diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-12-13 12:56:29 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-12-13 12:56:29 +0000 |
| commit | db95d3bf5038a19ecc91f3b11529b9b30260d118 (patch) | |
| tree | f2b483934d7e789c1700efe5464faa34a45c9051 | |
| parent | b77aba0a8c359c542e1a046c8d74697852374a6e (diff) | |
| download | ffmpeg-db95d3bf5038a19ecc91f3b11529b9b30260d118.tar.gz | |
Add img_convert() to imgconvert.h and #include it from imgresample.c.
This fixes an implicit declaration of img_convert() warning.
taken from a patchset from Anders Grönberg, galileo.m2 gmail com
Originally committed as revision 16097 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/imgconvert.h | 3 | ||||
| -rw-r--r-- | libavcodec/imgresample.c | 1 |
2 files changed, 4 insertions, 0 deletions
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 |