From b5c582fa9db0a4d360506a05ab66a01394e51c56 Mon Sep 17 00:00:00 2001 From: "S.N. Hemanth Meenakshisundaram" Date: Sat, 17 Jul 2010 18:13:17 +0000 Subject: [PATCH] Remove AVFilterBuffer w and h fields. These fields are never used, and they do not seem to belong to AVFilterBuffer anymore, now that it is now a media-independent structure and these fields are video-related. Patch by S.N. Hemanth Meenakshisundaram smeenaks ! ucsd ! edu. Originally committed as revision 24291 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavfilter/avfilter.h | 4 +--- libavfilter/defaults.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 44842e4ce5..75b872616a 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -25,7 +25,7 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 1 -#define LIBAVFILTER_VERSION_MINOR 24 +#define LIBAVFILTER_VERSION_MINOR 25 #define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ @@ -84,8 +84,6 @@ typedef struct AVFilterBuffer * reallocating it from scratch. */ void (*free)(struct AVFilterBuffer *pic); - - int w, h; ///< width and height of the allocated buffer } AVFilterBuffer; /** diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index e4218a818b..ed1db94b69 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -40,8 +40,8 @@ AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms, char *buf; ref->pic = pic; - ref->w = pic->w = w; - ref->h = pic->h = h; + ref->w = w; + ref->h = h; /* make sure the buffer gets read permission or it's useless for output */ ref->perms = perms | AV_PERM_READ;