[FFmpeg-cvslog] r20189 - in trunk/libavfilter: avfilter.h defaults.c

[stefano]

Author: stefano
Date: Wed Oct  7 20:50:00 2009
New Revision: 20189

Log:
Add w and h fields to AVFilterPic.

See the thread:
"[FFmpeg-devel] [PATCH] Add w,h fields to AVFilterPic".

Modified:
   trunk/libavfilter/avfilter.h
   trunk/libavfilter/defaults.c

Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h	Wed Oct  7 00:47:33 2009	(r20188)
+++ trunk/libavfilter/avfilter.h	Wed Oct  7 20:50:00 2009	(r20189)
@@ -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;
 
 /**

Modified: trunk/libavfilter/defaults.c
==============================================================================
--- trunk/libavfilter/defaults.c	Wed Oct  7 00:47:33 2009	(r20188)
+++ trunk/libavfilter/defaults.c	Wed Oct  7 20:50:00 2009	(r20189)
@@ -40,8 +40,8 @@ AVFilterPicRef *avfilter_default_get_vid
     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;