Merge commit 'd528045558825f01472e9bee873f60c98d661e53'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 18:57:30 +0000 (20:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 19:15:32 +0000 (21:15 +0200)
commita25ee5f9228d495fb9a69512632686cfa26df32f
tree28406eb4e763cdd0f031d0d49e2574ac61b23214
parentbc373595f28e20f69505dd0d29f716935c06f958
parentd528045558825f01472e9bee873f60c98d661e53
Merge commit 'd528045558825f01472e9bee873f60c98d661e53'

* commit 'd528045558825f01472e9bee873f60c98d661e53':
  mpegvideo: Have ff_mpeg_unref_picture use AVCodecContext directly

Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c

The memset is left in place

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