ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri May 22 
21:17:18 2015 +0200| [179527f34ea01a2a9b936acde1cb562780db98a6] | committer: 
Michael Niedermayer

Merge commit 'a3f4c930ac3f49f47b6e6ffda925d0dcf80320e2'

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

Conflicts:
        libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <[email protected]>

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



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

Reply via email to