From 9abba21ad3474ff5c49dd5cf17facc8330386a95 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Wed, 21 Oct 2009 20:43:43 +0000 Subject: [PATCH] Cosmetics: prefer "pix_fmts" over "pix_fmt" for the name of the argument of avfilter_make_format_list(), as the argument represents a list of elements. Originally committed as revision 20341 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/avfilter.h | 2 +- libavfilter/formats.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 2ebbc1fd2f..fe06f806d9 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -176,7 +176,7 @@ struct AVFilterFormats * @param pix_fmt list of pixel formats, terminated by PIX_FMT_NONE * @return the format list, with no existing references */ -AVFilterFormats *avfilter_make_format_list(const enum PixelFormat *pix_fmt); +AVFilterFormats *avfilter_make_format_list(const enum PixelFormat *pix_fmts); /** * Returns a list of all colorspaces supported by FFmpeg. diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 1e9afc7dd9..8747bb6fff 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -69,18 +69,18 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b) return ret; } -AVFilterFormats *avfilter_make_format_list(const enum PixelFormat *pix_fmt) +AVFilterFormats *avfilter_make_format_list(const enum PixelFormat *pix_fmts) { AVFilterFormats *formats; int count; - for (count = 0; pix_fmt[count] != PIX_FMT_NONE; count++) + for (count = 0; pix_fmts[count] != PIX_FMT_NONE; count++) ; formats = av_mallocz(sizeof(AVFilterFormats)); formats->formats = av_malloc(sizeof(*formats->formats) * count); formats->format_count = count; - memcpy(formats->formats, pix_fmt, sizeof(*formats->formats) * count); + memcpy(formats->formats, pix_fmts, sizeof(*formats->formats) * count); return formats; }