merge

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

diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 8ea40d1e35e7c41b74437f48b102b5acb4973956..ccd79c899531fafe0ed11afec98f1a84606db216 100644 (file)
--- 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;
     }
 }