[FFmpeg-cvslog] r24787 - in trunk: libavcodec/imgconvert.c libavcodec/imgconvert.h libavfilter/avfilter.c libavfilter/avfilter.h

[stefano]

Author: stefano
Date: Thu Aug 12 17:06:04 2010
New Revision: 24787

Log:
Deprecate ff_get_plane_bytewidth() in favor of
av_get_image_linesize().

Modified:
   trunk/libavcodec/imgconvert.c
   trunk/libavcodec/imgconvert.h
   trunk/libavfilter/avfilter.c
   trunk/libavfilter/avfilter.h

Modified: trunk/libavcodec/imgconvert.c
==============================================================================
--- trunk/libavcodec/imgconvert.c	Thu Aug 12 17:05:58 2010	(r24786)
+++ trunk/libavcodec/imgconvert.c	Thu Aug 12 17:06:04 2010	(r24787)
@@ -794,10 +794,12 @@ void ff_img_copy_plane(uint8_t *dst, int
     }
 }
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
 int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane)
 {
     return av_get_image_linesize(pix_fmt, width, plane);
 }
+#endif
 
 void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4],
                           uint8_t *src_data[4], int src_linesize[4],
@@ -812,7 +814,7 @@ void av_picture_data_copy(uint8_t *dst_d
     case FF_PIXEL_PLANAR:
         for(i = 0; i < pf->nb_channels; i++) {
             int h;
-            int bwidth = ff_get_plane_bytewidth(pix_fmt, width, i);
+            int bwidth = av_get_image_linesize(pix_fmt, width, i);
             h = height;
             if (i == 1 || i == 2) {
                 h= -((-height)>>desc->log2_chroma_h);

Modified: trunk/libavcodec/imgconvert.h
==============================================================================
--- trunk/libavcodec/imgconvert.h	Thu Aug 12 17:05:58 2010	(r24786)
+++ trunk/libavcodec/imgconvert.h	Thu Aug 12 17:06:04 2010	(r24787)
@@ -33,9 +33,10 @@ int ff_fill_linesize(AVPicture *picture,
 
 attribute_deprecated
 int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt, int height);
-#endif
 
+attribute_deprecated
 int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane);
+#endif
 
 int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt);
 

Modified: trunk/libavfilter/avfilter.c
==============================================================================
--- trunk/libavfilter/avfilter.c	Thu Aug 12 17:05:58 2010	(r24786)
+++ trunk/libavfilter/avfilter.c	Thu Aug 12 17:06:04 2010	(r24787)
@@ -21,8 +21,8 @@
 
 /* #define DEBUG */
 
-#include "libavcodec/imgconvert.h"
 #include "libavutil/pixdesc.h"
+#include "libavcore/imgutils.h"
 #include "avfilter.h"
 #include "internal.h"
 
@@ -322,7 +322,7 @@ void avfilter_draw_slice(AVFilterLink *l
 
         for(i = 0; i < 4; i ++) {
             int planew =
-                ff_get_plane_bytewidth(link->format, link->cur_buf->video->w, i);
+                av_get_image_linesize(link->format, link->cur_buf->video->w, i);
 
             if(!src[i]) continue;
 

Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h	Thu Aug 12 17:05:58 2010	(r24786)
+++ trunk/libavfilter/avfilter.h	Thu Aug 12 17:06:04 2010	(r24787)
@@ -26,7 +26,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  1
 #define LIBAVFILTER_VERSION_MINOR 34
-#define LIBAVFILTER_VERSION_MICRO  0
+#define LIBAVFILTER_VERSION_MICRO  1
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \