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