Michael Niedermayer f0a7b67a35 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>

2011-10-24 23:45:44 +02:00

17 KiB

Raw Blame History

View Raw