[FFmpeg-cvslog] Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961'
Michael Niedermayer
git at videolan.org
Thu Apr 11 11:09:48 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 10:59:06 2013 +0200| [44d4488301c69bc026908011a9b6f9df5add3353] | committer: Michael Niedermayer
Merge commit '8114c101607843a86960bd3e0e9c40487dc2a961'
* commit '8114c101607843a86960bd3e0e9c40487dc2a961':
lavfi: add avfilter_get_class().
Conflicts:
libavfilter/avfilter.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44d4488301c69bc026908011a9b6f9df5add3353
---
More information about the ffmpeg-cvslog
mailing list