[FFmpeg-cvslog] Merge commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3'
Michael Niedermayer
git at videolan.org
Sat Nov 8 11:14:14 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 8 11:08:57 2014 +0100| [4342b346d273366438f10a1cc665d0c2db2af469] | committer: Michael Niedermayer
Merge commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3'
* commit '8cb7b7b461b52898765b38e3eff68c0ce88347f3':
movenc: Avoid leaking locally allocated data when returning on errors
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4342b346d273366438f10a1cc665d0c2db2af469
---
More information about the ffmpeg-cvslog
mailing list