[Mlt-devel] SF.net SVN: mlt:[1268] trunk/mlt/src/modules/avformat

[<dde...@us...>]

Revision: 1268
          http://mlt.svn.sourceforge.net/mlt/?rev=1268&view=rev
Author:   ddennedy
Date:     2008-12-18 06:03:13 +0000 (Thu, 18 Dec 2008)

Log Message:
-----------
avformat/Makefile, avformat/factory.c, avformat/filter_avdeinterlace.c: 
Fix and enable the avdeinterlace filter for a non-MMX configuration.

Modified Paths:
--------------
    trunk/mlt/src/modules/avformat/Makefile
    trunk/mlt/src/modules/avformat/factory.c
    trunk/mlt/src/modules/avformat/filter_avdeinterlace.c

Modified: trunk/mlt/src/modules/avformat/Makefile
===================================================================
--- trunk/mlt/src/modules/avformat/Makefile	2008-12-18 04:42:53 UTC (rev 1267)
+++ trunk/mlt/src/modules/avformat/Makefile	2008-12-18 06:03:13 UTC (rev 1268)
@@ -7,12 +7,9 @@
 	   producer_avformat.o \
 	   consumer_avformat.o \
 	   filter_avcolour_space.o \
-	   filter_avresample.o
+	   filter_avresample.o \
+	   filter_avdeinterlace.o
 
-ifdef MMX_FLAGS
-	OBJS += filter_avdeinterlace.o
-endif
-
 CFLAGS+=-I../..
 
 LDFLAGS+=-L../../framework

Modified: trunk/mlt/src/modules/avformat/factory.c
===================================================================
--- trunk/mlt/src/modules/avformat/factory.c	2008-12-18 04:42:53 UTC (rev 1267)
+++ trunk/mlt/src/modules/avformat/factory.c	2008-12-18 06:03:13 UTC (rev 1268)
@@ -105,10 +105,8 @@
 	}
 	if ( !strcmp( id, "avcolour_space" ) )
 		return filter_avcolour_space_init( arg );
-#ifdef USE_MMX
 	if ( !strcmp( id, "avdeinterlace" ) )
 		return filter_avdeinterlace_init( arg );
-#endif
 	if ( !strcmp( id, "avresample" ) )
 		return filter_avresample_init( arg );
 	return NULL;

Modified: trunk/mlt/src/modules/avformat/filter_avdeinterlace.c
===================================================================
--- trunk/mlt/src/modules/avformat/filter_avdeinterlace.c	2008-12-18 04:42:53 UTC (rev 1267)
+++ trunk/mlt/src/modules/avformat/filter_avdeinterlace.c	2008-12-18 06:03:13 UTC (rev 1268)
@@ -29,6 +29,9 @@
 
 #ifdef USE_MMX
 #include "mmx.h"
+#else
+#define MAX_NEG_CROP 1024
+extern uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP];
 #endif
 
 #ifdef USE_MMX
@@ -86,7 +89,7 @@
 			     int size)
 {
 #ifndef USE_MMX
-    uint8_t *cm = cropTbl + MAX_NEG_CROP;
+    uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
     int sum;
 
     for(;size > 0;size--) {
@@ -129,7 +132,7 @@
                              int size)
 {
 #ifndef USE_MMX
-    uint8_t *cm = cropTbl + MAX_NEG_CROP;
+    uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
     int sum;
 
     for(;size > 0;size--) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.