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)
commitf0a7b67a356def037d26f9460b22c86d82be2b89
tree81f96865b5112c9299efc48cc0842cda4f21df42
parentf44c816566be23e5b6c09efb1200755fd0cef214
parentc8477df019f02a436c69e8ca54370dd5cf8eee97
Merge remote-tracking branch 'qatar/master'

* 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>
libavcodec/adpcm.c
libavcodec/mpeg12.c
libavcodec/vdpau.c
libavcodec/vdpau_internal.h