[SCM] libav/experimental: another >> vs >

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 960e48f8f061f4a947fceb2ba52dd84a84fb271d
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Jan 31 10:48:08 2007 +0000

    another >> vs >
    
    Originally committed as revision 7779 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/lzo.c b/libavcodec/lzo.c
index d4c19aa..340b552 100644
--- a/libavcodec/lzo.c
+++ b/libavcodec/lzo.c
@@ -213,7 +213,7 @@ int lzo1x_decode(void *out, int *outlen, void *in, int *inlen) {
                     c.error |= LZO_INPUT_DEPLETED;
                     continue;
                 }
-                if (x >> 4)
+                if (x > 15)
                     continue;
                 cnt = 1;
                 back = (1 << 11) + (GETB(c) << 2) + (x >> 2) + 1;

-- 
Libav/FFmpeg packaging