From db95d3bf5038a19ecc91f3b11529b9b30260d118 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 13 Dec 2008 12:56:29 +0000 Subject: [PATCH] =?UTF-8?q?Add=20img=5Fconvert()=20to=20imgconvert.h=20and?= =?UTF-8?q?=20#include=20it=20from=20imgresample.c.=20This=20fixes=20an=20?= =?UTF-8?q?implicit=20declaration=20of=20img=5Fconvert()=20warning.=20take?= =?UTF-8?q?n=20from=20a=20patchset=20from=20Anders=20Gr=C3=B6nberg,=20gali?= =?UTF-8?q?leo.m2=20gmail=20com?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Originally committed as revision 16097 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/imgconvert.h | 3 +++ libavcodec/imgresample.c | 1 + 2 files changed, 4 insertions(+) diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h index bfaa03ea16..83bce68f56 100644 --- a/libavcodec/imgconvert.h +++ b/libavcodec/imgconvert.h @@ -33,4 +33,7 @@ int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, int pix_fmt, int height); int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane); +int img_convert(AVPicture *dst, int dst_pix_fmt, const AVPicture *src, + int src_pix_fmt, int src_width, int src_height); + #endif /* AVCODEC_IMGCONVERT_H */ diff --git a/libavcodec/imgresample.c b/libavcodec/imgresample.c index 3c70c2a1cb..34c68899f0 100644 --- a/libavcodec/imgresample.c +++ b/libavcodec/imgresample.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "dsputil.h" +#include "imgconvert.h" #include "libswscale/swscale.h" #ifdef HAVE_ALTIVEC