Merge commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 10:11:00 +0000 (11:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 10:18:23 +0000 (11:18 +0100)
* commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022':
  dca: Move ff_dca_convert_bitstream() to the DCA common code
  vdpau: wrap codec specific functions in appropiate #ifs

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/Makefile
libavcodec/dca.c
libavcodec/dca.h
libavcodec/dca_parser.c
libavcodec/dcadec.c
libavcodec/mpeg12.c
libavcodec/vdpau.c

@@@ -156,10 -134,7 +156,10 @@@ OBJS-$(CONFIG_CPIA_DECODER)            
  OBJS-$(CONFIG_CSCD_DECODER)            += cscd.o
  OBJS-$(CONFIG_CYUV_DECODER)            += cyuv.o
  OBJS-$(CONFIG_DCA_DECODER)             += dcadec.o dca.o dcadsp.o      \
-                                           dca_parser.o synth_filter.o
+                                           synth_filter.o
 +OBJS-$(CONFIG_DCA_ENCODER)             += dcaenc.o dca.o
 +OBJS-$(CONFIG_DIRAC_DECODER)           += diracdec.o dirac.o diracdsp.o \
 +                                          dirac_arith.o mpeg12data.o dirac_dwt.o
  OBJS-$(CONFIG_DFA_DECODER)             += dfa.o
  OBJS-$(CONFIG_DNXHD_DECODER)           += dnxhddec.o dnxhddata.o
  OBJS-$(CONFIG_DNXHD_ENCODER)           += dnxhdenc.o dnxhddata.o
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -2304,7 -2240,8 +2304,8 @@@ static int decode_chunks(AVCodecContex
                          s2->er.error_count += s2->thread_context[i]->er.error_count;
                  }
  
-                 if (CONFIG_VDPAU && uses_vdpau(avctx))
+                 if ((CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER)
 -                    && avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
++                    && uses_vdpau(avctx))
                      ff_vdpau_mpeg_picture_complete(s2, buf, buf_size, s->slice_count);
  
                  ret = slice_end(avctx, picture);
Simple merge