aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorS.N. Hemanth Meenakshisundaram <smeenaks@ucsd.edu>2010-07-17 18:13:17 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-07-17 18:13:17 +0000
commitb5c582fa9db0a4d360506a05ab66a01394e51c56 (patch)
tree90559ee49ff1f38ff8b71ca5b90e21c73279e7ef
parenteedc4ee5d8644dab5ec5faa764af97996e029fc5 (diff)
downloadffmpeg-b5c582fa9db0a4d360506a05ab66a01394e51c56.tar.gz
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
-rw-r--r--libavfilter/avfilter.h4
-rw-r--r--libavfilter/defaults.c4
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;