From ede75ebc9b9c1a06406e7ae5cf4d38967c033c00 Mon Sep 17 00:00:00 2001 From: Kieran Kunhya Date: Tue, 14 May 2013 14:23:40 -0500 Subject: [PATCH 1/2] Clarify output of av_get_bits_per_pixel Signed-off-by: Anton Khirnov --- libavutil/pixdesc.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index 312e89ac04..1d73e5db51 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -177,7 +177,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 From 096696ef0dd391d9430376d1444c1a3cde9171fd Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 14 May 2013 08:16:37 +0200 Subject: [PATCH 2/2] avfiltergraph: simplify inserting conversion filters. There is now no need to explicitly pass 0:0 as width/height to scale, those are the defaults. --- libavfilter/avfiltergraph.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 7c88ecd908..913102642a 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -273,13 +273,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;