diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 20:53:03 -0700 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 20:53:03 -0700 |
| commit | 1b04ea1a6c237a94f81d1b8f8a42fae46fbeacab (patch) | |
| tree | 1219a7d01b489d4701bd06be9459c7725a208378 /ffmpeg.h | |
| parent | 9aa3023672b3336968cbdb5c4a733b6088ad564e (diff) | |
| parent | 73c6ec6d659bab11ac424a4ba6ce3a56246295ee (diff) | |
| download | ffmpeg-1b04ea1a6c237a94f81d1b8f8a42fae46fbeacab.tar.gz | |
Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge
* commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee':
avconv: create simple filtergraphs earlier
Merged-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'ffmpeg.h')
| -rw-r--r-- | ffmpeg.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); |