diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 11:40:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 11:46:09 +0200 |
| commit | 74cb7ef8514846e97b28973f1884ea9d2afbc018 (patch) | |
| tree | 0927d815157b564cd2bea4b4918962b31fe02611 /libavcodec/mpegaudiodata.c | |
| parent | 937af7f6d3e71e959028ddc75cb115533f560fbc (diff) | |
| parent | b01f6041f4260fba053c2f96ce1611ea77e833a0 (diff) | |
| download | ffmpeg-74cb7ef8514846e97b28973f1884ea9d2afbc018.tar.gz | |
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>
Diffstat (limited to 'libavcodec/mpegaudiodata.c')
0 files changed, 0 insertions, 0 deletions