[FFmpeg-cvslog] Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'
Michael Niedermayer
git at videolan.org
Mon Mar 17 05:58:03 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 05:49:10 2014 +0100| [c237e88d51b9da12026734101a9ba578d04b4b15] | committer: Michael Niedermayer
Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'
* commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87':
h264: move relevant fields from Picture to H264Picture
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c237e88d51b9da12026734101a9ba578d04b4b15
---
More information about the ffmpeg-cvslog
mailing list