diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:21:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 10:21:16 +0200 |
| commit | aa6454e6ca7bb898e9fb1990bbcc821caf4ad51a (patch) | |
| tree | 3082aeec21d0683891220d99169d81f018f5df41 | |
| parent | 85de84c3e0396be2e51298ca26e405ce629a9fa9 (diff) | |
| parent | 096696ef0dd391d9430376d1444c1a3cde9171fd (diff) | |
| download | ffmpeg-aa6454e6ca7bb898e9fb1990bbcc821caf4ad51a.tar.gz | |
Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd'
* commit '096696ef0dd391d9430376d1444c1a3cde9171fd':
avfiltergraph: simplify inserting conversion filters.
Clarify output of av_get_bits_per_pixel
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/avfiltergraph.c | 8 | ||||
| -rw-r--r-- | libavutil/pixdesc.h | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 959fbf7fa3..7ae8a37ed6 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -406,13 +406,9 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d", scaler_count++); - av_strlcpy(scale_args, "0:0", sizeof(scale_args)); - if (graph->scale_sws_opts) { - av_strlcat(scale_args, ":", sizeof(scale_args)); - av_strlcat(scale_args, graph->scale_sws_opts, sizeof(scale_args)); - } + if ((ret = avfilter_graph_create_filter(&convert, filter, - inst_name, scale_args, NULL, + inst_name, graph->scale_sws_opts, NULL, graph)) < 0) return ret; break; diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index f411558b44..97807231c2 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -180,7 +180,8 @@ char *av_get_pix_fmt_string (char *buf, int buf_size, enum AVPixelFormat pix_fmt /** * Return the number of bits per pixel used by the pixel format - * described by pixdesc. + * described by pixdesc. Note that this is not the same as the number + * of bits per sample. * * The returned number of bits refers to the number of bits actually * used for storing the pixel information, that is padding bits are |