diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-10-07 18:50:00 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-10-07 18:50:00 +0000 |
| commit | 46c40e4835cb91523c64806a1eef569029f3b85c (patch) | |
| tree | 0f6bc35fd160d9fc63e299958e210d597381eae5 /libavfilter | |
| parent | 9797ce58b7967b94cf70028e4a8159d654084695 (diff) | |
| download | ffmpeg-46c40e4835cb91523c64806a1eef569029f3b85c.tar.gz | |
Add w and h fields to AVFilterPic.
See the thread:
"[FFmpeg-devel] [PATCH] Add w,h fields to AVFilterPic".
Originally committed as revision 20189 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.h | 4 | ||||
| -rw-r--r-- | libavfilter/defaults.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index a41ece4ea9..9c282e278c 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -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; /** diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index 7c20a08f35..dabb1d5bf0 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 = 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; |