[FFmpeg-cvslog] Merge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28'
Michael Niedermayer
git at videolan.org
Fri Jun 27 19:29:38 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 27 19:20:12 2014 +0200| [1fd0e9a56d757a365492d3329ffe1c49e61d47f6] | committer: Michael Niedermayer
Merge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28'
* commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28':
mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter
Conflicts:
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1fd0e9a56d757a365492d3329ffe1c49e61d47f6
---
More information about the ffmpeg-cvslog
mailing list