Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge

* commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee':
  avconv: create simple filtergraphs earlier

Merged-by: Timothy Gu <timothygu99@gmail.com>
This commit is contained in:
Timothy Gu
2016-08-03 20:53:03 -07:00
4 changed files with 21 additions and 10 deletions

View File

@@ -574,7 +574,7 @@ int configure_filtergraph(FilterGraph *fg);
int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out);
int ist_in_filtergraph(FilterGraph *fg, InputStream *ist);
int filtergraph_is_simple(FilterGraph *fg);
FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost);
int init_simple_filtergraph(InputStream *ist, OutputStream *ost);
int init_complex_filtergraph(FilterGraph *fg);
int ffmpeg_parse_options(int argc, char **argv);