[FFmpeg-cvslog] Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'
Michael Niedermayer
git at videolan.org
Sat May 18 11:57:44 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 18 11:40:38 2013 +0200| [74cb7ef8514846e97b28973f1884ea9d2afbc018] | committer: Michael Niedermayer
Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'
* commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0':
lavfi: rename AVFilterFormats.format_count to nb_formats
Conflicts:
libavfilter/avfiltergraph.c
libavfilter/filtfmts.c
libavfilter/formats.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=74cb7ef8514846e97b28973f1884ea9d2afbc018
---
More information about the ffmpeg-cvslog
mailing list