X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Ffilter_avdeinterlace.c;h=6c2a6ff40061dab629c1c5fa40d06c148f3875a6;hb=8476c63313913b6c7e05f8b505dd4e7bbf2e186a;hp=84f9cb929beaaa9702c8ede1f84264831ddb4cba;hpb=833934cc90094c909078f709532e6fe6f8f13b60;p=melted

diff --git a/src/modules/avformat/filter_avdeinterlace.c b/src/modules/avformat/filter_avdeinterlace.c
index 84f9cb9..6c2a6ff 100644
--- a/src/modules/avformat/filter_avdeinterlace.c
+++ b/src/modules/avformat/filter_avdeinterlace.c
@@ -3,23 +3,22 @@
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "filter_avdeinterlace.h"
-
+#include <framework/mlt_filter.h>
 #include <framework/mlt_frame.h>
 
 #include <string.h>
@@ -30,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
@@ -87,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--) {
@@ -130,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--) {
@@ -304,7 +306,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
 	error = mlt_frame_get_image( this, image, format, width, height, writable );
 
 	// Check that we want progressive and we aren't already progressive
-	if ( deinterlace && *format == mlt_image_yuv422 && *image != NULL )
+	if ( deinterlace && *format == mlt_image_yuv422 && *image != NULL && !mlt_properties_get_int( MLT_FRAME_PROPERTIES( this ), "progressive" ) )
 	{
 		// Create a picture
 		AVPicture *output = mlt_pool_alloc( sizeof( AVPicture ) );