ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri May 22 
20:57:30 2015 +0200| [a25ee5f9228d495fb9a69512632686cfa26df32f] | committer: 
Michael Niedermayer

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 <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a25ee5f9228d495fb9a69512632686cfa26df32f
---



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to