diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 13:00:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 13:01:27 +0200 |
| commit | eadba3e94daac2f48fd9ce7c9fdf5a562d3274ed (patch) | |
| tree | e33c21663364927e22ba4a259ff8afb746e06ec6 /libavcodec/alpha | |
| parent | b4e516e30e7004a0454a9009080c4de38987189a (diff) | |
| parent | cbcd497f384f0f8ef3f76f85b29b644b900d6b9f (diff) | |
| download | ffmpeg-eadba3e94daac2f48fd9ce7c9fdf5a562d3274ed.tar.gz | |
Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'
* commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f':
adxdec: use planar sample format
adpcmdec: use planar sample format for adpcm_thp
adpcmdec: use planar sample format for adpcm_ea_xas
adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3
adpcmdec: use planar sample format for adpcm_xa
adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3
adpcmdec: use planar sample format for adpcm_4xm
adpcmdec: use planar sample format for adpcm_ima_wav
adpcmdec: use planar sample format for adpcm_ima_qt
pcmdec: use planar sample format for pcm_lxf
mace: use planar sample format
atrac1: use planar sample format
build: non-x86: Only compile mpegvideo optimizations when necessary
rtpdec_mpeg4: au_headers is a single array, simple av_free is enough
avcodec: free extended_data instead address of it
fate: Add tests of the ff_make_absolute_url function
url: Handle relative urls starting with two slashes
url: Handle relative urls being just a new query string
url: Don't treat slashes in query parameters as directory separators
Conflicts:
libavcodec/adxdec.c
libavcodec/mips/Makefile
libavcodec/pcm.c
libavcodec/utils.c
libavformat/Makefile
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/alpha')
| -rw-r--r-- | libavcodec/alpha/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/alpha/Makefile b/libavcodec/alpha/Makefile index e55fe49b7b..e28200d45a 100644 --- a/libavcodec/alpha/Makefile +++ b/libavcodec/alpha/Makefile @@ -2,5 +2,6 @@ OBJS += alpha/dsputil_alpha.o \ alpha/dsputil_alpha_asm.o \ alpha/motion_est_alpha.o \ alpha/motion_est_mvi_asm.o \ - alpha/mpegvideo_alpha.o \ alpha/simple_idct_alpha.o \ + +OBJS-$(CONFIG_MPEGVIDEO) += alpha/mpegvideo_alpha.o |