* commit '9f1223562e134bac6345a465870b9d56ff7d60cf': lavfi: connect libavresample options to af_resample via AVFilterGraph Conflicts: doc/APIchanges libavfilter/avfiltergraph.c libavfilter/avfiltergraph.h libavfilter/version.h
Showing the changes to libavfilter/avfiltergraph.c (1 of 5 files). Show all
Unified · Split
| @@ -68,6 +68,7 @@ void avfilter_graph_free(AVFilterGraph **graph) · 67 unmodified lines | |||
| 68 | av_freep(&(*graph)->sink_links); | 68 | av_freep(&(*graph)->sink_links); |
| 69 | av_freep(&(*graph)->scale_sws_opts); | 69 | av_freep(&(*graph)->scale_sws_opts); |
| 70 | av_freep(&(*graph)->aresample_swr_opts); | 70 | av_freep(&(*graph)->aresample_swr_opts); |
| 71 | av_freep(&(*graph)->resample_lavr_opts); | ||
| 71 | av_freep(&(*graph)->filters); | 72 | av_freep(&(*graph)->filters); |
| 72 | av_freep(graph); | 73 | av_freep(graph); |
| 73 | } | 74 | } |
| @@ -323,8 +324,13 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 249 unmodified lines | |||
| 323 | 324 | ||
| 324 | snprintf(inst_name, sizeof(inst_name), "auto-inserted resampler %d", | 325 | snprintf(inst_name, sizeof(inst_name), "auto-inserted resampler %d", |
| 325 | resampler_count++); | 326 | resampler_count++); |
| 327 | scale_args[0] = '\0'; | ||
| 328 | if (graph->aresample_swr_opts) | ||
| 329 | snprintf(scale_args, sizeof(scale_args), "%s", | ||
| 330 | graph->aresample_swr_opts); | ||
| 326 | if ((ret = avfilter_graph_create_filter(&convert, filter, | 331 | if ((ret = avfilter_graph_create_filter(&convert, filter, |
| 327 | inst_name, graph->aresample_swr_opts, NULL, graph)) < 0) | 332 | inst_name, graph->aresample_swr_opts, |
| 333 | NULL, graph)) < 0) | ||
| 328 | return ret; | 334 | return ret; |
| 329 | break; | 335 | break; |
| 330 | default: | 336 | default: |