check qblur > 1 (prevent assert failure / segfault)

[ffmpeg] / libavcodec / vp6data.h

diff --git a/libavcodec/vp6data.h b/libavcodec/vp6data.h
index 3ebe4f2738d0f798af7a08f82cac4e23d27ec31e..0545a9d667cc5388920e03a9d9f80228dfd20400 100644 (file)
--- a/libavcodec/vp6data.h
+++ b/libavcodec/vp6data.h
@@ -24,7 +24,6 @@
 #ifndef VP6DATA_H
 #define VP6DATA_H
 
-#include <inttypes.h>
 #include "vp56data.h"
 
 static const uint8_t vp6_def_fdv_vector_model[2][8] = {
@@ -145,7 +144,7 @@ static const uint8_t vp6_coeff_groups[] = {
     5, 5, 5, 5, 5, 5, 5, 5,
 };
 
-static const int16_t vp6_block_copy_filter[16][8][4] = {
+static const int16_t vp6_block_copy_filter[17][8][4] = {
   { {   0, 128,   0,   0  },  /* 0 */
     {  -3, 122,   9,   0  },
     {  -4, 109,  24,  -1  },
@@ -274,9 +273,17 @@ static const int16_t vp6_block_copy_filter[16][8][4] = {
     { -11,  59,  99, -19  },
     {  -6,  38, 114, -18  },
     {  -2,  18, 124, -12  } },
+  { {   0, 128,   0,   0  },  /* 16 */
+    {  -4, 118,  16,  -2  },
+    {  -7, 106,  34,  -5  },
+    {  -8,  90,  53,  -7  },
+    {  -8,  72,  72,  -8  },
+    {  -7,  53,  90,  -8  },
+    {  -5,  34, 106,  -7  },
+    {  -2,  16, 118,  -4  } },
 };
 
-const vp56_tree_t vp6_pcr_tree[] = {
+static const vp56_tree_t vp6_pcr_tree[] = {
     { 8, 0},
     { 4, 1},
     { 2, 2}, {-1}, {-2},