[FFmpeg-cvslog] r19314 - in trunk/libavcodec: avcodec.h imgconvert.c

[mru]

Author: mru
Date: Wed Jul  1 12:36:18 2009
New Revision: 19314

Log:
Fix argument type mismatches for av_picture_crop and av_picture_fill

Modified:
   trunk/libavcodec/avcodec.h
   trunk/libavcodec/imgconvert.c

Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h	Wed Jul  1 08:48:27 2009	(r19313)
+++ trunk/libavcodec/avcodec.h	Wed Jul  1 12:36:18 2009	(r19314)
@@ -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);
 

Modified: trunk/libavcodec/imgconvert.c
==============================================================================
--- trunk/libavcodec/imgconvert.c	Wed Jul  1 08:48:27 2009	(r19313)
+++ trunk/libavcodec/imgconvert.c	Wed Jul  1 12:36:18 2009	(r19314)
@@ -1288,7 +1288,7 @@ static inline int is_yuv_planar(const Pi
 }
 
 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;