diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:09:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:09:37 +0100 |
| commit | ecade984ac3ce5205f6276a9329e2b7bca09fa47 (patch) | |
| tree | b3be8c61ad61a2ba7d12c028c48b561ae400f315 /libavfilter/avfiltergraph.h | |
| parent | 8a0187e43d22527899a346034df4c7e4713f5212 (diff) | |
| parent | 42c7c61ab25809620b8c8809b3da73e25f5bbaaf (diff) | |
| download | ffmpeg-ecade984ac3ce5205f6276a9329e2b7bca09fa47.tar.gz | |
Merge commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf'
* commit '42c7c61ab25809620b8c8809b3da73e25f5bbaaf':
avfiltergraph: replace AVFilterGraph.filter_count with nb_filters
Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/graphparser.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfiltergraph.h')
| -rw-r--r-- | libavfilter/avfiltergraph.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index 3965412803..61110f99a1 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -27,11 +27,20 @@ typedef struct AVFilterGraph { const AVClass *av_class; - unsigned filter_count; +#if FF_API_FOO_COUNT + attribute_deprecated + unsigned filter_count_unused; +#endif AVFilterContext **filters; +#if !FF_API_FOO_COUNT + unsigned nb_filters; +#endif char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters +#if FF_API_FOO_COUNT + unsigned nb_filters; +#endif char *aresample_swr_opts; ///< swr options to use for the auto-inserted aresample filters, Access ONLY through AVOptions /** |