[FFmpeg-cvslog] Merge commit '01f9540320279954b2764645ab7136847d53d89f' into release/1.1
Michael Niedermayer
git at videolan.org
Fri Aug 8 14:30:15 CEST 2014
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 8 14:24:54 2014 +0200| [0bcf514198bfcb5ae99744bd82842ae37a5a55ad] | committer: Michael Niedermayer
Merge commit '01f9540320279954b2764645ab7136847d53d89f' into release/1.1
* commit '01f9540320279954b2764645ab7136847d53d89f':
h264_sei: check SEI size
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bcf514198bfcb5ae99744bd82842ae37a5a55ad
---
More information about the ffmpeg-cvslog
mailing list