Commit 69d45d2e authored by Michael Niedermayer's avatar Michael Niedermayer

avfiltergraph: add aresample_swr_opts

Reviewed-by: 's avatarPaul B Mahol <onemda@gmail.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 26240274
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
static const AVOption options[]={ static const AVOption options[]={
{"scale_sws_opts" , "default scale filter options" , OFFSET(scale_sws_opts) , AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, 0 }, {"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} {0}
}; };
...@@ -66,6 +67,7 @@ void avfilter_graph_free(AVFilterGraph **graph) ...@@ -66,6 +67,7 @@ void avfilter_graph_free(AVFilterGraph **graph)
avfilter_free((*graph)->filters[(*graph)->filter_count - 1]); avfilter_free((*graph)->filters[(*graph)->filter_count - 1]);
av_freep(&(*graph)->sink_links); av_freep(&(*graph)->sink_links);
av_freep(&(*graph)->scale_sws_opts); av_freep(&(*graph)->scale_sws_opts);
av_freep(&(*graph)->aresample_swr_opts);
av_freep(&(*graph)->filters); av_freep(&(*graph)->filters);
av_freep(graph); av_freep(graph);
} }
...@@ -386,7 +388,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) ...@@ -386,7 +388,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
snprintf(inst_name, sizeof(inst_name), "auto-inserted resampler %d", snprintf(inst_name, sizeof(inst_name), "auto-inserted resampler %d",
resampler_count++); resampler_count++);
if ((ret = avfilter_graph_create_filter(&convert, filter, 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; return ret;
break; break;
default: default:
......
...@@ -32,6 +32,8 @@ typedef struct AVFilterGraph { ...@@ -32,6 +32,8 @@ typedef struct AVFilterGraph {
char *scale_sws_opts; ///< sws options to use for the auto-inserted scale filters 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 * Private fields
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment