From 4a30fff60db14e0ee43d103898901b72e3fd3ee6 Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Wed, 1 Jul 2009 10:36:18 +0000 Subject: Fix argument type mismatches for av_picture_crop and av_picture_fill Originally committed as revision 19314 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/avcodec.h | 2 +- libavcodec/imgconvert.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 70b6c62917..8eb7c3c27c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2902,7 +2902,7 @@ void avpicture_free(AVPicture *picture); * @return size of the image data in bytes */ int avpicture_fill(AVPicture *picture, uint8_t *ptr, - int pix_fmt, int width, int height); + enum PixelFormat pix_fmt, int width, int height); int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height, unsigned char *dest, int dest_size); diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 3f457fe757..a2db471222 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -1288,7 +1288,7 @@ static inline int is_yuv_planar(const PixFmtInfo *ps) } int av_picture_crop(AVPicture *dst, const AVPicture *src, - int pix_fmt, int top_band, int left_band) + enum PixelFormat pix_fmt, int top_band, int left_band) { int y_shift; int x_shift; -- cgit v1.2.3