From: ddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Thu, 18 Dec 2008 06:03:13 +0000 (+0000)
Subject: avformat/Makefile, avformat/factory.c, avformat/filter_avdeinterlace.c:
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=8476c63313913b6c7e05f8b505dd4e7bbf2e186a;p=melted

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

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1268 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 42180f7..a2ff738 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -7,11 +7,8 @@ OBJS = factory.o \
 	   producer_avformat.o \
 	   consumer_avformat.o \
 	   filter_avcolour_space.o \
-	   filter_avresample.o
-
-ifdef MMX_FLAGS
-	OBJS += filter_avdeinterlace.o
-endif
+	   filter_avresample.o \
+	   filter_avdeinterlace.o
 
 CFLAGS+=-I../..
 
diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
index 2b6d234..96af91b 100644
--- a/src/modules/avformat/factory.c
+++ b/src/modules/avformat/factory.c
@@ -105,10 +105,8 @@ static void *create_service( mlt_profile profile, mlt_service_type type, const c
 	}
 	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;
diff --git a/src/modules/avformat/filter_avdeinterlace.c b/src/modules/avformat/filter_avdeinterlace.c
index 25b5135..6c2a6ff 100644
--- a/src/modules/avformat/filter_avdeinterlace.c
+++ b/src/modules/avformat/filter_avdeinterlace.c
@@ -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 @@ static inline void deinterlace_line(uint8_t *dst,
 			     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 @@ static inline void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3, ui
                              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--) {