profiles/*_15: add some 15fps profiles

[melted] / src / modules / avformat / filter_avdeinterlace.c

diff --git a/src/modules/avformat/filter_avdeinterlace.c b/src/modules/avformat/filter_avdeinterlace.c
index d5c04be..8dd5636 100644 (file)
--- a/src/modules/avformat/filter_avdeinterlace.c
+++ b/src/modules/avformat/filter_avdeinterlace.c
@@ -18,8 +18,7 @@
  * 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--) {
@@ -274,11 +276,11 @@ static int mlt_avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
        else {
       if (src == dst) {
           deinterlace_bottom_field_inplace(dst->data[0], dst->linesize[0],
-                               width, height);
+                               width<<1, height);
       } else {
           deinterlace_bottom_field(dst->data[0],dst->linesize[0],
                                       src->data[0], src->linesize[0],
-                                      width, height);
+                                      width<<1, height);
       }
        }