diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:37:42 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:38:13 +0200 |
commit | e932ae5940562ae0a183687053a5457a76fd1fa9 (patch) | |
tree | d60f2db127f068f058a0b44adfeca3d580ba542a /libavcodec/Makefile | |
parent | 1b58f1376132026a7633fea253f0ed67a8392343 (diff) | |
parent | d5cf5afabbf43f00283e70b12afbe1da030d85b6 (diff) |
Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'
* commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6':
adxdec: get rid of an avpriv function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 50a7b17b1a..3a2f5baa6b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -666,7 +666,6 @@ OBJS-$(CONFIG_VC1_VDPAU_HWACCEL) += vdpau_vc1.o # libavformat dependencies OBJS-$(CONFIG_ADTS_MUXER) += mpeg4audio.o -OBJS-$(CONFIG_ADX_DEMUXER) += adx.o OBJS-$(CONFIG_CAF_DEMUXER) += mpeg4audio.o mpegaudiodata.o \ ac3tab.o OBJS-$(CONFIG_FLAC_DEMUXER) += flac.o flacdata.o vorbis_data.o \ |