[SCM] libav/experimental: My commit in r11942 broke compilation. This fixes it.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:14:13 UTC 2013
The following commit has been merged in the experimental branch:
commit fba95d3c233260a6e2cc6db1f82fd2118545f79b
Author: Vitor Sessak <vitor1001 at gmail.com>
Date: Fri Feb 15 19:47:14 2008 +0000
My commit in r11942 broke compilation.
This fixes it.
Originally committed as revision 11959 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 04bcc27..a6a5d6f 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -608,10 +608,10 @@ int avpicture_fill(AVPicture *picture, uint8_t *ptr,
if(avcodec_check_dimensions(NULL, width, height))
return -1;
- if (avpicture_fill_linesize(picture, pix_fmt, width))
+ if (ff_fill_linesize(picture, pix_fmt, width))
return -1;
- return avpicture_fill_pointer(picture, ptr, pix_fmt, height);
+ return ff_fill_pointer(picture, ptr, pix_fmt, height);
}
int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height,
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list