Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 19:25:57 +0000 (21:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 20:39:47 +0000 (22:39 +0200)
commitf275f9eaee9c69bcbc732002f0ee36f480eebb85
tree8262a8aee25ee9ff50bc036381c542f474bb0ba3
parent179527f34ea01a2a9b936acde1cb562780db98a6
parent4e17946f10d39eec6cc03fb249ae8147373141b6
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>
libavcodec/h263dec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c