[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Mon Jun 17 01:16:33 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 17 01:04:33 2013 +0200| [95275551ef280deadb73d04bad0472486e497115] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
smacker: check frame size validity
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=95275551ef280deadb73d04bad0472486e497115
---
More information about the ffmpeg-cvslog
mailing list