Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Oct 2011 21:45:44 +0000 (23:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Oct 2011 21:45:44 +0000 (23:45 +0200)
* qatar/master:
  adpcm: use sign_extend()
  mpeg12: fix mpeg_decode_slice context parameter type
  Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"

Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/adpcm.c
libavcodec/mpeg12.c
libavcodec/vdpau.c
libavcodec/vdpau_internal.h

Simple merge
@@@ -2307,10 -2256,9 +2305,10 @@@ static int decode_chunks(AVCodecContex
                          s2->error_count += s2->thread_context[i]->error_count;
                  }
  
 -                if (CONFIG_MPEG_VDPAU_DECODER && avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
 +                if (CONFIG_VDPAU && uses_vdpau(avctx))
-                     ff_vdpau_mpeg_picture_complete(s, buf, buf_size, s->slice_count);
+                     ff_vdpau_mpeg_picture_complete(s2, buf, buf_size, s->slice_count);
  
 +
                  if (slice_end(avctx, picture)) {
                      if (s2->last_picture_ptr || s2->low_delay) //FIXME merge with the stuff in mpeg_decode_slice
                          *data_size = sizeof(AVPicture);
Simple merge
Simple merge