Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 21:04:51 +0000 (22:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 21:04:51 +0000 (22:04 +0100)
* commit 'd48430c367947a64647c6959cf472f2c01778b17':
  build: Let the SVQ3 decoder depend on the H.264 decoder

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/Makefile

diff --cc configure
Simple merge
@@@ -413,11 -335,7 +413,8 @@@ OBJS-$(CONFIG_SUNRAST_ENCODER)         
  OBJS-$(CONFIG_SVQ1_DECODER)            += svq1dec.o svq1.o svq13.o h263.o
  OBJS-$(CONFIG_SVQ1_ENCODER)            += svq1enc.o svq1.o    \
                                            h263.o ituh263enc.o
- OBJS-$(CONFIG_SVQ3_DECODER)            += svq3.o svq13.o h263.o h264.o        \
-                                           h264_loopfilter.o h264_direct.o     \
-                                           h264_sei.o h264_ps.o h264_refs.o    \
-                                           h264_cavlc.o h264_cabac.o cabac.o
+ OBJS-$(CONFIG_SVQ3_DECODER)            += svq3.o svq13.o
 +OBJS-$(CONFIG_TEXT_DECODER)            += textdec.o ass.o
  OBJS-$(CONFIG_TAK_DECODER)             += takdec.o tak.o
  OBJS-$(CONFIG_TARGA_DECODER)           += targa.o
  OBJS-$(CONFIG_TARGA_ENCODER)           += targaenc.o rle.o