Fix argument type mismatches for av_picture_crop and av_picture_fill

Originally committed as revision 19314 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 70b6c62917c93100363d720d1e1a20888114f112..8eb7c3c27c7f492c7b20e3bf36fb0395ad6c41df 100644 (file)
--- 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 3f457fe7578d87028869e77efdf548341ed89ee0..a2db471222db761320155416c2853b00f1c93dc8 100644 (file)
--- 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;