[SCM] libav/experimental: merge

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5e301bbb70a50f16151cb2b6db4b1ede2e5453ac
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Oct 8 12:14:43 2007 +0000

    merge
    
    Originally committed as revision 10685 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 8ea40d1..ccd79c8 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -201,9 +201,8 @@ static void dnxhd_decode_dct_block(DNXHDContext *ctx, DCTELEM *block, int n, int
         if (weigth_matrix[i] != 32) // FIXME 10bit
             level += 32;
         level >>= 6;
-        level = (level^sign) - sign;
         //av_log(NULL, AV_LOG_DEBUG, "i %d, j %d, end level %d\n", i, j, level);
-        block[j] = level;
+        block[j] = (level^sign) - sign;
     }
 }
 

-- 
Libav/FFmpeg packaging