X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavcodec%2Fdirac_arith.c;h=69b62802302fd2d61f29e2cd4ff70f5260cc68f6;hb=d92f38c179591a608390ffa9fee59c309142e79d;hp=1e6b964772f74de1095d2ebe79440809b22d05c0;hpb=6ed3d0e01c20aba7ef3984c0b8965d26e9f4990c;p=ffmpeg

diff --git a/libavcodec/dirac_arith.c b/libavcodec/dirac_arith.c
index 1e6b964772f..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];
     }
 }
 
@@ -116,6 +116,7 @@ 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;