← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libav/trusty

« back to all changes in this revision

Viewing changes to libavcodec/Makefile

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Jonas Smedegaard, Reinhard Tartler
  • Date: 2013-03-02 14:34:27 UTC
  • mfrom: (1.5.6)
  • mto: (1.3.35 sid)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: package-import@ubuntu.com-20130302143427-wdmprnbkkccte051
Tags: 6:9.3-1
[ Jonas Smedegaard ]
* Stop using CDBS.

[ Reinhard Tartler ]
* Imported Upstream version 9.2 (never uploaded, though)
* Imported Upstream version 9.3:
  - Fixes CVE-2013-0894
* drop 02-fix-build-on-non-armv5te.patch, merged upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/Makefile
36
36
# parts needed for many different codecs
37
37
OBJS-$(CONFIG_AANDCTTABLES)            += aandcttab.o
38
38
OBJS-$(CONFIG_AC3DSP)                  += ac3dsp.o
 
39
OBJS-$(CONFIG_AUDIO_FRAME_QUEUE)       += audio_frame_queue.o
39
40
OBJS-$(CONFIG_DCT)                     += dct.o dct32_fixed.o dct32_float.o
40
41
OBJS-$(CONFIG_DWT)                     += dwt.o
41
42
OBJS-$(CONFIG_DXVA2)                   += dxva2.o
79
80
OBJS-$(CONFIG_AAC_ENCODER)             += aacenc.o aaccoder.o    \
80
81
                                          aacpsy.o aactab.o      \
81
82
                                          psymodel.o iirfilter.o \
82
 
                                          mpeg4audio.o kbdwin.o  \
83
 
                                          audio_frame_queue.o
 
83
                                          mpeg4audio.o kbdwin.o
84
84
OBJS-$(CONFIG_AASC_DECODER)            += aasc.o msrledec.o
85
85
OBJS-$(CONFIG_AC3_DECODER)             += ac3dec.o ac3dec_data.o ac3.o kbdwin.o
86
86
OBJS-$(CONFIG_AC3_ENCODER)             += ac3enc_float.o ac3enc.o ac3tab.o \
273
273
OBJS-$(CONFIG_MTS2_DECODER)            += mss4.o mss34dsp.o
274
274
OBJS-$(CONFIG_MXPEG_DECODER)           += mxpegdec.o mjpegdec.o mjpeg.o
275
275
OBJS-$(CONFIG_NELLYMOSER_DECODER)      += nellymoserdec.o nellymoser.o
276
 
OBJS-$(CONFIG_NELLYMOSER_ENCODER)      += nellymoserenc.o nellymoser.o \
277
 
                                          audio_frame_queue.o
 
276
OBJS-$(CONFIG_NELLYMOSER_ENCODER)      += nellymoserenc.o nellymoser.o
278
277
OBJS-$(CONFIG_NUV_DECODER)             += nuv.o rtjpeg.o
279
278
OBJS-$(CONFIG_PAM_DECODER)             += pnmdec.o pnm.o
280
279
OBJS-$(CONFIG_PAM_ENCODER)             += pamenc.o pnm.o
306
305
OBJS-$(CONFIG_R10K_DECODER)            += r210dec.o
307
306
OBJS-$(CONFIG_R210_DECODER)            += r210dec.o
308
307
OBJS-$(CONFIG_RA_144_DECODER)          += ra144dec.o ra144.o celp_filters.o
309
 
OBJS-$(CONFIG_RA_144_ENCODER)          += ra144enc.o ra144.o celp_filters.o \
310
 
                                          audio_frame_queue.o
 
308
OBJS-$(CONFIG_RA_144_ENCODER)          += ra144enc.o ra144.o celp_filters.o
311
309
OBJS-$(CONFIG_RA_288_DECODER)          += ra288.o celp_filters.o
312
310
OBJS-$(CONFIG_RALF_DECODER)            += ralf.o
313
311
OBJS-$(CONFIG_RAWVIDEO_DECODER)        += rawdec.o
563
561
OBJS-$(CONFIG_WTV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
564
562
 
565
563
# external codec libraries
566
 
OBJS-$(CONFIG_LIBFAAC_ENCODER)            += libfaac.o audio_frame_queue.o
567
 
OBJS-$(CONFIG_LIBFDK_AAC_ENCODER)         += libfdk-aacenc.o audio_frame_queue.o
 
564
OBJS-$(CONFIG_LIBFAAC_ENCODER)            += libfaac.o
 
565
OBJS-$(CONFIG_LIBFDK_AAC_ENCODER)         += libfdk-aacenc.o
568
566
OBJS-$(CONFIG_LIBGSM_DECODER)             += libgsm.o
569
567
OBJS-$(CONFIG_LIBGSM_ENCODER)             += libgsm.o
570
568
OBJS-$(CONFIG_LIBGSM_MS_DECODER)          += libgsm.o
571
569
OBJS-$(CONFIG_LIBGSM_MS_ENCODER)          += libgsm.o
572
570
OBJS-$(CONFIG_LIBILBC_DECODER)            += libilbc.o
573
571
OBJS-$(CONFIG_LIBILBC_ENCODER)            += libilbc.o
574
 
OBJS-$(CONFIG_LIBMP3LAME_ENCODER)         += libmp3lame.o mpegaudiodecheader.o \
575
 
                                             audio_frame_queue.o
 
572
OBJS-$(CONFIG_LIBMP3LAME_ENCODER)         += libmp3lame.o mpegaudiodecheader.o
576
573
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER)  += libopencore-amr.o
577
574
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER)  += libopencore-amr.o
578
575
OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER)  += libopencore-amr.o
581
578
OBJS-$(CONFIG_LIBOPUS_DECODER)            += libopusdec.o libopus.o     \
582
579
                                             vorbis_data.o
583
580
OBJS-$(CONFIG_LIBOPUS_ENCODER)            += libopusenc.o libopus.o     \
584
 
                                             vorbis_data.o audio_frame_queue.o
 
581
                                             vorbis_data.o
585
582
OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER)    += libschroedingerdec.o \
586
583
                                             libschroedinger.o
587
584
OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER)    += libschroedingerenc.o \
588
585
                                             libschroedinger.o
589
586
OBJS-$(CONFIG_LIBSPEEX_DECODER)           += libspeexdec.o
590
 
OBJS-$(CONFIG_LIBSPEEX_ENCODER)           += libspeexenc.o audio_frame_queue.o
 
587
OBJS-$(CONFIG_LIBSPEEX_ENCODER)           += libspeexenc.o
591
588
OBJS-$(CONFIG_LIBTHEORA_ENCODER)          += libtheoraenc.o
592
589
OBJS-$(CONFIG_LIBVO_AACENC_ENCODER)       += libvo-aacenc.o mpeg4audio.o
593
590
OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER)     += libvo-amrwbenc.o
594
 
OBJS-$(CONFIG_LIBVORBIS_ENCODER)          += libvorbis.o audio_frame_queue.o \
 
591
OBJS-$(CONFIG_LIBVORBIS_ENCODER)          += libvorbis.o \
595
592
                                             vorbis_data.o vorbis_parser.o
596
593
OBJS-$(CONFIG_LIBVPX_DECODER)             += libvpxdec.o
597
594
OBJS-$(CONFIG_LIBVPX_ENCODER)             += libvpxenc.o