# HG changeset patch
# User michaelni
# Date 1058379134 0
# Node ID 80067f8d6770824d4f7a299b3558292f31af25ef
# Parent  d58fa7cc6008d040212c3a558685426511d6d8d3
fix edge repeating bug for %16!=0 files, this fixes Quicktime mpeg4 (they arent buggy)
note, encoding wasnt affected by that

diff -r d58fa7cc6008 -r 80067f8d6770 h263.c
--- a/h263.c	Wed Jul 16 11:48:59 2003 +0000
+++ b/h263.c	Wed Jul 16 18:12:14 2003 +0000
@@ -1900,8 +1900,6 @@
 
      s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; //FIXME add short header support 
      s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table;
-     s->h_edge_pos= s->width;
-     s->v_edge_pos= s->height;
 }
 
 #endif //CONFIG_ENCODERS
@@ -4955,7 +4953,7 @@
      s->y_dc_scale_table= ff_mpeg4_y_dc_scale_table; //FIXME add short header support 
      s->c_dc_scale_table= ff_mpeg4_c_dc_scale_table;
 
-     if(!(s->workaround_bugs&FF_BUG_EDGE)){
+     if(s->workaround_bugs&FF_BUG_EDGE){
          s->h_edge_pos= s->width;
          s->v_edge_pos= s->height;
      }
diff -r d58fa7cc6008 -r 80067f8d6770 h263dec.c
--- a/h263dec.c	Wed Jul 16 11:48:59 2003 +0000
+++ b/h263dec.c	Wed Jul 16 18:12:14 2003 +0000
@@ -512,13 +512,17 @@
         if(s->lavc_build && s->lavc_build<4655)
             s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE;
 
+        if(s->lavc_build && s->lavc_build<4618){
+            s->workaround_bugs|= FF_BUG_EDGE;
+        }
+
         if(s->divx_version)
             s->workaround_bugs|= FF_BUG_DIRECT_BLOCKSIZE;
 //printf("padding_bug_score: %d\n", s->padding_bug_score);
         if(s->divx_version==501 && s->divx_build==20020416)
             s->padding_bug_score= 256*256*256*64;
 
-        if(s->divx_version>=500){
+        if(s->divx_version && s->divx_version<500){
             s->workaround_bugs|= FF_BUG_EDGE;
         }