From fc2db52e2f429432226d4c2d0a675fc6b4f0639d Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Fri, 30 Jul 2010 08:42:08 +0000 Subject: [PATCH] Make avpicture_fill() directly call av_fill_image_linesizes() and av_fill_image_pointers() rather than their wrappers ff_fill_linesize() and ff_fill_pointer(). Improve performance. Originally committed as revision 24587 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/imgconvert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 70e6c0b4ff..d0fc1ce6d7 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -509,10 +509,10 @@ int avpicture_fill(AVPicture *picture, uint8_t *ptr, if(avcodec_check_dimensions(NULL, width, height)) return -1; - if (ff_fill_linesize(picture, pix_fmt, width)) + if (av_fill_image_linesizes(picture->linesize, pix_fmt, width)) return -1; - return ff_fill_pointer(picture, ptr, pix_fmt, height); + return av_fill_image_pointers(picture->data, pix_fmt, height, ptr, picture->linesize); } int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height,