[FFmpeg-cvslog] Merge commit '2007082d2db25f9305b8a345798b840ea7784fdb'
Michael Niedermayer
git at videolan.org
Tue Nov 18 03:40:01 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 18 03:33:35 2014 +0100| [4cd4a6de4f976a5bf79b564daa23c97cce545caf] | committer: Michael Niedermayer
Merge commit '2007082d2db25f9305b8a345798b840ea7784fdb'
* commit '2007082d2db25f9305b8a345798b840ea7784fdb':
mov: check ff_get_wav_header() return value
Conflicts:
libavformat/mov.c
See: 6d55a40b00801899f7975b22401bdd96bbc228af
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4cd4a6de4f976a5bf79b564daa23c97cce545caf
---
More information about the ffmpeg-cvslog
mailing list