[FFmpeg-cvslog] r24586 - in trunk/libavfilter: avfilter.h defaults.c

[stefano]

Author: stefano
Date: Fri Jul 30 02:29:50 2010
New Revision: 24586

Log:
Make avfilter_default_get_video_buffer() use functions in
libavcore/imgutils.c rather than ff_fill_linesize() and
ff_fill_pointer().

Also remove a dependency on libavcodec.

Modified:
   trunk/libavfilter/avfilter.h
   trunk/libavfilter/defaults.c

Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h	Fri Jul 30 02:05:16 2010	(r24585)
+++ trunk/libavfilter/avfilter.h	Fri Jul 30 02:29:50 2010	(r24586)
@@ -26,7 +26,7 @@
 
 #define LIBAVFILTER_VERSION_MAJOR  1
 #define LIBAVFILTER_VERSION_MINOR 26
-#define LIBAVFILTER_VERSION_MICRO  1
+#define LIBAVFILTER_VERSION_MICRO  2
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \

Modified: trunk/libavfilter/defaults.c
==============================================================================
--- trunk/libavfilter/defaults.c	Fri Jul 30 02:05:16 2010	(r24585)
+++ trunk/libavfilter/defaults.c	Fri Jul 30 02:29:50 2010	(r24586)
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/imgconvert.h"
+#include "libavcore/imgutils.h"
 #include "avfilter.h"
 
 /* TODO: buffer pool.  see comment for avfilter_default_get_video_buffer() */
@@ -49,15 +49,15 @@ AVFilterPicRef *avfilter_default_get_vid
     pic->refcount = 1;
     pic->format   = link->format;
     pic->free     = avfilter_default_free_buffer;
-    ff_fill_linesize((AVPicture *)pic, pic->format, ref->w);
+    av_fill_image_linesizes(pic->linesize, pic->format, ref->w);
 
     for (i=0; i<4;i++)
         pic->linesize[i] = FFALIGN(pic->linesize[i], 16);
 
-    tempsize = ff_fill_pointer((AVPicture *)pic, NULL, pic->format, ref->h);
+    tempsize = av_fill_image_pointers(pic->data, pic->format, ref->h, NULL, pic->linesize);
     buf = av_malloc(tempsize + 16); // +2 is needed for swscaler, +16 to be
                                     // SIMD-friendly
-    ff_fill_pointer((AVPicture *)pic, buf, pic->format, ref->h);
+    av_fill_image_pointers(pic->data, pic->format, ref->h, buf, pic->linesize);
 
     memcpy(ref->data,     pic->data,     sizeof(pic->data));
     memcpy(ref->linesize, pic->linesize, sizeof(pic->linesize));