[SCM] libav/experimental: Remove dead code in theora_decode_tables Reading 7 bits as an unsigned int can't result in a value exceeding 127. Accordingly, remove error message (as it'll never be reached).

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:18:09 UTC 2013


The following commit has been merged in the experimental branch:
commit 9d777508fa3b02aafdf365ee5398d2a0f4bf30ed
Author: Jason Garrett-Glaser <darkshikari at gmail.com>
Date:   Tue Oct 26 07:37:51 2010 +0000

    Remove dead code in theora_decode_tables
    Reading 7 bits as an unsigned int can't result in a value exceeding 127.
    Accordingly, remove error message (as it'll never be reached).
    
    Originally committed as revision 25575 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 36cfea2..3883512 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -2052,15 +2052,9 @@ static int theora_decode_tables(AVCodecContext *avctx, GetBitContext *gb)
     if (s->theora >= 0x030200) {
         n = get_bits(gb, 3);
         /* loop filter limit values table */
-        if (n) {
-            for (i = 0; i < 64; i++) {
+        if (n)
+            for (i = 0; i < 64; i++)
                 s->filter_limit_values[i] = get_bits(gb, n);
-                if (s->filter_limit_values[i] > 127) {
-                    av_log(avctx, AV_LOG_ERROR, "filter limit value too large (%i > 127), clamping\n", s->filter_limit_values[i]);
-                    s->filter_limit_values[i] = 127;
-                }
-            }
-        }
     }
 
     if (s->theora >= 0x030200)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list