[FFmpeg-devel] [PATCH] [H.263] remove disabled code cruft

Michael Niedermayer michaelni
Sun Dec 27 03:59:55 CET 2009


On Sat, Dec 26, 2009 at 06:22:42PM +0100, Diego Biurrun wrote:
> $subject, as attached
[...]
> @@ -4908,28 +4878,6 @@
>                          SKIP_COUNTER(re, &s->gb, 1+12+1);
>                      }
>  
> -#if 0
> -                    if(s->error_recognition >= FF_ER_COMPLIANT){
> -                        const int abs_level= FFABS(level);
> -                        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]){
> -                                av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, vlc encoding possible\n");
> -                                return -1;
> -                            }
> -                            if(s->error_recognition > FF_ER_COMPLIANT){
> -                                if(abs_level <= rl->max_level[last][run]*2){
> -                                    av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 1 encoding possible\n");
> -                                    return -1;
> -                                }
> -                                if(run1 >= 0 && abs_level <= rl->max_level[last][run1]){
> -                                    av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 2 encoding possible\n");
> -                                    return -1;
> -                                }
> -                            }
> -                        }
> -                    }
> -#endif
>                      if (level>0) level= level * qmul + qadd;
>                      else         level= level * qmul - qadd;
>  

id like to keep this hunk, not sure about the other 2

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No great genius has ever existed without some touch of madness. -- Aristotle
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20091227/a9f932c0/attachment.pgp>



More information about the ffmpeg-devel mailing list