diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-08-04 06:53:03 +0300 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-04 06:53:03 +0300 |
| commit | 1b04ea1a6c237a94f81d1b8f8a42fae46fbeacab (patch) | |
| tree | 1219a7d01b489d4701bd06be9459c7725a208378 /ffmpeg_filter.c | |
| parent | 9aa3023672b3336968cbdb5c4a733b6088ad564e (diff) | |
| parent | 73c6ec6d659bab11ac424a4ba6ce3a56246295ee (diff) | |
Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge
* commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee':
avconv: create simple filtergraphs earlier
Merged-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'ffmpeg_filter.c')
| -rw-r--r-- | ffmpeg_filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 0f8319f62b..76030cf995 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -193,7 +193,7 @@ DEF_CHOOSE_FORMAT(int, sample_rate, supported_samplerates, 0, DEF_CHOOSE_FORMAT(uint64_t, channel_layout, channel_layouts, 0, GET_CH_LAYOUT_NAME) -FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost) +int init_simple_filtergraph(InputStream *ist, OutputStream *ost) { FilterGraph *fg = av_mallocz(sizeof(*fg)); @@ -221,7 +221,7 @@ FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost) GROW_ARRAY(filtergraphs, nb_filtergraphs); filtergraphs[nb_filtergraphs - 1] = fg; - return fg; + return 0; } static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) |