ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Nov 11
21:20:50 2014 +0100| [9311026ec7a082c7ff9efff7a0d28e4d9832af6d] | committer:
Michael Niedermayer
Merge commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d'
* commit '898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d':
mpegvideo: check mpv return value
Conflicts:
libavcodec/mpegvideo.c
See: f4d73f0fb55e0b5931c859ddb4d2d1617b60d560
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9311026ec7a082c7ff9efff7a0d28e4d9832af6d
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
