[FFmpeg-cvslog] Merge commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'
Michael Niedermayer
git at videolan.org
Tue Aug 27 12:52:31 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 27 12:47:04 2013 +0200| [da2038221bc68e28edaaeddecff8d48cce2c9e52] | committer: Michael Niedermayer
Merge commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'
* commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242':
movenc: Properly free allocated data on failures in mov_write_header
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da2038221bc68e28edaaeddecff8d48cce2c9e52
---
More information about the ffmpeg-cvslog
mailing list