fixing illegal 3. esc bug (the mpeg4 std only requires encoders to use...

fixing illegal 3. esc bug (the mpeg4 std only requires encoders to use unescaped symbols but not esc1 or esc2 if they are shorter than esc3, andjust beause its logical to use the shortest possible vlc doesnt mean encoders do that)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1304 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/avcodec.h

@@ -548,12 +548,16 @@ typedef struct AVCodecContext {
     float b_quant_offset;
     
     /**
-     * error resilience {-1,0,1} higher values will detect more errors but may missdetect
+     * error resilience higher values will detect more errors but may missdetect
      * some more or less valid parts as errors
      * encoding: unused
      * decoding: set by user
      */
     int error_resilience;
+#define FF_ER_CAREFULL        1
+#define FF_ER_COMPLIANT       2
+#define FF_ER_AGGRESSIVE      3
+#define FF_ER_VERY_AGGRESSIVE 4
     
     /**
      * called at the beginning of each frame to get a buffer for it.

libavcodec/h263.c

@@ -3624,12 +3624,13 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
 #if 1 
                     {
                         const int abs_level= ABS(level);
-                        if(abs_level<=MAX_LEVEL && run<=MAX_RUN && ((s->workaround_bugs&FF_BUG_AC_VLC)==0)){
+                        if(abs_level<=MAX_LEVEL && run<=MAX_RUN){
                             const int run1= run - rl->max_run[last][abs_level] - 1;
                             if(abs_level <= rl->max_level[last][run]){
                                 fprintf(stderr, "illegal 3. esc, vlc encoding possible\n");
                                 return -1;
                             }
+                            if(s->error_resilience > FF_ER_COMPLIANT){
                                 if(abs_level <= rl->max_level[last][run]*2){
                                     fprintf(stderr, "illegal 3. esc, esc 1 encoding possible\n");
                                     return -1;
@@ -3640,6 +3641,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
                                 }
                             }
                         }
+                    }
 #endif
 		    if (level>0) level= level * qmul + qadd;
                     else         level= level * qmul - qadd;