From 69d45d2ecb9464b65032e31c495ed045c471faf8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 23 Nov 2012 15:33:47 +0100 Subject: [PATCH] avfiltergraph: add aresample_swr_opts Reviewed-by: Paul B Mahol Signed-off-by: Michael Niedermayer --- libavfilter/avfiltergraph.c | 4 +++- libavfilter/avfiltergraph.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index ca290235c5..52af2adbfc 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -37,6 +37,7 @@ static const AVOption options[]={ {"scale_sws_opts" , "default scale filter options" , OFFSET(scale_sws_opts) , AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, 0 }, +{"aresample_swr_opts" , "default aresample filter options" , OFFSET(aresample_swr_opts) , AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, 0 }, {0} }; @@ -66,6 +67,7 @@ void avfilter_graph_free(AVFilterGraph **graph) avfilter_free((*graph)->filters[(*graph)->filter_count - 1]); av_freep(&(*graph)->sink_links); av_freep(&(*graph)->scale_sws_opts); + av_freep(&(*graph)->aresample_swr_opts); av_freep(&(*graph)->filters); av_freep(graph); } @@ -386,7 +388,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) snprintf(inst_name, sizeof(inst_name), "auto-inserted resampler %d", resampler_count++); if ((ret = avfilter_graph_create_filter(&convert, filter, - inst_name, NULL, NULL, graph)) < 0) + inst_name, graph->aresample_swr_opts, NULL, graph)) < 0) return ret; break; default: diff --git a/libavfilter/avfiltergraph.h b/libavfilter/avfiltergraph.h index 0518124582..728bbb5c15 100644 --- a/libavfilter/avfiltergraph.h +++ b/libavfilter/avfiltergraph.h @@ -32,6 +32,8 @@ typedef struct AVFilterGraph { char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters + char *aresample_swr_opts; ///< swr options to use for the auto-inserted aresample filters, Access ONLY through AVOptions + /** * Private fields *