Browse code

avcodec/remove_extradata_bsf: Fix AVoption parameter max value

James Almer authored on 2016/09/23 23:13:48
Showing 2 changed files
... ...
@@ -95,7 +95,7 @@ static void remove_extradata_close(AVBSFContext *ctx)
95 95
 
96 96
 #define OFFSET(x) offsetof(RemoveExtradataContext, x)
97 97
 static const AVOption options[] = {
98
-    { "freq", NULL, OFFSET(freq), AV_OPT_TYPE_INT, { .i64 = REMOVE_FREQ_KEYFRAME }, REMOVE_FREQ_KEYFRAME, REMOVE_FREQ_ALL, 0, "freq" },
98
+    { "freq", NULL, OFFSET(freq), AV_OPT_TYPE_INT, { .i64 = REMOVE_FREQ_KEYFRAME }, REMOVE_FREQ_KEYFRAME, REMOVE_FREQ_NONKEYFRAME, 0, "freq" },
99 99
         { "k",        NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE_FREQ_NONKEYFRAME }, .unit = "freq" },
100 100
         { "keyframe", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE_FREQ_KEYFRAME }, .unit = "freq" },
101 101
         { "e",        NULL, 0, AV_OPT_TYPE_CONST, { .i64 = REMOVE_FREQ_ALL      }, .unit = "freq" },
... ...
@@ -1,33 +1,32 @@
1
-6196f1d6b59d16c045de627221d8685f *tests/data/fate/ffmpeg-bsf-remove-k.avi
2
-130072 tests/data/fate/ffmpeg-bsf-remove-k.avi
3
-#extradata 0:       30, 0x4a4d065a
1
+d6c688432b88ca62ea8abb885272af52 *tests/data/fate/ffmpeg-bsf-remove-k.avi
2
+129982 tests/data/fate/ffmpeg-bsf-remove-k.avi
4 3
 #tb 0: 1/25
5 4
 #media_type 0: video
6 5
 #codec_id 0: mpeg4
7 6
 #dimensions 0: 716x236
8 7
 #sar 0: 1/1
9
-0,          0,          0,        1,    20194, 0x174f64ac
10
-0,          1,          1,        1,    17878, 0xc081a405, F=0x0
11
-0,          2,          2,        1,    22723, 0x60935d28, F=0x0
12
-0,          3,          3,        1,    18655, 0xe5c33ada, F=0x0
13
-0,          4,          4,        1,    12928, 0x84d6a9d7, F=0x0
14
-0,          5,          5,        1,     4788, 0xbf9e1939, F=0x0
15
-0,          6,          6,        1,     3160, 0x867423c7, F=0x0
16
-0,          7,          7,        1,     2049, 0x523ffd85, F=0x0
17
-0,          8,          8,        1,     1440, 0x363ff725, F=0x0
18
-0,          9,          9,        1,     1300, 0x0d3c9c74, F=0x0
19
-0,         10,         10,        1,     1081, 0xbfb0365c, F=0x0
20
-0,         11,         11,        1,     1011, 0x9d310f90, F=0x0
21
-0,         12,         12,        1,     2543, 0x64500a0f
22
-0,         13,         13,        1,      881, 0x7492d262, F=0x0
23
-0,         14,         14,        1,      896, 0x1ff1d335, F=0x0
24
-0,         15,         15,        1,      973, 0x72c1fc04, F=0x0
25
-0,         16,         16,        1,     1075, 0xa5881d73, F=0x0
26
-0,         17,         17,        1,      933, 0xf0aae974, F=0x0
27
-0,         18,         18,        1,     1079, 0xbdce1b40, F=0x0
28
-0,         19,         19,        1,      964, 0x323fe4ab, F=0x0
29
-0,         20,         20,        1,     1015, 0x78a4fe96, F=0x0
30
-0,         21,         21,        1,      990, 0x9cd4ff25, F=0x0
31
-0,         22,         22,        1,     1093, 0x98712e2e, F=0x0
32
-0,         23,         23,        1,     1200, 0x37957156, F=0x0
33
-0,         24,         24,        1,     2881, 0xbb1feefb
8
+0,          0, -9223372036854775808,        1,    20164, 0x66bf5e52
9
+0,          1, -9223372036854775808,        1,    17878, 0xc081a405, F=0x0
10
+0,          2, -9223372036854775808,        1,    22723, 0x60935d28, F=0x0
11
+0,          3, -9223372036854775808,        1,    18655, 0xe5c33ada, F=0x0
12
+0,          4, -9223372036854775808,        1,    12928, 0x84d6a9d7, F=0x0
13
+0,          5, -9223372036854775808,        1,     4788, 0xbf9e1939, F=0x0
14
+0,          6, -9223372036854775808,        1,     3160, 0x867423c7, F=0x0
15
+0,          7, -9223372036854775808,        1,     2049, 0x523ffd85, F=0x0
16
+0,          8, -9223372036854775808,        1,     1440, 0x363ff725, F=0x0
17
+0,          9, -9223372036854775808,        1,     1300, 0x0d3c9c74, F=0x0
18
+0,         10, -9223372036854775808,        1,     1081, 0xbfb0365c, F=0x0
19
+0,         11, -9223372036854775808,        1,     1011, 0x9d310f90, F=0x0
20
+0,         12, -9223372036854775808,        1,     2513, 0xbcd803b5
21
+0,         13, -9223372036854775808,        1,      881, 0x7492d262, F=0x0
22
+0,         14, -9223372036854775808,        1,      896, 0x1ff1d335, F=0x0
23
+0,         15, -9223372036854775808,        1,      973, 0x72c1fc04, F=0x0
24
+0,         16, -9223372036854775808,        1,     1075, 0xa5881d73, F=0x0
25
+0,         17, -9223372036854775808,        1,      933, 0xf0aae974, F=0x0
26
+0,         18, -9223372036854775808,        1,     1079, 0xbdce1b40, F=0x0
27
+0,         19, -9223372036854775808,        1,      964, 0x323fe4ab, F=0x0
28
+0,         20, -9223372036854775808,        1,     1015, 0x78a4fe96, F=0x0
29
+0,         21, -9223372036854775808,        1,      990, 0x9cd4ff25, F=0x0
30
+0,         22, -9223372036854775808,        1,     1093, 0x98712e2e, F=0x0
31
+0,         23, -9223372036854775808,        1,     1200, 0x37957156, F=0x0
32
+0,         24, -9223372036854775808,        1,     2851, 0xb05be8a1