Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 19:17:18 +0000 (21:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 19:17:34 +0000 (21:17 +0200)
commit179527f34ea01a2a9b936acde1cb562780db98a6
tree3cc418475bd0b330664914aeb7696f7689335998
parenta25ee5f9228d495fb9a69512632686cfa26df32f
parenta3f4c930ac3f49f47b6e6ffda925d0dcf80320e2
Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'

* commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2':
  mpegvideo: Have ff_mpeg_ref_picture use AVCodecContext directly

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c