[FFmpeg-cvslog] Merge commit '0ef1660a6365ce60ead8858936b6f3f8ea862826'
Michael Niedermayer
git at videolan.org
Mon Sep 16 12:38:05 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 16 12:32:24 2013 +0200| [cfa909ef5b7e0320f75cca10d932631fb03b49af] | committer: Michael Niedermayer
Merge commit '0ef1660a6365ce60ead8858936b6f3f8ea862826'
* commit '0ef1660a6365ce60ead8858936b6f3f8ea862826':
sierravmd: Do sanity checking of frame sizes
Conflicts:
libavformat/sierravmd.c
See: 47c4713a23d271eedd2eb2c02daa70cb0ea4e0ac
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfa909ef5b7e0320f75cca10d932631fb03b49af
---
More information about the ffmpeg-cvslog
mailing list