diff --git a/Changelog b/Changelog
index 9d7c90c8b6..a09dcd82c2 100644
--- a/Changelog
+++ b/Changelog
@@ -51,6 +51,7 @@ version 7.1:
   and av1_nvenc encoders
 - libswresample now accepts custom order channel layouts as input, with some
   constrains
+- FFV1 parser
 
 
 version 7.0:
diff --git a/configure b/configure
index 32fbe58126..6e46e59b6f 100755
--- a/configure
+++ b/configure
@@ -3472,6 +3472,7 @@ vvc_qsv_decoder_select="vvc_mp4toannexb_bsf qsvdec"
 aac_parser_select="adts_header mpeg4audio"
 av1_parser_select="cbs_av1"
 evc_parser_select="evcparse"
+ffv1_parser_select="rangecoder"
 ftr_parser_select="adts_header mpeg4audio"
 h264_parser_select="golomb h264dsp h264parse h264_sei"
 hevc_parser_select="hevcparse hevc_sei"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 7001963784..9630074205 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1210,6 +1210,7 @@ OBJS-$(CONFIG_DVBSUB_PARSER)           += dvbsub_parser.o
 OBJS-$(CONFIG_DVD_NAV_PARSER)          += dvd_nav_parser.o
 OBJS-$(CONFIG_DVDSUB_PARSER)           += dvdsub_parser.o
 OBJS-$(CONFIG_EVC_PARSER)              += evc_parser.o
+OBJS-$(CONFIG_FFV1_PARSER)             += ffv1_parser.o ffv1_parse.o ffv1.o
 OBJS-$(CONFIG_FLAC_PARSER)             += flac_parser.o flacdata.o flac.o
 OBJS-$(CONFIG_FTR_PARSER)              += ftr_parser.o
 OBJS-$(CONFIG_G723_1_PARSER)           += g723_1_parser.o
diff --git a/libavcodec/ffv1_parser.c b/libavcodec/ffv1_parser.c
new file mode 100644
index 0000000000..f36a5dfdbd
--- /dev/null
+++ b/libavcodec/ffv1_parser.c
@@ -0,0 +1,86 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avcodec.h"
+#include "ffv1.h"
+#include "rangecoder.h"
+
+typedef struct FFV1ParseContext {
+    FFV1Context f;
+    int got_first;
+} FFV1ParseContext;
+
+static int parse(AVCodecParserContext *s,
+                 AVCodecContext *avctx,
+                 const uint8_t **poutbuf, int *poutbuf_size,
+                 const uint8_t *buf, int buf_size)
+{
+    FFV1ParseContext *p = s->priv_data;
+    FFV1Context *f = &p->f;
+    RangeCoder c;
+    uint8_t keystate = 128;
+
+    *poutbuf      = buf;
+    *poutbuf_size = buf_size;
+
+    if (!p->got_first) {
+        int ret = ff_ffv1_common_init(avctx, f);
+        p->got_first = 1;
+        if (ret < 0)
+            return buf_size;
+
+        if (avctx->extradata_size > 0 && (ret = ff_ffv1_read_extra_header(f)) < 0)
+            return buf_size;
+    }
+
+    ff_init_range_decoder(&c, buf, buf_size);
+    ff_build_rac_states(&c, 0.05 * (1LL << 32), 256 - 8);
+
+    f->avctx = avctx;
+    s->key_frame = get_rac(&c, &keystate);
+    s->pict_type = AV_PICTURE_TYPE_I;
+    s->field_order = AV_FIELD_UNKNOWN;
+    s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN;
+
+    if (s->key_frame) {
+        uint8_t state[CONTEXT_SIZE];
+        memset(state, 128, sizeof(state));
+        ff_ffv1_parse_header(f, &c, state);
+    }
+
+    s->width  = f->width;
+    s->height = f->height;
+    s->format = f->pix_fmt;
+
+    return buf_size;
+}
+
+static void close(AVCodecParserContext *s)
+{
+    FFV1ParseContext *p = s->priv_data;
+
+    p->f.avctx = NULL;
+    ff_ffv1_close(&p->f);
+}
+
+const AVCodecParser ff_ffv1_parser = {
+    .codec_ids    = { AV_CODEC_ID_FFV1 },
+    .priv_data_size = sizeof(FFV1ParseContext),
+    .parser_parse = parse,
+    .parser_close = close,
+};
diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c
index 8bfd2dbce0..5387351fd0 100644
--- a/libavcodec/parsers.c
+++ b/libavcodec/parsers.c
@@ -45,6 +45,7 @@ extern const AVCodecParser ff_dvd_nav_parser;
 extern const AVCodecParser ff_evc_parser;
 extern const AVCodecParser ff_flac_parser;
 extern const AVCodecParser ff_ftr_parser;
+extern const AVCodecParser ff_ffv1_parser;
 extern const AVCodecParser ff_g723_1_parser;
 extern const AVCodecParser ff_g729_parser;
 extern const AVCodecParser ff_gif_parser;
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 02192c86f7..2a08e42d7e 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,8 +29,8 @@
 
 #include "version_major.h"
 
-#define LIBAVCODEC_VERSION_MINOR  32
-#define LIBAVCODEC_VERSION_MICRO 101
+#define LIBAVCODEC_VERSION_MINOR  33
+#define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \