From 2690126ad163025e8813b57cc6bbf74c278d515a Mon Sep 17 00:00:00 2001 From: stefano Date: Sun, 18 Oct 2009 23:35:54 +0000 Subject: [PATCH] Remove avfilter_make_format_list(), it has been replaced by avfilter_make_format_list2(). git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20301 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- libavfilter/avfilter.h | 11 +---------- libavfilter/formats.c | 18 ------------------ 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 0694275f9..2aac3e086 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -23,7 +23,7 @@ #define AVFILTER_AVFILTER_H #define LIBAVFILTER_VERSION_MAJOR 1 -#define LIBAVFILTER_VERSION_MINOR 1 +#define LIBAVFILTER_VERSION_MINOR 2 #define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ @@ -171,15 +171,6 @@ struct AVFilterFormats }; /** - * Helper function to create a list of supported formats. This is intended - * for use in AVFilter->query_formats(). - * @param len the number of formats supported - * @param ... a list of the supported formats - * @return the format list, with no existing references - */ -AVFilterFormats *avfilter_make_format_list(int len, ...); - -/** * Creates a list of supported formats. This is intended for use in * AVFilter->query_formats(). * @param pix_fmt list of pixel formats, terminated by PIX_FMT_NONE diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 3a44cfd53..b1763d9ac 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -69,24 +69,6 @@ AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b) return ret; } -AVFilterFormats *avfilter_make_format_list(int len, ...) -{ - AVFilterFormats *ret; - int i; - va_list vl; - - ret = av_mallocz(sizeof(AVFilterFormats)); - ret->formats = av_malloc(sizeof(*ret->formats) * len); - ret->format_count = len; - - va_start(vl, len); - for(i = 0; i < len; i ++) - ret->formats[i] = va_arg(vl, int); - va_end(vl); - - return ret; -} - AVFilterFormats *avfilter_make_format_list2(enum PixelFormat *pix_fmt) { AVFilterFormats *formats; -- 2.11.4.GIT