Add w and h fields to AVFilterPic.
authorStefano Sabatini <stefano.sabatini-lala@poste.it>
Wed, 7 Oct 2009 18:50:00 +0000 (18:50 +0000)
committerStefano Sabatini <stefano.sabatini-lala@poste.it>
Wed, 7 Oct 2009 18:50:00 +0000 (18:50 +0000)
See the thread:
"[FFmpeg-devel] [PATCH] Add w,h fields to AVFilterPic".

Originally committed as revision 20189 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavfilter/avfilter.h
libavfilter/defaults.c

index a41ece4..9c282e2 100644 (file)
@@ -24,7 +24,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  0
 #define LIBAVFILTER_VERSION_MINOR  5
-#define LIBAVFILTER_VERSION_MICRO  0
+#define LIBAVFILTER_VERSION_MICRO  1
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
@@ -71,6 +71,8 @@ typedef struct AVFilterPic
      * reallocating it from scratch.
      */
     void (*free)(struct AVFilterPic *pic);
+
+    int w, h;                  ///< width and height of the allocated buffer
 } AVFilterPic;
 
 /**
index 7c20a08..dabb1d5 100644 (file)
@@ -40,8 +40,8 @@ AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms)
     char *buf;
 
     ref->pic   = pic;
-    ref->w     = link->w;
-    ref->h     = link->h;
+    ref->w     = pic->w = link->w;
+    ref->h     = pic->h = link->h;
 
     /* make sure the buffer gets read permission or it's useless for output */
     ref->perms = perms | AV_PERM_READ;