Merge commit 'b01f6041f4260fba053c2f96ce1611ea77e833a0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 09:40:38 +0000 (11:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 09:46:09 +0000 (11:46 +0200)
commit74cb7ef8514846e97b28973f1884ea9d2afbc018
tree0927d815157b564cd2bea4b4918962b31fe02611
parent937af7f6d3e71e959028ddc75cb115533f560fbc
parentb01f6041f4260fba053c2f96ce1611ea77e833a0
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@gmx.at>
libavfilter/avfiltergraph.c
libavfilter/filtfmts.c
libavfilter/formats.c
libavfilter/formats.h
libavfilter/vf_extractplanes.c
libavfilter/vf_format.c