[FFmpeg-soc] [soc]: r3929 - dirac/libavcodec/dirac_arith.c
conrad
subversion at mplayerhq.hu
Thu Jan 1 21:32:13 CET 2009
Author: conrad
Date: Thu Jan 1 21:32:12 2009
New Revision: 3929
Log:
Merge updating contexts with the previous if/else
Modified:
dirac/libavcodec/dirac_arith.c
Modified: dirac/libavcodec/dirac_arith.c
==============================================================================
--- dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:10 2009 (r3928)
+++ dirac/libavcodec/dirac_arith.c Thu Jan 1 21:32:12 2009 (r3929)
@@ -187,16 +187,12 @@ int dirac_get_arith_bit(dirac_arith_stat
ret = 1;
arith->low -= range_times_prob << 16;
arith->range -= range_times_prob;
+ arith->contexts[context] -= arith_lookup[arith->contexts[context] >> 8];
} else {
ret = 0;
arith->range = range_times_prob;
- }
-
- /* Update contexts. */
- if (ret)
- arith->contexts[context] -= arith_lookup[arith->contexts[context] >> 8];
- else
arith->contexts[context] += arith_lookup[255 - (arith->contexts[context] >> 8)];
+ }
renorm_arith_decoder(arith);
More information about the FFmpeg-soc
mailing list