diff options
author | S.N. Hemanth Meenakshisundaram <smeenaks@ucsd.edu> | 2010-08-07 00:02:26 +0000 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-07 00:02:26 +0000 |
commit | d54e0948e0fc8c17e9f409b716f982faf0470101 (patch) | |
tree | 1dd675bcd4d23a9c26956a4eee7826afba64d0d0 /libavfilter/defaults.c | |
parent | 59ff3fd536051b005f1cec53ca60e4d0e2cde126 (diff) | |
download | ffmpeg-d54e0948e0fc8c17e9f409b716f982faf0470101.tar.gz |
Move format from AVFilterBuffer to AVFilterPicRef.
Patch by S.N. Hemanth Meenakshisundaram |smeenaks|ucsd|edu|.
Originally committed as revision 24728 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter/defaults.c')
-rw-r--r-- | libavfilter/defaults.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index 47ae1e9c90..8f58cfe069 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -47,17 +47,17 @@ AVFilterPicRef *avfilter_default_get_video_buffer(AVFilterLink *link, int perms, ref->perms = perms | AV_PERM_READ; pic->refcount = 1; - pic->format = link->format; + ref->format = link->format; pic->free = avfilter_default_free_buffer; - av_fill_image_linesizes(pic->linesize, pic->format, ref->w); + av_fill_image_linesizes(pic->linesize, ref->format, ref->w); for (i=0; i<4;i++) pic->linesize[i] = FFALIGN(pic->linesize[i], 16); - tempsize = av_fill_image_pointers(pic->data, pic->format, ref->h, NULL, pic->linesize); + tempsize = av_fill_image_pointers(pic->data, ref->format, ref->h, NULL, pic->linesize); buf = av_malloc(tempsize + 16); // +2 is needed for swscaler, +16 to be // SIMD-friendly - av_fill_image_pointers(pic->data, pic->format, ref->h, buf, pic->linesize); + av_fill_image_pointers(pic->data, ref->format, ref->h, buf, pic->linesize); memcpy(ref->data, pic->data, 4*sizeof(pic->data[0])); memcpy(ref->linesize, pic->linesize, 4*sizeof(pic->linesize[0])); |