[FFmpeg-cvslog] Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'
Michael Niedermayer
git at videolan.org
Thu Jul 10 00:12:22 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 10 00:07:04 2014 +0200| [cd0dc88751db969964e7b40c4d4b5fd446ac1589] | committer: Michael Niedermayer
Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'
* commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09':
h264: parse display orientation SEI message
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd0dc88751db969964e7b40c4d4b5fd446ac1589
---
More information about the ffmpeg-cvslog
mailing list