* commit '096696ef0dd391d9430376d1444c1a3cde9171fd': avfiltergraph: simplify inserting conversion filters. Clarify output of av_get_bits_per_pixel
Unified · Split
| @@ -406,13 +406,9 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) · 405 unmodified lines | ||
| 406 | 406 | |
| 407 | 407 | snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d", |
| 408 | 408 | 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 | + | |
| 414 | 410 | if ((ret = avfilter_graph_create_filter(&convert, filter, |
| 415 | − inst_name, scale_args, NULL, | |
| 411 | + inst_name, graph->scale_sws_opts, NULL, | |
| 416 | 412 | graph)) < 0) |
| 417 | 413 | return ret; |
| 418 | 414 | break; |
| @@ -180,7 +180,8 @@ char *av_get_pix_fmt_string (char *buf, int buf_size, enum AVPixelFormat pix_fmt · 179 unmodified lines | ||
| 180 | 180 | |
| 181 | 181 | /** |
| 182 | 182 | * Return the number of bits per pixel used by the pixel format |
| 183 | − * described by pixdesc. | |
| 183 | + * described by pixdesc. Note that this is not the same as the number | |
| 184 | + * of bits per sample. | |
| 184 | 185 | * |
| 185 | 186 | * The returned number of bits refers to the number of bits actually |
| 186 | 187 | * used for storing the pixel information, that is padding bits are |