FFmpeg/libavcodec
Michael Niedermayer f275f9eaee Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'
* commit '4e17946f10d39eec6cc03fb249ae8147373141b6':
  mpegvideo: Rework various functions not to use MpegEncContext directly

Conflicts:
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22 22:39:47 +02:00
..
2015-05-13 01:59:51 +02:00
2015-05-15 18:29:40 +02:00
2015-05-20 18:15:22 +02:00
2015-05-20 15:50:58 +02:00
2015-05-13 00:41:38 +02:00