diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:10:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:10:55 +0100 |
| commit | 71cf094e1be086bce4c535b1fe0d96a0449486ae (patch) | |
| tree | c1608e1f7216f00ac1485e6ee6a911ecfbcc0a52 /libavfilter/avfiltergraph.c | |
| parent | f7c4b76c488b4901133addb3f7875ef3ac4ae9c4 (diff) | |
| parent | 9f1223562e134bac6345a465870b9d56ff7d60cf (diff) | |
| download | ffmpeg-71cf094e1be086bce4c535b1fe0d96a0449486ae.tar.gz | |
Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'
* 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>
Diffstat (limited to 'libavfilter/avfiltergraph.c')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index d0b6b1687f..8b18c6f729 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -68,6 +68,7 @@ void avfilter_graph_free(AVFilterGraph **graph) av_freep(&(*graph)->sink_links); av_freep(&(*graph)->scale_sws_opts); av_freep(&(*graph)->aresample_swr_opts); + av_freep(&(*graph)->resample_lavr_opts); av_freep(&(*graph)->filters); av_freep(graph); } @@ -323,8 +324,13 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) snprintf(inst_name, sizeof(inst_name), "auto-inserted resampler %d", resampler_count++); + scale_args[0] = '\0'; + if (graph->aresample_swr_opts) + snprintf(scale_args, sizeof(scale_args), "%s", + graph->aresample_swr_opts); if ((ret = avfilter_graph_create_filter(&convert, filter, - inst_name, graph->aresample_swr_opts, NULL, graph)) < 0) + inst_name, graph->aresample_swr_opts, + NULL, graph)) < 0) return ret; break; default: |