FFmpeg/libavcodec
Michael Niedermayer a25ee5f922 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>
2015-05-22 21:15:32 +02:00
..
2015-05-13 01:59:51 +02:00
2015-04-29 20:13:59 +02:00
2015-05-15 18:29:40 +02:00
2015-05-06 17:50:09 +02:00
2015-04-28 00:04:58 +02:00
2015-05-20 18:15:22 +02:00
2015-04-28 00:04:58 +02:00
2015-05-07 07:19:52 -04:00
2015-05-20 15:50:58 +02:00
2015-05-13 00:41:38 +02:00