generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'

Browse Source 
* commit '9f1223562e134bac6345a465870b9d56ff7d60cf':
  lavfi: connect libavresample options to af_resample via AVFilterGraph

Conflicts:
	doc/APIchanges
	libavfilter/avfiltergraph.c
	libavfilter/avfiltergraph.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-02-24 17:10:55 +01:00
parent f7c4b76c48 9f1223562e
commit 71cf094e1b
5 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavfilter/avfiltergraph.h
View File

@@ -45,6 +45,7 @@ typedef struct AVFilterGraph {
int sink_links_count;
unsigned disable_auto_convert;
char *resample_lavr_opts; ///< libavresample options to use for the auto-inserted resample filters
} AVFilterGraph;
/**