diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 12:27:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 12:27:59 +0100 |
| commit | 11146a9b440cd616b3a5ab322cfcca95da2aec7f (patch) | |
| tree | 4114e81850eb9dbcb2683f9de05e4b0e6d82cf5e /libavcodec | |
| parent | ad48c9374e13ecdf1399c44e9ea443a77232168a (diff) | |
| parent | 34150be515cd9c43b0b679806b8d01774960af78 (diff) | |
| download | ffmpeg-streaming-11146a9b440cd616b3a5ab322cfcca95da2aec7f.zip ffmpeg-streaming-11146a9b440cd616b3a5ab322cfcca95da2aec7f.tar.gz | |
Merge commit '34150be515cd9c43b0b679806b8d01774960af78'
* commit '34150be515cd9c43b0b679806b8d01774960af78':
build: Let the iac decoder depend on the imc decoder
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c375a50..1c1f8dd 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -243,7 +243,6 @@ OBJS-$(CONFIG_HEVC_DECODER) += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o OBJS-$(CONFIG_HNM4_VIDEO_DECODER) += hnm4video.o OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o huffyuvdec.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o huffyuvenc.o -OBJS-$(CONFIG_IAC_DECODER) += imc.o OBJS-$(CONFIG_IDCIN_DECODER) += idcinvideo.o OBJS-$(CONFIG_IDF_DECODER) += bintext.o cga_data.o OBJS-$(CONFIG_IFF_BYTERUN1_DECODER) += iff.o |
