Index: patched-ffmpeg-mt/libavcodec/Makefile |
=================================================================== |
--- patched-ffmpeg-mt/libavcodec/Makefile (revision 41250) |
+++ patched-ffmpeg-mt/libavcodec/Makefile (working copy) |
@@ -3,7 +3,7 @@ |
NAME = avcodec |
FFLIBS = avutil |
-HEADERS = avcodec.h dxva2.h opt.h vaapi.h vdpau.h xvmc.h |
+HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.h xvmc.h |
OBJS = allcodecs.o \ |
audioconvert.o \ |
@@ -30,9 +30,10 @@ |
OBJS-$(CONFIG_DCT) += dct.o |
OBJS-$(CONFIG_DXVA2) += dxva2.o |
FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o |
-OBJS-$(CONFIG_FFT) += fft.o $(FFT-OBJS-yes) |
+OBJS-$(CONFIG_FFT) += avfft.o fft.o $(FFT-OBJS-yes) |
OBJS-$(CONFIG_GOLOMB) += golomb.o |
OBJS-$(CONFIG_LPC) += lpc.o |
+OBJS-$(CONFIG_LSP) += lsp.o |
OBJS-$(CONFIG_MDCT) += mdct.o |
RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o |
OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) |
@@ -40,7 +41,7 @@ |
OBJS-$(CONFIG_VDPAU) += vdpau.o |
# decoders/encoders/hardware accelerators |
-OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o |
+OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o aacsbr.o |
OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ |
aacpsy.o aactab.o \ |
psymodel.o iirfilter.o \ |
@@ -50,7 +51,11 @@ |
OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o |
OBJS-$(CONFIG_ALAC_DECODER) += alac.o |
OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o |
-OBJS-$(CONFIG_ALS_DECODER) += alsdec.o |
+OBJS-$(CONFIG_ALS_DECODER) += alsdec.o bgmc.o mpeg4audio.o |
+OBJS-$(CONFIG_AMRNB_DECODER) += amrnbdec.o celp_filters.o \ |
+ celp_math.o acelp_filters.o \ |
+ acelp_vectors.o \ |
+ acelp_pitch_delay.o |
OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o |
OBJS-$(CONFIG_ANM_DECODER) += anm.o |
OBJS-$(CONFIG_APE_DECODER) += apedec.o |
@@ -65,6 +70,7 @@ |
OBJS-$(CONFIG_AVS_DECODER) += avs.o |
OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o |
OBJS-$(CONFIG_BFI_DECODER) += bfi.o |
+OBJS-$(CONFIG_BINK_DECODER) += bink.o binkidct.o |
OBJS-$(CONFIG_BINKAUDIO_DCT_DECODER) += binkaudio.o wma.o |
OBJS-$(CONFIG_BINKAUDIO_RDFT_DECODER) += binkaudio.o wma.o |
OBJS-$(CONFIG_BMP_DECODER) += bmp.o msrledec.o |
@@ -122,21 +128,27 @@ |
OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o huffman.o |
OBJS-$(CONFIG_FRWU_DECODER) += frwu.o |
OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o |
-OBJS-$(CONFIG_GIF_ENCODER) += gif.o |
+OBJS-$(CONFIG_GIF_ENCODER) += gif.o lzwenc.o |
OBJS-$(CONFIG_H261_DECODER) += h261dec.o h261.o \ |
mpegvideo.o error_resilience.o |
OBJS-$(CONFIG_H261_ENCODER) += h261enc.o h261.o \ |
mpegvideo_enc.o motion_est.o \ |
ratecontrol.o mpeg12data.o \ |
mpegvideo.o |
-OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o ituh263dec.o mpeg4video.o mpeg4videodec.o flvdec.o intelh263dec.o \ |
- mpegvideo.o error_resilience.o |
+OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o ituh263dec.o \ |
+ mpeg4video.o mpeg4videodec.o flvdec.o\ |
+ intelh263dec.o mpegvideo.o \ |
+ error_resilience.o |
OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o |
-OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o mpeg4video.o mpeg4videoenc.o motion_est.o \ |
- ratecontrol.o h263.o ituh263enc.o flvenc.o mpeg12data.o \ |
+OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o mpeg4video.o \ |
+ mpeg4videoenc.o motion_est.o \ |
+ ratecontrol.o h263.o ituh263enc.o \ |
+ flvenc.o mpeg12data.o \ |
mpegvideo.o error_resilience.o |
-OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o h264_loopfilter.o h264_direct.o cabac.o \ |
- h264_sei.o h264_ps.o h264_refs.o h264_cavlc.o h264_cabac.o\ |
+OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o \ |
+ h264_loopfilter.o h264_direct.o \ |
+ cabac.o h264_sei.o h264_ps.o \ |
+ h264_refs.o h264_cavlc.o h264_cabac.o\ |
mpegvideo.o error_resilience.o |
OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o |
OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o |
@@ -144,14 +156,18 @@ |
OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o |
OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o |
OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o |
+OBJS-$(CONFIG_IFF_BYTERUN1_DECODER) += iff.o |
+OBJS-$(CONFIG_IFF_ILBM_DECODER) += iff.o |
OBJS-$(CONFIG_IMC_DECODER) += imc.o |
OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o |
OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o |
+OBJS-$(CONFIG_INDEO5_DECODER) += indeo5.o ivi_common.o ivi_dsp.o |
OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.o |
OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o |
OBJS-$(CONFIG_JPEGLS_DECODER) += jpeglsdec.o jpegls.o \ |
mjpegdec.o mjpeg.o |
OBJS-$(CONFIG_JPEGLS_ENCODER) += jpeglsenc.o jpegls.o |
+OBJS-$(CONFIG_KGV1_DECODER) += kgv1dec.o |
OBJS-$(CONFIG_KMVC_DECODER) += kmvc.o |
OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpegenc.o mjpeg.o \ |
mpegvideo_enc.o motion_est.o \ |
@@ -181,7 +197,8 @@ |
OBJS-$(CONFIG_MP3ADU_DECODER) += mpegaudiodec.o mpegaudiodecheader.o \ |
mpegaudio.o mpegaudiodata.o |
OBJS-$(CONFIG_MP3ON4_DECODER) += mpegaudiodec.o mpegaudiodecheader.o \ |
- mpegaudio.o mpegaudiodata.o mpeg4audio.o |
+ mpegaudio.o mpegaudiodata.o \ |
+ mpeg4audio.o |
OBJS-$(CONFIG_MP3_DECODER) += mpegaudiodec.o mpegaudiodecheader.o \ |
mpegaudio.o mpegaudiodata.o |
OBJS-$(CONFIG_MPC7_DECODER) += mpc7.o mpc.o mpegaudiodec.o \ |
@@ -208,11 +225,16 @@ |
mpegvideo.o error_resilience.o |
OBJS-$(CONFIG_MPEG4_VAAPI_HWACCEL) += vaapi_mpeg4.o |
OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4.o msmpeg4data.o |
-OBJS-$(CONFIG_MSMPEG4V1_ENCODER) += msmpeg4.o msmpeg4data.o |
-OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o |
-OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4.o msmpeg4data.o |
-OBJS-$(CONFIG_MSMPEG4V3_DECODER) += msmpeg4.o msmpeg4data.o |
-OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4.o msmpeg4data.o |
+OBJS-$(CONFIG_MSMPEG4V1_ENCODER) += msmpeg4.o msmpeg4data.o h263dec.o \ |
+ h263.o ituh263dec.o mpeg4videodec.o |
+OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o \ |
+ h263.o ituh263dec.o mpeg4videodec.o |
+OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4.o msmpeg4data.o h263dec.o \ |
+ h263.o ituh263dec.o mpeg4videodec.o |
+OBJS-$(CONFIG_MSMPEG4V3_DECODER) += msmpeg4.o msmpeg4data.o h263dec.o \ |
+ h263.o ituh263dec.o mpeg4videodec.o |
+OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4.o msmpeg4data.o h263dec.o \ |
+ h263.o ituh263dec.o mpeg4videodec.o |
OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o msrledec.o |
OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o |
OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o |
@@ -235,7 +257,7 @@ |
OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o |
OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o |
OBJS-$(CONFIG_PTX_DECODER) += ptx.o |
-OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o lsp.o celp_math.o \ |
+OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o celp_math.o \ |
celp_filters.o acelp_vectors.o |
OBJS-$(CONFIG_QDM2_DECODER) += qdm2.o mpegaudiodec.o \ |
mpegaudiodecheader.o mpegaudio.o \ |
@@ -268,7 +290,7 @@ |
OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o |
OBJS-$(CONFIG_SIPR_DECODER) += sipr.o acelp_pitch_delay.o \ |
celp_math.o acelp_vectors.o \ |
- acelp_filters.o celp_filters.o lsp.o \ |
+ acelp_filters.o celp_filters.o \ |
sipr16k.o |
OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o |
OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o |
@@ -277,7 +299,8 @@ |
OBJS-$(CONFIG_SNOW_ENCODER) += snow.o rangecoder.o motion_est.o \ |
ratecontrol.o h263.o \ |
mpegvideo.o error_resilience.o \ |
- ituh263enc.o mpegvideo_enc.o |
+ ituh263enc.o mpegvideo_enc.o \ |
+ mpeg12data.o |
OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o |
OBJS-$(CONFIG_SONIC_DECODER) += sonic.o |
OBJS-$(CONFIG_SONIC_ENCODER) += sonic.o |
@@ -288,11 +311,14 @@ |
mpegvideo.o error_resilience.o |
OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o \ |
motion_est.o h263.o \ |
- mpegvideo.o error_resilience.o |
-OBJS-$(CONFIG_SVQ3_DECODER) += h264.o svq3.o h264idct.o h264pred.o h264_loopfilter.o h264_direct.o \ |
- h264_sei.o h264_ps.o h264_refs.o h264_cavlc.o h264_cabac.o \ |
- cabac.o \ |
mpegvideo.o error_resilience.o \ |
+ ituh263enc.o mpegvideo_enc.o \ |
+ ratecontrol.o mpeg12data.o |
+OBJS-$(CONFIG_SVQ3_DECODER) += h264.o svq3.o h264idct.o h264pred.o \ |
+ h264_loopfilter.o h264_direct.o \ |
+ h264_sei.o h264_ps.o h264_refs.o \ |
+ h264_cavlc.o h264_cabac.o cabac.o \ |
+ mpegvideo.o error_resilience.o \ |
svq1dec.o svq1.o h263.o |
OBJS-$(CONFIG_TARGA_DECODER) += targa.o |
OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o |
@@ -336,15 +362,20 @@ |
OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o |
OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o |
OBJS-$(CONFIG_WMAPRO_DECODER) += wmaprodec.o wma.o |
-OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o |
-OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o |
-OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o |
-OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o |
+OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o aactab.o |
+OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o aactab.o |
+OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o aactab.o |
+OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o aactab.o |
+OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \ |
+ celp_math.o celp_filters.o \ |
+ acelp_vectors.o acelp_filters.o |
+OBJS-$(CONFIG_WMV1_DECODER) += msmpeg4.o msmpeg4data.o |
OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o \ |
msmpeg4.o msmpeg4data.o \ |
intrax8.o intrax8dsp.o |
OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o \ |
- msmpeg4.o msmpeg4data.o |
+ msmpeg4.o msmpeg4data.o \ |
+ mpeg4videodec.o ituh263dec.o h263dec.o |
OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o |
OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o |
OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o |
@@ -446,12 +477,14 @@ |
# libavformat dependencies |
OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o |
+OBJS-$(CONFIG_CAF_DEMUXER) += mpeg4audio.o mpegaudiodata.o |
OBJS-$(CONFIG_DV_DEMUXER) += dvdata.o |
OBJS-$(CONFIG_DV_MUXER) += dvdata.o |
OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o flacdata.o flac.o |
OBJS-$(CONFIG_FLAC_MUXER) += flacdec.o flacdata.o flac.o |
OBJS-$(CONFIG_FLV_DEMUXER) += mpeg4audio.o |
OBJS-$(CONFIG_GXF_DEMUXER) += mpeg12data.o |
+OBJS-$(CONFIG_IFF_DEMUXER) += iff.o |
OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += xiph.o mpeg4audio.o \ |
flacdec.o flacdata.o flac.o |
OBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio.o |
@@ -476,7 +509,7 @@ |
OBJS-$(CONFIG_LIBMP3LAME_ENCODER) += libmp3lame.o |
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_DECODER) += libopencore-amr.o |
OBJS-$(CONFIG_LIBOPENCORE_AMRNB_ENCODER) += libopencore-amr.o |
-OBJS-$(CONFIG_LIBOPENCORE_AMRWB_ENCODER) += libopencore-amr.o |
+OBJS-$(CONFIG_LIBOPENCORE_AMRWB_DECODER) += libopencore-amr.o |
OBJS-$(CONFIG_LIBOPENJPEG_DECODER) += libopenjpeg.o |
OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o \ |
libschroedinger.o \ |
@@ -505,11 +538,16 @@ |
OBJS-$(CONFIG_H263_PARSER) += h263_parser.o |
OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264.o h264idct.o \ |
h264pred.o cabac.o \ |
+ h264_refs.o h264_sei.o h264_direct.o \ |
+ h264_loopfilter.o h264_cabac.o \ |
+ h264_cavlc.o h264_ps.o \ |
mpegvideo.o error_resilience.o |
OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o |
OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o |
OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o \ |
- mpegvideo.o error_resilience.o |
+ mpegvideo.o error_resilience.o \ |
+ mpeg4videodec.o mpeg4video.o \ |
+ ituh263dec.o h263dec.o |
OBJS-$(CONFIG_MPEGAUDIO_PARSER) += mpegaudio_parser.o \ |
mpegaudiodecheader.o mpegaudiodata.o |
OBJS-$(CONFIG_MPEGVIDEO_PARSER) += mpegvideo_parser.o \ |
@@ -517,8 +555,8 @@ |
mpegvideo.o error_resilience.o |
OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o |
OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o \ |
- msmpeg4.o msmpeg4data.o h263.o \ |
- mpegvideo.o error_resilience.o |
+ msmpeg4.o msmpeg4data.o mpeg4video.o \ |
+ h263.o mpegvideo.o error_resilience.o |
OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o |
# bitstream filters |
@@ -583,11 +621,12 @@ |
MMX-OBJS-$(HAVE_YASM) += x86/dsputil_yasm.o \ |
$(YASM-OBJS-yes) |
+MMX-OBJS-$(CONFIG_FFT) += x86/fft.o |
+ |
OBJS-$(HAVE_MMX) += x86/cpuid.o \ |
x86/dnxhd_mmx.o \ |
x86/dsputil_mmx.o \ |
x86/fdct_mmx.o \ |
- x86/fft.o \ |
x86/idct_mmx_xvid.o \ |
x86/idct_sse2_xvid.o \ |
x86/motion_est_mmx.o \ |
@@ -636,6 +675,7 @@ |
OBJS-$(HAVE_NEON) += arm/dsputil_init_neon.o \ |
arm/dsputil_neon.o \ |
+ arm/int_neon.o \ |
arm/simple_idct_neon.o \ |
$(NEON-OBJS-yes) |
@@ -679,18 +719,21 @@ |
OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ |
sparc/simple_idct_vis.o \ |
-SKIPHEADERS-$(CONFIG_DXVA2) += dxva2_internal.h |
+SKIPHEADERS = %_tablegen.h |
+SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h |
SKIPHEADERS-$(CONFIG_LIBDIRAC) += libdirac.h |
SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h |
SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_internal.h |
SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h |
SKIPHEADERS-$(CONFIG_XVMC) += xvmc.h |
+SKIPHEADERS += mpegaudio3.h |
EXAMPLES = api |
TESTPROGS = cabac dct eval fft h264 iirfilter rangecoder snow |
TESTPROGS-$(ARCH_X86) += x86/cpuid |
TESTPROGS-$(HAVE_MMX) += motion |
+TESTOBJS = dctref.o |
HOSTPROGS = costablegen |