diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-01-11 23:53:17 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-11 23:53:17 +0000 |
| commit | 36dc00de529fb4cd182e02f927597eef9514b886 (patch) | |
| tree | 89c44d490147bdf5cd0fd1695a5ccf7293884806 /libavfilter/avfilter.c | |
| parent | 4618637aca3b771b0bfb8fe15f3a080dacf9f0c0 (diff) | |
| download | ffmpeg-36dc00de529fb4cd182e02f927597eef9514b886.tar.gz | |
Add w,h,format back into AVFilterBuffer, these are required for direct rendering.
These fields are needed to be able to know which area of memory is allocated and
which is off limits.
This reverts 24291 and parts of r24424.
Originally committed as revision 26314 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 104a3b4956..ebb2165184 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -283,15 +283,15 @@ avfilter_get_video_buffer_ref_from_arrays(uint8_t *data[4], int linesize[4], int if (!(picref->video = av_mallocz(sizeof(AVFilterBufferRefVideoProps)))) goto fail; - picref->video->w = w; - picref->video->h = h; + pic->w = picref->video->w = w; + pic->h = picref->video->h = h; /* make sure the buffer gets read permission or it's useless for output */ picref->perms = perms | AV_PERM_READ; pic->refcount = 1; picref->type = AVMEDIA_TYPE_VIDEO; - picref->format = format; + pic->format = picref->format = format; memcpy(pic->data, data, sizeof(pic->data)); memcpy(pic->linesize, linesize, sizeof(pic->linesize)); |