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
Unified · Split
| @@ -25,7 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include "libavutil/avutil.h" | 25 | #include "libavutil/avutil.h" |
| 26 | 26 | ||
| 27 | #define LIBAVFILTER_VERSION_MAJOR 1 | 27 | #define LIBAVFILTER_VERSION_MAJOR 1 |
| 28 | #define LIBAVFILTER_VERSION_MINOR 24 | 28 | #define LIBAVFILTER_VERSION_MINOR 25 |
| 29 | #define LIBAVFILTER_VERSION_MICRO 0 | 29 | #define LIBAVFILTER_VERSION_MICRO 0 |
| 30 | 30 | ||
| 31 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | 31 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |
| @@ -84,8 +84,6 @@ typedef struct AVFilterBuffer · 52 unmodified lines | |||
| 84 | * reallocating it from scratch. | 84 | * reallocating it from scratch. |
| 85 | */ | 85 | */ |
| 86 | void (*free)(struct AVFilterBuffer *pic); | 86 | void (*free)(struct AVFilterBuffer *pic); |
| 87 | |||
| 88 | int w, h; ///< width and height of the allocated buffer | ||
| 89 | } AVFilterBuffer; | 87 | } AVFilterBuffer; |
| 90 | 88 | ||
| 91 | /** | 89 | /** |
| @@ -40,8 +40,8 @@ AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms, · 39 unmodified lines | |||
| 40 | char *buf; | 40 | char *buf; |
| 41 | 41 | ||
| 42 | ref->pic = pic; | 42 | ref->pic = pic; |
| 43 | ref->w = pic->w = w; | 43 | ref->w = w; |
| 44 | ref->h = pic->h = h; | 44 | ref->h = h; |
| 45 | 45 | ||
| 46 | /* make sure the buffer gets read permission or it's useless for output */ | 46 | /* make sure the buffer gets read permission or it's useless for output */ |
| 47 | ref->perms = perms | AV_PERM_READ; | 47 | ref->perms = perms | AV_PERM_READ; |