[FFmpeg-cvslog] Merge commit '1565cbc65cbb9f95c11367314a080068895e0cf0'
Michael Niedermayer
git at videolan.org
Fri Apr 12 00:59:44 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 00:54:05 2013 +0200| [eb0f774d4bfdb1e5cb131f63580417cfb6b47514] | committer: Michael Niedermayer
Merge commit '1565cbc65cbb9f95c11367314a080068895e0cf0'
* commit '1565cbc65cbb9f95c11367314a080068895e0cf0':
lavfi: make avfilter_free() remove the filter from its graph.
Conflicts:
libavfilter/avfilter.c
libavfilter/avfiltergraph.c
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb0f774d4bfdb1e5cb131f63580417cfb6b47514
---
More information about the ffmpeg-cvslog
mailing list