History

Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd'

* commit '096696ef0dd391d9430376d1444c1a3cde9171fd': avfiltergraph: simplify inserting conversion filters. Clarify output of av_get_bits_per_pixel

Michael Niedermayer committed 13 years ago

Commit aa6454e2 parents 85de84c 096696e2 files · +4 −7Browse files

Showing the changes to libavfilter/avfiltergraph.c (1 of 2 files). Show all

Unified · Split

libavfilter/avfiltergraph.c+2−6
@@ -406,13 +406,9 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 405 unmodified lines
406406
407407 snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d",
408408 scaler_count++);
409− av_strlcpy(scale_args, "0:0", sizeof(scale_args));
410− if (graph->scale_sws_opts) {
411− av_strlcat(scale_args, ":", sizeof(scale_args));
412− av_strlcat(scale_args, graph->scale_sws_opts, sizeof(scale_args));
413− }
409+
414410 if ((ret = avfilter_graph_create_filter(&convert, filter,
415− inst_name, scale_args, NULL,
411+ inst_name, graph->scale_sws_opts, NULL,
416412 graph)) < 0)
417413 return ret;
418414 break;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t