X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fdirac_arith.c;h=69b62802302fd2d61f29e2cd4ff70f5260cc68f6;hb=1c7f252783aec37e4ff8049476386f63afe91756;hp=7eb9bd60b2f1796c46cb04b6b79a9b8645e0e8ad;hpb=f4cf6ba8c9646814af842a99335c6ee312ded299;p=ffmpeg

diff --git a/libavcodec/dirac_arith.c b/libavcodec/dirac_arith.c
index 7eb9bd60b2f..69b62802302 100644
--- a/libavcodec/dirac_arith.c
+++ b/libavcodec/dirac_arith.c
@@ -28,7 +28,7 @@
 #include "dirac_arith.h"
 
 
-const uint16_t ff_dirac_prob[256] = {
+static const uint16_t dirac_prob[256] = {
     0,    2,    5,    8,    11,   15,   20,   24,
     29,   35,   41,   47,   53,   60,   67,   74,
     82,   89,   97,   106,  114,  123,  132,  141,
@@ -88,8 +88,8 @@ av_cold void ff_dirac_init_arith_tables(void)
     int i;
 
     for (i = 0; i < 256; i++) {
-        ff_dirac_prob_branchless[i][0] =  ff_dirac_prob[255-i];
-        ff_dirac_prob_branchless[i][1] = -ff_dirac_prob[i];
+        ff_dirac_prob_branchless[i][0] =  dirac_prob[255-i];
+        ff_dirac_prob_branchless[i][1] = -dirac_prob[i];
     }
 }
 
@@ -115,6 +115,8 @@ void ff_dirac_init_arith_decoder(DiracArith *c, GetBitContext *gb, int length)
 
     c->counter = -16;
     c->range   = 0xffff;
+    c->error   = 0;
+    c->overread= 0;
 
     for (i = 0; i < DIRAC_CTX_COUNT; i++)
         c->contexts[i] = 0x8000;