wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '42c7c61ab2'

Browse source 
* commit '42c7c61ab2':
  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>
This commit is contained in:
Michael Niedermayer 2013-03-16 16:09:37 +01:00
commit ecade984ac
7 changed files with 42 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libavfilter/avfiltergraph.h
View file

@ -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
/**