[FFmpeg-cvslog] Merge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24'
Michael Niedermayer
git at videolan.org
Fri Jan 10 03:57:08 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 10 03:46:28 2014 +0100| [d9481dcd612b5f020e3c2137c301406a5eb1aa90] | committer: Michael Niedermayer
Merge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24'
* commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24':
avfilter: fix leaks on error in ff_filter_frame
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d9481dcd612b5f020e3c2137c301406a5eb1aa90
---
More information about the ffmpeg-cvslog
mailing list