avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const

[ffmpeg] / libavcodec / vp9.c

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 9048700fb79bf4860290f506b033f1a2c6537045..2a6a138aa1c537cd6d0dc01d48c6065e0bc4582e 100644 (file)
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -1144,8 +1144,17 @@ static int vp9_decode_frame(AVCodecContext *avctx, AVFrame *frame,
     // probability maintenance between frames)
     if (s->refreshctx) {
         if (s->parallelmode) {
-            memcpy(s->prob_ctx[s->framectxid].coef, s->prob.coef,
-                   sizeof(s->prob.coef));
+            int j, k, l, m;
+            for (i = 0; i < 4; i++) {
+                for (j = 0; j < 2; j++)
+                    for (k = 0; k < 2; k++)
+                        for (l = 0; l < 6; l++)
+                            for (m = 0; m < 6; m++)
+                                memcpy(s->prob_ctx[s->framectxid].coef[i][j][k][l][m],
+                                       s->prob.coef[i][j][k][l][m], 3);
+                if (s->txfmmode == i)
+                    break;
+            }
             s->prob_ctx[s->framectxid].p = s->prob.p;
         } else {
             ff_vp9_adapt_probs(s);
@@ -1189,7 +1198,7 @@ static int vp9_decode_packet(AVCodecContext *avctx, void *frame,
             const uint8_t *idx = data + size + 1 - idx_sz;
 
             while (n_frames--) {
-                int sz = AV_RL32(idx);
+                unsigned sz = AV_RL32(idx);
 
                 if (nbytes < 4)
                     sz &= (1 << (8 * nbytes)) - 1;
@@ -1197,7 +1206,7 @@ static int vp9_decode_packet(AVCodecContext *avctx, void *frame,
 
                 if (sz > size) {
                     av_log(avctx, AV_LOG_ERROR,
-                           "Superframe packet size too big: %d > %d\n",
+                           "Superframe packet size too big: %u > %d\n",
                            sz, size);
                     return AVERROR_INVALIDDATA;
                 }