2792 files changed, 78612 insertions, 17095 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index 7ddaca2115..4766e56945 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,8 +1,11 @@
 /audiogen
+/audiomatch
 /base64
 /data/
 /pixfmts.mak
 /rotozoom
+/test_copy.ffmeta
 /tiny_psnr
+/tiny_ssim
 /videogen
 /vsynth1/
diff --git a/tests/Makefile b/tests/Makefile
index d3f11efaaa..fd3713fe81 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,8 +1,26 @@
+FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
+
 THREADS = 1
 VREF = tests/vsynth1/00.pgm
 AREF = tests/data/asynth1.sw
 
-OBJDIRS += tests/data tests/vsynth1 tests/data/filtergraphs
+FATEW = 34
+FATEH = 34
+
+FFMPEG=ffmpeg$(PROGSSUF)$(EXESUF)
+
+$(AREF): CMP=
+
+ffservertest: export PROGSUF = $(PROGSSUF)
+ffservertest: ffserver$(PROGSSUF)$(EXESUF) ffmpeg$(PROGSSUF)$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw
+	@echo
+	@echo "Unfortunately ffserver is broken and therefore its regression"
+	@echo "test fails randomly. Treat the results accordingly."
+	@echo
+	$(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)"
+
+APITESTSDIR := tests/api
+OBJDIRS += tests/data tests/vsynth1 tests/data/filtergraphs $(APITESTSDIR)/
 
 $(VREF): tests/videogen$(HOSTEXESUF) | tests/vsynth1
 	$(M)./$< 'tests/vsynth1/'
@@ -19,7 +37,26 @@ tests/data/vsynth1.yuv: tests/videogen$(HOSTEXESUF) | tests/data
 tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
 	$(M)$< $(SRC_PATH)/tests/reference.pnm $@
 
-tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN
+tests/data/vsynth_lena.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
+	$(M)$< $(SAMPLES)/lena.pnm $@
+
+tests/data/vsynth3.yuv: tests/videogen$(HOSTEXESUF) | tests/data
+	$(M)$< $@ $(FATEW) $(FATEH)
+
+tests/test_copy.ffmeta: TAG = COPY
+tests/test_copy.ffmeta: tests/data
+	$(M)cp -f $(SRC_PATH)/tests/test.ffmeta tests/test_copy.ffmeta
+
+tests/data/ffprobe-test.nut: ffmpeg$(PROGSSUF)$(EXESUF) tests/test_copy.ffmeta
+	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
+        -f lavfi -i "aevalsrc=sin(400*PI*2*t):d=0.125[out0]; testsrc=d=0.125[out1]; testsrc=s=100x100:d=0.125[out2]" \
+        -f ffmetadata -i $(TARGET_PATH)/tests/test_copy.ffmeta \
+        -flags +bitexact -fflags +bitexact -map 0:0 -map 0:1 -map 0:2 -map_metadata 1 \
+        -map_metadata:s:0 1:s:0 -map_metadata:s:1 1:s:1 \
+        -vcodec rawvideo -acodec pcm_s16le \
+        -y $(TARGET_PATH)/$@ 2>/dev/null
+
+tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm tests/data/%.nut: TAG = GEN
 
 tests/data/filtergraphs/%: TAG = COPY
 tests/data/filtergraphs/%: $(SRC_PATH)/tests/filtergraphs/% | tests/data/filtergraphs
@@ -56,6 +93,8 @@ FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $(
 
 PARSERDEMDEC       = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER)
 
+include $(SRC_PATH)/$(APITESTSDIR)/Makefile
+
 include $(SRC_PATH)/tests/fate/acodec.mak
 include $(SRC_PATH)/tests/fate/vcodec.mak
 
@@ -69,22 +108,36 @@ include $(SRC_PATH)/tests/fate/alac.mak
 include $(SRC_PATH)/tests/fate/als.mak
 include $(SRC_PATH)/tests/fate/amrnb.mak
 include $(SRC_PATH)/tests/fate/amrwb.mak
+include $(SRC_PATH)/tests/fate/api.mak
+include $(SRC_PATH)/tests/fate/apng.mak
 include $(SRC_PATH)/tests/fate/atrac.mak
 include $(SRC_PATH)/tests/fate/audio.mak
 include $(SRC_PATH)/tests/fate/bmp.mak
 include $(SRC_PATH)/tests/fate/build.mak
 include $(SRC_PATH)/tests/fate/canopus.mak
+include $(SRC_PATH)/tests/fate/cbs.mak
 include $(SRC_PATH)/tests/fate/cdxl.mak
 include $(SRC_PATH)/tests/fate/checkasm.mak
+include $(SRC_PATH)/tests/fate/concatdec.mak
 include $(SRC_PATH)/tests/fate/cover-art.mak
+include $(SRC_PATH)/tests/fate/dca.mak
 include $(SRC_PATH)/tests/fate/demux.mak
 include $(SRC_PATH)/tests/fate/dfa.mak
+include $(SRC_PATH)/tests/fate/dnxhd.mak
 include $(SRC_PATH)/tests/fate/dpcm.mak
 include $(SRC_PATH)/tests/fate/ea.mak
+include $(SRC_PATH)/tests/fate/exif.mak
+include $(SRC_PATH)/tests/fate/ffmpeg.mak
+include $(SRC_PATH)/tests/fate/ffprobe.mak
 include $(SRC_PATH)/tests/fate/fft.mak
+include $(SRC_PATH)/tests/fate/fifo-muxer.mak
 include $(SRC_PATH)/tests/fate/filter-audio.mak
 include $(SRC_PATH)/tests/fate/filter-video.mak
+include $(SRC_PATH)/tests/fate/fits.mak
 include $(SRC_PATH)/tests/fate/flac.mak
+include $(SRC_PATH)/tests/fate/flvenc.mak
+include $(SRC_PATH)/tests/fate/gapless.mak
+include $(SRC_PATH)/tests/fate/gif.mak
 include $(SRC_PATH)/tests/fate/h264.mak
 include $(SRC_PATH)/tests/fate/hevc.mak
 include $(SRC_PATH)/tests/fate/image.mak
@@ -94,22 +147,31 @@ include $(SRC_PATH)/tests/fate/libavdevice.mak
 include $(SRC_PATH)/tests/fate/libavformat.mak
 include $(SRC_PATH)/tests/fate/libavresample.mak
 include $(SRC_PATH)/tests/fate/libavutil.mak
+include $(SRC_PATH)/tests/fate/libswresample.mak
+include $(SRC_PATH)/tests/fate/libswscale.mak
 include $(SRC_PATH)/tests/fate/lossless-audio.mak
 include $(SRC_PATH)/tests/fate/lossless-video.mak
+include $(SRC_PATH)/tests/fate/matroska.mak
 include $(SRC_PATH)/tests/fate/microsoft.mak
 include $(SRC_PATH)/tests/fate/monkeysaudio.mak
 include $(SRC_PATH)/tests/fate/mov.mak
 include $(SRC_PATH)/tests/fate/mp3.mak
 include $(SRC_PATH)/tests/fate/mpc.mak
 include $(SRC_PATH)/tests/fate/mpeg4.mak
+include $(SRC_PATH)/tests/fate/mpegts.mak
+include $(SRC_PATH)/tests/fate/mxf.mak
 include $(SRC_PATH)/tests/fate/opus.mak
 include $(SRC_PATH)/tests/fate/pcm.mak
+include $(SRC_PATH)/tests/fate/pixlet.mak
 include $(SRC_PATH)/tests/fate/probe.mak
 include $(SRC_PATH)/tests/fate/prores.mak
 include $(SRC_PATH)/tests/fate/qt.mak
 include $(SRC_PATH)/tests/fate/qtrle.mak
 include $(SRC_PATH)/tests/fate/real.mak
 include $(SRC_PATH)/tests/fate/screen.mak
+include $(SRC_PATH)/tests/fate/source.mak
+include $(SRC_PATH)/tests/fate/speedhq.mak
+include $(SRC_PATH)/tests/fate/subtitles.mak
 include $(SRC_PATH)/tests/fate/utvideo.mak
 include $(SRC_PATH)/tests/fate/video.mak
 include $(SRC_PATH)/tests/fate/voice.mak
@@ -120,46 +182,60 @@ include $(SRC_PATH)/tests/fate/wavpack.mak
 include $(SRC_PATH)/tests/fate/wma.mak
 include $(SRC_PATH)/tests/fate/xvid.mak
 
-FATE_AVCONV += $(FATE_AVCONV-yes)
-FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV)
+FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes)
+FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG)
+FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE)
 
 FATE_SAMPLES_AVCONV           += $(FATE_SAMPLES_AVCONV-yes)
-FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV)
-FATE_SAMPLES += $(FATE_SAMPLES-yes)
+FATE_SAMPLES_FFMPEG           += $(FATE_SAMPLES_FFMPEG-yes)
+FATE_EXTERN-$(CONFIG_FFMPEG)  += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) $(FATE_SAMPLES_FFPROBE)
+FATE_EXTERN += $(FATE_EXTERN-yes)
 
 FATE += $(FATE-yes)
 
-$(FATE_AVCONV) $(FATE_SAMPLES_AVCONV): avconv$(EXESUF)
+RSYNC_OPTIONS-$(HAVE_RSYNC_CONTIMEOUT) += --contimeout=60
+RSYNC_OPTIONS = -vrltLW --timeout=60 $(RSYNC_OPTIONS-yes)
+
+$(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(PROGSSUF)$(EXESUF)
+
+$(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(PROGSSUF)$(EXESUF)
 
 ifdef SAMPLES
-FATE += $(FATE_SAMPLES)
+FATE += $(FATE_FULL) $(FATE_FULL-yes)
+FATE += $(FATE_EXTERN)
 fate-rsync:
-	rsync -vaLW rsync://fate-suite.libav.org/fate-suite/ $(SAMPLES)
+	rsync $(RSYNC_OPTIONS) rsync://fate-suite.ffmpeg.org/fate-suite/ $(SAMPLES)
 else
+fate::
+	@echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified"
 fate-rsync:
 	@echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite"
-$(FATE_SAMPLES):
+$(FATE_EXTERN):
 	@echo "$@ requires external samples and SAMPLES not specified"; false
 endif
 
-FATE_UTILS = base64 tiny_psnr
+FATE_UTILS = base64 tiny_psnr tiny_ssim audiomatch
+
+TOOL = ffmpeg
 
 $(addprefix fate-, $(IGNORE_TESTS)): REPORT=ignore
 
-fate: $(FATE)
+fate:: $(FATE)
 
-$(FATE): $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
+$(FATE) $(FATE_TESTS-no): export PROGSUF = $(PROGSSUF)
+$(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
 	@echo "TEST    $(@:fate-%=%)"
-	$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)'
+	$(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)'
 
 fate-list:
 	@printf '%s\n' $(sort $(FATE))
 
 coverage.info: TAG = LCOV
 coverage.info:
-	$(M)lcov -q -d $(CURDIR) -b $(SRC_PATH) --capture | \
-	    sed "s,$(CURDIR)/\./,$(CURDIR)/," > $@
-	$(M)lcov -q --remove $@ "/usr/include*" -o $@
+	$(M)lcov -q -d $(CURDIR) -b $(patsubst src%,./,$(SRC_LINK)) --capture | \
+	    sed "s,$(CURDIR)/\./,$(CURDIR)/," > $@.in
+	$(M)lcov -q --remove $@.in "/usr*" > $@
+	$(Q)$(RM) $@.in
 
 lcov:  TAG = GENHTML
 lcov: coverage.info
@@ -172,11 +248,11 @@ lcov-reset:
 
 clean:: testclean
 
-testclean:
-	$(RM) -r tests/vsynth1 tests/data
+testclean::
+	$(RM) -r tests/vsynth1 tests/data tools/lavfi-showfiltfmts$(PROGSSUF)$(EXESUF)
 	$(RM) $(CLEANSUFFIXES:%=tests/%)
 	$(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF))
-	$(RM) tests/pixfmts.mak
+	$(RM) tests/pixfmts.mak tests/test_copy.ffmeta
 
 -include $(wildcard tests/*.d)
 
diff --git a/tests/api/.gitignore b/tests/api/.gitignore
new file mode 100644
index 0000000000..bbab80ca73
--- /dev/null
+++ b/tests/api/.gitignore
@@ -0,0 +1 @@
+/*-test
diff --git a/tests/api/Makefile b/tests/api/Makefile
new file mode 100644
index 0000000000..759dd9d243
--- /dev/null
+++ b/tests/api/Makefile
@@ -0,0 +1,21 @@
+APITESTPROGS-$(call ENCDEC, FLAC, FLAC) += api-flac
+APITESTPROGS-$(call DEMDEC, H264, H264) += api-h264
+APITESTPROGS-yes += api-seek
+APITESTPROGS-yes += api-codec-param
+APITESTPROGS-$(call DEMDEC, H263, H263) += api-band
+APITESTPROGS-$(HAVE_THREADS) += api-threadmessage
+APITESTPROGS += $(APITESTPROGS-yes)
+
+APITESTOBJS  := $(APITESTOBJS:%=$(APITESTSDIR)%) $(APITESTPROGS:%=$(APITESTSDIR)/%-test.o)
+APITESTPROGS := $(APITESTPROGS:%=$(APITESTSDIR)/%-test$(EXESUF))
+-include $(wildcard $(APITESTOBJS:.o=.d))
+
+$(APITESTOBJS): | $(sort $(dir $(APITESTOBJS)))
+$(APITESTOBJS) $(APITESTOBJS:.o=.i): CPPFLAGS += -DTEST
+$(APITESTOBJS) $(APITESTOBJS:.o=.i): CFLAGS += -Umain
+
+$(APITESTPROGS): %$(EXESUF): %.o $(FF_DEP_LIBS)
+	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(filter %.o,$^) $(FF_EXTRALIBS) $(ELIBS)
+
+testclean::
+	$(RM) $(addprefix $(APITESTSDIR)/,$(CLEANSUFFIXES) *-test$(EXESUF))
diff --git a/tests/api/api-band-test.c b/tests/api/api-band-test.c
new file mode 100644
index 0000000000..5ccba4f766
--- /dev/null
+++ b/tests/api/api-band-test.c
@@ -0,0 +1,223 @@
+/*
+ * Copyright (c) 2015 Ludmila Glinskih
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * draw_horiz_band test.
+ */
+
+#include "libavutil/adler32.h"
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
+#include "libavutil/imgutils.h"
+
+uint8_t *slice_byte_buffer;
+uint8_t slice_byte_buffer_size;
+int draw_horiz_band_called;
+
+static void draw_horiz_band(AVCodecContext *ctx, const AVFrame *fr, int offset[4],
+                            int slice_position, int type, int height)
+{
+    int i;
+    const AVPixFmtDescriptor *pix_fmt_desc;
+    int chroma_w, chroma_h;
+    int shift_slice_position;
+    int shift_height;
+
+    draw_horiz_band_called = 1;
+
+    pix_fmt_desc = av_pix_fmt_desc_get(ctx->pix_fmt);
+    chroma_w = -((-ctx->width) >> pix_fmt_desc->log2_chroma_w);
+    chroma_h = -((-height) >> pix_fmt_desc->log2_chroma_h);
+    shift_slice_position = -((-slice_position) >> pix_fmt_desc->log2_chroma_h);
+    shift_height = -((-ctx->height) >> pix_fmt_desc->log2_chroma_h);
+
+    for (i = 0; i < height; i++) {
+        memcpy(slice_byte_buffer + ctx->width * slice_position + i * ctx->width,
+               fr->data[0] + offset[0] + i * fr->linesize[0], ctx->width);
+    }
+    for (i = 0; i < chroma_h; i++) {
+        memcpy(slice_byte_buffer + ctx->width * ctx->height + chroma_w * shift_slice_position + i * chroma_w,
+               fr->data[1] + offset[1] + i * fr->linesize[1], chroma_w);
+    }
+    for (i = 0; i < chroma_h; i++) {
+        memcpy(slice_byte_buffer + ctx->width * ctx->height + chroma_w * shift_height + chroma_w * shift_slice_position + i * chroma_w,
+               fr->data[2] + offset[2] + i * fr->linesize[2], chroma_w);
+    }
+}
+
+static int video_decode(const char *input_filename)
+{
+    AVCodec *codec = NULL;
+    AVCodecContext *ctx= NULL;
+    AVCodecParameters *origin_par = NULL;
+    uint8_t *byte_buffer = NULL;
+    AVFrame *fr = NULL;
+    AVPacket pkt;
+    AVFormatContext *fmt_ctx = NULL;
+    int number_of_written_bytes;
+    int video_stream;
+    int got_frame = 0;
+    int byte_buffer_size;
+    int result;
+    int end_of_stream = 0;
+
+    draw_horiz_band_called = 0;
+
+    result = avformat_open_input(&fmt_ctx, input_filename, NULL, NULL);
+    if (result < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Can't open file\n");
+        return result;
+    }
+
+    result = avformat_find_stream_info(fmt_ctx, NULL);
+    if (result < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Can't get stream info\n");
+        return result;
+    }
+
+    video_stream = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, NULL, 0);
+    if (video_stream < 0) {
+      av_log(NULL, AV_LOG_ERROR, "Can't find video stream in input file\n");
+      return -1;
+    }
+
+    origin_par = fmt_ctx->streams[video_stream]->codecpar;
+
+    codec = avcodec_find_decoder(origin_par->codec_id);
+    if (!codec) {
+        av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n");
+        return -1;
+    }
+
+    ctx = avcodec_alloc_context3(codec);
+    if (!ctx) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate decoder context\n");
+        return AVERROR(ENOMEM);
+    }
+
+    result = avcodec_parameters_to_context(ctx, origin_par);
+    if (result) {
+        av_log(NULL, AV_LOG_ERROR, "Can't copy decoder context\n");
+        return result;
+    }
+
+    ctx->draw_horiz_band = draw_horiz_band;
+    ctx->thread_count = 1;
+
+    result = avcodec_open2(ctx, codec, NULL);
+    if (result < 0) {
+        av_log(ctx, AV_LOG_ERROR, "Can't open decoder\n");
+        return result;
+    }
+
+    fr = av_frame_alloc();
+    if (!fr) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate frame\n");
+        return AVERROR(ENOMEM);
+    }
+
+    if (strcmp(codec->name, "flv") && strcmp(codec->name, "mpeg4") && strcmp(codec->name, "huffyuv")) {
+        av_log(NULL, AV_LOG_ERROR, "Wrong codec\n");
+        return -1;
+    }
+
+    byte_buffer_size = av_image_get_buffer_size(ctx->pix_fmt, ctx->width, ctx->height, 32);
+    byte_buffer = av_malloc(byte_buffer_size);
+    if (!byte_buffer) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate buffer\n");
+        return AVERROR(ENOMEM);
+    }
+
+    slice_byte_buffer = av_malloc(byte_buffer_size);
+    if (!slice_byte_buffer) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate buffer\n");
+        return AVERROR(ENOMEM);
+    }
+    memset(slice_byte_buffer, 0, byte_buffer_size);
+    slice_byte_buffer_size = byte_buffer_size;
+
+    av_init_packet(&pkt);
+    do {
+        if (!end_of_stream) {
+            if (av_read_frame(fmt_ctx, &pkt) < 0) {
+                end_of_stream = 1;
+            }
+        }
+        if (end_of_stream) {
+            pkt.data = NULL;
+            pkt.size = 0;
+        }
+        if (pkt.stream_index == video_stream || end_of_stream) {
+            got_frame = 0;
+            result = avcodec_decode_video2(ctx, fr, &got_frame, &pkt);
+            if (result < 0) {
+                av_log(NULL, AV_LOG_ERROR, "Error decoding frame\n");
+                return result;
+            }
+            if (got_frame) {
+                number_of_written_bytes = av_image_copy_to_buffer(byte_buffer, byte_buffer_size,
+                                        (const uint8_t* const *)fr->data, (const int*) fr->linesize,
+                                        ctx->pix_fmt, ctx->width, ctx->height, 1);
+                if (number_of_written_bytes < 0) {
+                    av_log(NULL, AV_LOG_ERROR, "Can't copy image to buffer\n");
+                    return number_of_written_bytes;
+                }
+                if (draw_horiz_band_called == 0) {
+                    av_log(NULL, AV_LOG_ERROR, "draw_horiz_band haven't been called!\n");
+                    return -1;
+                }
+                if (av_adler32_update(0, (const uint8_t*)byte_buffer, number_of_written_bytes) !=
+                    av_adler32_update(0, (const uint8_t*)slice_byte_buffer, number_of_written_bytes)) {
+                    av_log(NULL, AV_LOG_ERROR, "Decoded frames with and without draw_horiz_band are not the same!\n");
+                    return -1;
+                }
+            }
+            av_packet_unref(&pkt);
+            av_init_packet(&pkt);
+        }
+    } while (!end_of_stream || got_frame);
+
+    av_packet_unref(&pkt);
+    av_frame_free(&fr);
+    avcodec_close(ctx);
+    avformat_close_input(&fmt_ctx);
+    avcodec_free_context(&ctx);
+    av_freep(&byte_buffer);
+    av_freep(&slice_byte_buffer);
+    return 0;
+}
+
+int main(int argc, char **argv)
+{
+    if (argc < 2)
+    {
+        av_log(NULL, AV_LOG_ERROR, "Incorrect input: expected %s <name of a video file>\nNote that test works only for huffyuv, flv and mpeg4 decoders\n", argv[0]);
+        return 1;
+    }
+
+    av_register_all();
+
+    if (video_decode(argv[1]) != 0)
+        return 1;
+
+    return 0;
+}
diff --git a/tests/api/api-codec-param-test.c b/tests/api/api-codec-param-test.c
new file mode 100644
index 0000000000..377a5e9c79
--- /dev/null
+++ b/tests/api/api-codec-param-test.c
@@ -0,0 +1,258 @@
+/*
+ * Copyright (c) 2015 Matthieu Bouron <matthieu.bouron stupeflix.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include "libavformat/avformat.h"
+#include "libavutil/pixdesc.h"
+#include "libavcodec/internal.h"
+#include "libavutil/avassert.h"
+#include "libavutil/opt.h"
+
+static int try_decode_video_frame(AVCodecContext *codec_ctx, AVPacket *pkt, int decode)
+{
+    int ret = 0;
+    int got_frame = 0;
+    AVFrame *frame = NULL;
+    int skip_frame = codec_ctx->skip_frame;
+
+    if (!avcodec_is_open(codec_ctx)) {
+        const AVCodec *codec = avcodec_find_decoder(codec_ctx->codec_id);
+
+        ret = avcodec_open2(codec_ctx, codec, NULL);
+        if (ret < 0) {
+            av_log(codec_ctx, AV_LOG_ERROR, "Failed to open codec\n");
+            goto end;
+        }
+    }
+
+    frame = av_frame_alloc();
+    if (!frame) {
+        av_log(NULL, AV_LOG_ERROR, "Failed to allocate frame\n");
+        goto end;
+    }
+
+    if (!decode && avpriv_codec_get_cap_skip_frame_fill_param(codec_ctx->codec)) {
+        codec_ctx->skip_frame = AVDISCARD_ALL;
+    }
+
+    do {
+        ret = avcodec_decode_video2(codec_ctx, frame, &got_frame, pkt);
+        av_assert0(decode || (!decode && !got_frame));
+        if (ret < 0)
+            break;
+        pkt->data += ret;
+        pkt->size -= ret;
+
+        if (got_frame) {
+            break;
+        }
+    } while (pkt->size > 0);
+
+end:
+    codec_ctx->skip_frame = skip_frame;
+
+    av_frame_free(&frame);
+    return ret;
+}
+
+static int find_video_stream_info(AVFormatContext *fmt_ctx, int decode)
+{
+    int ret = 0;
+    int i, done = 0;
+    AVPacket pkt;
+
+    av_init_packet(&pkt);
+
+    while (!done) {
+        AVCodecContext *codec_ctx = NULL;
+        AVStream *st;
+
+        if ((ret = av_read_frame(fmt_ctx, &pkt)) < 0) {
+            av_log(fmt_ctx, AV_LOG_ERROR, "Failed to read frame\n");
+            goto end;
+        }
+
+        st = fmt_ctx->streams[pkt.stream_index];
+        codec_ctx = st->codec;
+
+        /* Writing to AVStream.codec_info_nb_frames must not be done by
+         * user applications. It is done here for testing purposing as
+         * find_video_stream_info tries to mimic avformat_find_stream_info
+         * which writes to this field.
+         * */
+        if (codec_ctx->codec_type != AVMEDIA_TYPE_VIDEO ||
+            st->codec_info_nb_frames++ > 0) {
+            av_packet_unref(&pkt);
+            continue;
+        }
+
+        ret = try_decode_video_frame(codec_ctx, &pkt, decode);
+        if (ret < 0) {
+            av_log(fmt_ctx, AV_LOG_ERROR, "Failed to decode video frame\n");
+            goto end;
+        }
+
+        av_packet_unref(&pkt);
+
+        /* check if all video streams have demuxed a packet */
+        done = 1;
+        for (i = 0; i < fmt_ctx->nb_streams; i++) {
+            st = fmt_ctx->streams[i];
+            codec_ctx = st->codec;
+
+            if (codec_ctx->codec_type != AVMEDIA_TYPE_VIDEO)
+                continue;
+
+            done &= st->codec_info_nb_frames > 0;
+        }
+    }
+
+end:
+    av_packet_unref(&pkt);
+
+    /* close all codecs opened in try_decode_video_frame */
+    for (i = 0; i < fmt_ctx->nb_streams; i++) {
+        AVStream *st = fmt_ctx->streams[i];
+        avcodec_close(st->codec);
+    }
+
+    return ret < 0;
+}
+
+static void dump_video_streams(const AVFormatContext *fmt_ctx, int decode)
+{
+    int i;
+
+    for (i = 0; i < fmt_ctx->nb_streams; i++) {
+        const AVOption *opt = NULL;
+        const AVStream *st = fmt_ctx->streams[i];
+        AVCodecContext *codec_ctx = st->codec;
+
+        printf("stream=%d, decode=%d\n", i, decode);
+        while (opt = av_opt_next(codec_ctx, opt)) {
+            uint8_t *str;
+
+            if (opt->type == AV_OPT_TYPE_CONST)
+                continue;
+
+            if (!strcmp(opt->name, "frame_number"))
+                continue;
+
+            if (av_opt_get(codec_ctx, opt->name, 0, &str) >= 0) {
+                printf("    %s=%s\n", opt->name, str);
+                av_free(str);
+            }
+        }
+    }
+}
+
+static int open_and_probe_video_streams(AVFormatContext **fmt_ctx, const char *filename, int decode)
+{
+    int ret = 0;
+
+    ret = avformat_open_input(fmt_ctx, filename, NULL, NULL);
+    if (ret < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Failed to open input '%s'", filename);
+        goto end;
+    }
+
+    ret = find_video_stream_info(*fmt_ctx, decode);
+    if (ret < 0) {
+        goto end;
+    }
+
+    dump_video_streams(*fmt_ctx, decode);
+
+end:
+    return ret;
+}
+
+static int check_video_streams(const AVFormatContext *fmt_ctx1, const AVFormatContext *fmt_ctx2)
+{
+    int i;
+    int ret = 0;
+
+    av_assert0(fmt_ctx1->nb_streams == fmt_ctx2->nb_streams);
+    for (i = 0; i < fmt_ctx1->nb_streams; i++) {
+        const AVOption *opt = NULL;
+        const AVStream *st1 = fmt_ctx1->streams[i];
+        const AVStream *st2 = fmt_ctx2->streams[i];
+        AVCodecContext *codec_ctx1 = st1->codec;
+        AVCodecContext *codec_ctx2 = st2->codec;
+
+        if (codec_ctx1->codec_type != AVMEDIA_TYPE_VIDEO)
+            continue;
+
+        while (opt = av_opt_next(codec_ctx1, opt)) {
+            uint8_t *str1 = NULL, *str2 = NULL;
+
+            if (opt->type == AV_OPT_TYPE_CONST)
+                continue;
+
+            if (!strcmp(opt->name, "frame_number"))
+                continue;
+
+            av_assert0(av_opt_get(codec_ctx1, opt->name, 0, &str1) >= 0);
+            av_assert0(av_opt_get(codec_ctx2, opt->name, 0, &str2) >= 0);
+            if (strcmp(str1, str2)) {
+                av_log(NULL, AV_LOG_ERROR, "Field %s differs: %s %s", opt->name, str1, str2);
+                ret = AVERROR(EINVAL);
+            }
+            av_free(str1);
+            av_free(str2);
+        }
+    }
+
+    return ret;
+}
+
+int main(int argc, char* argv[])
+{
+    int ret = 0;
+    AVFormatContext *fmt_ctx = NULL;
+    AVFormatContext *fmt_ctx_no_decode = NULL;
+
+    av_register_all();
+
+    if (argc < 2) {
+        av_log(NULL, AV_LOG_ERROR, "Usage: %s <input>\n", argv[0]);
+        return -1;
+    }
+
+    if ((ret = open_and_probe_video_streams(&fmt_ctx_no_decode, argv[1], 0)) < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Failed to probe '%s' without frame decoding\n", argv[1]);
+        goto end;
+    }
+
+    if ((ret = open_and_probe_video_streams(&fmt_ctx, argv[1], 1)) < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Failed to probe '%s' with frame decoding\n", argv[1]);
+        goto end;
+    }
+
+    ret = check_video_streams(fmt_ctx, fmt_ctx_no_decode);
+
+end:
+    avformat_close_input(&fmt_ctx);
+    avformat_close_input(&fmt_ctx_no_decode);
+
+    return ret;
+}
diff --git a/tests/api/api-flac-test.c b/tests/api/api-flac-test.c
new file mode 100644
index 0000000000..c5a37f03e1
--- /dev/null
+++ b/tests/api/api-flac-test.c
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) 2015 Ludmila Glinskih
+ * Copyright (c) 2001 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/*
+ * FLAC codec test.
+ * Encodes raw data to FLAC format and decodes it back to raw. Compares raw-data
+ * after that.
+ */
+
+#include "libavcodec/avcodec.h"
+#include "libavutil/common.h"
+#include "libavutil/samplefmt.h"
+
+#define NUMBER_OF_FRAMES 200
+#define NAME_BUFF_SIZE 100
+
+/* generate i-th frame of test audio */
+static int generate_raw_frame(uint16_t *frame_data, int i, int sample_rate,
+                              int channels, int frame_size)
+{
+    int j, k;
+
+    for (j = 0; j < frame_size; j++) {
+        frame_data[channels * j] = 10000 * ((j / 10 * i) % 2);
+        for (k = 1; k < channels; k++)
+            frame_data[channels * j + k] = frame_data[channels * j] * (k + 1);
+    }
+    return 0;
+}
+
+static int init_encoder(AVCodec *enc, AVCodecContext **enc_ctx,
+                        int64_t ch_layout, int sample_rate)
+{
+    AVCodecContext *ctx;
+    int result;
+    char name_buff[NAME_BUFF_SIZE];
+
+    av_get_channel_layout_string(name_buff, NAME_BUFF_SIZE, 0, ch_layout);
+    av_log(NULL, AV_LOG_INFO, "channel layout: %s, sample rate: %i\n", name_buff, sample_rate);
+
+    ctx = avcodec_alloc_context3(enc);
+    if (!ctx) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate encoder context\n");
+        return AVERROR(ENOMEM);
+    }
+
+    ctx->sample_fmt = AV_SAMPLE_FMT_S16;
+    ctx->sample_rate = sample_rate;
+    ctx->channel_layout = ch_layout;
+
+    result = avcodec_open2(ctx, enc, NULL);
+    if (result < 0) {
+        av_log(ctx, AV_LOG_ERROR, "Can't open encoder\n");
+        return result;
+    }
+
+    *enc_ctx = ctx;
+    return 0;
+}
+
+static int init_decoder(AVCodec *dec, AVCodecContext **dec_ctx,
+                        int64_t ch_layout)
+{
+    AVCodecContext *ctx;
+    int result;
+
+    ctx = avcodec_alloc_context3(dec);
+    if (!ctx) {
+        av_log(NULL, AV_LOG_ERROR , "Can't allocate decoder context\n");
+        return AVERROR(ENOMEM);
+    }
+
+    ctx->request_sample_fmt = AV_SAMPLE_FMT_S16;
+    /* XXX: FLAC ignores it for some reason */
+    ctx->request_channel_layout = ch_layout;
+    ctx->channel_layout = ch_layout;
+
+    result = avcodec_open2(ctx, dec, NULL);
+    if (result < 0) {
+        av_log(ctx, AV_LOG_ERROR, "Can't open decoder\n");
+        return result;
+    }
+
+    *dec_ctx = ctx;
+    return 0;
+}
+
+static int run_test(AVCodec *enc, AVCodec *dec, AVCodecContext *enc_ctx,
+                    AVCodecContext *dec_ctx)
+{
+    AVPacket enc_pkt;
+    AVFrame *in_frame, *out_frame;
+    uint8_t *raw_in = NULL, *raw_out = NULL;
+    int in_offset = 0, out_offset = 0;
+    int result = 0;
+    int got_output = 0;
+    int i = 0;
+    int in_frame_bytes, out_frame_bytes;
+
+    in_frame = av_frame_alloc();
+    if (!in_frame) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate input frame\n");
+        return AVERROR(ENOMEM);
+    }
+
+    in_frame->nb_samples = enc_ctx->frame_size;
+    in_frame->format = enc_ctx->sample_fmt;
+    in_frame->channel_layout = enc_ctx->channel_layout;
+    if (av_frame_get_buffer(in_frame, 32) != 0) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate a buffer for input frame\n");
+        return AVERROR(ENOMEM);
+    }
+
+    out_frame = av_frame_alloc();
+    if (!out_frame) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate output frame\n");
+        return AVERROR(ENOMEM);
+    }
+
+    raw_in = av_malloc(in_frame->linesize[0] * NUMBER_OF_FRAMES);
+    if (!raw_in) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate memory for raw_in\n");
+        return AVERROR(ENOMEM);
+    }
+
+    raw_out = av_malloc(in_frame->linesize[0] * NUMBER_OF_FRAMES);
+    if (!raw_out) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate memory for raw_out\n");
+        return AVERROR(ENOMEM);
+    }
+
+    for (i = 0; i < NUMBER_OF_FRAMES; i++) {
+        av_init_packet(&enc_pkt);
+        enc_pkt.data = NULL;
+        enc_pkt.size = 0;
+
+        generate_raw_frame((uint16_t*)(in_frame->data[0]), i, enc_ctx->sample_rate,
+                           enc_ctx->channels, enc_ctx->frame_size);
+        in_frame_bytes = in_frame->nb_samples * in_frame->channels * sizeof(uint16_t);
+        if (in_frame_bytes > in_frame->linesize[0]) {
+            av_log(NULL, AV_LOG_ERROR, "Incorrect value of input frame linesize\n");
+            return 1;
+        }
+        memcpy(raw_in + in_offset, in_frame->data[0], in_frame_bytes);
+        in_offset += in_frame_bytes;
+        result = avcodec_encode_audio2(enc_ctx, &enc_pkt, in_frame, &got_output);
+        if (result < 0) {
+            av_log(NULL, AV_LOG_ERROR, "Error encoding audio frame\n");
+            return result;
+        }
+
+        /* if we get an encoded packet, feed it straight to the decoder */
+        if (got_output) {
+            result = avcodec_decode_audio4(dec_ctx, out_frame, &got_output, &enc_pkt);
+            if (result < 0) {
+                av_log(NULL, AV_LOG_ERROR, "Error decoding audio packet\n");
+                return result;
+            }
+
+            if (got_output) {
+                if (result != enc_pkt.size) {
+                    av_log(NULL, AV_LOG_INFO, "Decoder consumed only part of a packet, it is allowed to do so -- need to update this test\n");
+                    return AVERROR_UNKNOWN;
+                }
+
+                if (in_frame->nb_samples != out_frame->nb_samples) {
+                    av_log(NULL, AV_LOG_ERROR, "Error frames before and after decoding has different number of samples\n");
+                    return AVERROR_UNKNOWN;
+                }
+
+                if (in_frame->channel_layout != out_frame->channel_layout) {
+                    av_log(NULL, AV_LOG_ERROR, "Error frames before and after decoding has different channel layout\n");
+                    return AVERROR_UNKNOWN;
+                }
+
+                if (in_frame->format != out_frame->format) {
+                    av_log(NULL, AV_LOG_ERROR, "Error frames before and after decoding has different sample format\n");
+                    return AVERROR_UNKNOWN;
+                }
+                out_frame_bytes = out_frame->nb_samples * out_frame->channels * sizeof(uint16_t);
+                if (out_frame_bytes > out_frame->linesize[0]) {
+                    av_log(NULL, AV_LOG_ERROR, "Incorrect value of output frame linesize\n");
+                    return 1;
+                }
+                memcpy(raw_out + out_offset, out_frame->data[0], out_frame_bytes);
+                out_offset += out_frame_bytes;
+            }
+        }
+        av_packet_unref(&enc_pkt);
+    }
+
+    if (memcmp(raw_in, raw_out, out_frame_bytes * NUMBER_OF_FRAMES) != 0) {
+        av_log(NULL, AV_LOG_ERROR, "Output differs\n");
+        return 1;
+    }
+
+    av_log(NULL, AV_LOG_INFO, "OK\n");
+
+    av_freep(&raw_in);
+    av_freep(&raw_out);
+    av_frame_free(&in_frame);
+    av_frame_free(&out_frame);
+    return 0;
+}
+
+static int close_encoder(AVCodecContext **enc_ctx)
+{
+    avcodec_close(*enc_ctx);
+    av_freep(enc_ctx);
+    return 0;
+}
+
+static int close_decoder(AVCodecContext **dec_ctx)
+{
+    avcodec_close(*dec_ctx);
+    av_freep(dec_ctx);
+    return 0;
+}
+
+int main(void)
+{
+    AVCodec *enc = NULL, *dec = NULL;
+    AVCodecContext *enc_ctx = NULL, *dec_ctx = NULL;
+    uint64_t channel_layouts[] = {AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_5POINT1_BACK, AV_CH_LAYOUT_SURROUND, AV_CH_LAYOUT_STEREO_DOWNMIX};
+    int sample_rates[] = {8000, 44100, 48000, 192000};
+    int cl, sr;
+
+    avcodec_register_all();
+
+    enc = avcodec_find_encoder(AV_CODEC_ID_FLAC);
+    if (!enc) {
+        av_log(NULL, AV_LOG_ERROR, "Can't find encoder\n");
+        return 1;
+    }
+
+    dec = avcodec_find_decoder(AV_CODEC_ID_FLAC);
+    if (!dec) {
+        av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n");
+        return 1;
+    }
+
+    for (cl = 0; cl < FF_ARRAY_ELEMS(channel_layouts); cl++) {
+        for (sr = 0; sr < FF_ARRAY_ELEMS(sample_rates); sr++) {
+            if (init_encoder(enc, &enc_ctx, channel_layouts[cl], sample_rates[sr]) != 0)
+                return 1;
+            if (init_decoder(dec, &dec_ctx, channel_layouts[cl]) != 0)
+                return 1;
+            if (run_test(enc, dec, enc_ctx, dec_ctx) != 0)
+                return 1;
+            close_encoder(&enc_ctx);
+            close_decoder(&dec_ctx);
+        }
+    }
+
+    return 0;
+}
diff --git a/tests/api/api-h264-test.c b/tests/api/api-h264-test.c
new file mode 100644
index 0000000000..52282e0007
--- /dev/null
+++ b/tests/api/api-h264-test.c
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2015 Ludmila Glinskih
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * H264 codec test.
+ */
+
+#include "libavutil/adler32.h"
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
+#include "libavutil/imgutils.h"
+
+static int video_decode_example(const char *input_filename)
+{
+    AVCodec *codec = NULL;
+    AVCodecContext *ctx= NULL;
+    AVCodecParameters *origin_par = NULL;
+    AVFrame *fr = NULL;
+    uint8_t *byte_buffer = NULL;
+    AVPacket pkt;
+    AVFormatContext *fmt_ctx = NULL;
+    int number_of_written_bytes;
+    int video_stream;
+    int got_frame = 0;
+    int byte_buffer_size;
+    int i = 0;
+    int result;
+    int end_of_stream = 0;
+
+    result = avformat_open_input(&fmt_ctx, input_filename, NULL, NULL);
+    if (result < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Can't open file\n");
+        return result;
+    }
+
+    result = avformat_find_stream_info(fmt_ctx, NULL);
+    if (result < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Can't get stream info\n");
+        return result;
+    }
+
+    video_stream = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, NULL, 0);
+    if (video_stream < 0) {
+      av_log(NULL, AV_LOG_ERROR, "Can't find video stream in input file\n");
+      return -1;
+    }
+
+    origin_par = fmt_ctx->streams[video_stream]->codecpar;
+
+    codec = avcodec_find_decoder(origin_par->codec_id);
+    if (!codec) {
+        av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n");
+        return -1;
+    }
+
+    ctx = avcodec_alloc_context3(codec);
+    if (!ctx) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate decoder context\n");
+        return AVERROR(ENOMEM);
+    }
+
+    result = avcodec_parameters_to_context(ctx, origin_par);
+    if (result) {
+        av_log(NULL, AV_LOG_ERROR, "Can't copy decoder context\n");
+        return result;
+    }
+
+    result = avcodec_open2(ctx, codec, NULL);
+    if (result < 0) {
+        av_log(ctx, AV_LOG_ERROR, "Can't open decoder\n");
+        return result;
+    }
+
+    fr = av_frame_alloc();
+    if (!fr) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate frame\n");
+        return AVERROR(ENOMEM);
+    }
+
+    byte_buffer_size = av_image_get_buffer_size(ctx->pix_fmt, ctx->width, ctx->height, 16);
+    byte_buffer = av_malloc(byte_buffer_size);
+    if (!byte_buffer) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate buffer\n");
+        return AVERROR(ENOMEM);
+    }
+
+    printf("#tb %d: %d/%d\n", video_stream, fmt_ctx->streams[video_stream]->time_base.num, fmt_ctx->streams[video_stream]->time_base.den);
+    i = 0;
+    av_init_packet(&pkt);
+    do {
+        if (!end_of_stream)
+            if (av_read_frame(fmt_ctx, &pkt) < 0)
+                end_of_stream = 1;
+        if (end_of_stream) {
+            pkt.data = NULL;
+            pkt.size = 0;
+        }
+        if (pkt.stream_index == video_stream || end_of_stream) {
+            got_frame = 0;
+            if (pkt.pts == AV_NOPTS_VALUE)
+                pkt.pts = pkt.dts = i;
+            result = avcodec_decode_video2(ctx, fr, &got_frame, &pkt);
+            if (result < 0) {
+                av_log(NULL, AV_LOG_ERROR, "Error decoding frame\n");
+                return result;
+            }
+            if (got_frame) {
+                number_of_written_bytes = av_image_copy_to_buffer(byte_buffer, byte_buffer_size,
+                                        (const uint8_t* const *)fr->data, (const int*) fr->linesize,
+                                        ctx->pix_fmt, ctx->width, ctx->height, 1);
+                if (number_of_written_bytes < 0) {
+                    av_log(NULL, AV_LOG_ERROR, "Can't copy image to buffer\n");
+                    return number_of_written_bytes;
+                }
+                printf("%d, %10"PRId64", %10"PRId64", %8"PRId64", %8d, 0x%08lx\n", video_stream,
+                        fr->pts, fr->pkt_dts, fr->pkt_duration,
+                        number_of_written_bytes, av_adler32_update(0, (const uint8_t*)byte_buffer, number_of_written_bytes));
+            }
+            av_packet_unref(&pkt);
+            av_init_packet(&pkt);
+        }
+        i++;
+    } while (!end_of_stream || got_frame);
+
+    av_packet_unref(&pkt);
+    av_frame_free(&fr);
+    avcodec_close(ctx);
+    avformat_close_input(&fmt_ctx);
+    avcodec_free_context(&ctx);
+    av_freep(&byte_buffer);
+    return 0;
+}
+
+int main(int argc, char **argv)
+{
+    if (argc < 2)
+    {
+        av_log(NULL, AV_LOG_ERROR, "Incorrect input\n");
+        return 1;
+    }
+
+    av_register_all();
+
+    if (video_decode_example(argv[1]) != 0)
+        return 1;
+
+    return 0;
+}
diff --git a/tests/api/api-seek-test.c b/tests/api/api-seek-test.c
new file mode 100644
index 0000000000..2b32cb9e4f
--- /dev/null
+++ b/tests/api/api-seek-test.c
@@ -0,0 +1,288 @@
+/*
+ * Copyright (c) 2015 Ludmila Glinskih
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Seek test.
+ */
+
+#include "libavutil/adler32.h"
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
+#include "libavutil/imgutils.h"
+
+int64_t *pts_array;
+uint32_t *crc_array;
+int size_of_array;
+int number_of_elements;
+
+static int add_crc_to_array(uint32_t crc, int64_t pts)
+{
+    if (size_of_array <= number_of_elements) {
+        if (size_of_array == 0)
+            size_of_array = 10;
+        size_of_array *= 2;
+        crc_array = av_realloc_f(crc_array, size_of_array, sizeof(uint32_t));
+        pts_array = av_realloc_f(pts_array, size_of_array, sizeof(int64_t));
+        if ((crc_array == NULL) || (pts_array == NULL)) {
+            av_log(NULL, AV_LOG_ERROR, "Can't allocate array to store crcs\n");
+            return AVERROR(ENOMEM);
+        }
+    }
+    crc_array[number_of_elements] = crc;
+    pts_array[number_of_elements] = pts;
+    number_of_elements++;
+    return 0;
+}
+
+static int compare_crc_in_array(uint32_t crc, int64_t pts)
+{
+    int i;
+    for (i = 0; i < number_of_elements; i++) {
+        if (pts_array[i] == pts) {
+            if (crc_array[i] == crc) {
+                printf("Comparing 0x%08"PRIx32" %"PRId64" %d is OK\n", crc, pts, i);
+                return 0;
+            }
+            else {
+                av_log(NULL, AV_LOG_ERROR, "Incorrect crc of a frame after seeking\n");
+                return -1;
+            }
+        }
+    }
+    av_log(NULL, AV_LOG_ERROR, "Incorrect pts of a frame after seeking\n");
+    return -1;
+}
+
+static int compute_crc_of_packets(AVFormatContext *fmt_ctx, int video_stream,
+                                AVCodecContext *ctx, AVFrame *fr, uint64_t ts_start, uint64_t ts_end, int no_seeking)
+{
+    int number_of_written_bytes;
+    int got_frame = 0;
+    int result;
+    int end_of_stream = 0;
+    int byte_buffer_size;
+    uint8_t *byte_buffer;
+    uint32_t crc;
+    AVPacket pkt;
+
+    byte_buffer_size = av_image_get_buffer_size(ctx->pix_fmt, ctx->width, ctx->height, 16);
+    byte_buffer = av_malloc(byte_buffer_size);
+    if (!byte_buffer) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate buffer\n");
+        return AVERROR(ENOMEM);
+    }
+
+    if (!no_seeking) {
+        result = av_seek_frame(fmt_ctx, video_stream, ts_start, AVSEEK_FLAG_ANY);
+        printf("Seeking to %"PRId64", computing crc for frames with pts < %"PRId64"\n", ts_start, ts_end);
+        if (result < 0) {
+            av_log(NULL, AV_LOG_ERROR, "Error in seeking\n");
+            return result;
+        }
+        avcodec_flush_buffers(ctx);
+    }
+
+    av_init_packet(&pkt);
+    do {
+        if (!end_of_stream)
+            if (av_read_frame(fmt_ctx, &pkt) < 0)
+                end_of_stream = 1;
+        if (end_of_stream) {
+            pkt.data = NULL;
+            pkt.size = 0;
+        }
+        if (pkt.stream_index == video_stream || end_of_stream) {
+            got_frame = 0;
+            if ((pkt.pts == AV_NOPTS_VALUE) && (!end_of_stream)) {
+                av_log(NULL, AV_LOG_ERROR, "Error: frames doesn't have pts values\n");
+                return -1;
+            }
+            result = avcodec_decode_video2(ctx, fr, &got_frame, &pkt);
+            if (result < 0) {
+                av_log(NULL, AV_LOG_ERROR, "Error decoding frame\n");
+                return result;
+            }
+            if (got_frame) {
+                number_of_written_bytes = av_image_copy_to_buffer(byte_buffer, byte_buffer_size,
+                                        (const uint8_t* const *)fr->data, (const int*) fr->linesize,
+                                        ctx->pix_fmt, ctx->width, ctx->height, 1);
+                if (number_of_written_bytes < 0) {
+                    av_log(NULL, AV_LOG_ERROR, "Can't copy image to buffer\n");
+                    return number_of_written_bytes;
+                }
+                if ((!no_seeking) && (fr->pts > ts_end))
+                    break;
+                crc = av_adler32_update(0, (const uint8_t*)byte_buffer, number_of_written_bytes);
+                printf("%10"PRId64", 0x%08"PRIx32"\n", fr->pts, crc);
+                if (no_seeking) {
+                    if (add_crc_to_array(crc, fr->pts) < 0)
+                        return -1;
+                }
+                else {
+                    if (compare_crc_in_array(crc, fr->pts) < 0)
+                        return -1;
+                }
+            }
+        }
+        av_packet_unref(&pkt);
+        av_init_packet(&pkt);
+    } while ((!end_of_stream || got_frame) && (no_seeking || (fr->pts + fr->pkt_duration <= ts_end)));
+
+    av_packet_unref(&pkt);
+    av_freep(&byte_buffer);
+
+    return 0;
+}
+
+static long int read_seek_range(const char *string_with_number)
+{
+    long int number;
+    char *end_of_string = NULL;
+    number = strtol(string_with_number, &end_of_string, 10);
+    if ((strlen(string_with_number) != end_of_string - string_with_number)  || (number < 0)) {
+        av_log(NULL, AV_LOG_ERROR, "Incorrect input ranges of seeking\n");
+        return -1;
+    }
+    else if ((number == LONG_MAX) || (number == LONG_MIN)) {
+        if (errno == ERANGE) {
+            av_log(NULL, AV_LOG_ERROR, "Incorrect input ranges of seeking\n");
+            return -1;
+        }
+    }
+    return number;
+}
+
+static int seek_test(const char *input_filename, const char *start, const char *end)
+{
+    AVCodec *codec = NULL;
+    AVCodecContext *ctx= NULL;
+    AVCodecParameters *origin_par = NULL;
+    AVFrame *fr = NULL;
+    AVFormatContext *fmt_ctx = NULL;
+    int video_stream;
+    int result;
+    int i, j;
+    long int start_ts, end_ts;
+
+    size_of_array = 0;
+    number_of_elements = 0;
+    crc_array = NULL;
+    pts_array = NULL;
+
+    result = avformat_open_input(&fmt_ctx, input_filename, NULL, NULL);
+    if (result < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Can't open file\n");
+        return result;
+    }
+
+    result = avformat_find_stream_info(fmt_ctx, NULL);
+    if (result < 0) {
+        av_log(NULL, AV_LOG_ERROR, "Can't get stream info\n");
+        goto end;
+    }
+
+    start_ts = read_seek_range(start);
+    end_ts = read_seek_range(end);
+    if ((start_ts < 0) || (end_ts < 0)) {
+        result = -1;
+        goto end;
+    }
+
+    //TODO: add ability to work with audio format
+    video_stream = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, NULL, 0);
+    if (video_stream < 0) {
+      av_log(NULL, AV_LOG_ERROR, "Can't find video stream in input file\n");
+      result = video_stream;
+      goto end;
+    }
+
+    origin_par = fmt_ctx->streams[video_stream]->codecpar;
+
+    codec = avcodec_find_decoder(origin_par->codec_id);
+    if (!codec) {
+        av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n");
+        result = AVERROR_DECODER_NOT_FOUND;
+        goto end;
+    }
+
+    ctx = avcodec_alloc_context3(codec);
+    if (!ctx) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate decoder context\n");
+        result = AVERROR(ENOMEM);
+        goto end;
+    }
+
+    result = avcodec_parameters_to_context(ctx, origin_par);
+    if (result) {
+        av_log(NULL, AV_LOG_ERROR, "Can't copy decoder context\n");
+        goto end;
+    }
+
+    result = avcodec_open2(ctx, codec, NULL);
+    if (result < 0) {
+        av_log(ctx, AV_LOG_ERROR, "Can't open decoder\n");
+        goto end;
+    }
+
+    fr = av_frame_alloc();
+    if (!fr) {
+        av_log(NULL, AV_LOG_ERROR, "Can't allocate frame\n");
+        result = AVERROR(ENOMEM);
+        goto end;
+    }
+
+    result = compute_crc_of_packets(fmt_ctx, video_stream, ctx, fr, 0, 0, 1);
+    if (result != 0)
+        goto end;
+
+    for (i = start_ts; i < end_ts; i += 100) {
+        for (j = i + 100; j < end_ts; j += 100) {
+            result = compute_crc_of_packets(fmt_ctx, video_stream, ctx, fr, i, j, 0);
+            if (result != 0)
+                break;
+        }
+    }
+
+end:
+    av_freep(&crc_array);
+    av_freep(&pts_array);
+    av_frame_free(&fr);
+    avcodec_close(ctx);
+    avformat_close_input(&fmt_ctx);
+    avcodec_free_context(&ctx);
+    return result;
+}
+
+int main(int argc, char **argv)
+{
+    if (argc < 4) {
+        av_log(NULL, AV_LOG_ERROR, "Incorrect input\n");
+        return 1;
+    }
+
+    av_register_all();
+
+    if (seek_test(argv[1], argv[2], argv[3]) != 0)
+        return 1;
+
+    return 0;
+}
diff --git a/tests/api/api-threadmessage-test.c b/tests/api/api-threadmessage-test.c
new file mode 100644
index 0000000000..05a8062b8c
--- /dev/null
+++ b/tests/api/api-threadmessage-test.c
@@ -0,0 +1,260 @@
+/*
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+/**
+ * Thread message API test
+ */
+
+#include "libavutil/avassert.h"
+#include "libavutil/avstring.h"
+#include "libavutil/frame.h"
+#include "libavutil/threadmessage.h"
+#include "libavutil/thread.h" // not public
+
+struct sender_data {
+    int id;
+    pthread_t tid;
+    int workload;
+    AVThreadMessageQueue *queue;
+};
+
+/* same as sender_data but shuffled for testing purpose */
+struct receiver_data {
+    pthread_t tid;
+    int workload;
+    int id;
+    AVThreadMessageQueue *queue;
+};
+
+struct message {
+    AVFrame *frame;
+    // we add some junk in the message to make sure the message size is >
+    // sizeof(void*)
+    int magic;
+};
+
+#define MAGIC 0xdeadc0de
+
+static void free_frame(void *arg)
+{
+    struct message *msg = arg;
+    av_assert0(msg->magic == MAGIC);
+    av_frame_free(&msg->frame);
+}
+
+static void *sender_thread(void *arg)
+{
+    int i, ret = 0;
+    struct sender_data *wd = arg;
+
+    av_log(NULL, AV_LOG_INFO, "sender #%d: workload=%d\n", wd->id, wd->workload);
+    for (i = 0; i < wd->workload; i++) {
+        if (rand() % wd->workload < wd->workload / 10) {
+            av_log(NULL, AV_LOG_INFO, "sender #%d: flushing the queue\n", wd->id);
+            av_thread_message_flush(wd->queue);
+        } else {
+            char *val;
+            AVDictionary *meta = NULL;
+            struct message msg = {
+                .magic = MAGIC,
+                .frame = av_frame_alloc(),
+            };
+
+            if (!msg.frame) {
+                ret = AVERROR(ENOMEM);
+                break;
+            }
+
+            /* we add some metadata to identify the frames */
+            val = av_asprintf("frame %d/%d from sender %d",
+                              i + 1, wd->workload, wd->id);
+            if (!val) {
+                av_frame_free(&msg.frame);
+                ret = AVERROR(ENOMEM);
+                break;
+            }
+            ret = av_dict_set(&meta, "sig", val, AV_DICT_DONT_STRDUP_VAL);
+            if (ret < 0) {
+                av_frame_free(&msg.frame);
+                break;
+            }
+            msg.frame->metadata = meta;
+
+            /* allocate a real frame in order to simulate "real" work */
+            msg.frame->format = AV_PIX_FMT_RGBA;
+            msg.frame->width  = 320;
+            msg.frame->height = 240;
+            ret = av_frame_get_buffer(msg.frame, 32);
+            if (ret < 0) {
+                av_frame_free(&msg.frame);
+                break;
+            }
+
+            /* push the frame in the common queue */
+            av_log(NULL, AV_LOG_INFO, "sender #%d: sending my work (%d/%d frame:%p)\n",
+                   wd->id, i + 1, wd->workload, msg.frame);
+            ret = av_thread_message_queue_send(wd->queue, &msg, 0);
+            if (ret < 0) {
+                av_frame_free(&msg.frame);
+                break;
+            }
+        }
+    }
+    av_log(NULL, AV_LOG_INFO, "sender #%d: my work is done here (%s)\n",
+           wd->id, av_err2str(ret));
+    av_thread_message_queue_set_err_recv(wd->queue, ret < 0 ? ret : AVERROR_EOF);
+    return NULL;
+}
+
+static void *receiver_thread(void *arg)
+{
+    int i, ret = 0;
+    struct receiver_data *rd = arg;
+
+    for (i = 0; i < rd->workload; i++) {
+        if (rand() % rd->workload < rd->workload / 10) {
+            av_log(NULL, AV_LOG_INFO, "receiver #%d: flushing the queue\n", rd->id);
+            av_thread_message_flush(rd->queue);
+        } else {
+            struct message msg;
+            AVDictionary *meta;
+            AVDictionaryEntry *e;
+
+            ret = av_thread_message_queue_recv(rd->queue, &msg, 0);
+            if (ret < 0)
+                break;
+            av_assert0(msg.magic == MAGIC);
+            meta = msg.frame->metadata;
+            e = av_dict_get(meta, "sig", NULL, 0);
+            av_log(NULL, AV_LOG_INFO, "got \"%s\" (%p)\n", e->value, msg.frame);
+            av_frame_free(&msg.frame);
+        }
+    }
+
+    av_log(NULL, AV_LOG_INFO, "consumed enough (%d), stop\n", i);
+    av_thread_message_queue_set_err_send(rd->queue, ret < 0 ? ret : AVERROR_EOF);
+
+    return NULL;
+}
+
+static int get_workload(int minv, int maxv)
+{
+    return maxv == minv ? maxv : rand() % (maxv - minv) + minv;
+}
+
+int main(int ac, char **av)
+{
+    int i, ret = 0;
+    int max_queue_size;
+    int nb_senders, sender_min_load, sender_max_load;
+    int nb_receivers, receiver_min_load, receiver_max_load;
+    struct sender_data *senders;
+    struct receiver_data *receivers;
+    AVThreadMessageQueue *queue = NULL;
+
+    if (ac != 8) {
+        av_log(NULL, AV_LOG_ERROR, "%s <max_queue_size> "
+               "<nb_senders> <sender_min_send> <sender_max_send> "
+               "<nb_receivers> <receiver_min_recv> <receiver_max_recv>\n", av[0]);
+        return 1;
+    }
+
+    max_queue_size    = atoi(av[1]);
+    nb_senders        = atoi(av[2]);
+    sender_min_load   = atoi(av[3]);
+    sender_max_load   = atoi(av[4]);
+    nb_receivers      = atoi(av[5]);
+    receiver_min_load = atoi(av[6]);
+    receiver_max_load = atoi(av[7]);
+
+    if (max_queue_size <= 0 ||
+        nb_senders <= 0 || sender_min_load <= 0 || sender_max_load <= 0 ||
+        nb_receivers <= 0 || receiver_min_load <= 0 || receiver_max_load <= 0) {
+        av_log(NULL, AV_LOG_ERROR, "negative values not allowed\n");
+        return 1;
+    }
+
+    av_log(NULL, AV_LOG_INFO, "qsize:%d / %d senders sending [%d-%d] / "
+           "%d receivers receiving [%d-%d]\n", max_queue_size,
+           nb_senders, sender_min_load, sender_max_load,
+           nb_receivers, receiver_min_load, receiver_max_load);
+
+    senders = av_mallocz_array(nb_senders, sizeof(*senders));
+    receivers = av_mallocz_array(nb_receivers, sizeof(*receivers));
+    if (!senders || !receivers) {
+        ret = AVERROR(ENOMEM);
+        goto end;
+    }
+
+    ret = av_thread_message_queue_alloc(&queue, max_queue_size, sizeof(struct message));
+    if (ret < 0)
+        goto end;
+
+    av_thread_message_queue_set_free_func(queue, free_frame);
+
+#define SPAWN_THREADS(type) do {                                                \
+    for (i = 0; i < nb_##type##s; i++) {                                        \
+        struct type##_data *td = &type##s[i];                                   \
+                                                                                \
+        td->id = i;                                                             \
+        td->queue = queue;                                                      \
+        td->workload = get_workload(type##_min_load, type##_max_load);          \
+                                                                                \
+        ret = pthread_create(&td->tid, NULL, type##_thread, td);                \
+        if (ret) {                                                              \
+            const int err = AVERROR(ret);                                       \
+            av_log(NULL, AV_LOG_ERROR, "Unable to start " AV_STRINGIFY(type)    \
+                   " thread: %s\n", av_err2str(err));                           \
+            goto end;                                                           \
+        }                                                                       \
+    }                                                                           \
+} while (0)
+
+#define WAIT_THREADS(type) do {                                                 \
+    for (i = 0; i < nb_##type##s; i++) {                                        \
+        struct type##_data *td = &type##s[i];                                   \
+                                                                                \
+        ret = pthread_join(td->tid, NULL);                                      \
+        if (ret) {                                                              \
+            const int err = AVERROR(ret);                                       \
+            av_log(NULL, AV_LOG_ERROR, "Unable to join " AV_STRINGIFY(type)     \
+                   " thread: %s\n", av_err2str(err));                           \
+            goto end;                                                           \
+        }                                                                       \
+    }                                                                           \
+} while (0)
+
+    SPAWN_THREADS(receiver);
+    SPAWN_THREADS(sender);
+
+    WAIT_THREADS(sender);
+    WAIT_THREADS(receiver);
+
+end:
+    av_thread_message_queue_free(&queue);
+    av_freep(&senders);
+    av_freep(&receivers);
+
+    if (ret < 0 && ret != AVERROR_EOF) {
+        av_log(NULL, AV_LOG_ERROR, "Error: %s\n", av_err2str(ret));
+        return 1;
+    }
+    return 0;
+}
diff --git a/tests/audiogen.c b/tests/audiogen.c
index 7f9caedd4e..8d596b5108 100644
--- a/tests/audiogen.c
+++ b/tests/audiogen.c
@@ -4,20 +4,20 @@
  *
  * Copyright (c) 2002 Fabrice Bellard
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * 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.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
diff --git a/tests/audiomatch.c b/tests/audiomatch.c
new file mode 100644
index 0000000000..ca56df09b3
--- /dev/null
+++ b/tests/audiomatch.c
@@ -0,0 +1,110 @@
+/*
+ * 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <inttypes.h>
+
+#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
+#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
+
+static int64_t fsize(FILE *f){
+    int64_t end, pos= ftell(f);
+    fseek(f, 0, SEEK_END);
+    end = ftell(f);
+    fseek(f, pos, SEEK_SET);
+    return end;
+}
+
+int main(int argc, char **argv){
+    FILE *f[2];
+    int i, pos;
+    int siglen, datlen;
+    int bestpos = 0;
+    double bestc=0;
+    double sigamp= 0;
+    int16_t *signal, *data;
+    int maxshift= 16384;
+
+    if (argc < 3) {
+        printf("audiomatch <testfile> <reffile>\n");
+        printf("WAV headers are skipped automatically.\n");
+        return 1;
+    }
+
+    f[0] = fopen(argv[1], "rb");
+    f[1] = fopen(argv[2], "rb");
+    if (!f[0] || !f[1]) {
+        fprintf(stderr, "Could not open input files.\n");
+        return 1;
+    }
+
+    for (i = 0; i < 2; i++) {
+        uint8_t p[100];
+        if (fread(p, 1, 12, f[i]) != 12)
+            return 1;
+        if (!memcmp(p, "RIFF", 4) &&
+            !memcmp(p + 8, "WAVE", 4)) {
+            if (fread(p, 1, 8, f[i]) != 8)
+                return 1;
+            while (memcmp(p, "data", 4)) {
+                int s = p[4] | p[5] << 8 | p[6] << 16 | p[7] << 24;
+                fseek(f[i], s, SEEK_CUR);
+                if (fread(p, 1, 8, f[i]) != 8)
+                    return 1;
+            }
+        } else {
+            fseek(f[i], -12, SEEK_CUR);
+        }
+    }
+
+    datlen = fsize(f[0]) - ftell(f[0]);
+    siglen = fsize(f[1]) - ftell(f[1]);
+    data   = malloc(datlen * sizeof(*data));
+    signal = malloc(siglen * sizeof(*signal));
+
+    fread(data  , 1, datlen, f[0]);
+    fread(signal, 1, siglen, f[1]);
+    datlen /= 2;
+    siglen /= 2;
+
+    for(i=0; i<siglen; i++){
+        signal[i] = ((uint8_t*)(signal + i))[0] + 256*((uint8_t*)(signal + i))[1];
+        sigamp += signal[i] * signal[i];
+    }
+    for(i=0; i<datlen; i++)
+        data[i] = ((uint8_t*)(data + i))[0] + 256*((uint8_t*)(data + i))[1];
+
+    for(pos = 0; pos<maxshift; pos = pos < 0 ? -pos: -pos-1){
+        int64_t c= 0;
+        int testlen = FFMIN(siglen, datlen-pos);
+        for(i=FFMAX(0, -pos); i<testlen; i++){
+            int j= pos+i;
+            c += signal[i] * data[j];
+        }
+        if(fabs(c) > sigamp * 0.94)
+            maxshift = FFMIN(maxshift, fabs(pos)+32);
+        if(fabs(c)>fabs(bestc)){
+            bestc= c;
+            bestpos = pos;
+        }
+    }
+    printf("presig: %d postsig:%d c:%7.4f lenerr:%d\n", bestpos, datlen - siglen - bestpos, bestc / sigamp, datlen - siglen);
+}
diff --git a/tests/base64.c b/tests/base64.c
index 6462d9aa7a..5035ad96a7 100644
--- a/tests/base64.c
+++ b/tests/base64.c
@@ -1,18 +1,18 @@
 /*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * 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.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile
index d5febec74c..74f07f11cd 100644
--- a/tests/checkasm/Makefile
+++ b/tests/checkasm/Makefile
@@ -3,21 +3,40 @@
 AVCODECOBJS-$(CONFIG_AUDIODSP)          += audiodsp.o
 AVCODECOBJS-$(CONFIG_BLOCKDSP)          += blockdsp.o
 AVCODECOBJS-$(CONFIG_BSWAPDSP)          += bswapdsp.o
+AVCODECOBJS-$(CONFIG_FLACDSP)           += flacdsp.o
 AVCODECOBJS-$(CONFIG_FMTCONVERT)        += fmtconvert.o
-AVCODECOBJS-$(CONFIG_HUFFYUVDSP)        += huffyuvdsp.o
+AVCODECOBJS-$(CONFIG_G722DSP)           += g722dsp.o
 AVCODECOBJS-$(CONFIG_H264DSP)           += h264dsp.o
 AVCODECOBJS-$(CONFIG_H264PRED)          += h264pred.o
 AVCODECOBJS-$(CONFIG_H264QPEL)          += h264qpel.o
+AVCODECOBJS-$(CONFIG_LLVIDDSP)          += llviddsp.o
 AVCODECOBJS-$(CONFIG_VP8DSP)            += vp8dsp.o
+AVCODECOBJS-$(CONFIG_VIDEODSP)          += videodsp.o
 
 # decoders/encoders
-AVCODECOBJS-$(CONFIG_DCA_DECODER)       += dcadsp.o synth_filter.o
-AVCODECOBJS-$(CONFIG_HEVC_DECODER)      += hevc_add_res.o hevc_idct.o hevc_mc.o
+AVCODECOBJS-$(CONFIG_AAC_DECODER)       += aacpsdsp.o \
+                                           sbrdsp.o
+AVCODECOBJS-$(CONFIG_ALAC_DECODER)      += alacdsp.o
+AVCODECOBJS-$(CONFIG_DCA_DECODER)       += synth_filter.o
+AVCODECOBJS-$(CONFIG_EXR_DECODER)       += exrdsp.o
+AVCODECOBJS-$(CONFIG_JPEG2000_DECODER)  += jpeg2000dsp.o
+AVCODECOBJS-$(CONFIG_PIXBLOCKDSP)       += pixblockdsp.o
+AVCODECOBJS-$(CONFIG_HEVC_DECODER)      += hevc_add_res.o hevc_idct.o
 AVCODECOBJS-$(CONFIG_V210_ENCODER)      += v210enc.o
 AVCODECOBJS-$(CONFIG_VP9_DECODER)       += vp9dsp.o
 
 CHECKASMOBJS-$(CONFIG_AVCODEC)          += $(AVCODECOBJS-yes)
 
+# libavfilter tests
+AVFILTEROBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o
+AVFILTEROBJS-$(CONFIG_COLORSPACE_FILTER) += vf_colorspace.o
+
+CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes)
+
+AVUTILOBJS                              += fixed_dsp.o
+AVUTILOBJS                              += float_dsp.o
+
+CHECKASMOBJS-$(CONFIG_AVUTIL)  += $(AVUTILOBJS)
 
 CHECKASMOBJS-$(ARCH_AARCH64)            += aarch64/checkasm.o
 CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL)   += arm/checkasm.o
@@ -32,14 +51,16 @@ CHECKASMDIRS := $(sort $(dir $(CHECKASMOBJS)))
 $(CHECKASMOBJS): | $(CHECKASMDIRS)
 OBJDIRS += $(CHECKASMDIRS)
 
+tests/checkasm/checkasm.o: CFLAGS += -Umain
+
 CHECKASM := tests/checkasm/checkasm$(EXESUF)
 
 $(CHECKASM): $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS)
-	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS) $(EXTRALIBS-avcodec) $(EXTRALIBS-avutil) $(EXTRALIBS)
+	$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS) $(EXTRALIBS-avcodec) $(EXTRALIBS-avfilter) $(EXTRALIBS-avutil) $(EXTRALIBS)
 
 checkasm: $(CHECKASM)
 
-clean:: checkasmclean
+testclean:: checkasmclean
 
 checkasmclean:
 	$(RM) $(CHECKASM) $(CLEANSUFFIXES:%=tests/checkasm/%) $(CLEANSUFFIXES:%=tests/checkasm/$(ARCH)/%)
diff --git a/tests/checkasm/aacpsdsp.c b/tests/checkasm/aacpsdsp.c
new file mode 100644
index 0000000000..ea68b39fa9
--- /dev/null
+++ b/tests/checkasm/aacpsdsp.c
@@ -0,0 +1,243 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 "libavcodec/aacpsdsp.h"
+
+#include "checkasm.h"
+
+#define N 32
+#define STRIDE 128
+#define BUF_SIZE (N * STRIDE)
+
+#define randomize(buf, len) do {                                \
+    int i;                                                      \
+    for (i = 0; i < len; i++) {                                 \
+        const INTFLOAT f = (INTFLOAT)rnd() / UINT_MAX;          \
+        (buf)[i] = f;                                           \
+    }                                                           \
+} while (0)
+
+#define EPS 0.005
+
+static void test_add_squares(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(INTFLOAT, src, [BUF_SIZE], [2]);
+
+    declare_func(void, INTFLOAT *dst,
+                 const INTFLOAT (*src)[2], int n);
+
+    randomize((INTFLOAT *)src, BUF_SIZE * 2);
+    randomize(dst0, BUF_SIZE);
+    memcpy(dst1, dst0, BUF_SIZE * sizeof(INTFLOAT));
+    call_ref(dst0, src, BUF_SIZE);
+    call_new(dst1, src, BUF_SIZE);
+    if (!float_near_abs_eps_array(dst0, dst1, EPS, BUF_SIZE))
+        fail();
+    bench_new(dst1, src, BUF_SIZE);
+}
+
+static void test_mul_pair_single(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [BUF_SIZE], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [BUF_SIZE], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, src0, [BUF_SIZE], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, src1, [BUF_SIZE]);
+
+    declare_func(void, INTFLOAT (*dst)[2],
+                       INTFLOAT (*src0)[2], INTFLOAT *src1, int n);
+
+    randomize((INTFLOAT *)src0, BUF_SIZE * 2);
+    randomize(src1, BUF_SIZE);
+    call_ref(dst0, src0, src1, BUF_SIZE);
+    call_new(dst1, src0, src1, BUF_SIZE);
+    if (!float_near_abs_eps_array((float *)dst0, (float *)dst1, EPS, BUF_SIZE * 2))
+        fail();
+    bench_new(dst1, src0, src1, BUF_SIZE);
+}
+
+static void test_hybrid_analysis(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [BUF_SIZE], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [BUF_SIZE], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, in, [13], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, filter, [N], [8][2]);
+
+    declare_func(void, INTFLOAT (*out)[2], INTFLOAT (*in)[2],
+                 const INTFLOAT (*filter)[8][2],
+                 ptrdiff_t stride, int n);
+
+    randomize((INTFLOAT *)in, 13 * 2);
+    randomize((INTFLOAT *)filter, N * 8 * 2);
+
+    randomize((INTFLOAT *)dst0, BUF_SIZE * 2);
+    memcpy(dst1, dst0, BUF_SIZE * 2 * sizeof(INTFLOAT));
+
+    call_ref(dst0, in, filter, STRIDE, N);
+    call_new(dst1, in, filter, STRIDE, N);
+
+    if (!float_near_abs_eps_array((float *)dst0, (float *)dst1, EPS, BUF_SIZE * 2))
+        fail();
+    bench_new(dst1, in, filter, STRIDE, N);
+}
+
+static void test_hybrid_analysis_ileave(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, in,   [2], [38][64]);
+    LOCAL_ALIGNED_16(INTFLOAT, out0, [91], [32][2]);
+    LOCAL_ALIGNED_16(INTFLOAT, out1, [91], [32][2]);
+
+    declare_func(void, INTFLOAT (*out)[32][2], INTFLOAT L[2][38][64],
+                       int i, int len);
+
+    randomize((INTFLOAT *)out0, 91 * 32 * 2);
+    randomize((INTFLOAT *)in,    2 * 38 * 64);
+    memcpy(out1, out0, 91 * 32 * 2 * sizeof(INTFLOAT));
+
+    /* len is hardcoded to 32 as that's the only value used in
+       libavcodec. asm functions are likely to be optimized
+       hardcoding this value in their loops and could fail with
+       anything else.
+       i is hardcoded to the two values currently used by the
+       aac decoder because the arm neon implementation is
+       micro-optimized for them and will fail for almost every
+       other value. */
+    call_ref(out0, in, 3, 32);
+    call_new(out1, in, 3, 32);
+
+    /* the function just moves data around, so memcmp is enough */
+    if (memcmp(out0, out1, 91 * 32 * 2 * sizeof(INTFLOAT)))
+        fail();
+
+    call_ref(out0, in, 5, 32);
+    call_new(out1, in, 5, 32);
+
+    if (memcmp(out0, out1, 91 * 32 * 2 * sizeof(INTFLOAT)))
+        fail();
+
+    bench_new(out1, in, 3, 32);
+}
+
+static void test_hybrid_synthesis_deint(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, out0, [2], [38][64]);
+    LOCAL_ALIGNED_16(INTFLOAT, out1, [2], [38][64]);
+    LOCAL_ALIGNED_16(INTFLOAT, in,  [91], [32][2]);
+
+    declare_func(void, INTFLOAT out[2][38][64], INTFLOAT (*in)[32][2],
+                       int i, int len);
+
+    randomize((INTFLOAT *)in,  91 * 32 * 2);
+    randomize((INTFLOAT *)out0, 2 * 38 * 64);
+    memcpy(out1, out0, 2 * 38 * 64 * sizeof(INTFLOAT));
+
+    /* len is hardcoded to 32 as that's the only value used in
+       libavcodec. asm functions are likely to be optimized
+       hardcoding this value in their loops and could fail with
+       anything else.
+       i is hardcoded to the two values currently used by the
+       aac decoder because the arm neon implementation is
+       micro-optimized for them and will fail for almost every
+       other value. */
+    call_ref(out0, in, 3, 32);
+    call_new(out1, in, 3, 32);
+
+    /* the function just moves data around, so memcmp is enough */
+    if (memcmp(out0, out1, 2 * 38 * 64 * sizeof(INTFLOAT)))
+        fail();
+
+    call_ref(out0, in, 5, 32);
+    call_new(out1, in, 5, 32);
+
+    if (memcmp(out0, out1, 2 * 38 * 64 * sizeof(INTFLOAT)))
+        fail();
+
+    bench_new(out1, in, 3, 32);
+}
+
+static void test_stereo_interpolate(PSDSPContext *psdsp)
+{
+    int i;
+    LOCAL_ALIGNED_16(INTFLOAT, l,  [BUF_SIZE], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, r,  [BUF_SIZE], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, l0, [BUF_SIZE], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, r0, [BUF_SIZE], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, l1, [BUF_SIZE], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, r1, [BUF_SIZE], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, h, [2], [4]);
+    LOCAL_ALIGNED_16(INTFLOAT, h_step, [2], [4]);
+
+    declare_func(void, INTFLOAT (*l)[2], INTFLOAT (*r)[2],
+                       INTFLOAT h[2][4], INTFLOAT h_step[2][4], int len);
+
+    randomize((INTFLOAT *)l, BUF_SIZE * 2);
+    randomize((INTFLOAT *)r, BUF_SIZE * 2);
+
+    for (i = 0; i < 2; i++) {
+        if (check_func(psdsp->stereo_interpolate[i], "ps_stereo_interpolate%s", i ? "_ipdopd" : "")) {
+            memcpy(l0, l, BUF_SIZE * 2 * sizeof(INTFLOAT));
+            memcpy(l1, l, BUF_SIZE * 2 * sizeof(INTFLOAT));
+            memcpy(r0, r, BUF_SIZE * 2 * sizeof(INTFLOAT));
+            memcpy(r1, r, BUF_SIZE * 2 * sizeof(INTFLOAT));
+
+            randomize((INTFLOAT *)h, 2 * 4);
+            randomize((INTFLOAT *)h_step, 2 * 4);
+
+            call_ref(l0, r0, h, h_step, BUF_SIZE);
+            call_new(l1, r1, h, h_step, BUF_SIZE);
+            if (!float_near_abs_eps_array((float *)l0, (float *)l1, EPS, BUF_SIZE * 2) ||
+                !float_near_abs_eps_array((float *)r0, (float *)r1, EPS, BUF_SIZE * 2))
+                fail();
+
+            memcpy(l1, l, BUF_SIZE * 2 * sizeof(INTFLOAT));
+            memcpy(r1, r, BUF_SIZE * 2 * sizeof(INTFLOAT));
+            bench_new(l1, r1, h, h_step, BUF_SIZE);
+        }
+    }
+}
+
+void checkasm_check_aacpsdsp(void)
+{
+    PSDSPContext psdsp;
+
+    ff_psdsp_init(&psdsp);
+
+    if (check_func(psdsp.add_squares, "ps_add_squares"))
+        test_add_squares();
+    report("add_squares");
+
+    if (check_func(psdsp.mul_pair_single, "ps_mul_pair_single"))
+        test_mul_pair_single();
+    report("mul_pair_single");
+
+    if (check_func(psdsp.hybrid_analysis, "ps_hybrid_analysis"))
+        test_hybrid_analysis();
+    report("hybrid_analysis");
+
+    if (check_func(psdsp.hybrid_analysis_ileave, "ps_hybrid_analysis_ileave"))
+        test_hybrid_analysis_ileave();
+    report("hybrid_analysis_ileave");
+
+    if (check_func(psdsp.hybrid_synthesis_deint, "ps_hybrid_synthesis_deint"))
+        test_hybrid_synthesis_deint();
+    report("hybrid_synthesis_deint");
+
+    test_stereo_interpolate(&psdsp);
+    report("stereo_interpolate");
+}
diff --git a/tests/checkasm/aarch64/checkasm.S b/tests/checkasm/aarch64/checkasm.S
index bc5ed9ea09..75a9a56143 100644
--- a/tests/checkasm/aarch64/checkasm.S
+++ b/tests/checkasm/aarch64/checkasm.S
@@ -3,14 +3,14 @@
  * Copyright (c) 2015 Martin Storsjo
  * Copyright (c) 2015 Janne Grunau
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
@@ -112,10 +112,10 @@ function checkasm_checked_call, export=1
     movi        v3.8h,  #0
 
 .macro check_reg_neon reg1, reg2
-    ldr         q0,  [x9], #16
-    uzp1        v1.2d,  v\reg1\().2d, v\reg2\().2d
-    eor         v0.16b, v0.16b, v1.16b
-    orr         v3.16b, v3.16b, v0.16b
+    ldr         q1,  [x9], #16
+    uzp1        v2.2d,  v\reg1\().2d, v\reg2\().2d
+    eor         v1.16b, v1.16b, v2.16b
+    orr         v3.16b, v3.16b, v1.16b
 .endm
     check_reg_neon  8,  9
     check_reg_neon  10, 11
diff --git a/tests/checkasm/alacdsp.c b/tests/checkasm/alacdsp.c
new file mode 100644
index 0000000000..cbf03f82e8
--- /dev/null
+++ b/tests/checkasm/alacdsp.c
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2015 James Almer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 <string.h>
+#include "checkasm.h"
+#include "libavcodec/alacdsp.h"
+#include "libavcodec/mathops.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+
+#define BUF_SIZE 256
+#define MAX_CHANNELS 2
+
+#define randomize_buffers()                           \
+    do {                                              \
+        int i;                                        \
+        for (i = 0; i < BUF_SIZE*MAX_CHANNELS; i++) { \
+            int32_t r = sign_extend(rnd(), 24);       \
+            ref_buf[i] = r;                           \
+            new_buf[i] = r;                           \
+        }                                             \
+    } while (0)
+
+static void check_decorrelate_stereo(void)
+{
+    LOCAL_ALIGNED_16(int32_t, ref_buf, [BUF_SIZE*MAX_CHANNELS]);
+    LOCAL_ALIGNED_16(int32_t, new_buf, [BUF_SIZE*MAX_CHANNELS]);
+    int32_t *ref[2] = { &ref_buf[BUF_SIZE*0], &ref_buf[BUF_SIZE*1] };
+    int32_t *new[2] = { &new_buf[BUF_SIZE*0], &new_buf[BUF_SIZE*1] };
+    ALACDSPContext c;
+
+    ff_alacdsp_init(&c);
+    if (check_func(c.decorrelate_stereo, "alac_decorrelate_stereo")) {
+        int len    = (rnd() & 0xFF) + 1;
+        int shift  =  rnd() & 0x1F;
+        int weight =  rnd() & 0xFF;
+        declare_func(void, int32_t *buf[2], int len, int shift, int weight);
+
+        randomize_buffers();
+        call_ref(ref, len, shift, weight);
+        call_new(new, len, shift, weight);
+        if (memcmp(ref[0], new[0], len * sizeof(int32_t)) ||
+            memcmp(ref[1], new[1], len * sizeof(int32_t)))
+            fail();
+        bench_new(new, BUF_SIZE, shift, weight);
+    }
+
+    report("decorrelate_stereo");
+}
+
+#undef randomize_buffers
+#define randomize_buffers()                           \
+    do {                                              \
+        int i, j;                                     \
+        for (i = 0; i < BUF_SIZE; i++) {              \
+            for (j = 0; j < ch; j++) {                \
+                int32_t r = sign_extend(rnd(), 24);   \
+                ref[j][i] = r;                        \
+                new[j][i] = r;                        \
+                r = rnd() & 0xFF;                     \
+                ref_ebb[j][i] = r;                    \
+                new_ebb[j][i] = r;                    \
+            }                                         \
+        }                                             \
+    } while (0)
+
+static void check_append_extra_bits(void)
+{
+    LOCAL_ALIGNED_16(int32_t, ref_buf, [BUF_SIZE*MAX_CHANNELS*2]);
+    LOCAL_ALIGNED_16(int32_t, new_buf, [BUF_SIZE*MAX_CHANNELS*2]);
+    int32_t *ref[2]     = { &ref_buf[BUF_SIZE*0], &ref_buf[BUF_SIZE*1] };
+    int32_t *new[2]     = { &new_buf[BUF_SIZE*0], &new_buf[BUF_SIZE*1] };
+    int32_t *ref_ebb[2] = { &ref_buf[BUF_SIZE*2], &ref_buf[BUF_SIZE*3] };
+    int32_t *new_ebb[2] = { &new_buf[BUF_SIZE*2], &new_buf[BUF_SIZE*3] };
+    ALACDSPContext c;
+    static const char * const channels[2] = { "mono", "stereo" };
+    int ch;
+
+    ff_alacdsp_init(&c);
+    for (ch = 1; ch <= 2; ch++) {
+        if (check_func(c.append_extra_bits[ch-1], "alac_append_extra_bits_%s", channels[ch-1])) {
+            int len    = (rnd() & 0xFF) + 1;
+            declare_func(void, int32_t *buf[2], int32_t *ebb[2], int ebits, int ch, int len);
+
+            randomize_buffers();
+            call_ref(ref, ref_ebb, 8, ch, len);
+            call_new(new, new_ebb, 8, ch, len);
+            if (            memcmp(ref[0], new[0], len * sizeof(int32_t)) ||
+                (ch == 2 && memcmp(ref[1], new[1], len * sizeof(int32_t))))
+                fail();
+            bench_new(new, new_ebb, 8, ch, BUF_SIZE);
+        }
+    }
+
+    report("append_extra_bits");
+}
+
+void checkasm_check_alacdsp(void)
+{
+    check_decorrelate_stereo();
+    check_append_extra_bits();
+}
diff --git a/tests/checkasm/arm/checkasm.S b/tests/checkasm/arm/checkasm.S
index 237252f978..2051b290f6 100644
--- a/tests/checkasm/arm/checkasm.S
+++ b/tests/checkasm/arm/checkasm.S
@@ -3,14 +3,14 @@
  * Copyright (c) 2015 Martin Storsjo
  * Copyright (c) 2015 Janne Grunau
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
diff --git a/tests/checkasm/audiodsp.c b/tests/checkasm/audiodsp.c
index 40fa3844e8..7c4e16e40d 100644
--- a/tests/checkasm/audiodsp.c
+++ b/tests/checkasm/audiodsp.c
@@ -1,18 +1,18 @@
 /*
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
diff --git a/tests/checkasm/blockdsp.c b/tests/checkasm/blockdsp.c
index f10e2ff578..c753506b3c 100644
--- a/tests/checkasm/blockdsp.c
+++ b/tests/checkasm/blockdsp.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2015 Henrik Gramner
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -53,11 +53,13 @@ do {                                                                \
 
 void checkasm_check_blockdsp(void)
 {
-    LOCAL_ALIGNED_16(uint16_t, buf0, [6 * 8 * 8]);
-    LOCAL_ALIGNED_16(uint16_t, buf1, [6 * 8 * 8]);
+    LOCAL_ALIGNED_32(uint16_t, buf0, [6 * 8 * 8]);
+    LOCAL_ALIGNED_32(uint16_t, buf1, [6 * 8 * 8]);
+
+    AVCodecContext avctx = { 0 };
     BlockDSPContext h;
 
-    ff_blockdsp_init(&h);
+    ff_blockdsp_init(&h, &avctx);
 
     check_clear(clear_block,  8 * 8);
     check_clear(clear_blocks, 8 * 8 * 6);
diff --git a/tests/checkasm/bswapdsp.c b/tests/checkasm/bswapdsp.c
index 829ebaa8a8..5f7555037d 100644
--- a/tests/checkasm/bswapdsp.c
+++ b/tests/checkasm/bswapdsp.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2015 Henrik Gramner
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index 61515deb88..b8b0e32dbd 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -3,23 +3,31 @@
  * Copyright (c) 2015 Henrik Gramner
  * Copyright (c) 2008 Loren Merritt
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
+#if CONFIG_LINUX_PERF
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE // for syscall (performance monitoring API)
+# endif
+#endif
+
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -64,47 +72,84 @@ static const struct {
     const char *name;
     void (*func)(void);
 } tests[] = {
-#if CONFIG_AUDIODSP
-    { "audiodsp", checkasm_check_audiodsp },
-#endif
-#if CONFIG_BLOCKDSP
-    { "blockdsp", checkasm_check_blockdsp },
-#endif
-#if CONFIG_BSWAPDSP
-    { "bswapdsp", checkasm_check_bswapdsp },
-#endif
-#if CONFIG_DCA_DECODER
-    { "dcadsp", checkasm_check_dcadsp },
-    { "synth_filter", checkasm_check_synth_filter },
-#endif
-#if CONFIG_FMTCONVERT
-    { "fmtconvert", checkasm_check_fmtconvert },
-#endif
-#if CONFIG_H264DSP
-    { "h264dsp", checkasm_check_h264dsp },
+#if CONFIG_AVCODEC
+    #if CONFIG_AAC_DECODER
+        { "aacpsdsp", checkasm_check_aacpsdsp },
+        { "sbrdsp",   checkasm_check_sbrdsp },
+    #endif
+    #if CONFIG_ALAC_DECODER
+        { "alacdsp", checkasm_check_alacdsp },
+    #endif
+    #if CONFIG_AUDIODSP
+        { "audiodsp", checkasm_check_audiodsp },
+    #endif
+    #if CONFIG_BLOCKDSP
+        { "blockdsp", checkasm_check_blockdsp },
+    #endif
+    #if CONFIG_BSWAPDSP
+        { "bswapdsp", checkasm_check_bswapdsp },
+    #endif
+    #if CONFIG_DCA_DECODER
+        { "synth_filter", checkasm_check_synth_filter },
+    #endif
+    #if CONFIG_EXR_DECODER
+        { "exrdsp", checkasm_check_exrdsp },
+    #endif
+    #if CONFIG_FLACDSP
+        { "flacdsp", checkasm_check_flacdsp },
+    #endif
+    #if CONFIG_FMTCONVERT
+        { "fmtconvert", checkasm_check_fmtconvert },
+    #endif
+    #if CONFIG_G722DSP
+        { "g722dsp", checkasm_check_g722dsp },
+    #endif
+    #if CONFIG_H264DSP
+        { "h264dsp", checkasm_check_h264dsp },
+    #endif
+    #if CONFIG_H264PRED
+        { "h264pred", checkasm_check_h264pred },
+    #endif
+    #if CONFIG_H264QPEL
+        { "h264qpel", checkasm_check_h264qpel },
+    #endif
+    #if CONFIG_HEVC_DECODER
+        { "hevc_add_res", checkasm_check_hevc_add_res },
+        { "hevc_idct", checkasm_check_hevc_idct },
+    #endif
+    #if CONFIG_JPEG2000_DECODER
+        { "jpeg2000dsp", checkasm_check_jpeg2000dsp },
+    #endif
+    #if CONFIG_HUFFYUVDSP
+        { "llviddsp", checkasm_check_llviddsp },
+    #endif
+    #if CONFIG_PIXBLOCKDSP
+        { "pixblockdsp", checkasm_check_pixblockdsp },
+    #endif
+    #if CONFIG_V210_ENCODER
+        { "v210enc", checkasm_check_v210enc },
+    #endif
+    #if CONFIG_VP8DSP
+        { "vp8dsp", checkasm_check_vp8dsp },
+    #endif
+    #if CONFIG_VP9_DECODER
+        { "vp9dsp", checkasm_check_vp9dsp },
+    #endif
+    #if CONFIG_VIDEODSP
+        { "videodsp", checkasm_check_videodsp },
+    #endif
 #endif
-#if CONFIG_H264PRED
-    { "h264pred", checkasm_check_h264pred },
+#if CONFIG_AVFILTER
+    #if CONFIG_BLEND_FILTER
+        { "vf_blend", checkasm_check_blend },
+    #endif
+    #if CONFIG_COLORSPACE_FILTER
+        { "vf_colorspace", checkasm_check_colorspace },
+    #endif
 #endif
-#if CONFIG_H264QPEL
-    { "h264qpel", checkasm_check_h264qpel },
-#endif
-#if CONFIG_HEVC_DECODER
-    { "hevc_add_res", checkasm_check_hevc_add_res },
-    { "hevc_idct", checkasm_check_hevc_idct },
-    { "hevc_mc", checkasm_check_hevc_mc },
-#endif
-#if CONFIG_HUFFYUVDSP
-    { "huffyuvdsp", checkasm_check_huffyuvdsp },
-#endif
-#if CONFIG_V210_ENCODER
-    { "v210enc", checkasm_check_v210enc },
-#endif
-#if CONFIG_VP8DSP
-    { "vp8dsp", checkasm_check_vp8dsp },
-#endif
-#if CONFIG_VP9_DECODER
-    { "vp9dsp", checkasm_check_vp9dsp },
+#if CONFIG_AVUTIL
+        { "fixed_dsp", checkasm_check_fixed_dsp },
+        { "float_dsp", checkasm_check_float_dsp },
 #endif
     { NULL }
 };
@@ -141,6 +186,7 @@ static const struct {
     { "SSSE3",    "ssse3",    AV_CPU_FLAG_SSSE3|AV_CPU_FLAG_ATOM },
     { "SSE4.1",   "sse4",     AV_CPU_FLAG_SSE4 },
     { "SSE4.2",   "sse42",    AV_CPU_FLAG_SSE42 },
+    { "AES-NI",   "aesni",    AV_CPU_FLAG_AESNI },
     { "AVX",      "avx",      AV_CPU_FLAG_AVX },
     { "XOP",      "xop",      AV_CPU_FLAG_XOP },
     { "FMA3",     "fma3",     AV_CPU_FLAG_FMA3 },
@@ -155,8 +201,7 @@ typedef struct CheckasmFuncVersion {
     void *func;
     int ok;
     int cpu;
-    int iterations;
-    uint64_t cycles;
+    CheckasmPerf perf;
 } CheckasmFuncVersion;
 
 /* Binary search tree node */
@@ -177,7 +222,11 @@ static struct {
     int bench_pattern_len;
     int num_checked;
     int num_failed;
+
+    /* perf */
     int nop_time;
+    int sysfd;
+
     int cpu_flag;
     const char *cpu_flag_name;
     const char *test_name;
@@ -258,6 +307,25 @@ int float_near_abs_eps_array_ulp(const float *a, const float *b, float eps,
     return 1;
 }
 
+int double_near_abs_eps(double a, double b, double eps)
+{
+    double abs_diff = fabs(a - b);
+
+    return abs_diff < eps;
+}
+
+int double_near_abs_eps_array(const double *a, const double *b, double eps,
+                              unsigned len)
+{
+    unsigned i;
+
+    for (i = 0; i < len; i++) {
+        if (!double_near_abs_eps(a[i], b[i], eps))
+            return 0;
+    }
+    return 1;
+}
+
 /* Print colored text to stderr if the terminal supports it */
 static void color_printf(int color, const char *fmt, ...)
 {
@@ -342,7 +410,6 @@ static const char *cpu_suffix(int cpu)
     return "c";
 }
 
-#ifdef AV_READ_TIME
 static int cmp_nop(const void *a, const void *b)
 {
     return *(const uint16_t*)a - *(const uint16_t*)b;
@@ -353,10 +420,13 @@ static int measure_nop_time(void)
 {
     uint16_t nops[10000];
     int i, nop_sum = 0;
+    av_unused const int sysfd = state.sysfd;
 
+    uint64_t t = 0;
     for (i = 0; i < 10000; i++) {
-        uint64_t t = AV_READ_TIME();
-        nops[i] = AV_READ_TIME() - t;
+        PERF_START(t);
+        PERF_STOP(t);
+        nops[i] = t;
     }
 
     qsort(nops, 10000, sizeof(uint16_t), cmp_nop);
@@ -376,8 +446,9 @@ static void print_benchs(CheckasmFunc *f)
         if (f->versions.cpu || f->versions.next) {
             CheckasmFuncVersion *v = &f->versions;
             do {
-                if (v->iterations) {
-                    int decicycles = (10*v->cycles/v->iterations - state.nop_time) / 4;
+                CheckasmPerf *p = &v->perf;
+                if (p->iterations) {
+                    int decicycles = (10*p->cycles/p->iterations - state.nop_time) / 4;
                     printf("%s_%s: %d.%d\n", f->name, cpu_suffix(v->cpu), decicycles/10, decicycles%10);
                 }
             } while ((v = v->next));
@@ -386,7 +457,6 @@ static void print_benchs(CheckasmFunc *f)
         print_benchs(f->child[1]);
     }
 }
-#endif
 
 /* ASCIIbetical sort except preserving natural order for numbers */
 static int cmp_func_names(const char *a, const char *b)
@@ -463,8 +533,9 @@ static void check_cpu_flag(const char *name, int flag)
     int old_cpu_flag = state.cpu_flag;
 
     flag |= old_cpu_flag;
-    av_set_cpu_flags_mask(flag);
-    state.cpu_flag = av_get_cpu_flags();
+    av_force_cpu_flags(-1);
+    state.cpu_flag = flag & av_get_cpu_flags();
+    av_force_cpu_flags(state.cpu_flag);
 
     if (!flag || state.cpu_flag != old_cpu_flag) {
         int i;
@@ -488,6 +559,63 @@ static void print_cpu_name(void)
     }
 }
 
+#if CONFIG_LINUX_PERF
+static int bench_init_linux(void)
+{
+    struct perf_event_attr attr = {
+        .type           = PERF_TYPE_HARDWARE,
+        .size           = sizeof(struct perf_event_attr),
+        .config         = PERF_COUNT_HW_CPU_CYCLES,
+        .disabled       = 1, // start counting only on demand
+        .exclude_kernel = 1,
+        .exclude_hv     = 1,
+    };
+
+    printf("benchmarking with Linux Perf Monitoring API\n");
+
+    state.sysfd = syscall(__NR_perf_event_open, &attr, 0, -1, -1, 0);
+    if (state.sysfd == -1) {
+        perror("syscall");
+        return -1;
+    }
+    return 0;
+}
+#endif
+
+static int bench_init_ffmpeg(void)
+{
+#ifdef AV_READ_TIME
+    printf("benchmarking with native FFmpeg timers\n");
+    return 0;
+#else
+    fprintf(stderr, "checkasm: --bench is not supported on your system\n");
+    return -1;
+#endif
+}
+
+static int bench_init(void)
+{
+#if CONFIG_LINUX_PERF
+    int ret = bench_init_linux();
+#else
+    int ret = bench_init_ffmpeg();
+#endif
+    if (ret < 0)
+        return ret;
+
+    state.nop_time = measure_nop_time();
+    printf("nop: %d.%d\n", state.nop_time/10, state.nop_time%10);
+    return 0;
+}
+
+static void bench_uninit(void)
+{
+#if CONFIG_LINUX_PERF
+    if (state.sysfd > 0)
+        close(state.sysfd);
+#endif
+}
+
 int main(int argc, char *argv[])
 {
     unsigned int seed = av_get_random_seed();
@@ -505,10 +633,8 @@ int main(int argc, char *argv[])
 
     while (argc > 1) {
         if (!strncmp(argv[1], "--bench", 7)) {
-#ifndef AV_READ_TIME
-            fprintf(stderr, "checkasm: --bench is not supported on your system\n");
-            return 1;
-#endif
+            if (bench_init() < 0)
+                return 1;
             if (argv[1][7] == '=') {
                 state.bench_pattern = argv[1] + 8;
                 state.bench_pattern_len = strlen(state.bench_pattern);
@@ -536,16 +662,13 @@ int main(int argc, char *argv[])
         ret = 1;
     } else {
         fprintf(stderr, "checkasm: all %d tests passed\n", state.num_checked);
-#ifdef AV_READ_TIME
         if (state.bench_pattern) {
-            state.nop_time = measure_nop_time();
-            printf("nop: %d.%d\n", state.nop_time/10, state.nop_time%10);
             print_benchs(state.funcs);
         }
-#endif
     }
 
     destroy_func_tree(state.funcs);
+    bench_uninit();
     return ret;
 }
 
@@ -623,11 +746,13 @@ void checkasm_fail_func(const char *msg, ...)
     }
 }
 
-/* Update benchmark results of the current function */
-void checkasm_update_bench(int iterations, uint64_t cycles)
+/* Get the benchmark context of the current function */
+CheckasmPerf *checkasm_get_perf_context(void)
 {
-    state.current_func_ver->iterations += iterations;
-    state.current_func_ver->cycles += cycles;
+    CheckasmPerf *perf = &state.current_func_ver->perf;
+    memset(perf, 0, sizeof(*perf));
+    perf->sysfd = state.sysfd;
+    return perf;
 }
 
 /* Print the outcome of all tests performed since the last time this function was called */
diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h
index db71382ac3..e5b1877dc0 100644
--- a/tests/checkasm/checkasm.h
+++ b/tests/checkasm/checkasm.h
@@ -3,20 +3,20 @@
  * Copyright (c) 2015 Henrik Gramner
  * Copyright (c) 2008 Loren Merritt
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -25,33 +25,54 @@
 
 #include <stdint.h>
 #include "config.h"
+
+#if CONFIG_LINUX_PERF
+#include <unistd.h> // read(3)
+#include <sys/ioctl.h>
+#include <asm/unistd.h>
+#include <linux/perf_event.h>
+#endif
+
 #include "libavutil/avstring.h"
 #include "libavutil/cpu.h"
 #include "libavutil/internal.h"
 #include "libavutil/lfg.h"
 #include "libavutil/timer.h"
 
+void checkasm_check_aacpsdsp(void);
+void checkasm_check_alacdsp(void);
 void checkasm_check_audiodsp(void);
+void checkasm_check_blend(void);
 void checkasm_check_blockdsp(void);
 void checkasm_check_bswapdsp(void);
-void checkasm_check_dcadsp(void);
+void checkasm_check_colorspace(void);
+void checkasm_check_exrdsp(void);
+void checkasm_check_fixed_dsp(void);
+void checkasm_check_flacdsp(void);
+void checkasm_check_float_dsp(void);
 void checkasm_check_fmtconvert(void);
+void checkasm_check_g722dsp(void);
 void checkasm_check_h264dsp(void);
 void checkasm_check_h264pred(void);
 void checkasm_check_h264qpel(void);
 void checkasm_check_hevc_add_res(void);
 void checkasm_check_hevc_idct(void);
-void checkasm_check_hevc_mc(void);
-void checkasm_check_huffyuvdsp(void);
+void checkasm_check_jpeg2000dsp(void);
+void checkasm_check_llviddsp(void);
+void checkasm_check_pixblockdsp(void);
+void checkasm_check_sbrdsp(void);
 void checkasm_check_synth_filter(void);
 void checkasm_check_v210enc(void);
 void checkasm_check_vp8dsp(void);
 void checkasm_check_vp9dsp(void);
+void checkasm_check_videodsp(void);
+
+struct CheckasmPerf;
 
 void *checkasm_check_func(void *func, const char *name, ...) av_printf_format(2, 3);
 int checkasm_bench_func(void);
 void checkasm_fail_func(const char *msg, ...) av_printf_format(1, 2);
-void checkasm_update_bench(int iterations, uint64_t cycles);
+struct CheckasmPerf *checkasm_get_perf_context(void);
 void checkasm_report(const char *name, ...) av_printf_format(1, 2);
 
 /* float compare utilities */
@@ -64,6 +85,9 @@ int float_near_abs_eps_array(const float *a, const float *b, float eps,
                              unsigned len);
 int float_near_abs_eps_array_ulp(const float *a, const float *b, float eps,
                                  unsigned max_ulp, unsigned len);
+int double_near_abs_eps(double a, double b, double eps);
+int double_near_abs_eps_array(const double *a, const double *b, double eps,
+                              unsigned len);
 
 extern AVLFG checkasm_lfg;
 #define rnd() av_lfg_get(&checkasm_lfg)
@@ -78,6 +102,7 @@ static av_unused void *func_ref, *func_new;
 /* Declare the function prototype. The first argument is the return value, the remaining
  * arguments are the function parameters. Naming parameters is optional. */
 #define declare_func(ret, ...) declare_new(ret, __VA_ARGS__) typedef ret func_type(__VA_ARGS__)
+#define declare_func_float(ret, ...) declare_new_float(ret, __VA_ARGS__) typedef ret func_type(__VA_ARGS__)
 #define declare_func_emms(cpu_flags, ret, ...) declare_new_emms(cpu_flags, ret, __VA_ARGS__) typedef ret func_type(__VA_ARGS__)
 
 /* Indicate that the current test has failed */
@@ -96,6 +121,9 @@ void checkasm_checked_call(void *func, ...);
 /* Verifies that clobbered callee-saved registers are properly saved and restored
  * and issues emms for asm functions which are not required to do so */
 void checkasm_checked_call_emms(void *func, ...);
+/* Verifies that clobbered callee-saved registers are properly saved and restored
+ * but doesn't issue emms. Meant for dsp functions returning float or double */
+void checkasm_checked_call_float(void *func, ...);
 
 #if ARCH_X86_64
 /* Evil hack: detect incorrect assumptions that 32-bit ints are zero-extended to 64-bit.
@@ -110,6 +138,8 @@ void checkasm_checked_call_emms(void *func, ...);
 void checkasm_stack_clobber(uint64_t clobber, ...);
 #define declare_new(ret, ...) ret (*checked_call)(void *, int, int, int, int, int, __VA_ARGS__)\
                               = (void *)checkasm_checked_call;
+#define declare_new_float(ret, ...) ret (*checked_call)(void *, int, int, int, int, int, __VA_ARGS__)\
+                                    = (void *)checkasm_checked_call_float;
 #define declare_new_emms(cpu_flags, ret, ...) \
     ret (*checked_call)(void *, int, int, int, int, int, __VA_ARGS__) = \
         ((cpu_flags) & av_get_cpu_flags()) ? (void *)checkasm_checked_call_emms : \
@@ -120,6 +150,7 @@ void checkasm_stack_clobber(uint64_t clobber, ...);
                       checked_call(func_new, 0, 0, 0, 0, 0, __VA_ARGS__))
 #elif ARCH_X86_32
 #define declare_new(ret, ...) ret (*checked_call)(void *, __VA_ARGS__) = (void *)checkasm_checked_call;
+#define declare_new_float(ret, ...) ret (*checked_call)(void *, __VA_ARGS__) = (void *)checkasm_checked_call_float;
 #define declare_new_emms(cpu_flags, ret, ...) ret (*checked_call)(void *, __VA_ARGS__) = \
         ((cpu_flags) & av_get_cpu_flags()) ? (void *)checkasm_checked_call_emms :        \
                                              (void *)checkasm_checked_call;
@@ -145,6 +176,7 @@ void checkasm_checked_call(void *func, ...);
                       checked_call(func_new, 0, 0, 0, 0, 0, 0, 0, __VA_ARGS__))
 #else
 #define declare_new(ret, ...)
+#define declare_new_float(ret, ...)
 #define declare_new_emms(cpu_flags, ret, ...)
 /* Call the function */
 #define call_new(...) ((func_type *)func_new)(__VA_ARGS__)
@@ -153,33 +185,63 @@ void checkasm_checked_call(void *func, ...);
 #ifndef declare_new_emms
 #define declare_new_emms(cpu_flags, ret, ...) declare_new(ret, __VA_ARGS__)
 #endif
+#ifndef declare_new_float
+#define declare_new_float(ret, ...) declare_new(ret, __VA_ARGS__)
+#endif
+
+typedef struct CheckasmPerf {
+    int sysfd;
+    uint64_t cycles;
+    int iterations;
+} CheckasmPerf;
+
+#if defined(AV_READ_TIME) || CONFIG_LINUX_PERF
+
+#if CONFIG_LINUX_PERF
+#define PERF_START(t) do {                              \
+    ioctl(sysfd, PERF_EVENT_IOC_RESET, 0);              \
+    ioctl(sysfd, PERF_EVENT_IOC_ENABLE, 0);             \
+} while (0)
+#define PERF_STOP(t) do {                               \
+    ioctl(sysfd, PERF_EVENT_IOC_DISABLE, 0);            \
+    read(sysfd, &t, sizeof(t));                         \
+} while (0)
+#else
+#define PERF_START(t) t = AV_READ_TIME()
+#define PERF_STOP(t)  t = AV_READ_TIME() - t
+#endif
 
 /* Benchmark the function */
-#ifdef AV_READ_TIME
 #define bench_new(...)\
     do {\
         if (checkasm_bench_func()) {\
+            struct CheckasmPerf *perf = checkasm_get_perf_context();\
+            av_unused const int sysfd = perf->sysfd;\
             func_type *tfunc = func_new;\
             uint64_t tsum = 0;\
             int ti, tcount = 0;\
+            uint64_t t = 0; \
             for (ti = 0; ti < BENCH_RUNS; ti++) {\
-                uint64_t t = AV_READ_TIME();\
+                PERF_START(t);\
                 tfunc(__VA_ARGS__);\
                 tfunc(__VA_ARGS__);\
                 tfunc(__VA_ARGS__);\
                 tfunc(__VA_ARGS__);\
-                t = AV_READ_TIME() - t;\
+                PERF_STOP(t);\
                 if (t*tcount <= tsum*4 && ti > 0) {\
                     tsum += t;\
                     tcount++;\
                 }\
             }\
             emms_c();\
-            checkasm_update_bench(tcount, tsum);\
+            perf->cycles += t;\
+            perf->iterations++;\
         }\
     } while (0)
 #else
 #define bench_new(...) while(0)
+#define PERF_START(t)  while(0)
+#define PERF_STOP(t)   while(0)
 #endif
 
 #endif /* TESTS_CHECKASM_CHECKASM_H */
diff --git a/tests/checkasm/dcadsp.c b/tests/checkasm/dcadsp.c
deleted file mode 100644
index 7251362a1e..0000000000
--- a/tests/checkasm/dcadsp.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2015 Janne Grunau
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Libav 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <math.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "libavutil/internal.h"
-#include "libavutil/intfloat.h"
-#include "libavcodec/dca.h"
-#include "libavcodec/dcadsp.h"
-#include "libavcodec/dcadata.h"
-
-#include "checkasm.h"
-
-#define randomize_lfe_fir(size)                                 \
-    do {                                                        \
-        int i;                                                  \
-        for (i = 0; i < size; i++) {                            \
-            float f = (float)rnd() / (UINT_MAX >> 1) - 1.0f;    \
-            in[i] = f;                                          \
-        }                                                       \
-        for (i = 0; i < 256; i++) {                             \
-            float f = (float)rnd() / (UINT_MAX >> 1) - 1.0f;    \
-            coeffs[i] = f;                                      \
-        }                                                       \
-    } while (0)
-
-#define check_lfe_fir(decifactor, eps)                                  \
-    do {                                                                \
-        LOCAL_ALIGNED_16(float, in,     [256 / decifactor]);            \
-        LOCAL_ALIGNED_16(float, out0,   [decifactor * 2]);              \
-        LOCAL_ALIGNED_16(float, out1,   [decifactor * 2]);              \
-        LOCAL_ALIGNED_16(float, coeffs, [256]);                         \
-        int i;                                                          \
-        const float * in_ptr = in + (256 / decifactor) - 1;             \
-        declare_func(void, float *out, const float *in, const float *coeffs); \
-        /* repeat the test several times */                             \
-        for (i = 0; i < 32; i++) {                                      \
-            int j;                                                      \
-            memset(out0,    0, sizeof(*out0) * 2 * decifactor);         \
-            memset(out1, 0xFF, sizeof(*out1) * 2 * decifactor);         \
-            randomize_lfe_fir(256 / decifactor);                        \
-            call_ref(out0, in_ptr, coeffs);                             \
-            call_new(out1, in_ptr, coeffs);                             \
-            for (j = 0; j < 2 * decifactor; j++) {                      \
-                if (!float_near_abs_eps(out0[j], out1[j], eps)) {       \
-                    if (0) {                                            \
-                        union av_intfloat32 x, y; x.f = out0[j]; y.f = out1[j]; \
-                        fprintf(stderr, "%3d: %11g (0x%08x); %11g (0x%08x)\n", \
-                                j, x.f, x.i, y.f, y.i);                 \
-                    }                                                   \
-                    fail();                                             \
-                    break;                                              \
-                }                                                       \
-            }                                                           \
-            bench_new(out1, in_ptr, coeffs);                            \
-        }                                                               \
-    } while (0)
-
-void checkasm_check_dcadsp(void)
-{
-    DCADSPContext c;
-
-    ff_dcadsp_init(&c);
-
-    /* values are limited to {-8, 8} so absolute epsilon is good enough */
-    if (check_func(c.lfe_fir[0], "dca_lfe_fir0"))
-        check_lfe_fir(32, 1.0e-6f);
-
-    if (check_func(c.lfe_fir[1], "dca_lfe_fir1"))
-        check_lfe_fir(64, 1.0e-6f);
-
-    report("dcadsp");
-}
diff --git a/tests/checkasm/exrdsp.c b/tests/checkasm/exrdsp.c
new file mode 100644
index 0000000000..754a079f83
--- /dev/null
+++ b/tests/checkasm/exrdsp.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2017 James Almer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 <string.h>
+
+#include "checkasm.h"
+#include "libavcodec/avcodec.h"
+#include "libavcodec/exrdsp.h"
+#include "libavutil/intreadwrite.h"
+
+#define BUF_SIZE 5120
+#define PADDED_BUF_SIZE BUF_SIZE+AV_INPUT_BUFFER_PADDING_SIZE*2
+
+#define randomize_buffers()                 \
+    do {                                    \
+        int i;                              \
+        for (i = 0; i < BUF_SIZE; i += 4) { \
+            uint32_t r = rnd();             \
+            AV_WN32A(src + i, r);           \
+        }                                   \
+    } while (0)
+
+static void check_reorder_pixels(void) {
+    LOCAL_ALIGNED_32(uint8_t, src,     [PADDED_BUF_SIZE]);
+    LOCAL_ALIGNED_32(uint8_t, dst_ref, [PADDED_BUF_SIZE]);
+    LOCAL_ALIGNED_32(uint8_t, dst_new, [PADDED_BUF_SIZE]);
+
+    declare_func(void, uint8_t *dst, const uint8_t *src, ptrdiff_t size);
+
+    memset(src,     0, PADDED_BUF_SIZE);
+    memset(dst_ref, 0, PADDED_BUF_SIZE);
+    memset(dst_new, 0, PADDED_BUF_SIZE);
+    randomize_buffers();
+    call_ref(dst_ref, src, BUF_SIZE);
+    call_new(dst_new, src, BUF_SIZE);
+    if (memcmp(dst_ref, dst_new, BUF_SIZE))
+        fail();
+    bench_new(dst_new, src, BUF_SIZE);
+}
+
+static void check_predictor(void) {
+    LOCAL_ALIGNED_32(uint8_t, src,     [PADDED_BUF_SIZE]);
+    LOCAL_ALIGNED_32(uint8_t, dst_ref, [PADDED_BUF_SIZE]);
+    LOCAL_ALIGNED_32(uint8_t, dst_new, [PADDED_BUF_SIZE]);
+
+    declare_func(void, uint8_t *src, ptrdiff_t size);
+
+    memset(src,     0, PADDED_BUF_SIZE);
+    randomize_buffers();
+    memcpy(dst_ref, src, PADDED_BUF_SIZE);
+    memcpy(dst_new, src, PADDED_BUF_SIZE);
+    call_ref(dst_ref, BUF_SIZE);
+    call_new(dst_new, BUF_SIZE);
+    if (memcmp(dst_ref, dst_new, BUF_SIZE))
+        fail();
+    bench_new(dst_new, BUF_SIZE);
+}
+
+void checkasm_check_exrdsp(void)
+{
+    ExrDSPContext h;
+
+    ff_exrdsp_init(&h);
+
+    if (check_func(h.reorder_pixels, "reorder_pixels"))
+        check_reorder_pixels();
+
+    report("reorder_pixels");
+
+    if (check_func(h.predictor, "predictor"))
+        check_predictor();
+
+    report("predictor");
+}
diff --git a/tests/checkasm/fixed_dsp.c b/tests/checkasm/fixed_dsp.c
new file mode 100644
index 0000000000..fa11f2e23f
--- /dev/null
+++ b/tests/checkasm/fixed_dsp.c
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2015 James Almer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 "checkasm.h"
+#include "libavutil/common.h"
+#include "libavutil/fixed_dsp.h"
+#include "libavutil/internal.h"
+#include "libavutil/mem.h"
+
+#define BUF_SIZE 256
+
+#define randomize_buffers()                   \
+    do {                                      \
+        int i;                                \
+        for (i = 0; i < BUF_SIZE; i++) {      \
+            src0[i] = sign_extend(rnd(), 24); \
+            src1[i] = sign_extend(rnd(), 24); \
+            src2[i] = sign_extend(rnd(), 24); \
+        }                                     \
+    } while (0)
+
+static void check_vector_fmul(const int *src0, const int *src1)
+{
+    LOCAL_ALIGNED_32(int, ref, [BUF_SIZE]);
+    LOCAL_ALIGNED_32(int, new, [BUF_SIZE]);
+
+    declare_func(void, int *dst, const int *src0, const int *src1, int len);
+
+    call_ref(ref, src0, src1, BUF_SIZE);
+    call_new(new, src0, src1, BUF_SIZE);
+    if (memcmp(ref, new, BUF_SIZE * sizeof(int)))
+        fail();
+    bench_new(new, src0, src1, BUF_SIZE);
+}
+
+static void check_vector_fmul_add(const int *src0, const int *src1, const int *src2)
+{
+    LOCAL_ALIGNED_32(int, ref, [BUF_SIZE]);
+    LOCAL_ALIGNED_32(int, new, [BUF_SIZE]);
+
+    declare_func(void, int *dst, const int *src0, const int *src1, const int *src2, int len);
+
+    call_ref(ref, src0, src1, src2, BUF_SIZE);
+    call_new(new, src0, src1, src2, BUF_SIZE);
+    if (memcmp(ref, new, BUF_SIZE * sizeof(int)))
+        fail();
+    bench_new(new, src0, src1, src2, BUF_SIZE);
+}
+
+static void check_vector_fmul_window(const int32_t *src0, const int32_t *src1, const int32_t *win)
+{
+    LOCAL_ALIGNED_32(int32_t, ref, [BUF_SIZE]);
+    LOCAL_ALIGNED_32(int32_t, new, [BUF_SIZE]);
+
+    declare_func(void, int32_t *dst, const int32_t *src0, const int32_t *src1, const int32_t *win, int len);
+
+    call_ref(ref, src0, src1, win, BUF_SIZE / 2);
+    call_new(new, src0, src1, win, BUF_SIZE / 2);
+    if (memcmp(ref, new, BUF_SIZE * sizeof(int32_t)))
+        fail();
+    bench_new(new, src0, src1, win, BUF_SIZE / 2);
+}
+
+static void check_vector_fmul_window_scaled(const int32_t *src0, const int32_t *src1, const int32_t *win)
+{
+    LOCAL_ALIGNED_16(int16_t, ref, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(int16_t, new, [BUF_SIZE]);
+
+    declare_func(void, int16_t *dst, const int32_t *src0, const int32_t *src1, const int32_t *win, int len, uint8_t bits);
+
+    call_ref(ref, src0, src1, win, BUF_SIZE / 2, 2);
+    call_new(new, src0, src1, win, BUF_SIZE / 2, 2);
+    if (memcmp(ref, new, BUF_SIZE * sizeof(int16_t)))
+        fail();
+    bench_new(new, src0, src1, win, BUF_SIZE / 2, 2);
+}
+
+static void check_butterflies(const int *src0, const int *src1)
+{
+    LOCAL_ALIGNED_16(int, ref0, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(int, ref1, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(int, new0, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(int, new1, [BUF_SIZE]);
+
+    declare_func(void, int *av_restrict src0, int *av_restrict src1, int len);
+
+    memcpy(ref0, src0, BUF_SIZE * sizeof(*src0));
+    memcpy(ref1, src1, BUF_SIZE * sizeof(*src1));
+    memcpy(new0, src0, BUF_SIZE * sizeof(*src0));
+    memcpy(new1, src1, BUF_SIZE * sizeof(*src1));
+
+    call_ref(ref0, ref1, BUF_SIZE);
+    call_new(new0, new1, BUF_SIZE);
+    if (memcmp(ref0, new0, BUF_SIZE * sizeof(*ref0)) ||
+        memcmp(ref1, new1, BUF_SIZE * sizeof(*ref1)))
+        fail();
+    memcpy(new0, src0, BUF_SIZE * sizeof(*src0));
+    memcpy(new1, src1, BUF_SIZE * sizeof(*src1));
+    bench_new(new0, new1, BUF_SIZE);
+}
+
+static void check_scalarproduct_fixed(const int *src0, const int *src1)
+{
+    int ref, new;
+
+    declare_func(int, const int *src0, const int *src1, int len);
+
+    ref = call_ref(src0, src1, BUF_SIZE);
+    new = call_new(src0, src1, BUF_SIZE);
+    if (ref != new)
+        fail();
+    bench_new(src0, src1, BUF_SIZE);
+}
+
+void checkasm_check_fixed_dsp(void)
+{
+    LOCAL_ALIGNED_32(int32_t, src0, [BUF_SIZE]);
+    LOCAL_ALIGNED_32(int32_t, src1, [BUF_SIZE]);
+    LOCAL_ALIGNED_32(int32_t, src2, [BUF_SIZE]);
+    AVFixedDSPContext *fdsp = avpriv_alloc_fixed_dsp(1);
+
+    randomize_buffers();
+    if (check_func(fdsp->vector_fmul, "vector_fmul_fixed"))
+        check_vector_fmul(src0, src1);
+    if (check_func(fdsp->vector_fmul_add, "vector_fmul_add_fixed"))
+        check_vector_fmul_add(src0, src1, src2);
+    if (check_func(fdsp->vector_fmul_reverse, "vector_fmul_reverse_fixed"))
+        check_vector_fmul(src0, src1);
+    if (check_func(fdsp->vector_fmul_window, "vector_fmul_window_fixed"))
+        check_vector_fmul_window(src0, src1, src2);
+    if (check_func(fdsp->vector_fmul_window_scaled, "vector_fmul_window_scaled_fixed"))
+        check_vector_fmul_window_scaled(src0, src1, src2);
+    report("vector_fmul");
+    if (check_func(fdsp->butterflies_fixed, "butterflies_fixed"))
+        check_butterflies(src0, src1);
+    report("butterflies_fixed");
+    if (check_func(fdsp->scalarproduct_fixed, "scalarproduct_fixed"))
+        check_scalarproduct_fixed(src0, src1);
+    report("scalarproduct_fixed");
+
+    av_freep(&fdsp);
+}
diff --git a/tests/checkasm/flacdsp.c b/tests/checkasm/flacdsp.c
new file mode 100644
index 0000000000..dccb54d672
--- /dev/null
+++ b/tests/checkasm/flacdsp.c
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2015 James Almer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 <string.h>
+#include "checkasm.h"
+#include "libavcodec/flacdsp.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define BUF_SIZE 256
+#define MAX_CHANNELS 8
+
+#define randomize_buffers()                                 \
+    do {                                                    \
+        int i, j;                                           \
+        for (i = 0; i < BUF_SIZE; i += 4) {                 \
+            for (j = 0; j < channels; j++) {                \
+                uint32_t r = rnd() & (1 << (bits - 2)) - 1; \
+                AV_WN32A(ref_src[j] + i, r);                \
+                AV_WN32A(new_src[j] + i, r);                \
+            }                                               \
+        }                                                   \
+    } while (0)
+
+static void check_decorrelate(uint8_t **ref_dst, uint8_t **ref_src, uint8_t **new_dst, uint8_t **new_src,
+                              int channels, int bits) {
+    declare_func(void, uint8_t **out, int32_t **in, int channels, int len, int shift);
+
+    randomize_buffers();
+    call_ref(ref_dst, (int32_t **)ref_src, channels, BUF_SIZE / sizeof(int32_t), 8);
+    call_new(new_dst, (int32_t **)new_src, channels, BUF_SIZE / sizeof(int32_t), 8);
+    if (memcmp(*ref_dst, *new_dst, bits == 16 ? BUF_SIZE * (channels/2) : BUF_SIZE * channels) ||
+        memcmp(*ref_src, *new_src, BUF_SIZE * channels))
+        fail();
+    bench_new(new_dst, (int32_t **)new_src, channels, BUF_SIZE / sizeof(int32_t), 8);
+}
+
+void checkasm_check_flacdsp(void)
+{
+    LOCAL_ALIGNED_16(uint8_t, ref_dst, [BUF_SIZE*MAX_CHANNELS]);
+    LOCAL_ALIGNED_16(uint8_t, ref_buf, [BUF_SIZE*MAX_CHANNELS]);
+    LOCAL_ALIGNED_16(uint8_t, new_dst, [BUF_SIZE*MAX_CHANNELS]);
+    LOCAL_ALIGNED_16(uint8_t, new_buf, [BUF_SIZE*MAX_CHANNELS]);
+    uint8_t *ref_src[] = { &ref_buf[BUF_SIZE*0], &ref_buf[BUF_SIZE*1], &ref_buf[BUF_SIZE*2], &ref_buf[BUF_SIZE*3],
+                           &ref_buf[BUF_SIZE*4], &ref_buf[BUF_SIZE*5], &ref_buf[BUF_SIZE*6], &ref_buf[BUF_SIZE*7] };
+    uint8_t *new_src[] = { &new_buf[BUF_SIZE*0], &new_buf[BUF_SIZE*1], &new_buf[BUF_SIZE*2], &new_buf[BUF_SIZE*3],
+                           &new_buf[BUF_SIZE*4], &new_buf[BUF_SIZE*5], &new_buf[BUF_SIZE*6], &new_buf[BUF_SIZE*7] };
+    static const char * const names[3] = { "ls", "rs", "ms" };
+    static const struct {
+        enum AVSampleFormat fmt;
+        int bits;
+    } fmts[] = {
+        { AV_SAMPLE_FMT_S16, 16 },
+        { AV_SAMPLE_FMT_S32, 32 },
+    };
+    FLACDSPContext h;
+    int i, j;
+
+    for (i = 0; i < 2; i++) {
+        ff_flacdsp_init(&h, fmts[i].fmt, 2, 0);
+        for (j = 0; j < 3; j++)
+            if (check_func(h.decorrelate[j], "flac_decorrelate_%s_%d", names[j], fmts[i].bits))
+                check_decorrelate(&ref_dst, ref_src, &new_dst, new_src, 2, fmts[i].bits);
+        for (j = 2; j <= MAX_CHANNELS; j += 2) {
+            ff_flacdsp_init(&h, fmts[i].fmt, j, 0);
+            if (check_func(h.decorrelate[0], "flac_decorrelate_indep%d_%d", j, fmts[i].bits))
+                check_decorrelate(&ref_dst, ref_src, &new_dst, new_src, j, fmts[i].bits);
+        }
+    }
+
+    report("decorrelate");
+}
diff --git a/tests/checkasm/float_dsp.c b/tests/checkasm/float_dsp.c
new file mode 100644
index 0000000000..9b0a221c25
--- /dev/null
+++ b/tests/checkasm/float_dsp.c
@@ -0,0 +1,310 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 "config.h"
+
+#include <float.h>
+#include <stdint.h>
+
+#include "libavutil/float_dsp.h"
+#include "libavutil/internal.h"
+#include "checkasm.h"
+
+#define LEN 256
+
+#define randomize_buffer(buf)                 \
+do {                                          \
+    int i;                                    \
+    double bmg[2], stddev = 10.0, mean = 0.0; \
+                                              \
+    for (i = 0; i < LEN; i += 2) {            \
+        av_bmg_get(&checkasm_lfg, bmg);       \
+        buf[i]     = bmg[0] * stddev + mean;  \
+        buf[i + 1] = bmg[1] * stddev + mean;  \
+    }                                         \
+} while(0);
+
+static void test_vector_fmul(const float *src0, const float *src1)
+{
+    LOCAL_ALIGNED_32(float, cdst, [LEN]);
+    LOCAL_ALIGNED_32(float, odst, [LEN]);
+    int i;
+
+    declare_func(void, float *dst, const float *src0, const float *src1,
+                 int len);
+
+    call_ref(cdst, src0, src1, LEN);
+    call_new(odst, src0, src1, LEN);
+    for (i = 0; i < LEN; i++) {
+        if (!float_near_abs_eps(cdst[i], odst[i], FLT_EPSILON)) {
+            fprintf(stderr, "%d: %- .12f - %- .12f = % .12g\n",
+                    i, cdst[i], odst[i], cdst[i] - odst[i]);
+            fail();
+            break;
+        }
+    }
+    bench_new(odst, src0, src1, LEN);
+}
+
+#define ARBITRARY_FMUL_ADD_CONST 0.005
+static void test_vector_fmul_add(const float *src0, const float *src1, const float *src2)
+{
+    LOCAL_ALIGNED_32(float, cdst, [LEN]);
+    LOCAL_ALIGNED_32(float, odst, [LEN]);
+    int i;
+
+    declare_func(void, float *dst, const float *src0, const float *src1,
+                     const float *src2, int len);
+
+    call_ref(cdst, src0, src1, src2, LEN);
+    call_new(odst, src0, src1, src2, LEN);
+    for (i = 0; i < LEN; i++) {
+        if (!float_near_abs_eps(cdst[i], odst[i], ARBITRARY_FMUL_ADD_CONST)) {
+            fprintf(stderr, "%d: %- .12f - %- .12f = % .12g\n",
+                    i, cdst[i], odst[i], cdst[i] - odst[i]);
+            fail();
+            break;
+        }
+    }
+    bench_new(odst, src0, src1, src2, LEN);
+}
+
+static void test_vector_fmul_scalar(const float *src0, const float *src1)
+{
+    LOCAL_ALIGNED_16(float, cdst, [LEN]);
+    LOCAL_ALIGNED_16(float, odst, [LEN]);
+    int i;
+
+    declare_func(void, float *dst, const float *src, float mul, int len);
+
+    call_ref(cdst, src0, src1[0], LEN);
+    call_new(odst, src0, src1[0], LEN);
+        for (i = 0; i < LEN; i++) {
+            if (!float_near_abs_eps(cdst[i], odst[i], FLT_EPSILON)) {
+                fprintf(stderr, "%d: %- .12f - %- .12f = % .12g\n",
+                        i, cdst[i], odst[i], cdst[i] - odst[i]);
+                fail();
+                break;
+            }
+        }
+    bench_new(odst, src0, src1[0], LEN);
+}
+
+#define ARBITRARY_FMUL_WINDOW_CONST 0.008
+static void test_vector_fmul_window(const float *src0, const float *src1, const float *win)
+{
+    LOCAL_ALIGNED_16(float, cdst, [LEN]);
+    LOCAL_ALIGNED_16(float, odst, [LEN]);
+    int i;
+
+    declare_func(void, float *dst, const float *src0, const float *src1,
+                 const float *win, int len);
+
+    call_ref(cdst, src0, src1, win, LEN / 2);
+    call_new(odst, src0, src1, win, LEN / 2);
+    for (i = 0; i < LEN; i++) {
+        if (!float_near_abs_eps(cdst[i], odst[i], ARBITRARY_FMUL_WINDOW_CONST)) {
+            fprintf(stderr, "%d: %- .12f - %- .12f = % .12g\n",
+                    i, cdst[i], odst[i], cdst[i] - odst[i]);
+            fail();
+            break;
+        }
+    }
+    bench_new(odst, src0, src1, win, LEN / 2);
+}
+
+#define ARBITRARY_FMAC_SCALAR_CONST 0.005
+static void test_vector_fmac_scalar(const float *src0, const float *src1, const float *src2)
+{
+    LOCAL_ALIGNED_32(float, cdst, [LEN]);
+    LOCAL_ALIGNED_32(float, odst, [LEN]);
+    int i;
+
+    declare_func(void, float *dst, const float *src, float mul, int len);
+
+    memcpy(cdst, src2, LEN * sizeof(*src2));
+    memcpy(odst, src2, LEN * sizeof(*src2));
+
+    call_ref(cdst, src0, src1[0], LEN);
+    call_new(odst, src0, src1[0], LEN);
+    for (i = 0; i < LEN; i++) {
+        if (!float_near_abs_eps(cdst[i], odst[i], ARBITRARY_FMAC_SCALAR_CONST)) {
+            fprintf(stderr, "%d: %- .12f - %- .12f = % .12g\n",
+                    i, cdst[i], odst[i], cdst[i] - odst[i]);
+            fail();
+            break;
+        }
+    }
+    memcpy(odst, src2, LEN * sizeof(*src2));
+    bench_new(odst, src0, src1[0], LEN);
+}
+
+static void test_vector_dmul_scalar(const double *src0, const double *src1)
+{
+    LOCAL_ALIGNED_32(double, cdst, [LEN]);
+    LOCAL_ALIGNED_32(double, odst, [LEN]);
+    int i;
+
+    declare_func(void, double *dst, const double *src, double mul, int len);
+
+    call_ref(cdst, src0, src1[0], LEN);
+    call_new(odst, src0, src1[0], LEN);
+    for (i = 0; i < LEN; i++) {
+        if (!double_near_abs_eps(cdst[i], odst[i], DBL_EPSILON)) {
+            fprintf(stderr, "%d: %- .12f - %- .12f = % .12g\n", i,
+                    cdst[i], odst[i], cdst[i] - odst[i]);
+            fail();
+            break;
+        }
+    }
+    bench_new(odst, src0, src1[0], LEN);
+}
+
+#define ARBITRARY_DMAC_SCALAR_CONST 0.005
+static void test_vector_dmac_scalar(const double *src0, const double *src1, const double *src2)
+{
+    LOCAL_ALIGNED_32(double, cdst, [LEN]);
+    LOCAL_ALIGNED_32(double, odst, [LEN]);
+    int i;
+
+    declare_func(void, double *dst, const double *src, double mul, int len);
+
+    memcpy(cdst, src2, LEN * sizeof(*src2));
+    memcpy(odst, src2, LEN * sizeof(*src2));
+    call_ref(cdst, src0, src1[0], LEN);
+    call_new(odst, src0, src1[0], LEN);
+    for (i = 0; i < LEN; i++) {
+        if (!double_near_abs_eps(cdst[i], odst[i], ARBITRARY_DMAC_SCALAR_CONST)) {
+            fprintf(stderr, "%d: %- .12f - %- .12f = % .12g\n",
+                    i, cdst[i], odst[i], cdst[i] - odst[i]);
+            fail();
+            break;
+        }
+    }
+    memcpy(odst, src2, LEN * sizeof(*src2));
+    bench_new(odst, src0, src1[0], LEN);
+}
+
+static void test_butterflies_float(const float *src0, const float *src1)
+{
+    LOCAL_ALIGNED_16(float,  cdst,  [LEN]);
+    LOCAL_ALIGNED_16(float,  odst,  [LEN]);
+    LOCAL_ALIGNED_16(float,  cdst1, [LEN]);
+    LOCAL_ALIGNED_16(float,  odst1, [LEN]);
+    int i;
+
+    declare_func(void, float *av_restrict src0, float *av_restrict src1,
+    int len);
+
+    memcpy(cdst,  src0, LEN * sizeof(*src0));
+    memcpy(cdst1, src1, LEN * sizeof(*src1));
+    memcpy(odst,  src0, LEN * sizeof(*src0));
+    memcpy(odst1, src1, LEN * sizeof(*src1));
+
+    call_ref(cdst, cdst1, LEN);
+    call_new(odst, odst1, LEN);
+    for (i = 0; i < LEN; i++) {
+        if (!float_near_abs_eps(cdst[i],  odst[i],  FLT_EPSILON) ||
+            !float_near_abs_eps(cdst1[i], odst1[i], FLT_EPSILON)) {
+            fprintf(stderr, "%d: %- .12f - %- .12f = % .12g\n",
+                    i, cdst[i], odst[i], cdst[i] - odst[i]);
+            fprintf(stderr, "%d: %- .12f - %- .12f = % .12g\n",
+                    i, cdst1[i], odst1[i], cdst1[i] - odst1[i]);
+            fail();
+            break;
+        }
+    }
+    memcpy(odst,  src0, LEN * sizeof(*src0));
+    memcpy(odst1, src1, LEN * sizeof(*src1));
+    bench_new(odst, odst1, LEN);
+}
+
+#define ARBITRARY_SCALARPRODUCT_CONST 0.2
+static void test_scalarproduct_float(const float *src0, const float *src1)
+{
+    float cprod, oprod;
+
+    declare_func_float(float, const float *src0, const float *src1, int len);
+
+    cprod = call_ref(src0, src1, LEN);
+    oprod = call_new(src0, src1, LEN);
+    if (!float_near_abs_eps(cprod, oprod, ARBITRARY_SCALARPRODUCT_CONST)) {
+        fprintf(stderr, "%- .12f - %- .12f = % .12g\n",
+                cprod, oprod, cprod - oprod);
+        fail();
+    }
+    bench_new(src0, src1, LEN);
+}
+
+void checkasm_check_float_dsp(void)
+{
+    LOCAL_ALIGNED_32(float,  src0,     [LEN]);
+    LOCAL_ALIGNED_32(float,  src1,     [LEN]);
+    LOCAL_ALIGNED_32(float,  src2,     [LEN]);
+    LOCAL_ALIGNED_16(float,  src3,     [LEN]);
+    LOCAL_ALIGNED_16(float,  src4,     [LEN]);
+    LOCAL_ALIGNED_16(float,  src5,     [LEN]);
+    LOCAL_ALIGNED_32(double, dbl_src0, [LEN]);
+    LOCAL_ALIGNED_32(double, dbl_src1, [LEN]);
+    LOCAL_ALIGNED_32(double, dbl_src2, [LEN]);
+    AVFloatDSPContext *fdsp = avpriv_float_dsp_alloc(1);
+
+    if (!fdsp) {
+        fprintf(stderr, "floatdsp: Out of memory error\n");
+        return;
+    }
+
+    randomize_buffer(src0);
+    randomize_buffer(src1);
+    randomize_buffer(src2);
+    randomize_buffer(src3);
+    randomize_buffer(src4);
+    randomize_buffer(src5);
+    randomize_buffer(dbl_src0);
+    randomize_buffer(dbl_src1);
+    randomize_buffer(dbl_src2);
+
+    if (check_func(fdsp->vector_fmul, "vector_fmul"))
+        test_vector_fmul(src0, src1);
+    if (check_func(fdsp->vector_fmul_add, "vector_fmul_add"))
+        test_vector_fmul_add(src0, src1, src2);
+    if (check_func(fdsp->vector_fmul_scalar, "vector_fmul_scalar"))
+        test_vector_fmul_scalar(src3, src4);
+    if (check_func(fdsp->vector_fmul_reverse, "vector_fmul_reverse"))
+        test_vector_fmul(src0, src1);
+    if (check_func(fdsp->vector_fmul_window, "vector_fmul_window"))
+        test_vector_fmul_window(src3, src4, src5);
+    report("vector_fmul");
+    if (check_func(fdsp->vector_fmac_scalar, "vector_fmac_scalar"))
+        test_vector_fmac_scalar(src0, src1, src2);
+    report("vector_fmac");
+    if (check_func(fdsp->vector_dmul_scalar, "vector_dmul_scalar"))
+        test_vector_dmul_scalar(dbl_src0, dbl_src1);
+    report("vector_dmul");
+    if (check_func(fdsp->vector_dmac_scalar, "vector_dmac_scalar"))
+        test_vector_dmac_scalar(dbl_src0, dbl_src1, dbl_src2);
+    report("vector_dmac");
+    if (check_func(fdsp->butterflies_float, "butterflies_float"))
+        test_butterflies_float(src3, src4);
+    report("butterflies_float");
+    if (check_func(fdsp->scalarproduct_float, "scalarproduct_float"))
+        test_scalarproduct_float(src3, src4);
+    report("scalarproduct_float");
+
+    av_freep(&fdsp);
+}
diff --git a/tests/checkasm/fmtconvert.c b/tests/checkasm/fmtconvert.c
index 1a843b0b02..50ad3ca2ea 100644
--- a/tests/checkasm/fmtconvert.c
+++ b/tests/checkasm/fmtconvert.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2015 Janne Grunau
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
diff --git a/tests/checkasm/g722dsp.c b/tests/checkasm/g722dsp.c
new file mode 100644
index 0000000000..6bcff11e3d
--- /dev/null
+++ b/tests/checkasm/g722dsp.c
@@ -0,0 +1,63 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 <string.h>
+#include "checkasm.h"
+#include "libavcodec/g722.h"
+#include "libavcodec/g722dsp.h"
+#include "libavcodec/mathops.h"
+
+#define randomize_buffers()                             \
+    do {                                                \
+        int i;                                          \
+        for (i = 0; i < PREV_SAMPLES_BUF_SIZE; i++) {   \
+            src0[i] = src1[i] = sign_extend(rnd(), 16); \
+        }                                               \
+    } while (0)
+
+static void check_qmf(void) {
+    int16_t src0[PREV_SAMPLES_BUF_SIZE];
+    int16_t src1[PREV_SAMPLES_BUF_SIZE];
+    const int16_t *tmp0 = src0;
+    const int16_t *tmp1 = src1;
+    int dst0[2], dst1[2];
+    int i;
+
+    declare_func(void, const int16_t *prev_samples, int xout[2]);
+
+    randomize_buffers();
+    for (i = 0; i < PREV_SAMPLES_BUF_SIZE - 24; i++) {
+        call_ref(tmp0++, dst0);
+        call_new(tmp1++, dst1);
+        if (memcmp(dst0, dst1, sizeof(dst0)))
+            fail();
+    }
+    bench_new(src1, dst1);
+}
+
+void checkasm_check_g722dsp(void)
+{
+    G722DSPContext h;
+
+    ff_g722dsp_init(&h);
+
+    if (check_func(h.apply_qmf, "g722_apply_qmf"))
+        check_qmf();
+
+    report("apply_qmf");
+}
diff --git a/tests/checkasm/h264dsp.c b/tests/checkasm/h264dsp.c
index c9ddd52a7f..945423703f 100644
--- a/tests/checkasm/h264dsp.c
+++ b/tests/checkasm/h264dsp.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2016 Martin Storsjo
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
diff --git a/tests/checkasm/h264pred.c b/tests/checkasm/h264pred.c
index 4994947b1b..59dcb2f427 100644
--- a/tests/checkasm/h264pred.c
+++ b/tests/checkasm/h264pred.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2015 Henrik Gramner
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
diff --git a/tests/checkasm/h264qpel.c b/tests/checkasm/h264qpel.c
index d92f223ba1..ba069f1259 100644
--- a/tests/checkasm/h264qpel.c
+++ b/tests/checkasm/h264qpel.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2015 Henrik Gramner
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
diff --git a/tests/checkasm/hevc_add_res.c b/tests/checkasm/hevc_add_res.c
index 2cd97eaf36..185656ae8c 100644
--- a/tests/checkasm/hevc_add_res.c
+++ b/tests/checkasm/hevc_add_res.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2016 Alexandra Hájková
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -45,10 +45,10 @@
 static void check_add_res(HEVCDSPContext h, int bit_depth)
 {
     int i;
-    LOCAL_ALIGNED(32, int16_t, res0, [32 * 32]);
-    LOCAL_ALIGNED(32, int16_t, res1, [32 * 32]);
-    LOCAL_ALIGNED(32, uint8_t, dst0, [32 * 32 * 2]);
-    LOCAL_ALIGNED(32, uint8_t, dst1, [32 * 32 * 2]);
+    LOCAL_ALIGNED_32(int16_t, res0, [32 * 32]);
+    LOCAL_ALIGNED_32(int16_t, res1, [32 * 32]);
+    LOCAL_ALIGNED_32(uint8_t, dst0, [32 * 32 * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst1, [32 * 32 * 2]);
 
     for (i = 2; i <= 5; i++) {
         int block_size = 1 << i;
@@ -59,7 +59,7 @@ static void check_add_res(HEVCDSPContext h, int bit_depth)
         randomize_buffers(res0, size);
         randomize_buffers2(dst0, size);
         memcpy(res1, res0, sizeof(*res0) * size);
-        memcpy(dst1, dst0, size);
+        memcpy(dst1, dst0, sizeof(int16_t) * size);
 
         if (check_func(h.add_residual[i - 2], "add_res_%dx%d_%d", block_size, block_size, bit_depth)) {
             call_ref(dst0, res0, stride);
diff --git a/tests/checkasm/hevc_idct.c b/tests/checkasm/hevc_idct.c
index dd4dc0d064..eea712101d 100644
--- a/tests/checkasm/hevc_idct.c
+++ b/tests/checkasm/hevc_idct.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2016 Alexandra Hájková
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
diff --git a/tests/checkasm/hevc_mc.c b/tests/checkasm/hevc_mc.c
deleted file mode 100644
index 70f35ce78a..0000000000
--- a/tests/checkasm/hevc_mc.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright (c) 2015 Anton Khirnov
- *
- * This file is part of Libav.
- *
- * Libav is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Libav 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <string.h>
-
-#include "checkasm.h"
-
-#include "libavcodec/avcodec.h"
-#include "libavcodec/hevcdsp.h"
-
-#include "libavutil/common.h"
-#include "libavutil/intreadwrite.h"
-
-// max PU size + interpolation stencil
-#define BUF_SIZE (FFALIGN(64 + 7, 16) * (64 + 7) * 2)
-
-#define PIXEL_SIZE(depth) ((depth + 7) / 8)
-
-#define randomize_buffers(buf, size, depth)     \
-    do {                                        \
-        uint32_t mask = pixel_mask[depth - 8];  \
-        int i;                                  \
-        for (i = 0; i < size; i += 4) {         \
-            uint32_t r = rnd() & mask;          \
-            AV_WN32A(buf + i, r);               \
-        }                                       \
-    } while (0)
-
-static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff };
-
-static const int pred_heights[][7] = {
-    [2]  = {  8, 4, 2, 0 },
-    [4]  = { 16, 8, 4, 2, 0 },
-    [6]  = {  8, 0 },
-    [8]  = { 32, 16, 8, 4, 2, 0 },
-    [12] = { 16, 0 },
-    [16] = { 64, 32, 16, 12, 8, 4, 0 },
-    [24] = { 32, 0 },
-    [32] = { 64, 32, 24, 16, 8, 0 },
-    [48] = { 64, 0 },
-    [64] = { 64, 48, 32, 16, 0 },
-};
-
-static const int pred_widths[] = { 4, 8, 12, 16, 24, 32, 48, 64 };
-
-static const char *interp_names[2][2] = { { "pixels", "h" }, { "v", "hv" } };
-
-#define UNWEIGHTED_PRED(dst0, dst1, src0, width, bit_depth)         \
-do {                                                                \
-    int i;                                                          \
-    for (i = 0; i < FF_ARRAY_ELEMS(pred_heights[i]); i++) {         \
-        int height = pred_heights[width][i];                        \
-        if (!height)                                                \
-            break;                                                  \
-        call_ref(dst0, dststride, src0,       srcstride, height);   \
-        call_new(dst1, dststride, src0,       srcstride, height);   \
-        if (memcmp(dst0, dst1, dststride * height))                 \
-            fail();                                                 \
-        bench_new(dst1, dststride, src0,       srcstride, height);  \
-    }                                                               \
-} while (0)
-
-#define UNWEIGHTED_PRED_AVG(dst0, dst1, src0, src1, width, bit_depth)   \
-do {                                                                    \
-    int i;                                                              \
-    for (i = 0; i < FF_ARRAY_ELEMS(pred_heights[i]); i++) {             \
-        int height = pred_heights[width][i];                            \
-        if (!height)                                                    \
-            break;                                                      \
-        call_ref(dst0, dststride, src0, src1, srcstride, height);       \
-        call_new(dst1, dststride, src0, src1, srcstride, height);       \
-        if (memcmp(dst0, dst1, dststride * height))                     \
-            fail();                                                     \
-        bench_new(dst1, dststride, src0, src1, srcstride, height);      \
-    }                                                                   \
-} while (0)
-
-static void check_unweighted_pred(HEVCDSPContext *h, uint8_t *dst0, uint8_t *dst1,
-                                  int16_t *src0, int16_t *src1, int bit_depth)
-{
-    int i;
-
-    randomize_buffers(src0, BUF_SIZE, 8);
-    randomize_buffers(src1, BUF_SIZE, 8);
-
-    memset(dst0, 0, BUF_SIZE * sizeof(*dst0));
-    memset(dst1, 0, BUF_SIZE * sizeof(*dst1));
-
-    for (i = 0; i < FF_ARRAY_ELEMS(pred_widths); i++) {
-        const int width = pred_widths[i];
-        const ptrdiff_t srcstride = FFALIGN(width, 16) * sizeof(*src0);
-        const ptrdiff_t dststride = FFALIGN(width, 16) * PIXEL_SIZE(bit_depth);
-
-        {
-            declare_func(void, uint8_t *dst, ptrdiff_t dststride, int16_t *src, ptrdiff_t srcstride, int height);
-            if (check_func(h->put_unweighted_pred[i], "put_unweighted_pred_%d_%d", width, bit_depth))
-                UNWEIGHTED_PRED(dst0, dst1, src0, width, bit_depth);
-            if (check_func(h->put_unweighted_pred_chroma[i], "put_unweighted_pred_%d_%d", width / 2, bit_depth))
-                UNWEIGHTED_PRED(dst0, dst1, src0, width, bit_depth);
-        }
-        {
-            declare_func(void, uint8_t *dst, ptrdiff_t dststride,
-                         int16_t *src0, int16_t *src1, ptrdiff_t srcstride, int height);
-            if (check_func(h->put_unweighted_pred_avg[i], "put_unweighted_pred_avg_%d_%d", width, bit_depth))
-                UNWEIGHTED_PRED_AVG(dst0, dst1, src0, src1, width, bit_depth);
-            if (check_func(h->put_unweighted_pred_avg_chroma[i], "put_unweighted_pred_avg_%d_%d", width / 2, bit_depth))
-                UNWEIGHTED_PRED_AVG(dst0, dst1, src0, src1, width, bit_depth);
-        }
-    }
-}
-
-#define WEIGHTED_PRED(dst0, dst1, src0, width, bit_depth)                               \
-do {                                                                                    \
-    int i;                                                                              \
-    for (i = 0; i < FF_ARRAY_ELEMS(pred_heights[i]); i++) {                             \
-        int height = pred_heights[width][i];                                            \
-        if (!height)                                                                    \
-            break;                                                                      \
-        call_ref(denom, weight0, offset0, dst0, dststride, src0, srcstride, height);    \
-        call_new(denom, weight0, offset0, dst1, dststride, src0, srcstride, height);    \
-        if (memcmp(dst0, dst1, dststride * height))                                     \
-            fail();                                                                     \
-        bench_new(denom,  weight0, offset0, dst1, dststride, src0, srcstride, height);  \
-    }                                                                                   \
-} while (0)
-
-#define WEIGHTED_PRED_AVG(dst0, dst1, src0, src1, width, bit_depth)                                              \
-do {                                                                                                            \
-    int i;                                                                                                      \
-    for (i = 0; i < FF_ARRAY_ELEMS(pred_heights[i]); i++) {                                                     \
-        int height = pred_heights[width][i];                                                                    \
-        if (!height)                                                                                            \
-            break;                                                                                              \
-        call_ref(denom, weight0, weight1, offset0, offset1, dst0, dststride, src0, src1, srcstride, height);    \
-        call_new(denom, weight0, weight1, offset0, offset1, dst1, dststride, src0, src1, srcstride, height);    \
-        if (memcmp(dst0, dst1, dststride * height))                                                             \
-            fail();                                                                                             \
-        bench_new(denom, weight0, weight1, offset0, offset1, dst1, dststride, src0, src1, srcstride, height);   \
-    }                                                                                                           \
-} while (0)
-
-static void check_weighted_pred(HEVCDSPContext *h, uint8_t *dst0, uint8_t *dst1,
-                                int16_t *src0, int16_t *src1, int bit_depth)
-{
-    uint8_t denom;
-    int16_t weight0, weight1, offset0, offset1;
-    int i;
-
-    randomize_buffers(src0, BUF_SIZE, 8);
-    randomize_buffers(src1, BUF_SIZE, 8);
-
-    denom   = rnd() & 7;
-    weight0 = denom + ((rnd() & 255) - 128);
-    weight1 = denom + ((rnd() & 255) - 128);
-    offset0 = (rnd() & 255) - 128;
-    offset1 = (rnd() & 255) - 128;
-
-    memset(dst0, 0, BUF_SIZE * sizeof(*dst0));
-    memset(dst1, 0, BUF_SIZE * sizeof(*dst1));
-
-    for (i = 0; i < FF_ARRAY_ELEMS(pred_widths); i++) {
-        const int width = pred_widths[i];
-        const ptrdiff_t srcstride = FFALIGN(width, 16) * sizeof(*src0);
-        const ptrdiff_t dststride = FFALIGN(width, 16) * PIXEL_SIZE(bit_depth);
-
-        {
-            declare_func(void, uint8_t denom, int16_t weight, int16_t offset,
-                         uint8_t *dst, ptrdiff_t dststride, int16_t *src, ptrdiff_t srcstride, int height);
-            if (check_func(h->weighted_pred[i], "weighted_pred_%d_%d", width, bit_depth))
-                WEIGHTED_PRED(dst0, dst1, src0, width, bit_depth);
-            if (check_func(h->weighted_pred_chroma[i], "weighted_pred_%d_%d", width / 2, bit_depth))
-                WEIGHTED_PRED(dst0, dst1, src0, width, bit_depth);
-        }
-        {
-            declare_func(void, uint8_t denom, int16_t weight0, int16_t weight1, int16_t offset0, int16_t offset1,
-                         uint8_t *dst, ptrdiff_t dststride, int16_t *src0, int16_t *src1, ptrdiff_t srcstride, int height);
-            if (check_func(h->weighted_pred_avg[i], "weighted_pred_avg_%d_%d", width, bit_depth))
-                WEIGHTED_PRED_AVG(dst0, dst1, src0, src1, width, bit_depth);
-            if (check_func(h->weighted_pred_avg_chroma[i], "weighted_pred_avg_%d_%d", width / 2, bit_depth))
-                WEIGHTED_PRED_AVG(dst0, dst1, src0, src1, width, bit_depth);
-        }
-    }
-}
-
-static void check_epel(HEVCDSPContext *h, int16_t *dst0, int16_t *dst1,
-                       uint8_t *src, int16_t *mcbuffer, int bit_depth)
-{
-    int i, j, k, l, mx, my;
-
-    declare_func(void, int16_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride,
-                 int height, int mx, int my, int16_t *mcbuffer);
-
-    randomize_buffers(src, BUF_SIZE, bit_depth);
-
-    memset(dst0, 0, BUF_SIZE * sizeof(*dst0));
-    memset(dst1, 0, BUF_SIZE * sizeof(*dst1));
-
-    for (i = 0; i < 2; i++) {
-        for (j = 0; j < 2; j++) {
-            for (k = 0; k < FF_ARRAY_ELEMS(h->put_hevc_epel[i][j]); k++) {
-                int width = pred_widths[k] / 2;
-                ptrdiff_t dststride = FFALIGN(width, 16) * sizeof(*dst0);
-                ptrdiff_t srcstride = FFALIGN(width + 3, 8) * PIXEL_SIZE(bit_depth);
-
-                if (!check_func(h->put_hevc_epel[i][j][k], "epel_%s_%d_%d", interp_names[i][j], width, bit_depth))
-                    continue;
-
-                for (l = 0; l < FF_ARRAY_ELEMS(pred_heights[0]); l++) {
-                    int height = pred_heights[width][l];
-
-                    if (!height)
-                        continue;
-
-                    for (my = i; my < (i ? 8 : 1); my++)
-                        for (mx = j; mx < (j ? 8 : 1); mx++) {
-                            call_ref(dst0, dststride, src + srcstride + PIXEL_SIZE(bit_depth), srcstride, height, mx, my, mcbuffer);
-                            call_new(dst1, dststride, src + srcstride + PIXEL_SIZE(bit_depth), srcstride, height, mx, my, mcbuffer);
-
-                            if (memcmp(dst0, dst1, dststride * height * sizeof(*dst0)))
-                                fail();
-
-                            bench_new(dst1, dststride, src + srcstride + PIXEL_SIZE(bit_depth), srcstride, height, mx, my, mcbuffer);
-                        }
-                }
-            }
-        }
-    }
-}
-
-static void check_qpel(HEVCDSPContext *h, int16_t *dst0, int16_t *dst1,
-                       uint8_t *src, int16_t *mcbuffer, int bit_depth)
-{
-    int i, j, k, l, mx, my;
-
-    declare_func(void, int16_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride,
-                 int height, int mx, int my, int16_t *mcbuffer);
-
-    randomize_buffers(src, BUF_SIZE, bit_depth);
-
-    memset(dst0, 0, BUF_SIZE * sizeof(*dst0));
-    memset(dst1, 0, BUF_SIZE * sizeof(*dst1));
-
-    for (i = 0; i < 2; i++) {
-        for (j = 0; j < 2; j++) {
-            for (k = 0; k < FF_ARRAY_ELEMS(h->put_hevc_qpel[i][j]); k++) {
-                int width = pred_widths[k];
-                ptrdiff_t dststride = FFALIGN(width, 16) * sizeof(*dst0);
-                ptrdiff_t srcstride = FFALIGN(width + 7, 8) * PIXEL_SIZE(bit_depth);
-
-                if (!check_func(h->put_hevc_qpel[i][j][k], "qpel_%s_%d_%d", interp_names[i][j], width, bit_depth))
-                    continue;
-
-                for (l = 0; l < FF_ARRAY_ELEMS(pred_heights[0]); l++) {
-                    int height = pred_heights[width][l];
-
-                    if (!height)
-                        continue;
-
-                    for (my = i; my < (i ? 2 : 1); my++)
-                        for (mx = j; mx < (j ? 2 : 1); mx++) {
-                            call_ref(dst0, dststride, src + 3 * srcstride + 3 * PIXEL_SIZE(bit_depth), srcstride, height, mx, my, mcbuffer);
-                            call_new(dst1, dststride, src + 3 * srcstride + 3 * PIXEL_SIZE(bit_depth), srcstride, height, mx, my, mcbuffer);
-
-                            if (memcmp(dst0, dst1, dststride * height * sizeof(*dst0)))
-                                fail();
-
-                            bench_new(dst1, dststride, src + 3 * srcstride + 3 * PIXEL_SIZE(bit_depth), srcstride, height, mx, my, mcbuffer);
-                        }
-                }
-            }
-        }
-    }
-}
-
-void checkasm_check_hevc_mc(void)
-{
-    DECLARE_ALIGNED(16, uint8_t,  buf8_0)[BUF_SIZE];
-    DECLARE_ALIGNED(16, uint8_t,  buf8_1)[BUF_SIZE];
-
-    DECLARE_ALIGNED(16, int16_t, buf16_0)[BUF_SIZE];
-    DECLARE_ALIGNED(16, int16_t, buf16_1)[BUF_SIZE];
-
-    DECLARE_ALIGNED(16, int16_t, mcbuffer)[BUF_SIZE];
-
-    HEVCDSPContext h;
-    int bit_depth;
-
-    for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
-        ff_hevc_dsp_init(&h, bit_depth);
-        check_qpel(&h, buf16_0, buf16_1, buf8_0, mcbuffer, bit_depth);
-    }
-    report("qpel");
-
-    for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
-        ff_hevc_dsp_init(&h, bit_depth);
-        check_epel(&h, buf16_0, buf16_1, buf8_0, mcbuffer, bit_depth);
-    }
-    report("epel");
-
-    for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
-        ff_hevc_dsp_init(&h, bit_depth);
-        check_unweighted_pred(&h, buf8_0, buf8_1, buf16_0, buf16_1, bit_depth);
-    }
-    report("unweighted_pred");
-
-    for (bit_depth = 8; bit_depth <= 10; bit_depth++) {
-        ff_hevc_dsp_init(&h, bit_depth);
-        check_weighted_pred(&h, buf8_0, buf8_1, buf16_0, buf16_1, bit_depth);
-    }
-    report("weighted_pred");
-}
diff --git a/tests/checkasm/jpeg2000dsp.c b/tests/checkasm/jpeg2000dsp.c
new file mode 100644
index 0000000000..48559df085
--- /dev/null
+++ b/tests/checkasm/jpeg2000dsp.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015 James Almer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 "checkasm.h"
+#include "libavcodec/jpeg2000dsp.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define BUF_SIZE 512
+
+#define randomize_buffers()                 \
+    do {                                    \
+        int i;                              \
+        for (i = 0; i < BUF_SIZE; i += 4) { \
+            uint32_t r = rnd();             \
+            AV_WN32A(ref0 + i, r);          \
+            AV_WN32A(new0 + i, r);          \
+            r = rnd();                      \
+            AV_WN32A(ref1 + i, r);          \
+            AV_WN32A(new1 + i, r);          \
+            r = rnd();                      \
+            AV_WN32A(ref2 + i, r);          \
+            AV_WN32A(new2 + i, r);          \
+        }                                   \
+    } while (0)
+
+static void check_mct(uint8_t *ref0, uint8_t *ref1, uint8_t *ref2,
+                      uint8_t *new0, uint8_t *new1, uint8_t *new2) {
+    declare_func(void, void *src0, void *src1, void *src2, int csize);
+
+    randomize_buffers();
+    call_ref(ref0, ref1, ref2, BUF_SIZE / sizeof(int32_t));
+    call_new(new0, new1, new2, BUF_SIZE / sizeof(int32_t));
+    if (memcmp(ref0, new0, BUF_SIZE) || memcmp(ref1, new1, BUF_SIZE) ||
+        memcmp(ref2, new2, BUF_SIZE))
+        fail();
+    bench_new(new0, new1, new2, BUF_SIZE / sizeof(int32_t));
+}
+
+void checkasm_check_jpeg2000dsp(void)
+{
+    LOCAL_ALIGNED_32(uint8_t, ref, [BUF_SIZE*3]);
+    LOCAL_ALIGNED_32(uint8_t, new, [BUF_SIZE*3]);
+    Jpeg2000DSPContext h;
+
+    ff_jpeg2000dsp_init(&h);
+
+    if (check_func(h.mct_decode[FF_DWT53], "jpeg2000_rct_int"))
+        check_mct(&ref[BUF_SIZE*0], &ref[BUF_SIZE*1], &ref[BUF_SIZE*2],
+                  &new[BUF_SIZE*0], &new[BUF_SIZE*1], &new[BUF_SIZE*2]);
+
+    report("mct_decode");
+}
diff --git a/tests/checkasm/huffyuvdsp.c b/tests/checkasm/llviddsp.c
index 59e0f6a65a..b1f3b83b43 100644
--- a/tests/checkasm/huffyuvdsp.c
+++ b/tests/checkasm/llviddsp.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2016 Alexandra Hájková
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
@@ -24,7 +24,7 @@
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mem.h"
 
-#include "libavcodec/huffyuvdsp.h"
+#include "libavcodec/lossless_videodsp.h"
 
 #include "checkasm.h"
 
@@ -35,13 +35,13 @@
             buf[j] = rnd() & 0xFF;       \
     } while (0)
 
-static void check_add_bytes(HuffYUVDSPContext c, int width)
+static void check_add_bytes(LLVidDSPContext c, int width)
 {
     uint8_t *src0 = av_mallocz(width);
     uint8_t *src1 = av_mallocz(width);
     uint8_t *dst0 = av_mallocz(width);
     uint8_t *dst1 = av_mallocz(width);
-    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, uint8_t *src, int w);
+    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, uint8_t *src, ptrdiff_t w);
 
     if (!src0 || !src1 || !dst0 || !dst1)
         fail();
@@ -63,12 +63,12 @@ static void check_add_bytes(HuffYUVDSPContext c, int width)
     av_free(dst1);
 }
 
-void checkasm_check_huffyuvdsp(void)
+void checkasm_check_llviddsp(void)
 {
-    HuffYUVDSPContext c;
+    LLVidDSPContext c;
     int width = 16 * av_clip(rnd(), 16, 128);
 
-    ff_huffyuvdsp_init(&c);
+    ff_llviddsp_init(&c);
 
     check_add_bytes(c, width);
 
diff --git a/tests/checkasm/pixblockdsp.c b/tests/checkasm/pixblockdsp.c
new file mode 100644
index 0000000000..e14b0a90de
--- /dev/null
+++ b/tests/checkasm/pixblockdsp.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2015 Tiancheng "Timothy" Gu
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 <string.h>
+#include "checkasm.h"
+#include "libavcodec/pixblockdsp.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define BUF_UNITS 8
+#define BUF_SIZE (BUF_UNITS * 128 + 8 * BUF_UNITS)
+
+#define randomize_buffers()                 \
+    do {                                    \
+        int i;                              \
+        for (i = 0; i < BUF_SIZE; i += 4) { \
+            uint32_t r = rnd();             \
+            AV_WN32A(src10 + i, r);         \
+            AV_WN32A(src11 + i, r);         \
+            r = rnd();                      \
+            AV_WN32A(src20 + i, r);         \
+            AV_WN32A(src21 + i, r);         \
+            r = rnd();                      \
+            AV_WN32A(dst0_ + i, r);         \
+            AV_WN32A(dst1_ + i, r);         \
+        }                                   \
+    } while (0)
+
+#define check_get_pixels(type)                                                             \
+    do {                                                                                   \
+        int i;                                                                             \
+        declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *block, const uint8_t *pixels, ptrdiff_t line_size);    \
+                                                                                           \
+        for (i = 0; i < BUF_UNITS; i++) {                                              \
+            int src_offset = i * 64 * sizeof(type) + 8 * i; /* Test various alignments */      \
+            int dst_offset = i * 64; /* dst must be aligned */                             \
+            randomize_buffers();                                                           \
+            call_ref(dst0 + dst_offset, src10 + src_offset, 8);                            \
+            call_new(dst1 + dst_offset, src11 + src_offset, 8);                            \
+            if (memcmp(src10, src11, BUF_SIZE)|| memcmp(dst0, dst1, BUF_SIZE)) \
+                fail();                                                                    \
+            bench_new(dst1 + dst_offset, src11 + src_offset, 8);                           \
+        }                                                                                  \
+    } while (0)
+
+#define check_diff_pixels(type)                                                            \
+    do {                                                                                   \
+        int i;                                                                             \
+        declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *av_restrict block, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride); \
+                                                                                           \
+        for (i = 0; i < BUF_UNITS; i++) {                                              \
+            int src_offset = i * 64 * sizeof(type) + 8 * i; /* Test various alignments */      \
+            int dst_offset = i * 64; /* dst must be aligned */                             \
+            randomize_buffers();                                                           \
+            call_ref(dst0 + dst_offset, src10 + src_offset, src20 + src_offset, 8);        \
+            call_new(dst1 + dst_offset, src11 + src_offset, src21 + src_offset, 8);        \
+            if (memcmp(src10, src11, BUF_SIZE) || memcmp(src20, src21, BUF_SIZE) || memcmp(dst0, dst1, BUF_SIZE)) \
+                fail();                                                                    \
+            bench_new(dst1 + dst_offset, src11 + src_offset, src21 + src_offset, 8);       \
+        }                                                                                  \
+    } while (0)
+
+void checkasm_check_pixblockdsp(void)
+{
+    LOCAL_ALIGNED_16(uint8_t, src10, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(uint8_t, src11, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(uint8_t, src20, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(uint8_t, src21, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(uint8_t, dst0_, [BUF_SIZE]);
+    LOCAL_ALIGNED_16(uint8_t, dst1_, [BUF_SIZE]);
+    uint16_t *dst0 = (uint16_t *)dst0_;
+    uint16_t *dst1 = (uint16_t *)dst1_;
+    PixblockDSPContext h;
+    AVCodecContext avctx = {
+        .bits_per_raw_sample = 8,
+    };
+
+    ff_pixblockdsp_init(&h, &avctx);
+
+    if (check_func(h.get_pixels, "get_pixels"))
+        check_get_pixels(uint8_t);
+
+    report("get_pixels");
+
+    if (check_func(h.diff_pixels, "diff_pixels"))
+        check_diff_pixels(uint8_t);
+
+    report("diff_pixels");
+}
diff --git a/tests/checkasm/sbrdsp.c b/tests/checkasm/sbrdsp.c
new file mode 100644
index 0000000000..558f452c9b
--- /dev/null
+++ b/tests/checkasm/sbrdsp.c
@@ -0,0 +1,298 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 "libavcodec/sbrdsp.h"
+
+#include "checkasm.h"
+
+#define randomize(buf, len) do {                                \
+    int i;                                                      \
+    for (i = 0; i < len; i++) {                                 \
+        const INTFLOAT f = (INTFLOAT)rnd() / UINT_MAX;          \
+        (buf)[i] = f;                                           \
+    }                                                           \
+} while (0)
+
+#define EPS 0.0001
+
+static void test_sum64x5(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [64 + 256]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [64 + 256]);
+
+    declare_func(void, INTFLOAT *z);
+
+    randomize((INTFLOAT *)dst0, 64 + 256);
+    memcpy(dst1, dst0, (64 + 256) * sizeof(INTFLOAT));
+    call_ref(dst0);
+    call_new(dst1);
+    if (!float_near_abs_eps_array(dst0, dst1, EPS, 64 + 256))
+        fail();
+    bench_new(dst1);
+}
+
+static void test_sum_square(void)
+{
+    INTFLOAT res0;
+    INTFLOAT res1;
+    LOCAL_ALIGNED_16(INTFLOAT, src, [256], [2]);
+
+    declare_func_float(INTFLOAT, INTFLOAT (*x)[2], int n);
+
+    randomize((INTFLOAT *)src, 256 * 2);
+    res0 = call_ref(src, 256);
+    res1 = call_new(src, 256);
+    if (!float_near_abs_eps(res0, res1, EPS))
+        fail();
+    bench_new(src, 256);
+}
+
+static void test_neg_odd_64(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [64]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [64]);
+
+    declare_func(void, INTFLOAT *x);
+
+    randomize((INTFLOAT *)dst0, 64);
+    memcpy(dst1, dst0, (64) * sizeof(INTFLOAT));
+    call_ref(dst0);
+    call_new(dst1);
+    if (!float_near_abs_eps_array(dst0, dst1, EPS, 64))
+        fail();
+    bench_new(dst1);
+}
+
+static void test_qmf_pre_shuffle(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [128]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [128]);
+
+    declare_func(void, INTFLOAT *z);
+
+    randomize((INTFLOAT *)dst0, 128);
+    memcpy(dst1, dst0, (128) * sizeof(INTFLOAT));
+    call_ref(dst0);
+    call_new(dst1);
+    if (!float_near_abs_eps_array(dst0, dst1, EPS, 128))
+        fail();
+    bench_new(dst1);
+}
+
+static void test_qmf_post_shuffle(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, src, [64]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [32], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [32], [2]);
+
+    declare_func(void, INTFLOAT W[32][2], const INTFLOAT *z);
+
+    randomize((INTFLOAT *)src, 64);
+    call_ref(dst0, src);
+    call_new(dst1, src);
+    if (!float_near_abs_eps_array((INTFLOAT *)dst0, (INTFLOAT *)dst1, EPS, 64))
+        fail();
+    bench_new(dst1, src);
+}
+
+static void test_qmf_deint_neg(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, src, [64]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [64]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [64]);
+
+    declare_func(void, INTFLOAT *v, const INTFLOAT *src);
+
+    randomize((INTFLOAT *)src, 64);
+    call_ref(dst0, src);
+    call_new(dst1, src);
+    if (!float_near_abs_eps_array(dst0, dst1, EPS, 64))
+        fail();
+    bench_new(dst1, src);
+}
+
+static void test_qmf_deint_bfly(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, src0, [64]);
+    LOCAL_ALIGNED_16(INTFLOAT, src1, [64]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [128]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [128]);
+
+    declare_func(void, INTFLOAT *v, const INTFLOAT *src0, const INTFLOAT *src1);
+
+    memset(dst0, 0, 128 * sizeof(INTFLOAT));
+    memset(dst1, 0, 128 * sizeof(INTFLOAT));
+
+    randomize((INTFLOAT *)src0, 64);
+    randomize((INTFLOAT *)src1, 64);
+    call_ref(dst0, src0, src1);
+    call_new(dst1, src0, src1);
+    if (!float_near_abs_eps_array(dst0, dst1, EPS, 128))
+        fail();
+    bench_new(dst1, src0, src1);
+}
+
+static void test_autocorrelate(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, src, [40], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [3], [2][2]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [3], [2][2]);
+
+    declare_func(void, const INTFLOAT x[40][2], INTFLOAT phi[3][2][2]);
+
+    memset(dst0, 0, 3 * 2 * 2 * sizeof(INTFLOAT));
+    memset(dst1, 0, 3 * 2 * 2 * sizeof(INTFLOAT));
+
+    randomize((INTFLOAT *)src, 80);
+    call_ref(src, dst0);
+    call_new(src, dst1);
+    if (!float_near_abs_eps_array((INTFLOAT *)dst0, (INTFLOAT *)dst1, EPS, 3 * 2 * 2))
+        fail();
+    bench_new(src, dst1);
+}
+
+static void test_hf_gen(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, low, [128], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, alpha0, [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, alpha1, [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [128], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [128], [2]);
+    INTFLOAT bw = (INTFLOAT)rnd() / UINT_MAX;
+    int i;
+
+    declare_func(void, INTFLOAT (*X_high)[2], const INTFLOAT (*X_low)[2],
+                       const INTFLOAT alpha0[2], const INTFLOAT alpha1[2],
+                       INTFLOAT bw, int start, int end);
+
+    randomize((INTFLOAT *)low, 128 * 2);
+    randomize((INTFLOAT *)alpha0, 2);
+    randomize((INTFLOAT *)alpha1, 2);
+    for (i = 2; i < 64; i += 2) {
+        memset(dst0, 0, 128 * 2 * sizeof(INTFLOAT));
+        memset(dst1, 0, 128 * 2 * sizeof(INTFLOAT));
+        call_ref(dst0, low, alpha0, alpha1, 0.0, i, 128);
+        call_new(dst1, low, alpha0, alpha1, 0.0, i, 128);
+        if (!float_near_abs_eps_array((INTFLOAT *)dst0, (INTFLOAT *)dst1, EPS, 128 * 2))
+            fail();
+        bench_new(dst1, low, alpha0, alpha1, bw, i, 128);
+    }
+}
+
+static void test_hf_g_filt(void)
+{
+    LOCAL_ALIGNED_16(INTFLOAT, high, [128], [40][2]);
+    LOCAL_ALIGNED_16(INTFLOAT, g_filt, [128]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [128], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [128], [2]);
+
+    declare_func(void, INTFLOAT (*Y)[2], const INTFLOAT (*X_high)[40][2],
+                       const INTFLOAT *g_filt, int m_max, intptr_t ixh);
+
+    randomize((INTFLOAT *)high, 128 * 40 * 2);
+    randomize((INTFLOAT *)g_filt, 128);
+
+    call_ref(dst0, high, g_filt, 128, 20);
+    call_new(dst1, high, g_filt, 128, 20);
+    if (!float_near_abs_eps_array((INTFLOAT *)dst0, (INTFLOAT *)dst1, EPS, 128 * 2))
+        fail();
+    bench_new(dst1, high, g_filt, 128, 20);
+}
+
+static void test_hf_apply_noise(const SBRDSPContext *sbrdsp)
+{
+    LOCAL_ALIGNED_16(AAC_FLOAT, s_m, [128]);
+    LOCAL_ALIGNED_16(AAC_FLOAT, q_filt, [128]);
+    LOCAL_ALIGNED_16(INTFLOAT, ref, [128], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst0, [128], [2]);
+    LOCAL_ALIGNED_16(INTFLOAT, dst1, [128], [2]);
+    int noise = 0x2a;
+    int i, j;
+
+    declare_func(void, INTFLOAT (*Y)[2], const AAC_FLOAT *s_m,
+                       const AAC_FLOAT *q_filt, int noise,
+                       int kx, int m_max);
+
+    randomize((INTFLOAT *)ref, 128 * 2);
+    randomize((INTFLOAT *)s_m, 128);
+    randomize((INTFLOAT *)q_filt, 128);
+
+    for (i = 0; i < 4; i++) {
+        if (check_func(sbrdsp->hf_apply_noise[i], "hf_apply_noise_%d", i)) {
+            for (j = 0; j < 2; j++) {
+                memcpy(dst0, ref, 128 * 2 * sizeof(INTFLOAT));
+                memcpy(dst1, ref, 128 * 2 * sizeof(INTFLOAT));
+                call_ref(dst0, s_m, q_filt, noise, j, 128);
+                call_new(dst1, s_m, q_filt, noise, j, 128);
+                if (!float_near_abs_eps_array((INTFLOAT *)dst0, (INTFLOAT *)dst1, EPS, 128 * 2))
+                    fail();
+                bench_new(dst1, s_m, q_filt, noise, j, 128);
+            }
+        }
+    }
+}
+
+void checkasm_check_sbrdsp(void)
+{
+    SBRDSPContext sbrdsp;
+
+    ff_sbrdsp_init(&sbrdsp);
+
+    if (check_func(sbrdsp.sum64x5, "sum64x5"))
+        test_sum64x5();
+    report("sum64x5");
+
+    if (check_func(sbrdsp.sum_square, "sum_square"))
+        test_sum_square();
+    report("sum_square");
+
+    if (check_func(sbrdsp.neg_odd_64, "neg_odd_64"))
+        test_neg_odd_64();
+    report("neg_odd_64");
+
+    if (check_func(sbrdsp.qmf_pre_shuffle, "qmf_pre_shuffle"))
+        test_qmf_pre_shuffle();
+    report("qmf_pre_shuffle");
+
+    if (check_func(sbrdsp.qmf_post_shuffle, "qmf_post_shuffle"))
+        test_qmf_post_shuffle();
+    report("qmf_post_shuffle");
+
+    if (check_func(sbrdsp.qmf_deint_neg, "qmf_deint_neg"))
+        test_qmf_deint_neg();
+    report("qmf_deint_neg");
+
+    if (check_func(sbrdsp.qmf_deint_bfly, "qmf_deint_bfly"))
+        test_qmf_deint_bfly();
+    report("qmf_deint_bfly");
+
+    if (check_func(sbrdsp.autocorrelate, "autocorrelate"))
+        test_autocorrelate();
+    report("autocorrelate");
+
+    if (check_func(sbrdsp.hf_gen, "hf_gen"))
+        test_hf_gen();
+    report("hf_gen");
+
+    if (check_func(sbrdsp.hf_g_filt, "hf_g_filt"))
+        test_hf_g_filt();
+    report("hf_g_filt");
+
+    test_hf_apply_noise(&sbrdsp);
+    report("hf_apply_noise");
+}
diff --git a/tests/checkasm/synth_filter.c b/tests/checkasm/synth_filter.c
index 157400b570..87e32ebc0e 100644
--- a/tests/checkasm/synth_filter.c
+++ b/tests/checkasm/synth_filter.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2015 Janne Grunau
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
diff --git a/tests/checkasm/v210enc.c b/tests/checkasm/v210enc.c
index 4f5f6ba4ba..ed3677659d 100644
--- a/tests/checkasm/v210enc.c
+++ b/tests/checkasm/v210enc.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2015 Henrik Gramner
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
diff --git a/tests/checkasm/vf_blend.c b/tests/checkasm/vf_blend.c
new file mode 100644
index 0000000000..be65730452
--- /dev/null
+++ b/tests/checkasm/vf_blend.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2016 Tiancheng "Timothy" Gu
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 <string.h>
+#include "checkasm.h"
+#include "libavfilter/blend.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define WIDTH 256
+#define HEIGHT 256
+#define BUF_UNITS 3
+#define SIZE_PER_UNIT (WIDTH * HEIGHT)
+#define BUF_SIZE (BUF_UNITS * SIZE_PER_UNIT)
+
+#define randomize_buffers()                   \
+    do {                                      \
+        int i, j;                             \
+        for (i = 0; i < HEIGHT; i++) {        \
+            for (j = 0; j < WIDTH; j++) {     \
+                top1[i * WIDTH + j] =         \
+                top2[i * WIDTH + j] = i;      \
+                bot1[i * WIDTH + j] =         \
+                bot2[i * WIDTH + j] = j;      \
+            }                                 \
+        }                                     \
+        for (i = 0; i < SIZE_PER_UNIT; i += 4) { \
+            uint32_t r = rnd();               \
+            AV_WN32A(dst1 + i, r);            \
+            AV_WN32A(dst2 + i, r);            \
+        }                                     \
+        for (; i < BUF_SIZE; i += 4) {        \
+            uint32_t r = rnd();               \
+            AV_WN32A(top1 + i, r);            \
+            AV_WN32A(top2 + i, r);            \
+            r = rnd();                        \
+            AV_WN32A(bot1 + i, r);            \
+            AV_WN32A(bot2 + i, r);            \
+            r = rnd();                        \
+            AV_WN32A(dst1 + i, r);            \
+            AV_WN32A(dst2 + i, r);            \
+        }                                     \
+    } while (0)
+
+#define check_blend_func()                                                                 \
+    do {                                                                                   \
+        int i;                                                                             \
+        declare_func(void, const uint8_t *top, ptrdiff_t top_linesize,                     \
+                     const uint8_t *bottom, ptrdiff_t bottom_linesize,                     \
+                     uint8_t *dst, ptrdiff_t dst_linesize,                                 \
+                     ptrdiff_t width, ptrdiff_t height,                                    \
+                     struct FilterParams *param, double *values);                          \
+                                                                                           \
+        for (i = 0; i < BUF_UNITS - 1; i++) {                                              \
+            int src_offset = i * SIZE_PER_UNIT + i; /* Test various alignments */          \
+            int dst_offset = i * SIZE_PER_UNIT; /* dst must be aligned */                  \
+            randomize_buffers();                                                           \
+            call_ref(top1 + src_offset, WIDTH, bot1 + src_offset, WIDTH,                   \
+                     dst1 + dst_offset, WIDTH, WIDTH, HEIGHT, &param, NULL);               \
+            call_new(top2 + src_offset, WIDTH, bot2 + src_offset, WIDTH,                   \
+                     dst2 + dst_offset, WIDTH, WIDTH, HEIGHT, &param, NULL);               \
+            if (memcmp(top1, top2, BUF_SIZE) || memcmp(bot1, bot2, BUF_SIZE) || memcmp(dst1, dst2, BUF_SIZE)) \
+                fail();                                                                    \
+        }                                                                                  \
+        bench_new(top2, WIDTH / 4, bot2, WIDTH / 4, dst2, WIDTH / 4,                       \
+                  WIDTH / 4, HEIGHT / 4, &param, NULL);                                    \
+    } while (0)
+
+void checkasm_check_blend(void)
+{
+    uint8_t *top1 = av_malloc(BUF_SIZE);
+    uint8_t *top2 = av_malloc(BUF_SIZE);
+    uint8_t *bot1 = av_malloc(BUF_SIZE);
+    uint8_t *bot2 = av_malloc(BUF_SIZE);
+    uint8_t *dst1 = av_malloc(BUF_SIZE);
+    uint8_t *dst2 = av_malloc(BUF_SIZE);
+    FilterParams param = {
+        .opacity = 1.0,
+    };
+
+#define check_and_report(name, val)               \
+    param.mode = val;                             \
+    ff_blend_init(&param, 0);                     \
+    if (check_func(param.blend, #name))           \
+        check_blend_func();
+
+    check_and_report(addition, BLEND_ADDITION)
+    check_and_report(grainmerge, BLEND_GRAINMERGE)
+    check_and_report(and, BLEND_AND)
+    check_and_report(average, BLEND_AVERAGE)
+    check_and_report(darken, BLEND_DARKEN)
+    check_and_report(grainextract, BLEND_GRAINEXTRACT)
+    check_and_report(hardmix, BLEND_HARDMIX)
+    check_and_report(lighten, BLEND_LIGHTEN)
+    check_and_report(multiply, BLEND_MULTIPLY)
+    check_and_report(or, BLEND_OR)
+    check_and_report(phoenix, BLEND_PHOENIX)
+    check_and_report(screen, BLEND_SCREEN)
+    check_and_report(subtract, BLEND_SUBTRACT)
+    check_and_report(xor, BLEND_XOR)
+    check_and_report(difference, BLEND_DIFFERENCE)
+    check_and_report(extremity, BLEND_EXTREMITY)
+    check_and_report(negation, BLEND_NEGATION)
+
+    report("8bit");
+
+    av_freep(&top1);
+    av_freep(&top2);
+    av_freep(&bot1);
+    av_freep(&bot2);
+    av_freep(&dst1);
+    av_freep(&dst2);
+}
diff --git a/tests/checkasm/vf_colorspace.c b/tests/checkasm/vf_colorspace.c
new file mode 100644
index 0000000000..10b7b83924
--- /dev/null
+++ b/tests/checkasm/vf_colorspace.c
@@ -0,0 +1,314 @@
+/*
+ * Copyright (c) 2016 Ronald S. Bultje <rsbultje@gmail.com>
+ *
+ * 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 <string.h>
+#include "checkasm.h"
+#include "libavfilter/colorspacedsp.h"
+#include "libavutil/common.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define W 64
+#define H 64
+
+#define randomize_buffers()                     \
+    do {                                        \
+        unsigned mask = bpp_mask[idepth];       \
+        int n, m;                               \
+        int bpp = 1 + (!!idepth);               \
+        int buf_size = W * H * bpp;             \
+        for (m = 0; m < 3; m++) {               \
+            int ss = m ? ss_w + ss_h : 0;       \
+            int plane_sz = buf_size >> ss;      \
+            for (n = 0; n < plane_sz; n += 4) { \
+                unsigned r = rnd() & mask;      \
+                AV_WN32A(&src[m][n], r);        \
+            }                                   \
+        }                                       \
+    } while (0)
+
+static const char *format_string[] = {
+    "444", "422", "420"
+};
+
+static const unsigned bpp_mask[] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
+
+static void check_yuv2yuv(void)
+{
+    declare_func(void, uint8_t *dst[3], ptrdiff_t dst_stride[3],
+                 uint8_t *src[3], ptrdiff_t src_stride[3],
+                 int w, int h, const int16_t coeff[3][3][8],
+                 const int16_t off[2][8]);
+    ColorSpaceDSPContext dsp;
+    int idepth, odepth, fmt, n;
+    LOCAL_ALIGNED_32(uint8_t, src_y, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, src_u, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, src_v, [W * H * 2]);
+    uint8_t *src[3] = { src_y, src_u, src_v };
+    LOCAL_ALIGNED_32(uint8_t, dst0_y, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst0_u, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst0_v, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst1_y, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst1_u, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst1_v, [W * H * 2]);
+    uint8_t *dst0[3] = { dst0_y, dst0_u, dst0_v }, *dst1[3] = { dst1_y, dst1_u, dst1_v };
+    LOCAL_ALIGNED_32(int16_t, offset_buf, [16]);
+    LOCAL_ALIGNED_32(int16_t, coeff_buf, [3 * 3 * 8]);
+    int16_t (*offset)[8] = (int16_t(*)[8]) offset_buf;
+    int16_t (*coeff)[3][8] = (int16_t(*)[3][8]) coeff_buf;
+
+    ff_colorspacedsp_init(&dsp);
+    for (n = 0; n < 8; n++) {
+        offset[0][n] = offset[1][n] = 16;
+
+        coeff[0][0][n] = (1 << 14) + (1 << 7) + 1;
+        coeff[0][1][n] = (1 << 7) - 1;
+        coeff[0][2][n] = -(1 << 8);
+        coeff[1][0][n] = coeff[2][0][n] = 0;
+        coeff[1][1][n] = (1 << 14) + (1 << 7);
+        coeff[1][2][n] = -(1 << 7);
+        coeff[2][2][n] = (1 << 14) - (1 << 6);
+        coeff[2][1][n] = 1 << 6;
+    }
+    for (idepth = 0; idepth < 3; idepth++) {
+        for (odepth = 0; odepth < 3; odepth++) {
+            for (fmt = 0; fmt < 3; fmt++) {
+                if (check_func(dsp.yuv2yuv[idepth][odepth][fmt],
+                               "ff_colorspacedsp_yuv2yuv_%sp%dto%d",
+                               format_string[fmt],
+                               idepth * 2 + 8, odepth * 2 + 8)) {
+                    int ss_w = !!fmt, ss_h = fmt == 2;
+                    int y_src_stride = W << !!idepth, y_dst_stride = W << !!odepth;
+                    int uv_src_stride = y_src_stride >> ss_w, uv_dst_stride = y_dst_stride >> ss_w;
+
+                    randomize_buffers();
+                    call_ref(dst0, (ptrdiff_t[3]) { y_dst_stride, uv_dst_stride, uv_dst_stride },
+                             src, (ptrdiff_t[3]) { y_src_stride, uv_src_stride, uv_src_stride },
+                             W, H, coeff, offset);
+                    call_new(dst1, (ptrdiff_t[3]) { y_dst_stride, uv_dst_stride, uv_dst_stride },
+                             src, (ptrdiff_t[3]) { y_src_stride, uv_src_stride, uv_src_stride },
+                             W, H, coeff, offset);
+                    if (memcmp(dst0[0], dst1[0], y_dst_stride * H) ||
+                        memcmp(dst0[1], dst1[1], uv_dst_stride * H >> ss_h) ||
+                        memcmp(dst0[2], dst1[2], uv_dst_stride * H >> ss_h)) {
+                        fail();
+                    }
+                }
+            }
+        }
+    }
+
+    report("yuv2yuv");
+}
+
+static void check_yuv2rgb(void)
+{
+    declare_func(void, int16_t *dst[3], ptrdiff_t dst_stride,
+                 uint8_t *src[3], ptrdiff_t src_stride[3],
+                 int w, int h, const int16_t coeff[3][3][8],
+                 const int16_t off[8]);
+    ColorSpaceDSPContext dsp;
+    int idepth, fmt, n;
+    LOCAL_ALIGNED_32(uint8_t, src_y, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, src_u, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, src_v, [W * H * 2]);
+    uint8_t *src[3] = { src_y, src_u, src_v };
+    LOCAL_ALIGNED_32(int16_t, dst0_y, [W * H]);
+    LOCAL_ALIGNED_32(int16_t, dst0_u, [W * H]);
+    LOCAL_ALIGNED_32(int16_t, dst0_v, [W * H]);
+    LOCAL_ALIGNED_32(int16_t, dst1_y, [W * H]);
+    LOCAL_ALIGNED_32(int16_t, dst1_u, [W * H]);
+    LOCAL_ALIGNED_32(int16_t, dst1_v, [W * H]);
+    int16_t *dst0[3] = { dst0_y, dst0_u, dst0_v }, *dst1[3] = { dst1_y, dst1_u, dst1_v };
+    LOCAL_ALIGNED_32(int16_t, offset, [8]);
+    LOCAL_ALIGNED_32(int16_t, coeff_buf, [3 * 3 * 8]);
+    int16_t (*coeff)[3][8] = (int16_t(*)[3][8]) coeff_buf;
+
+    ff_colorspacedsp_init(&dsp);
+    for (n = 0; n < 8; n++) {
+        offset[n] = 16;
+
+        coeff[0][0][n] = coeff[1][0][n] = coeff[2][0][n] = (1 << 14) | 1;
+        coeff[0][1][n] = coeff[2][2][n] = 0;
+        coeff[0][2][n] = 1 << 13;
+        coeff[1][1][n] = -(1 << 12);
+        coeff[1][2][n] = 1 << 12;
+        coeff[2][1][n] = 1 << 11;
+    }
+    for (idepth = 0; idepth < 3; idepth++) {
+        for (fmt = 0; fmt < 3; fmt++) {
+            if (check_func(dsp.yuv2rgb[idepth][fmt],
+                           "ff_colorspacedsp_yuv2rgb_%sp%d",
+                           format_string[fmt], idepth * 2 + 8)) {
+                int ss_w = !!fmt, ss_h = fmt == 2;
+                int y_src_stride = W << !!idepth;
+                int uv_src_stride = y_src_stride >> ss_w;
+
+                randomize_buffers();
+                call_ref(dst0, W, src,
+                         (ptrdiff_t[3]) { y_src_stride, uv_src_stride, uv_src_stride },
+                         W, H, coeff, offset);
+                call_new(dst1, W, src,
+                         (ptrdiff_t[3]) { y_src_stride, uv_src_stride, uv_src_stride },
+                         W, H, coeff, offset);
+                if (memcmp(dst0[0], dst1[0], W * H * sizeof(int16_t)) ||
+                    memcmp(dst0[1], dst1[1], W * H * sizeof(int16_t)) ||
+                    memcmp(dst0[2], dst1[2], W * H * sizeof(int16_t))) {
+                    fail();
+                }
+            }
+        }
+    }
+
+    report("yuv2rgb");
+}
+
+#undef randomize_buffers
+#define randomize_buffers()                     \
+    do {                                        \
+        int y, x, p;                            \
+        for (p = 0; p < 3; p++) {               \
+            for (y = 0; y < H; y++) {           \
+                for (x = 0; x < W; x++) {       \
+                    int r = rnd() & 0x7fff;     \
+                    r -= (32768 - 28672) >> 1;  \
+                    src[p][y * W + x] = r;      \
+                }                               \
+            }                                   \
+        }                                       \
+    } while (0)
+
+static void check_rgb2yuv(void)
+{
+    declare_func(void, uint8_t *dst[3], ptrdiff_t dst_stride[3],
+                 int16_t *src[3], ptrdiff_t src_stride,
+                 int w, int h, const int16_t coeff[3][3][8],
+                 const int16_t off[8]);
+    ColorSpaceDSPContext dsp;
+    int odepth, fmt, n;
+    LOCAL_ALIGNED_32(int16_t, src_y, [W * H * 2]);
+    LOCAL_ALIGNED_32(int16_t, src_u, [W * H * 2]);
+    LOCAL_ALIGNED_32(int16_t, src_v, [W * H * 2]);
+    int16_t *src[3] = { src_y, src_u, src_v };
+    LOCAL_ALIGNED_32(uint8_t, dst0_y, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst0_u, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst0_v, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst1_y, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst1_u, [W * H * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst1_v, [W * H * 2]);
+    uint8_t *dst0[3] = { dst0_y, dst0_u, dst0_v }, *dst1[3] = { dst1_y, dst1_u, dst1_v };
+    LOCAL_ALIGNED_32(int16_t, offset, [8]);
+    LOCAL_ALIGNED_32(int16_t, coeff_buf, [3 * 3 * 8]);
+    int16_t (*coeff)[3][8] = (int16_t(*)[3][8]) coeff_buf;
+
+    ff_colorspacedsp_init(&dsp);
+    for (n = 0; n < 8; n++) {
+        offset[n] = 16;
+
+        // these somewhat resemble bt601/smpte170m coefficients
+        coeff[0][0][n] = lrint(0.3 * (1 << 14));
+        coeff[0][1][n] = lrint(0.6 * (1 << 14));
+        coeff[0][2][n] = lrint(0.1 * (1 << 14));
+        coeff[1][0][n] = lrint(-0.15 * (1 << 14));
+        coeff[1][1][n] = lrint(-0.35 * (1 << 14));
+        coeff[1][2][n] = lrint(0.5 * (1 << 14));
+        coeff[2][0][n] = lrint(0.5 * (1 << 14));
+        coeff[2][1][n] = lrint(-0.42 * (1 << 14));
+        coeff[2][2][n] = lrint(-0.08 * (1 << 14));
+    }
+    for (odepth = 0; odepth < 3; odepth++) {
+        for (fmt = 0; fmt < 3; fmt++) {
+            if (check_func(dsp.rgb2yuv[odepth][fmt],
+                           "ff_colorspacedsp_rgb2yuv_%sp%d",
+                           format_string[fmt], odepth * 2 + 8)) {
+                int ss_w = !!fmt, ss_h = fmt == 2;
+                int y_dst_stride = W << !!odepth;
+                int uv_dst_stride = y_dst_stride >> ss_w;
+
+                randomize_buffers();
+                call_ref(dst0, (ptrdiff_t[3]) { y_dst_stride, uv_dst_stride, uv_dst_stride },
+                         src, W, W, H, coeff, offset);
+                call_new(dst1, (ptrdiff_t[3]) { y_dst_stride, uv_dst_stride, uv_dst_stride },
+                         src, W, W, H, coeff, offset);
+                if (memcmp(dst0[0], dst1[0], H * y_dst_stride) ||
+                    memcmp(dst0[1], dst1[1], H * uv_dst_stride >> ss_h) ||
+                    memcmp(dst0[2], dst1[2], H * uv_dst_stride >> ss_h)) {
+                    fail();
+                }
+            }
+        }
+    }
+
+    report("rgb2yuv");
+}
+
+static void check_multiply3x3(void)
+{
+    declare_func(void, int16_t *data[3], ptrdiff_t stride,
+                 int w, int h, const int16_t coeff[3][3][8]);
+    ColorSpaceDSPContext dsp;
+    LOCAL_ALIGNED_32(int16_t, dst0_y, [W * H]);
+    LOCAL_ALIGNED_32(int16_t, dst0_u, [W * H]);
+    LOCAL_ALIGNED_32(int16_t, dst0_v, [W * H]);
+    LOCAL_ALIGNED_32(int16_t, dst1_y, [W * H]);
+    LOCAL_ALIGNED_32(int16_t, dst1_u, [W * H]);
+    LOCAL_ALIGNED_32(int16_t, dst1_v, [W * H]);
+    int16_t *dst0[3] = { dst0_y, dst0_u, dst0_v }, *dst1[3] = { dst1_y, dst1_u, dst1_v };
+    int16_t **src = dst0;
+    LOCAL_ALIGNED_32(int16_t, coeff_buf, [3 * 3 * 8]);
+    int16_t (*coeff)[3][8] = (int16_t(*)[3][8]) coeff_buf;
+    int n;
+
+    ff_colorspacedsp_init(&dsp);
+    for (n = 0; n < 8; n++) {
+        coeff[0][0][n] = lrint(0.85 * (1 << 14));
+        coeff[0][1][n] = lrint(0.10 * (1 << 14));
+        coeff[0][2][n] = lrint(0.05 * (1 << 14));
+        coeff[1][0][n] = lrint(-0.1 * (1 << 14));
+        coeff[1][1][n] = lrint(0.95 * (1 << 14));
+        coeff[1][2][n] = lrint(0.15 * (1 << 14));
+        coeff[2][0][n] = lrint(-0.2 * (1 << 14));
+        coeff[2][1][n] = lrint(0.30 * (1 << 14));
+        coeff[2][2][n] = lrint(0.90 * (1 << 14));
+    }
+    if (check_func(dsp.multiply3x3, "ff_colorspacedsp_multiply3x3")) {
+        randomize_buffers();
+        memcpy(dst1_y, dst0_y, W * H * sizeof(*dst1_y));
+        memcpy(dst1_u, dst0_u, W * H * sizeof(*dst1_u));
+        memcpy(dst1_v, dst0_v, W * H * sizeof(*dst1_v));
+        call_ref(dst0, W, W, H, coeff);
+        call_new(dst1, W, W, H, coeff);
+        if (memcmp(dst0[0], dst1[0], H * W * sizeof(*dst0_y)) ||
+            memcmp(dst0[1], dst1[1], H * W * sizeof(*dst0_u)) ||
+            memcmp(dst0[2], dst1[2], H * W * sizeof(*dst0_v))) {
+            fail();
+        }
+    }
+
+    report("multiply3x3");
+}
+
+void checkasm_check_colorspace(void)
+{
+    check_yuv2yuv();
+    check_yuv2rgb();
+    check_rgb2yuv();
+    check_multiply3x3();
+}
diff --git a/tests/checkasm/videodsp.c b/tests/checkasm/videodsp.c
new file mode 100644
index 0000000000..0a4424a28c
--- /dev/null
+++ b/tests/checkasm/videodsp.c
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2016 Ronald S. Bultje <rsbultje@gmail.com>
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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 <string.h>
+#include "checkasm.h"
+#include "libavcodec/videodsp.h"
+#include "libavutil/internal.h"
+#include "libavutil/intreadwrite.h"
+
+#define randomize_buffers(w, h)                         \
+    do {                                                \
+        int i;                                          \
+        for (i = 0; i < w * h * sizeof(*src0); i += 4)  \
+            AV_WN32A(((uint8_t *) src0) + i, rnd());    \
+    } while (0)
+
+#define iter_1d(type, fix, fix_val, var, var_start, var_end)        \
+    for (fix = fix_val, var = var_start; var <= var_end; var++) {   \
+        call_ref((type *) dst0, (const type *) (src0 + y * pw + x), \
+                 bw * sizeof(type), pw * sizeof(type),              \
+                 bw, bh, x, y, pw, ph);                             \
+        call_new((type *) dst1, (const type *) (src1 + y * pw + x), \
+                 bw * sizeof(type), pw * sizeof(type),              \
+                 bw, bh, x, y, pw, ph);                             \
+        if (memcmp(dst0, dst1, bw * bh * sizeof(type)))             \
+            fail();                                                 \
+        bench_new((type *) dst1, (const type *) (src1 + y * pw + x),\
+                  bw * sizeof(type), pw * sizeof(type),             \
+                  bw, bh, x, y, pw, ph);                            \
+    }
+
+#define check_emu_edge_size(type, src_w, src_h, dst_w, dst_h)   \
+    do {                                                        \
+        LOCAL_ALIGNED_16(type, src0, [src_w * src_h]);          \
+        LOCAL_ALIGNED_16(type, src1, [src_w * src_h]);          \
+        int bw = dst_w, bh = dst_h;                             \
+        int pw = src_w, ph = src_h;                             \
+        int y, x;                                               \
+        randomize_buffers(src_w, src_h);                        \
+        memcpy(src1, src0, pw * ph * sizeof(type));             \
+        iter_1d(type, y, 0 - src_h, x, 0 - src_w, src_w - 0);   \
+        iter_1d(type, x, src_w - 0, y, 0 - src_h, src_h - 0);   \
+        iter_1d(type, y, src_h - 0, x, 0 - src_w, src_w - 0);   \
+        iter_1d(type, x, 0 - src_w, y, 0 - src_h, src_h - 0);   \
+    } while (0)
+
+#define check_emu_edge(type)                                    \
+    do {                                                        \
+        LOCAL_ALIGNED_16(type, dst0, [64 * 64]);                \
+        LOCAL_ALIGNED_16(type, dst1, [64 * 64]);                \
+        declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, \
+                          void, type *dst, const type *src,     \
+                          ptrdiff_t dst_linesize,               \
+                          ptrdiff_t src_linesize,               \
+                          int block_w, int block_h,             \
+                          int src_x, int src_y,                 \
+                          int src_w, int src_h);                \
+        check_emu_edge_size(type, 16,  1, 64, 64);              \
+        check_emu_edge_size(type, 16, 16, 64, 64);              \
+        check_emu_edge_size(type, 64, 64, 64, 64);              \
+    } while (0)
+
+void checkasm_check_videodsp(void)
+{
+    VideoDSPContext vdsp;
+
+    ff_videodsp_init(&vdsp, 8);
+    if (check_func(vdsp.emulated_edge_mc, "emulated_edge_mc_8"))
+        check_emu_edge(uint8_t);
+
+    report("emulated_edge_mc");
+}
diff --git a/tests/checkasm/vp8dsp.c b/tests/checkasm/vp8dsp.c
index 40e4061228..d93f73087f 100644
--- a/tests/checkasm/vp8dsp.c
+++ b/tests/checkasm/vp8dsp.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2016 Martin Storsjo
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
diff --git a/tests/checkasm/vp9dsp.c b/tests/checkasm/vp9dsp.c
index 39b82e165b..a91577b94e 100644
--- a/tests/checkasm/vp9dsp.c
+++ b/tests/checkasm/vp9dsp.c
@@ -1,44 +1,105 @@
 /*
  * Copyright (c) 2015 Ronald S. Bultje <rsbultje@gmail.com>
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or modify
+ * FFmpeg is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with Libav; if not, write to the Free Software Foundation, Inc.,
+ * with FFmpeg; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <math.h>
 #include <string.h>
-
+#include "checkasm.h"
+#include "libavcodec/vp9data.h"
+#include "libavcodec/vp9.h"
 #include "libavutil/common.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
 
-#include "libavcodec/vp9.h"
-#include "libavcodec/vp9data.h"
+static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
+#define SIZEOF_PIXEL ((bit_depth + 7) / 8)
+
+#define randomize_buffers()                                        \
+    do {                                                           \
+        uint32_t mask = pixel_mask[(bit_depth - 8) >> 1];          \
+        int k;                                                     \
+        for (k = -4;  k < SIZEOF_PIXEL * FFMAX(8, size); k += 4) { \
+            uint32_t r = rnd() & mask;                             \
+            AV_WN32A(a + k, r);                                    \
+        }                                                          \
+        for (k = 0; k < size * SIZEOF_PIXEL; k += 4) {             \
+            uint32_t r = rnd() & mask;                             \
+            AV_WN32A(l + k, r);                                    \
+        }                                                          \
+    } while (0)
 
-#include "checkasm.h"
+static void check_ipred(void)
+{
+    LOCAL_ALIGNED_32(uint8_t, a_buf, [64 * 2]);
+    uint8_t *a = &a_buf[32 * 2];
+    LOCAL_ALIGNED_32(uint8_t, l, [32 * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst0, [32 * 32 * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst1, [32 * 32 * 2]);
+    VP9DSPContext dsp;
+    int tx, mode, bit_depth;
+    declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t stride,
+                      const uint8_t *left, const uint8_t *top);
+    static const char *const mode_names[N_INTRA_PRED_MODES] = {
+        [VERT_PRED] = "vert",
+        [HOR_PRED] = "hor",
+        [DC_PRED] = "dc",
+        [DIAG_DOWN_LEFT_PRED] = "diag_downleft",
+        [DIAG_DOWN_RIGHT_PRED] = "diag_downright",
+        [VERT_RIGHT_PRED] = "vert_right",
+        [HOR_DOWN_PRED] = "hor_down",
+        [VERT_LEFT_PRED] = "vert_left",
+        [HOR_UP_PRED] = "hor_up",
+        [TM_VP8_PRED] = "tm",
+        [LEFT_DC_PRED] = "dc_left",
+        [TOP_DC_PRED] = "dc_top",
+        [DC_128_PRED] = "dc_128",
+        [DC_127_PRED] = "dc_127",
+        [DC_129_PRED] = "dc_129",
+    };
 
-static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
+    for (bit_depth = 8; bit_depth <= 12; bit_depth += 2) {
+        ff_vp9dsp_init(&dsp, bit_depth, 0);
+        for (tx = 0; tx < 4; tx++) {
+            int size = 4 << tx;
 
-#define BIT_DEPTH 8
-#define SIZEOF_PIXEL ((BIT_DEPTH + 7) / 8)
+            for (mode = 0; mode < N_INTRA_PRED_MODES; mode++) {
+                if (check_func(dsp.intra_pred[tx][mode], "vp9_%s_%dx%d_%dbpp",
+                               mode_names[mode], size, size, bit_depth)) {
+                    randomize_buffers();
+                    call_ref(dst0, size * SIZEOF_PIXEL, l, a);
+                    call_new(dst1, size * SIZEOF_PIXEL, l, a);
+                    if (memcmp(dst0, dst1, size * size * SIZEOF_PIXEL))
+                        fail();
+                    bench_new(dst1, size * SIZEOF_PIXEL,l, a);
+                }
+            }
+        }
+    }
+    report("ipred");
+}
+
+#undef randomize_buffers
 
 #define randomize_buffers() \
     do { \
-        uint32_t mask = pixel_mask[(BIT_DEPTH - 8) >> 1];                  \
+        uint32_t mask = pixel_mask[(bit_depth - 8) >> 1];                  \
         for (y = 0; y < sz; y++) {                                         \
             for (x = 0; x < sz * SIZEOF_PIXEL; x += 4) {                   \
                 uint32_t r = rnd() & mask;                                 \
@@ -46,7 +107,7 @@ static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff };
                 AV_WN32A(src + y * sz * SIZEOF_PIXEL + x, rnd() & mask);   \
             }                                                              \
             for (x = 0; x < sz; x++) {                                     \
-                if (BIT_DEPTH == 8) {                                      \
+                if (bit_depth == 8) {                                      \
                     coef[y * sz + x] = src[y * sz + x] - dst[y * sz + x];  \
                 } else {                                                   \
                     ((int32_t *) coef)[y * sz + x] =                       \
@@ -243,67 +304,69 @@ static int iszero(const int16_t *c, int sz)
     return 1;
 }
 
-#define SIZEOF_COEF (2 * ((BIT_DEPTH + 7) / 8))
+#define SIZEOF_COEF (2 * ((bit_depth + 7) / 8))
 
 static void check_itxfm(void)
 {
     LOCAL_ALIGNED_32(uint8_t, src, [32 * 32 * 2]);
-    LOCAL_ALIGNED(32, uint8_t, dst, [32 * 32 * 2]);
-    LOCAL_ALIGNED(32, uint8_t, dst0, [32 * 32 * 2]);
-    LOCAL_ALIGNED(32, uint8_t, dst1, [32 * 32 * 2]);
-    LOCAL_ALIGNED(32, int16_t, coef, [32 * 32 * 2]);
-    LOCAL_ALIGNED(32, int16_t, subcoef0, [32 * 32 * 2]);
-    LOCAL_ALIGNED(32, int16_t, subcoef1, [32 * 32 * 2]);
-    declare_func(void, uint8_t *dst, ptrdiff_t stride, int16_t *block, int eob);
+    LOCAL_ALIGNED_32(uint8_t, dst, [32 * 32 * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst0, [32 * 32 * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst1, [32 * 32 * 2]);
+    LOCAL_ALIGNED_32(int16_t, coef, [32 * 32 * 2]);
+    LOCAL_ALIGNED_32(int16_t, subcoef0, [32 * 32 * 2]);
+    LOCAL_ALIGNED_32(int16_t, subcoef1, [32 * 32 * 2]);
+    declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t stride, int16_t *block, int eob);
     VP9DSPContext dsp;
-    int y, x, tx, txtp, sub;
+    int y, x, tx, txtp, bit_depth, sub;
     static const char *const txtp_types[N_TXFM_TYPES] = {
         [DCT_DCT] = "dct_dct", [DCT_ADST] = "adst_dct",
         [ADST_DCT] = "dct_adst", [ADST_ADST] = "adst_adst"
     };
 
-    ff_vp9dsp_init(&dsp);
-
-    for (tx = TX_4X4; tx <= N_TXFM_SIZES /* 4 = lossless */; tx++) {
-        int sz = 4 << (tx & 3);
-        int n_txtps = tx < TX_32X32 ? N_TXFM_TYPES : 1;
-
-        for (txtp = 0; txtp < n_txtps; txtp++) {
-            // skip testing sub-IDCTs for WHT or ADST since they don't
-            // implement it in any of the SIMD functions. If they do,
-            // consider changing this to ensure we have complete test
-            // coverage. Test sub=1 for dc-only, then 2, 4, 8, 12, etc,
-            // since the arm version can distinguish them at that level.
-            for (sub = (txtp == 0 && tx < 4) ? 1 : sz; sub <= sz;
-                 sub < 4 ? (sub <<= 1) : (sub += 4)) {
-                if (check_func(dsp.itxfm_add[tx][txtp],
-                               "vp9_inv_%s_%dx%d_sub%d_add",
-                               tx == 4 ? "wht_wht" : txtp_types[txtp],
-                               sz, sz, sub)) {
-                    int eob;
+    for (bit_depth = 8; bit_depth <= 12; bit_depth += 2) {
+        ff_vp9dsp_init(&dsp, bit_depth, 0);
+
+        for (tx = TX_4X4; tx <= N_TXFM_SIZES /* 4 = lossless */; tx++) {
+            int sz = 4 << (tx & 3);
+            int n_txtps = tx < TX_32X32 ? N_TXFM_TYPES : 1;
+
+            for (txtp = 0; txtp < n_txtps; txtp++) {
+                // skip testing sub-IDCTs for WHT or ADST since they don't
+                // implement it in any of the SIMD functions. If they do,
+                // consider changing this to ensure we have complete test
+                // coverage. Test sub=1 for dc-only, then 2, 4, 8, 12, etc,
+                // since the arm version can distinguish them at that level.
+                for (sub = (txtp == 0 && tx < 4) ? 1 : sz; sub <= sz;
+                     sub < 4 ? (sub <<= 1) : (sub += 4)) {
+                    if (check_func(dsp.itxfm_add[tx][txtp],
+                                   "vp9_inv_%s_%dx%d_sub%d_add_%d",
+                                   tx == 4 ? "wht_wht" : txtp_types[txtp],
+                                   sz, sz, sub, bit_depth)) {
+                        int eob;
+
+                        randomize_buffers();
+                        ftx(coef, tx, txtp, sz, bit_depth);
+
+                        if (sub < sz) {
+                            eob = copy_subcoefs(subcoef0, coef, tx, txtp,
+                                                sz, sub, bit_depth);
+                        } else {
+                            eob = sz * sz;
+                            memcpy(subcoef0, coef, sz * sz * SIZEOF_COEF);
+                        }
 
-                    randomize_buffers();
-                    ftx(coef, tx, txtp, sz, BIT_DEPTH);
-
-                    if (sub < sz) {
-                        eob = copy_subcoefs(subcoef0, coef, tx, txtp,
-                                            sz, sub, BIT_DEPTH);
-                    } else {
-                        eob = sz * sz;
-                        memcpy(subcoef0, coef, sz * sz * SIZEOF_COEF);
+                        memcpy(dst0, dst, sz * sz * SIZEOF_PIXEL);
+                        memcpy(dst1, dst, sz * sz * SIZEOF_PIXEL);
+                        memcpy(subcoef1, subcoef0, sz * sz * SIZEOF_COEF);
+                        call_ref(dst0, sz * SIZEOF_PIXEL, subcoef0, eob);
+                        call_new(dst1, sz * SIZEOF_PIXEL, subcoef1, eob);
+                        if (memcmp(dst0, dst1, sz * sz * SIZEOF_PIXEL) ||
+                            !iszero(subcoef0, sz * sz * SIZEOF_COEF) ||
+                            !iszero(subcoef1, sz * sz * SIZEOF_COEF))
+                            fail();
+
+                        bench_new(dst, sz * SIZEOF_PIXEL, coef, eob);
                     }
-
-                    memcpy(dst0, dst, sz * sz * SIZEOF_PIXEL);
-                    memcpy(dst1, dst, sz * sz * SIZEOF_PIXEL);
-                    memcpy(subcoef1, subcoef0, sz * sz * SIZEOF_COEF);
-                    call_ref(dst0, sz * SIZEOF_PIXEL, subcoef0, eob);
-                    call_new(dst1, sz * SIZEOF_PIXEL, subcoef1, eob);
-                    if (memcmp(dst0, dst1, sz * sz * SIZEOF_PIXEL) ||
-                        !iszero(subcoef0, sz * sz * SIZEOF_COEF) ||
-                        !iszero(subcoef1, sz * sz * SIZEOF_COEF))
-                        fail();
-
-                    bench_new(dst, sz * SIZEOF_PIXEL, coef, eob);
                 }
             }
         }
@@ -318,19 +381,19 @@ static void check_itxfm(void)
         if (SIZEOF_PIXEL == 1) { \
             buf0[(a) + (b) * jstride] = av_clip_uint8(c); \
         } else { \
-            ((uint16_t *)buf0)[(a) + (b) * jstride] = av_clip_uintp2(c, BIT_DEPTH); \
+            ((uint16_t *)buf0)[(a) + (b) * jstride] = av_clip_uintp2(c, bit_depth); \
         } \
     } while (0)
-#define setdx(a,b,c,d) setpx(a,b,c-(d)+(rnd()%((d)*2+1)))
-#define setsx(a,b,c,d) setdx(a,b,c,(d) << (BIT_DEPTH - 8))
 
+// c can be an assignment and must not be put under ()
+#define setdx(a,b,c,d) setpx(a,b,c-(d)+(rnd()%((d)*2+1)))
+#define setsx(a,b,c,d) setdx(a,b,c,(d) << (bit_depth - 8))
 static void randomize_loopfilter_buffers(int bidx, int lineoff, int str,
-                                         int bit_depth, int dir,
-                                         const int *E, const int *F,
-                                         const int *H, const int *I,
+                                         int bit_depth, int dir, const int *E,
+                                         const int *F, const int *H, const int *I,
                                          uint8_t *buf0, uint8_t *buf1)
 {
-    uint32_t mask = (1 << BIT_DEPTH) - 1;
+    uint32_t mask = (1 << bit_depth) - 1;
     int off = dir ? lineoff : lineoff * 16;
     int istride = dir ? 1 : 16;
     int jstride = dir ? str : 1;
@@ -380,84 +443,83 @@ static void randomize_loopfilter_buffers(int bidx, int lineoff, int str,
         }
     }
 }
-
-#define randomize_buffers(bidx, lineoff, str)                        \
-    randomize_loopfilter_buffers(bidx, lineoff, str, BIT_DEPTH, dir, \
-                                 E, F, H, I, buf0, buf1)
+#define randomize_buffers(bidx, lineoff, str) \
+        randomize_loopfilter_buffers(bidx, lineoff, str, bit_depth, dir, \
+                                     E, F, H, I, buf0, buf1)
 
 static void check_loopfilter(void)
 {
     LOCAL_ALIGNED_32(uint8_t, base0, [32 + 16 * 16 * 2]);
     LOCAL_ALIGNED_32(uint8_t, base1, [32 + 16 * 16 * 2]);
     VP9DSPContext dsp;
-    int dir, wd, wd2;
+    int dir, wd, wd2, bit_depth;
     static const char *const dir_name[2] = { "h", "v" };
     static const int E[2] = { 20, 28 }, I[2] = { 10, 16 };
-    static const int H[2] = {  7, 11 }, F[2] = {  1,  1 };
-    declare_func(void, uint8_t *dst, ptrdiff_t stride, int E, int I, int H);
-
-    ff_vp9dsp_init(&dsp);
-
-    for (dir = 0; dir < 2; dir++) {
-        uint8_t *buf0, *buf1;
-        int midoff = (dir ? 8 * 8 : 8) * SIZEOF_PIXEL;
-        int midoff_aligned = (dir ? 8 * 8 : 16) * SIZEOF_PIXEL;
-
-        buf0 = base0 + midoff_aligned;
-        buf1 = base1 + midoff_aligned;
-
-        for (wd = 0; wd < 3; wd++) {
-            // 4/8/16wd_8px
-            if (check_func(dsp.loop_filter_8[wd][dir],
-                           "vp9_loop_filter_%s_%d_8",
-                           dir_name[dir], 4 << wd)) {
-                randomize_buffers(0, 0, 8);
-                memcpy(buf1 - midoff, buf0 - midoff,
-                       16 * 8 * SIZEOF_PIXEL);
-                call_ref(buf0, 16 * SIZEOF_PIXEL >> dir, E[0], I[0], H[0]);
-                call_new(buf1, 16 * SIZEOF_PIXEL >> dir, E[0], I[0], H[0]);
-                if (memcmp(buf0 - midoff, buf1 - midoff, 16 * 8 * SIZEOF_PIXEL))
-                    fail();
-                bench_new(buf1, 16 * SIZEOF_PIXEL >> dir, E[0], I[0], H[0]);
+    static const int H[2] = { 7, 11 }, F[2] = { 1, 1 };
+    declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t stride, int E, int I, int H);
+
+    for (bit_depth = 8; bit_depth <= 12; bit_depth += 2) {
+        ff_vp9dsp_init(&dsp, bit_depth, 0);
+
+        for (dir = 0; dir < 2; dir++) {
+            int midoff = (dir ? 8 * 8 : 8) * SIZEOF_PIXEL;
+            int midoff_aligned = (dir ? 8 * 8 : 16) * SIZEOF_PIXEL;
+            uint8_t *buf0 = base0 + midoff_aligned;
+            uint8_t *buf1 = base1 + midoff_aligned;
+
+            for (wd = 0; wd < 3; wd++) {
+                // 4/8/16wd_8px
+                if (check_func(dsp.loop_filter_8[wd][dir],
+                               "vp9_loop_filter_%s_%d_8_%dbpp",
+                               dir_name[dir], 4 << wd, bit_depth)) {
+                    randomize_buffers(0, 0, 8);
+                    memcpy(buf1 - midoff, buf0 - midoff,
+                           16 * 8 * SIZEOF_PIXEL);
+                    call_ref(buf0, 16 * SIZEOF_PIXEL >> dir, E[0], I[0], H[0]);
+                    call_new(buf1, 16 * SIZEOF_PIXEL >> dir, E[0], I[0], H[0]);
+                    if (memcmp(buf0 - midoff, buf1 - midoff, 16 * 8 * SIZEOF_PIXEL))
+                        fail();
+                    bench_new(buf1, 16 * SIZEOF_PIXEL >> dir, E[0], I[0], H[0]);
+                }
             }
-        }
 
-        midoff = (dir ? 16 * 8 : 8) * SIZEOF_PIXEL;
-        midoff_aligned = (dir ? 16 * 8 : 16) * SIZEOF_PIXEL;
-
-        buf0 = base0 + midoff_aligned;
-        buf1 = base1 + midoff_aligned;
-
-        // 16wd_16px loopfilter
-        if (check_func(dsp.loop_filter_16[dir],
-                       "vp9_loop_filter_%s_16_16",
-                       dir_name[dir])) {
-            randomize_buffers(0, 0, 16);
-            randomize_buffers(0, 8, 16);
-            memcpy(buf1 - midoff, buf0 - midoff, 16 * 16 * SIZEOF_PIXEL);
-            call_ref(buf0, 16 * SIZEOF_PIXEL, E[0], I[0], H[0]);
-            call_new(buf1, 16 * SIZEOF_PIXEL, E[0], I[0], H[0]);
-            if (memcmp(buf0 - midoff, buf1 - midoff, 16 * 16 * SIZEOF_PIXEL))
-                fail();
-            bench_new(buf1, 16 * SIZEOF_PIXEL, E[0], I[0], H[0]);
-        }
+            midoff = (dir ? 16 * 8 : 8) * SIZEOF_PIXEL;
+            midoff_aligned = (dir ? 16 * 8 : 16) * SIZEOF_PIXEL;
+
+            buf0 = base0 + midoff_aligned;
+            buf1 = base1 + midoff_aligned;
+
+            // 16wd_16px loopfilter
+            if (check_func(dsp.loop_filter_16[dir],
+                           "vp9_loop_filter_%s_16_16_%dbpp",
+                           dir_name[dir], bit_depth)) {
+                randomize_buffers(0, 0, 16);
+                randomize_buffers(0, 8, 16);
+                memcpy(buf1 - midoff, buf0 - midoff, 16 * 16 * SIZEOF_PIXEL);
+                call_ref(buf0, 16 * SIZEOF_PIXEL, E[0], I[0], H[0]);
+                call_new(buf1, 16 * SIZEOF_PIXEL, E[0], I[0], H[0]);
+                if (memcmp(buf0 - midoff, buf1 - midoff, 16 * 16 * SIZEOF_PIXEL))
+                    fail();
+                bench_new(buf1, 16 * SIZEOF_PIXEL, E[0], I[0], H[0]);
+            }
 
-        for (wd = 0; wd < 2; wd++) {
-            for (wd2 = 0; wd2 < 2; wd2++) {
-                // mix2 loopfilter
-                if (check_func(dsp.loop_filter_mix2[wd][wd2][dir],
-                               "vp9_loop_filter_mix2_%s_%d%d_16",
-                               dir_name[dir], 4 << wd, 4 << wd2)) {
-                    randomize_buffers(0, 0, 16);
-                    randomize_buffers(1, 8, 16);
-                    memcpy(buf1 - midoff, buf0 - midoff, 16 * 16 * SIZEOF_PIXEL);
-#define M(a) ((a[1] << 8) | a[0])
-                    call_ref(buf0, 16 * SIZEOF_PIXEL, M(E), M(I), M(H));
-                    call_new(buf1, 16 * SIZEOF_PIXEL, M(E), M(I), M(H));
-                    if (memcmp(buf0 - midoff, buf1 - midoff, 16 * 16 * SIZEOF_PIXEL))
-                        fail();
-                    bench_new(buf1, 16 * SIZEOF_PIXEL, M(E), M(I), M(H));
+            for (wd = 0; wd < 2; wd++) {
+                for (wd2 = 0; wd2 < 2; wd2++) {
+                    // mix2 loopfilter
+                    if (check_func(dsp.loop_filter_mix2[wd][wd2][dir],
+                                   "vp9_loop_filter_mix2_%s_%d%d_16_%dbpp",
+                                   dir_name[dir], 4 << wd, 4 << wd2, bit_depth)) {
+                        randomize_buffers(0, 0, 16);
+                        randomize_buffers(1, 8, 16);
+                        memcpy(buf1 - midoff, buf0 - midoff, 16 * 16 * SIZEOF_PIXEL);
+#define M(a) (((a)[1] << 8) | (a)[0])
+                        call_ref(buf0, 16 * SIZEOF_PIXEL, M(E), M(I), M(H));
+                        call_new(buf1, 16 * SIZEOF_PIXEL, M(E), M(I), M(H));
+                        if (memcmp(buf0 - midoff, buf1 - midoff, 16 * 16 * SIZEOF_PIXEL))
+                            fail();
+                        bench_new(buf1, 16 * SIZEOF_PIXEL, M(E), M(I), M(H));
 #undef M
+                    }
                 }
             }
         }
@@ -477,7 +539,7 @@ static void check_loopfilter(void)
 
 #define randomize_buffers()                               \
     do {                                                  \
-        uint32_t mask = pixel_mask[(BIT_DEPTH - 8) >> 1]; \
+        uint32_t mask = pixel_mask[(bit_depth - 8) >> 1]; \
         int k;                                            \
         for (k = 0; k < SRC_BUF_SIZE; k += 4) {           \
             uint32_t r = rnd() & mask;                    \
@@ -494,60 +556,63 @@ static void check_loopfilter(void)
 
 static void check_mc(void)
 {
+    LOCAL_ALIGNED_32(uint8_t, buf, [72 * 72 * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst0, [64 * 64 * 2]);
+    LOCAL_ALIGNED_32(uint8_t, dst1, [64 * 64 * 2]);
+    VP9DSPContext dsp;
+    int op, hsize, bit_depth, filter, dx, dy;
+    declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dst_stride,
+                      const uint8_t *ref, ptrdiff_t ref_stride,
+                 int h, int mx, int my);
     static const char *const filter_names[4] = {
         "8tap_smooth", "8tap_regular", "8tap_sharp", "bilin"
     };
     static const char *const subpel_names[2][2] = { { "", "h" }, { "v", "hv" } };
     static const char *const op_names[2] = { "put", "avg" };
-
-    LOCAL_ALIGNED_32(uint8_t, buf,  [72 * 72 * 2]);
-    LOCAL_ALIGNED_32(uint8_t, dst0, [64 * 64 * 2]);
-    LOCAL_ALIGNED_32(uint8_t, dst1, [64 * 64 * 2]);
     char str[256];
-    VP9DSPContext dsp;
-    int op, hsize, filter, dx, dy;
-
-    declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT,
-                      void, uint8_t *dst, ptrdiff_t dst_stride,
-                      const uint8_t *ref, ptrdiff_t ref_stride,
-                      int h, int mx, int my);
 
     for (op = 0; op < 2; op++) {
-        ff_vp9dsp_init(&dsp);
-        for (hsize = 0; hsize < 5; hsize++) {
-            int size = 64 >> hsize;
-
-            for (filter = 0; filter < 4; filter++) {
-                for (dx = 0; dx < 2; dx++) {
-                    for (dy = 0; dy < 2; dy++) {
-                        if (dx || dy) {
-                            snprintf(str, sizeof(str), "%s_%s_%d%s", op_names[op],
-                                     filter_names[filter], size,
-                                     subpel_names[dy][dx]);
-                        } else {
-                            snprintf(str, sizeof(str), "%s%d", op_names[op], size);
-                        }
-                        if (check_func(dsp.mc[hsize][filter][op][dx][dy],
-                                       "vp9_%s", str)) {
-                            int mx = dx ? 1 + (rnd() % 14) : 0;
-                            int my = dy ? 1 + (rnd() % 14) : 0;
-                            randomize_buffers();
-                            call_ref(dst0, size * SIZEOF_PIXEL,
-                                     src, SRC_BUF_STRIDE * SIZEOF_PIXEL,
-                                     size, mx, my);
-                            call_new(dst1, size * SIZEOF_PIXEL,
-                                     src, SRC_BUF_STRIDE * SIZEOF_PIXEL,
-                                     size, mx, my);
-                            if (memcmp(dst0, dst1, DST_BUF_SIZE))
-                                fail();
-
-                            // SIMD implementations for each filter of subpel
-                            // functions are identical
-                            if (filter >= 1 && filter <= 2) continue;
-
-                            bench_new(dst1, size * SIZEOF_PIXEL,
-                                      src, SRC_BUF_STRIDE * SIZEOF_PIXEL,
-                                      size, mx, my);
+        for (bit_depth = 8; bit_depth <= 12; bit_depth += 2) {
+            ff_vp9dsp_init(&dsp, bit_depth, 0);
+            for (hsize = 0; hsize < 5; hsize++) {
+                int size = 64 >> hsize;
+
+                for (filter = 0; filter < 4; filter++) {
+                    for (dx = 0; dx < 2; dx++) {
+                        for (dy = 0; dy < 2; dy++) {
+                            if (dx || dy) {
+                                snprintf(str, sizeof(str),
+                                         "%s_%s_%d%s", op_names[op],
+                                         filter_names[filter], size,
+                                         subpel_names[dy][dx]);
+                            } else {
+                                snprintf(str, sizeof(str),
+                                         "%s%d", op_names[op], size);
+                            }
+                            if (check_func(dsp.mc[hsize][filter][op][dx][dy],
+                                           "vp9_%s_%dbpp", str, bit_depth)) {
+                                int mx = dx ? 1 + (rnd() % 14) : 0;
+                                int my = dy ? 1 + (rnd() % 14) : 0;
+                                randomize_buffers();
+                                call_ref(dst0, size * SIZEOF_PIXEL,
+                                         src, SRC_BUF_STRIDE * SIZEOF_PIXEL,
+                                         size, mx, my);
+                                call_new(dst1, size * SIZEOF_PIXEL,
+                                         src, SRC_BUF_STRIDE * SIZEOF_PIXEL,
+                                         size, mx, my);
+                                if (memcmp(dst0, dst1, DST_BUF_SIZE))
+                                    fail();
+
+                                // simd implementations for each filter of subpel
+                                // functions are identical
+                                if (filter >= 1 && filter <= 2) continue;
+                                // 10/12 bpp for bilin are identical
+                                if (bit_depth == 12 && filter == 3) continue;
+
+                                bench_new(dst1, size * SIZEOF_PIXEL,
+                                          src, SRC_BUF_STRIDE * SIZEOF_PIXEL,
+                                          size, mx, my);
+                            }
                         }
                     }
                 }
@@ -559,6 +624,7 @@ static void check_mc(void)
 
 void checkasm_check_vp9dsp(void)
 {
+    check_ipred();
     check_itxfm();
     check_loopfilter();
     check_mc();
diff --git a/tests/checkasm/x86/checkasm.asm b/tests/checkasm/x86/checkasm.asm
index 55212fc24b..683aae80e3 100644
--- a/tests/checkasm/x86/checkasm.asm
+++ b/tests/checkasm/x86/checkasm.asm
@@ -3,14 +3,14 @@
 ;* Copyright (c) 2008 Loren Merritt
 ;* Copyright (c) 2012 Henrik Gramner
 ;*
-;* This file is part of Libav.
+;* This file is part of FFmpeg.
 ;*
-;* Libav is free software; you can redistribute it and/or modify
+;* FFmpeg is free software; you can redistribute it and/or modify
 ;* it under the terms of the GNU General Public License as published by
 ;* the Free Software Foundation; either version 2 of the License, or
 ;* (at your option) any later version.
 ;*
-;* Libav is distributed in the hope that it will be useful,
+;* 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 General Public License for more details.
@@ -169,15 +169,15 @@ cglobal checked_call%1, 2,15,16,max_args*8+8
     jz .clobber_ok
     report_fail error_message
 .clobber_ok:
-%ifnid %1, _emms
+%ifidn %1, _emms
+    emms
+%elifnidn %1, _float
     fstenv [rsp]
     cmp  word [rsp + 8], 0xffff
     je   .emms_ok
     report_fail error_message_emms
     emms
 .emms_ok:
-%else
-    emms
 %endif
     RET
 %endmacro
@@ -223,15 +223,15 @@ cglobal checked_call%1, 1,7
     jz .clobber_ok
     report_fail error_message
 .clobber_ok:
-%ifnid %1, _emms
+%ifidn %1, _emms
+    emms
+%elifnidn %1, _float
     fstenv [esp]
     cmp  word [esp + 8], 0xffff
     je   .emms_ok
     report_fail error_message_emms
     emms
 .emms_ok:
-%else
-    emms
 %endif
     add  esp, max_args*4
     REP_RET
@@ -241,3 +241,4 @@ cglobal checked_call%1, 1,7
 
 CHECKED_CALL
 CHECKED_CALL _emms
+CHECKED_CALL _float
diff --git a/tests/copycooker.sh b/tests/copycooker.sh
new file mode 100755
index 0000000000..4b5811dcf6
--- /dev/null
+++ b/tests/copycooker.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+LC_ALL=C
+export LC_ALL
+
+datadir="tests/data"
+
+logfile="$datadir/copy.regression"
+reffile="$1"
+
+list=$(grep -oh ' ./tests/data/.*' tests/ref/{acodec,lavf,vsynth1}/*| sort)
+rm -f $logfile
+for i in $list ; do
+    echo ---------------- >> $logfile
+    echo $i >> $logfile
+    ./ffmpeg_g -flags +bitexact -i $i -acodec copy -vcodec copy -y first.nut
+    ./ffmpeg_g -flags +bitexact -i first.nut -acodec copy -vcodec copy -y second.nut
+    cmp first.nut second.nut >> $logfile
+    md5sum first.nut >> $logfile
+done
+
+if diff -u -w "$reffile" "$logfile" ; then
+    echo
+    echo copy regression test: success
+    exit 0
+else
+    echo
+    echo copy regression test: error
+    exit 1
+fi
diff --git a/tests/extended.ffconcat b/tests/extended.ffconcat
new file mode 100644
index 0000000000..7359113c23
--- /dev/null
+++ b/tests/extended.ffconcat
@@ -0,0 +1,114 @@
+ffconcat version 1.0
+
+file      %SRCFILE%
+
+file      %SRCFILE%
+duration  1
+file_packet_metadata dummy=1
+
+file      %SRCFILE%
+inpoint   00:00.00
+outpoint  00:00.04
+
+file      %SRCFILE%
+inpoint   00:00.04
+outpoint  00:00.08
+
+file      %SRCFILE%
+inpoint   00:00.08
+outpoint  00:00.12
+
+file      %SRCFILE%
+inpoint   00:00.12
+outpoint  00:00.16
+
+file      %SRCFILE%
+inpoint   00:00.16
+outpoint  00:00.20
+
+file      %SRCFILE%
+inpoint   00:00.20
+outpoint  00:00.24
+
+file      %SRCFILE%
+inpoint   00:00.24
+outpoint  00:00.28
+
+file      %SRCFILE%
+inpoint   00:00.28
+outpoint  00:00.32
+
+file      %SRCFILE%
+inpoint   00:00.32
+outpoint  00:00.36
+
+file      %SRCFILE%
+inpoint   00:00.36
+outpoint  00:00.40
+
+file      %SRCFILE%
+inpoint   00:00.40
+outpoint  00:00.44
+
+file      %SRCFILE%
+inpoint   00:00.44
+outpoint  00:00.48
+
+file      %SRCFILE%
+inpoint   00:00.48
+outpoint  00:00.52
+
+file      %SRCFILE%
+inpoint   00:00.52
+outpoint  00:00.56
+
+file      %SRCFILE%
+inpoint   00:00.56
+outpoint  00:00.60
+
+file      %SRCFILE%
+inpoint   00:00.60
+outpoint  00:00.64
+
+file      %SRCFILE%
+inpoint   00:00.64
+outpoint  00:00.68
+
+file      %SRCFILE%
+inpoint   00:00.68
+outpoint  00:00.72
+
+file      %SRCFILE%
+inpoint   00:00.72
+outpoint  00:00.76
+
+file      %SRCFILE%
+inpoint   00:00.76
+outpoint  00:00.80
+
+file      %SRCFILE%
+inpoint   00:00.80
+outpoint  00:00.84
+
+file      %SRCFILE%
+inpoint   00:00.84
+outpoint  00:00.88
+
+file      %SRCFILE%
+inpoint   00:00.88
+outpoint  00:00.92
+
+file      %SRCFILE%
+inpoint   00:00.92
+outpoint  00:00.96
+
+file      %SRCFILE%
+inpoint   00:00.96
+outpoint  00:01.00
+
+file      %SRCFILE%
+outpoint  00:00.40
+
+file      %SRCFILE%
+inpoint   00:00.40
+
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 8de749d4a7..e8d2e67709 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -8,7 +8,7 @@ base=$(dirname $0)
 base64=tests/base64
 
 test="${1#fate-}"
-samples=$2
+target_samples=$2
 target_exec=$3
 target_path=$4
 command=$5
@@ -44,7 +44,7 @@ compare(){
 }
 
 do_tiny_psnr(){
-    psnr=$(tests/tiny_psnr "$1" "$2" $cmp_unit $cmp_shift 0)
+    psnr=$(tests/tiny_psnr "$1" "$2" $cmp_unit $cmp_shift 0) || return 1
     val=$(expr "$psnr" : ".*$3: *\([0-9.]*\)")
     size1=$(expr "$psnr" : '.*bytes: *\([0-9]*\)')
     size2=$(expr "$psnr" : '.*bytes:[ 0-9]*/ *\([0-9]*\)')
@@ -52,6 +52,12 @@ do_tiny_psnr(){
     size_cmp=$(compare $size1 $size2 $size_tolerance)
     if [ "$val_cmp" != 0 ] || [ "$size_cmp" != 0 ]; then
         echo "$psnr"
+        if [ "$val_cmp" != 0 ]; then
+            echo "$3: |$val - $cmp_target| >= $fuzz"
+        fi
+        if [ "$size_cmp" != 0 ]; then
+            echo "size: |$size1 - $size2| >= $size_tolerance"
+        fi
         return 1
     fi
 }
@@ -73,42 +79,88 @@ run(){
     $target_exec $target_path/"$@"
 }
 
+runecho(){
+    test "${V:-0}" -gt 0 && echo "$target_exec" $target_path/"$@" >&3
+    $target_exec $target_path/"$@" >&3
+}
+
 probefmt(){
-    run avprobe -show_format_entry format_name -v 0 "$@"
+    run ffprobe${PROGSUF} -show_entries format=format_name -print_format default=nw=1:nk=1 -v 0 "$@"
+}
+
+runlocal(){
+    test "${V:-0}" -gt 0 && echo ${base}/"$@" ${base} >&3
+    ${base}/"$@" ${base}
+}
+
+probeframes(){
+    run ffprobe${PROGSUF} -show_frames -v 0 "$@"
 }
 
-probestream(){
-    run avprobe -show_stream_entry "$1" -v 0 "$2"
+probechapters(){
+    run ffprobe${PROGSUF} -show_chapters -v 0 "$@"
 }
 
-avconv(){
+probegaplessinfo(){
+    filename="$1"
+    shift
+    run ffprobe${PROGSUF} -bitexact -select_streams a -show_entries format=start_time,duration:stream=index,start_pts,duration_ts -v 0 "$filename" "$@"
+    pktfile1="${outdir}/${test}.pkts"
+    framefile1="${outdir}/${test}.frames"
+    cleanfiles="$cleanfiles $pktfile1 $framefile1"
+    run ffprobe${PROGSUF} -bitexact -select_streams a -of compact -count_packets -show_entries packet=pts,dts,duration,flags:stream=nb_read_packets -v 0 "$filename" "$@" > "$pktfile1"
+    head -n 8 "$pktfile1"
+    tail -n 9 "$pktfile1"
+    run ffprobe${PROGSUF} -bitexact -select_streams a -of compact -count_frames -show_entries frame=pkt_pts,pkt_dts,best_effort_timestamp,pkt_duration,nb_samples:stream=nb_read_frames -v 0 "$filename" "$@" > "$framefile1"
+    head -n 8 "$framefile1"
+    tail -n 9 "$framefile1"
+}
+
+ffmpeg(){
     dec_opts="-hwaccel $hwaccel -threads $threads -thread_type $thread_type"
-    avconv_args="-nostats -cpuflags $cpuflags"
+    ffmpeg_args="-nostdin -nostats -cpuflags $cpuflags"
     for arg in $@; do
-        [ x${arg} = x-i ] && avconv_args="${avconv_args} ${dec_opts}"
-        avconv_args="${avconv_args} ${arg}"
+        [ x${arg} = x-i ] && ffmpeg_args="${ffmpeg_args} ${dec_opts}"
+        ffmpeg_args="${ffmpeg_args} ${arg}"
     done
-    run avconv ${avconv_args}
+    run ffmpeg${PROGSUF} ${ffmpeg_args}
 }
 
 framecrc(){
-    avconv "$@" -f framecrc -
+    ffmpeg "$@" -flags +bitexact -fflags +bitexact -f framecrc -
+}
+
+ffmetadata(){
+    ffmpeg "$@" -flags +bitexact -fflags +bitexact -f ffmetadata -
 }
 
 framemd5(){
-    avconv "$@" -f framemd5 -
+    ffmpeg "$@" -flags +bitexact -fflags +bitexact -f framemd5 -
 }
 
 crc(){
-    avconv "$@" -f crc -
+    ffmpeg "$@" -f crc -
+}
+
+md5pipe(){
+    ffmpeg "$@" md5:
 }
 
 md5(){
-    avconv "$@" md5:
+    encfile="${outdir}/${test}.out"
+    cleanfiles="$cleanfiles $encfile"
+    ffmpeg "$@" $encfile
+    do_md5sum $encfile | awk '{print $1}'
 }
 
 pcm(){
-    avconv "$@" -vn -f s16le -
+    ffmpeg "$@" -vn -f s16le -
+}
+
+fmtstdout(){
+    fmt=$1
+    shift 1
+    ffmpeg -flags +bitexact -fflags +bitexact "$@" -f $fmt -
 }
 
 enc_dec_pcm(){
@@ -120,8 +172,8 @@ enc_dec_pcm(){
     encfile="${outdir}/${test}.${out_fmt}"
     cleanfiles=$encfile
     encfile=$(target_path ${encfile})
-    avconv -i $src_file "$@" -f $out_fmt -y ${encfile} || return
-    avconv -f $out_fmt -i ${encfile} -c:a pcm_${pcm_fmt} -f ${dec_fmt} -
+    ffmpeg -i $src_file "$@" -f $out_fmt -y ${encfile} || return
+    ffmpeg -flags +bitexact -fflags +bitexact -i ${encfile} -c:a pcm_${pcm_fmt} -fflags +bitexact -f ${dec_fmt} -
 }
 
 FLAGS="-flags +bitexact -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
@@ -142,20 +194,53 @@ enc_dec(){
     tsrcfile=$(target_path $srcfile)
     tencfile=$(target_path $encfile)
     tdecfile=$(target_path $decfile)
-    avconv -f $src_fmt $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt $FLAGS \
+    ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt $FLAGS \
         -f $enc_fmt -y $tencfile || return
     do_md5sum $encfile
     echo $(wc -c $encfile)
-    avconv $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \
+    ffmpeg $8 $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \
         -f $dec_fmt -y $tdecfile || return
     do_md5sum $decfile
     tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
 }
 
+transcode(){
+    src_fmt=$1
+    srcfile=$2
+    enc_fmt=$3
+    enc_opt=$4
+    final_decode=$5
+    encfile="${outdir}/${test}.${enc_fmt}"
+    test "$7" = -keep || cleanfiles="$cleanfiles $encfile"
+    tsrcfile=$(target_path $srcfile)
+    tencfile=$(target_path $encfile)
+    ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt $FLAGS \
+        -f $enc_fmt -y $tencfile || return
+    do_md5sum $encfile
+    echo $(wc -c $encfile)
+    ffmpeg $DEC_OPTS -i $encfile $ENC_OPTS $FLAGS $final_decode \
+        -f framecrc - || return
+}
+
+lavffatetest(){
+    t="${test#lavf-fate-}"
+    ref=${base}/ref/lavf-fate/$t
+    ${base}/lavf-regression.sh $t lavf-fate tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" "$target_samples"
+}
+
 lavftest(){
     t="${test#lavf-}"
     ref=${base}/ref/lavf/$t
-    ${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags"
+    ${base}/lavf-regression.sh $t lavf tests/vsynth1 "$target_exec" "$target_path" "$threads" "$thread_type" "$cpuflags" "$target_samples"
+}
+
+refcmp_metadata(){
+    refcmp=$1
+    pixfmt=$2
+    fuzz=${3:-0.001}
+    ffmpeg $FLAGS $ENC_OPTS \
+        -lavfi "testsrc2=size=300x200:rate=1:duration=5,format=${pixfmt},split[ref][tmp];[tmp]avgblur=4[enc];[enc][ref]${refcmp},metadata=print:file=-" \
+        -f null /dev/null | awk -v ref=${ref} -v fuzz=${fuzz} -f ${base}/refcmp-metadata.awk -
 }
 
 video_filter(){
@@ -164,40 +249,119 @@ video_filter(){
     label=${test#filter-}
     raw_src="${target_path}/tests/vsynth1/%02d.pgm"
     printf '%-20s' $label
-    avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src \
-        $FLAGS $ENC_OPTS -vf "$filters" -c:v rawvideo -frames:v 5 $* -f nut md5:
+    ffmpeg $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src \
+        $FLAGS $ENC_OPTS -vf "$filters" -vcodec rawvideo -frames:v 5 $* -f nut md5:
 }
 
 pixfmts(){
     filter=${test#filter-pixfmts-}
+    filter=${filter%_*}
     filter_args=$1
+    prefilter_chain=$2
+    nframes=${3:-1}
 
     showfiltfmts="$target_exec $target_path/libavfilter/tests/filtfmts"
-    exclude_fmts=${outfile}${filter}_exclude_fmts
-    out_fmts=${outfile}${filter}_out_fmts
+    scale_exclude_fmts=${outfile}_scale_exclude_fmts
+    scale_in_fmts=${outfile}_scale_in_fmts
+    scale_out_fmts=${outfile}_scale_out_fmts
+    in_fmts=${outfile}_in_fmts
 
     # exclude pixel formats which are not supported as input
-    avconv -pix_fmts list 2>/dev/null | awk 'NR > 8 && /^\..\./ { print $2 }' | sort >$exclude_fmts
-    $showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ print $3 }' | sort | comm -23 - $exclude_fmts >$out_fmts
+    $showfiltfmts scale | awk -F '[ \r]' '/^INPUT/{ fmt=substr($3, 5); print fmt }' | sort >$scale_in_fmts
+    $showfiltfmts scale | awk -F '[ \r]' '/^OUTPUT/{ fmt=substr($3, 5); print fmt }' | sort >$scale_out_fmts
+    comm -12 $scale_in_fmts $scale_out_fmts >$scale_exclude_fmts
 
-    pix_fmts=$($showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ print $3 }' | sort | comm -12 - $out_fmts)
+    $showfiltfmts $filter | awk -F '[ \r]' '/^INPUT/{ fmt=substr($3, 5); print fmt }' | sort >$in_fmts
+    pix_fmts=$(comm -12 $scale_exclude_fmts $in_fmts)
 
     outertest=$test
     for pix_fmt in $pix_fmts; do
         test=$pix_fmt
-        video_filter "format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt -frames:v 1
+        video_filter "${prefilter_chain}format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt -frames:v $nframes
     done
 
-    rm $exclude_fmts $out_fmts
+    rm $in_fmts $scale_in_fmts $scale_out_fmts $scale_exclude_fmts
     test=$outertest
 }
 
+gapless(){
+    sample=$(target_path $1)
+    extra_args=$2
+
+    decfile1="${outdir}/${test}.out-1"
+    decfile2="${outdir}/${test}.out-2"
+    decfile3="${outdir}/${test}.out-3"
+    cleanfiles="$cleanfiles $decfile1 $decfile2 $decfile3"
+
+    # test packet data
+    ffmpeg $extra_args -i "$sample" -flags +bitexact -fflags +bitexact -c:a copy -f framecrc -y $decfile1
+    do_md5sum $decfile1
+    # test decoded (and cut) data
+    ffmpeg $extra_args -i "$sample" -flags +bitexact -fflags +bitexact -f wav md5:
+    # the same as above again, with seeking to the start
+    ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -fflags +bitexact -c:a copy -f framecrc -y $decfile2
+    do_md5sum $decfile2
+    ffmpeg $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -flags +bitexact -fflags +bitexact -f wav md5:
+    # test packet data, with seeking to a specific position
+    ffmpeg $extra_args -ss 5 -seek_timestamp 1 -i "$sample" -flags +bitexact -fflags +bitexact -c:a copy -f framecrc -y $decfile3
+    do_md5sum $decfile3
+}
+
+gaplessenc(){
+    sample=$(target_path $1)
+    format=$2
+    codec=$3
+
+    file1="${outdir}/${test}.out-1"
+    cleanfiles="$cleanfiles $file1"
+
+    # test data after reencoding
+    ffmpeg -i "$sample" -flags +bitexact -fflags +bitexact -map 0:a -c:a $codec -f $format -y "$file1"
+    probegaplessinfo "$file1"
+}
+
+audio_match(){
+    sample=$(target_path $1)
+    trefile=$(target_path $2)
+    extra_args=$3
+
+    decfile="${outdir}/${test}.wav"
+    cleanfiles="$cleanfiles $decfile"
+
+    ffmpeg -i "$sample" -flags +bitexact -fflags +bitexact $extra_args -y $decfile
+    tests/audiomatch $decfile $trefile
+}
+
+concat(){
+    template=$1
+    sample=$2
+    mode=$3
+    extra_args=$4
+
+    concatfile="${outdir}/${test}.ffconcat"
+    packetfile="${outdir}/${test}.ffprobe"
+    cleanfiles="$concatfile $packetfile"
+
+    awk "{gsub(/%SRCFILE%/, \"$sample\"); print}" $template > $concatfile
+
+    if [ "$mode" = "md5" ]; then
+        run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -v 0 -fflags keepside -safe 0 $extra_args $concatfile | tr -d '\r' > $packetfile
+        do_md5sum $packetfile
+    else
+        run ffprobe${PROGSUF} -bitexact -show_streams -show_packets -v 0 -of compact=p=0:nk=1 -fflags keepside -safe 0 $extra_args $concatfile
+    fi
+}
+
 null(){
     :
 }
 
 mkdir -p "$outdir"
 
+# Disable globbing: command arguments may contain globbing characters and
+# must be kept verbatim
+set -f
+
 exec 3>&2
 eval $command >"$outfile" 2>$errfile
 err=$?
@@ -207,12 +371,14 @@ if [ $err -gt 128 ]; then
     test "${sig}" = "${sig%[!A-Za-z]*}" || unset sig
 fi
 
-if test -e "$ref" || test $cmp = "oneline" || test $cmp = "null" ; then
+if test -e "$ref" || test $cmp = "oneline" || test $cmp = "null" || test $cmp = "grep" ; then
     case $cmp in
         diff)   diff -u -b "$ref" "$outfile"            >$cmpfile ;;
+        rawdiff)diff -u    "$ref" "$outfile"            >$cmpfile ;;
         oneoff) oneoff     "$ref" "$outfile"            >$cmpfile ;;
         stddev) stddev     "$ref" "$outfile"            >$cmpfile ;;
         oneline)oneline    "$ref" "$outfile"            >$cmpfile ;;
+        grep)   grep       "$ref" "$errfile"            >$cmpfile ;;
         null)   cat               "$outfile"            >$cmpfile ;;
     esac
     cmperr=$?
@@ -241,5 +407,12 @@ if test $err != 0 && test $gen != "no" ; then
     err=$?
 fi
 
-test $err = 0 && rm -f $outfile $errfile $cmpfile $cleanfiles
+if test $err = 0; then
+    rm -f $outfile $errfile $cmpfile $cleanfiles
+elif test $gen = "no"; then
+    echo "Test $test failed. Look at $errfile for details."
+    test "${V:-0}" -gt 0 && cat $errfile
+else
+    echo "Updating reference failed, possibly no output file was generated."
+fi
 exit $err
diff --git a/tests/fate-valgrind.supp b/tests/fate-valgrind.supp
new file mode 100644
index 0000000000..db72c54b7f
--- /dev/null
+++ b/tests/fate-valgrind.supp
@@ -0,0 +1,31 @@
+# seems fixed in newer versions
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=577135
+{
+   zlib-inflate
+   Memcheck:Cond
+   fun:inflateReset2
+   fun:inflateInit2_
+}
+# libc overreads on purpose
+# http://sourceware.org/bugzilla/show_bug.cgi?id=12424
+{
+   eval-strtod
+   Memcheck:Addr8
+   fun:__GI___strncasecmp_l
+   fun:____strtod_l_internal
+   fun:av_strtod
+}
+{
+   eval-strtod
+   Memcheck:Value8
+   fun:__GI___strncasecmp_l
+   fun:____strtod_l_internal
+   fun:av_strtod
+}
+{
+   eval-strtod
+   Memcheck:Cond
+   fun:__GI___strncasecmp_l
+   fun:____strtod_l_internal
+   fun:av_strtod
+}
diff --git a/tests/fate.sh b/tests/fate.sh
index c93e20a464..0edee7f22e 100755
--- a/tests/fate.sh
+++ b/tests/fate.sh
@@ -37,16 +37,18 @@ checkout(){
 update()(
     cd ${src} || return
     case "$repo" in
-        git:*) git fetch --quiet --force; git reset --quiet --hard "origin/$branch" ;;
+        git:*) git fetch --quiet --force && git reset --quiet --hard "origin/$branch" ;;
     esac
 )
 
 configure()(
     cd ${build} || return
-    ${src}/configure                                                    \
+    ${shell} ${src}/configure                                           \
         --prefix="${inst}"                                              \
         --samples="${samples}"                                          \
         --enable-gpl                                                    \
+        --enable-memory-poisoning                                       \
+        --enable-avresample                                             \
         ${ignore_tests:+--ignore-tests="$ignore_tests"}                 \
         ${arch:+--arch=$arch}                                           \
         ${cpu:+--cpu="$cpu"}                                            \
@@ -84,7 +86,8 @@ clean(){
 report(){
     date=$(date -u +%Y%m%d%H%M%S)
     echo "fate:1:${date}:${slot}:${version}:$1:$2:${branch}:${comment}" >report
-    cat ${build}/avbuild/config.fate ${build}/tests/data/fate/*.rep >> report 2> /dev/null
+    cat ${build}/ffbuild/config.fate >>report
+    cat ${build}/tests/data/fate/*.rep >>report 2>/dev/null || for i in ${build}/tests/data/fate/*.rep ; do cat "$i" >>report 2>/dev/null; done
     test -n "$fate_recv" && $tar report *.log | gzip | $fate_recv
 }
 
@@ -106,15 +109,15 @@ test -d "$src" && update || checkout || die "Error fetching source"
 
 cd ${workdir}
 
-version=$(${src}/avbuild/version.sh ${src})
+version=$(${src}/ffbuild/version.sh ${src})
 test "$version" = "$(cat version-$slot 2>/dev/null)" && exit 0
 echo ${version} >version-$slot
 
 rm -rf "${build}" *.log
 mkdir -p ${build}
 
-configure >configure.log 2>&1 || fail $? "error configuring"
-compile   >compile.log   2>&1 || fail $? "error compiling"
-fate      >test.log      2>&1 || fail $? "error testing"
+configure >configure.log 2>&1 || fail 3 "error configuring"
+compile   >compile.log   2>&1 || fail 2 "error compiling"
+fate      >test.log      2>&1 || fail 1 "error testing"
 report 0 success
 clean
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak
index 63ea06ce53..e8cbcef54d 100644
--- a/tests/fate/aac.mak
+++ b/tests/fate/aac.mak
@@ -2,6 +2,10 @@ FATE_AAC += fate-aac-al04_44
 fate-aac-al04_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al04_44.mp4
 fate-aac-al04_44: REF = $(SAMPLES)/aac/al04_44.s16
 
+FATE_AAC += fate-aac-al04sf_48
+fate-aac-al04sf_48: CMD = pcm -i $(TARGET_SAMPLES)/aac/al04sf_48.mp4
+fate-aac-al04sf_48: REF = $(SAMPLES)/aac/al04sf_48.s16
+
 FATE_AAC += fate-aac-al05_44
 fate-aac-al05_44: CMD = pcm -i $(TARGET_SAMPLES)/aac/al05_44.mp4
 fate-aac-al05_44: REF = $(SAMPLES)/aac/al05_44.s16
@@ -46,6 +50,10 @@ FATE_AAC += fate-aac-al_sbr_hq_sr_48_2_fsaac48
 fate-aac-al_sbr_hq_sr_48_2_fsaac48: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_sr_48_2_fsaac48.mp4
 fate-aac-al_sbr_hq_sr_48_2_fsaac48: REF = $(SAMPLES)/aac/al_sbr_hq_sr_48_2_fsaac48.s16
 
+FATE_AAC += fate-aac-al_sbr_ps_04_ur
+fate-aac-al_sbr_ps_04_ur: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_ps_04_new.mp4
+fate-aac-al_sbr_ps_04_ur: REF = $(SAMPLES)/aac/al_sbr_ps_04_ur.s16
+
 FATE_AAC += fate-aac-al_sbr_ps_06_ur
 fate-aac-al_sbr_ps_06_ur: CMD = pcm -i $(TARGET_SAMPLES)/aac/al_sbr_ps_06_new.mp4
 fate-aac-al_sbr_ps_06_ur: REF = $(SAMPLES)/aac/al_sbr_ps_06_ur.s16
@@ -70,6 +78,61 @@ FATE_AAC += fate-aac-er_eld2100np_48_ep0
 fate-aac-er_eld2100np_48_ep0: CMD = pcm -i $(TARGET_SAMPLES)/aac/er_eld2100np_48_ep0.mp4
 fate-aac-er_eld2100np_48_ep0: REF = $(SAMPLES)/aac/er_eld2100np_48.s16
 
+FATE_AAC_FIXED += fate-aac-fixed-al04_44
+fate-aac-fixed-al04_44: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al04_44.mp4
+fate-aac-fixed-al04_44: REF = $(SAMPLES)/aac/al04_44.s16
+
+FATE_AAC_FIXED += fate-aac-fixed-al05_44
+fate-aac-fixed-al05_44: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al05_44.mp4
+fate-aac-fixed-al05_44: REF = $(SAMPLES)/aac/al05_44.s16
+
+FATE_AAC_FIXED += fate-aac-fixed-al06_44
+fate-aac-fixed-al06_44: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al06_44.mp4
+fate-aac-fixed-al06_44: REF = $(SAMPLES)/aac/al06_44_reorder.s16
+
+FATE_AAC_FIXED += fate-aac-fixed-al15_44
+fate-aac-fixed-al15_44: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al15_44.mp4
+fate-aac-fixed-al15_44: REF = $(SAMPLES)/aac/al15_44_reorder.s16
+
+FATE_AAC_FIXED += fate-aac-fixed-al17_44
+fate-aac-fixed-al17_44: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al17_44.mp4
+fate-aac-fixed-al17_44: REF = $(SAMPLES)/aac/al17_44.s16
+
+FATE_AAC_FIXED += fate-aac-fixed-al18_44
+fate-aac-fixed-al18_44: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al18_44.mp4
+fate-aac-fixed-al18_44: REF = $(SAMPLES)/aac/al18_44.s16
+
+FATE_AAC_FIXED += fate-aac-fixed-al_sbr_hq_cm_48_2
+fate-aac-fixed-al_sbr_hq_cm_48_2: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al_sbr_cm_48_2.mp4
+fate-aac-fixed-al_sbr_hq_cm_48_2: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_2.s16
+
+FATE_AAC_FIXED += fate-aac-fixed-al_sbr_hq_cm_48_5.1
+fate-aac-fixed-al_sbr_hq_cm_48_5.1: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al_sbr_cm_48_5.1.mp4
+fate-aac-fixed-al_sbr_hq_cm_48_5.1: REF = $(SAMPLES)/aac/al_sbr_hq_cm_48_5.1_reorder.s16
+
+FATE_AAC_FIXED += fate-aac-fixed-al_sbr_hq_sr_48_2_fsaac48
+fate-aac-fixed-al_sbr_hq_sr_48_2_fsaac48: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/al_sbr_sr_48_2_fsaac48.mp4
+fate-aac-fixed-al_sbr_hq_sr_48_2_fsaac48: REF = $(SAMPLES)/aac/al_sbr_hq_sr_48_2_fsaac48.s16
+
+#FATE_AAC_FIXED += fate-aac-fixed-al_sbr_ps_06_ur
+#fate-aac-fixed-al_sbr_ps_06_ur: CMD = pcm -c aac_fixed-i $(TARGET_SAMPLES)/aac/al_sbr_ps_06_new.mp4
+#fate-aac-fixed-al_sbr_ps_06_ur: REF = $(SAMPLES)/aac/al_sbr_ps_06_ur.s16
+
+FATE_AAC_FIXED += fate-aac-fixed-ap05_48
+fate-aac-fixed-ap05_48: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/ap05_48.mp4
+fate-aac-fixed-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16
+
+FATE_AAC_FIXED += fate-aac-fixed-er_ad6000np_44_ep0
+fate-aac-fixed-er_ad6000np_44_ep0: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/er_ad6000np_44_ep0.mp4
+fate-aac-fixed-er_ad6000np_44_ep0: REF = $(SAMPLES)/aac/er_ad6000np_44.s16
+
+FATE_AAC_FIXED += fate-aac-fixed-er_eld1001np_44_ep0
+fate-aac-fixed-er_eld1001np_44_ep0: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/er_eld1001np_44_ep0.mp4
+fate-aac-fixed-er_eld1001np_44_ep0: REF = $(SAMPLES)/aac/er_eld1001np_44.s16
+
+FATE_AAC_FIXED += fate-aac-fixed-er_eld2000np_48_ep0
+fate-aac-fixed-er_eld2000np_48_ep0: CMD = pcm -c aac_fixed -i $(TARGET_SAMPLES)/aac/er_eld2000np_48_ep0.mp4
+fate-aac-fixed-er_eld2000np_48_ep0: REF = $(SAMPLES)/aac/er_eld2000np_48_ep0.s16
 
 fate-aac-ct%: CMD = pcm -i $(TARGET_SAMPLES)/aac/CT_DecoderCheck/$(@:fate-aac-ct-%=%)
 fate-aac-ct%: REF = $(SAMPLES)/aac/CT_DecoderCheck/aacPlusv2.wav
@@ -85,6 +148,99 @@ FATE_AAC_CT = sbr_bc-ps_i.3gp  \
 
 FATE_AAC += $(FATE_AAC_CT:%=fate-aac-ct-%)
 
+FATE_AAC_ENCODE += fate-aac-aref-encode
+fate-aac-aref-encode: ./tests/data/asynth-44100-2.wav
+fate-aac-aref-encode: CMD = enc_dec_pcm adts wav s16le $(REF) -c:a aac -aac_is 0 -aac_pns 0 -aac_ms 0 -aac_tns 0 -b:a 512k
+fate-aac-aref-encode: CMP = stddev
+fate-aac-aref-encode: REF = ./tests/data/asynth-44100-2.wav
+fate-aac-aref-encode: CMP_SHIFT = -4096
+fate-aac-aref-encode: CMP_TARGET = 669
+fate-aac-aref-encode: SIZE_TOLERANCE = 2464
+fate-aac-aref-encode: FUZZ = 89
+
+FATE_AAC_ENCODE += fate-aac-ln-encode
+fate-aac-ln-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_is 0 -aac_pns 0 -aac_ms 0 -aac_tns 0 -b:a 512k
+fate-aac-ln-encode: CMP = stddev
+fate-aac-ln-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+fate-aac-ln-encode: CMP_SHIFT = -4096
+fate-aac-ln-encode: CMP_TARGET = 61
+fate-aac-ln-encode: SIZE_TOLERANCE = 3560
+fate-aac-ln-encode: FUZZ = 30
+
+FATE_AAC_ENCODE += fate-aac-ln-encode-128k
+fate-aac-ln-encode-128k: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_is 0 -aac_pns 0 -aac_ms 0 -aac_tns 0 -b:a 128k -cutoff 22050
+fate-aac-ln-encode-128k: CMP = stddev
+fate-aac-ln-encode-128k: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+fate-aac-ln-encode-128k: CMP_SHIFT = -4096
+fate-aac-ln-encode-128k: CMP_TARGET = 800
+fate-aac-ln-encode-128k: SIZE_TOLERANCE = 3560
+fate-aac-ln-encode-128k: FUZZ = 5
+
+FATE_AAC_ENCODE += fate-aac-pns-encode
+fate-aac-pns-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_pns 1 -aac_is 0 -aac_ms 0 -aac_tns 0 -b:a 128k -cutoff 22050  -fflags +bitexact -flags +bitexact
+fate-aac-pns-encode: CMP = stddev
+fate-aac-pns-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+fate-aac-pns-encode: CMP_SHIFT = -4096
+fate-aac-pns-encode: CMP_TARGET = 616
+fate-aac-pns-encode: SIZE_TOLERANCE = 3560
+fate-aac-pns-encode: FUZZ = 74
+
+FATE_AAC_ENCODE += fate-aac-tns-encode
+fate-aac-tns-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_tns 1 -aac_is 0 -aac_pns 0 -aac_ms 0 -b:a 128k -cutoff 22050  -fflags +bitexact -flags +bitexact
+fate-aac-tns-encode: CMP = stddev
+fate-aac-tns-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+fate-aac-tns-encode: CMP_SHIFT = -4096
+fate-aac-tns-encode: CMP_TARGET = 817
+fate-aac-tns-encode: FUZZ = 7
+fate-aac-tns-encode: SIZE_TOLERANCE = 3560
+
+FATE_AAC_ENCODE += fate-aac-is-encode
+fate-aac-is-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_pns 0 -aac_is 1 -aac_ms 0 -b:a 128k -aac_tns 0 -cutoff 22050
+fate-aac-is-encode: CMP = stddev
+fate-aac-is-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+fate-aac-is-encode: CMP_SHIFT = -4096
+fate-aac-is-encode: CMP_TARGET = 615
+fate-aac-is-encode: SIZE_TOLERANCE = 3560
+fate-aac-is-encode: FUZZ = 10
+
+FATE_AAC_ENCODE += fate-aac-ms-encode
+fate-aac-ms-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a aac -aac_pns 0 -aac_is 0 -aac_ms 1 -aac_tns 0 -b:a 128k -cutoff 22050
+fate-aac-ms-encode: CMP = stddev
+fate-aac-ms-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+fate-aac-ms-encode: CMP_SHIFT = -4096
+fate-aac-ms-encode: CMP_TARGET = 675
+fate-aac-ms-encode: SIZE_TOLERANCE = 3560
+fate-aac-ms-encode: FUZZ = 15
+
+FATE_AAC_ENCODE += fate-aac-ltp-encode
+fate-aac-ltp-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -strict -2 -c:a aac -profile:a aac_ltp -aac_pns 0 -aac_is 0 -aac_ms 0 -aac_tns 0 -b:a 36k -fflags +bitexact -flags +bitexact
+fate-aac-ltp-encode: CMP = stddev
+fate-aac-ltp-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+fate-aac-ltp-encode: CMP_SHIFT = -4096
+fate-aac-ltp-encode: CMP_TARGET = 1270
+fate-aac-ltp-encode: SIZE_TOLERANCE = 3560
+fate-aac-ltp-encode: FUZZ = 17
+
+#Ticket1784
+FATE_AAC_ENCODE += fate-aac-yoraw-encode
+fate-aac-yoraw-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/yo.raw-short.wav -c:a aac -fflags +bitexact -flags +bitexact
+fate-aac-yoraw-encode: CMP = stddev
+fate-aac-yoraw-encode: REF = $(SAMPLES)/audio-reference/yo.raw-short.wav
+fate-aac-yoraw-encode: CMP_SHIFT = -12288
+fate-aac-yoraw-encode: CMP_TARGET = 259
+fate-aac-yoraw-encode: SIZE_TOLERANCE = 3560
+fate-aac-yoraw-encode: FUZZ = 17
+
+
+FATE_AAC_ENCODE += fate-aac-pred-encode
+fate-aac-pred-encode: CMD = enc_dec_pcm adts wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -profile:a aac_main -c:a aac -aac_is 0 -aac_pns 0 -aac_ms 0 -aac_tns 0 -b:a 128k -cutoff 22050
+fate-aac-pred-encode: CMP = stddev
+fate-aac-pred-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+fate-aac-pred-encode: CMP_SHIFT = -4096
+fate-aac-pred-encode: CMP_TARGET = 841
+fate-aac-pred-encode: FUZZ = 12
+fate-aac-pred-encode: SIZE_TOLERANCE = 3560
+
 FATE_AAC_LATM += fate-aac-latm_000000001180bc60
 fate-aac-latm_000000001180bc60: CMD = pcm -i $(TARGET_SAMPLES)/aac/latm_000000001180bc60.mpg
 fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16
@@ -93,16 +249,24 @@ FATE_AAC_LATM += fate-aac-latm_stereo_to_51
 fate-aac-latm_stereo_to_51: CMD = pcm -i $(TARGET_SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1
 fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16
 
+fate-aac-autobsf-adtstoasc: CMD = transcode "aac" $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.adts \
+                                            matroska "-c:a copy" "-c:a copy"
+
 FATE_AAC-$(call      DEMDEC, AAC,    AAC)      += $(FATE_AAC_CT_RAW)
 FATE_AAC-$(call      DEMDEC, MOV,    AAC)      += $(FATE_AAC)
 FATE_AAC_LATM-$(call DEMDEC, MPEGTS, AAC_LATM) += $(FATE_AAC_LATM)
+FATE_AAC-$(call      DEMDEC, AAC,    AAC_FIXED)+= $(FATE_AAC_FIXED)
 
-FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes)
+FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes) $(FATE_AAC_FIXED-yes)
 
 $(FATE_AAC_ALL): CMP  = oneoff
 $(FATE_AAC_ALL): FUZZ = 2
 
-FATE_SAMPLES_AVCONV += $(FATE_AAC_ALL)
+FATE_AAC_ENCODE-$(call ENCMUX, AAC, ADTS) += $(FATE_AAC_ENCODE)
+
+FATE_AAC_BSF-$(call ALLYES, AAC_DEMUXER AAC_ADTSTOASC_BSF MATROSKA_MUXER) += fate-aac-autobsf-adtstoasc
+
+FATE_SAMPLES_FFMPEG += $(FATE_AAC_ALL) $(FATE_AAC_ENCODE-yes) $(FATE_AAC_BSF-yes)
 
-fate-aac: $(FATE_AAC_ALL)
+fate-aac: $(FATE_AAC_ALL) $(FATE_AAC_ENCODE) $(FATE_AAC_BSF-yes)
 fate-aac-latm: $(FATE_AAC_LATM-yes)
diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak
index fee4567288..76be2e869a 100644
--- a/tests/fate/ac3.mak
+++ b/tests/fate/ac3.mak
@@ -28,6 +28,22 @@ FATE_AC3 += fate-ac3-5.1-downmix-stereo
 fate-ac3-5.1-downmix-stereo: CMD = pcm -request_channel_layout 3 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
 fate-ac3-5.1-downmix-stereo: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_stereo_v2.pcm
 
+FATE_AC3 += fate-ac3-fixed-2.0
+fate-ac3-fixed-2.0: CMD = pcm -c ac3_fixed -i $(TARGET_SAMPLES)/ac3/monsters_inc_2.0_192_small.ac3
+fate-ac3-fixed-2.0: REF = $(SAMPLES)/ac3/monsters_inc_2.0_192_small_v2.pcm
+
+FATE_AC3 += fate-ac3-fixed-4.0-downmix-mono
+fate-ac3-fixed-4.0-downmix-mono: CMD = pcm -c ac3_fixed -request_channel_layout 4 -i $(TARGET_SAMPLES)/ac3/millers_crossing_4.0.ac3
+fate-ac3-fixed-4.0-downmix-mono: REF = $(SAMPLES)/ac3/millers_crossing_4.0_mono_v2.pcm
+
+FATE_AC3 += fate-ac3-fixed-5.1-downmix-mono
+fate-ac3-fixed-5.1-downmix-mono: CMD = pcm -c ac3_fixed -request_channel_layout 4 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
+fate-ac3-fixed-5.1-downmix-mono: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_mono_v2.pcm
+
+FATE_AC3 += fate-ac3-fixed-5.1-downmix-stereo
+fate-ac3-fixed-5.1-downmix-stereo: CMD = pcm -c ac3_fixed -request_channel_layout 3 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
+fate-ac3-fixed-5.1-downmix-stereo: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small_stereo_v2.pcm
+
 FATE_EAC3 += fate-eac3-1
 fate-eac3-1: CMD = pcm -i $(TARGET_SAMPLES)/eac3/csi_miami_5.1_256_spx_small.eac3
 fate-eac3-1: REF = $(SAMPLES)/eac3/csi_miami_5.1_256_spx_small_v2.pcm
@@ -55,6 +71,7 @@ fate-ac3-encode: CMP_SHIFT = -1024
 fate-ac3-encode: CMP_TARGET = 404.53
 fate-ac3-encode: SIZE_TOLERANCE = 488
 
+
 FATE_EAC3-$(call ENCDEC, EAC3, EAC3) += fate-eac3-encode
 fate-eac3-encode: CMD = enc_dec_pcm eac3 wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c:a eac3 -b:a 128k
 fate-eac3-encode: CMP_SHIFT = -1024
@@ -67,7 +84,7 @@ fate-ac3-encode fate-eac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2c
 FATE_AC3-$(call ENCMUX, AC3_FIXED, AC3) += fate-ac3-fixed-encode
 fate-ac3-fixed-encode: tests/data/asynth-44100-2.wav
 fate-ac3-fixed-encode: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
-fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -b 128k -f ac3 -flags bitexact
+fate-ac3-fixed-encode: CMD = md5 -i $(SRC) -c ac3_fixed -ab 128k -f ac3 -flags +bitexact
 fate-ac3-fixed-encode: CMP = oneline
 fate-ac3-fixed-encode: REF = a1d1fc116463b771abf5aef7ed37d7b1
 
diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak
index 3431754bfe..5c3fea90c5 100644
--- a/tests/fate/acodec.mak
+++ b/tests/fate/acodec.mak
@@ -1,6 +1,6 @@
 fate-acodec-%: CODEC = $(@:fate-acodec-%=%)
 fate-acodec-%: SRC = tests/data/asynth-44100-2.wav
-fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -ar 44100 -c $(CODEC)" wav "-c pcm_s16le" -keep
+fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b:a 128k -c $(CODEC) $(ENCOPTS)" wav "-c pcm_s16le $(DECOPTS)" -keep
 fate-acodec-%: CMP_UNIT = 2
 fate-acodec-%: REF = $(SRC_PATH)/tests/ref/acodec/$(@:fate-acodec-%=%)
 
@@ -10,24 +10,38 @@ FATE_ACODEC_PCM-$(call ENCDEC, PCM_S8,    MOV) += s8
 FATE_ACODEC_PCM-$(call ENCDEC, PCM_U8,    WAV) += u8
 FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16BE, MOV) += s16be
 FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16LE, WAV) += s16le
+FATE_ACODEC_PCM-$(call ENCDEC, PCM_U16BE, NUT) += u16be
+FATE_ACODEC_PCM-$(call ENCDEC, PCM_U16LE, NUT) += u16le
 FATE_ACODEC_PCM-$(call ENCDEC, PCM_S24BE, MOV) += s24be
 FATE_ACODEC_PCM-$(call ENCDEC, PCM_S24LE, WAV) += s24le
+FATE_ACODEC_PCM-$(call ENCDEC, PCM_U24BE, NUT) += u24be
+FATE_ACODEC_PCM-$(call ENCDEC, PCM_U24LE, NUT) += u24le
 FATE_ACODEC_PCM-$(call ENCDEC, PCM_S32BE, MOV) += s32be
 FATE_ACODEC_PCM-$(call ENCDEC, PCM_S32LE, WAV) += s32le
+FATE_ACODEC_PCM-$(call ENCDEC, PCM_U32BE, NUT) += u32be
+FATE_ACODEC_PCM-$(call ENCDEC, PCM_U32LE, NUT) += u32le
 FATE_ACODEC_PCM-$(call ENCDEC, PCM_F32BE, AU)  += f32be
 FATE_ACODEC_PCM-$(call ENCDEC, PCM_F32LE, WAV) += f32le
 FATE_ACODEC_PCM-$(call ENCDEC, PCM_F64BE, AU)  += f64be
 FATE_ACODEC_PCM-$(call ENCDEC, PCM_F64LE, WAV) += f64le
+FATE_ACODEC_PCM-$(call ENCDEC, PCM_S8_PLANAR, NUT) += s8_planar
+FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16BE_PLANAR, NUT) += s16be_planar
+FATE_ACODEC_PCM-$(call ENCDEC, PCM_S16LE_PLANAR, NUT) += s16le_planar
+FATE_ACODEC_PCM-$(call ENCDEC, PCM_S24LE_PLANAR, NUT) += s24le_planar
+FATE_ACODEC_PCM-$(call ENCDEC, PCM_S32LE_PLANAR, NUT) += s32le_planar
 
 FATE_ACODEC_PCM := $(FATE_ACODEC_PCM-yes:%=fate-acodec-pcm-%)
 FATE_ACODEC += $(FATE_ACODEC_PCM)
 fate-acodec-pcm: $(FATE_ACODEC_PCM)
 
 fate-acodec-pcm-%: FMT = wav
+fate-acodec-pcm-%_planar: FMT = nut
 fate-acodec-pcm-%: CODEC = pcm_$(@:fate-acodec-pcm-%=%)
 
 fate-acodec-pcm-s8:   FMT = mov
 fate-acodec-pcm-s%be: FMT = mov
+fate-acodec-pcm-u%be: FMT = nut
+fate-acodec-pcm-u%le: FMT = nut
 fate-acodec-pcm-f%be: FMT = au
 
 FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_ADX,     ADX)  += adx
@@ -50,18 +64,99 @@ fate-acodec-adpcm-ms:      FMT = wav
 fate-acodec-adpcm-swf:     FMT = flv
 fate-acodec-adpcm-yamaha:  FMT = wav
 
+FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_ADX,     ADX)  += adx
+FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_IMA_QT,  AIFF) += ima_qt
+FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_IMA_WAV, WAV)  += ima_wav
+FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_MS,      WAV)  += ms
+FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_SWF,     FLV)  += swf
+FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_YAMAHA,  WAV)  += yamaha
+
+FATE_ACODEC_ADPCM_TRELLIS := $(FATE_ACODEC_ADPCM_TRELLIS-yes:%=fate-acodec-adpcm-%-trellis)
+FATE_ACODEC += $(FATE_ACODEC_ADPCM_TRELLIS)
+fate-acodec-adpcm-trellis: $(FATE_ACODEC_ADPCM_TRELLIS)
+
+fate-acodec-adpcm-%-trellis: CODEC = adpcm_$(@:fate-acodec-adpcm-%-trellis=%)
+fate-acodec-adpcm-%-trellis: ENCOPTS = -trellis 5
+
+fate-acodec-adpcm-adx-trellis:     FMT = adx
+fate-acodec-adpcm-ima_qt-trellis:  FMT = aiff
+fate-acodec-adpcm-ima_wav-trellis: FMT = wav
+fate-acodec-adpcm-ms-trellis:      FMT = wav
+fate-acodec-adpcm-swf-trellis:     FMT = flv
+fate-acodec-adpcm-yamaha-trellis:  FMT = wav
+
 FATE_ACODEC-$(call ENCDEC, MP2, MP2 MP3) += fate-acodec-mp2
 fate-acodec-mp2: FMT = mp2
 fate-acodec-mp2: CMP_SHIFT = -1924
+fate-acodec-mp2: ENCOPTS = -b:a 128k
+
+FATE_ACODEC-$(call ENCDEC, MP2FIXED MP2 , MP2 MP3) += fate-acodec-mp2fixed
+fate-acodec-mp2fixed: FMT = mp2
+fate-acodec-mp2fixed: CMP_SHIFT = -1924
+fate-acodec-mp2fixed: ENCOPTS = -b:a 384k
 
 FATE_ACODEC-$(call ENCDEC, ALAC, MOV) += fate-acodec-alac
 fate-acodec-alac: FMT = mov
 fate-acodec-alac: CODEC = alac -compression_level 1
 
-FATE_ACODEC-$(call ENCDEC, FLAC, FLAC) += fate-acodec-flac
+FATE_ACODEC-$(call ENCDEC, DCA, DTS) += fate-acodec-dca
+fate-acodec-dca: tests/data/asynth-44100-2.wav
+fate-acodec-dca: SRC = tests/data/asynth-44100-2.wav
+fate-acodec-dca: CMD = md5 -i $(TARGET_PATH)/$(SRC) -c:a dca -strict -2 -f dts -flags +bitexact
+fate-acodec-dca: CMP = oneline
+fate-acodec-dca: REF = 7cd79a3717943a06b217f1130223a86f
+
+FATE_ACODEC-$(call ENCDEC, DCA, WAV) += fate-acodec-dca2
+fate-acodec-dca2: CMD = enc_dec_pcm dts wav s16le $(SRC) -c:a dca -strict -2 -flags +bitexact
+fate-acodec-dca2: REF = $(SRC)
+fate-acodec-dca2: CMP = stddev
+fate-acodec-dca2: CMP_SHIFT = -2048
+fate-acodec-dca2: CMP_TARGET = 527
+fate-acodec-dca2: SIZE_TOLERANCE = 1632
+
+FATE_ACODEC-$(call ENCDEC, FLAC, FLAC) += fate-acodec-flac fate-acodec-flac-exact-rice
 fate-acodec-flac: FMT = flac
 fate-acodec-flac: CODEC = flac -compression_level 2
 
+fate-acodec-flac-exact-rice: FMT = flac
+fate-acodec-flac-exact-rice: CODEC = flac -compression_level 2 -exact_rice_parameters 1
+
+FATE_ACODEC-$(call ENCDEC, G723_1, G723_1) += fate-acodec-g723_1
+fate-acodec-g723_1: tests/data/asynth-8000-1.wav
+fate-acodec-g723_1: SRC = tests/data/asynth-8000-1.wav
+fate-acodec-g723_1: FMT = g723_1
+fate-acodec-g723_1: CODEC = g723_1
+fate-acodec-g723_1: ENCOPTS = -b:a 6.3k
+fate-acodec-g723_1: CMP_SHIFT = 8
+
+FATE_ACODEC-$(call ENCDEC, RA_144, WAV) += fate-acodec-ra144
+fate-acodec-ra144: tests/data/asynth-8000-1.wav
+fate-acodec-ra144: SRC = tests/data/asynth-8000-1.wav
+fate-acodec-ra144: CMD = enc_dec_pcm rm wav s16le $(SRC) -c:a real_144
+fate-acodec-ra144: REF = $(SRC)
+fate-acodec-ra144: CMP = stddev
+fate-acodec-ra144: CMP_TARGET = 4777
+fate-acodec-ra144: CMP_SHIFT = -320
+
+FATE_ACODEC-$(call ENCDEC, ROQ_DPCM, ROQ) += fate-acodec-roqaudio
+fate-acodec-roqaudio: FMT = roq
+fate-acodec-roqaudio: CODEC = roq_dpcm
+fate-acodec-roqaudio: ENCOPTS = -ar 22050
+fate-acodec-roqaudio: DECOPTS = -ar 44100
+
+FATE_ACODEC-$(call ENCDEC, S302M, MPEGTS) += fate-acodec-s302m
+fate-acodec-s302m: FMT = mpegts
+fate-acodec-s302m: CODEC = s302m
+fate-acodec-s302m: ENCOPTS = -ar 48000 -strict -2
+fate-acodec-s302m: DECOPTS = -ar 44100
+
+FATE_ACODEC-$(call ENCDEC, WAVPACK, WV) += fate-acodec-wavpack
+fate-acodec-wavpack: FMT = wv
+fate-acodec-wavpack: CODEC = wavpack -compression_level 1
+
+FATE_ACODEC-$(call ENCDEC, TTA, TTA) += fate-acodec-tta
+fate-acodec-tta: FMT = tta
+
 FATE_ACODEC += $(FATE_ACODEC-yes)
 
 $(FATE_ACODEC): tests/data/asynth-44100-2.wav
diff --git a/tests/fate/adpcm.mak b/tests/fate/adpcm.mak
index 7ee62459f0..b64920d4fe 100644
--- a/tests/fate/adpcm.mak
+++ b/tests/fate/adpcm.mak
@@ -1,3 +1,9 @@
+FATE_ADPCM-$(call DEMDEC, FOURXM, ADPCM_4XM) += fate-adpcm-4xm
+fate-adpcm-4xm: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/dracula.4xm -vn -map 0:6
+
+FATE_ADPCM-$(call DEMDEC, AST, ADPCM_AFC) += fate-adpcm-afc
+fate-adpcm-afc: CMD = framecrc -i $(TARGET_SAMPLES)/ast/demo11_02_partial.ast
+
 FATE_ADPCM-$(call DEMDEC, WAV, ADPCM_CT) += fate-adpcm-creative
 fate-adpcm-creative: CMD = md5 -i $(TARGET_SAMPLES)/creative/intro-partial.wav -f s16le
 
@@ -10,6 +16,9 @@ fate-adpcm-creative-8-2.6bit: CMD = md5 -i $(TARGET_SAMPLES)/creative/BBC_3BIT.V
 FATE_ADPCM-$(call DEMDEC, VOC, ADPCM_SBPRO_4) += fate-adpcm-creative-8-4bit
 fate-adpcm-creative-8-4bit: CMD = md5 -i $(TARGET_SAMPLES)/creative/BBC_4BIT.VOC -f s16le
 
+FATE_ADPCM-$(call DEMDEC, ADP, ADPCM_DTK) += fate-adpcm-dtk
+fate-adpcm-dtk: CMD = framecrc -i $(TARGET_SAMPLES)/adp/shakespr_partial.adp -f s16le
+
 FATE_ADPCM-$(call DEMDEC, EA, ADPCM_EA) += fate-adpcm-ea-1
 fate-adpcm-ea-1: CMD = framecrc -i $(TARGET_SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:a 26 -vn
 
@@ -49,6 +58,12 @@ fate-adpcm-ima-ea-sead: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTEL_S.TGV -
 FATE_ADPCM-$(call DEMDEC, ISS, ADPCM_IMA_ISS) += fate-adpcm-ima-iss
 fate-adpcm-ima-iss: CMD = md5 -i $(TARGET_SAMPLES)/funcom-iss/0004010100.iss -f s16le
 
+FATE_ADPCM-$(call DEMDEC, WAV, ADPCM_IMA_OKI) += fate-adpcm-ima-oki
+fate-adpcm-ima-oki: CMD = md5 -i $(TARGET_SAMPLES)/oki/test.wav -f s16le
+
+FATE_ADPCM-$(call DEMDEC, RSD, ADPCM_IMA_RAD) += fate-adpcm-ima-rad
+fate-adpcm-ima-rad: CMD = md5 -i $(TARGET_SAMPLES)/rsd/hit_run_partial.rsd -f s16le
+
 FATE_ADPCM-$(call DEMDEC, SMJPEG, ADPCM_IMA_SMJPEG) += fate-adpcm-ima-smjpeg
 fate-adpcm-ima-smjpeg: CMD = framecrc -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -vn
 
diff --git a/tests/fate/api.mak b/tests/fate/api.mak
new file mode 100644
index 0000000000..eb656e68a3
--- /dev/null
+++ b/tests/fate/api.mak
@@ -0,0 +1,45 @@
+FATE_API_LIBAVCODEC-$(call ENCDEC, FLAC, FLAC) += fate-api-flac
+fate-api-flac: $(APITESTSDIR)/api-flac-test$(EXESUF)
+fate-api-flac: CMD = run $(APITESTSDIR)/api-flac-test
+fate-api-flac: CMP = null
+
+FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, FLV, FLV) += fate-api-band
+fate-api-band: $(APITESTSDIR)/api-band-test$(EXESUF)
+fate-api-band: CMD = run $(APITESTSDIR)/api-band-test $(TARGET_SAMPLES)/mpeg4/resize_down-up.h263
+fate-api-band: CMP = null
+
+FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, H264, H264) += fate-api-h264
+fate-api-h264: $(APITESTSDIR)/api-h264-test$(EXESUF)
+fate-api-h264: CMD = run $(APITESTSDIR)/api-h264-test $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264
+
+FATE_API_LIBAVFORMAT-$(call DEMDEC, FLV, FLV) += fate-api-seek
+fate-api-seek: $(APITESTSDIR)/api-seek-test$(EXESUF) fate-lavf-flv_fmt
+fate-api-seek: CMD = run $(APITESTSDIR)/api-seek-test $(TARGET_PATH)/tests/data/lavf/lavf.flv 0 720
+fate-api-seek: CMP = null
+
+FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, IMAGE2, PNG) += fate-api-png-codec-param
+fate-api-png-codec-param: $(APITESTSDIR)/api-codec-param-test$(EXESUF)
+fate-api-png-codec-param: CMD = run $(APITESTSDIR)/api-codec-param-test $(TARGET_SAMPLES)/png1/lena-rgba.png
+
+FATE_API_SAMPLES_LIBAVFORMAT-$(call DEMDEC, IMAGE2, MJPEG) += fate-api-mjpeg-codec-param
+fate-api-mjpeg-codec-param: $(APITESTSDIR)/api-codec-param-test$(EXESUF)
+fate-api-mjpeg-codec-param: CMD = run $(APITESTSDIR)/api-codec-param-test $(TARGET_SAMPLES)/exif/image_small.jpg
+
+FATE_API-$(HAVE_THREADS) += fate-api-threadmessage
+fate-api-threadmessage: $(APITESTSDIR)/api-threadmessage-test$(EXESUF)
+fate-api-threadmessage: CMD = run $(APITESTSDIR)/api-threadmessage-test 3 10 30 50 2 20 40
+fate-api-threadmessage: CMP = null
+
+FATE_API_SAMPLES-$(CONFIG_AVFORMAT) += $(FATE_API_SAMPLES_LIBAVFORMAT-yes)
+
+ifdef SAMPLES
+    FATE_API_SAMPLES += $(FATE_API_SAMPLES-yes)
+endif
+
+FATE_API-$(CONFIG_AVCODEC) += $(FATE_API_LIBAVCODEC-yes)
+FATE_API-$(CONFIG_AVFORMAT) += $(FATE_API_LIBAVFORMAT-yes)
+FATE_API = $(FATE_API-yes)
+
+FATE-yes += $(FATE_API) $(FATE_API_SAMPLES)
+
+fate-api: $(FATE_API) $(FATE_API_SAMPLES)
diff --git a/tests/fate/apng.mak b/tests/fate/apng.mak
new file mode 100644
index 0000000000..bc138b42d1
--- /dev/null
+++ b/tests/fate/apng.mak
@@ -0,0 +1,10 @@
+FATE_APNG += fate-apng-clock
+fate-apng-clock: CMD = framecrc -i $(TARGET_SAMPLES)/apng/clock.png
+
+FATE_APNG += fate-apng-osample
+fate-apng-osample: CMD = framecrc -i $(TARGET_SAMPLES)/apng/o_sample.png
+
+FATE_APNG-$(call DEMDEC, APNG, APNG) += $(FATE_APNG)
+
+FATE_SAMPLES_FFMPEG += $(FATE_APNG-yes)
+fate-apng: $(FATE_APNG-yes)
diff --git a/tests/fate/atrac.mak b/tests/fate/atrac.mak
index 94dbe3809b..acf79a539c 100644
--- a/tests/fate/atrac.mak
+++ b/tests/fate/atrac.mak
@@ -1,6 +1,13 @@
-FATE_ATRAC1-$(call DEMDEC, AEA, ATRAC1) += fate-atrac1
-fate-atrac1: CMD = pcm -i $(TARGET_SAMPLES)/atrac1/test_tones_small.aea
-fate-atrac1: REF = $(SAMPLES)/atrac1/test_tones_small.pcm
+FATE_ATRAC1 += fate-atrac1-1
+fate-atrac1-1: CMD = pcm -i $(TARGET_SAMPLES)/atrac1/test_tones_small.aea
+fate-atrac1-1: REF = $(SAMPLES)/atrac1/test_tones_small_fixed_delay.pcm
+
+FATE_ATRAC1 += fate-atrac1-2
+fate-atrac1-2: CMD = pcm -i $(TARGET_SAMPLES)/atrac1/chirp_tone_10-16000.aea
+fate-atrac1-2: REF = $(SAMPLES)/atrac1/chirp_tone_10-16000.pcm
+fate-atrac1-2: FUZZ = 61
+
+FATE_ATRAC1-$(call DEMDEC, AEA, ATRAC1) += $(FATE_ATRAC1)
 
 FATE_ATRAC3 += fate-atrac3-1
 fate-atrac3-1: CMD = pcm -i $(TARGET_SAMPLES)/atrac3/mc_sich_at3_066_small.wav
@@ -16,11 +23,22 @@ fate-atrac3-3: REF = $(SAMPLES)/atrac3/mc_sich_at3_132_small.pcm
 
 FATE_ATRAC3-$(call DEMDEC, WAV, ATRAC3) += $(FATE_ATRAC3)
 
-FATE_ATRAC_ALL = $(FATE_ATRAC1-yes) $(FATE_ATRAC3-yes)
+FATE_ATRAC3P += fate-atrac3p-1
+fate-atrac3p-1: CMD = pcm -i $(TARGET_SAMPLES)/atrac3p/at3p_sample1.oma
+fate-atrac3p-1: REF = $(SAMPLES)/atrac3p/at3p_sample1.pcm
+
+FATE_ATRAC3P += fate-atrac3p-2
+fate-atrac3p-2: CMD = pcm -i $(TARGET_SAMPLES)/atrac3p/sonateno14op27-2-cut.aa3
+fate-atrac3p-2: REF = $(SAMPLES)/atrac3p/sonateno14op27-2-cut.pcm
+
+FATE_ATRAC3P-$(call DEMDEC, OMA, ATRAC3P) += $(FATE_ATRAC3P)
+
+FATE_ATRAC_ALL = $(FATE_ATRAC1-yes) $(FATE_ATRAC3-yes) $(FATE_ATRAC3P-yes)
 
 $(FATE_ATRAC_ALL): CMP = oneoff
 
 FATE_SAMPLES_AVCONV += $(FATE_ATRAC_ALL)
 
-fate-atrac:  $(FATE_ATRAC_ALL)
-fate-atrac3: $(FATE_ATRAC3-yes)
+fate-atrac:   $(FATE_ATRAC_ALL)
+fate-atrac3:  $(FATE_ATRAC3-yes)
+fate-atrac3p: $(FATE_ATRAC3P-yes)
diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak
index cf11e9d3c3..40c4ca7b75 100644
--- a/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@ -10,53 +10,58 @@ fate-binkaudio-rdft: FUZZ = 2
 
 $(FATE_BINKAUDIO-yes): CMP = oneoff
 
-FATE_SAMPLES_AVCONV += $(FATE_BINKAUDIO-yes)
+FATE_SAMPLES_AUDIO += $(FATE_BINKAUDIO-yes)
 fate-binkaudio: $(FATE_BINKAUDIO-yes)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, BMV, BMV_AUDIO) += fate-bmv-audio
+FATE_SAMPLES_AUDIO-$(call DEMDEC, BMV, BMV_AUDIO) += fate-bmv-audio
 fate-bmv-audio: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -vn
 
-FATE_DCA-$(CONFIG_MPEGTS_DEMUXER) += fate-dca-core
-fate-dca-core: CMD = pcm -i $(TARGET_SAMPLES)/dts/dts.ts
-fate-dca-core: CMP = oneoff
-fate-dca-core: REF = $(SAMPLES)/dts/dts.pcm
-
-FATE_DCA-$(CONFIG_DTS_DEMUXER) += fate-dca-xll
-fate-dca-xll: CMD = pcm -disable_xll 0 -i $(TARGET_SAMPLES)/dts/master_audio_7.1_24bit.dts
-fate-dca-xll: CMP = oneoff
-fate-dca-xll: REF = $(SAMPLES)/dts/master_audio_7.1_24bit_2.pcm
-
-FATE_SAMPLES_AVCONV-$(CONFIG_DCA_DECODER) += $(FATE_DCA-yes)
-fate-dca: $(FATE_DCA-yes)
-
-FATE_SAMPLES_AVCONV-$(call DEMDEC, DSICIN, DSICINAUDIO) += fate-delphine-cin-audio
+FATE_SAMPLES_AUDIO-$(call DEMDEC, DSICIN, DSICINAUDIO) += fate-delphine-cin-audio
 fate-delphine-cin-audio: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -vn
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, DSS, DSS_SP) += fate-dss-lp fate-dss-sp
+FATE_SAMPLES_AUDIO-$(call DEMDEC, DSS, DSS_SP) += fate-dss-lp fate-dss-sp
 fate-dss-lp: CMD = framecrc -i $(TARGET_SAMPLES)/dss/lp.dss -frames 30
 fate-dss-sp: CMD = framecrc -i $(TARGET_SAMPLES)/dss/sp.dss -frames 30
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, IMC) += fate-imc
+FATE_SAMPLES_AUDIO-$(call DEMDEC, AVI, IMC) += fate-imc
 fate-imc: CMD = pcm -i $(TARGET_SAMPLES)/imc/imc.avi
 fate-imc: CMP = oneoff
-fate-imc: REF = $(SAMPLES)/imc/imc.pcm
+fate-imc: REF = $(SAMPLES)/imc/imc-201706.pcm
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, FLV, NELLYMOSER) += fate-nellymoser
+FATE_SAMPLES_AUDIO-$(call DEMDEC, FLV, NELLYMOSER) += fate-nellymoser
 fate-nellymoser: CMD = pcm -i $(TARGET_SAMPLES)/nellymoser/nellymoser.flv
 fate-nellymoser: CMP = oneoff
 fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, ON2AVC) += fate-on2avc
+FATE_SAMPLES_AUDIO-$(call ENCMUX, NELLYMOSER, FLV) += fate-nellymoser-aref-encode
+fate-nellymoser-aref-encode: $(AREF) ./tests/data/asynth-16000-1.wav
+fate-nellymoser-aref-encode: CMD = enc_dec_pcm flv wav s16le $(REF) -c:a nellymoser
+fate-nellymoser-aref-encode: CMP = stddev
+fate-nellymoser-aref-encode: REF = ./tests/data/asynth-16000-1.wav
+fate-nellymoser-aref-encode: CMP_SHIFT = -256
+fate-nellymoser-aref-encode: CMP_TARGET = 3863
+fate-nellymoser-aref-encode: SIZE_TOLERANCE = 268
+
+FATE_SAMPLES_AUDIO-$(call DEMDEC, AVI, ON2AVC) += fate-on2avc
 fate-on2avc: CMD = framecrc -i $(TARGET_SAMPLES)/vp7/potter-40.vp7 -frames 30 -vn
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, PAF, PAF_AUDIO) += fate-paf-audio
+FATE_SAMPLES_AUDIO-$(call DEMDEC, PAF, PAF_AUDIO) += fate-paf-audio
 fate-paf-audio: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -vn
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, VMD, VMDAUDIO) += fate-sierra-vmd-audio
+FATE_SAMPLES_AUDIO-$(call DEMDEC, VMD, VMDAUDIO) += fate-sierra-vmd-audio
 fate-sierra-vmd-audio: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -vn
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, SMACKER, SMACKAUD) += fate-smacker-audio
+FATE_SAMPLES_AUDIO-$(call DEMDEC, SMACKER, SMACKAUD) += fate-smacker-audio
 fate-smacker-audio: CMD = framecrc -i $(TARGET_SAMPLES)/smacker/wetlogo.smk -vn
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, WSVQA, WS_SND1) += fate-ws_snd
+FATE_SAMPLES_AUDIO-$(call DEMDEC, WSVQA, WS_SND1) += fate-ws_snd
 fate-ws_snd: CMD = md5 -i $(TARGET_SAMPLES)/vqa/ws_snd.vqa -f s16le
+
+fate-flcl1905: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_frames -show_packets -print_format compact $(TARGET_SAMPLES)/wav/FLCL_Ending_My-short.wav
+
+FATE_SAMPLES_AUDIO += $(FATE_SAMPLES_AUDIO-yes)
+
+FATE_SAMPLES_FFPROBE += fate-flcl1905
+
+FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_AUDIO)
+fate-audio: $(FATE_SAMPLES_AUDIO) fate-flcl1905
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 458ae7cae9..c9ea99ad1b 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -1,22 +1,34 @@
 FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             AIFF)               += aiff
 FATE_LAVF-$(call ENCDEC,  PCM_ALAW,              PCM_ALAW)           += alaw
+FATE_LAVF-$(call ENCDEC,  APNG,                  APNG)               += apng
 FATE_LAVF-$(call ENCDEC2, MSMPEG4V3,  MP2,       ASF)                += asf
+FATE_LAVF-$(call ENCDEC,  PCM_S16BE_PLANAR,      AST)                += ast
 FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             AU)                 += au
 FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       AVI)                += avi
 FATE_LAVF-$(call ENCDEC,  BMP,                   IMAGE2)             += bmp
+FATE_LAVF-$(call ENCDEC,  PCM_S16BE,             CAF)                += caf
 FATE_LAVF-$(call ENCDEC,  DPX,                   IMAGE2)             += dpx
 FATE_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, AVI)                += dv_fmt
+FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       FFM)                += ffm
+FATE_LAVF-$(call ENCDEC,  FITS,                  FITS)               += fits
+FATE_LAVF-$(call ENCDEC,  RAWVIDEO,              FILMSTRIP)          += flm
 FATE_LAVF-$(call ENCDEC,  FLV,                   FLV)                += flv_fmt
 FATE_LAVF-$(call ENCDEC,  GIF,                   IMAGE2)             += gif
 FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF)                += gxf
+FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             IRCAM)              += ircam
 FATE_LAVF-$(call ENCDEC,  MJPEG,                 IMAGE2)             += jpg
+FATE_LAVF-$(call ENCMUX,  TTA,                   MATROSKA_AUDIO)     += mka
 FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       MATROSKA)           += mkv
 FATE_LAVF-$(call ENCDEC,  ADPCM_YAMAHA,          MMF)                += mmf
-FATE_LAVF-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)                += mov
+FATE_LAVF-$(call ENCDEC2, MPEG4,      PCM_ALAW,  MOV)                += mov ismv
 FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       MPEG1SYSTEM MPEGPS) += mpg
 FATE_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)          += mulaw
 FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)                += mxf
 FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF)        += mxf_d10
+FATE_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, MXF)                += mxf_dv25
+FATE_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, MXF)                += mxf_dvcpro50
+FATE_LAVF-$(call ENCDEC2, DNXHD,      PCM_S16LE, MXF_OPATOM MXF)     += mxf_opatom
+FATE_LAVF-$(call ENCDEC2, DNXHD,      PCM_S16LE, MXF_OPATOM MXF)     += mxf_opatom_audio
 FATE_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)                += nut
 FATE_LAVF-$(call ENCDEC,  FLAC,                  OGG)                += ogg
 FATE_LAVF-$(call ENCDEC,  PAM,                   IMAGE2)             += pam
@@ -30,23 +42,102 @@ FATE_LAVF-$(call ENCDEC,  PPM,                   IMAGE2PIPE)         += ppmpipe
 FATE_LAVF-$(call ENCMUX,  RV10 AC3_FIXED,        RM)                 += rm
 FATE_LAVF-$(call ENCDEC,  PCM_U8,                RSO)                += rso
 FATE_LAVF-$(call ENCDEC,  SGI,                   IMAGE2)             += sgi
+FATE_LAVF-$(call ENCMUX,  MJPEG PCM_S16LE,       SMJPEG)             += smjpeg
 FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             SOX)                += sox
 FATE_LAVF-$(call ENCDEC,  SUNRAST,               IMAGE2)             += sunrast
 FATE_LAVF-$(call ENCDEC,  FLV,                   SWF)                += swf
 FATE_LAVF-$(call ENCDEC,  TARGA,                 IMAGE2)             += tga
 FATE_LAVF-$(call ENCDEC,  TIFF,                  IMAGE2)             += tiff
 FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)             += ts
+FATE_LAVF-$(call ENCDEC,  TTA,                   TTA)                += tta
 FATE_LAVF-$(call ENCDEC,  PCM_U8,                VOC)                += voc
 FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             VOC)                += voc_s16
 FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)                += wav
+FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)                += wav_peak
+FATE_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)                += wav_peak_only
+FATE_LAVF-$(call ENCMUX,  PCM_S16LE,             W64)                += w64
+FATE_LAVF-$(call ENCDEC,  MP2,                   WTV)                += wtv
+FATE_LAVF-$(call ENCDEC,  WAVPACK,               WV)                 += wv
+FATE_LAVF-$(call ENCDEC,  XBM,                   IMAGE2)             += xbm
 FATE_LAVF-$(call ENCDEC,  XWD,                   IMAGE2)             += xwd
 FATE_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                               += yuv4mpeg
 
 FATE_LAVF += $(FATE_LAVF-yes:%=fate-lavf-%)
-FATE_LAVF += fate-lavf-pixfmt
+FATE_LAVF_PIXFMT-$(CONFIG_SCALE_FILTER) += fate-lavf-pixfmt
+FATE_LAVF += $(FATE_LAVF_PIXFMT-yes)
 
 $(FATE_LAVF): $(AREF) $(VREF)
 $(FATE_LAVF): CMD = lavftest
+$(FATE_LAVF): CMP =
 
 FATE_AVCONV += $(FATE_LAVF)
 fate-lavf:     $(FATE_LAVF)
+
+FATE_LAVF_FATE-$(call ALLYES, MATROSKA_DEMUXER   OGG_MUXER)          += ogg_vp3
+FATE_LAVF_FATE-$(call ALLYES, MATROSKA_DEMUXER   OGV_MUXER)          += ogg_vp8
+FATE_LAVF_FATE-$(call ALLYES, MOV_DEMUXER        LATM_MUXER)         += latm
+FATE_LAVF_FATE-$(call ALLYES, MP3_DEMUXER        MP3_MUXER)          += mp3
+FATE_LAVF_FATE-$(call ALLYES, MOV_DEMUXER        MOV_MUXER)          += mov_qtrle_mace6
+FATE_LAVF_FATE-$(call ALLYES, AVI_DEMUXER        AVI_MUXER)          += avi_cram
+
+FATE_LAVF_FATE +=  $(FATE_LAVF_FATE-yes:%=fate-lavf-fate-%)
+$(FATE_LAVF_FATE): CMD = lavffatetest
+
+FATE_SAMPLES_FFMPEG += $(FATE_LAVF_FATE)
+fate-lavf-fate:        $(FATE_LAVF_FATE)
+
+tests/data/mp4-to-ts.m3u8: TAG = GEN
+tests/data/mp4-to-ts.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
+        -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 \
+        -f ssegment -segment_time 1 -map 0 -flags +bitexact -codec copy \
+        -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/mp4-to-ts-%03d.ts 2>/dev/null
+
+tests/data/adts-to-mkv.m3u8: TAG = GEN
+tests/data/adts-to-mkv.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
+        -i $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.m4a \
+        -f segment -segment_time 1 -map 0 -flags +bitexact -codec copy -segment_format_options live=1 \
+        -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/adts-to-mkv-%03d.mkv 2>/dev/null
+
+tests/data/adts-to-mkv-header.mkv: TAG = GEN
+tests/data/adts-to-mkv-header.mkv: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
+        -i $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.m4a \
+        -f segment -segment_time 1 -map 0 -flags +bitexact -codec copy -segment_format_options live=1 \
+        -segment_header_filename $(TARGET_PATH)/tests/data/adts-to-mkv-header.mkv \
+        -y $(TARGET_PATH)/tests/data/adts-to-mkv-header-%03d.mkv 2>/dev/null
+
+tests/data/adts-to-mkv-header-%.mkv: tests/data/adts-to-mkv-header.mkv ;
+
+FATE_SEGMENT_PARTS += 000 001 002
+
+tests/data/adts-to-mkv-cated-all.mkv: TAG = GEN
+tests/data/adts-to-mkv-cated-all.mkv: tests/data/adts-to-mkv-header.mkv $(FATE_SEGMENT_PARTS:%=tests/data/adts-to-mkv-header-%.mkv) | tests/data
+	$(M)cat $^ >$@
+
+tests/data/adts-to-mkv-cated-%.mkv: TAG = GEN
+tests/data/adts-to-mkv-cated-%.mkv: tests/data/adts-to-mkv-header.mkv tests/data/adts-to-mkv-header-%.mkv | tests/data
+	$(M)cat $^ >$@
+
+FATE_SEGMENT += fate-segment-mp4-to-ts
+fate-segment-mp4-to-ts: tests/data/mp4-to-ts.m3u8
+fate-segment-mp4-to-ts: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/mp4-to-ts.m3u8 -c copy
+FATE_SEGMENT-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF MPEGTS_MUXER MATROSKA_DEMUXER SEGMENT_MUXER HLS_DEMUXER) += fate-segment-mp4-to-ts
+
+FATE_SEGMENT += fate-segment-adts-to-mkv
+fate-segment-adts-to-mkv: tests/data/adts-to-mkv.m3u8
+fate-segment-adts-to-mkv: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/adts-to-mkv.m3u8 -c copy
+fate-segment-adts-to-mkv: REF = $(SRC_PATH)/tests/ref/fate/segment-adts-to-mkv-header-all
+FATE_SEGMENT-$(call ALLYES, AAC_DEMUXER AAC_ADTSTOASC_BSF MATROSKA_MUXER MATROSKA_DEMUXER SEGMENT_MUXER HLS_DEMUXER) += fate-segment-adts-to-mkv
+
+FATE_SEGMENT_ALLPARTS = $(FATE_SEGMENT_PARTS)
+FATE_SEGMENT_ALLPARTS += all
+FATE_SEGMENT_SPLIT += $(FATE_SEGMENT_ALLPARTS:%=fate-segment-adts-to-mkv-header-%)
+$(foreach N,$(FATE_SEGMENT_ALLPARTS),$(eval $(N:%=fate-segment-adts-to-mkv-header-%): tests/data/adts-to-mkv-cated-$(N).mkv))
+fate-segment-adts-to-mkv-header-%: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/$(@:fate-segment-adts-to-mkv-header-%=adts-to-mkv-cated-%).mkv -c copy
+FATE_SEGMENT-$(call ALLYES, AAC_DEMUXER AAC_ADTSTOASC_BSF MATROSKA_MUXER MATROSKA_DEMUXER SEGMENT_MUXER HLS_DEMUXER) += $(FATE_SEGMENT_SPLIT)
+
+FATE_SAMPLES_FFMPEG += $(FATE_SEGMENT-yes)
+
+fate-segment: $(FATE_SEGMENT-yes)
diff --git a/tests/fate/build.mak b/tests/fate/build.mak
index ba9768e786..f97f9ebe5c 100644
--- a/tests/fate/build.mak
+++ b/tests/fate/build.mak
@@ -13,5 +13,5 @@ fate-build-testprogs: testprogs
 $(FATE_BUILD): CMD = null
 $(FATE_BUILD): CMP = null
 
-FATE += $(FATE_BUILD)
+# FATE += $(FATE_BUILD)
 fate-build: $(FATE_BUILD)
diff --git a/tests/fate/canopus.mak b/tests/fate/canopus.mak
index 1f24a4c178..d419211303 100644
--- a/tests/fate/canopus.mak
+++ b/tests/fate/canopus.mak
@@ -8,7 +8,7 @@ fate-canopus-cllc-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-rgb.
 FATE_CANOPUS_CLLC += fate-canopus-cllc-yuy2-noblock
 fate-canopus-cllc-yuy2-noblock: CMD = framecrc -i $(TARGET_SAMPLES)/cllc/sample-cllc-yuy2-noblock.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CLLC) += $(FATE_CANOPUS_CLLC)
+FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, CLLC) += $(FATE_CANOPUS_CLLC)
 fate-canopus-cllc: $(FATE_CANOPUS_CLLC)
 
 #lossy
@@ -21,7 +21,7 @@ fate-canopus-hq_hqa-hqa: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqa.avi
 FATE_CANOPUS_HQ_HQA += fate-canopus-hq_hqa-inter
 fate-canopus-hq_hqa-inter: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hq25i.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, HQ_HQA) += $(FATE_CANOPUS_HQ_HQA)
+FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQ_HQA) += $(FATE_CANOPUS_HQ_HQA)
 fate-canopus-hq_hqa: $(FATE_CANOPUS_HQ_HQA)
 
 FATE_CANOPUS_HQX += fate-canopus-hqx422
@@ -30,5 +30,5 @@ fate-canopus-hqx422: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422.avi -pix
 FATE_CANOPUS_HQX += fate-canopus-hqx422a
 fate-canopus-hqx422a: CMD = framecrc -i $(TARGET_SAMPLES)/canopus/hqx422a.avi -pix_fmt yuv422p16be -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, HQX) += $(FATE_CANOPUS_HQX)
+FATE_SAMPLES_FFMPEG-$(call DEMDEC, AVI, HQX) += $(FATE_CANOPUS_HQX)
 fate-canopus-hqx: $(FATE_CANOPUS_HQX)
diff --git a/tests/fate/cbs.mak b/tests/fate/cbs.mak
new file mode 100644
index 0000000000..fc5967e6f3
--- /dev/null
+++ b/tests/fate/cbs.mak
@@ -0,0 +1,79 @@
+# Read/write tests: this uses the codec metadata filter - with no
+# arguments, it decomposes the stream fully and then recomposes it
+# without making any changes.
+
+fate-cbs: fate-cbs-h264 fate-cbs-hevc fate-cbs-mpeg2
+
+FATE_CBS_DEPS = $(call ALLYES, $(1)_DEMUXER $(1)_PARSER $(2)_METADATA_BSF $(3)_DECODER $(3)_MUXER)
+
+define FATE_CBS_TEST
+# (codec, test_name, sample_file, output_format)
+FATE_CBS_$(1) += fate-cbs-$(1)-$(2)
+fate-cbs-$(1)-$(2): CMD = md5 -i $(TARGET_SAMPLES)/$(3) -c:v copy -bsf:v $(1)_metadata -f $(4)
+endef
+
+# H.264 read/write
+
+FATE_CBS_H264_SAMPLES =   \
+    SVA_Base_B.264        \
+    BASQP1_Sony_C.jsv     \
+    FM1_BT_B.h264         \
+    CVFC1_Sony_C.jsv      \
+    AUD_MW_E.264          \
+    CVBS3_Sony_C.jsv      \
+    MR1_BT_A.h264         \
+    CVWP1_TOSHIBA_E.264   \
+    CVNLFI1_Sony_C.jsv    \
+    Sharp_MP_PAFF_1r2.jvt \
+    CVMANL1_TOSHIBA_B.264 \
+    sp1_bt_a.h264         \
+    CVSE2_Sony_B.jsv      \
+    CABACI3_Sony_B.jsv
+
+$(foreach N,$(FATE_CBS_H264_SAMPLES),$(eval $(call FATE_CBS_TEST,h264,$(basename $(N)),h264-conformance/$(N),h264)))
+
+FATE_CBS_H264-$(call FATE_CBS_DEPS, H264, H264, H264) = $(FATE_CBS_h264)
+FATE_SAMPLES_AVCONV += $(FATE_CBS_H264-yes)
+fate-cbs-h264: $(FATE_CBS_H264-yes)
+
+# H.265 read/write
+
+FATE_CBS_HEVC_SAMPLES =       \
+    STRUCT_A_Samsung_5.bit    \
+    WP_A_Toshiba_3.bit        \
+    SLIST_A_Sony_4.bit        \
+    SLIST_D_Sony_9.bit        \
+    CAINIT_E_SHARP_3.bit      \
+    CAINIT_H_SHARP_3.bit      \
+    TILES_B_Cisco_1.bit       \
+    WPP_A_ericsson_MAIN_2.bit \
+    WPP_F_ericsson_MAIN_2.bit \
+    ipcm_E_NEC_2.bit          \
+    NUT_A_ericsson_5.bit      \
+    PICSIZE_A_Bossen_1.bit    \
+    PICSIZE_B_Bossen_1.bit    \
+    RPS_A_docomo_4.bit        \
+    RPS_E_qualcomm_5.bit      \
+    LTRPSPS_A_Qualcomm_1.bit  \
+    RPLM_A_qualcomm_4.bit     \
+    CONFWIN_A_Sony_1.bit      \
+    HRD_A_Fujitsu_2.bit
+
+$(foreach N,$(FATE_CBS_HEVC_SAMPLES),$(eval $(call FATE_CBS_TEST,hevc,$(basename $(N)),hevc-conformance/$(N),hevc)))
+
+FATE_CBS_HEVC-$(call FATE_CBS_DEPS, HEVC, HEVC, HEVC) = $(FATE_CBS_hevc)
+FATE_SAMPLES_AVCONV += $(FATE_CBS_HEVC-yes)
+fate-cbs-hevc: $(FATE_CBS_HEVC-yes)
+
+# MPEG-2 read/write
+
+FATE_CBS_MPEG2_SAMPLES =     \
+    hhi_burst_422_short.bits \
+    sony-ct3.bs              \
+    tcela-6.bits
+
+$(foreach N,$(FATE_CBS_MPEG2_SAMPLES),$(eval $(call FATE_CBS_TEST,mpeg2,$(basename $(N)),mpeg2/$(N),mpeg2video)))
+
+FATE_CBS_MPEG2-$(call FATE_CBS_DEPS, MPEGVIDEO, MPEG2, MPEG2VIDEO) = $(FATE_CBS_mpeg2)
+FATE_SAMPLES_AVCONV += $(FATE_CBS_MPEG2-yes)
+fate-cbs-mpeg2: $(FATE_CBS_MPEG2-yes)
diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak
index 5721f1f53c..fbf60e9848 100644
--- a/tests/fate/checkasm.mak
+++ b/tests/fate/checkasm.mak
@@ -1,23 +1,34 @@
-FATE_CHECKASM = fate-checkasm-audiodsp                                  \
+FATE_CHECKASM = fate-checkasm-aacpsdsp                                  \
+                fate-checkasm-alacdsp                                   \
+                fate-checkasm-audiodsp                                  \
                 fate-checkasm-blockdsp                                  \
                 fate-checkasm-bswapdsp                                  \
-                fate-checkasm-dcadsp                                    \
+                fate-checkasm-exrdsp                                    \
+                fate-checkasm-fixed_dsp                                 \
+                fate-checkasm-flacdsp                                   \
+                fate-checkasm-float_dsp                                 \
                 fate-checkasm-fmtconvert                                \
+                fate-checkasm-g722dsp                                   \
                 fate-checkasm-h264dsp                                   \
                 fate-checkasm-h264pred                                  \
                 fate-checkasm-h264qpel                                  \
                 fate-checkasm-hevc_add_res                              \
                 fate-checkasm-hevc_idct                                 \
-                fate-checkasm-hevc_mc                                   \
-                fate-checkasm-huffyuvdsp                                \
+                fate-checkasm-jpeg2000dsp                               \
+                fate-checkasm-llviddsp                                  \
+                fate-checkasm-pixblockdsp                               \
+                fate-checkasm-sbrdsp                                    \
                 fate-checkasm-synth_filter                              \
                 fate-checkasm-v210enc                                   \
+                fate-checkasm-vf_blend                                  \
+                fate-checkasm-vf_colorspace                             \
+                fate-checkasm-videodsp                                  \
                 fate-checkasm-vp8dsp                                    \
                 fate-checkasm-vp9dsp                                    \
 
 $(FATE_CHECKASM): tests/checkasm/checkasm$(EXESUF)
 $(FATE_CHECKASM): CMD = run tests/checkasm/checkasm --test=$(@:fate-checkasm-%=%)
-$(FATE_CHECKASM): REF = /dev/null
+$(FATE_CHECKASM): CMP = null
 
 FATE-$(CONFIG_STATIC) += $(FATE_CHECKASM)
 fate-checkasm: $(FATE_CHECKASM)
diff --git a/tests/fate/concatdec.mak b/tests/fate/concatdec.mak
new file mode 100644
index 0000000000..988559d251
--- /dev/null
+++ b/tests/fate/concatdec.mak
@@ -0,0 +1,21 @@
+FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)   += mxf
+FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)   += mxf_d10
+
+FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS)      += ts
+
+FATE_CONCAT_DEMUXER_EXTENDED_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)  += mxf
+FATE_CONCAT_DEMUXER_EXTENDED_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)  += mxf_d10
+
+$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes),$(eval fate-concat-demuxer-simple1-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF) fate-lavf-$(D)))
+$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes),$(eval fate-concat-demuxer-simple1-lavf-$(D): CMD = concat $(SRC_PATH)/tests/simple1.ffconcat ../lavf/lavf.$(D)))
+FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) += $(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes:%=fate-concat-demuxer-simple1-lavf-%)
+
+$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-yes),$(eval fate-concat-demuxer-simple2-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF) fate-lavf-$(D)))
+$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-yes),$(eval fate-concat-demuxer-simple2-lavf-$(D): CMD = concat $(SRC_PATH)/tests/simple2.ffconcat ../lavf/lavf.$(D)))
+FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) += $(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-yes:%=fate-concat-demuxer-simple2-lavf-%)
+
+$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes),$(eval fate-concat-demuxer-extended-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF) fate-lavf-$(D)))
+$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes),$(eval fate-concat-demuxer-extended-lavf-$(D): CMD = concat $(SRC_PATH)/tests/extended.ffconcat ../lavf/lavf.$(D) md5))
+FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) += $(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes:%=fate-concat-demuxer-extended-lavf-%)
+
+FATE-$(CONFIG_FFPROBE) += $(FATE_CONCAT_DEMUXER-yes)
diff --git a/tests/fate/cover-art.mak b/tests/fate/cover-art.mak
index 54dc0ba777..721c650b78 100644
--- a/tests/fate/cover-art.mak
+++ b/tests/fate/cover-art.mak
@@ -1,35 +1,38 @@
-FATE_COVER_ART += fate-cover-art-ape
+FATE_COVER_ART-$(CONFIG_APE_DEMUXER) += fate-cover-art-ape
 fate-cover-art-ape: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/luckynight_cover.ape -an -c:v copy -f rawvideo
 fate-cover-art-ape: REF = 45333c983c45af54449dff10af144317
 
-FATE_COVER_ART += fate-cover-art-flac
+FATE_COVER_ART-$(CONFIG_FLAC_DEMUXER) += fate-cover-art-flac
 fate-cover-art-flac: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/cover_art.flac -an -c:v copy -f rawvideo
 fate-cover-art-flac: REF = 0de1fc6200596fa32b8f7300a14c0261
 
-FATE_COVER_ART += fate-cover-art-m4a
+FATE_COVER_ART-$(CONFIG_MOV_DEMUXER) += fate-cover-art-m4a
 fate-cover-art-m4a: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a -an -c:v copy -f rawvideo
 fate-cover-art-m4a: REF = 08ba70a3b594ff6345a93965e96a9d3e
 
-FATE_COVER_ART += fate-cover-art-ogg
-fate-cover-art-ogg: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus -an -c:v copy -f rawvideo
-fate-cover-art-ogg: REF = b796d33363dbfed1868523b5c751b7b1
+FATE_COVER_ART-$(CONFIG_OGG_DEMUXER) += fate-cover-art-ogg
+fate-cover-art-ogg: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/ogg_vorbiscomment_cover.opus -map 0:v -c:v copy -f rawvideo
+fate-cover-art-ogg: REF = 7f117e073620eabb4ed02680cf70af41
 
-FATE_COVER_ART += fate-cover-art-wma
+FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma
 fate-cover-art-wma: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/Californication_cover.wma -an -c:v copy -f rawvideo
 fate-cover-art-wma: REF = 0808bd0e1b61542a16e1906812dd924b
 
-FATE_COVER_ART += fate-cover-art-wma-id3
+FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma-id3
 fate-cover-art-wma-id3: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/wma_with_ID3_APIC_trimmed.wma -an -c:v copy -f rawvideo
 fate-cover-art-wma-id3: REF = e6a8dd03687d5178bc13fc7d3316696e
 
-FATE_COVER_ART += fate-cover-art-wma-metadatalib
+FATE_COVER_ART-$(CONFIG_ASF_DEMUXER) += fate-cover-art-wma-metadatalib
 fate-cover-art-wma-metadatalib: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/wma_with_metadata_library_object_tag_trimmed.wma -map 0:v -c:v copy -f rawvideo
 fate-cover-art-wma-metadatalib: REF = 32e8bd4fad546f63d881a0256f083aea
 
-FATE_COVER_ART += fate-cover-art-wv
+FATE_COVER_ART-$(CONFIG_WV_DEMUXER) += fate-cover-art-wv
 fate-cover-art-wv: CMD = md5 -i $(TARGET_SAMPLES)/cover_art/luckynight_cover.wv -an -c:v copy -f rawvideo
 fate-cover-art-wv: REF = 45333c983c45af54449dff10af144317
 
+FCA_TEMP-$(call ALLYES, RAWVIDEO_MUXER FILE_PROTOCOL) = $(FATE_COVER_ART-yes)
+FATE_COVER_ART = $(FCA_TEMP-yes)
+
 $(FATE_COVER_ART): CMP = oneline
 FATE_SAMPLES_AVCONV += $(FATE_COVER_ART)
 fate-cover-art: $(FATE_COVER_ART)
diff --git a/tests/fate/dca.mak b/tests/fate/dca.mak
new file mode 100644
index 0000000000..b1681c6b59
--- /dev/null
+++ b/tests/fate/dca.mak
@@ -0,0 +1,79 @@
+# dcadec test samples
+DCADEC_SUITE_LOSSLESS_16 = xll_51_16_192_768_0        \
+                           xll_51_16_192_768_1        \
+
+DCADEC_SUITE_LOSSLESS_24 = xll_51_24_48_768           \
+                           xll_51_24_48_none          \
+                           xll_71_24_48_768_0         \
+                           xll_71_24_48_768_1         \
+                           xll_71_24_96_768           \
+                           xll_x96_51_24_96_1509      \
+                           xll_xch_61_24_48_768       \
+
+DCADEC_SUITE_LOSSY       = core_51_24_48_768_0        \
+                           core_51_24_48_768_1        \
+                           x96_51_24_96_1509          \
+                           x96_xch_61_24_96_3840      \
+                           x96_xxch_71_24_96_3840     \
+                           xbr_51_24_48_3840          \
+                           xbr_xch_61_24_48_3840      \
+                           xbr_xxch_71_24_48_3840     \
+                           xch_61_24_48_768           \
+                           xxch_71_24_48_2046         \
+
+define FATE_DCADEC_LOSSLESS_SUITE
+FATE_DCADEC_LOSSLESS += fate-dca-$(1) fate-dca-$(1)-dmix_2 fate-dca-$(1)-dmix_6
+fate-dca-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/dts/dcadec-suite/$(1).dtshd -c:a pcm_$(2)
+fate-dca-$(1)-dmix_2: CMD = framemd5 -request_channel_layout 0x3   -i $(TARGET_SAMPLES)/dts/dcadec-suite/$(1).dtshd -c:a pcm_$(2)
+fate-dca-$(1)-dmix_6: CMD = framemd5 -request_channel_layout 0x60f -i $(TARGET_SAMPLES)/dts/dcadec-suite/$(1).dtshd -c:a pcm_$(2)
+endef
+
+define FATE_DCADEC_LOSSY_SUITE
+FATE_DCADEC_LOSSY += fate-dca-$(1)
+fate-dca-$(1): CMD = ffmpeg -i $(TARGET_SAMPLES)/dts/dcadec-suite/$(1).dtshd -f f32le -
+fate-dca-$(1): REF = $(SAMPLES)/dts/dcadec-suite/$(1).f32
+endef
+
+$(foreach N,$(DCADEC_SUITE_LOSSLESS_16),$(eval $(call FATE_DCADEC_LOSSLESS_SUITE,$(N),s16le)))
+$(foreach N,$(DCADEC_SUITE_LOSSLESS_24),$(eval $(call FATE_DCADEC_LOSSLESS_SUITE,$(N),s24le)))
+$(foreach N,$(DCADEC_SUITE_LOSSY),$(eval $(call FATE_DCADEC_LOSSY_SUITE,$(N))))
+
+# lossy downmix tests
+FATE_DCADEC_LOSSY += fate-dca-core_51_24_48_768_1-dmix_2
+fate-dca-core_51_24_48_768_1-dmix_2: CMD = ffmpeg -request_channel_layout 0x3 -i $(TARGET_SAMPLES)/dts/dcadec-suite/core_51_24_48_768_1.dtshd -f f32le -
+fate-dca-core_51_24_48_768_1-dmix_2: REF = $(SAMPLES)/dts/dcadec-suite/core_51_24_48_768_1-dmix_2.f32
+
+FATE_DCADEC_LOSSY += fate-dca-x96_xxch_71_24_96_3840-dmix_2
+fate-dca-x96_xxch_71_24_96_3840-dmix_2: CMD = ffmpeg -request_channel_layout 0x3 -i $(TARGET_SAMPLES)/dts/dcadec-suite/x96_xxch_71_24_96_3840.dtshd -f f32le -
+# intentionally uses the dmix_6 reference because the sample does not contain stereo downmix coefficients
+fate-dca-x96_xxch_71_24_96_3840-dmix_2: REF = $(SAMPLES)/dts/dcadec-suite/x96_xxch_71_24_96_3840-dmix_6.f32
+
+FATE_DCADEC_LOSSY += fate-dca-x96_xxch_71_24_96_3840-dmix_6
+fate-dca-x96_xxch_71_24_96_3840-dmix_6: CMD = ffmpeg -request_channel_layout 0x60f -i $(TARGET_SAMPLES)/dts/dcadec-suite/x96_xxch_71_24_96_3840.dtshd -f f32le -
+fate-dca-x96_xxch_71_24_96_3840-dmix_6: REF = $(SAMPLES)/dts/dcadec-suite/x96_xxch_71_24_96_3840-dmix_6.f32
+
+FATE_DCADEC_LOSSY += fate-dca-xch_61_24_48_768-dmix_6
+fate-dca-xch_61_24_48_768-dmix_6: CMD = ffmpeg -request_channel_layout 0x60f -i $(TARGET_SAMPLES)/dts/dcadec-suite/xch_61_24_48_768.dtshd -f f32le -
+fate-dca-xch_61_24_48_768-dmix_6: REF = $(SAMPLES)/dts/dcadec-suite/xch_61_24_48_768-dmix_6.f32
+
+$(FATE_DCADEC_LOSSY): CMP = oneoff
+$(FATE_DCADEC_LOSSY): CMP_UNIT = f32
+$(FATE_DCADEC_LOSSY): FUZZ = 9
+
+FATE_DCA-$(call DEMDEC, DTSHD, DCA) += $(FATE_DCADEC_LOSSLESS) $(FATE_DCADEC_LOSSY)
+
+FATE_DCA-$(call DEMDEC, MPEGTS, DCA) += fate-dca-core
+fate-dca-core: CMD = pcm -i $(TARGET_SAMPLES)/dts/dts.ts
+fate-dca-core: CMP = oneoff
+fate-dca-core: REF = $(SAMPLES)/dts/dts.pcm
+
+FATE_DCA-$(call DEMDEC, DTS, DCA) += fate-dca-xll
+fate-dca-xll: CMD = md5 -i $(TARGET_SAMPLES)/dts/master_audio_7.1_24bit.dts -f s24le
+
+FATE_DCA-$(call DEMDEC, DTS, DCA) += fate-dts_es
+fate-dts_es: CMD = pcm -i $(TARGET_SAMPLES)/dts/dts_es.dts
+fate-dts_es: CMP = oneoff
+fate-dts_es: REF = $(SAMPLES)/dts/dts_es_2.pcm
+
+FATE_SAMPLES_AUDIO += $(FATE_DCA-yes)
+fate-dca: $(FATE_DCA-yes)
diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
index 44c4d6efa4..9427ac30c8 100644
--- a/tests/fate/demux.mak
+++ b/tests/fate/demux.mak
@@ -1,71 +1,151 @@
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AAC, AAC) += fate-adts-demux
+FATE_SAMPLES_DEMUX-$(call DEMDEC, AVI, FRAPS) += fate-avio-direct
+fate-avio-direct: CMD = framecrc -avioflags direct -i $(TARGET_SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -avioflags direct
+
+FATE_SAMPLES_DEMUX-$(call DEMDEC, AAC, AAC) += fate-adts-demux fate-adts-id3v1-demux
 fate-adts-demux: CMD = crc -i $(TARGET_SAMPLES)/aac/ct_faac-adts.aac -c:a copy
+fate-adts-id3v1-demux: CMD = framecrc -f aac -i $(TARGET_SAMPLES)/aac/id3v1.aac -c:a copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_AEA_DEMUXER) += fate-aea-demux
+FATE_SAMPLES_DEMUX-$(CONFIG_AEA_DEMUXER) += fate-aea-demux
 fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -c:a copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_BINK_DEMUXER) += fate-bink-demux
+FATE_SAMPLES_DEMUX-$(CONFIG_AST_DEMUXER) += fate-ast
+fate-ast: CMD = crc -i $(TARGET_SAMPLES)/ast/demo11_02_partial.ast -c copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_BINK_DEMUXER) += fate-bink-demux
 fate-bink-demux: CMD = crc -i $(TARGET_SAMPLES)/bink/Snd0a7d9b58.dee -vn -c:a copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_CAF_DEMUXER) += fate-caf
+FATE_SAMPLES_DEMUX-$(CONFIG_BFSTM_DEMUXER) += fate-bfstm fate-bcstm
+fate-bfstm: CMD = crc -i $(TARGET_SAMPLES)/bfstm/spl-forest-day.bfstm -c:a copy
+fate-bcstm: CMD = crc -i $(TARGET_SAMPLES)/bfstm/loz-mm-mikau.bcstm -c:a copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_BRSTM_DEMUXER) += fate-brstm
+fate-brstm: CMD = crc -i $(TARGET_SAMPLES)/brstm/lozswd_partial.brstm -c:a copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_CAF_DEMUXER) += fate-caf
 fate-caf: CMD = crc -i $(TARGET_SAMPLES)/caf/caf-pcm16.caf -c copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_CDXL_DEMUXER) += fate-cdxl-demux
-fate-cdxl-demux: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl -c copy
+FATE_SAMPLES_DEMUX-$(CONFIG_CDXL_DEMUXER) += fate-cdxl-demux
+fate-cdxl-demux: CMD = framecrc -i $(TARGET_SAMPLES)/cdxl/mirage.cdxl -c:v copy -c:a copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_DAUD_DEMUXER) += fate-d-cinema-demux
+FATE_SAMPLES_DEMUX-$(CONFIG_CINE_DEMUXER) += fate-cine-demux
+fate-cine-demux: CMD = crc -i $(TARGET_SAMPLES)/cine/bayer_gbrg8.cine -c copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_DAUD_DEMUXER) += fate-d-cinema-demux
 fate-d-cinema-demux: CMD = framecrc -i $(TARGET_SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -c:a copy
 
-FATE_SAMPLES_AVCONV-$(call ALLYES, IV8_DEMUXER MPEG4VIDEO_PARSER) += fate-iv8-demux
+FATE_SAMPLES_DEMUX-$(CONFIG_EA_DEMUXER) += fate-d-eavp6-demux
+fate-d-eavp6-demux: CMD = framecrc -i $(TARGET_SAMPLES)/ea-vp6/SmallRing.vp6 -map 0 -c:v copy
+
+FATE_SAMPLES_DEMUX-$(call ALLYES, GIF_DEMUXER FITS_DEMUXER GIF_DECODER FITS_ENCODER FITS_MUXER) += fate-fits-demux
+fate-fits-demux: tests/data/fits-multi.fits
+fate-fits-demux: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -c:v copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_FLV_DEMUXER) += fate-flv-demux
+fate-flv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/flv/Enigma_Principles_of_Lust-part.flv -codec copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_GIF_DEMUXER) += fate-gif-demux
+fate-gif-demux: CMD = framecrc -i $(TARGET_SAMPLES)/gif/Newtons_cradle_animation_book_2.gif -c:v copy
+
+FATE_SAMPLES_DEMUX-$(call ALLYES, IV8_DEMUXER MPEG4VIDEO_PARSER) += fate-iv8-demux
 fate-iv8-demux: CMD = framecrc -i $(TARGET_SAMPLES)/iv8/zzz-partial.mpg -c:v copy
 
-FATE_SAMPLES_AVCONV-$(call ALLYES, LMLM4_DEMUXER MPEG4VIDEO_PARSER) += fate-lmlm4-demux
-fate-lmlm4-demux: CMD = framecrc -i $(TARGET_SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -c copy
+FATE_SAMPLES_DEMUX-$(CONFIG_JV_DEMUXER) += fate-jv-demux
+fate-jv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -c:v copy -c:a copy
+
+FATE_SAMPLES_DEMUX-$(call ALLYES, LMLM4_DEMUXER MPEG4VIDEO_PARSER) += fate-lmlm4-demux
+fate-lmlm4-demux: CMD = framecrc -i $(TARGET_SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -c:a copy -c:v copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_XA_DEMUXER) += fate-maxis-xa
+FATE_SAMPLES_DEMUX-$(CONFIG_XA_DEMUXER) += fate-maxis-xa
 fate-maxis-xa: CMD = framecrc -i $(TARGET_SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -c:a copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_MTV_DEMUXER) += fate-mtv
+FATE_SAMPLES_DEMUX-$(call DEMDEC, MATROSKA, H264) += fate-mkv
+fate-mkv: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/test7_cut.mkv -c copy
+
+#No dts errors or duplicate DTS should be in this
+FATE_SAMPLES_DEMUX-$(call DEMDEC, MATROSKA, H264) += fate-mkv-1242
+fate-mkv-1242: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/1242-small.mkv -c copy -frames:v 11
+
+FATE_SAMPLES_DEMUX-$(CONFIG_MLV_DEMUXER) += fate-mlv-demux
+fate-mlv-demux: CMD = crc -i $(TARGET_SAMPLES)/mlv/M19-0333-cut.MLV -c copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_MOV_DEMUXER) += fate-mov-mp3-demux
+fate-mov-mp3-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mpegaudio/packed_maindata.mp3.mp4 -c copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-opus-demux
+fate-ts-opus-demux: CMD = framecrc -i $(TARGET_SAMPLES)/opus/test-8-7.1.opus-small.ts -c copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_MTV_DEMUXER) += fate-mtv
 fate-mtv: CMD = framecrc -i $(TARGET_SAMPLES)/mtv/comedian_auto-partial.mtv -c copy
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MXF, MPEG4) += fate-mxf-demux
-fate-mxf-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mxf/C0023S01.mxf -c copy
+FATE_SAMPLES_DEMUX-$(call DEMDEC, MXF, MPEG4) += fate-mxf-demux
+fate-mxf-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mxf/C0023S01.mxf -c:a copy -c:v copy
 
-FATE_SAMPLES_AVCONV-$(call ALLYES, NC_DEMUXER MPEG4VIDEO_PARSER) += fate-nc-demux
+FATE_SAMPLES_DEMUX-$(call ALLYES, NC_DEMUXER MPEG4VIDEO_PARSER) += fate-nc-demux
 fate-nc-demux: CMD = framecrc -i $(TARGET_SAMPLES)/nc-camera/nc-sample-partial -c:v copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_NSV_DEMUXER) += fate-nsv-demux
-fate-nsv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -c copy
+FATE_SAMPLES_DEMUX-$(CONFIG_NISTSPHERE_DEMUXER) += fate-nistsphere-demux
+fate-nistsphere-demux: CMD = crc -i $(TARGET_SAMPLES)/nistsphere/nist-ulaw.nist -c:a copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_NSV_DEMUXER) += fate-nsv-demux
+fate-nsv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -c:v copy -c:a copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_OMA_DEMUXER) += fate-oma-demux
+FATE_SAMPLES_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggopus-demux
+fate-oggopus-demux: CMD = framecrc -i $(TARGET_SAMPLES)/ogg/intro-partial.opus -c:a copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_OGG_DEMUXER) += fate-oggvp8-demux
+fate-oggvp8-demux: CMD = framecrc -i $(TARGET_SAMPLES)/ogg/videotest.ogv -c:v copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_OMA_DEMUXER) += fate-oma-demux
 fate-oma-demux: CMD = crc -i $(TARGET_SAMPLES)/oma/01-Untitled-partial.oma -c:a copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_STR_DEMUXER) += fate-psx-str-demux
+FATE_SAMPLES_DEMUX-$(CONFIG_PAF_DEMUXER) += fate-paf-demux
+fate-paf-demux: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -c:v copy -c:a copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_PMP_DEMUXER) += fate-pmp-demux
+fate-pmp-demux: CMD = framecrc -i $(TARGET_SAMPLES)/pmp/demo.pmp -vn -c:a copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_RSD_DEMUXER) += fate-rsd-demux
+fate-rsd-demux: CMD = crc -i $(TARGET_SAMPLES)/rsd/hum01_partial.rsd -c:a copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_REDSPARK_DEMUXER) += fate-redspark-demux
+fate-redspark-demux: CMD = crc -i $(TARGET_SAMPLES)/redspark/jingle04_partial.rsd -c:a copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_STR_DEMUXER) += fate-psx-str-demux
 fate-psx-str-demux: CMD = framecrc -i $(TARGET_SAMPLES)/psx-str/descent-partial.str -c copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_PVA_DEMUXER) += fate-pva-demux
-fate-pva-demux: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -c:a copy -vn
+FATE_SAMPLES_DEMUX-$(CONFIG_PVA_DEMUXER) += fate-pva-demux
+fate-pva-demux: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -c:a copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_QCP_DEMUXER) += fate-qcp-demux
+FATE_SAMPLES_DEMUX-$(CONFIG_QCP_DEMUXER) += fate-qcp-demux
 fate-qcp-demux: CMD = crc -i $(TARGET_SAMPLES)/qcp/0036580847.QCP -c:a copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_R3D_DEMUXER) += fate-redcode-demux
-fate-redcode-demux: CMD = framecrc -i $(TARGET_SAMPLES)/r3d/4MB-sample.r3d -c copy
+FATE_SAMPLES_DEMUX-$(CONFIG_R3D_DEMUXER) += fate-redcode-demux
+fate-redcode-demux: CMD = framecrc -i $(TARGET_SAMPLES)/r3d/4MB-sample.r3d -c:v copy -c:a copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_SIFF_DEMUXER) += fate-siff-demux
+FATE_SAMPLES_DEMUX-$(CONFIG_SIFF_DEMUXER) += fate-siff-demux
 fate-siff-demux: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -c copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_SMJPEG_DEMUXER) += fate-smjpeg-demux
+FATE_SAMPLES_DEMUX-$(CONFIG_SMJPEG_DEMUXER) += fate-smjpeg-demux
 fate-smjpeg-demux: CMD = framecrc -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -c copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_WSAUD_DEMUXER) += fate-westwood-aud
+FATE_SAMPLES_DEMUX-$(CONFIG_WAV_DEMUXER) += fate-wav-ac3
+fate-wav-ac3: CMD = framecrc -i $(TARGET_SAMPLES)/ac3/diatonis_invisible_order_anfos_ac3-small.wav -c copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_WSAUD_DEMUXER) += fate-westwood-aud
 fate-westwood-aud: CMD = framecrc -i $(TARGET_SAMPLES)/westwood-aud/excellent.aud -c copy
 
-FATE_SAMPLES_AVCONV-$(call ALLYES, WTV_DEMUXER MPEGVIDEO_PARSER) += fate-wtv-demux
-fate-wtv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/wtv/law-and-order-partial.wtv -c copy
+FATE_SAMPLES_DEMUX-$(call ALLYES, WTV_DEMUXER MPEGVIDEO_PARSER) += fate-wtv-demux
+fate-wtv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/wtv/law-and-order-partial.wtv -c:v copy -c:a copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_XMV_DEMUXER) += fate-xmv-demux
-fate-xmv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/xmv/logos1p.fmv -c copy
+FATE_SAMPLES_DEMUX-$(CONFIG_XMV_DEMUXER) += fate-xmv-demux
+fate-xmv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/xmv/logos1p.fmv -c:v copy -c:a copy
 
-FATE_SAMPLES_AVCONV-$(CONFIG_XWMA_DEMUXER) += fate-xwma-demux
+FATE_SAMPLES_DEMUX-$(CONFIG_XWMA_DEMUXER) += fate-xwma-demux
 fate-xwma-demux: CMD = crc -i $(TARGET_SAMPLES)/xwma/ergon.xwma -c:a copy
+
+FATE_SAMPLES_DEMUX-$(CONFIG_MPEGTS_DEMUXER) += fate-ts-demux
+fate-ts-demux: CMD = framecrc -i $(TARGET_SAMPLES)/ac3/mp3ac325-4864-small.ts -codec copy
+
+FATE_SAMPLES_DEMUX += $(FATE_SAMPLES_DEMUX-yes)
+FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_DEMUX)
+fate-demux: $(FATE_SAMPLES_DEMUX)
diff --git a/tests/fate/dnxhd.mak b/tests/fate/dnxhd.mak
new file mode 100644
index 0000000000..60bfd34ba4
--- /dev/null
+++ b/tests/fate/dnxhd.mak
@@ -0,0 +1,22 @@
+FATE_DNXHD = fate-dnxhd-mbaff     \
+             fate-dnxhr-444       \
+             fate-dnxhr-12bit     \
+             fate-dnxhr-parse     \
+             fate-dnxhr-prefix1   \
+             fate-dnxhr-prefix2   \
+             fate-dnxhr-prefix3   \
+             fate-dnxhr-prefix4   \
+             fate-dnxhr-prefix5
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, DNXHD) += $(FATE_DNXHD)
+fate-dnxhd: $(FATE_DNXHD) $(FATE_VCODEC_DNXHD)
+
+fate-dnxhd-mbaff: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/dnxhd100_cid1260.mov -pix_fmt yuv422p10le
+fate-dnxhr-444:   CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/dnxhr444_cid1270.mov -pix_fmt yuv444p10le
+fate-dnxhr-12bit: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/dnxhr_cid1271_12bit.mov -pix_fmt yuv422p12le
+fate-dnxhr-parse: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/dnxhr_cid1274.dnxhr -pix_fmt yuv422p
+fate-dnxhr-prefix1: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/prefix-256x1536.dnxhr -pix_fmt yuv422p
+fate-dnxhr-prefix2: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/prefix-256x1716.dnxhr -pix_fmt yuv422p
+fate-dnxhr-prefix3: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/prefix-256x2048.dnxhr -pix_fmt yuv422p
+fate-dnxhr-prefix4: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/prefix-256x2160.dnxhr -pix_fmt yuv422p
+fate-dnxhr-prefix5: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/dnxhd/prefix-256x3212.dnxhr -pix_fmt yuv422p
diff --git a/tests/fate/ea.mak b/tests/fate/ea.mak
index 2bffd47b70..9de671ce6b 100644
--- a/tests/fate/ea.mak
+++ b/tests/fate/ea.mak
@@ -1,13 +1,13 @@
-FATE_SAMPLES_AVCONV-$(call DEMDEC, EA_CDATA, ADPCM_EA_XAS) += fate-ea-cdata
+FATE_SAMPLES_EA-$(call DEMDEC, EA_CDATA, ADPCM_EA_XAS) += fate-ea-cdata
 fate-ea-cdata: CMD = md5 -i $(TARGET_SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EACMV) += fate-ea-cmv
+FATE_SAMPLES_EA-$(call DEMDEC, EA, EACMV) += fate-ea-cmv
 fate-ea-cmv: CMD = framecrc -i $(TARGET_SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EAMAD) += fate-ea-mad
+FATE_SAMPLES_EA-$(call DEMDEC, EA, EAMAD) += fate-ea-mad
 fate-ea-mad: CMD = framecrc -i $(TARGET_SAMPLES)/ea-mad/NFS6LogoE.mad -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EATGQ) += fate-ea-tgq
+FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGQ) += fate-ea-tgq
 fate-ea-tgq: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgq/v27.tgq -an
 
 FATE_EA_TGV += fate-ea-tgv-1
@@ -16,8 +16,11 @@ fate-ea-tgv-1: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTRO8K-partial.TGV -p
 FATE_EA_TGV += fate-ea-tgv-2
 fate-ea-tgv-2: CMD = framecrc -i $(TARGET_SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EATGV) += $(FATE_EA_TGV)
+FATE_SAMPLES_EA-$(call DEMDEC, EA, EATGV) += $(FATE_EA_TGV)
 fate-ea-tgv: $(FATE_EA_TGV)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, EATQI) += fate-ea-tqi
+FATE_SAMPLES_EA-$(call DEMDEC, EA, EATQI) += fate-ea-tqi
 fate-ea-tqi: CMD = framecrc -i $(TARGET_SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an
+
+FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_EA-yes)
+fate-ea: $(FATE_SAMPLES_EA-yes)
diff --git a/tests/fate/exif.mak b/tests/fate/exif.mak
new file mode 100644
index 0000000000..da5dae8d5e
--- /dev/null
+++ b/tests/fate/exif.mak
@@ -0,0 +1,18 @@
+# test exif metadata in TIFF images
+FATE_SAMPLES_EXIF-$(call DEMDEC, IMAGE2, TIFF) += fate-exif-image-tiff
+fate-exif-image-tiff: CMD = probeframes $(TARGET_SAMPLES)/exif/image_small.tiff
+
+# test exif metadata in JPG images
+FATE_SAMPLES_EXIF-$(call DEMDEC, IMAGE2, MJPEG) += fate-exif-image-jpg
+fate-exif-image-jpg: CMD = probeframes $(TARGET_SAMPLES)/exif/image_small.jpg
+
+# test exif metadata in WebP images
+FATE_SAMPLES_EXIF-$(call DEMDEC, IMAGE2, WEBP) += fate-exif-image-webp
+fate-exif-image-webp: CMD = probeframes $(TARGET_SAMPLES)/exif/image_small.webp
+
+# test exif metadata in MP3 with embedded JPEG images
+FATE_SAMPLES_EXIF-$(call ALLYES, MP3_DEMUXER IMAGE2_DEMUXER MJPEG_DECODER) += fate-exif-image-embedded
+fate-exif-image-embedded: CMD = probeframes $(TARGET_SAMPLES)/exif/embedded_small.mp3
+
+# add all -yes targets to the tested targets
+FATE_SAMPLES_FFPROBE += $(FATE_SAMPLES_EXIF-yes)
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak
new file mode 100644
index 0000000000..a806c05d45
--- /dev/null
+++ b/tests/fate/ffmpeg.mak
@@ -0,0 +1,148 @@
+FATE_MAPCHAN-$(CONFIG_CHANNELMAP_FILTER) += fate-mapchan-6ch-extract-2
+fate-mapchan-6ch-extract-2: tests/data/asynth-22050-6.wav
+fate-mapchan-6ch-extract-2: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.0 -fflags +bitexact -f wav md5: -map_channel 0.0.1 -fflags +bitexact -f wav md5:
+
+FATE_MAPCHAN-$(CONFIG_CHANNELMAP_FILTER) += fate-mapchan-6ch-extract-2-downmix-mono
+fate-mapchan-6ch-extract-2-downmix-mono: tests/data/asynth-22050-6.wav
+fate-mapchan-6ch-extract-2-downmix-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-6.wav -map_channel 0.0.1 -map_channel 0.0.0 -ac 1 -fflags +bitexact -f wav
+
+FATE_MAPCHAN-$(CONFIG_CHANNELMAP_FILTER) += fate-mapchan-silent-mono
+fate-mapchan-silent-mono: tests/data/asynth-22050-1.wav
+fate-mapchan-silent-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-1.wav -map_channel -1 -map_channel 0.0.0 -fflags +bitexact -f wav
+
+FATE_MAPCHAN-$(CONFIG_CHANNELMAP_FILTER) += fate-mapchan-2ch-extract-ch0-ch2-trailing
+fate-mapchan-2ch-extract-ch0-ch2-trailing: tests/data/asynth-44100-2.wav
+fate-mapchan-2ch-extract-ch0-ch2-trailing: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-44100-2.wav -map_channel 0.0.0 -map_channel 0.0.2? -fflags +bitexact -f wav
+
+FATE_MAPCHAN-$(CONFIG_CHANNELMAP_FILTER) += fate-mapchan-3ch-extract-ch0-ch2-trailing
+fate-mapchan-3ch-extract-ch0-ch2-trailing: tests/data/asynth-44100-3.wav
+fate-mapchan-3ch-extract-ch0-ch2-trailing: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-44100-3.wav -map_channel 0.0.0 -map_channel 0.0.2? -fflags +bitexact -f wav
+
+FATE_MAPCHAN = $(FATE_MAPCHAN-yes)
+
+FATE_FFMPEG += $(FATE_MAPCHAN)
+fate-mapchan: $(FATE_MAPCHAN)
+
+FATE_FFMPEG-$(CONFIG_COLOR_FILTER) += fate-ffmpeg-filter_complex
+fate-ffmpeg-filter_complex: CMD = framecrc -filter_complex color=d=1:r=5 -fflags +bitexact
+
+# Ticket 6603
+FATE_FFMPEG-$(call ALLYES, AEVALSRC_FILTER ASETNSAMPLES_FILTER AC3_FIXED_ENCODER) += fate-ffmpeg-filter_complex_audio
+fate-ffmpeg-filter_complex_audio: CMD = framecrc -filter_complex "aevalsrc=0:d=0.1,asetnsamples=1537" -c ac3_fixed
+
+# Ticket 6375
+FATE_SAMPLES_FFMPEG-$(call ALLYES, MOV_DEMUXER PNG_DECODER ALAC_DECODER ALAC_ENCODER) += fate-ffmpeg-attached_pics
+fate-ffmpeg-attached_pics: CMD = threads=2 framecrc -i $(TARGET_SAMPLES)/lossless-audio/inside.m4a -acodec alac -max_muxing_queue_size 16
+
+FATE_SAMPLES_FFMPEG-$(CONFIG_COLORKEY_FILTER) += fate-ffmpeg-filter_colorkey
+fate-ffmpeg-filter_colorkey: tests/data/filtergraphs/colorkey
+fate-ffmpeg-filter_colorkey: CMD = framecrc -idct simple -fflags +bitexact -flags +bitexact  -sws_flags +accurate_rnd+bitexact -i $(TARGET_SAMPLES)/cavs/cavs.mpg -fflags +bitexact -flags +bitexact -sws_flags +accurate_rnd+bitexact -i $(TARGET_SAMPLES)/lena.pnm -an -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/colorkey -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -qscale 2 -frames:v 10
+
+FATE_FFMPEG-$(CONFIG_COLOR_FILTER) += fate-ffmpeg-lavfi
+fate-ffmpeg-lavfi: CMD = framecrc -lavfi color=d=1:r=5 -fflags +bitexact
+
+FATE_SAMPLES_FFMPEG-$(CONFIG_RAWVIDEO_DEMUXER) += fate-force_key_frames
+fate-force_key_frames: tests/data/vsynth_lena.yuv
+fate-force_key_frames: CMD = enc_dec \
+  "rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth_lena.yuv \
+  avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \
+  framecrc "" "" "-skip_frame nokey"
+
+FATE_SAMPLES_FFMPEG-$(call ALLYES, VOBSUB_DEMUXER DVDSUB_DECODER AVFILTER OVERLAY_FILTER DVDSUB_ENCODER) += fate-sub2video
+fate-sub2video: tests/data/vsynth_lena.yuv
+fate-sub2video: CMD = framecrc \
+  -f rawvideo -r 5 -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv \
+  -ss 132 -i $(TARGET_SAMPLES)/sub/vobsub.idx \
+  -filter_complex "sws_flags=+accurate_rnd+bitexact\;[0:0]scale=720:480[v]\;[v][1:0]overlay[v2]" \
+  -map "[v2]" -c:v rawvideo -map 1:s -c:s dvdsub
+
+FATE_FFMPEG-$(call ALLYES, PCM_S16LE_DEMUXER PCM_S16LE_MUXER PCM_S16LE_DECODER PCM_S16LE_ENCODER) += fate-unknown_layout-pcm
+fate-unknown_layout-pcm: $(AREF)
+fate-unknown_layout-pcm: CMD = md5 \
+  -guess_layout_max 0 -f s16le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) -f s16le
+
+FATE_FFMPEG-$(call ALLYES, PCM_S16LE_DEMUXER AC3_MUXER PCM_S16LE_DECODER AC3_FIXED_ENCODER) += fate-unknown_layout-ac3
+fate-unknown_layout-ac3: $(AREF)
+fate-unknown_layout-ac3: CMD = md5 \
+  -guess_layout_max 0 -f s16le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) \
+  -f ac3 -flags +bitexact -c ac3_fixed
+
+
+FATE_STREAMCOPY-$(call ALLYES, EAC3_DEMUXER MOV_MUXER) += fate-copy-trac3074
+fate-copy-trac3074: $(TARGET_SAMPLES)/eac3/csi_miami_stereo_128_spx.eac3
+fate-copy-trac3074: CMD = transcode eac3 $(TARGET_SAMPLES)/eac3/csi_miami_stereo_128_spx.eac3\
+                     mp4 "-codec copy -map 0" "-codec copy"
+
+FATE_STREAMCOPY-$(call ALLYES, MOV_DEMUXER MOV_MUXER) += fate-copy-trac236
+fate-copy-trac236: $(TARGET_SAMPLES)/mov/fcp_export8-236.mov
+fate-copy-trac236: CMD = transcode mov $(TARGET_SAMPLES)/mov/fcp_export8-236.mov\
+                     mov "-codec copy -map 0"
+
+FATE_STREAMCOPY-$(call ALLYES, MPEGTS_DEMUXER MXF_MUXER PCM_S16LE_ENCODER) += fate-copy-trac4914
+fate-copy-trac4914: $(TARGET_SAMPLES)/mpeg2/xdcam8mp2-1s_small.ts
+fate-copy-trac4914: CMD = transcode mpegts $(TARGET_SAMPLES)/mpeg2/xdcam8mp2-1s_small.ts\
+                      mxf "-c:a pcm_s16le -c:v copy"
+
+FATE_STREAMCOPY-$(call ALLYES, MPEGTS_DEMUXER AVI_MUXER) += fate-copy-trac4914-avi
+fate-copy-trac4914-avi: $(TARGET_SAMPLES)/mpeg2/xdcam8mp2-1s_small.ts
+fate-copy-trac4914-avi: CMD = transcode mpegts $(TARGET_SAMPLES)/mpeg2/xdcam8mp2-1s_small.ts\
+                          avi "-c:a copy -c:v copy"
+
+FATE_STREAMCOPY-$(call ALLYES, H264_DEMUXER AVI_MUXER) += fate-copy-trac2211-avi
+fate-copy-trac2211-avi: $(TARGET_SAMPLES)/h264/bbc2.sample.h264
+fate-copy-trac2211-avi: CMD = transcode "h264 -r 14" $(TARGET_SAMPLES)/h264/bbc2.sample.h264\
+                          avi "-c:a copy -c:v copy"
+
+FATE_STREAMCOPY-$(call DEMMUX, OGG, OGG) += fate-limited_input_seek fate-limited_input_seek-copyts
+fate-limited_input_seek: $(TARGET_SAMPLES)/vorbis/moog_small.ogg
+fate-limited_input_seek: CMD = md5 -ss 1.5 -t 1.3 -i $(TARGET_SAMPLES)/vorbis/moog_small.ogg -c:a copy -fflags +bitexact -f ogg
+fate-limited_input_seek-copyts: $(TARGET_SAMPLES)/vorbis/moog_small.ogg
+fate-limited_input_seek-copyts: CMD = md5 -ss 1.5 -t 1.3 -i $(TARGET_SAMPLES)/vorbis/moog_small.ogg -c:a copy -copyts -fflags +bitexact -f ogg
+
+FATE_STREAMCOPY-$(call ALLYES, MOV_DEMUXER MOV_MUXER) += fate-copy-psp
+fate-copy-psp: $(TARGET_SAMPLES)/h264/wwwq_cut.mp4
+fate-copy-psp: CMD = transcode "mov" $(TARGET_SAMPLES)/h264/wwwq_cut.mp4\
+                      psp "-c copy" "-codec copy"
+
+fate-streamcopy: $(FATE_STREAMCOPY-yes)
+
+FATE_SAMPLES_FFMPEG-$(call ALLYES, MOV_DEMUXER MATROSKA_MUXER) += fate-rgb24-mkv
+fate-rgb24-mkv: $(TARGET_SAMPLES)/qtrle/aletrek-rle.mov
+fate-rgb24-mkv: CMD = transcode "mov" $(TARGET_SAMPLES)/qtrle/aletrek-rle.mov\
+                      matroska "-c:v rawvideo -pix_fmt rgb24 -allow_raw_vfw 1 -frames:v 1"
+
+FATE_SAMPLES_FFMPEG-$(call ALLYES, AAC_DEMUXER MOV_MUXER) += fate-adtstoasc_ticket3715
+fate-adtstoasc_ticket3715: $(TARGET_SAMPLES)/aac/foo.aac
+fate-adtstoasc_ticket3715: CMD = transcode "aac" $(TARGET_SAMPLES)/aac/foo.aac\
+                      mov "-c copy -bsf:a aac_adtstoasc" "-codec copy"
+
+FATE_SAMPLES_FFMPEG-$(call ALLYES, MOV_DEMUXER H264_MUXER H264_MP4TOANNEXB_BSF) += fate-h264_mp4toannexb_ticket2991
+fate-h264_mp4toannexb_ticket2991: $(TARGET_SAMPLES)/h264/wwwq_cut.mp4
+fate-h264_mp4toannexb_ticket2991: CMD = transcode "mp4" $(TARGET_SAMPLES)/h264/wwwq_cut.mp4\
+                                  h264 "-c:v copy -bsf:v h264_mp4toannexb" "-codec copy"
+
+FATE_SAMPLES_FFMPEG-$(call ALLYES, MOV_DEMUXER H264_MUXER H264_MP4TOANNEXB_BSF) += fate-h264_mp4toannexb_ticket5927 fate-h264_mp4toannexb_ticket5927_2
+fate-h264_mp4toannexb_ticket5927:   CMD = transcode "mp4" $(TARGET_SAMPLES)/h264/thezerotheorem-cut.mp4 \
+                                          h264 "-c:v copy -bsf:v h264_mp4toannexb -an" "-c:v copy"
+fate-h264_mp4toannexb_ticket5927_2: CMD = transcode "mp4" $(TARGET_SAMPLES)/h264/thezerotheorem-cut.mp4 \
+                                          h264 "-c:v copy -an" "-c:v copy"
+
+FATE_SAMPLES_FFMPEG-$(call ALLYES, MPEGPS_DEMUXER AVI_MUXER REMOVE_EXTRADATA_BSF) += fate-ffmpeg-bsf-remove-k fate-ffmpeg-bsf-remove-r fate-ffmpeg-bsf-remove-e
+fate-ffmpeg-bsf-remove-k: $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg
+fate-ffmpeg-bsf-remove-k: CMD = transcode "mpeg" $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg\
+                          avi "-vbsf remove_extra=k" "-codec copy"
+fate-ffmpeg-bsf-remove-r: $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg
+fate-ffmpeg-bsf-remove-r: CMD = transcode "mpeg" $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg\
+                          avi "-vbsf remove_extra=keyframe" "-codec copy"
+fate-ffmpeg-bsf-remove-e: $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg
+fate-ffmpeg-bsf-remove-e: CMD = transcode "mpeg" $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg\
+                          avi "-vbsf remove_extra=e" "-codec copy"
+
+
+FATE_SAMPLES_FFMPEG-yes += $(FATE_STREAMCOPY-yes)
+
+FATE_TIME_BASE-$(call ALLYES, MPEGPS_DEMUXER MXF_MUXER) += fate-time_base
+fate-time_base: $(TARGET_SAMPLES)/mpeg2/dvd_single_frame.vob
+fate-time_base: CMD = md5 -i $(TARGET_SAMPLES)/mpeg2/dvd_single_frame.vob -an -sn -c:v copy -r 25 -time_base 1001:30000 -fflags +bitexact -f mxf
+
+FATE_SAMPLES_FFMPEG-yes += $(FATE_TIME_BASE-yes)
diff --git a/tests/fate/ffprobe.mak b/tests/fate/ffprobe.mak
new file mode 100644
index 0000000000..d5fb05cd68
--- /dev/null
+++ b/tests/fate/ffprobe.mak
@@ -0,0 +1,35 @@
+FFPROBE_TEST_FILE=tests/data/ffprobe-test.nut
+FFPROBE_COMMAND=ffprobe$(PROGSSUF)$(EXESUF) -show_streams -show_packets -show_format -show_frames -bitexact $(FFPROBE_TEST_FILE)
+
+FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_compact
+fate-ffprobe_compact: $(FFPROBE_TEST_FILE)
+fate-ffprobe_compact: CMD = run $(FFPROBE_COMMAND) -of compact
+
+FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_csv
+fate-ffprobe_csv: $(FFPROBE_TEST_FILE)
+fate-ffprobe_csv: CMD = run $(FFPROBE_COMMAND) -of csv
+
+FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_default
+fate-ffprobe_default: $(FFPROBE_TEST_FILE)
+fate-ffprobe_default: CMD = run $(FFPROBE_COMMAND) -of default
+
+FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_flat
+fate-ffprobe_flat: $(FFPROBE_TEST_FILE)
+fate-ffprobe_flat: CMD = run $(FFPROBE_COMMAND) -of flat
+
+FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_ini
+fate-ffprobe_ini: $(FFPROBE_TEST_FILE)
+fate-ffprobe_ini: CMD = run $(FFPROBE_COMMAND) -of ini
+
+FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_json
+fate-ffprobe_json: $(FFPROBE_TEST_FILE)
+fate-ffprobe_json: CMD = run $(FFPROBE_COMMAND) -of json
+
+FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_xml
+fate-ffprobe_xml: $(FFPROBE_TEST_FILE)
+fate-ffprobe_xml: CMD = run $(FFPROBE_COMMAND) -of xml
+
+FATE_FFPROBE += $(FATE_FFPROBE-yes)
+
+fate-ffprobe: $(FATE_FFPROBE)
+
diff --git a/tests/fate/fft.mak b/tests/fate/fft.mak
index 3360a07e66..c7c26cd634 100644
--- a/tests/fate/fft.mak
+++ b/tests/fate/fft.mak
@@ -46,12 +46,58 @@ FATE_FFT_FIXED_ALL = $(FATE_FFT_FIXED-yes) $(FATE_MDCT_FIXED-yes)
 $(FATE_FFT_FIXED_ALL): libavcodec/tests/fft-fixed$(EXESUF)
 $(FATE_FFT_FIXED_ALL): CMD = run libavcodec/tests/fft-fixed $(CPUFLAGS:%=-c%) $(ARGS)
 
-$(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL): REF = /dev/null
+$(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL): CMP = null
+
+define DEF_FFT_FIXED32
+FATE_FFT_FIXED32 += fate-fft-fixed32-$(1)   fate-ifft-fixed32-$(1)  \
+                  fate-mdct-fixed32-$(1) fate-imdct-fixed32-$(1)
+
+fate-fft-fixed32-$(1):   ARGS = -n$(1)
+fate-ifft-fixed32-$(1):  ARGS = -n$(1) -i
+#fate-mdct-fixed32-$(1):  ARGS = -n$(1) -m
+fate-imdct-fixed32-$(1): ARGS = -n$(1) -m -i
+endef
+
+$(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_FFT_FIXED32,$(N))))
+
+fate-fft-fixed32: $(FATE_FFT_FIXED32)
+$(FATE_FFT_FIXED32): libavcodec/tests/fft-fixed32$(EXESUF)
+$(FATE_FFT_FIXED32): CMD = run libavcodec/tests/fft-fixed32 $(CPUFLAGS:%=-c%) $(ARGS)
+$(FATE_FFT_FIXED32): CMP = null
+
+define DEF_AV_FFT
+FATE_AV_DCT-$(CONFIG_DCT)   += fate-av-dct1d-$(1) fate-av-idct1d-$(1)
+FATE_AV_FFT-$(CONFIG_FFT)   += fate-av-fft-$(1)   fate-av-ifft-$(1)
+FATE_AV_MDCT-$(CONFIG_MDCT) += fate-av-mdct-$(1)  fate-av-imdct-$(1)
+FATE_AV_RDFT-$(CONFIG_RDFT) += fate-av-rdft-$(1)  fate-av-irdft-$(1)
+
+fate-av-fft-$(N):    ARGS = -n$(1)
+fate-av-ifft-$(N):   ARGS = -n$(1) -i
+fate-av-mdct-$(N):   ARGS = -n$(1) -m
+fate-av-imdct-$(N):  ARGS = -n$(1) -m -i
+fate-av-rdft-$(N):   ARGS = -n$(1) -r
+fate-av-irdft-$(N):  ARGS = -n$(1) -r -i
+fate-av-dct1d-$(N):  ARGS = -n$(1) -d
+fate-av-idct1d-$(N): ARGS = -n$(1) -d -i
+endef
+
+$(foreach N, 4 5 6 7 8 9 10 11 12, $(eval $(call DEF_AV_FFT,$(N))))
+
+fate-av-dct-float: $(FATE_AV_DCT-yes)
+fate-av-fft-float: $(FATE_AV_FFT-yes)
+fate-av-mdct-float: $(FATE_AV_MDCT-yes)
+fate-av-rdft-float: $(FATE_AV_RDFT-yes)
+
+FATE_AV_FFT_ALL = $(FATE_AV_DCT-yes) $(FATE_AV_FFT-yes) $(FATE_AV_MDCT-yes) $(FATE_AV_RDFT-yes)
+
+$(FATE_AV_FFT_ALL): libavcodec/tests/avfft$(EXESUF)
+$(FATE_AV_FFT_ALL): CMD = run libavcodec/tests/avfft $(CPUFLAGS:%=-c%) $(ARGS)
+$(FATE_AV_FFT_ALL): CMP = null
 
 fate-dct: fate-dct-float
-fate-fft: fate-fft-float fate-fft-fixed
+fate-fft: fate-fft-float fate-fft-fixed fate-fft-fixed32
 fate-mdct: fate-mdct-float fate-mdct-fixed
 fate-rdft: fate-rdft-float
 
-FATE-$(CONFIG_AVCODEC) += $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL)
-fate-fft-all: $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL)
+FATE-$(call ALLYES, AVCODEC FFT MDCT) += $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL) $(FATE_FFT_FIXED32) $(FATE_AV_FFT_ALL)
+fate-fft-all: $(FATE_FFT_ALL) $(FATE_FFT_FIXED_ALL) $(FATE_FFT_FIXED32) $(FATE_AV_FFT_ALL)
diff --git a/tests/fate/fifo-muxer.mak b/tests/fate/fifo-muxer.mak
new file mode 100644
index 0000000000..9c13954cf7
--- /dev/null
+++ b/tests/fate/fifo-muxer.mak
@@ -0,0 +1,20 @@
+fate-fifo-muxer-h264: CMD = ffmpeg -i $(TARGET_SAMPLES)/mkv/1242-small.mkv -frames:v 11\
+                            -c:v copy -c:a copy -map v:0 -map a:0 -flags +bitexact\
+                            -fflags +bitexact -f fifo -fifo_format framecrc -
+fate-fifo-muxer-h264: REF = $(SRC_PATH)/tests/ref/fate/mkv-1242
+FATE_SAMPLES_FIFO_MUXER-$(call ALLYES, FIFO_MUXER, MATROSKA_DEMUXER, H264_DECODER) += fate-fifo-muxer-h264
+
+fate-fifo-muxer-wav: CMD = ffmpeg -i $(TARGET_SAMPLES)/audio-reference/chorusnoise_2ch_44kHz_s16.wav\
+                           -c:a copy -map a:0 -flags +bitexact\
+                           -fflags +bitexact -f fifo -fifo_format wav md5:
+fate-fifo-muxer-wav: CMP = oneline
+fate-fifo-muxer-wav: REF = 4dda5dcc7ecdc2218b0739a152ada802
+FATE_SAMPLES_FIFO_MUXER-$(call ALLYES, FIFO_MUXER, WAV_DEMUXER) += fate-fifo-muxer-wav
+
+fate-fifo-muxer-tst: libavformat/tests/fifo_muxer$(EXESUF)
+fate-fifo-muxer-tst: CMD = run libavformat/tests/fifo_muxer$(EXESUF)
+FATE_FIFO_MUXER-$(call ALLYES, FIFO_MUXER NETWORK) += fate-fifo-muxer-tst
+
+FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_FIFO_MUXER-yes)
+FATE_FFMPEG += $(FATE_FIFO_MUXER-yes)
+fate-fifo-muxer: $(FATE_FIFO_MUXER-yes) $(FATE_SAMPLES_FIFO_MUXER-yes)
diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak
index 363ae2e317..bd8b3d3c35 100644
--- a/tests/fate/filter-audio.mak
+++ b/tests/fate/filter-audio.mak
@@ -1,29 +1,202 @@
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, ADELAY, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-adelay
+fate-filter-adelay: tests/data/asynth-44100-2.wav
+fate-filter-adelay: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-adelay: CMD = framecrc -i $(SRC) -af adelay=42
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, AECHO, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-aecho
+fate-filter-aecho: tests/data/asynth-44100-2.wav
+fate-filter-aecho: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-aecho: CMD = framecrc -i $(SRC) -af aecho=0.5:0.5:32:0.5
+
+FATE_FILTER_AEMPHASIS += fate-filter-aemphasis-50fm
+fate-filter-aemphasis-50fm: tests/data/asynth-44100-2.wav
+fate-filter-aemphasis-50fm: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-aemphasis-50fm: CMD = framecrc -i $(SRC) -af aemphasis=1:5:reproduction:50fm
+
+FATE_FILTER_AEMPHASIS += fate-filter-aemphasis-75kf
+fate-filter-aemphasis-75kf: tests/data/asynth-44100-2.wav
+fate-filter-aemphasis-75kf: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-aemphasis-75kf: CMD = framecrc -i $(SRC) -af aemphasis=2:8:reproduction:75kf
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, AEMPHASIS, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_FILTER_AEMPHASIS)
+
+FATE_FILTER_AFADE += fate-filter-afade-qsin
+fate-filter-afade-qsin: tests/data/asynth-44100-2.wav
+fate-filter-afade-qsin: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-afade-qsin: CMD = framecrc -i $(SRC) -af afade=t=in:ss=0:d=2:curve=qsin
+
+FATE_FILTER_AFADE += fate-filter-afade-iqsin
+fate-filter-afade-iqsin: tests/data/asynth-44100-2.wav
+fate-filter-afade-iqsin: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-afade-iqsin: CMD = framecrc -i $(SRC) -af afade=t=in:ss=0:d=2:curve=iqsin
+
+FATE_FILTER_AFADE += fate-filter-afade-esin
+fate-filter-afade-esin: tests/data/asynth-44100-2.wav
+fate-filter-afade-esin: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-afade-esin: CMD = framecrc -i $(SRC) -af afade=t=in:ss=0:d=2:curve=esin
+
+FATE_FILTER_AFADE += fate-filter-afade-hsin
+fate-filter-afade-hsin: tests/data/asynth-44100-2.wav
+fate-filter-afade-hsin: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-afade-hsin: CMD = framecrc -i $(SRC) -af afade=t=in:ss=0:d=2:curve=hsin
+
+FATE_FILTER_AFADE += fate-filter-afade-exp
+fate-filter-afade-exp: tests/data/asynth-44100-2.wav
+fate-filter-afade-exp: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-afade-exp: CMD = framecrc -i $(SRC) -af afade=t=in:ss=0:d=2:curve=exp
+
+FATE_FILTER_AFADE += fate-filter-afade-log
+fate-filter-afade-log: tests/data/asynth-44100-2.wav
+fate-filter-afade-log: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-afade-log: CMD = framecrc -i $(SRC) -af afade=t=in:ss=1:d=2.5:curve=log
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, AFADE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_FILTER_AFADE)
+
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, ACROSSFADE, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-acrossfade
+fate-filter-acrossfade: tests/data/asynth-44100-2.wav
+fate-filter-acrossfade: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-acrossfade: SRC2 = $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+fate-filter-acrossfade: CMD = framecrc -i $(SRC) -i $(SRC2) -filter_complex acrossfade=d=2:c1=log:c2=exp
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, AFADE, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-agate
+fate-filter-agate: tests/data/asynth-44100-2.wav
+fate-filter-agate: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-agate: CMD = framecrc -i $(SRC) -af agate=level_in=10:range=0:threshold=1:ratio=1:attack=1:knee=1:makeup=4
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, AFADE, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-alimiter
+fate-filter-alimiter: tests/data/asynth-44100-2.wav
+fate-filter-alimiter: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-alimiter: CMD = framecrc -i $(SRC) -af alimiter=level_in=1:level_out=2:limit=0.2
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, AMERGE, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-amerge
+fate-filter-amerge: tests/data/asynth-44100-1.wav
+fate-filter-amerge: SRC = $(TARGET_PATH)/tests/data/asynth-44100-1.wav
+fate-filter-amerge: CMD = framecrc -i $(SRC) -i $(SRC) -filter_complex "[0:a][1:a]amerge=inputs=2[aout]" -map "[aout]"
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, APAD, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-apad
+fate-filter-apad: tests/data/asynth-44100-2.wav
+fate-filter-apad: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-apad: CMD = framecrc -i $(SRC) -af apad=pad_len=10
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, ANEQUALIZER, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-anequalizer
+fate-filter-anequalizer: tests/data/asynth-44100-2.wav
+fate-filter-anequalizer: tests/data/filtergraphs/anequalizer
+fate-filter-anequalizer: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-anequalizer: CMD = framecrc -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/anequalizer
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, ASETNSAMPLES, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-asetnsamples-pad
+fate-filter-asetnsamples-pad: tests/data/asynth-44100-2.wav
+fate-filter-asetnsamples-pad: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-asetnsamples-pad: CMD = framecrc -i $(SRC) -af asetnsamples=512:p=1
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, ASETNSAMPLES, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-asetnsamples-nopad
+fate-filter-asetnsamples-nopad: tests/data/asynth-44100-2.wav
+fate-filter-asetnsamples-nopad: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-asetnsamples-nopad: CMD = framecrc -i $(SRC) -af asetnsamples=512:p=0
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, ASETRATE, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-asetrate
+fate-filter-asetrate: tests/data/asynth-44100-2.wav
+fate-filter-asetrate: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-asetrate: CMD = framecrc -i $(SRC) -frames:a 20 -af asetrate=20000
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHORUS, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-chorus
+fate-filter-chorus: tests/data/asynth-22050-1.wav
+fate-filter-chorus: SRC = $(TARGET_PATH)/tests/data/asynth-22050-1.wav
+fate-filter-chorus: CMD = framecrc -i $(SRC) -frames:a 10 -af chorus=0.050001:0.050002:64:0.050001:0.025003:2.00004
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, DCSHIFT, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-dcshift
+fate-filter-dcshift: tests/data/asynth-44100-2.wav
+fate-filter-dcshift: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-dcshift: CMD = framecrc -i $(SRC) -frames:a 20 -af dcshift=shift=0.25:limitergain=0.05
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, EARWAX, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-earwax
+fate-filter-earwax: tests/data/asynth-44100-2.wav
+fate-filter-earwax: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-earwax: CMD = framecrc -i $(SRC) -frames:a 20 -af earwax
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, EXTRASTEREO, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-extrastereo
+fate-filter-extrastereo: tests/data/asynth-44100-2.wav
+fate-filter-extrastereo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-extrastereo: CMD = framecrc -i $(SRC) -frames:a 20 -af extrastereo=m=2
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, FIREQUALIZER ATRIM VOLUME, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-firequalizer
+fate-filter-firequalizer: tests/data/asynth-44100-2.wav
+fate-filter-firequalizer: tests/data/filtergraphs/firequalizer
+fate-filter-firequalizer: REF = tests/data/asynth-44100-2.wav
+fate-filter-firequalizer: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-44100-2.wav -filter_script $(TARGET_PATH)/tests/data/filtergraphs/firequalizer -f wav -c:a pcm_s16le -
+fate-filter-firequalizer: CMP = oneoff
+fate-filter-firequalizer: CMP_UNIT = s16
+fate-filter-firequalizer: SIZE_TOLERANCE = 1058400 - 1097208
+
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, SILENCEREMOVE, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-silenceremove
+fate-filter-silenceremove: SRC = $(TARGET_SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav
+fate-filter-silenceremove: CMD = framecrc -i $(SRC) -frames:a 30 -af silenceremove=0:0:0:-1:0:-90dB
+
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, STEREOTOOLS, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-stereotools
+fate-filter-stereotools: SRC = $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+fate-filter-stereotools: CMD = framecrc -i $(SRC) -frames:a 20 -af stereotools=mlev=0.015625
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, TREMOLO, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-tremolo
+fate-filter-tremolo: tests/data/asynth-44100-2.wav
+fate-filter-tremolo: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-tremolo: CMD = framecrc -i $(SRC) -frames:a 20 -af tremolo
+
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, COMPAND, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-filter-compand
+fate-filter-compand: tests/data/asynth-44100-2.wav
+fate-filter-compand: tests/data/filtergraphs/compand
+fate-filter-compand: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
+fate-filter-compand: CMD = framecrc -i $(SRC) -frames:a 20 -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/compand
+
+tests/data/hls-list.m3u8: TAG = GEN
+tests/data/hls-list.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
+        -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f segment -segment_time 10 -map 0 -flags +bitexact -codec:a mp2fixed \
+        -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/hls-out-%03d.ts 2>/dev/null
+
+FATE_AFILTER-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER AEVALSRC_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls
+fate-filter-hls: tests/data/hls-list.m3u8
+fate-filter-hls: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/hls-list.m3u8
+
+tests/data/hls-list-append.m3u8: TAG = GEN
+tests/data/hls-list-append.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
+        -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f segment -segment_time 10 -map 0 -flags +bitexact -codec:a mp2fixed \
+        -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/hls-append-out-%03d.ts 2>/dev/null; \
+        $(TARGET_EXEC) $(TARGET_PATH)/$< \
+        -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_time 10 -map 0 -flags +bitexact \
+        -hls_flags append_list -codec:a mp2fixed -hls_segment_filename $(TARGET_PATH)/tests/data/hls-append-out-%03d.ts \
+        $(TARGET_PATH)/tests/data/hls-list-append.m3u8 2>/dev/null
+
+FATE_AFILTER-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER AEVALSRC_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls-append
+fate-filter-hls-append: tests/data/hls-list-append.m3u8
+fate-filter-hls-append: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/hls-list-append.m3u8 -af asetpts=RTCTIME
+
 FATE_AMIX += fate-filter-amix-simple
-fate-filter-amix-simple: CMD = avconv -filter_complex amix -i $(SRC) -ss 3 -i $(SRC1) -f f32le -
+fate-filter-amix-simple: CMD = ffmpeg -filter_complex amix -i $(SRC) -ss 3 -i $(SRC1) -f f32le -
 fate-filter-amix-simple: REF = $(SAMPLES)/filter/amix_simple.pcm
 
 FATE_AMIX += fate-filter-amix-first
-fate-filter-amix-first: CMD = avconv -filter_complex amix=duration=first -ss 4 -i $(SRC) -i $(SRC1) -f f32le -
+fate-filter-amix-first: CMD = ffmpeg -filter_complex amix=duration=first -ss 4 -i $(SRC) -i $(SRC1) -f f32le -
 fate-filter-amix-first: REF = $(SAMPLES)/filter/amix_first.pcm
 
 FATE_AMIX += fate-filter-amix-transition
 fate-filter-amix-transition: tests/data/asynth-44100-2-3.wav
 fate-filter-amix-transition: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-2-3.wav
-fate-filter-amix-transition: CMD = avconv -filter_complex amix=inputs=3:dropout_transition=0.5 -i $(SRC) -ss 2 -i $(SRC1) -ss 4 -i $(SRC2) -f f32le -
+fate-filter-amix-transition: CMD = ffmpeg -filter_complex amix=inputs=3:dropout_transition=0.5 -i $(SRC) -ss 2 -i $(SRC1) -ss 4 -i $(SRC2) -f f32le -
 fate-filter-amix-transition: REF = $(SAMPLES)/filter/amix_transition.pcm
 
-FATE_AFILTER-$(call FILTERDEMDECENCMUX, AMIX, WAV, PCM_S16LE, PCM_F32LE, PCM_F32LE) += $(FATE_AMIX)
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, AMIX, WAV, PCM_S16LE, PCM_F32LE, PCM_F32LE) += $(FATE_AMIX)
 $(FATE_AMIX): tests/data/asynth-44100-2.wav tests/data/asynth-44100-2-2.wav
 $(FATE_AMIX): SRC  = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
 $(FATE_AMIX): SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2-2.wav
 $(FATE_AMIX): CMP  = oneoff
 $(FATE_AMIX): CMP_UNIT = f32
 
-FATE_AFILTER-$(call FILTERDEMDECMUX, ASYNCTS, FLV, NELLYMOSER, PCM_S16LE) += fate-filter-asyncts
-fate-filter-asyncts: SRC = $(TARGET_SAMPLES)/nellymoser/nellymoser-discont.flv
-fate-filter-asyncts: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af asyncts
-fate-filter-asyncts: CMP = oneoff
-fate-filter-asyncts: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm
+FATE_AFILTER_SAMPLES-$(CONFIG_ARESAMPLE_FILTER) += fate-filter-aresample
+fate-filter-aresample: SRC = $(TARGET_SAMPLES)/nellymoser/nellymoser-discont.flv
+fate-filter-aresample: CMD = pcm -analyzeduration 10000000 -i $(SRC) -af aresample=min_comp=0.001:min_hard_comp=0.1:first_pts=0
+fate-filter-aresample: CMP = oneoff
+fate-filter-aresample: REF = $(SAMPLES)/nellymoser/nellymoser-discont.pcm
 
 FATE_ATRIM += fate-filter-atrim-duration
 fate-filter-atrim-duration: CMD = framecrc -i $(SRC) -af atrim=start=0.1:duration=0.01
@@ -39,7 +212,7 @@ fate-filter-atrim-time: CMD = framecrc -i $(SRC) -af atrim=0.1:0.2
 $(FATE_ATRIM): tests/data/asynth-44100-2.wav
 $(FATE_ATRIM): SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
 
-FATE_FILTER-$(call FILTERDEMDECENCMUX, ATRIM, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_ATRIM)
+FATE_AFILTER-$(call FILTERDEMDECENCMUX, ATRIM, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_ATRIM)
 
 FATE_FILTER_CHANNELMAP += fate-filter-channelmap-one-int
 fate-filter-channelmap-one-int: tests/data/filtergraphs/channelmap_one_int
@@ -47,7 +220,7 @@ fate-filter-channelmap-one-int: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.w
 fate-filter-channelmap-one-int: tests/data/asynth-44100-6.wav
 fate-filter-channelmap-one-int: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_int -f wav -fflags +bitexact
 fate-filter-channelmap-one-int: CMP = oneline
-fate-filter-channelmap-one-int: REF = 21f1977c4f9705e2057083f84764e685
+fate-filter-channelmap-one-int: REF = 8cfe553d65ed4696756d8c1b824fcdd3
 
 FATE_FILTER_CHANNELMAP += fate-filter-channelmap-one-str
 fate-filter-channelmap-one-str: tests/data/filtergraphs/channelmap_one_str
@@ -55,7 +228,7 @@ fate-filter-channelmap-one-str: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.w
 fate-filter-channelmap-one-str: tests/data/asynth-44100-2.wav
 fate-filter-channelmap-one-str: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_str -f wav -fflags +bitexact
 fate-filter-channelmap-one-str: CMP = oneline
-fate-filter-channelmap-one-str: REF = 9fe9bc452282dfd94fd80e9491607a0c
+fate-filter-channelmap-one-str: REF = 0ea3052e482c95d5d3bd9da6dac1b5fa
 
 FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_FILTER_CHANNELMAP)
 
@@ -70,16 +243,107 @@ FATE_AFILTER-$(call FILTERDEMDECENCMUX, JOIN, WAV, PCM_S16LE, PCM_S16LE, PCM_S16
 fate-filter-join: SRC1 = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
 fate-filter-join: SRC2 = $(TARGET_PATH)/tests/data/asynth-44100-3.wav
 fate-filter-join: tests/data/asynth-44100-2.wav tests/data/asynth-44100-3.wav
-fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex join=channel_layout=5 -f s16le
+fate-filter-join: CMD = md5 -i $(SRC1) -i $(SRC2) -filter_complex join=channel_layout=5c -f s16le
 fate-filter-join: CMP = oneline
-fate-filter-join: REF = 409e66fc5ece4ddea4aa16bc47026bb0
+fate-filter-join: REF = 88b0d24a64717ba8635b29e8dac6ecd8
 
-FATE_AFILTER-$(call FILTERDEMDECENCMUX, VOLUME, WAV, PCM_S16LE, PCM_S16LE, PCM_S16LE) += fate-filter-volume
+FATE_AFILTER-$(call ALLYES, WAV_DEMUXER PCM_S16LE_DECODER PCM_S16LE_ENCODER PCM_S16LE_MUXER APERMS_FILTER VOLUME_FILTER) += fate-filter-volume
 fate-filter-volume: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
 fate-filter-volume: tests/data/asynth-44100-2.wav
-fate-filter-volume: CMD = md5 -i $(SRC) -af volume=precision=fixed:volume=0.5 -f s16le
+fate-filter-volume: CMD = md5 -i $(SRC) -af aperms=random,volume=precision=fixed:volume=0.5 -f s16le
 fate-filter-volume: CMP = oneline
 fate-filter-volume: REF = 4d6ba75ef3e32d305d066b9bc771d6f4
 
-FATE_SAMPLES_AVCONV += $(FATE_AFILTER-yes)
-fate-afilter: $(FATE_AFILTER-yes)
+# hdcd-mix.flac is a mix of three different sources which are interesting for various reasons:
+# first 5 seconds uses packet format A and max LLE of -7.0db
+# second 5 seconds uses packet format B and has a gain mismatch between channels
+# last 10 seconds is not HDCD but has a coincidental HDCD packet, it needs to be 10 seconds because it also tests the cdt expiration
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-mix
+fate-filter-hdcd-mix: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac
+fate-filter-hdcd-mix: CMD = md5 -i $(SRC) -af hdcd -f s24le
+fate-filter-hdcd-mix: CMP = oneline
+fate-filter-hdcd-mix: REF = e7079913e90c124460cdbc712df5b84c
+
+# output will be different because of the gain mismatch in the second and third parts
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-mix-psoff
+fate-filter-hdcd-mix-psoff: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac
+fate-filter-hdcd-mix-psoff: CMD = md5 -i $(SRC) -af hdcd=process_stereo=false -f s24le
+fate-filter-hdcd-mix-psoff: CMP = oneline
+fate-filter-hdcd-mix-psoff: REF = bd0e81fe17696b825ee3515ab928e6bb
+
+# test the different analyze modes
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze-pe
+fate-filter-hdcd-analyze-pe: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac
+fate-filter-hdcd-analyze-pe: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=pe -f s24le
+fate-filter-hdcd-analyze-pe: CMP = oneline
+fate-filter-hdcd-analyze-pe: REF = bb83e97bbd0064b9b1c0ef2f2c8f0c77
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze-lle
+fate-filter-hdcd-analyze-lle: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac
+fate-filter-hdcd-analyze-lle: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=lle -f s24le
+fate-filter-hdcd-analyze-lle: CMP = oneline
+fate-filter-hdcd-analyze-lle: REF = 121cc4a681aa0caef5c664fece7a3ddc
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze-cdt
+fate-filter-hdcd-analyze-cdt: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac
+fate-filter-hdcd-analyze-cdt: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=cdt -f s24le
+fate-filter-hdcd-analyze-cdt: CMP = oneline
+fate-filter-hdcd-analyze-cdt: REF = 12136e6a00dd532994f6edcc347af1d4
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze-tgm
+fate-filter-hdcd-analyze-tgm: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac
+fate-filter-hdcd-analyze-tgm: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=tgm -f s24le
+fate-filter-hdcd-analyze-tgm: CMP = oneline
+fate-filter-hdcd-analyze-tgm: REF = a3c39f62e9b9b42c9c440d0045d5fb2f
+# the two additional analyze modes from libhdcd
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze-ltgm
+fate-filter-hdcd-analyze-ltgm: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac
+fate-filter-hdcd-analyze-ltgm: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=lle:process_stereo=false -f s24le
+fate-filter-hdcd-analyze-ltgm: CMP = oneline
+fate-filter-hdcd-analyze-ltgm: REF = 76ffd86b762b5a93332039f27e4c0c0e
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-analyze-pel
+fate-filter-hdcd-analyze-pel: SRC = $(TARGET_SAMPLES)/filter/hdcd-mix.flac
+fate-filter-hdcd-analyze-pel: CMD = md5 -i $(SRC) -af hdcd=analyze_mode=pe:force_pe=true -f s24le
+fate-filter-hdcd-analyze-pel: CMP = oneline
+fate-filter-hdcd-analyze-pel: REF = 8156c5a3658d789ab46447d62151f5e9
+
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-false-positive
+fate-filter-hdcd-false-positive: SRC = $(TARGET_SAMPLES)/filter/hdcd-false-positive.flac
+fate-filter-hdcd-false-positive: CMD = md5 -i $(SRC) -af hdcd -f s24le
+fate-filter-hdcd-false-positive: CMP = grep
+fate-filter-hdcd-false-positive: REF = HDCD detected: no
+
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-detect-errors
+fate-filter-hdcd-detect-errors: SRC = $(TARGET_SAMPLES)/filter/hdcd-encoding-errors.flac
+fate-filter-hdcd-detect-errors: CMD = md5 -i $(SRC) -af hdcd -f s24le
+fate-filter-hdcd-detect-errors: CMP = grep
+fate-filter-hdcd-detect-errors: REF = detectable errors: [1-9]
+
+# 20bit HDCD
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, FLAC, FLAC, PCM_S32LE, PCM_S32LE) += fate-filter-hdcd-20bit
+fate-filter-hdcd-20bit: SRC = $(TARGET_SAMPLES)/filter/hdcd-fake20bit.flac
+fate-filter-hdcd-20bit: CMD = md5 -i $(SRC) -af hdcd=bits_per_sample=20 -f s32le
+fate-filter-hdcd-20bit: CMP = oneline
+fate-filter-hdcd-20bit: REF = 365ded883a4a92483b15b69babc81390
+
+# non-hdcd tests of different input formats for code coverage
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, WAV, PCM_S16LE, PCM_S24LE, PCM_S24LE) += fate-filter-hdcd-mono
+fate-filter-hdcd-mono: SRC = $(TARGET_SAMPLES)/audiomatch/tones_44100_mono.wav
+fate-filter-hdcd-mono: CMD = md5 -i $(SRC) -af hdcd -f s24le
+fate-filter-hdcd-mono: CMP = oneline
+fate-filter-hdcd-mono: REF = f51b114b20728e6a463a9491c643d166
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, WV, WAVPACK, PCM_S32LE, PCM_S32LE) += fate-filter-hdcd-s16p
+fate-filter-hdcd-s16p: SRC = $(TARGET_SAMPLES)/wavpack/lossless/16bit-partial.wv
+fate-filter-hdcd-s16p: CMD = md5 -i $(SRC) -af hdcd -f s32le
+fate-filter-hdcd-s16p: CMP = oneline
+fate-filter-hdcd-s16p: REF = 4e767f436b891ac59810a8b2b1d7e96b
+FATE_AFILTER_SAMPLES-$(call FILTERDEMDECENCMUX, HDCD, WV, WAVPACK, PCM_S32LE, PCM_S32LE) += fate-filter-hdcd-s32p
+fate-filter-hdcd-s32p: SRC = $(TARGET_SAMPLES)/wavpack/lossless/24bit-partial.wv
+fate-filter-hdcd-s32p: CMD = md5 -i $(SRC) -af hdcd -f s32le
+fate-filter-hdcd-s32p: CMP = oneline
+fate-filter-hdcd-s32p: REF = 0c5513e83eedaa10ab6fac9ddc173cf5
+
+FATE_AFILTER-yes += fate-filter-formats
+fate-filter-formats: libavfilter/tests/formats$(EXESUF)
+fate-filter-formats: CMD = run libavfilter/tests/formats
+
+FATE_SAMPLES_AVCONV += $(FATE_AFILTER_SAMPLES-yes)
+FATE_FFMPEG += $(FATE_AFILTER-yes)
+fate-afilter: $(FATE_AFILTER-yes) $(FATE_AFILTER_SAMPLES-yes)
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index 82d0a62dbd..c19f301ff8 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -1,36 +1,142 @@
-FATE_FILTER-$(call FILTERDEMDEC, DELOGO, RM, RV30) += fate-filter-delogo
-fate-filter-delogo: CMD = framecrc -i $(TARGET_SAMPLES)/real/rv30.rm -vf delogo=show=0:x=290:y=25:w=26:h=16 -an
+FATE_FILTER_SAMPLES-$(call ALLYES, SMJPEG_DEMUXER MJPEG_DECODER PERMS_FILTER OWDENOISE_FILTER) += fate-filter-owdenoise-sample
+fate-filter-owdenoise-sample: CMD = ffmpeg -idct simple -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -vf "trim=duration=0.5,perms=random,owdenoise=10:20:20:enable=not(between(t\,0.2\,1.2))" -an -f rawvideo -
+fate-filter-owdenoise-sample: REF = $(TARGET_SAMPLES)/filter-reference/owdenoise-scenwin.raw
+fate-filter-owdenoise-sample: CMP_TARGET = 1
+fate-filter-owdenoise-sample: FUZZ = 3539
+fate-filter-owdenoise-sample: CMP = oneoff
+
+FATE_FILTER_SAMPLES-$(call ALLYES, PERMS_FILTER DELOGO_FILTER RM_DEMUXER RV30_DECODER) += fate-filter-delogo
+fate-filter-delogo: CMD = framecrc -i $(TARGET_SAMPLES)/real/rv30.rm -vf perms=random,delogo=show=0:x=290:y=25:w=26:h=16 -an
 
 FATE_YADIF += fate-filter-yadif-mode0
-fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=0
+fate-filter-yadif-mode0: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -frames:v 30 -vf yadif=0
 
 FATE_YADIF += fate-filter-yadif-mode1
-fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -vf yadif=1
+fate-filter-yadif-mode1: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -frames:v 59 -vf yadif=1
+
+FATE_YADIF += fate-filter-yadif10
+fate-filter-yadif10: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -flags bitexact -pix_fmt yuv420p10le -frames:v 30 -vf yadif=0
+
+FATE_YADIF += fate-filter-yadif16
+fate-filter-yadif16: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -flags bitexact -pix_fmt yuv420p16le -frames:v 30 -vf yadif=0
+
+FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, YADIF, MPEGTS, MPEG2VIDEO) += $(FATE_YADIF)
+
+FATE_W3FDIF += fate-filter-w3fdif-simple
+fate-filter-w3fdif-simple: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -frames:v 30 -vf w3fdif=0
+
+FATE_W3FDIF += fate-filter-w3fdif-complex
+fate-filter-w3fdif-complex: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -frames:v 30 -vf w3fdif=1
+
+FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, W3FDIF, MPEGTS, MPEG2VIDEO) += $(FATE_W3FDIF)
+
+FATE_MCDEINT += fate-filter-mcdeint-fast
+fate-filter-mcdeint-fast: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -frames:v 30 -vf mcdeint=fast
+
+FATE_MCDEINT += fate-filter-mcdeint-medium
+fate-filter-mcdeint-medium: CMD = framecrc -flags bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -frames:v 30 -vf mcdeint=mode=medium
+
+FATE_FILTER_SAMPLES-$(call ALLYES, MCDEINT_FILTER, MPEGTS_DEMUXER, MPEG2VIDEO_DECODER SNOW_ENCODER) += $(FATE_MCDEINT)
+
+FATE_FILTER_SAMPLES-$(call ALLYES, CODECVIEW_FILTER RM_DEMUXER RV40_DECODER) += fate-filter-codecview-mvs
+fate-filter-codecview-mvs: CMD = framecrc -flags2 +export_mvs -i $(TARGET_SAMPLES)/real/spygames-2MB.rmvb -vf codecview=mv=pf+bf+bb -frames:v 60 -an
+
+FATE_FILTER_SAMPLES-$(call ALLYES, SHOWPALETTE_FILTER FLIC_DEMUXER FLIC_DECODER) += fate-filter-showpalette
+fate-filter-showpalette: CMD = framecrc -i $(TARGET_SAMPLES)/fli/fli-engines.fli -vf showpalette=3 -pix_fmt bgra
+
+FATE_FILTER_PALETTEGEN += fate-filter-palettegen-1
+fate-filter-palettegen-1: CMD = framecrc -i $(TARGET_SAMPLES)/filter/anim.mkv -vf palettegen -pix_fmt bgra
+
+FATE_FILTER_PALETTEGEN += fate-filter-palettegen-2
+fate-filter-palettegen-2: CMD = framecrc -i $(TARGET_SAMPLES)/filter/anim.mkv -vf palettegen=max_colors=128:reserve_transparent=0:stats_mode=diff -pix_fmt bgra
+
+fate-filter-palettegen: $(FATE_FILTER_PALETTEGEN)
+FATE_FILTER_SAMPLES-$(call ALLYES, PALETTEGEN_FILTER MATROSKA_DEMUXER H264_DECODER) += $(FATE_FILTER_PALETTEGEN)
+
+FATE_FILTER_PALETTEUSE += fate-filter-paletteuse-nodither
+fate-filter-paletteuse-nodither: CMD = framecrc -i $(TARGET_SAMPLES)/filter/anim.mkv -i $(TARGET_SAMPLES)/filter/anim-palette.png -lavfi paletteuse=none -pix_fmt bgra
+
+FATE_FILTER_PALETTEUSE += fate-filter-paletteuse-bayer
+fate-filter-paletteuse-bayer: CMD = framecrc -i $(TARGET_SAMPLES)/filter/anim.mkv -i $(TARGET_SAMPLES)/filter/anim-palette.png -lavfi paletteuse=bayer -pix_fmt bgra
+
+FATE_FILTER_PALETTEUSE += fate-filter-paletteuse-sierra2_4a
+fate-filter-paletteuse-sierra2_4a: CMD = framecrc -i $(TARGET_SAMPLES)/filter/anim.mkv -i $(TARGET_SAMPLES)/filter/anim-palette.png -lavfi paletteuse=sierra2_4a:diff_mode=rectangle -pix_fmt bgra
+
+fate-filter-paletteuse: $(FATE_FILTER_PALETTEUSE)
+FATE_FILTER_SAMPLES-$(call ALLYES, PALETTEUSE_FILTER MATROSKA_DEMUXER H264_DECODER IMAGE2_DEMUXER PNG_DECODER) += $(FATE_FILTER_PALETTEUSE)
+
+FATE_FILTER-$(call ALLYES, AVDEVICE LIFE_FILTER) += fate-filter-lavd-life
+fate-filter-lavd-life: CMD = framecrc -f lavfi -i life=s=40x40:r=5:seed=42:mold=64:ratio=0.1:death_color=red:life_color=green -t 2
+
+FATE_FILTER-$(call ALLYES, AVDEVICE TESTSRC_FILTER) += fate-filter-lavd-testsrc
+fate-filter-lavd-testsrc: CMD = framecrc -f lavfi -i testsrc=r=7:n=2:d=10
+
+FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER) += fate-filter-testsrc2-yuv420p
+fate-filter-testsrc2-yuv420p: CMD = framecrc -lavfi testsrc2=r=7:d=10 -pix_fmt yuv420p
 
-FATE_FILTER-$(call FILTERDEMDEC, YADIF, MPEGTS, MPEG2VIDEO) += $(FATE_YADIF)
+FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER) += fate-filter-testsrc2-yuv444p
+fate-filter-testsrc2-yuv444p: CMD = framecrc -lavfi testsrc2=r=7:d=10 -pix_fmt yuv444p
 
-FATE_SAMPLES_AVCONV += $(FATE_FILTER-yes)
+FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER) += fate-filter-testsrc2-rgb24
+fate-filter-testsrc2-rgb24: CMD = framecrc -lavfi testsrc2=r=7:d=10 -pix_fmt rgb24
 
+FATE_FILTER-$(call ALLYES, LAVFI_INDEV TESTSRC2_FILTER) += fate-filter-testsrc2-rgba
+fate-filter-testsrc2-rgba: CMD = framecrc -lavfi testsrc2=r=7:d=10 -pix_fmt rgba
+
+FATE_FILTER-$(call ALLYES, LAVFI_INDEV ALLRGB_FILTER) += fate-filter-allrgb
+fate-filter-allrgb: CMD = framecrc -lavfi allrgb=rate=5:duration=1 -pix_fmt rgb24
+
+FATE_FILTER-$(call ALLYES, LAVFI_INDEV ALLYUV_FILTER) += fate-filter-allyuv
+fate-filter-allyuv: CMD = framecrc -lavfi allyuv=rate=5:duration=1 -pix_fmt yuv444p
+
+FATE_FILTER-$(call ALLYES, LAVFI_INDEV RGBTESTSRC_FILTER) += fate-filter-rgbtestsrc
+fate-filter-rgbtestsrc: CMD = framecrc -lavfi rgbtestsrc=rate=5:duration=1 -pix_fmt rgb24
+
+FATE_FILTER-$(call ALLYES, LAVFI_INDEV SMPTEBARS_FILTER) += fate-filter-smptebars
+fate-filter-smptebars: CMD = framecrc -lavfi smptebars=rate=5:duration=1 -pix_fmt yuv420p
+
+FATE_FILTER-$(call ALLYES, LAVFI_INDEV SMPTEHDBARS_FILTER) += fate-filter-smptehdbars
+fate-filter-smptehdbars: CMD = framecrc -lavfi smptehdbars=rate=5:duration=1 -pix_fmt yuv444p
+
+FATE_FILTER-$(call ALLYES, LAVFI_INDEV YUVTESTSRC_FILTER) += fate-filter-yuvtestsrc-yuv444p
+fate-filter-yuvtestsrc-yuv444p: CMD = framecrc -lavfi yuvtestsrc=rate=5:duration=1 -pix_fmt yuv444p
+
+FATE_FILTER-$(call ALLYES, LAVFI_INDEV YUVTESTSRC_FILTER) += fate-filter-yuvtestsrc-yuv444p12
+fate-filter-yuvtestsrc-yuv444p12: CMD = framecrc -lavfi yuvtestsrc=rate=5:duration=1,format=yuv444p12 -pix_fmt yuv444p12le
+
+FATE_FILTER-$(call ALLYES, AVDEVICE TESTSRC_FILTER FORMAT_FILTER CONCAT_FILTER SCALE_FILTER) += fate-filter-lavd-scalenorm
+fate-filter-lavd-scalenorm: tests/data/filtergraphs/scalenorm
+fate-filter-lavd-scalenorm: CMD = framecrc -f lavfi -graph_file $(TARGET_PATH)/tests/data/filtergraphs/scalenorm -i dummy
+
+
+FATE_FILTER-$(call ALLYES, FRAMERATE_FILTER TESTSRC2_FILTER) += fate-filter-framerate-up fate-filter-framerate-down
+fate-filter-framerate-up: CMD = framecrc -lavfi testsrc2=r=2:d=10,framerate=fps=10 -t 1
+fate-filter-framerate-down: CMD = framecrc -lavfi testsrc2=r=2:d=10,framerate=fps=1 -t 1
 
 FATE_FILTER_VSYNTH-$(CONFIG_BOXBLUR_FILTER) += fate-filter-boxblur
 fate-filter-boxblur: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf boxblur=2:1
 
+FATE_FILTER_VSYNTH-$(call ALLYES, COLORCHANNELMIXER_FILTER FORMAT_FILTER PERMS_FILTER) += fate-filter-colorchannelmixer
+fate-filter-colorchannelmixer: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf format=rgb24,perms=random,colorchannelmixer=.31415927:.4:.31415927:0:.27182818:.8:.27182818:0:.2:.6:.2:0 -flags +bitexact -sws_flags +accurate_rnd+bitexact
+
 FATE_FILTER_VSYNTH-$(CONFIG_DRAWBOX_FILTER) += fate-filter-drawbox
-fate-filter-drawbox: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf drawbox=10:20:200:60:red@0.5
+fate-filter-drawbox: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf drawbox=224:24:88:72:red@0.5
 
 FATE_FILTER_VSYNTH-$(CONFIG_FADE_FILTER) += fate-filter-fade
-fate-filter-fade: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf fade=in:0:25,fade=out:25:25
+fate-filter-fade: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf fade=in:5:15,fade=out:30:15
 
 FATE_FILTER_VSYNTH-$(call ALLYES, INTERLACE_FILTER FIELDORDER_FILTER) += fate-filter-fieldorder
 fate-filter-fieldorder: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf interlace=tff,fieldorder=bff -sws_flags +accurate_rnd+bitexact
 
 define FATE_FPFILTER_SUITE
-FATE_FILTER_VSYNTH-$(CONFIG_FRAMEPACK_FILTER) += fate-filter-framepack-$(1)
+FATE_FILTER_FRAMEPACK += fate-filter-framepack-$(1)
 fate-filter-framepack-$(1): CMD = framecrc -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -filter_complex framepack=$(1) -frames 15
 endef
 
 FPMODES = columns frameseq lines sbs tab
 $(foreach MODE,$(FPMODES),$(eval $(call FATE_FPFILTER_SUITE,$(MODE))))
+FATE_FILTER_VSYNTH-$(CONFIG_FRAMEPACK_FILTER) += $(FATE_FILTER_FRAMEPACK)
+fate-filter-framepack: $(FATE_FILTER_FRAMEPACK)
 
 FATE_FILTER_VSYNTH-$(CONFIG_GRADFUN_FILTER) += fate-filter-gradfun
 fate-filter-gradfun: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf gradfun
@@ -41,13 +147,193 @@ fate-filter-hqdn3d: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf hqdn3d
 FATE_FILTER_VSYNTH-$(CONFIG_INTERLACE_FILTER) += fate-filter-interlace
 fate-filter-interlace: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf interlace
 
-FATE_FILTER_VSYNTH-$(CONFIG_NEGATE_FILTER) += fate-filter-negate
-fate-filter-negate: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf negate
+FATE_FILTER_VSYNTH-$(CONFIG_INTERLACE_FILTER) += fate-filter-interlace-complex
+fate-filter-interlace-complex: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf interlace=lowpass=complex
+
+FATE_FILTER_VSYNTH-$(call ALLYES, NEGATE_FILTER PERMS_FILTER) += fate-filter-negate
+fate-filter-negate: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf perms=random,negate
+
+FATE_FILTER_VSYNTH-$(CONFIG_HISTOGRAM_FILTER) += fate-filter-histogram-levels
+fate-filter-histogram-levels: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf histogram -flags +bitexact -sws_flags +accurate_rnd+bitexact
+
+FATE_FILTER_VSYNTH-$(CONFIG_WAVEFORM_FILTER) += fate-filter-waveform_column
+fate-filter-waveform_column: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf waveform -flags +bitexact -sws_flags +accurate_rnd+bitexact
+
+FATE_FILTER_VSYNTH-$(CONFIG_WAVEFORM_FILTER) += fate-filter-waveform_row
+fate-filter-waveform_row: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf waveform=m=row -flags +bitexact -sws_flags +accurate_rnd+bitexact
+
+FATE_FILTER_VSYNTH-$(CONFIG_WAVEFORM_FILTER) += fate-filter-waveform_envelope
+fate-filter-waveform_envelope: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf waveform=e=3 -flags +bitexact -sws_flags +accurate_rnd+bitexact
+
+FATE_FILTER_VSYNTH-$(CONFIG_WAVEFORM_FILTER) += fate-filter-waveform_uv
+fate-filter-waveform_uv: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf waveform=c=6 -flags +bitexact -sws_flags +accurate_rnd+bitexact
+
+FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_gray
+fate-filter-vectorscope_gray: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=gray -sws_flags +accurate_rnd+bitexact -frames:v 3
+
+FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color
+fate-filter-vectorscope_color: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=color -sws_flags +accurate_rnd+bitexact -frames:v 3
+
+FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color2
+fate-filter-vectorscope_color2: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=color2 -sws_flags +accurate_rnd+bitexact -frames:v 3
+
+FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color3
+fate-filter-vectorscope_color3: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=color3 -sws_flags +accurate_rnd+bitexact -frames:v 3
+
+FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_color4
+fate-filter-vectorscope_color4: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=color4 -sws_flags +accurate_rnd+bitexact -frames:v 3
+
+FATE_FILTER_VSYNTH-$(CONFIG_VECTORSCOPE_FILTER) += fate-filter-vectorscope_xy
+fate-filter-vectorscope_xy: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf vectorscope=x=0:y=1 -sws_flags +accurate_rnd+bitexact -frames:v 3
+
+FATE_FILTER_VSYNTH-$(CONFIG_MERGEPLANES_FILTER) += fate-filter-mergeplanes
+fate-filter-mergeplanes: tests/data/filtergraphs/mergeplanes
+fate-filter-mergeplanes: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/mergeplanes
+
+FATE_FILTER_VSYNTH-$(CONFIG_HSTACK_FILTER) += fate-filter-hstack
+fate-filter-hstack: tests/data/filtergraphs/hstack
+fate-filter-hstack: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/hstack
+
+FATE_FILTER_VSYNTH-$(CONFIG_VSTACK_FILTER) += fate-filter-vstack
+fate-filter-vstack: tests/data/filtergraphs/vstack
+fate-filter-vstack: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/vstack
 
 FATE_FILTER_VSYNTH-$(CONFIG_OVERLAY_FILTER) += fate-filter-overlay
 fate-filter-overlay: tests/data/filtergraphs/overlay
 fate-filter-overlay: CMD = framecrc -c:v pgmyuv -i $(SRC) -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay
 
+FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_rgb
+fate-filter-overlay_rgb: tests/data/filtergraphs/overlay_rgb
+fate-filter-overlay_rgb: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_rgb
+
+FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv420
+fate-filter-overlay_yuv420: tests/data/filtergraphs/overlay_yuv420
+fate-filter-overlay_yuv420: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_yuv420
+
+FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_nv12
+fate-filter-overlay_nv12: tests/data/filtergraphs/overlay_nv12
+fate-filter-overlay_nv12: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_nv12
+fate-filter-overlay_nv12: REF = $(SRC_PATH)/tests/ref/fate/filter-overlay_yuv420
+
+FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_nv21
+fate-filter-overlay_nv21: tests/data/filtergraphs/overlay_nv21
+fate-filter-overlay_nv21: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_nv21
+fate-filter-overlay_nv21: REF = $(SRC_PATH)/tests/ref/fate/filter-overlay_yuv420
+
+FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv422
+fate-filter-overlay_yuv422: tests/data/filtergraphs/overlay_yuv422
+fate-filter-overlay_yuv422: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_yuv422
+
+FATE_FILTER_VSYNTH-$(call ALLYES, SPLIT_FILTER SCALE_FILTER PAD_FILTER OVERLAY_FILTER) += fate-filter-overlay_yuv444
+fate-filter-overlay_yuv444: tests/data/filtergraphs/overlay_yuv444
+fate-filter-overlay_yuv444: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay_yuv444
+
+FATE_FILTER_OVERLAY_ALPHA += fate-filter-overlay_yuv420_yuva420  fate-filter-overlay_yuv422_yuva422  fate-filter-overlay_yuv444_yuva444  fate-filter-overlay_rgb_rgba  fate-filter-overlay_gbrp_gbrap
+FATE_FILTER_OVERLAY_ALPHA += fate-filter-overlay_yuva420_yuva420 fate-filter-overlay_yuva422_yuva422 fate-filter-overlay_yuva444_yuva444 fate-filter-overlay_rgba_rgba fate-filter-overlay_gbrap_gbrap
+$(FATE_FILTER_OVERLAY_ALPHA): SRC = $(TARGET_SAMPLES)/png1/lena-rgba.png
+$(FATE_FILTER_OVERLAY_ALPHA): CMD = framecrc -i $(SRC) -sws_flags +accurate_rnd+bitexact -vf $(FILTER) -frames:v 1
+
+fate-filter-overlay_yuv420_yuva420:  FILTER = "format=yuva420p[over];color=black:128x128,format=yuv420p[main];[main][over]overlay=format=yuv420"
+fate-filter-overlay_yuv422_yuva422:  FILTER = "format=yuva422p[over];color=black:128x128,format=yuv422p[main];[main][over]overlay=format=yuv422"
+fate-filter-overlay_yuv444_yuva444:  FILTER = "format=yuva444p[over];color=black:128x128,format=yuv444p[main];[main][over]overlay=format=yuv444"
+fate-filter-overlay_rgb_rgba:        FILTER = "format=rgba[over];color=black:128x128,format=rgb24[main];[main][over]overlay=format=rgb"
+fate-filter-overlay_gbrp_gbrap:      FILTER = "format=gbrap[over];color=black:128x128,format=gbrp[main];[main][over]overlay=format=gbrp"
+
+fate-filter-overlay_yuva420_yuva420: FILTER = "format=yuva420p[over];color=black:128x128,format=yuva420p[main];[main][over]overlay=format=yuv420"
+fate-filter-overlay_yuva422_yuva422: FILTER = "format=yuva422p[over];color=black:128x128,format=yuva422p[main];[main][over]overlay=format=yuv422"
+fate-filter-overlay_yuva444_yuva444: FILTER = "format=yuva444p[over];color=black:128x128,format=yuva444p[main];[main][over]overlay=format=yuv444"
+fate-filter-overlay_rgba_rgba:       FILTER = "format=rgba[over];color=black:128x128,format=rgba[main];[main][over]overlay=format=rgb"
+fate-filter-overlay_gbrap_gbrap:     FILTER = "format=gbrap[over];color=black:128x128,format=gbrap[main];[main][over]overlay=format=gbrp"
+
+FATE_FILTER_SAMPLES-$(call ALLYES, PNG_DECODER APNG_DEMUXER FORMAT_FILTER COLOR_FILTER OVERLAY_FILTER) += $(FATE_FILTER_OVERLAY_ALPHA)
+
+FATE_FILTER_VSYNTH-$(CONFIG_PHASE_FILTER) += fate-filter-phase
+fate-filter-phase: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf phase
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-00
+fate-filter-removegrain-mode-00: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=0:0:0
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-01
+fate-filter-removegrain-mode-01: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=1:1:1
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-02
+fate-filter-removegrain-mode-02: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=2:2:2
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-03
+fate-filter-removegrain-mode-03: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=3:3:3
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-04
+fate-filter-removegrain-mode-04: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=4:4:4
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-05
+fate-filter-removegrain-mode-05: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=5:5:5
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-06
+fate-filter-removegrain-mode-06: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=6:6:6
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-07
+fate-filter-removegrain-mode-07: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=7:7:7
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-08
+fate-filter-removegrain-mode-08: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=8:8:8
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-09
+fate-filter-removegrain-mode-09: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=9:9:9
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-10
+fate-filter-removegrain-mode-10: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=10:10:10
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-11
+fate-filter-removegrain-mode-11: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=11:11:11
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-12
+fate-filter-removegrain-mode-12: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=12:12:12
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-13
+fate-filter-removegrain-mode-13: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=13:13:13
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-14
+fate-filter-removegrain-mode-14: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=14:14:14
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-15
+fate-filter-removegrain-mode-15: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=15:15:15
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-16
+fate-filter-removegrain-mode-16: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=16:16:16
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-17
+fate-filter-removegrain-mode-17: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=17:17:17
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-18
+fate-filter-removegrain-mode-18: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=18:18:18
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-19
+fate-filter-removegrain-mode-19: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=19:19:19
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-20
+fate-filter-removegrain-mode-20: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=20:20:20
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-21
+fate-filter-removegrain-mode-21: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=21:21:21
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-22
+fate-filter-removegrain-mode-22: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=22:22:22
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-23
+fate-filter-removegrain-mode-23: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=23:23:23
+
+FATE_REMOVEGRAIN += fate-filter-removegrain-mode-24
+fate-filter-removegrain-mode-24: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=24:24:24
+
+fate-filter-removegrain: $(FATE_REMOVEGRAIN)
+FATE_FILTER_VSYNTH-$(CONFIG_REMOVEGRAIN_FILTER) += $(FATE_REMOVEGRAIN)
+
+FATE_FILTER_VSYNTH-$(CONFIG_SEPARATEFIELDS_FILTER) += fate-filter-separatefields
+fate-filter-separatefields: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf separatefields
+
+FATE_FILTER_VSYNTH-$(CONFIG_WEAVE_FILTER) += fate-filter-weave
+fate-filter-weave: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf weave=bottom
+
 FATE_FILTER_VSYNTH-$(CONFIG_SELECT_FILTER) += fate-filter-select-alternate
 fate-filter-select-alternate: tests/data/filtergraphs/select-alternate
 fate-filter-select-alternate: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/data/filtergraphs/select-alternate
@@ -56,6 +342,11 @@ FATE_FILTER_VSYNTH-$(call ALLYES, SETPTS_FILTER  SETTB_FILTER) += fate-filter-se
 fate-filter-setpts: tests/data/filtergraphs/setpts
 fate-filter-setpts: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_script $(TARGET_PATH)/tests/data/filtergraphs/setpts
 
+FATE_SHUFFLEFRAMES += fate-filter-shuffleframes
+fate-filter-shuffleframes: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf shuffleframes="2|1|0"
+
+FATE_FILTER_VSYNTH-$(CONFIG_SHUFFLEFRAMES_FILTER) += $(FATE_SHUFFLEFRAMES)
+
 FATE_SHUFFLEPLANES += fate-filter-shuffleplanes-dup-luma
 fate-filter-shuffleplanes-dup-luma: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf format=yuva444p,shuffleplanes=0:0:0:0
 
@@ -64,6 +355,17 @@ fate-filter-shuffleplanes-swapuv: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf shuff
 
 FATE_FILTER_VSYNTH-$(CONFIG_SHUFFLEPLANES_FILTER) += $(FATE_SHUFFLEPLANES)
 
+FATE_SWAPRECT += fate-filter-swaprect
+fate-filter-swaprect: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf swaprect
+
+FATE_FILTER_VSYNTH-$(CONFIG_SWAPRECT_FILTER) += $(FATE_SWAPRECT)
+
+FATE_FILTER_VSYNTH-$(CONFIG_TBLEND_FILTER) += fate-filter-tblend
+fate-filter-tblend: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf tblend=all_mode=difference128
+
+FATE_FILTER_VSYNTH-$(CONFIG_TELECINE_FILTER) += fate-filter-telecine
+fate-filter-telecine: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf telecine
+
 FATE_FILTER_VSYNTH-$(CONFIG_TRANSPOSE_FILTER) += fate-filter-transpose
 fate-filter-transpose: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf transpose
 
@@ -82,8 +384,56 @@ fate-filter-trim-time: CMD = framecrc -i $(SRC) -vf trim=0:0.09
 FATE_FILTER_VSYNTH-$(CONFIG_TRIM_FILTER) += $(FATE_TRIM)
 
 FATE_FILTER_VSYNTH-$(CONFIG_UNSHARP_FILTER) += fate-filter-unsharp
-fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp
+fate-filter-unsharp: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf unsharp=11:11:-1.5:11:11:-1.5
+
+FATE_FILTER_SAMPLES-$(call ALLYES, SMJPEG_DEMUXER MJPEG_DECODER PERMS_FILTER HQDN3D_FILTER) += fate-filter-hqdn3d-sample
+fate-filter-hqdn3d-sample: tests/data/filtergraphs/hqdn3d
+fate-filter-hqdn3d-sample: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/smjpeg/scenwin.mjpg -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/hqdn3d -an
+
+FATE_FILTER_SAMPLES-$(call ALLYES, MATROSKA_DEMUXER OVERLAY_FILTER H264_DECODER DVDSUB_DECODER) += fate-filter-overlay-dvdsub-2397
+fate-filter-overlay-dvdsub-2397: tests/data/filtergraphs/overlay-dvdsub-2397
+fate-filter-overlay-dvdsub-2397: CMD = framecrc -flags bitexact -i $(TARGET_SAMPLES)/filter/242_4.mkv -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/overlay-dvdsub-2397 -c:a copy
+
+FATE_FILTER_HQX-$(call ALLYES, IMAGE2_DEMUXER PNG_DECODER HQX_FILTER) = fate-filter-hq2x fate-filter-hq3x fate-filter-hq4x
+FATE_FILTER_SAMPLES-yes += $(FATE_FILTER_HQX-yes)
+fate-filter-hq2x: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf hqx=2 -pix_fmt bgra
+fate-filter-hq3x: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf hqx=3 -pix_fmt bgra
+fate-filter-hq4x: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf hqx=4 -pix_fmt bgra
+fate-filter-hqx: $(FATE_FILTER_HQX-yes)
+
+FATE_FILTER_XBR-$(call ALLYES, IMAGE2_DEMUXER PNG_DECODER XBR_FILTER) = fate-filter-2xbr fate-filter-3xbr fate-filter-4xbr
+FATE_FILTER_SAMPLES-yes += $(FATE_FILTER_XBR-yes)
+fate-filter-2xbr: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf xbr=2 -pix_fmt bgra
+fate-filter-3xbr: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf xbr=3 -pix_fmt bgra
+fate-filter-4xbr: CMD = framecrc -i $(TARGET_SAMPLES)/filter/pixelart%d.png -vf xbr=4 -pix_fmt bgra
+fate-filter-xbr: $(FATE_FILTER_XBR-yes)
+
+FATE_FILTER_SAMPLES-$(call ALLYES, UTVIDEO_DECODER AVI_DEMUXER PERMS_FILTER CURVES_FILTER) += fate-filter-curves
+fate-filter-curves: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_rgb_median.avi -vf perms=random,curves=vintage
+
+FATE_FILTER_SAMPLES-$(call ALLYES, VMD_DEMUXER VMDVIDEO_DECODER FORMAT_FILTER PERMS_FILTER GRADFUN_FILTER) += fate-filter-gradfun-sample
+fate-filter-gradfun-sample: tests/data/filtergraphs/gradfun
+fate-filter-gradfun-sample: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -filter_script $(TARGET_PATH)/tests/data/filtergraphs/gradfun -an -frames:v 20
 
+FATE_FILTER-$(call ALLYES, TESTSRC_FILTER SINE_FILTER CONCAT_FILTER) += fate-filter-concat
+fate-filter-concat: tests/data/filtergraphs/concat
+fate-filter-concat: CMD = framecrc -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/concat
+
+FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER FPS_FILTER MPDECIMATE_FILTER) += fate-filter-mpdecimate
+fate-filter-mpdecimate: CMD = framecrc -lavfi testsrc2=r=2:d=10,fps=3,mpdecimate -r 3 -pix_fmt yuv420p
+
+FATE_FILTER_SAMPLES-$(call ALLYES, MOV_DEMUXER FPS_FILTER QTRLE_DECODER) += fate-filter-fps-cfr fate-filter-fps fate-filter-fps-r
+fate-filter-fps-cfr: CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -r 30 -vsync cfr -pix_fmt yuv420p
+fate-filter-fps-r:   CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -r 30 -vf fps -pix_fmt yuv420p
+fate-filter-fps:     CMD = framecrc -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -vf fps=30 -pix_fmt yuv420p
+
+FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER SPLIT_FILTER ALPHAEXTRACT_FILTER ALPHAMERGE_FILTER) += fate-filter-alphaextract_alphamerge_rgb
+fate-filter-alphaextract_alphamerge_rgb: tests/data/filtergraphs/alphamerge_alphaextract_rgb
+fate-filter-alphaextract_alphamerge_rgb: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/alphamerge_alphaextract_rgb
+
+FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER SPLIT_FILTER ALPHAEXTRACT_FILTER ALPHAMERGE_FILTER) += fate-filter-alphaextract_alphamerge_yuv
+fate-filter-alphaextract_alphamerge_yuv: tests/data/filtergraphs/alphamerge_alphaextract_yuv
+fate-filter-alphaextract_alphamerge_yuv: CMD = framecrc -c:v pgmyuv -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/alphamerge_alphaextract_yuv
 
 FATE_FILTER_VSYNTH-$(CONFIG_CROP_FILTER) += fate-filter-crop
 fate-filter-crop: CMD = video_filter "crop=iw-100:ih-100:100:100"
@@ -106,18 +456,146 @@ fate-filter-scale200: CMD = video_filter "scale=w=200:h=200"
 FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scale500
 fate-filter-scale500: CMD = video_filter "scale=w=500:h=500"
 
+FATE_FILTER_VSYNTH-$(CONFIG_SCALE2REF_FILTER) += fate-filter-scale2ref_keep_aspect
+fate-filter-scale2ref_keep_aspect: tests/data/filtergraphs/scale2ref_keep_aspect
+fate-filter-scale2ref_keep_aspect: CMD = framemd5 -frames:v 5 -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/scale2ref_keep_aspect -map "[main]"
+
+FATE_FILTER_VSYNTH-$(CONFIG_SCALE_FILTER) += fate-filter-scalechroma
+fate-filter-scalechroma: tests/data/vsynth1.yuv
+fate-filter-scalechroma: CMD = framecrc -flags bitexact -s 352x288 -pix_fmt yuv444p -i tests/data/vsynth1.yuv -pix_fmt yuv420p -sws_flags +bitexact -vf scale=out_v_chr_pos=33:out_h_chr_pos=151
+
 FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip
 fate-filter-vflip: CMD = video_filter "vflip"
 
+FATE_FILTER_VSYNTH-$(CONFIG_COLORMATRIX_FILTER) += fate-filter-colormatrix1
+fate-filter-colormatrix1: CMD = video_filter "colormatrix=bt601:smpte240m,colormatrix=smpte240m:fcc,colormatrix=fcc:bt601,colormatrix=bt601:fcc,colormatrix=fcc:smpte240m,colormatrix=smpte240m:bt709"
+
+FATE_FILTER_VSYNTH-$(CONFIG_COLORMATRIX_FILTER) += fate-filter-colormatrix2
+fate-filter-colormatrix2: CMD = video_filter "colormatrix=bt709:fcc,colormatrix=fcc:bt709,colormatrix=bt709:bt601,colormatrix=bt601:bt709,colormatrix=bt709:smpte240m,colormatrix=smpte240m:bt601"
+
 FATE_FILTER_VSYNTH-$(call ALLYES, CROP_FILTER VFLIP_FILTER) += fate-filter-vflip_crop
 fate-filter-vflip_crop: CMD = video_filter "vflip,crop=iw-100:ih-100:100:100"
 
 FATE_FILTER_VSYNTH-$(CONFIG_VFLIP_FILTER) += fate-filter-vflip_vflip
 fate-filter-vflip_vflip: CMD = video_filter "vflip,vflip"
 
+FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER PERMS_FILTER EDGEDETECT_FILTER) += fate-filter-edgedetect
+fate-filter-edgedetect: CMD = video_filter "format=gray,perms=random,edgedetect" -frames:v 20
+
+FATE_FILTER_VSYNTH-$(call ALLYES, FORMAT_FILTER PERMS_FILTER EDGEDETECT_FILTER) += fate-filter-edgedetect-colormix
+fate-filter-edgedetect-colormix: CMD = video_filter "format=gbrp,perms=random,edgedetect=mode=colormix" -frames:v 20
+
+FATE_FILTER_VSYNTH-$(call ALLYES, PERMS_FILTER HUE_FILTER) += fate-filter-hue
+fate-filter-hue: CMD = video_filter "perms=random,hue=s=sin(2*PI*t)+1" -frames:v 20
+
+FATE_FILTER_VSYNTH-$(CONFIG_IDET_FILTER) += fate-filter-idet
+fate-filter-idet: CMD = framecrc -flags bitexact -idct simple -i $(SRC) -vf idet -frames:v 25 -flags +bitexact
+
+FATE_FILTER_VSYNTH-$(CONFIG_PAD_FILTER) += fate-filter-pad
+fate-filter-pad: CMD = video_filter "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2"
+
+FATE_FILTER_PP = fate-filter-pp fate-filter-pp1 fate-filter-pp2 fate-filter-pp3 fate-filter-pp4 fate-filter-pp5 fate-filter-pp6
+FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += $(FATE_FILTER_PP)
+$(FATE_FILTER_PP): fate-vsynth1-mpeg4-qprd
+
+fate-filter-pp:  CMD = framecrc -flags bitexact -idct simple -i $(TARGET_PATH)/tests/data/fate/vsynth1-mpeg4-qprd.avi -frames:v 5 -flags +bitexact -vf "pp=be/hb/vb/tn/l5/al"
+fate-filter-pp1: CMD = video_filter "pp=fq|4/be/hb/vb/tn/l5/al"
+fate-filter-pp2: CMD = video_filter "qp=x+y,pp=be/h1/v1/lb"
+fate-filter-pp3: CMD = video_filter "qp=x+y,pp=be/ha|128|7/va/li"
+fate-filter-pp4: CMD = video_filter "pp=be/ci"
+fate-filter-pp5: CMD = video_filter "pp=md"
+fate-filter-pp6: CMD = video_filter "pp=be/fd"
+
+FATE_FILTER_VSYNTH-$(call ALLYES, QP_FILTER PP_FILTER) += fate-filter-qp
+fate-filter-qp: CMD = video_filter "qp=17,pp=be/hb/vb/tn/l5/al"
+
+FATE_FILTER_VSYNTH-$(CONFIG_SELECT_FILTER) += fate-filter-select
+fate-filter-select: CMD = framecrc -flags bitexact -idct simple -i $(SRC) -vf "select=not(eq(mod(n\,2)\,0)+eq(mod(n\,3)\,0))" -frames:v 25 -flags +bitexact
+
+FATE_FILTER_VSYNTH-$(CONFIG_SETDAR_FILTER) += fate-filter-setdar
+fate-filter-setdar: CMD = video_filter "setdar=dar=16/9"
+
+FATE_FILTER_VSYNTH-$(CONFIG_SETSAR_FILTER) += fate-filter-setsar
+fate-filter-setsar: CMD = video_filter "setsar=sar=16/11"
+
+FATE_STEREO3D += fate-filter-stereo3d-al-sbsl
+fate-filter-stereo3d-al-sbsl: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=al:sbsl
+
+FATE_STEREO3D += fate-filter-stereo3d-ar-abl
+fate-filter-stereo3d-ar-abl: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=ar:abl
+
+FATE_STEREO3D += fate-filter-stereo3d-abr-mr
+fate-filter-stereo3d-abr-mr: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=abr:mr
+
+FATE_STEREO3D += fate-filter-stereo3d-abr-ml
+fate-filter-stereo3d-abr-ml: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=abr:ml
+
+FATE_STEREO3D  += fate-filter-stereo3d-sbsl-abl
+fate-filter-stereo3d-sbsl-abl: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:abl
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-abr
+fate-filter-stereo3d-sbsl-abr: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:abr
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-al
+fate-filter-stereo3d-sbsl-al: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:al
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-sbsr
+fate-filter-stereo3d-sbsl-sbsr: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:sbsr
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-agmc
+fate-filter-stereo3d-sbsl-agmc: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:agmc
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-agmd
+fate-filter-stereo3d-sbsl-agmd: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:agmd
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-agmg
+fate-filter-stereo3d-sbsl-agmg: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:agmg
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-agmh
+fate-filter-stereo3d-sbsl-agmh: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:agmh
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-arbg
+fate-filter-stereo3d-sbsl-arbg: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:arbg
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-arcc
+fate-filter-stereo3d-sbsl-arcc: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:arcc
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-arcd
+fate-filter-stereo3d-sbsl-arcd: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:arcd
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-arcg
+fate-filter-stereo3d-sbsl-arcg: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:arcg
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-arch
+fate-filter-stereo3d-sbsl-arch: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:arch
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-argg
+fate-filter-stereo3d-sbsl-argg: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:argg
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-aybc
+fate-filter-stereo3d-sbsl-aybc: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:aybc
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-aybd
+fate-filter-stereo3d-sbsl-aybd: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:aybd
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-aybg
+fate-filter-stereo3d-sbsl-aybg: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:aybg
+
+FATE_STEREO3D += fate-filter-stereo3d-sbsl-aybh
+fate-filter-stereo3d-sbsl-aybh: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 5 -flags +bitexact -sws_flags +accurate_rnd+bitexact -vf stereo3d=sbsl:aybh
+
+fate-filter-stereo3d: $(FATE_STEREO3D)
+FATE_FILTER_VSYNTH-$(CONFIG_STEREO3D_FILTER) += $(FATE_STEREO3D)
+
+FATE_FILTER_VSYNTH-$(CONFIG_THUMBNAIL_FILTER) += fate-filter-thumbnail
+fate-filter-thumbnail: CMD = video_filter "thumbnail=10"
+
+FATE_FILTER_VSYNTH-$(CONFIG_TILE_FILTER) += fate-filter-tile
+fate-filter-tile: CMD = video_filter "tile=3x3:nb_frames=5:padding=7:margin=2"
+
 
 tests/pixfmts.mak: TAG = GEN
-tests/pixfmts.mak: avconv$(EXESUF) | tests
+tests/pixfmts.mak: ffmpeg$(PROGSSUF)$(EXESUF) | tests
 	$(M)printf "PIXFMTS = " > $@
 	$(Q)$(TARGET_EXEC) $(TARGET_PATH)/$< -pix_fmts list 2> /dev/null | awk 'NR > 8 && /^IO/ { printf $$2 " " }' >> $@
 	$(Q)printf "\n" >> $@
@@ -139,36 +617,154 @@ fate-filter-pixdesc: $(FATE_FILTER_PIXDESC-yes)
 FATE_FILTER_VSYNTH-yes += $(FATE_FILTER_PIXDESC-yes)
 
 
-FATE_FILTER_PIXFMTS += fate-filter-pixfmts-copy
+FATE_FILTER_PIXFMTS-$(CONFIG_COPY_FILTER) += fate-filter-pixfmts-copy
 fate-filter-pixfmts-copy:  CMD = pixfmts
 
-FATE_FILTER_PIXFMTS += fate-filter-pixfmts-crop
+FATE_FILTER_PIXFMTS-$(CONFIG_CROP_FILTER) += fate-filter-pixfmts-crop
 fate-filter-pixfmts-crop:  CMD = pixfmts "100:100:100:100"
 
-FATE_FILTER_PIXFMTS += fate-filter-pixfmts-hflip
+FATE_FILTER_PIXFMTS-$(CONFIG_FIELD_FILTER) += fate-filter-pixfmts-field
+fate-filter-pixfmts-field: CMD = pixfmts "bottom"
+
+FATE_FILTER_PIXFMTS-$(call ALLYES, TELECINE_FILTER FIELDMATCH_FILTER) += fate-filter-pixfmts-fieldmatch
+fate-filter-pixfmts-fieldmatch: CMD = pixfmts "" "telecine," 25
+
+FATE_FILTER_PIXFMTS-$(CONFIG_FIELDORDER_FILTER) += fate-filter-pixfmts-fieldorder
+fate-filter-pixfmts-fieldorder: CMD = pixfmts "tff" "setfield=bff,"
+
+FATE_FILTER_PIXFMTS-$(CONFIG_HFLIP_FILTER) += fate-filter-pixfmts-hflip
 fate-filter-pixfmts-hflip: CMD = pixfmts
 
-FATE_FILTER_PIXFMTS += fate-filter-pixfmts-null
+#FATE_FILTER_PIXFMTS-$(CONFIG_HISTEQ_FILTER) += fate-filter-pixfmts-histeq
+#fate-filter-pixfmts-histeq: CMD = pixfmts "antibanding=strong"
+
+FATE_FILTER_PIXFMTS-$(CONFIG_IL_FILTER) += fate-filter-pixfmts-il
+fate-filter-pixfmts-il:    CMD = pixfmts "luma_mode=d:chroma_mode=d:alpha_mode=d"
+
+FATE_FILTER_PIXFMTS-$(CONFIG_KERNDEINT_FILTER) += fate-filter-pixfmts-kerndeint
+fate-filter-pixfmts-kerndeint: CMD = pixfmts "" "tinterlace=interleave_top,"
+
+FATE_FILTER_PIXFMTS-$(CONFIG_LUT_FILTER) += fate-filter-pixfmts-lut
+fate-filter-pixfmts-lut: CMD = pixfmts "c0=2*val:c1=2*val:c2=val/2:c3=negval+40"
+
+FATE_FILTER_PIXFMTS-$(CONFIG_NULL_FILTER) += fate-filter-pixfmts-null
 fate-filter-pixfmts-null:  CMD = pixfmts
 
-FATE_FILTER_PIXFMTS += fate-filter-pixfmts-pad
+FATE_FILTER_PIXFMTS-$(CONFIG_PAD_FILTER) += fate-filter-pixfmts-pad
 fate-filter-pixfmts-pad:   CMD = pixfmts "500:400:20:20"
 
-FATE_FILTER_PIXFMTS += fate-filter-pixfmts-scale
+FATE_FILTER_PIXFMTS-$(call ALLYES, TELECINE_FILTER PULLUP_FILTER) += fate-filter-pixfmts-pullup
+fate-filter-pixfmts-pullup: CMD = pixfmts "" "telecine," 25
+
+FATE_FILTER_PIXFMTS-$(CONFIG_ROTATE_FILTER) += fate-filter-pixfmts-rotate
+fate-filter-pixfmts-rotate: CMD = pixfmts "2*PI*n/50"
+
+FATE_FILTER_PIXFMTS-$(CONFIG_SCALE_FILTER) += fate-filter-pixfmts-scale
 fate-filter-pixfmts-scale: CMD = pixfmts "200:100"
 
-FATE_FILTER_PIXFMTS += fate-filter-pixfmts-vflip
+FATE_FILTER_PIXFMTS-$(CONFIG_SUPER2XSAI_FILTER) += fate-filter-pixfmts-super2xsai
+fate-filter-pixfmts-super2xsai: CMD = pixfmts
+
+FATE_FILTER_PIXFMTS-$(CONFIG_SWAPUV_FILTER) += fate-filter-pixfmts-swapuv
+fate-filter-pixfmts-swapuv: CMD = pixfmts
+
+FATE_FILTER_PIXFMTS-$(CONFIG_TINTERLACE_FILTER) += fate-filter-pixfmts-tinterlace_cvlpf
+fate-filter-pixfmts-tinterlace_cvlpf: CMD = pixfmts "interleave_top:cvlpf"
+
+FATE_FILTER_PIXFMTS-$(CONFIG_TINTERLACE_FILTER) += fate-filter-pixfmts-tinterlace_merge
+fate-filter-pixfmts-tinterlace_merge: CMD = pixfmts "merge"
+
+FATE_FILTER_PIXFMTS-$(CONFIG_TINTERLACE_FILTER) += fate-filter-pixfmts-tinterlace_pad
+fate-filter-pixfmts-tinterlace_pad: CMD = pixfmts "pad"
+
+FATE_FILTER_PIXFMTS-$(CONFIG_TINTERLACE_FILTER) += fate-filter-pixfmts-tinterlace_vlpf
+fate-filter-pixfmts-tinterlace_vlpf: CMD = pixfmts "interleave_top:vlpf"
+
+FATE_FILTER_PIXFMTS-$(CONFIG_VFLIP_FILTER) += fate-filter-pixfmts-vflip
 fate-filter-pixfmts-vflip: CMD = pixfmts
 
-$(FATE_FILTER_PIXFMTS): libavfilter/tests/filtfmts$(EXESUF)
-FATE_FILTER_VSYNTH-$(CONFIG_FORMAT_FILTER) += $(FATE_FILTER_PIXFMTS)
+$(FATE_FILTER_PIXFMTS-yes): libavfilter/tests/filtfmts$(EXESUF)
+FATE_FILTER_VSYNTH-$(CONFIG_FORMAT_FILTER) += $(FATE_FILTER_PIXFMTS-yes)
 
+fate-filter-pixfmts: $(FATE_FILTER_PIXFMTS-yes)
 
 $(FATE_FILTER_VSYNTH-yes): $(VREF)
 $(FATE_FILTER_VSYNTH-yes): SRC = $(TARGET_PATH)/tests/vsynth1/%02d.pgm
 
 FATE_AVCONV-$(call DEMDEC, IMAGE2, PGMYUV) += $(FATE_FILTER_VSYNTH-yes)
 
-fate-vfilter: $(FATE_FILTER-yes) $(FATE_FILTER_VSYNTH-yes)
+#
+# Metadata tests
+#
+FILTER_METADATA_COMMAND = ffprobe$(PROGSSUF)$(EXESUF) -of compact=p=0 -show_entries frame=pkt_pts:frame_tags -bitexact -f lavfi
+
+SCENEDETECT_DEPS = FFPROBE LAVFI_INDEV MOVIE_FILTER SELECT_FILTER SCALE_FILTER \
+                   AVCODEC AVDEVICE MOV_DEMUXER SVQ3_DECODER ZLIB
+FATE_METADATA_FILTER-$(call ALLYES, $(SCENEDETECT_DEPS)) += fate-filter-metadata-scenedetect
+fate-filter-metadata-scenedetect: SRC = $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov
+fate-filter-metadata-scenedetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',select=gt(scene\,.4)"
+
+CROPDETECT_DEPS = FFPROBE LAVFI_INDEV MOVIE_FILTER CROPDETECT_FILTER SCALE_FILTER \
+                  AVCODEC AVDEVICE MOV_DEMUXER H264_DECODER
+FATE_METADATA_FILTER-$(call ALLYES, $(CROPDETECT_DEPS)) += fate-filter-metadata-cropdetect
+fate-filter-metadata-cropdetect: SRC = $(TARGET_SAMPLES)/filter/cropdetect.mp4
+fate-filter-metadata-cropdetect: CMD = run $(FILTER_METADATA_COMMAND) "sws_flags=+accurate_rnd+bitexact;movie='$(SRC)',cropdetect=max_outliers=3"
+
+SILENCEDETECT_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER AMR_DEMUXER AMRWB_DECODER SILENCEDETECT_FILTER
+FATE_METADATA_FILTER-$(call ALLYES, $(SILENCEDETECT_DEPS)) += fate-filter-metadata-silencedetect
+fate-filter-metadata-silencedetect: SRC = $(TARGET_SAMPLES)/amrwb/seed-12k65.awb
+fate-filter-metadata-silencedetect: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',silencedetect=d=-20dB"
+
+EBUR128_METADATA_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER EBUR128_FILTER
+FATE_METADATA_FILTER-$(call ALLYES, $(EBUR128_METADATA_DEPS)) += fate-filter-metadata-ebur128
+fate-filter-metadata-ebur128: SRC = $(TARGET_SAMPLES)/filter/seq-3341-7_seq-3342-5-24bit.flac
+fate-filter-metadata-ebur128: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',ebur128=metadata=1"
+
+READVITC_METADATA_DEPS = FFPROBE LAVFI_INDEV MOVIE_FILTER AVCODEC AVDEVICE \
+                         AVI_DEMUXER FFVHUFF_DECODER READVITC_FILTER
+FATE_METADATA_FILTER-$(call ALLYES, $(READVITC_METADATA_DEPS)) += fate-filter-metadata-readvitc-def
+fate-filter-metadata-readvitc-def: SRC = $(TARGET_SAMPLES)/filter/sample-vitc.avi
+fate-filter-metadata-readvitc-def: CMD = run $(FILTER_METADATA_COMMAND) "movie='$(SRC)',readvitc"
+
+FATE_METADATA_FILTER-$(call ALLYES, $(READVITC_METADATA_DEPS)) += fate-filter-metadata-readvitc-thr
+fate-filter-metadata-readvitc-thr: SRC = $(TARGET_SAMPLES)/filter/sample-vitc.avi
+fate-filter-metadata-readvitc-thr: CMD = run $(FILTER_METADATA_COMMAND) "movie='$(SRC)',readvitc=thr_b=0.3:thr_w=0.5"
+
+AVF_PHASE_METER_DEPS = FFPROBE AVDEVICE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER SINE_FILTER APHASEMETER_FILTER
+FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-mono
+fate-filter-metadata-avf-aphase-meter-mono: CMD = run $(FILTER_METADATA_COMMAND) sine="frequency=1000:sample_rate=48000:duration=1,aphasemeter=video=0"
+
+FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-out-of-phase
+fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filter/out-of-phase-1000hz.flac
+fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_COMMAND) "amovie='$(SRC)',aphasemeter=video=0"
+
+tests/data/file4560-override2rotate0.mov: TAG = GEN
+tests/data/file4560-override2rotate0.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
+	-i $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov -c copy -flags +bitexact -metadata:s:v:0 rotate=0 $(TARGET_PATH)/$@ -y 2>/dev/null
+
+FATE_FILTER_SAMPLES-$(call ALLYES, MOV_DEMUXER H264_DECODER AAC_FIXED_DECODER PCM_S16LE_ENCODER MOV_MUXER) += fate-filter-meta-4560-rotate0
+fate-filter-meta-4560-rotate0: tests/data/file4560-override2rotate0.mov
+fate-filter-meta-4560-rotate0: CMD = framecrc -flags +bitexact -c:a aac_fixed -i $(TARGET_PATH)/tests/data/file4560-override2rotate0.mov
+
+REFCMP_DEPS = FFMPEG LAVFI_INDEV TESTSRC2_FILTER AVGBLUR_FILTER METADATA_FILTER
+
+FATE_FILTER_SAMPLES-$(call ALLYES, $(REFCMP_DEPS) PSNR_FILTER) += fate-filter-refcmp-psnr-rgb
+fate-filter-refcmp-psnr-rgb: CMD = refcmp_metadata psnr rgb24 0.001
+
+FATE_FILTER_SAMPLES-$(call ALLYES, $(REFCMP_DEPS) PSNR_FILTER) += fate-filter-refcmp-psnr-yuv
+fate-filter-refcmp-psnr-yuv: CMD = refcmp_metadata psnr yuv422p 0.0015
+
+FATE_FILTER_SAMPLES-$(call ALLYES, $(REFCMP_DEPS) SSIM_FILTER) += fate-filter-refcmp-ssim-rgb
+fate-filter-refcmp-ssim-rgb: CMD = refcmp_metadata ssim rgb24 0.015
+
+FATE_FILTER_SAMPLES-$(call ALLYES, $(REFCMP_DEPS) SSIM_FILTER) += fate-filter-refcmp-ssim-yuv
+fate-filter-refcmp-ssim-yuv: CMD = refcmp_metadata ssim yuv422p 0.015
+
+FATE_SAMPLES_FFPROBE += $(FATE_METADATA_FILTER-yes)
+FATE_SAMPLES_FFMPEG += $(FATE_FILTER_SAMPLES-yes)
+FATE_FFMPEG += $(FATE_FILTER-yes)
+
+fate-vfilter: $(FATE_FILTER-yes) $(FATE_FILTER_SAMPLES-yes) $(FATE_FILTER_VSYNTH-yes)
 
-fate-filter: fate-afilter fate-vfilter
+fate-filter: fate-afilter fate-vfilter $(FATE_METADATA_FILTER-yes)
diff --git a/tests/fate/fits.mak b/tests/fate/fits.mak
new file mode 100644
index 0000000000..3d58f98807
--- /dev/null
+++ b/tests/fate/fits.mak
@@ -0,0 +1,59 @@
+tests/data/fits-multi.fits: TAG = GEN
+tests/data/fits-multi.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
+        -i $(TARGET_SAMPLES)/gif/m4nb.gif \
+        -y $(TARGET_PATH)/$(@) 2>/dev/null
+
+#mapping of fits file formats to png filenames
+map.tests/data/lena-gray.fits    := gray8
+map.tests/data/lena-gbrp.fits    := rgb24
+map.tests/data/lena-gbrp16.fits  := rgb48
+map.tests/data/lena-gbrap16.fits := rgba64
+
+tests/data/lena%.fits: TAG = GEN
+tests/data/lena%.fits: NAME = $(map.$(@))
+tests/data/lena%.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
+        -i $(TARGET_SAMPLES)/png1/lena-$(map.$(@)).png \
+        -y $(TARGET_PATH)/$(@) 2>/dev/null
+
+FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-ext_data_min_max
+fate-fitsdec-ext_data_min_max: CMD = framecrc -i $(TARGET_SAMPLES)/fits/x0cj010ct_d0h.fit -pix_fmt gray16
+
+FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-blank_bitpix32
+fate-fitsdec-blank_bitpix32: CMD = framecrc -blank_value 65535 -i $(TARGET_SAMPLES)/fits/file008.fits -pix_fmt gray16
+
+FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-bitpix-32
+fate-fitsdec-bitpix-32: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0005.fits -pix_fmt gray16
+
+FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-bitpix-64
+fate-fitsdec-bitpix-64: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0006.fits -pix_fmt gray16
+
+FATE_FITS_DEC-$(call ALLYES, GIF_DEMUXER FITS_DEMUXER GIF_DECODER FITS_DECODER FITS_ENCODER FITS_MUXER) += fate-fitsdec-multi
+fate-fitsdec-multi: tests/data/fits-multi.fits
+fate-fitsdec-multi: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -pix_fmt gbrap
+
+fate-fitsdec%: PIXFMT = $(word 3, $(subst -, ,$(@)))
+fate-fitsdec%: SRC = $(TARGET_PATH)/tests/data/lena-$(PIXFMT).fits
+fate-fitsdec%: CMD = framecrc -i $(SRC) -pix_fmt $(PIXFMT)
+
+FATE_FITS_DEC_PIXFMT = gray gbrp gbrp16 gbrap16
+$(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%): fate-fitsdec-%: tests/data/lena-%.fits
+FATE_FITS_DEC-$(call ALLYES, FITS_DEMUXER IMAGE2_DEMUXER FITS_DECODER PNG_DECODER FITS_ENCODER FITS_MUXER) += $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%)
+
+FATE_FITS += $(FATE_FITS_DEC-yes)
+fate-fitsdec: $(FATE_FITS_DEC-yes)
+
+fate-fitsenc%: PIXFMT = $(word 3, $(subst -, ,$(@)))
+fate-fitsenc%: SRC = $(TARGET_PATH)/tests/data/fits-multi.fits
+fate-fitsenc%: CMD = framecrc -i $(SRC) -c:v fits -pix_fmt $(PIXFMT)
+
+FATE_FITS_ENC_PIXFMT = gray gray16be gbrp gbrap gbrp16be gbrap16be
+$(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%): tests/data/fits-multi.fits
+FATE_FITS_ENC-$(call ALLYES, GIF_DEMUXER GIF_DECODER FITS_ENCODER FITS_MUXER) += $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%)
+
+FATE_FITS += $(FATE_FITS_ENC-yes)
+fate-fitsenc: $(FATE_FITS_ENC-yes)
+
+FATE_SAMPLES_FFMPEG += $(FATE_FITS)
+fate-fits: $(FATE_FITS)
diff --git a/tests/fate/flac.mak b/tests/fate/flac.mak
index e28f45f82f..115cc965e1 100644
--- a/tests/fate/flac.mak
+++ b/tests/fate/flac.mak
@@ -6,6 +6,7 @@ FATE_FLAC += fate-flac-16-chmode-indep                                  \
              fate-flac-16-lpc-cholesky                                  \
              fate-flac-16-lpc-levinson                                  \
              fate-flac-24-comp-8                                        \
+             fate-flac-rice-params                                      \
 
 fate-flac-16-chmode-%: OPTS = -ch_mode $(@:fate-flac-16-chmode-%=%)
 fate-flac-16-fixed:    OPTS = -lpc_type fixed
@@ -19,8 +20,13 @@ fate-flac-24-comp-%: OPTS = -compression_level $(@:fate-flac-24-comp-%=%)
 fate-flac-24-%: REF = $(SAMPLES)/audio-reference/divertimenti_2ch_96kHz_s24.wav
 fate-flac-24-%: CMD = enc_dec_pcm flac wav s24le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c flac $(OPTS)
 
+fate-flac-rice-params: REF = $(SAMPLES)/audio-reference/chorusnoise_2ch_44kHz_s16.wav
+fate-flac-rice-params: CMD = enc_dec_pcm flac wav s16le $(subst $(SAMPLES),$(TARGET_SAMPLES),$(REF)) -c flac
+
 fate-flac-%: CMP = oneoff
 fate-flac-%: FUZZ = 0
 
-FATE_SAMPLES_AVCONV += $(FATE_FLAC)
+FATE_FLAC-$(call ENCMUX, FLAC, FLAC) += $(FATE_FLAC)
+
+FATE_SAMPLES_AVCONV += $(FATE_FLAC-yes)
 fate-flac: $(FATE_FLAC)
diff --git a/tests/fate/flvenc.mak b/tests/fate/flvenc.mak
new file mode 100644
index 0000000000..4fdeeff4c1
--- /dev/null
+++ b/tests/fate/flvenc.mak
@@ -0,0 +1,11 @@
+tests/data/add_keyframe_index.flv: TAG = GEN
+tests/data/add_keyframe_index.flv: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
+		-f lavfi -i "sws_flags=+accurate_rnd+bitexact;testsrc=r=7:n=2:d=20" -sws_flags '+accurate_rnd+bitexact' -metadata "encoder=Lavf" -pix_fmt yuv420p -c:v flv1 -g 7 -f flv -flags +bitexact -fflags +bitexact \
+		-flvflags add_keyframe_index -idct simple -dct int -y $(TARGET_PATH)/tests/data/add_keyframe_index.flv 2> /dev/null;
+
+FATE_AFILTER-$(call ALLYES, FLV_MUXER FLV_DEMUXER AVDEVICE TESTSRC_FILTER LAVFI_INDEV FLV_ENCODER) += fate-flv-add_keyframe_index
+fate-flv-add_keyframe_index: tests/data/add_keyframe_index.flv
+fate-flv-add_keyframe_index: CMD = ffmetadata -flags +bitexact -i $(TARGET_PATH)/tests/data/add_keyframe_index.flv
+
+
diff --git a/tests/fate/gapless.mak b/tests/fate/gapless.mak
new file mode 100644
index 0000000000..0253b9ec61
--- /dev/null
+++ b/tests/fate/gapless.mak
@@ -0,0 +1,125 @@
+FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-gapless-mp3
+fate-gapless-mp3: CMD = gapless $(TARGET_SAMPLES)/gapless/gapless.mp3
+
+FATE_GAPLESS-$(CONFIG_MP3_DEMUXER) += fate-audiomatch-square-mp3
+fate-audiomatch-square-mp3: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/square3.mp3 $(TARGET_SAMPLES)/audiomatch/square3.wav
+
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-square-aac
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-afconvert-16000-mono-lc-adts    fate-audiomatch-afconvert-16000-mono-lc-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-afconvert-44100-mono-lc-adts    fate-audiomatch-afconvert-44100-mono-lc-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-afconvert-16000-mono-he-adts    fate-audiomatch-afconvert-16000-mono-he-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-afconvert-44100-mono-he-adts    fate-audiomatch-afconvert-44100-mono-he-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-afconvert-16000-stereo-he-adts  fate-audiomatch-afconvert-16000-stereo-he-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-afconvert-44100-stereo-he-adts  fate-audiomatch-afconvert-44100-stereo-he-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-afconvert-16000-stereo-he2-adts fate-audiomatch-afconvert-16000-stereo-he2-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-afconvert-44100-stereo-he2-adts fate-audiomatch-afconvert-44100-stereo-he2-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-afconvert-16000-stereo-lc-adts  fate-audiomatch-afconvert-16000-stereo-lc-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-afconvert-44100-stereo-lc-adts  fate-audiomatch-afconvert-44100-stereo-lc-m4a
+
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-faac-16000-mono-lc-adts    fate-audiomatch-faac-16000-mono-lc-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-faac-44100-mono-lc-adts    fate-audiomatch-faac-44100-mono-lc-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-faac-16000-stereo-lc-adts  fate-audiomatch-faac-16000-stereo-lc-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-faac-44100-stereo-lc-adts  fate-audiomatch-faac-44100-stereo-lc-m4a
+
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-dolby-44100-mono-lc-mp4
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-dolby-44100-mono-he-mp4
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-dolby-44100-stereo-he-mp4
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-dolby-44100-stereo-he2-mp4
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-dolby-44100-stereo-lc-mp4
+
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-nero-16000-mono-lc-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-nero-44100-mono-lc-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-nero-16000-mono-he-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-nero-44100-mono-he-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-nero-16000-stereo-he-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-nero-44100-stereo-he-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-nero-16000-stereo-he2-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-nero-44100-stereo-he2-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-nero-16000-stereo-lc-m4a
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-nero-44100-stereo-lc-m4a
+
+FATE_GAPLESS-$(CONFIG_MOV_DEMUXER) += fate-audiomatch-quicktime7-44100-stereo-lc-mp4 fate-audiomatch-quicktimeX-44100-stereo-lc-m4a
+
+fate-audiomatch-square-aac: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/square3.m4a $(TARGET_SAMPLES)/audiomatch/square3.wav
+
+fate-audiomatch-afconvert-16000-mono-lc-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.adts  $(TARGET_SAMPLES)/audiomatch/tones_16000_mono.wav
+fate-audiomatch-afconvert-16000-mono-lc-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.m4a   $(TARGET_SAMPLES)/audiomatch/tones_16000_mono.wav
+fate-audiomatch-afconvert-16000-mono-he-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_he.adts  $(TARGET_SAMPLES)/audiomatch/tones_16000_mono.wav "-ac 1 -ar 16000"
+fate-audiomatch-afconvert-16000-mono-he-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_he.m4a   $(TARGET_SAMPLES)/audiomatch/tones_16000_mono.wav "-ac 1 -ar 16000"
+fate-audiomatch-afconvert-16000-stereo-lc-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_lc.adts  $(TARGET_SAMPLES)/audiomatch/tones_16000_stereo.wav
+fate-audiomatch-afconvert-16000-stereo-lc-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_lc.m4a   $(TARGET_SAMPLES)/audiomatch/tones_16000_stereo.wav
+fate-audiomatch-afconvert-16000-stereo-he-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_he.adts  $(TARGET_SAMPLES)/audiomatch/tones_16000_stereo.wav "-ar 16000"
+fate-audiomatch-afconvert-16000-stereo-he-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_he.m4a   $(TARGET_SAMPLES)/audiomatch/tones_16000_stereo.wav "-ar 16000"
+fate-audiomatch-afconvert-16000-stereo-he2-adts:CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_he2.adts $(TARGET_SAMPLES)/audiomatch/tones_16000_stereo.wav "-ar 16000"
+fate-audiomatch-afconvert-16000-stereo-he2-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_he2.m4a  $(TARGET_SAMPLES)/audiomatch/tones_16000_stereo.wav "-ar 16000"
+fate-audiomatch-afconvert-44100-mono-lc-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_mono_aac_lc.adts  $(TARGET_SAMPLES)/audiomatch/tones_44100_mono.wav
+fate-audiomatch-afconvert-44100-mono-lc-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_mono_aac_lc.m4a   $(TARGET_SAMPLES)/audiomatch/tones_44100_mono.wav
+fate-audiomatch-afconvert-44100-mono-he-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_mono_aac_he.adts  $(TARGET_SAMPLES)/audiomatch/tones_44100_mono.wav "-ac 1"
+fate-audiomatch-afconvert-44100-mono-he-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_mono_aac_he.m4a   $(TARGET_SAMPLES)/audiomatch/tones_44100_mono.wav "-ac 1"
+fate-audiomatch-afconvert-44100-stereo-lc-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_lc.adts  $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+fate-audiomatch-afconvert-44100-stereo-lc-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_lc.m4a   $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+fate-audiomatch-afconvert-44100-stereo-he-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_he.adts  $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+fate-audiomatch-afconvert-44100-stereo-he-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_he.m4a   $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+fate-audiomatch-afconvert-44100-stereo-he2-adts:CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_he2.adts $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+fate-audiomatch-afconvert-44100-stereo-he2-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_he2.m4a  $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+
+fate-audiomatch-dolby-44100-mono-lc-mp4:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_dolby_44100_mono_aac_lc.mp4   $(TARGET_SAMPLES)/audiomatch/tones_44100_mono.wav
+fate-audiomatch-dolby-44100-mono-he-mp4:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_dolby_44100_mono_aac_he.mp4   $(TARGET_SAMPLES)/audiomatch/tones_44100_mono.wav "-ac 1"
+fate-audiomatch-dolby-44100-stereo-lc-mp4:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_dolby_44100_stereo_aac_lc.mp4   $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+fate-audiomatch-dolby-44100-stereo-he-mp4:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_dolby_44100_stereo_aac_he.mp4   $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+fate-audiomatch-dolby-44100-stereo-he2-mp4: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_dolby_44100_stereo_aac_he2.mp4  $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+
+fate-audiomatch-faac-16000-mono-lc-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_faac_16000_mono_aac_lc.adts  $(TARGET_SAMPLES)/audiomatch/tones_16000_mono.wav
+fate-audiomatch-faac-16000-mono-lc-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_faac_16000_mono_aac_lc.m4a   $(TARGET_SAMPLES)/audiomatch/tones_16000_mono.wav
+fate-audiomatch-faac-16000-stereo-lc-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_faac_16000_stereo_aac_lc.adts  $(TARGET_SAMPLES)/audiomatch/tones_16000_stereo.wav
+fate-audiomatch-faac-16000-stereo-lc-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_faac_16000_stereo_aac_lc.m4a   $(TARGET_SAMPLES)/audiomatch/tones_16000_stereo.wav
+fate-audiomatch-faac-44100-mono-lc-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_faac_44100_mono_aac_lc.adts  $(TARGET_SAMPLES)/audiomatch/tones_44100_mono.wav
+fate-audiomatch-faac-44100-mono-lc-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_faac_44100_mono_aac_lc.m4a   $(TARGET_SAMPLES)/audiomatch/tones_44100_mono.wav
+fate-audiomatch-faac-44100-stereo-lc-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_faac_44100_stereo_aac_lc.adts  $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+fate-audiomatch-faac-44100-stereo-lc-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_faac_44100_stereo_aac_lc.m4a   $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+
+fate-audiomatch-nero-16000-mono-lc-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_nero_16000_mono_aac_lc.m4a   $(TARGET_SAMPLES)/audiomatch/tones_16000_mono.wav
+fate-audiomatch-nero-16000-mono-he-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_nero_16000_mono_aac_he.m4a   $(TARGET_SAMPLES)/audiomatch/tones_16000_mono.wav
+fate-audiomatch-nero-16000-stereo-lc-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_nero_16000_stereo_aac_lc.m4a   $(TARGET_SAMPLES)/audiomatch/tones_16000_stereo.wav
+fate-audiomatch-nero-16000-stereo-he-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_nero_16000_stereo_aac_he.m4a   $(TARGET_SAMPLES)/audiomatch/tones_16000_stereo.wav
+fate-audiomatch-nero-16000-stereo-he2-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_nero_16000_stereo_aac_he2.m4a  $(TARGET_SAMPLES)/audiomatch/tones_16000_stereo.wav
+fate-audiomatch-nero-44100-mono-lc-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_nero_44100_mono_aac_lc.m4a   $(TARGET_SAMPLES)/audiomatch/tones_44100_mono.wav
+fate-audiomatch-nero-44100-mono-he-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_nero_44100_mono_aac_he.m4a   $(TARGET_SAMPLES)/audiomatch/tones_44100_mono.wav
+fate-audiomatch-nero-44100-stereo-lc-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_nero_44100_stereo_aac_lc.m4a   $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+fate-audiomatch-nero-44100-stereo-he-m4a:  CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_nero_44100_stereo_aac_he.m4a   $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+fate-audiomatch-nero-44100-stereo-he2-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_nero_44100_stereo_aac_he2.m4a  $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+
+fate-audiomatch-quicktime7-44100-stereo-lc-mp4: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_quicktime7_44100_stereo_aac_lc.mp4  $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+fate-audiomatch-quicktimeX-44100-stereo-lc-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_quicktimeX_44100_stereo_aac_lc.m4a  $(TARGET_SAMPLES)/audiomatch/tones_44100_stereo.wav
+
+
+FATE_GAPLESS = $(FATE_GAPLESS-yes)
+
+FATE_GAPLESSINFO_PROBE-$(call DEMDEC, MOV, AAC) += fate-gaplessinfo-itunes1
+fate-gaplessinfo-itunes1: ffprobe$(PROGSSUF)$(EXESUF)
+fate-gaplessinfo-itunes1: CMD = probegaplessinfo $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a
+
+FATE_GAPLESSINFO_PROBE-$(call DEMDEC, MOV, AAC) += fate-gaplessinfo-itunes2
+fate-gaplessinfo-itunes2: ffprobe$(PROGSSUF)$(EXESUF)
+fate-gaplessinfo-itunes2: CMD = probegaplessinfo $(TARGET_SAMPLES)/gapless/102400samples_qt-lc-aac.m4a
+
+FATE_GAPLESSENC_PROBE-$(call ENCDEC, AAC, MOV) += fate-gaplessenc-itunes-to-ipod-aac
+fate-gaplessenc-itunes-to-ipod-aac: ffprobe$(PROGSSUF)$(EXESUF)
+fate-gaplessenc-itunes-to-ipod-aac: CMD = gaplessenc $(TARGET_SAMPLES)/gapless/102400samples_qt-lc-aac.m4a ipod aac
+
+FATE_GAPLESSENC_PROBE-$(call ENCDEC, AAC, MOV) += fate-gaplessenc-pcm-to-mov-aac
+fate-gaplessenc-pcm-to-mov-aac: $(AREF)
+fate-gaplessenc-pcm-to-mov-aac: ffprobe$(PROGSSUF)$(EXESUF)
+fate-gaplessenc-pcm-to-mov-aac: CMD = gaplessenc $(AREF) mov aac
+
+FATE_GAPLESSINFO-$(CONFIG_FFPROBE) = $(FATE_GAPLESSINFO_PROBE-yes)
+FATE_GAPLESSINFO = $(FATE_GAPLESSINFO-yes)
+
+FATE_GAPLESSENC-$(CONFIG_FFPROBE) = $(FATE_GAPLESSENC_PROBE-yes)
+FATE_GAPLESSENC = $(FATE_GAPLESSENC-yes)
+
+FATE_SAMPLES_AVCONV += $(FATE_GAPLESS)
+FATE_SAMPLES_AVCONV += $(FATE_GAPLESSINFO)
+FATE_SAMPLES_AVCONV += $(FATE_GAPLESSENC)
+
+fate-gapless: $(FATE_GAPLESS) $(FATE_GAPLESSINFO) $(FATE_GAPLESSENC)
diff --git a/tests/fate/gif.mak b/tests/fate/gif.mak
new file mode 100644
index 0000000000..9bd9631e37
--- /dev/null
+++ b/tests/fate/gif.mak
@@ -0,0 +1,30 @@
+FATE_GIF += fate-gif-color
+fate-gif-color: CMD = framecrc -i $(TARGET_SAMPLES)/gif/tc217.gif -pix_fmt bgra
+
+FATE_GIF += fate-gif-disposal-background
+fate-gif-disposal-background: CMD = framecrc -trans_color 0 -i $(TARGET_SAMPLES)/gif/m4nb.gif -pix_fmt bgra
+
+FATE_GIF += fate-gif-disposal-restore
+fate-gif-disposal-restore: CMD = framecrc -i $(TARGET_SAMPLES)/gif/banner2.gif -pix_fmt bgra
+
+FATE_GIF += fate-gif-gray
+fate-gif-gray: CMD = framecrc -i $(TARGET_SAMPLES)/gif/Newtons_cradle_animation_book_2.gif -pix_fmt bgra
+
+FATE_GIF += fate-gif-deal
+fate-gif-deal: CMD = framecrc -i $(TARGET_SAMPLES)/gif/deal.gif -vsync cfr -pix_fmt bgra
+
+fate-gifenc%: fate-gif-color
+fate-gifenc%: PIXFMT = $(word 3, $(subst -, ,$(@)))
+fate-gifenc%: SRC = $(TARGET_SAMPLES)/gif/tc217.gif
+fate-gifenc%: CMD = framecrc -i $(SRC) -c:v gif -pix_fmt $(PIXFMT)
+
+FATE_GIF_ENC_PIXFMT = rgb8 bgr8 rgb4_byte bgr4_byte gray pal8
+FATE_GIF_ENC-$(call ENCDEC, GIF, GIF) = $(FATE_GIF_ENC_PIXFMT:%=fate-gifenc-%)
+
+FATE_GIF += $(FATE_GIF_ENC-yes)
+fate-gifenc: $(FATE_GIF_ENC-yes)
+
+FATE_GIF-$(call DEMDEC, GIF, GIF) += $(FATE_GIF)
+
+FATE_SAMPLES_AVCONV += $(FATE_GIF-yes)
+fate-gif: $(FATE_GIF-yes)
diff --git a/tests/fate/h264.mak b/tests/fate/h264.mak
index bdc390d479..043e1f2d19 100644
--- a/tests/fate/h264.mak
+++ b/tests/fate/h264.mak
@@ -114,6 +114,10 @@ FATE_H264 = aud_mw_e                                                    \
             frext-hcafr3_hhi_a                                          \
             frext-hcafr4_hhi_a                                          \
             frext-hcamff1_hhi_b                                         \
+            frext-hi422fr10_sony_b                                      \
+            frext-hi422fr13_sony_b                                      \
+            frext-hi422fr1_sony_a                                       \
+            frext-hi422fr6_sony_a                                       \
             frext-hpca_brcm_c                                           \
             frext-hpcadq_brcm_b                                         \
             frext-hpcafl_bcrm_c                                         \
@@ -135,6 +139,13 @@ FATE_H264 = aud_mw_e                                                    \
             frext-pph10i5_panasonic_a                                   \
             frext-pph10i6_panasonic_a                                   \
             frext-pph10i7_panasonic_a                                   \
+            frext-pph422i1_panasonic_a                                  \
+            frext-pph422i2_panasonic_a                                  \
+            frext-pph422i3_panasonic_a                                  \
+            frext-pph422i4_panasonic_a                                  \
+            frext-pph422i5_panasonic_a                                  \
+            frext-pph422i6_panasonic_a                                  \
+            frext-pph422i7_panasonic_a                                  \
             hcbp2_hhi_a                                                 \
             hcmp1_hhi_a                                                 \
             ls_sva_d                                                    \
@@ -182,6 +193,7 @@ FATE_H264  := $(FATE_H264:%=fate-h264-conformance-%)                    \
               fate-h264-extreme-plane-pred                              \
               fate-h264-intra-refresh-recovery                          \
               fate-h264-lossless                                        \
+              fate-h264-3386                                            \
               fate-h264-missing-frame                                   \
 
 FATE_H264-$(call DEMDEC, H264, H264) += $(FATE_H264)
@@ -206,14 +218,23 @@ FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-unescaped-extradata
 # this sample contains field-coded frames, with both fields in a single packet
 FATE_H264-$(call DEMDEC,  MOV, H264) += fate-h264-twofields-packet
 
-FATE_H264-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF) += fate-h264-bsf-mp4toannexb
+FATE_H264-$(call ALLYES, MOV_DEMUXER H264_MP4TOANNEXB_BSF H264_MUXER) += fate-h264-bsf-mp4toannexb
 FATE_H264-$(call DEMDEC, MATROSKA, H264) += fate-h264-direct-bff
+FATE_H264-$(call DEMDEC, FLV, H264) += fate-h264-brokensps-2580
+FATE_H264-$(call DEMDEC, MXF, H264) += fate-h264-xavc-4389
+FATE_H264-$(call DEMDEC, MOV, H264) += fate-h264-attachment-631
+FATE_H264-$(call DEMDEC, MPEGTS, H264) += fate-h264-skip-nokey fate-h264-skip-nointra
+FATE_H264_FFPROBE-$(call DEMDEC, MATROSKA, H264) += fate-h264-dts_5frames
 
 FATE_SAMPLES_AVCONV += $(FATE_H264-yes)
-fate-h264: $(FATE_H264-yes)
+FATE_SAMPLES_FFPROBE += $(FATE_H264_FFPROBE-yes)
+fate-h264: $(FATE_H264-yes) $(FATE_H264_FFPROBE-yes)
+
+fate-h264-conformance-aud_mw_e:                   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/AUD_MW_E.264
+
+#force framerate so that the option is tested, theres no other case that tests it, its not needed at all otherwise here
+fate-h264-conformance-ba1_ft_c:                   CMD = framecrc -framerate 19 -i $(TARGET_SAMPLES)/h264-conformance/BA1_FT_C.264
 
-fate-h264-conformance-aud_mw_e:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/AUD_MW_E.264
-fate-h264-conformance-ba1_ft_c:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA1_FT_C.264
 fate-h264-conformance-ba1_sony_d:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA1_Sony_D.jsv
 fate-h264-conformance-ba2_sony_f:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA2_Sony_F.jsv
 fate-h264-conformance-ba3_sva_c:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/BA3_SVA_C.264
@@ -229,175 +250,195 @@ fate-h264-conformance-caba2_sva_b:                CMD = framecrc -i $(TARGET_SAM
 fate-h264-conformance-caba3_sony_c:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA3_Sony_C.jsv
 fate-h264-conformance-caba3_sva_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA3_SVA_B.264
 fate-h264-conformance-caba3_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABA3_TOSHIBA_E.264
-fate-h264-conformance-cabac_mot_fld0_full:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_fld0_full.26l
-fate-h264-conformance-cabac_mot_frm0_full:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_frm0_full.26l
-fate-h264-conformance-cabac_mot_mbaff0_full:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_mbaff0_full.26l
-fate-h264-conformance-cabac_mot_picaff0_full:     CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_picaff0_full.26l
-fate-h264-conformance-cabaci3_sony_b:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABACI3_Sony_B.jsv
-fate-h264-conformance-cabast3_sony_e:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABAST3_Sony_E.jsv
-fate-h264-conformance-cabastbr3_sony_b:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABASTBR3_Sony_B.jsv
-fate-h264-conformance-cabref3_sand_d:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CABREF3_Sand_D.264
-fate-h264-conformance-cacqp3_sony_d:              CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CACQP3_Sony_D.jsv
-fate-h264-conformance-cafi1_sva_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAFI1_SVA_C.264
-fate-h264-conformance-cama1_sony_c:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMA1_Sony_C.jsv
-fate-h264-conformance-cama1_toshiba_b:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMA1_TOSHIBA_B.264
-fate-h264-conformance-cama1_vtc_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cama1_vtc_c.avc
-fate-h264-conformance-cama2_vtc_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cama2_vtc_b.avc
-fate-h264-conformance-cama3_sand_e:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMA3_Sand_E.264
-fate-h264-conformance-cama3_vtc_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cama3_vtc_b.avc
-fate-h264-conformance-camaci3_sony_c:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMACI3_Sony_C.jsv
-fate-h264-conformance-camanl1_toshiba_b:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMANL1_TOSHIBA_B.264
-fate-h264-conformance-camanl2_toshiba_b:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMANL2_TOSHIBA_B.264
-fate-h264-conformance-camanl3_sand_e:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMANL3_Sand_E.264
-fate-h264-conformance-camasl3_sony_b:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMASL3_Sony_B.jsv
-fate-h264-conformance-camp_mot_mbaff_l30:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L30.26l
-fate-h264-conformance-camp_mot_mbaff_l31:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L31.26l
-fate-h264-conformance-canl1_sony_e:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL1_Sony_E.jsv
-fate-h264-conformance-canl1_sva_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL1_SVA_B.264
-fate-h264-conformance-canl1_toshiba_g:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL1_TOSHIBA_G.264
-fate-h264-conformance-canl2_sony_e:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL2_Sony_E.jsv
-fate-h264-conformance-canl2_sva_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL2_SVA_B.264
-fate-h264-conformance-canl3_sony_c:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL3_Sony_C.jsv
-fate-h264-conformance-canl3_sva_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL3_SVA_B.264
-fate-h264-conformance-canl4_sva_b:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANL4_SVA_B.264
-fate-h264-conformance-canlma2_sony_c:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANLMA2_Sony_C.jsv
-fate-h264-conformance-canlma3_sony_c:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CANLMA3_Sony_C.jsv
-fate-h264-conformance-capa1_toshiba_b:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPA1_TOSHIBA_B.264
-fate-h264-conformance-capama3_sand_f:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPAMA3_Sand_F.264
-fate-h264-conformance-capcm1_sand_e:              CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPCM1_Sand_E.264
-fate-h264-conformance-capcmnl1_sand_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPCMNL1_Sand_E.264
-fate-h264-conformance-capm3_sony_d:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAPM3_Sony_D.jsv
-fate-h264-conformance-caqp1_sony_b:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAQP1_Sony_B.jsv
-fate-h264-conformance-cavlc_mot_fld0_full_b:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_fld0_full_B.26l
-fate-h264-conformance-cavlc_mot_frm0_full_b:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_frm0_full_B.26l
-fate-h264-conformance-cavlc_mot_mbaff0_full_b:    CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_mbaff0_full_B.26l
-fate-h264-conformance-cavlc_mot_picaff0_full_b:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_picaff0_full_B.26l
-fate-h264-conformance-cawp1_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAWP1_TOSHIBA_E.264
-fate-h264-conformance-cawp5_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CAWP5_TOSHIBA_E.264
-fate-h264-conformance-ci1_ft_b:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CI1_FT_B.264
-fate-h264-conformance-ci_mw_d:                    CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CI_MW_D.264
-fate-h264-conformance-cvbs3_sony_c:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVBS3_Sony_C.jsv
-fate-h264-conformance-cvcanlma2_sony_c:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVCANLMA2_Sony_C.jsv
+fate-h264-conformance-cabac_mot_fld0_full:        CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_fld0_full.26l
+fate-h264-conformance-cabac_mot_frm0_full:        CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_frm0_full.26l
+fate-h264-conformance-cabac_mot_mbaff0_full:      CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_mbaff0_full.26l
+fate-h264-conformance-cabac_mot_picaff0_full:     CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/camp_mot_picaff0_full.26l
+fate-h264-conformance-cabaci3_sony_b:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABACI3_Sony_B.jsv
+fate-h264-conformance-cabast3_sony_e:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABAST3_Sony_E.jsv
+fate-h264-conformance-cabastbr3_sony_b:           CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABASTBR3_Sony_B.jsv
+fate-h264-conformance-cabref3_sand_d:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CABREF3_Sand_D.264
+fate-h264-conformance-cacqp3_sony_d:              CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CACQP3_Sony_D.jsv
+fate-h264-conformance-cafi1_sva_c:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAFI1_SVA_C.264
+fate-h264-conformance-cama1_sony_c:               CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMA1_Sony_C.jsv
+fate-h264-conformance-cama1_toshiba_b:            CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMA1_TOSHIBA_B.264
+fate-h264-conformance-cama1_vtc_c:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cama1_vtc_c.avc
+fate-h264-conformance-cama2_vtc_b:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cama2_vtc_b.avc
+fate-h264-conformance-cama3_sand_e:               CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMA3_Sand_E.264
+fate-h264-conformance-cama3_vtc_b:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cama3_vtc_b.avc
+fate-h264-conformance-camaci3_sony_c:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMACI3_Sony_C.jsv
+fate-h264-conformance-camanl1_toshiba_b:          CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMANL1_TOSHIBA_B.264
+fate-h264-conformance-camanl2_toshiba_b:          CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMANL2_TOSHIBA_B.264
+fate-h264-conformance-camanl3_sand_e:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMANL3_Sand_E.264
+fate-h264-conformance-camasl3_sony_b:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMASL3_Sony_B.jsv
+fate-h264-conformance-camp_mot_mbaff_l30:         CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L30.26l
+fate-h264-conformance-camp_mot_mbaff_l31:         CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAMP_MOT_MBAFF_L31.26l
+fate-h264-conformance-canl1_sony_e:               CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL1_Sony_E.jsv
+fate-h264-conformance-canl1_sva_b:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL1_SVA_B.264
+fate-h264-conformance-canl1_toshiba_g:            CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL1_TOSHIBA_G.264
+fate-h264-conformance-canl2_sony_e:               CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL2_Sony_E.jsv
+fate-h264-conformance-canl2_sva_b:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL2_SVA_B.264
+fate-h264-conformance-canl3_sony_c:               CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL3_Sony_C.jsv
+fate-h264-conformance-canl3_sva_b:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL3_SVA_B.264
+fate-h264-conformance-canl4_sva_b:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANL4_SVA_B.264
+fate-h264-conformance-canlma2_sony_c:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANLMA2_Sony_C.jsv
+fate-h264-conformance-canlma3_sony_c:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CANLMA3_Sony_C.jsv
+fate-h264-conformance-capa1_toshiba_b:            CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPA1_TOSHIBA_B.264
+fate-h264-conformance-capama3_sand_f:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPAMA3_Sand_F.264
+fate-h264-conformance-capcm1_sand_e:              CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPCM1_Sand_E.264
+fate-h264-conformance-capcmnl1_sand_e:            CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPCMNL1_Sand_E.264
+fate-h264-conformance-capm3_sony_d:               CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAPM3_Sony_D.jsv
+fate-h264-conformance-caqp1_sony_b:               CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAQP1_Sony_B.jsv
+fate-h264-conformance-cavlc_mot_fld0_full_b:      CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_fld0_full_B.26l
+fate-h264-conformance-cavlc_mot_frm0_full_b:      CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_frm0_full_B.26l
+fate-h264-conformance-cavlc_mot_mbaff0_full_b:    CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_mbaff0_full_B.26l
+fate-h264-conformance-cavlc_mot_picaff0_full_b:   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/cvmp_mot_picaff0_full_B.26l
+fate-h264-conformance-cawp1_toshiba_e:            CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAWP1_TOSHIBA_E.264
+fate-h264-conformance-cawp5_toshiba_e:            CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CAWP5_TOSHIBA_E.264
+fate-h264-conformance-ci1_ft_b:                   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CI1_FT_B.264
+fate-h264-conformance-ci_mw_d:                    CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CI_MW_D.264
+fate-h264-conformance-cvbs3_sony_c:               CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVBS3_Sony_C.jsv
+fate-h264-conformance-cvcanlma2_sony_c:           CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVCANLMA2_Sony_C.jsv
 fate-h264-conformance-cvfc1_sony_c:               CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/h264-conformance/CVFC1_Sony_C.jsv
-fate-h264-conformance-cvfi1_sony_d:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVFI1_Sony_D.jsv
-fate-h264-conformance-cvfi1_sva_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVFI1_SVA_C.264
-fate-h264-conformance-cvfi2_sony_h:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVFI2_Sony_H.jsv
-fate-h264-conformance-cvfi2_sva_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVFI2_SVA_C.264
-fate-h264-conformance-cvma1_sony_d:               CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMA1_Sony_D.jsv
-fate-h264-conformance-cvma1_toshiba_b:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMA1_TOSHIBA_B.264
-fate-h264-conformance-cvmanl1_toshiba_b:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMANL1_TOSHIBA_B.264
-fate-h264-conformance-cvmanl2_toshiba_b:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMANL2_TOSHIBA_B.264
-fate-h264-conformance-cvmapaqp3_sony_e:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMAPAQP3_Sony_E.jsv
-fate-h264-conformance-cvmaqp2_sony_g:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMAQP2_Sony_G.jsv
-fate-h264-conformance-cvmaqp3_sony_d:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMAQP3_Sony_D.jsv
-fate-h264-conformance-cvmp_mot_fld_l30_b:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMP_MOT_FLD_L30_B.26l
-fate-h264-conformance-cvmp_mot_frm_l31_b:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVMP_MOT_FRM_L31_B.26l
-fate-h264-conformance-cvnlfi1_sony_c:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVNLFI1_Sony_C.jsv
-fate-h264-conformance-cvnlfi2_sony_h:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVNLFI2_Sony_H.jsv
-fate-h264-conformance-cvpa1_toshiba_b:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVPA1_TOSHIBA_B.264
-fate-h264-conformance-cvpcmnl1_sva_c:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVPCMNL1_SVA_C.264
-fate-h264-conformance-cvpcmnl2_sva_c:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVPCMNL2_SVA_C.264
-fate-h264-conformance-cvwp1_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVWP1_TOSHIBA_E.264
-fate-h264-conformance-cvwp2_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVWP2_TOSHIBA_E.264
-fate-h264-conformance-cvwp3_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVWP3_TOSHIBA_E.264
-fate-h264-conformance-cvwp5_toshiba_e:            CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/CVWP5_TOSHIBA_E.264
-fate-h264-conformance-fi1_sony_e:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FI1_Sony_E.jsv
-fate-h264-conformance-frext-alphaconformanceg:    CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/test8b43.264
-fate-h264-conformance-frext-bcrm_freh10:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh10.264 -vsync 0
-fate-h264-conformance-frext-brcm_freh11:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh11.264 -vsync 0
-fate-h264-conformance-frext-brcm_freh3:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh3.264
-fate-h264-conformance-frext-brcm_freh4:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh4.264 -vsync 0
-fate-h264-conformance-frext-brcm_freh5:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh5.264
-fate-h264-conformance-frext-brcm_freh8:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh8.264
-fate-h264-conformance-frext-brcm_freh9:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh9.264
-fate-h264-conformance-frext-freh12_b:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh12_B.264
-fate-h264-conformance-frext-freh1_b:              CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh1_B.264
-fate-h264-conformance-frext-freh2_b:              CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh2_B.264
-fate-h264-conformance-frext-freh6:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh6.264 -vsync 0
-fate-h264-conformance-frext-freh7_b:              CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh7_B.264 -vsync 0
-fate-h264-conformance-frext-frext01_jvc_d:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT01_JVC_D.264
-fate-h264-conformance-frext-frext02_jvc_c:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT02_JVC_C.264
-fate-h264-conformance-frext-frext1_panasonic_c:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt1_Panasonic.avc
-fate-h264-conformance-frext-frext2_panasonic_b:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt2_Panasonic.avc -vsync 0
-fate-h264-conformance-frext-frext3_panasonic_d:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt3_Panasonic.avc
-fate-h264-conformance-frext-frext4_panasonic_a:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt4_Panasonic.avc
-fate-h264-conformance-frext-frext_mmco4_sony_b:   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt_MMCO4_Sony_B.264
-fate-h264-conformance-frext-hcaff1_hhi_b:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFF1_HHI.264
-fate-h264-conformance-frext-hcafr1_hhi_c:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR1_HHI.264
-fate-h264-conformance-frext-hcafr2_hhi_a:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR2_HHI.264
-fate-h264-conformance-frext-hcafr3_hhi_a:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR3_HHI.264
-fate-h264-conformance-frext-hcafr4_hhi_a:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR4_HHI.264
-fate-h264-conformance-frext-hcamff1_hhi_b:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAMFF1_HHI.264
-fate-h264-conformance-frext-hpca_brcm_c:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCA_BRCM_C.264
-fate-h264-conformance-frext-hpcadq_brcm_b:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCADQ_BRCM_B.264
-fate-h264-conformance-frext-hpcafl_bcrm_c:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAFL_BRCM_C.264 -vsync 0
-fate-h264-conformance-frext-hpcaflnl_bcrm_c:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAFLNL_BRCM_C.264 -vsync 0
-fate-h264-conformance-frext-hpcalq_brcm_b:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCALQ_BRCM_B.264
-fate-h264-conformance-frext-hpcamapalq_bcrm_b:    CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMAPALQ_BRCM_B.264 -vsync 0
-fate-h264-conformance-frext-hpcamolq_brcm_b:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMOLQ_BRCM_B.264
-fate-h264-conformance-frext-hpcanl_brcm_c:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCANL_BRCM_C.264
-fate-h264-conformance-frext-hpcaq2lq_brcm_b:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAQ2LQ_BRCM_B.264
-fate-h264-conformance-frext-hpcv_brcm_a:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCV_BRCM_A.264
-fate-h264-conformance-frext-hpcvfl_bcrm_a:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVFL_BRCM_A.264 -vsync 0
-fate-h264-conformance-frext-hpcvflnl_bcrm_a:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVFLNL_BRCM_A.264 -vsync 0
-fate-h264-conformance-frext-hpcvmolq_brcm_b:      CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVMOLQ_BRCM_B.264
-fate-h264-conformance-frext-hpcvnl_brcm_a:        CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVNL_BRCM_A.264
-fate-h264-conformance-frext-pph10i1_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I1_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-frext-pph10i2_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I2_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-frext-pph10i3_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I3_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-frext-pph10i4_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I4_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-frext-pph10i5_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I5_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-frext-pph10i6_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I6_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-frext-pph10i7_panasonic_a:  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I7_Panasonic_A.264 -pix_fmt yuv420p10le
-fate-h264-conformance-hcbp2_hhi_a:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/HCBP2_HHI_A.264
-fate-h264-conformance-hcmp1_hhi_a:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/HCMP1_HHI_A.264
-fate-h264-conformance-ls_sva_d:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/LS_SVA_D.264
-fate-h264-conformance-midr_mw_d:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MIDR_MW_D.264
-fate-h264-conformance-mps_mw_a:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MPS_MW_A.264
-fate-h264-conformance-mr1_bt_a:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR1_BT_A.h264
-fate-h264-conformance-mr1_mw_a:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR1_MW_A.264
-fate-h264-conformance-mr2_mw_a:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR2_MW_A.264
-fate-h264-conformance-mr2_tandberg_e:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR2_TANDBERG_E.264
-fate-h264-conformance-mr3_tandberg_b:             CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR3_TANDBERG_B.264
-fate-h264-conformance-mr4_tandberg_c:             CMD = framecrc -strict 1 -i $(TARGET_SAMPLES)/h264-conformance/MR4_TANDBERG_C.264
-fate-h264-conformance-mr5_tandberg_c:             CMD = framecrc -strict 1 -i $(TARGET_SAMPLES)/h264-conformance/MR5_TANDBERG_C.264
-fate-h264-conformance-mr6_bt_b:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR6_BT_B.h264
-fate-h264-conformance-mr7_bt_b:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR7_BT_B.h264
-fate-h264-conformance-mr8_bt_b:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR8_BT_B.h264
-fate-h264-conformance-mr9_bt_b:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/MR9_BT_B.h264
-fate-h264-conformance-mv1_brcm_d:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/src19td.IBP.264
-fate-h264-conformance-nl1_sony_d:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NL1_Sony_D.jsv
-fate-h264-conformance-nl2_sony_h:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NL2_Sony_H.jsv
-fate-h264-conformance-nl3_sva_e:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NL3_SVA_E.264
-fate-h264-conformance-nlmq1_jvc_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NLMQ1_JVC_C.264
-fate-h264-conformance-nlmq2_jvc_c:                CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NLMQ2_JVC_C.264
-fate-h264-conformance-nrf_mw_e:                   CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/NRF_MW_E.264
-fate-h264-conformance-sharp_mp_field_1_b:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_1_B.jvt
-fate-h264-conformance-sharp_mp_field_2_b:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_2_B.jvt
-fate-h264-conformance-sharp_mp_field_3_b:         CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_3_B.jvt
-fate-h264-conformance-sharp_mp_paff_1r2:          CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_PAFF_1r2.jvt
-fate-h264-conformance-sharp_mp_paff_2r:           CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_PAFF_2.jvt
-fate-h264-conformance-sl1_sva_b:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SL1_SVA_B.264
-fate-h264-conformance-sva_ba1_b:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_BA1_B.264
-fate-h264-conformance-sva_ba2_d:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_BA2_D.264
-fate-h264-conformance-sva_base_b:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_Base_B.264
-fate-h264-conformance-sva_cl1_e:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_CL1_E.264
-fate-h264-conformance-sva_fm1_e:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_FM1_E.264
-fate-h264-conformance-sva_nl1_b:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL1_B.264
-fate-h264-conformance-sva_nl2_e:                  CMD = framecrc -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264
+fate-h264-conformance-cvfi1_sony_d:               CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVFI1_Sony_D.jsv
+fate-h264-conformance-cvfi1_sva_c:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVFI1_SVA_C.264
+fate-h264-conformance-cvfi2_sony_h:               CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVFI2_Sony_H.jsv
+fate-h264-conformance-cvfi2_sva_c:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVFI2_SVA_C.264
+fate-h264-conformance-cvma1_sony_d:               CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMA1_Sony_D.jsv
+fate-h264-conformance-cvma1_toshiba_b:            CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMA1_TOSHIBA_B.264
+fate-h264-conformance-cvmanl1_toshiba_b:          CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMANL1_TOSHIBA_B.264
+fate-h264-conformance-cvmanl2_toshiba_b:          CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMANL2_TOSHIBA_B.264
+fate-h264-conformance-cvmapaqp3_sony_e:           CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMAPAQP3_Sony_E.jsv
+fate-h264-conformance-cvmaqp2_sony_g:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMAQP2_Sony_G.jsv
+fate-h264-conformance-cvmaqp3_sony_d:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMAQP3_Sony_D.jsv
+fate-h264-conformance-cvmp_mot_fld_l30_b:         CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMP_MOT_FLD_L30_B.26l
+fate-h264-conformance-cvmp_mot_frm_l31_b:         CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVMP_MOT_FRM_L31_B.26l
+fate-h264-conformance-cvnlfi1_sony_c:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVNLFI1_Sony_C.jsv
+fate-h264-conformance-cvnlfi2_sony_h:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVNLFI2_Sony_H.jsv
+fate-h264-conformance-cvpa1_toshiba_b:            CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVPA1_TOSHIBA_B.264
+fate-h264-conformance-cvpcmnl1_sva_c:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVPCMNL1_SVA_C.264
+fate-h264-conformance-cvpcmnl2_sva_c:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVPCMNL2_SVA_C.264
+fate-h264-conformance-cvwp1_toshiba_e:            CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVWP1_TOSHIBA_E.264
+fate-h264-conformance-cvwp2_toshiba_e:            CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVWP2_TOSHIBA_E.264
+fate-h264-conformance-cvwp3_toshiba_e:            CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVWP3_TOSHIBA_E.264
+fate-h264-conformance-cvwp5_toshiba_e:            CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/CVWP5_TOSHIBA_E.264
+fate-h264-conformance-fi1_sony_e:                 CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FI1_Sony_E.jsv
+fate-h264-conformance-frext-alphaconformanceg:    CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/test8b43.264
+fate-h264-conformance-frext-bcrm_freh10:          CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh10.264 -vsync drop
+fate-h264-conformance-frext-brcm_freh11:          CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh11.264 -vsync drop
+fate-h264-conformance-frext-brcm_freh3:           CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh3.264
+fate-h264-conformance-frext-brcm_freh4:           CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh4.264 -vsync drop
+fate-h264-conformance-frext-brcm_freh5:           CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh5.264
+fate-h264-conformance-frext-brcm_freh8:           CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh8.264
+fate-h264-conformance-frext-brcm_freh9:           CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh9.264
+fate-h264-conformance-frext-freh12_b:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh12_B.264
+fate-h264-conformance-frext-freh1_b:              CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh1_B.264
+fate-h264-conformance-frext-freh2_b:              CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh2_B.264
+fate-h264-conformance-frext-freh6:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/freh6.264 -vsync drop
+fate-h264-conformance-frext-freh7_b:              CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Freh7_B.264 -vsync drop
+fate-h264-conformance-frext-frext01_jvc_d:        CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT01_JVC_D.264
+fate-h264-conformance-frext-frext02_jvc_c:        CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FREXT02_JVC_C.264
+fate-h264-conformance-frext-frext1_panasonic_c:   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt1_Panasonic.avc
+fate-h264-conformance-frext-frext2_panasonic_b:   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt2_Panasonic.avc -vsync 0
+fate-h264-conformance-frext-frext3_panasonic_d:   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt3_Panasonic.avc
+fate-h264-conformance-frext-frext4_panasonic_a:   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt4_Panasonic.avc
+fate-h264-conformance-frext-frext_mmco4_sony_b:   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/FRExt_MMCO4_Sony_B.264
+fate-h264-conformance-frext-hcaff1_hhi_b:         CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFF1_HHI.264
+fate-h264-conformance-frext-hcafr1_hhi_c:         CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR1_HHI.264
+fate-h264-conformance-frext-hcafr2_hhi_a:         CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR2_HHI.264
+fate-h264-conformance-frext-hcafr3_hhi_a:         CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR3_HHI.264
+fate-h264-conformance-frext-hcafr4_hhi_a:         CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAFR4_HHI.264
+fate-h264-conformance-frext-hcamff1_hhi_b:        CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HCAMFF1_HHI.264
+fate-h264-conformance-frext-hi422fr10_sony_b:     CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR10_SONY_B.264
+fate-h264-conformance-frext-hi422fr13_sony_b:     CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR13_SONY_B.264 -pix_fmt yuv422p10le
+fate-h264-conformance-frext-hi422fr1_sony_a:      CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR1_SONY_A.jsv
+fate-h264-conformance-frext-hi422fr6_sony_a:      CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/Hi422FR6_SONY_A.jsv -pix_fmt yuv422p10le
+fate-h264-conformance-frext-hpca_brcm_c:          CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCA_BRCM_C.264
+fate-h264-conformance-frext-hpcadq_brcm_b:        CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCADQ_BRCM_B.264
+fate-h264-conformance-frext-hpcafl_bcrm_c:        CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAFL_BRCM_C.264 -vsync drop
+fate-h264-conformance-frext-hpcaflnl_bcrm_c:      CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAFLNL_BRCM_C.264 -vsync drop
+fate-h264-conformance-frext-hpcalq_brcm_b:        CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCALQ_BRCM_B.264
+fate-h264-conformance-frext-hpcamapalq_bcrm_b:    CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMAPALQ_BRCM_B.264 -vsync 0
+fate-h264-conformance-frext-hpcamolq_brcm_b:      CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAMOLQ_BRCM_B.264
+fate-h264-conformance-frext-hpcanl_brcm_c:        CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCANL_BRCM_C.264
+fate-h264-conformance-frext-hpcaq2lq_brcm_b:      CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCAQ2LQ_BRCM_B.264
+fate-h264-conformance-frext-hpcv_brcm_a:          CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCV_BRCM_A.264
+fate-h264-conformance-frext-hpcvfl_bcrm_a:        CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVFL_BRCM_A.264 -vsync drop
+fate-h264-conformance-frext-hpcvflnl_bcrm_a:      CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVFLNL_BRCM_A.264 -vsync drop
+fate-h264-conformance-frext-hpcvmolq_brcm_b:      CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVMOLQ_BRCM_B.264
+fate-h264-conformance-frext-hpcvnl_brcm_a:        CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/HPCVNL_BRCM_A.264
+fate-h264-conformance-frext-pph10i1_panasonic_a:  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I1_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph10i2_panasonic_a:  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I2_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph10i3_panasonic_a:  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I3_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph10i4_panasonic_a:  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I4_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph10i5_panasonic_a:  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I5_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph10i6_panasonic_a:  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I6_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph10i7_panasonic_a:  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH10I7_Panasonic_A.264 -pix_fmt yuv420p10le
+fate-h264-conformance-frext-pph422i1_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I1_Panasonic_A.264 -pix_fmt yuv422p10le
+fate-h264-conformance-frext-pph422i2_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I2_Panasonic_A.264 -pix_fmt yuv422p10le
+fate-h264-conformance-frext-pph422i3_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I3_Panasonic_A.264 -pix_fmt yuv422p10le
+fate-h264-conformance-frext-pph422i4_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I4_Panasonic_A.264 -pix_fmt yuv422p10le
+fate-h264-conformance-frext-pph422i5_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I5_Panasonic_A.264 -pix_fmt yuv422p10le
+fate-h264-conformance-frext-pph422i6_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I6_Panasonic_A.264 -pix_fmt yuv422p10le
+fate-h264-conformance-frext-pph422i7_panasonic_a: CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/FRext/PPH422I7_Panasonic_A.264 -pix_fmt yuv422p10le
+fate-h264-conformance-hcbp2_hhi_a:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/HCBP2_HHI_A.264
+fate-h264-conformance-hcmp1_hhi_a:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/HCMP1_HHI_A.264
+fate-h264-conformance-ls_sva_d:                   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/LS_SVA_D.264
+fate-h264-conformance-midr_mw_d:                  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MIDR_MW_D.264
+fate-h264-conformance-mps_mw_a:                   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MPS_MW_A.264
+fate-h264-conformance-mr1_bt_a:                   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR1_BT_A.h264
+fate-h264-conformance-mr1_mw_a:                   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR1_MW_A.264
+fate-h264-conformance-mr2_mw_a:                   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR2_MW_A.264
+fate-h264-conformance-mr2_tandberg_e:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR2_TANDBERG_E.264
+fate-h264-conformance-mr3_tandberg_b:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR3_TANDBERG_B.264
+fate-h264-conformance-mr4_tandberg_c:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR4_TANDBERG_C.264
+fate-h264-conformance-mr5_tandberg_c:             CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR5_TANDBERG_C.264
+fate-h264-conformance-mr6_bt_b:                   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR6_BT_B.h264
+fate-h264-conformance-mr7_bt_b:                   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR7_BT_B.h264
+fate-h264-conformance-mr8_bt_b:                   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR8_BT_B.h264
+fate-h264-conformance-mr9_bt_b:                   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/MR9_BT_B.h264
+fate-h264-conformance-mv1_brcm_d:                 CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/src19td.IBP.264
+fate-h264-conformance-nl1_sony_d:                 CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NL1_Sony_D.jsv
+fate-h264-conformance-nl2_sony_h:                 CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NL2_Sony_H.jsv
+fate-h264-conformance-nl3_sva_e:                  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NL3_SVA_E.264
+fate-h264-conformance-nlmq1_jvc_c:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NLMQ1_JVC_C.264
+fate-h264-conformance-nlmq2_jvc_c:                CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NLMQ2_JVC_C.264
+fate-h264-conformance-nrf_mw_e:                   CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/NRF_MW_E.264
+fate-h264-conformance-sharp_mp_field_1_b:         CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_1_B.jvt
+fate-h264-conformance-sharp_mp_field_2_b:         CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_2_B.jvt
+fate-h264-conformance-sharp_mp_field_3_b:         CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_Field_3_B.jvt
+fate-h264-conformance-sharp_mp_paff_1r2:          CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_PAFF_1r2.jvt
+fate-h264-conformance-sharp_mp_paff_2r:           CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/Sharp_MP_PAFF_2.jvt
+fate-h264-conformance-sl1_sva_b:                  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SL1_SVA_B.264
+fate-h264-conformance-sva_ba1_b:                  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_BA1_B.264
+fate-h264-conformance-sva_ba2_d:                  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_BA2_D.264
+fate-h264-conformance-sva_base_b:                 CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_Base_B.264
+fate-h264-conformance-sva_cl1_e:                  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_CL1_E.264
+fate-h264-conformance-sva_fm1_e:                  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_FM1_E.264
+fate-h264-conformance-sva_nl1_b:                  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL1_B.264
+fate-h264-conformance-sva_nl2_e:                  CMD = framecrc -vsync drop -i $(TARGET_SAMPLES)/h264-conformance/SVA_NL2_E.264
+
+fate-h264-bsf-mp4toannexb:                        CMD = md5 -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -c:v copy -f h264
 
-fate-h264-bsf-mp4toannexb:                        CMD = md5 -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -c:v copy -bsf h264_mp4toannexb -f h264
 fate-h264-crop-to-container:                      CMD = framemd5 -i $(TARGET_SAMPLES)/h264/crop-to-container-dims-canon.mov
 fate-h264-direct-bff:                             CMD = framecrc -i $(TARGET_SAMPLES)/h264/direct-bff.mkv
 fate-h264-extradata-reload:                       CMD = framemd5 -i $(TARGET_SAMPLES)/h264/extradata-reload-multi-stsd.mov
 fate-h264-extreme-plane-pred:                     CMD = framemd5 -i $(TARGET_SAMPLES)/h264/extreme-plane-pred.h264
 fate-h264-interlace-crop:                         CMD = framecrc -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 -frames:v 3
+fate-h264-brokensps-2580:                         CMD = framecrc -i $(TARGET_SAMPLES)/h264/brokensps.flv -vf format=yuv420p,scale=w=192:h=144 -sws_flags bitexact+bilinear
+fate-h264-xavc-4389:                              CMD = framecrc -i $(TARGET_SAMPLES)/h264/SonyXAVC_LongGOP_green_pixelation_early_Frames.MXF -pix_fmt yuv422p10le
+fate-h264-attachment-631:                         CMD = framecrc -i $(TARGET_SAMPLES)/h264/attachment631-small.mp4 -an -max_error_rate 0.96
+fate-h264-skip-nokey:                             CMD = framecrc -skip_frame nokey -i $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts
+fate-h264-skip-nointra:                           CMD = framecrc -skip_frame nointra -i $(TARGET_SAMPLES)/h264/h264_intra_first-small.ts
 fate-h264-intra-refresh-recovery:                 CMD = framecrc -i $(TARGET_SAMPLES)/h264/intra_refresh.h264 -frames:v 10
 fate-h264-invalid-ref-mod:                        CMD = framecrc -i $(TARGET_SAMPLES)/h264/h264refframeregression.mp4 -an -frames 10 -pix_fmt yuv420p10le
 fate-h264-lossless:                               CMD = framecrc -i $(TARGET_SAMPLES)/h264/lossless.h264
 fate-h264-mixed-nal-coding:                       CMD = framecrc -i $(TARGET_SAMPLES)/h264/mixed-nal-coding.mp4
 fate-h264-twofields-packet:                       CMD = framecrc -i $(TARGET_SAMPLES)/h264/twofields_packet.mp4 -an -frames 30
 fate-h264-unescaped-extradata:                    CMD = framecrc -i $(TARGET_SAMPLES)/h264/unescaped_extradata.mp4 -an -frames 10
+fate-h264-3386:                                   CMD = framecrc -i $(TARGET_SAMPLES)/h264/bbc2.sample.h264
 fate-h264-missing-frame:                          CMD = framecrc -i $(TARGET_SAMPLES)/h264/nondeterministic_cut.h264
 
 fate-h264-reinit-%:                               CMD = framecrc -i $(TARGET_SAMPLES)/h264/$(@:fate-h264-%=%).h264 -vf format=yuv444p10le,scale=w=352:h=288
+
+fate-h264-dts_5frames:                            CMD = probeframes $(TARGET_SAMPLES)/h264/dts_5frames.mkv
diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index 5446969a7d..2e798eca60 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -1,12 +1,16 @@
 HEVC_SAMPLES =                  \
     AMP_A_Samsung_4             \
+    AMP_A_Samsung_6             \
     AMP_B_Samsung_4             \
-    AMVP_C_Samsung_4            \
+    AMP_B_Samsung_6             \
     AMP_D_Hisilicon             \
     AMP_E_Hisilicon             \
     AMP_F_Hisilicon_3           \
     AMVP_A_MTK_4                \
     AMVP_B_MTK_4                \
+    AMVP_C_Samsung_4            \
+    AMVP_C_Samsung_6            \
+    BUMPING_A_ericsson_1        \
     CAINIT_A_SHARP_4            \
     CAINIT_B_SHARP_4            \
     CAINIT_C_SHARP_3            \
@@ -18,26 +22,28 @@ HEVC_SAMPLES =                  \
     CIP_A_Panasonic_3           \
     cip_B_NEC_3                 \
     CIP_C_Panasonic_2           \
+    CONFWIN_A_Sony_1            \
     DBLK_A_SONY_3               \
     DBLK_B_SONY_3               \
     DBLK_C_SONY_3               \
-    DBLK_D_VIXS_1               \
     DBLK_D_VIXS_2               \
-    DBLK_E_VIXS_1               \
     DBLK_E_VIXS_2               \
-    DBLK_F_VIXS_1               \
     DBLK_F_VIXS_2               \
-    DBLK_G_VIXS_1               \
     DBLK_G_VIXS_2               \
+    DELTAQP_A_BRCM_4            \
     DELTAQP_B_SONY_3            \
     DELTAQP_C_SONY_3            \
     DSLICE_A_HHI_5              \
     DSLICE_B_HHI_5              \
     DSLICE_C_HHI_5              \
-    ENTP_A_LG_2                 \
-    ENTP_B_LG_2                 \
-    ENTP_C_LG_3                 \
+    ENTP_A_Qualcomm_1           \
+    ENTP_B_Qualcomm_1           \
+    ENTP_C_Qualcomm_1           \
     EXT_A_ericsson_4            \
+    FILLER_A_Sony_1             \
+    HRD_A_Fujitsu_2             \
+    HRD_A_Fujitsu_3             \
+    INITQP_A_Sony_1             \
     ipcm_A_NEC_3                \
     ipcm_B_NEC_3                \
     ipcm_C_NEC_3                \
@@ -45,7 +51,7 @@ HEVC_SAMPLES =                  \
     ipcm_E_NEC_2                \
     IPRED_A_docomo_2            \
     IPRED_B_Nokia_3             \
-    IPRED_C_Mitsubishi_2        \
+    IPRED_C_Mitsubishi_3        \
     LS_A_Orange_2               \
     LS_B_ORANGE_4               \
     LTRPSPS_A_Qualcomm_1        \
@@ -62,7 +68,12 @@ HEVC_SAMPLES =                  \
     MVCLIP_A_qualcomm_3         \
     MVDL1ZERO_A_docomo_3        \
     MVEDGE_A_qualcomm_3         \
+    NoOutPrior_A_Qualcomm_1     \
+    NoOutPrior_B_Qualcomm_1     \
     NUT_A_ericsson_5            \
+    OPFLAG_A_Qualcomm_1         \
+    OPFLAG_B_Qualcomm_1         \
+    OPFLAG_C_Qualcomm_1         \
     PICSIZE_A_Bossen_1          \
     PICSIZE_B_Bossen_1          \
     PICSIZE_C_Bossen_1          \
@@ -74,9 +85,9 @@ HEVC_SAMPLES =                  \
     PMERGE_E_TI_3               \
     POC_A_Bossen_3              \
     PPS_A_qualcomm_7            \
-    RAP_A_docomo_4              \
     PS_A_VIDYO_3                \
     PS_B_VIDYO_3                \
+    RAP_A_docomo_4              \
     RAP_B_Bossen_1              \
     RPLM_A_qualcomm_4           \
     RPLM_B_qualcomm_4           \
@@ -96,7 +107,9 @@ HEVC_SAMPLES =                  \
     SAO_A_MediaTek_4            \
     SAO_B_MediaTek_5            \
     SAO_C_Samsung_4             \
+    SAO_C_Samsung_5             \
     SAO_D_Samsung_4             \
+    SAO_D_Samsung_5             \
     SAO_E_Canon_4               \
     SAO_F_Canon_3               \
     SAO_G_Canon_3               \
@@ -107,8 +120,10 @@ HEVC_SAMPLES =                  \
     SLIST_C_Sony_3              \
     SLIST_D_Sony_9              \
     SLPPLP_A_VIDYO_1            \
+    SLPPLP_A_VIDYO_2            \
     STRUCT_A_Samsung_5          \
     STRUCT_B_Samsung_4          \
+    STRUCT_B_Samsung_6          \
     TILES_A_Cisco_2             \
     TILES_B_Cisco_1             \
     TMVP_A_MS_3                 \
@@ -117,6 +132,7 @@ HEVC_SAMPLES =                  \
     TSKIP_A_MS_3                \
     TUSIZE_A_Samsung_1          \
     VPSID_A_VIDYO_1             \
+    VPSID_A_VIDYO_2             \
     WP_A_Toshiba_3              \
     WP_B_Toshiba_3              \
     WPP_A_ericsson_MAIN_2       \
@@ -127,7 +143,7 @@ HEVC_SAMPLES =                  \
     WPP_F_ericsson_MAIN_2       \
 
 HEVC_SAMPLES_10BIT =            \
-    DBLK_A_MAIN10_VIXS_2        \
+    DBLK_A_MAIN10_VIXS_3        \
     WP_A_MAIN10_Toshiba_3       \
     WP_MAIN10_B_Toshiba_3       \
     WPP_A_ericsson_MAIN10_2     \
@@ -136,35 +152,101 @@ HEVC_SAMPLES_10BIT =            \
     WPP_D_ericsson_MAIN10_2     \
     WPP_E_ericsson_MAIN10_2     \
     WPP_F_ericsson_MAIN10_2     \
+    INITQP_B_Sony_1             \
+
+HEVC_SAMPLES_422_10BIT =        \
+    ADJUST_IPRED_ANGLE_A_RExt_Mitsubishi_1 \
+    IPCM_A_RExt_NEC             \
+
+HEVC_SAMPLES_422_10BIN =        \
+    Main_422_10_A_RExt_Sony_1   \
+    Main_422_10_B_RExt_Sony_1   \
+
+HEVC_SAMPLES_444_8BIT =         \
+    QMATRIX_A_RExt_Sony_1       \
+
+HEVC_SAMPLES_444_12BIT =        \
+    IPCM_B_RExt_NEC             \
+    PERSIST_RPARAM_A_RExt_Sony_1\
+    SAO_A_RExt_MediaTek_1       \
+
+
+# equivalent bitstreams
+# AMP_D_Hisilicon_3 -- AMP_D_Hisilicon
+# AMP_E_Hisilicon_3 -- AMP_E_Hisilicon
+# MVDL1ZERO_A_docomo_4 -- MVDL1ZERO_A_docomo_3
+# RAP_A_docomo_5 -- RAP_A_docomo_4
+# RAP_B_bossen_2 -- RAP_B_bossen_1
+# RPS_A_docomo_5 -- RPS_A_docomo_4
+# RPS_F_docomo_2 -- RPS_F_docomo_1
 
 # do not pass:
-# DELTAQP_A_BRCM_4.bit -- TODO uses CRC instead of MD5
-# HRD_A_Fujitsu_2.bin -- TODO uses hash 2 ("checksum")
-# TSUNEQBD_A_MAIN10_Technicolor_2.bit (segfault)
+# TSUNEQBD_A_MAIN10_Technicolor_2.bit (segfault mix 9-10bits)
+# PERSIST_RPARAM_A_RExt_Sony_1 (rext)
+
 
 define FATE_HEVC_TEST
 FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -vsync 0 -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
+fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -vsync drop -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
 endef
 
 define FATE_HEVC_TEST_10BIT
 FATE_HEVC += fate-hevc-conformance-$(1)
-fate-hevc-conformance-$(1): CMD = framecrc -vsync 0 -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p10le
+fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv420p10le
+endef
+
+define FATE_HEVC_TEST_422_10BIT
+FATE_HEVC += fate-hevc-conformance-$(1)
+fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv422p10le
+endef
+
+define FATE_HEVC_TEST_422_10BIN
+FATE_HEVC += fate-hevc-conformance-$(1)
+fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bin -pix_fmt yuv422p10le
+endef
+
+define FATE_HEVC_TEST_444_8BIT
+FATE_HEVC += fate-hevc-conformance-$(1)
+fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit
+endef
+
+define FATE_HEVC_TEST_444_12BIT
+FATE_HEVC += fate-hevc-conformance-$(1)
+fate-hevc-conformance-$(1): CMD = framecrc -flags unaligned -i $(TARGET_SAMPLES)/hevc-conformance/$(1).bit -pix_fmt yuv444p12le
 endef
 
 $(foreach N,$(HEVC_SAMPLES),$(eval $(call FATE_HEVC_TEST,$(N))))
 $(foreach N,$(HEVC_SAMPLES_10BIT),$(eval $(call FATE_HEVC_TEST_10BIT,$(N))))
+$(foreach N,$(HEVC_SAMPLES_422_10BIT),$(eval $(call FATE_HEVC_TEST_422_10BIT,$(N))))
+$(foreach N,$(HEVC_SAMPLES_422_10BIN),$(eval $(call FATE_HEVC_TEST_422_10BIN,$(N))))
+$(foreach N,$(HEVC_SAMPLES_444_8BIT),$(eval $(call FATE_HEVC_TEST_444_8BIT,$(N))))
+$(foreach N,$(HEVC_SAMPLES_444_12BIT),$(eval $(call FATE_HEVC_TEST_444_12BIT,$(N))))
 
-fate-hevc-paramchange-yuv420p-yuv420p10: CMD = framecrc -vsync 0 -i $(TARGET_SAMPLES)/hevc/paramchange_yuv420p_yuv420p10.hevc
+fate-hevc-paramchange-yuv420p-yuv420p10: CMD = framecrc -vsync 0 -i $(TARGET_SAMPLES)/hevc/paramchange_yuv420p_yuv420p10.hevc -sws_flags area+accurate_rnd+bitexact
 FATE_HEVC += fate-hevc-paramchange-yuv420p-yuv420p10
 
+fate-hevc-paired-fields: CMD = probeframes -show_entries frame=interlaced_frame,top_field_first $(TARGET_SAMPLES)/hevc/paired_fields.hevc
+FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-paired-fields
+
+tests/data/hevc-mp4.mov: TAG = GEN
+tests/data/hevc-mp4.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+	$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
+	-i $(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit -c copy -flags +bitexact $(TARGET_PATH)/$@ -y 2>/dev/null
+
+FATE_HEVC-$(call ALLYES, HEVC_DEMUXER MOV_DEMUXER HEVC_MP4TOANNEXB_BSF MOV_MUXER HEVC_MUXER) += fate-hevc-bsf-mp4toannexb
+fate-hevc-bsf-mp4toannexb: tests/data/hevc-mp4.mov
+fate-hevc-bsf-mp4toannexb: CMD = md5 -i $(TARGET_PATH)/tests/data/hevc-mp4.mov -c:v copy -fflags +bitexact -f hevc
+fate-hevc-bsf-mp4toannexb: CMP = oneline
+fate-hevc-bsf-mp4toannexb: REF = 1873662a3af1848c37e4eb25722c8df9
+
 FATE_HEVC-$(call DEMDEC, HEVC, HEVC) += $(FATE_HEVC)
 
 # this sample has two stsd entries and needs to reload extradata
 FATE_HEVC-$(call DEMDEC, MOV, HEVC) += fate-hevc-extradata-reload
 
-fate-hevc-extradata-reload: CMD = framemd5 -i $(TARGET_SAMPLES)/hevc/extradata-reload-multi-stsd.mov
+fate-hevc-extradata-reload: CMD = framemd5 -i $(TARGET_SAMPLES)/hevc/extradata-reload-multi-stsd.mov -sws_flags bitexact
 
 FATE_SAMPLES_AVCONV += $(FATE_HEVC-yes)
+FATE_SAMPLES_FFPROBE += $(FATE_HEVC_FFPROBE-yes)
 
-fate-hevc: $(FATE_HEVC-yes)
+fate-hevc: $(FATE_HEVC-yes) $(FATE_HEVC_FFPROBE-yes)
diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 7d970312d4..7e7be3f119 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -5,7 +5,7 @@ FATE_ALIASPIX += fate-aliaspix-gray
 fate-aliaspix-gray: CMD = framecrc -i $(TARGET_SAMPLES)/aliaspix/firstgray.pix -pix_fmt gray
 
 FATE_ALIASPIX-$(call DEMDEC, IMAGE2, ALIAS_PIX) += $(FATE_ALIASPIX)
-FATE_SAMPLES_AVCONV += $(FATE_ALIASPIX-yes)
+FATE_IMAGE += $(FATE_ALIASPIX-yes)
 fate-aliaspix: $(FATE_ALIASPIX-yes)
 
 FATE_BRENDERPIX += fate-brenderpix-24
@@ -24,15 +24,15 @@ FATE_BRENDERPIX += fate-brenderpix-y400a
 fate-brenderpix-y400a: CMD = framecrc -c:v brender_pix -i $(TARGET_SAMPLES)/brenderpix/gears.pix
 
 FATE_BRENDERPIX-$(call DEMDEC, IMAGE2, BRENDER_PIX) += $(FATE_BRENDERPIX)
-FATE_SAMPLES_AVCONV += $(FATE_BRENDERPIX-yes)
+FATE_IMAGE += $(FATE_BRENDERPIX-yes)
 fate-brenderpix: $(FATE_BRENDERPIX-yes)
 
-FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP) += fate-bmpparser
-fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/libav_4x_concat.bmp -pix_fmt rgb24
+FATE_IMAGE-$(call PARSERDEMDEC, BMP, IMAGE2PIPE, BMP) += fate-bmpparser
+fate-bmpparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/bmp/numbers.bmp -pix_fmt rgb24
 
 define FATE_IMGSUITE_DDS
 FATE_DDS += fate-dds-$(1)
-fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/libav_$(1).dds $(DDS_OPTS_$(1))
+fate-dds-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/dds/fate_$(1).dds $(DDS_OPTS_$(1))
 endef
 
 DDS_OPTS_pal     = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba
@@ -88,14 +88,14 @@ DDS_FMT          = alpha8                                               \
 $(foreach FMT,$(DDS_FMT),$(eval $(call FATE_IMGSUITE_DDS,$(FMT))))
 
 FATE_DDS-$(call DEMDEC, IMAGE2, DDS) += $(FATE_DDS)
-FATE_SAMPLES_AVCONV += $(FATE_DDS-yes)
+FATE_IMAGE += $(FATE_DDS-yes)
 fate-dds: $(FATE_DDS-yes)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
+FATE_IMAGE-$(call DEMDEC, IMAGE2, DPX) += fate-dpx
 fate-dpx: CMD = framecrc -i $(TARGET_SAMPLES)/dpx/lighthouse_rgb48.dpx
 
 FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, DPX, IMAGE2PIPE, DPX) += fate-dpxparser
-fate-dpxparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/dpx/libav_4x_concat.dpx -sws_flags +accurate_rnd+bitexact
+fate-dpxparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/dpx/lena_4x_concat.dpx -sws_flags +accurate_rnd+bitexact
 
 FATE_EXR += fate-exr-slice-raw
 fate-exr-slice-raw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_raw.exr -pix_fmt rgba64le
@@ -112,35 +112,254 @@ fate-exr-slice-zip16: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_slice_zip16.e
 FATE_EXR += fate-exr-slice-pxr24
 fate-exr-slice-pxr24: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_slice_pxr24.exr -pix_fmt rgb48le
 
+FATE_EXR += fate-exr-rgb-scanline-pxr24-float-12x8
+fate-exr-rgb-scanline-pxr24-float-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_12x8.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgba-multiscanline-half-b44
+fate-exr-rgba-multiscanline-half-b44: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_multiscanline_half_b44.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-scanline-float-b44
+fate-exr-rgb-scanline-float-b44: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_float_b44.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-half-b44-12x8
+fate-exr-rgb-scanline-half-b44-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_b44_12x8.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-half-b44-13x9
+fate-exr-rgb-scanline-half-b44-13x9: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_b44_13x9.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-tile-float-raw-12x8
+fate-exr-rgb-tile-float-raw-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_float_raw_12x8.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-tile-float-raw-150x130
+fate-exr-rgb-tile-float-raw-150x130: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_float_raw_150x130.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-tile-half-raw-12x8
+fate-exr-rgb-tile-half-raw-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_raw_12x8.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgba-scanline-float-half-b44-13x9-l1
+fate-exr-rgba-scanline-float-half-b44-13x9-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_13x9.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgba-scanline-float-half-b44-13x9-l2
+fate-exr-rgba-scanline-float-half-b44-13x9-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_13x9.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgba-scanline-float-half-b44-12x8-l1
+fate-exr-rgba-scanline-float-half-b44-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_12x8.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgba-scanline-float-half-b44-12x8-l2
+fate-exr-rgba-scanline-float-half-b44-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44_12x8.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgba-scanline-float-half-b44a-12x8-l1
+fate-exr-rgba-scanline-float-half-b44a-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_12x8.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgba-scanline-float-half-b44a-12x8-l2
+fate-exr-rgba-scanline-float-half-b44a-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_12x8.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgba-scanline-float-half-b44a-13x9-l1
+fate-exr-rgba-scanline-float-half-b44a-13x9-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_13x9.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgba-scanline-float-half-b44a-13x9-l2
+fate-exr-rgba-scanline-float-half-b44a-13x9-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgba_scanline_float_half_b44a_13x9.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-tile-pxr24-float-half-l1
+fate-exr-rgb-tile-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_float_half.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-tile-pxr24-float-half-l2
+fate-exr-rgb-tile-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_float_half.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-tile-pxr24-half-float-l1
+fate-exr-rgb-tile-pxr24-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_half_float.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-tile-pxr24-half-float-l2
+fate-exr-rgb-tile-pxr24-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_pxr24_half_float.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-tile-half-float-b44-12x8-l1
+fate-exr-rgb-tile-half-float-b44-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_half_float_b44_12x8.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-tile-half-float-b44-12x8-l2
+fate-exr-rgb-tile-half-float-b44-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_half_float_b44_12x8.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-tile-zip-half-float-l1
+fate-exr-rgb-tile-zip-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_zip_half_float.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-tile-zip-half-float-l2
+fate-exr-rgb-tile-zip-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_zip_half_float.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-tile-zip1-half-float-l1
+fate-exr-rgb-tile-zip1-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_zip1_half_float.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-tile-zip1-half-float-l2
+fate-exr-rgb-tile-zip1-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_zip1_half_float.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-tile-rle-half-float-l1
+fate-exr-rgb-tile-rle-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_rle_half_float.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-tile-rle-half-float-l2
+fate-exr-rgb-tile-rle-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_rle_half_float.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-tile-raw-half-float-l1
+fate-exr-rgb-tile-raw-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_tile_raw_half_float.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-tile-raw-half-float-l2
+fate-exr-rgb-tile-raw-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_tile_raw_half_float.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-scanline-b44-half-float-12x8-l1
+fate-exr-rgb-scanline-b44-half-float-12x8-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_half_float_12x8.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-b44-half-float-12x8-l2
+fate-exr-rgb-scanline-b44-half-float-12x8-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_half_float_12x8.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-scanline-pxr24-half-float-l1
+fate-exr-rgb-scanline-pxr24-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_float.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-pxr24-half-float-l2
+fate-exr-rgb-scanline-pxr24-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_float.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-scanline-pxr24-float-half-l1
+fate-exr-rgb-scanline-pxr24-float-half-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-pxr24-float-half-l2
+fate-exr-rgb-scanline-pxr24-float-half-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_float_half.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-scanline-pxr24-half-uint32-13x9
+fate-exr-rgb-scanline-pxr24-half-uint32-13x9: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_half_uint32_13x9.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-zip-half-float-l1
+fate-exr-rgb-scanline-zip-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip_half_float.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-zip-half-float-l2
+fate-exr-rgb-scanline-zip-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip_half_float.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-scanline-zip1-half-float-l1
+fate-exr-rgb-scanline-zip1-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-zip1-half-float-l2
+fate-exr-rgb-scanline-zip1-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-scanline-rle-half-float-l1
+fate-exr-rgb-scanline-rle-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_rle_half_float.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-rle-half-float-l2
+fate-exr-rgb-scanline-rle-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_rle_half_float.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-scanline-raw-half-float-l1
+fate-exr-rgb-scanline-raw-half-float-l1: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_raw_half_float.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-raw-half-float-l2
+fate-exr-rgb-scanline-raw-half-float-l2: CMD = framecrc -layer "VRaySamplerInfo" -i $(TARGET_SAMPLES)/exr/rgb_scanline_raw_half_float.exr -pix_fmt rgba64le
+
+FATE_EXR += fate-exr-rgb-scanline-b44-uint32
+fate-exr-rgb-scanline-b44-uint32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_b44_uint32.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-pxr24-uint32
+fate-exr-rgb-scanline-pxr24-uint32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_pxr24_uint32.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-zip1-half-float-l1-zero-offsets
+fate-exr-rgb-scanline-zip1-half-float-l1-zero-offsets: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_zip1_half_float_zero_offsets.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-half-piz-bw
+fate-exr-rgb-scanline-half-piz-bw: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_bw.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-half-piz-color
+fate-exr-rgb-scanline-half-piz-color: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_color.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-half-piz-dw-t01
+fate-exr-rgb-scanline-half-piz-dw-t01: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_dw_t01.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-float-piz-48x32
+fate-exr-rgb-scanline-float-piz-48x32: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_float_piz_48x32.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-rgb-scanline-none-negative-red
+fate-exr-rgb-scanline-none-negative-red: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_none_negative_red.exr -pix_fmt rgb48le
+
+
+FATE_EXR += fate-exr-rgb-b44a-half-negative-4x4
+fate-exr-rgb-b44a-half-negative-4x4: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_b44a_half_negative_4x4.exr -pix_fmt rgb48le
+
+FATE_EXR += fate-exr-y-tile-zip-half-12x8
+fate-exr-y-tile-zip-half-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/y_tile_zip_half_12x8.exr -pix_fmt gray16le
+
+FATE_EXR += fate-exr-y-scanline-zip-half-12x8
+fate-exr-y-scanline-zip-half-12x8: CMD = framecrc -i $(TARGET_SAMPLES)/exr/y_scanline_zip_half_12x8.exr -pix_fmt gray16le
+
+FATE_EXR += fate-exr-rgb-scanline-half-piz-dw-t08
+fate-exr-rgb-scanline-half-piz-dw-t08: CMD = framecrc -i $(TARGET_SAMPLES)/exr/rgb_scanline_half_piz_dw_t08.exr -pix_fmt rgb48le
+
 FATE_EXR-$(call DEMDEC, IMAGE2, EXR) += $(FATE_EXR)
 
-FATE_SAMPLES_AVCONV += $(FATE_EXR-yes)
+FATE_IMAGE += $(FATE_EXR-yes)
 fate-exr: $(FATE_EXR-yes)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, QDRAW) += fate-pict
+FATE_JPG += fate-jpg-12bpp
+fate-jpg-12bpp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/12bpp.jpg -f rawvideo -pix_fmt gray16le -vf setsar=sar=sar
+
+FATE_JPG += fate-jpg-jfif
+fate-jpg-jfif: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/jpg/20242.jpg
+
+FATE_JPG-$(call DEMDEC, IMAGE2, MJPEG) += $(FATE_JPG)
+FATE_IMAGE += $(FATE_JPG-yes)
+fate-jpg: $(FATE_JPG-yes)
+
+FATE_IMAGE-$(call DEMDEC, IMAGE2, QDRAW) += fate-pict
 fate-pict: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/TRU256.PCT -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
-fate-pictor: CMD = framecrc -c pictor -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
+FATE_IMAGE-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor
+fate-pictor: CMD = framecrc -i $(TARGET_SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
-fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/libav_4x_concat.png -pix_fmt rgba
+FATE_IMAGE-$(call PARSERDEMDEC, PNG, IMAGE2PIPE, PNG) += fate-pngparser
+fate-pngparser: CMD = framecrc -f image2pipe -i $(TARGET_SAMPLES)/png1/feed_4x_concat.png -pix_fmt rgba
 
 define FATE_IMGSUITE_PNG
 FATE_PNG += fate-png-$(1)
-fate-png-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/png1/libav_$(1).png -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24
+fate-png-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/png1/lena-$(1).png -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24
 endef
 
-PNG_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba ya8 ya16
+PNG_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba rgba64 ya8 ya16
 $(foreach CLSP,$(PNG_COLORSPACES),$(eval $(call FATE_IMGSUITE_PNG,$(CLSP))))
 
+FATE_PNG += fate-png-int-rgb24
+fate-png-int-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/png1/lena-int_rgb24.png -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24
+
 FATE_PNG-$(call DEMDEC, IMAGE2, PNG) += $(FATE_PNG)
-FATE_SAMPLES_AVCONV += $(FATE_PNG-yes)
+FATE_IMAGE += $(FATE_PNG-yes)
 fate-png: $(FATE_PNG-yes)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
+FATE_IMAGE-$(call DEMDEC, IMAGE2, PTX) += fate-ptx
 fate-ptx: CMD = framecrc -i $(TARGET_SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
 
+define FATE_IMGSUITE_PSD
+FATE_PSD += fate-psd-$(1)
+fate-psd-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-$(1).psd -sws_flags +accurate_rnd+bitexact -pix_fmt rgb24
+endef
+
+PSD_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba rgba64 ya8 ya16
+$(foreach CLSP,$(PSD_COLORSPACES),$(eval $(call FATE_IMGSUITE_PSD,$(CLSP))))
+
+FATE_PSD += fate-psd-lena-127x127-rgb24
+fate-psd-lena-127x127-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-127x127_rgb24.psd
+
+FATE_PSD += fate-psd-lena-rgb-rle-127x127-16b
+fate-psd-lena-rgb-rle-127x127-16b: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-rgb_rle_127x127_16b.psd
+
+FATE_PSD += fate-psd-lena-rgb-rle-127x127-8b
+fate-psd-lena-rgb-rle-127x127-8b: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-rgb_rle_127x127_8b.psd
+
+FATE_PSD += fate-psd-lena-rgba-rle-128x128-8b
+fate-psd-lena-rgba-rle-128x128-8b: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-rgba_rle_128x128_8b.psd
+
+FATE_PSD += fate-psd-lena-256c
+fate-psd-lena-256c: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-256c.psd
+
+FATE_PSD += fate-psd-lena-bitmap
+fate-psd-lena-bitmap: CMD = framecrc -i $(TARGET_SAMPLES)/psd/lena-bitmap.psd
+
+FATE_PSD += fate-psd-duo-tone-color
+fate-psd-duo-tone-color: CMD = framecrc -i $(TARGET_SAMPLES)/psd/duotone-color.psd
+
+FATE_PSD-$(call DEMDEC, IMAGE2, PSD) += $(FATE_PSD)
+
+FATE_IMAGE += $(FATE_PSD-yes)
+fate-psd: $(FATE_PSD-yes)
+
 define FATE_IMGSUITE_SGI
 FATE_SGI += fate-sgi-$(1) fate-sgi-$(1)-rle
 fate-sgi-$(1): CMD = framecrc -i $(TARGET_SAMPLES)/sgi/libav_$(1).sgi -sws_flags +accurate_rnd+bitexact
@@ -151,7 +370,7 @@ SGI_COLORSPACES = gray8 gray16 rgb24 rgb48 rgba rgba64
 $(foreach CLSP,$(SGI_COLORSPACES),$(eval $(call FATE_IMGSUITE_SGI,$(CLSP))))
 
 FATE_SGI-$(call DEMDEC, IMAGE2, SGI) += $(FATE_SGI)
-FATE_SAMPLES_AVCONV += $(FATE_SGI-yes)
+FATE_IMAGE += $(FATE_SGI-yes)
 fate-sgi: $(FATE_SGI-yes)
 
 FATE_SUNRASTER += fate-sunraster-1bit-raw
@@ -177,7 +396,7 @@ fate-sunraster-24bit-rle: CMD = framecrc -i $(TARGET_SAMPLES)/sunraster/lena-24b
 
 FATE_SUNRASTER-$(call DEMDEC, IMAGE2, SUNRAST) += $(FATE_SUNRASTER)
 
-FATE_SAMPLES_AVCONV += $(FATE_SUNRASTER-yes)
+FATE_IMAGE += $(FATE_SUNRASTER-yes)
 fate-sunraster: $(FATE_SUNRASTER-yes)
 
 FATE_TARGA = CBW8       \
@@ -196,7 +415,7 @@ FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%)  \
 
 FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA) += $(FATE_TARGA)
 
-FATE_SAMPLES_AVCONV += $(FATE_TARGA-yes)
+FATE_IMAGE += $(FATE_TARGA-yes)
 fate-targa: $(FATE_TARGA-yes)
 
 fate-targa-conformance-CBW8:  CMD = framecrc -i $(TARGET_SAMPLES)/targa-conformance/CBW8.TGA
@@ -220,19 +439,34 @@ fate-tiff-fax-g3s: CMD = framecrc -i $(TARGET_SAMPLES)/CCITT_fax/G31DS.TIF
 
 FATE_TIFF-$(call DEMDEC, IMAGE2, TIFF) += $(FATE_TIFF)
 
-FATE_SAMPLES_AVCONV += $(FATE_TIFF-yes)
+FATE_IMAGE += $(FATE_TIFF-yes)
 fate-tiff: $(FATE_TIFF-yes)
 
-FATE_WEBP += fate-webp-yuv420p
-fate-webp-yuv420p: CMD = framecrc -i $(TARGET_SAMPLES)/webp/image_small.webp
+FATE_WEBP += fate-webp-rgb-lossless
+fate-webp-rgb-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_lossless.webp
+
+FATE_WEBP += fate-webp-rgb-lena-lossless
+fate-webp-rgb-lena-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_lena_lossless.webp
+
+FATE_WEBP += fate-webp-rgb-lena-lossless-rgb24
+fate-webp-rgb-lena-lossless-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_lena_lossless.webp -pix_fmt rgb24
 
-FATE_WEBP += fate-webp-yuva420p
-fate-webp-yuva420p: CMD = framecrc -i $(TARGET_SAMPLES)/webp/1_webp_a.webp
+FATE_WEBP += fate-webp-rgba-lossless
+fate-webp-rgba-lossless: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgba_lossless.webp
+
+FATE_WEBP += fate-webp-rgb-lossy-q80
+fate-webp-rgb-lossy-q80: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgb_q80.webp
+
+FATE_WEBP += fate-webp-rgba-lossy-q80
+fate-webp-rgba-lossy-q80: CMD = framecrc -i $(TARGET_SAMPLES)/webp/rgba_q80.webp
 
 FATE_WEBP-$(call DEMDEC, IMAGE2, WEBP) += $(FATE_WEBP)
-FATE_SAMPLES_AVCONV += $(FATE_WEBP-yes)
+FATE_IMAGE += $(FATE_WEBP-yes)
 fate-webp: $(FATE_WEBP-yes)
 
+FATE_IMAGE-$(call DEMDEC, IMAGE2, XFACE) += fate-xface
+fate-xface: CMD = framecrc -i $(TARGET_SAMPLES)/xface/lena.xface
+
 FATE_XBM += fate-xbm10
 fate-xbm10: CMD = framecrc -i $(TARGET_SAMPLES)/xbm/xl.xbm
 
@@ -240,5 +474,10 @@ FATE_XBM += fate-xbm11
 fate-xbm11: CMD = framecrc -i $(TARGET_SAMPLES)/xbm/lbw.xbm
 
 FATE_XBM-$(call DEMDEC, IMAGE2, XBM) += $(FATE_XBM)
-FATE_SAMPLES_AVCONV += $(FATE_XBM-yes)
+FATE_IMAGE += $(FATE_XBM-yes)
 fate-xbm: $(FATE_XBM-yes)
+
+FATE_IMAGE += $(FATE_IMAGE-yes)
+
+FATE_SAMPLES_FFMPEG += $(FATE_IMAGE)
+fate-image: $(FATE_IMAGE)
diff --git a/tests/fate/libavcodec.mak b/tests/fate/libavcodec.mak
index 0bbe57223f..a2d5d9fe33 100644
--- a/tests/fate/libavcodec.mak
+++ b/tests/fate/libavcodec.mak
@@ -1,21 +1,86 @@
+FATE_LIBAVCODEC-yes += fate-avpacket
+fate-avpacket: libavcodec/tests/avpacket$(EXESUF)
+fate-avpacket: CMD = run libavcodec/tests/avpacket
+fate-avpacket: CMP = null
+
+FATE_LIBAVCODEC-$(CONFIG_CABAC) += fate-cabac
+fate-cabac: libavcodec/tests/cabac$(EXESUF)
+fate-cabac: CMD = run libavcodec/tests/cabac
+fate-cabac: CMP = null
+
+FATE_LIBAVCODEC-yes += fate-celp_math
+fate-celp_math: libavcodec/tests/celp_math$(EXESUF)
+fate-celp_math: CMD = run libavcodec/tests/celp_math
+fate-celp_math: CMP = null
+
 FATE_LIBAVCODEC-$(CONFIG_GOLOMB) += fate-golomb
 fate-golomb: libavcodec/tests/golomb$(EXESUF)
 fate-golomb: CMD = run libavcodec/tests/golomb
 fate-golomb: CMP = null
 
-FATE_LIBAVCODEC-$(CONFIG_IDCTDSP) += fate-idct8x8
-fate-idct8x8: libavcodec/tests/dct$(EXESUF)
-fate-idct8x8: CMD = run libavcodec/tests/dct -i
-fate-idct8x8: CMP = null
+FATE_LIBAVCODEC-$(CONFIG_IDCTDSP) += fate-idct8x8-0 fate-idct8x8-1 fate-idct8x8-2 fate-idct248
+
+fate-idct8x8-0: libavcodec/tests/dct$(EXESUF)
+fate-idct8x8-0: CMD = run libavcodec/tests/dct -i 0
+fate-idct8x8-0: CMP = null
+
+fate-idct8x8-1: libavcodec/tests/dct$(EXESUF)
+fate-idct8x8-1: CMD = run libavcodec/tests/dct -i 1
+fate-idct8x8-1: CMP = null
+
+fate-idct8x8-2: libavcodec/tests/dct$(EXESUF)
+fate-idct8x8-2: CMD = run libavcodec/tests/dct -i 2
+fate-idct8x8-2: CMP = null
+
+fate-idct248: libavcodec/tests/dct$(EXESUF)
+fate-idct248: CMD = run libavcodec/tests/dct -4
+fate-idct248: CMP = null
+
+FATE_LIBAVCODEC-$(CONFIG_IDCTDSP) += fate-dct8x8
+fate-dct8x8: libavcodec/tests/dct$(EXESUF)
+fate-dct8x8: CMD = run libavcodec/tests/dct
+fate-dct8x8: CMP = null
 
 FATE_LIBAVCODEC-$(CONFIG_IIRFILTER) += fate-iirfilter
 fate-iirfilter: libavcodec/tests/iirfilter$(EXESUF)
 fate-iirfilter: CMD = run libavcodec/tests/iirfilter
 
+FATE_LIBAVCODEC-$(CONFIG_MPEGVIDEO) += fate-mpeg12framerate
+fate-mpeg12framerate: libavcodec/tests/mpeg12framerate$(EXESUF)
+fate-mpeg12framerate: CMD = run libavcodec/tests/mpeg12framerate
+fate-mpeg12framerate: REF = /dev/null
+
+FATE_LIBAVCODEC-yes += fate-libavcodec-options
+fate-libavcodec-options: libavcodec/tests/options$(EXESUF)
+fate-libavcodec-options: CMD = run libavcodec/tests/options
+
 FATE_LIBAVCODEC-$(CONFIG_RANGECODER) += fate-rangecoder
 fate-rangecoder: libavcodec/tests/rangecoder$(EXESUF)
 fate-rangecoder: CMD = run libavcodec/tests/rangecoder
 fate-rangecoder: CMP = null
 
+FATE_LIBAVCODEC-yes += fate-mathops
+fate-mathops: libavcodec/tests/mathops$(EXESUF)
+fate-mathops: CMD = run libavcodec/tests/mathops
+fate-mathops: CMP = null
+
+FATE_LIBAVCODEC-$(CONFIG_JPEG2000_ENCODER) += fate-j2k-dwt
+fate-j2k-dwt: libavcodec/tests/jpeg2000dwt$(EXESUF)
+fate-j2k-dwt: CMD = run libavcodec/tests/jpeg2000dwt
+
+FATE_LIBAVCODEC-yes += fate-libavcodec-utils
+fate-libavcodec-utils: libavcodec/tests/utils$(EXESUF)
+fate-libavcodec-utils: CMD = run libavcodec/tests/utils
+fate-libavcodec-utils: CMP = null
+
+FATE_LIBAVCODEC-yes += fate-libavcodec-huffman
+fate-libavcodec-huffman: libavcodec/tests/mjpegenc_huffman$(EXESUF)
+fate-libavcodec-huffman: CMD = run libavcodec/tests/mjpegenc_huffman
+fate-libavcodec-huffman: CMP = null
+
+FATE_LIBAVCODEC-yes += fate-libavcodec-htmlsubtitles
+fate-libavcodec-htmlsubtitles: libavcodec/tests/htmlsubtitles$(EXESUF)
+fate-libavcodec-htmlsubtitles: CMD = run libavcodec/tests/htmlsubtitles
+
 FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC-yes)
 fate-libavcodec: $(FATE_LIBAVCODEC-yes)
diff --git a/tests/fate/libavformat.mak b/tests/fate/libavformat.mak
index 30f0e03cb8..cf1ba189dd 100644
--- a/tests/fate/libavformat.mak
+++ b/tests/fate/libavformat.mak
@@ -1,3 +1,7 @@
+#FATE_LIBAVFORMAT-$(HAVE_PTHREADS) += fate-async
+#fate-async: libavformat/tests/async$(EXESUF)
+#fate-async: CMD = run libavformat/tests/async
+
 FATE_LIBAVFORMAT-$(CONFIG_NETWORK) += fate-noproxy
 fate-noproxy: libavformat/tests/noproxy$(EXESUF)
 fate-noproxy: CMD = run libavformat/tests/noproxy
@@ -18,5 +22,6 @@ FATE_LIBAVFORMAT-$(CONFIG_MOV_MUXER) += fate-movenc
 fate-movenc: libavformat/tests/movenc$(EXESUF)
 fate-movenc: CMD = run libavformat/tests/movenc
 
-FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT-yes)
+FATE_LIBAVFORMAT += $(FATE_LIBAVFORMAT-yes)
+FATE-$(CONFIG_AVFORMAT) += $(FATE_LIBAVFORMAT)
 fate-libavformat: $(FATE_LIBAVFORMAT)
diff --git a/tests/fate/libavresample.mak b/tests/fate/libavresample.mak
index cb61f2a76a..da5cbb35f7 100644
--- a/tests/fate/libavresample.mak
+++ b/tests/fate/libavresample.mak
@@ -9,7 +9,7 @@ MIX_CHANNELS = 1 2 3 4 5 6 7 8
 define MIX
 FATE_LAVR_MIX += fate-lavr-mix-$(3)-$(1)-$(2)
 fate-lavr-mix-$(3)-$(1)-$(2): tests/data/asynth-44100-$(1).wav
-fate-lavr-mix-$(3)-$(1)-$(2): CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-44100-$(1).wav -ac $(2) -mix_coeff_type $(3) -internal_sample_fmt $(4) -f s16le -af atrim=end_sample=1024 -
+fate-lavr-mix-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-44100-$(1).wav -ac $(2) -mix_coeff_type $(3) -internal_sample_fmt $(4) -f s16le -af atrim=end_sample=1024 -
 fate-lavr-mix-$(3)-$(1)-$(2): CMP = oneoff
 fate-lavr-mix-$(3)-$(1)-$(2): REF = $(SAMPLES)/lavr/lavr-mix-$(3)-$(1)-$(2)
 endef
@@ -22,19 +22,19 @@ $(call CROSS_TEST,$(MIX_CHANNELS),MIX,flt,fltp)
 FATE_LAVR_MIX-$(call FILTERDEMDECENCMUX, CHANNELMAP RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-lavr-mix-output-zero
 fate-lavr-mix-output-zero: tests/data/filtergraphs/lavr_mix_output_zero tests/data/asynth-44100-4.wav
 fate-lavr-mix-output-zero: CMP = oneoff
-fate-lavr-mix-output-zero: CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-44100-4.wav -filter_script $(TARGET_PATH)/tests/data/filtergraphs/lavr_mix_output_zero -f s16le -
+fate-lavr-mix-output-zero: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-44100-4.wav -filter_script $(TARGET_PATH)/tests/data/filtergraphs/lavr_mix_output_zero -f s16le -
 fate-lavr-mix-output-zero: REF = $(SAMPLES)/lavr/lavr-mix-output-zero
 
 FATE_LAVR_MIX-$(call FILTERDEMDECENCMUX, RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_LAVR_MIX)
 fate-lavr-mix: $(FATE_LAVR_MIX-yes)
-FATE_LAVR += $(FATE_LAVR_MIX-yes)
+#FATE_LAVR += $(FATE_LAVR_MIX-yes)
 
 SAMPLERATES = 2626 8000 44100 48000 96000
 
 define RESAMPLE
 FATE_LAVR_RESAMPLE += fate-lavr-resample-$(3)-$(1)-$(2)
 fate-lavr-resample-$(3)-$(1)-$(2): tests/data/asynth-$(1)-1.wav
-fate-lavr-resample-$(3)-$(1)-$(2): CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -ar $(2) -internal_sample_fmt $(3) -f $(4) -af atrim=end_sample=10240 -
+fate-lavr-resample-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -ar $(2) -internal_sample_fmt $(3) -f $(4) -af atrim=end_sample=10240 -
 fate-lavr-resample-$(3)-$(1)-$(2): CMP = oneoff
 fate-lavr-resample-$(3)-$(1)-$(2): CMP_UNIT = $(5)
 fate-lavr-resample-$(3)-$(1)-$(2): FUZZ = 6
@@ -48,21 +48,21 @@ $(call CROSS_TEST,$(SAMPLERATES),RESAMPLE,dblp,f64le,f64)
 
 FATE_LAVR_RESAMPLE += fate-lavr-resample-linear
 fate-lavr-resample-linear: tests/data/asynth-44100-1.wav
-fate-lavr-resample-linear: CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-44100-1.wav -ar 48000 -filter_size 32 -linear_interp 1 -f s16le -af atrim=end_sample=10240 -
+fate-lavr-resample-linear: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-44100-1.wav -ar 48000 -filter_size 32 -linear_interp 1 -f s16le -af atrim=end_sample=10240 -
 fate-lavr-resample-linear: CMP = oneoff
 fate-lavr-resample-linear: CMP_UNIT = s16
 fate-lavr-resample-linear: REF = $(SAMPLES)/lavr/lavr-resample-linear
 
 FATE_LAVR_RESAMPLE += fate-lavr-resample-nearest
 fate-lavr-resample-nearest: tests/data/asynth-48000-1.wav
-fate-lavr-resample-nearest: CMD = avconv -i $(TARGET_PATH)/tests/data/asynth-48000-1.wav -ar 44100 -filter_size 0 -phase_shift 0 -f s16le -af atrim=end_sample=10240 -
+fate-lavr-resample-nearest: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-48000-1.wav -ar 44100 -filter_size 0 -phase_shift 0 -f s16le -af atrim=end_sample=10240 -
 fate-lavr-resample-nearest: CMP = oneoff
 fate-lavr-resample-nearest: CMP_UNIT = s16
 fate-lavr-resample-nearest: REF = $(SAMPLES)/lavr/lavr-resample-nearest
 
 FATE_LAVR_RESAMPLE-$(call FILTERDEMDECENCMUX, RESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_LAVR_RESAMPLE)
 fate-lavr-resample: $(FATE_LAVR_RESAMPLE-yes)
-FATE_LAVR += $(FATE_LAVR_RESAMPLE-yes)
+#FATE_LAVR += $(FATE_LAVR_RESAMPLE-yes)
 
 FATE_SAMPLES_AVCONV += $(FATE_LAVR)
 fate-lavr: $(FATE_LAVR)
diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak
index e0a669310b..591cab9b58 100644
--- a/tests/fate/libavutil.mak
+++ b/tests/fate/libavutil.mak
@@ -8,6 +8,30 @@ fate-aes: libavutil/tests/aes$(EXESUF)
 fate-aes: CMD = run libavutil/tests/aes
 fate-aes: CMP = null
 
+FATE_LIBAVUTIL += fate-aes_ctr
+fate-aes_ctr: libavutil/tests/aes_ctr$(EXESUF)
+fate-aes_ctr: CMD = run libavutil/tests/aes_ctr
+fate-aes_ctr: CMP = null
+
+FATE_LIBAVUTIL += fate-camellia
+fate-camellia: libavutil/tests/camellia$(EXESUF)
+fate-camellia: CMD = run libavutil/tests/camellia
+fate-camellia: CMP = null
+
+FATE_LIBAVUTIL += fate-cast5
+fate-cast5: libavutil/tests/cast5$(EXESUF)
+fate-cast5: CMD = run libavutil/tests/cast5
+fate-cast5: CMP = null
+
+FATE_LIBAVUTIL += fate-atomic
+fate-atomic: libavutil/tests/atomic$(EXESUF)
+fate-atomic: CMD = run libavutil/tests/atomic
+fate-atomic: CMP = null
+
+FATE_LIBAVUTIL += fate-audio_fifo
+fate-audio_fifo: libavutil/tests/audio_fifo$(EXESUF)
+fate-audio_fifo: CMD = run libavutil/tests/audio_fifo
+
 FATE_LIBAVUTIL += fate-avstring
 fate-avstring: libavutil/tests/avstring$(EXESUF)
 fate-avstring: CMD = run libavutil/tests/avstring
@@ -20,9 +44,13 @@ FATE_LIBAVUTIL += fate-blowfish
 fate-blowfish: libavutil/tests/blowfish$(EXESUF)
 fate-blowfish: CMD = run libavutil/tests/blowfish
 
+FATE_LIBAVUTIL += fate-bprint
+fate-bprint: libavutil/tests/bprint$(EXESUF)
+fate-bprint: CMD = run libavutil/tests/bprint
+
 FATE_LIBAVUTIL += fate-cpu
 fate-cpu: libavutil/tests/cpu$(EXESUF)
-fate-cpu: CMD = run libavutil/tests/cpu $(CPUFLAGS:%=-c%) $(THREADS:%=-t%)
+fate-cpu: CMD = runecho libavutil/tests/cpu $(CPUFLAGS:%=-c%) $(THREADS:%=-t%)
 fate-cpu: CMP = null
 
 FATE_LIBAVUTIL-$(HAVE_THREADS) += fate-cpu_init
@@ -34,11 +62,19 @@ FATE_LIBAVUTIL += fate-crc
 fate-crc: libavutil/tests/crc$(EXESUF)
 fate-crc: CMD = run libavutil/tests/crc
 
+FATE_LIBAVUTIL += fate-color_utils
+fate-color_utils: libavutil/tests/color_utils$(EXESUF)
+fate-color_utils: CMD = run libavutil/tests/color_utils
+
 FATE_LIBAVUTIL += fate-des
 fate-des: libavutil/tests/des$(EXESUF)
 fate-des: CMD = run libavutil/tests/des
 fate-des: CMP = null
 
+FATE_LIBAVUTIL += fate-dict
+fate-dict: libavutil/tests/dict$(EXESUF)
+fate-dict: CMD = run libavutil/tests/dict
+
 FATE_LIBAVUTIL += fate-eval
 fate-eval: libavutil/tests/eval$(EXESUF)
 fate-eval: CMD = run libavutil/tests/eval
@@ -47,36 +83,84 @@ FATE_LIBAVUTIL += fate-fifo
 fate-fifo: libavutil/tests/fifo$(EXESUF)
 fate-fifo: CMD = run libavutil/tests/fifo
 
-FATE_LIBAVUTIL += fate-float-dsp
-fate-float-dsp: libavutil/tests/float_dsp$(EXESUF)
-fate-float-dsp: CMD = run libavutil/tests/float_dsp
-fate-float-dsp: CMP = null
+FATE_LIBAVUTIL += fate-hash
+fate-hash: libavutil/tests/hash$(EXESUF)
+fate-hash: CMD = run libavutil/tests/hash
 
 FATE_LIBAVUTIL += fate-hmac
 fate-hmac: libavutil/tests/hmac$(EXESUF)
 fate-hmac: CMD = run libavutil/tests/hmac
 
+FATE_LIBAVUTIL += fate-imgutils
+fate-imgutils: libavutil/tests/imgutils$(EXESUF)
+fate-imgutils: CMD = run libavutil/tests/imgutils
+
+FATE_LIBAVUTIL += fate-lfg
+fate-lfg: libavutil/tests/lfg$(EXESUF)
+fate-lfg: CMD = run libavutil/tests/lfg
+
 FATE_LIBAVUTIL += fate-md5
 fate-md5: libavutil/tests/md5$(EXESUF)
 fate-md5: CMD = run libavutil/tests/md5
 
+FATE_LIBAVUTIL += fate-murmur3
+fate-murmur3: libavutil/tests/murmur3$(EXESUF)
+fate-murmur3: CMD = run libavutil/tests/murmur3
+
 FATE_LIBAVUTIL += fate-parseutils
 fate-parseutils: libavutil/tests/parseutils$(EXESUF)
 fate-parseutils: CMD = run libavutil/tests/parseutils
 
+FATE_LIBAVUTIL-$(CONFIG_PIXELUTILS) += fate-pixelutils
+fate-pixelutils: libavutil/tests/pixelutils$(EXESUF)
+fate-pixelutils: CMD = run libavutil/tests/pixelutils
+
+FATE_LIBAVUTIL += fate-pixfmt_best
+fate-pixfmt_best: libavutil/tests/pixfmt_best$(EXESUF)
+fate-pixfmt_best: CMD = run libavutil/tests/pixfmt_best
+
+FATE_LIBAVUTIL += fate-display
+fate-display: libavutil/tests/display$(EXESUF)
+fate-display: CMD = run libavutil/tests/display
+
+FATE_LIBAVUTIL += fate-random_seed
+fate-random_seed: libavutil/tests/random_seed$(EXESUF)
+fate-random_seed: CMD = run libavutil/tests/random_seed
+
+FATE_LIBAVUTIL += fate-ripemd
+fate-ripemd: libavutil/tests/ripemd$(EXESUF)
+fate-ripemd: CMD = run libavutil/tests/ripemd
+
 FATE_LIBAVUTIL += fate-sha
 fate-sha: libavutil/tests/sha$(EXESUF)
 fate-sha: CMD = run libavutil/tests/sha
 
+FATE_LIBAVUTIL += fate-sha512
+fate-sha512: libavutil/tests/sha512$(EXESUF)
+fate-sha512: CMD = run libavutil/tests/sha512
+
 FATE_LIBAVUTIL += fate-tree
 fate-tree: libavutil/tests/tree$(EXESUF)
 fate-tree: CMD = run libavutil/tests/tree
 fate-tree: CMP = null
 
+FATE_LIBAVUTIL += fate-twofish
+fate-twofish: libavutil/tests/twofish$(EXESUF)
+fate-twofish: CMD = run libavutil/tests/twofish
+fate-twofish: CMP = null
+
 FATE_LIBAVUTIL += fate-xtea
 fate-xtea: libavutil/tests/xtea$(EXESUF)
 fate-xtea: CMD = run libavutil/tests/xtea
 
+FATE_LIBAVUTIL += fate-tea
+fate-tea: libavutil/tests/tea$(EXESUF)
+fate-tea: CMD = run libavutil/tests/tea
+
+FATE_LIBAVUTIL += fate-opt
+fate-opt: libavutil/tests/opt$(EXESUF)
+fate-opt: CMD = run libavutil/tests/opt
+
 FATE_LIBAVUTIL += $(FATE_LIBAVUTIL-yes)
 FATE-$(CONFIG_AVUTIL) += $(FATE_LIBAVUTIL)
 fate-libavutil: $(FATE_LIBAVUTIL)
diff --git a/tests/fate/libswresample.mak b/tests/fate/libswresample.mak
new file mode 100644
index 0000000000..fed481b3d5
--- /dev/null
+++ b/tests/fate/libswresample.mak
@@ -0,0 +1,1098 @@
+CROSS_TEST = $(foreach I,$(1),                                        \
+                 $(foreach J,$(1),                                    \
+                     $(if $(filter-out $(I),$(J)),                    \
+                         $(eval $(call $(2),$(I),$(J),$(3),$(4),$(5))),    \
+                     )))
+
+
+SAMPLERATES = 2626 8000 44100 48000 96000
+
+SAMPLERATES_LITE = 8000 44100 48000
+
+SAMPLERATES_NN = 8000 44100
+
+#note that the default is ARESAMPLE_EXACT_LIN
+define ARESAMPLE
+FATE_SWR_RESAMPLE += fate-swr-resample-$(3)-$(1)-$(2)
+fate-swr-resample-$(3)-$(1)-$(2): tests/data/asynth-$(1)-1.wav
+fate-swr-resample-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -af atrim=end_sample=10240,aresample=$(2):internal_sample_fmt=$(3):exact_rational=0:linear_interp=0,aformat=$(3),aresample=$(1):internal_sample_fmt=$(3):exact_rational=0:linear_interp=0 -f wav -c:a pcm_s16le -
+
+fate-swr-resample-$(3)-$(1)-$(2): CMP = stddev
+fate-swr-resample-$(3)-$(1)-$(2): CMP_UNIT = $(5)
+fate-swr-resample-$(3)-$(1)-$(2): FUZZ = 0.1
+fate-swr-resample-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav
+endef
+
+#below list is generated by:
+#you can use this if you need to update it!
+#make -k  `make fate-list | grep swr` | egrep 'TEST|stddev' | tr '\n' '@' | sed 's#TEST *\([^@]*\)@stddev: *\([0-9.]*\)[^b@]*bytes: *\([0-9]*\) */ *\([0-9]*\)@#fate-\1: CMP_TARGET = \2@fate-\1: SIZE_TOLERANCE = \3 - \4@@#g' | tr '@' '\n'
+
+fate-swr-resample-dblp-2626-44100: CMP_TARGET = 1352.67
+fate-swr-resample-dblp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample-dblp-2626-48000: CMP_TARGET = 1352.66
+fate-swr-resample-dblp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample-dblp-2626-8000: CMP_TARGET = 1352.56
+fate-swr-resample-dblp-2626-8000: SIZE_TOLERANCE = 31512 - 20482
+
+fate-swr-resample-dblp-2626-96000: CMP_TARGET = 1352.67
+fate-swr-resample-dblp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample-dblp-44100-2626: CMP_TARGET = 185.82
+fate-swr-resample-dblp-44100-2626: SIZE_TOLERANCE = 529200 - 20490
+
+fate-swr-resample-dblp-44100-48000: CMP_TARGET = 9.69
+fate-swr-resample-dblp-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample-dblp-44100-8000: CMP_TARGET = 75.45
+fate-swr-resample-dblp-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample-dblp-44100-96000: CMP_TARGET = 11.46
+fate-swr-resample-dblp-44100-96000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample-dblp-48000-2626: CMP_TARGET = 456.51
+fate-swr-resample-dblp-48000-2626: SIZE_TOLERANCE = 576000 - 20510
+
+fate-swr-resample-dblp-48000-44100: CMP_TARGET = 1.00
+fate-swr-resample-dblp-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample-dblp-48000-8000: CMP_TARGET = 62.38
+fate-swr-resample-dblp-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample-dblp-48000-96000: CMP_TARGET = 0.47
+fate-swr-resample-dblp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample-dblp-8000-2626: CMP_TARGET = 2503.33
+fate-swr-resample-dblp-8000-2626: SIZE_TOLERANCE = 96000 - 20486
+
+fate-swr-resample-dblp-8000-44100: CMP_TARGET = 15.09
+fate-swr-resample-dblp-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample-dblp-8000-48000: CMP_TARGET = 14.69
+fate-swr-resample-dblp-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample-dblp-8000-96000: CMP_TARGET = 13.81
+fate-swr-resample-dblp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample-dblp-96000-2626: CMP_TARGET = 675.07
+fate-swr-resample-dblp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
+
+fate-swr-resample-dblp-96000-44100: CMP_TARGET = 1.44
+fate-swr-resample-dblp-96000-44100: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample-dblp-96000-48000: CMP_TARGET = 0.99
+fate-swr-resample-dblp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample-dblp-96000-8000: CMP_TARGET = 58.57
+fate-swr-resample-dblp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
+
+fate-swr-resample-fltp-2626-44100: CMP_TARGET = 1352.67
+fate-swr-resample-fltp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample-fltp-2626-48000: CMP_TARGET = 1352.66
+fate-swr-resample-fltp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample-fltp-2626-8000: CMP_TARGET = 1352.56
+fate-swr-resample-fltp-2626-8000: SIZE_TOLERANCE = 31512 - 20482
+
+fate-swr-resample-fltp-2626-96000: CMP_TARGET = 1352.67
+fate-swr-resample-fltp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample-fltp-44100-2626: CMP_TARGET = 185.82
+fate-swr-resample-fltp-44100-2626: SIZE_TOLERANCE = 529200 - 20490
+
+fate-swr-resample-fltp-44100-48000: CMP_TARGET = 9.69
+fate-swr-resample-fltp-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample-fltp-44100-8000: CMP_TARGET = 75.45
+fate-swr-resample-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample-fltp-44100-96000: CMP_TARGET = 11.46
+fate-swr-resample-fltp-44100-96000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample-fltp-48000-2626: CMP_TARGET = 456.51
+fate-swr-resample-fltp-48000-2626: SIZE_TOLERANCE = 576000 - 20510
+
+fate-swr-resample-fltp-48000-44100: CMP_TARGET = 1.00
+fate-swr-resample-fltp-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample-fltp-48000-8000: CMP_TARGET = 62.38
+fate-swr-resample-fltp-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample-fltp-48000-96000: CMP_TARGET = 0.47
+fate-swr-resample-fltp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample-fltp-8000-2626: CMP_TARGET = 2503.33
+fate-swr-resample-fltp-8000-2626: SIZE_TOLERANCE = 96000 - 20486
+
+fate-swr-resample-fltp-8000-44100: CMP_TARGET = 15.09
+fate-swr-resample-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample-fltp-8000-48000: CMP_TARGET = 14.69
+fate-swr-resample-fltp-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample-fltp-8000-96000: CMP_TARGET = 13.81
+fate-swr-resample-fltp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample-fltp-96000-2626: CMP_TARGET = 675.07
+fate-swr-resample-fltp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
+
+fate-swr-resample-fltp-96000-44100: CMP_TARGET = 1.44
+fate-swr-resample-fltp-96000-44100: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample-fltp-96000-48000: CMP_TARGET = 0.99
+fate-swr-resample-fltp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample-fltp-96000-8000: CMP_TARGET = 58.57
+fate-swr-resample-fltp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
+
+fate-swr-resample-s16p-2626-44100: CMP_TARGET = 1392.98
+fate-swr-resample-s16p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample-s16p-2626-48000: CMP_TARGET = 1393.01
+fate-swr-resample-s16p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample-s16p-2626-8000: CMP_TARGET = 1393.36
+fate-swr-resample-s16p-2626-8000: SIZE_TOLERANCE = 31512 - 20482
+
+fate-swr-resample-s16p-2626-96000: CMP_TARGET = 1393.07
+fate-swr-resample-s16p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample-s16p-44100-2626: CMP_TARGET = 185.84
+fate-swr-resample-s16p-44100-2626: SIZE_TOLERANCE = 529200 - 20490
+
+fate-swr-resample-s16p-44100-48000: CMP_TARGET = 9.71
+fate-swr-resample-s16p-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample-s16p-44100-8000: CMP_TARGET = 75.46
+fate-swr-resample-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample-s16p-44100-96000: CMP_TARGET = 11.48
+fate-swr-resample-s16p-44100-96000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample-s16p-48000-2626: CMP_TARGET = 456.55
+fate-swr-resample-s16p-48000-2626: SIZE_TOLERANCE = 576000 - 20510
+
+fate-swr-resample-s16p-48000-44100: CMP_TARGET = 1.20
+fate-swr-resample-s16p-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample-s16p-48000-8000: CMP_TARGET = 62.41
+fate-swr-resample-s16p-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample-s16p-48000-96000: CMP_TARGET = 0.73
+fate-swr-resample-s16p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample-s16p-8000-2626: CMP_TARGET = 2503.32
+fate-swr-resample-s16p-8000-2626: SIZE_TOLERANCE = 96000 - 20486
+
+fate-swr-resample-s16p-8000-44100: CMP_TARGET = 15.13
+fate-swr-resample-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample-s16p-8000-48000: CMP_TARGET = 14.69
+fate-swr-resample-s16p-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample-s16p-8000-96000: CMP_TARGET = 13.83
+fate-swr-resample-s16p-8000-96000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample-s16p-96000-2626: CMP_TARGET = 675.15
+fate-swr-resample-s16p-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
+
+fate-swr-resample-s16p-96000-44100: CMP_TARGET = 1.62
+fate-swr-resample-s16p-96000-44100: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample-s16p-96000-48000: CMP_TARGET = 1.12
+fate-swr-resample-s16p-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample-s16p-96000-8000: CMP_TARGET = 58.60
+fate-swr-resample-s16p-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
+
+fate-swr-resample-s32p-2626-44100: CMP_TARGET = 1392.99
+fate-swr-resample-s32p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample-s32p-2626-48000: CMP_TARGET = 1393.01
+fate-swr-resample-s32p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample-s32p-2626-8000: CMP_TARGET = 1393.36
+fate-swr-resample-s32p-2626-8000: SIZE_TOLERANCE = 31512 - 20482
+
+fate-swr-resample-s32p-2626-96000: CMP_TARGET = 1393.00
+fate-swr-resample-s32p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample-s32p-44100-2626: CMP_TARGET = 185.81
+fate-swr-resample-s32p-44100-2626: SIZE_TOLERANCE = 529200 - 20490
+
+fate-swr-resample-s32p-44100-48000: CMP_TARGET = 9.70
+fate-swr-resample-s32p-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample-s32p-44100-8000: CMP_TARGET = 75.45
+fate-swr-resample-s32p-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample-s32p-44100-96000: CMP_TARGET = 11.47
+fate-swr-resample-s32p-44100-96000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample-s32p-48000-2626: CMP_TARGET = 456.49
+fate-swr-resample-s32p-48000-2626: SIZE_TOLERANCE = 576000 - 20510
+
+fate-swr-resample-s32p-48000-44100: CMP_TARGET = 1.12
+fate-swr-resample-s32p-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample-s32p-48000-8000: CMP_TARGET = 62.37
+fate-swr-resample-s32p-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample-s32p-48000-96000: CMP_TARGET = 0.85
+fate-swr-resample-s32p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample-s32p-8000-2626: CMP_TARGET = 2503.33
+fate-swr-resample-s32p-8000-2626: SIZE_TOLERANCE = 96000 - 20486
+
+fate-swr-resample-s32p-8000-44100: CMP_TARGET = 15.09
+fate-swr-resample-s32p-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample-s32p-8000-48000: CMP_TARGET = 14.68
+fate-swr-resample-s32p-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample-s32p-8000-96000: CMP_TARGET = 13.81
+fate-swr-resample-s32p-8000-96000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample-s32p-96000-2626: CMP_TARGET = 675.05
+fate-swr-resample-s32p-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
+
+fate-swr-resample-s32p-96000-44100: CMP_TARGET = 1.54
+fate-swr-resample-s32p-96000-44100: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample-s32p-96000-48000: CMP_TARGET = 1.21
+fate-swr-resample-s32p-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample-s32p-96000-8000: CMP_TARGET = 58.59
+fate-swr-resample-s32p-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
+
+
+define ARESAMPLE_LIN
+FATE_SWR_RESAMPLE += fate-swr-resample_lin-$(3)-$(1)-$(2)
+fate-swr-resample_lin-$(3)-$(1)-$(2): tests/data/asynth-$(1)-1.wav
+fate-swr-resample_lin-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -af atrim=end_sample=10240,aresample=$(2):linear_interp=1:exact_rational=0:internal_sample_fmt=$(3),aformat=$(3),aresample=$(1):linear_interp=1:exact_rational=0:internal_sample_fmt=$(3) -f wav -c:a pcm_s16le -
+
+fate-swr-resample_lin-$(3)-$(1)-$(2): CMP = stddev
+fate-swr-resample_lin-$(3)-$(1)-$(2): CMP_UNIT = $(5)
+fate-swr-resample_lin-$(3)-$(1)-$(2): FUZZ = 0.1
+fate-swr-resample_lin-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav
+endef
+
+fate-swr-resample_lin-s16p-8000-44100: CMP_TARGET = 14.61
+fate-swr-resample_lin-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_lin-s16p-8000-48000: CMP_TARGET = 14.53
+fate-swr-resample_lin-s16p-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_lin-s16p-44100-8000: CMP_TARGET = 75.41
+fate-swr-resample_lin-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_lin-s16p-44100-48000: CMP_TARGET = 9.66
+fate-swr-resample_lin-s16p-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_lin-s16p-48000-8000: CMP_TARGET = 62.38
+fate-swr-resample_lin-s16p-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample_lin-s16p-48000-44100: CMP_TARGET = 0.65
+fate-swr-resample_lin-s16p-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_lin-fltp-8000-44100: CMP_TARGET = 14.59
+fate-swr-resample_lin-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_lin-fltp-8000-48000: CMP_TARGET = 14.50
+fate-swr-resample_lin-fltp-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_lin-fltp-44100-8000: CMP_TARGET = 75.38
+fate-swr-resample_lin-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_lin-fltp-44100-48000: CMP_TARGET = 9.64
+fate-swr-resample_lin-fltp-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_lin-fltp-48000-8000: CMP_TARGET = 62.36
+fate-swr-resample_lin-fltp-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample_lin-fltp-48000-44100: CMP_TARGET = 0.23
+fate-swr-resample_lin-fltp-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_lin-dblp-8000-44100: CMP_TARGET = 14.59
+fate-swr-resample_lin-dblp-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_lin-dblp-8000-48000: CMP_TARGET = 14.50
+fate-swr-resample_lin-dblp-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_lin-dblp-44100-8000: CMP_TARGET = 75.38
+fate-swr-resample_lin-dblp-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_lin-dblp-44100-48000: CMP_TARGET = 9.64
+fate-swr-resample_lin-dblp-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_lin-dblp-48000-8000: CMP_TARGET = 62.36
+fate-swr-resample_lin-dblp-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample_lin-dblp-48000-44100: CMP_TARGET = 0.23
+fate-swr-resample_lin-dblp-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+define ARESAMPLE_NN
+FATE_SWR_RESAMPLE += fate-swr-resample_nn-$(3)-$(1)-$(2)
+fate-swr-resample_nn-$(3)-$(1)-$(2): tests/data/asynth-$(1)-1.wav
+fate-swr-resample_nn-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -af atrim=end_sample=10240,aresample=$(2):filter_size=1:phase_shift=0:linear_interp=0:internal_sample_fmt=$(3),aformat=$(3),aresample=$(1):linear_interp=0:exact_rational=0:internal_sample_fmt=$(3) -f wav -c:a pcm_s16le -
+
+fate-swr-resample_nn-$(3)-$(1)-$(2): CMP = stddev
+fate-swr-resample_nn-$(3)-$(1)-$(2): CMP_UNIT = $(5)
+fate-swr-resample_nn-$(3)-$(1)-$(2): FUZZ = 0.1
+fate-swr-resample_nn-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav
+endef
+
+fate-swr-resample_nn-fltp-44100-8000: CMP_TARGET = 591.03
+fate-swr-resample_nn-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_nn-fltp-8000-44100: CMP_TARGET = 3163.32
+fate-swr-resample_nn-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_nn-s16p-44100-8000: CMP_TARGET = 590.98
+fate-swr-resample_nn-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_nn-s16p-8000-44100: CMP_TARGET = 3163.39
+fate-swr-resample_nn-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+define ARESAMPLE_ASYNC
+FATE_SWR_RESAMPLE += fate-swr-resample_async-$(3)-$(1)-$(2)
+fate-swr-resample_async-$(3)-$(1)-$(2): tests/data/asynth-$(1)-1.wav
+fate-swr-resample_async-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -af atrim=end_sample=10240,asetpts=PTS+random\(0\)*200-100,aresample=$(2):async=50:min_hard_comp=0.100000:first_pts=0:linear_interp=0:exact_rational=0:internal_sample_fmt=$(3),aformat=$(3),aresample=$(1):linear_interp=0:exact_rational=0:internal_sample_fmt=$(3) -f wav -c:a pcm_s16le -
+
+fate-swr-resample_async-$(3)-$(1)-$(2): CMP = stddev
+fate-swr-resample_async-$(3)-$(1)-$(2): CMP_UNIT = $(5)
+fate-swr-resample_async-$(3)-$(1)-$(2): FUZZ = 0.1
+fate-swr-resample_async-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav
+endef
+
+fate-swr-resample_async-fltp-44100-8000: CMP_TARGET = 4020.60
+fate-swr-resample_async-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20310
+
+fate-swr-resample_async-fltp-8000-44100: CMP_TARGET = 11186.66
+fate-swr-resample_async-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_async-s16p-44100-8000: CMP_TARGET = 4020.71
+fate-swr-resample_async-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20310
+
+fate-swr-resample_async-s16p-8000-44100: CMP_TARGET = 11186.94
+fate-swr-resample_async-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20344
+
+define ARESAMPLE_EXACT
+FATE_SWR_RESAMPLE += fate-swr-resample_exact-$(3)-$(1)-$(2)
+fate-swr-resample_exact-$(3)-$(1)-$(2): tests/data/asynth-$(1)-1.wav
+fate-swr-resample_exact-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -af atrim=end_sample=10240,aresample=$(2):internal_sample_fmt=$(3):exact_rational=on:linear_interp=0,aformat=$(3),aresample=$(1):internal_sample_fmt=$(3):exact_rational=on:linear_interp=0 -f wav -c:a pcm_s16le -
+
+fate-swr-resample_exact-$(3)-$(1)-$(2): CMP = stddev
+fate-swr-resample_exact-$(3)-$(1)-$(2): CMP_UNIT = $(5)
+fate-swr-resample_exact-$(3)-$(1)-$(2): FUZZ = 0.1
+fate-swr-resample_exact-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav
+endef
+
+fate-swr-resample_exact-dblp-2626-44100: CMP_TARGET = 1352.67
+fate-swr-resample_exact-dblp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact-dblp-2626-48000: CMP_TARGET = 1352.66
+fate-swr-resample_exact-dblp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact-dblp-2626-8000: CMP_TARGET = 1352.56
+fate-swr-resample_exact-dblp-2626-8000: SIZE_TOLERANCE = 31512 - 20482
+
+fate-swr-resample_exact-dblp-2626-96000: CMP_TARGET = 1352.67
+fate-swr-resample_exact-dblp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact-dblp-44100-2626: CMP_TARGET = 185.82
+fate-swr-resample_exact-dblp-44100-2626: SIZE_TOLERANCE = 529200 - 20490
+
+fate-swr-resample_exact-dblp-44100-48000: CMP_TARGET = 9.64
+fate-swr-resample_exact-dblp-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact-dblp-44100-8000: CMP_TARGET = 75.38
+fate-swr-resample_exact-dblp-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_exact-dblp-44100-96000: CMP_TARGET = 11.45
+fate-swr-resample_exact-dblp-44100-96000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact-dblp-48000-2626: CMP_TARGET = 456.51
+fate-swr-resample_exact-dblp-48000-2626: SIZE_TOLERANCE = 576000 - 20510
+
+fate-swr-resample_exact-dblp-48000-44100: CMP_TARGET = 0.23
+fate-swr-resample_exact-dblp-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact-dblp-48000-8000: CMP_TARGET = 62.36
+fate-swr-resample_exact-dblp-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample_exact-dblp-48000-96000: CMP_TARGET = 0.47
+fate-swr-resample_exact-dblp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact-dblp-8000-2626: CMP_TARGET = 2503.33
+fate-swr-resample_exact-dblp-8000-2626: SIZE_TOLERANCE = 96000 - 20486
+
+fate-swr-resample_exact-dblp-8000-44100: CMP_TARGET = 14.59
+fate-swr-resample_exact-dblp-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact-dblp-8000-48000: CMP_TARGET = 14.50
+fate-swr-resample_exact-dblp-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact-dblp-8000-96000: CMP_TARGET = 13.62
+fate-swr-resample_exact-dblp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact-dblp-96000-2626: CMP_TARGET = 675.07
+fate-swr-resample_exact-dblp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
+
+fate-swr-resample_exact-dblp-96000-44100: CMP_TARGET = 1.24
+fate-swr-resample_exact-dblp-96000-44100: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact-dblp-96000-48000: CMP_TARGET = 0.99
+fate-swr-resample_exact-dblp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact-dblp-96000-8000: CMP_TARGET = 58.52
+fate-swr-resample_exact-dblp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
+
+fate-swr-resample_exact-fltp-2626-44100: CMP_TARGET = 1352.67
+fate-swr-resample_exact-fltp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact-fltp-2626-48000: CMP_TARGET = 1352.66
+fate-swr-resample_exact-fltp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact-fltp-2626-8000: CMP_TARGET = 1352.56
+fate-swr-resample_exact-fltp-2626-8000: SIZE_TOLERANCE = 31512 - 20482
+
+fate-swr-resample_exact-fltp-2626-96000: CMP_TARGET = 1352.67
+fate-swr-resample_exact-fltp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact-fltp-44100-2626: CMP_TARGET = 185.82
+fate-swr-resample_exact-fltp-44100-2626: SIZE_TOLERANCE = 529200 - 20490
+
+fate-swr-resample_exact-fltp-44100-48000: CMP_TARGET = 9.64
+fate-swr-resample_exact-fltp-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact-fltp-44100-8000: CMP_TARGET = 75.38
+fate-swr-resample_exact-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_exact-fltp-44100-96000: CMP_TARGET = 11.45
+fate-swr-resample_exact-fltp-44100-96000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact-fltp-48000-2626: CMP_TARGET = 456.51
+fate-swr-resample_exact-fltp-48000-2626: SIZE_TOLERANCE = 576000 - 20510
+
+fate-swr-resample_exact-fltp-48000-44100: CMP_TARGET = 0.23
+fate-swr-resample_exact-fltp-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact-fltp-48000-8000: CMP_TARGET = 62.36
+fate-swr-resample_exact-fltp-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample_exact-fltp-48000-96000: CMP_TARGET = 0.47
+fate-swr-resample_exact-fltp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact-fltp-8000-2626: CMP_TARGET = 2503.33
+fate-swr-resample_exact-fltp-8000-2626: SIZE_TOLERANCE = 96000 - 20486
+
+fate-swr-resample_exact-fltp-8000-44100: CMP_TARGET = 14.59
+fate-swr-resample_exact-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact-fltp-8000-48000: CMP_TARGET = 14.50
+fate-swr-resample_exact-fltp-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact-fltp-8000-96000: CMP_TARGET = 13.62
+fate-swr-resample_exact-fltp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact-fltp-96000-2626: CMP_TARGET = 675.07
+fate-swr-resample_exact-fltp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
+
+fate-swr-resample_exact-fltp-96000-44100: CMP_TARGET = 1.23
+fate-swr-resample_exact-fltp-96000-44100: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact-fltp-96000-48000: CMP_TARGET = 0.99
+fate-swr-resample_exact-fltp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact-fltp-96000-8000: CMP_TARGET = 58.52
+fate-swr-resample_exact-fltp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
+
+fate-swr-resample_exact-s16p-2626-44100: CMP_TARGET = 1392.98
+fate-swr-resample_exact-s16p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact-s16p-2626-48000: CMP_TARGET = 1393.01
+fate-swr-resample_exact-s16p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact-s16p-2626-8000: CMP_TARGET = 1393.36
+fate-swr-resample_exact-s16p-2626-8000: SIZE_TOLERANCE = 31512 - 20482
+
+fate-swr-resample_exact-s16p-2626-96000: CMP_TARGET = 1393.07
+fate-swr-resample_exact-s16p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact-s16p-44100-2626: CMP_TARGET = 185.84
+fate-swr-resample_exact-s16p-44100-2626: SIZE_TOLERANCE = 529200 - 20490
+
+fate-swr-resample_exact-s16p-44100-48000: CMP_TARGET = 9.66
+fate-swr-resample_exact-s16p-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact-s16p-44100-8000: CMP_TARGET = 75.43
+fate-swr-resample_exact-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_exact-s16p-44100-96000: CMP_TARGET = 11.46
+fate-swr-resample_exact-s16p-44100-96000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact-s16p-48000-2626: CMP_TARGET = 456.55
+fate-swr-resample_exact-s16p-48000-2626: SIZE_TOLERANCE = 576000 - 20510
+
+fate-swr-resample_exact-s16p-48000-44100: CMP_TARGET = 0.68
+fate-swr-resample_exact-s16p-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact-s16p-48000-8000: CMP_TARGET = 62.39
+fate-swr-resample_exact-s16p-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample_exact-s16p-48000-96000: CMP_TARGET = 0.73
+fate-swr-resample_exact-s16p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact-s16p-8000-2626: CMP_TARGET = 2503.32
+fate-swr-resample_exact-s16p-8000-2626: SIZE_TOLERANCE = 96000 - 20486
+
+fate-swr-resample_exact-s16p-8000-44100: CMP_TARGET = 14.63
+fate-swr-resample_exact-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact-s16p-8000-48000: CMP_TARGET = 14.54
+fate-swr-resample_exact-s16p-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact-s16p-8000-96000: CMP_TARGET = 13.65
+fate-swr-resample_exact-s16p-8000-96000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact-s16p-96000-2626: CMP_TARGET = 675.15
+fate-swr-resample_exact-s16p-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
+
+fate-swr-resample_exact-s16p-96000-44100: CMP_TARGET = 1.44
+fate-swr-resample_exact-s16p-96000-44100: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact-s16p-96000-48000: CMP_TARGET = 1.12
+fate-swr-resample_exact-s16p-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact-s16p-96000-8000: CMP_TARGET = 58.56
+fate-swr-resample_exact-s16p-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
+
+fate-swr-resample_exact-s32p-2626-44100: CMP_TARGET = 1392.99
+fate-swr-resample_exact-s32p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact-s32p-2626-48000: CMP_TARGET = 1393.01
+fate-swr-resample_exact-s32p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact-s32p-2626-8000: CMP_TARGET = 1393.36
+fate-swr-resample_exact-s32p-2626-8000: SIZE_TOLERANCE = 31512 - 20482
+
+fate-swr-resample_exact-s32p-2626-96000: CMP_TARGET = 1393.00
+fate-swr-resample_exact-s32p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact-s32p-44100-2626: CMP_TARGET = 185.81
+fate-swr-resample_exact-s32p-44100-2626: SIZE_TOLERANCE = 529200 - 20490
+
+fate-swr-resample_exact-s32p-44100-48000: CMP_TARGET = 9.66
+fate-swr-resample_exact-s32p-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact-s32p-44100-8000: CMP_TARGET = 75.37
+fate-swr-resample_exact-s32p-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_exact-s32p-44100-96000: CMP_TARGET = 11.46
+fate-swr-resample_exact-s32p-44100-96000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact-s32p-48000-2626: CMP_TARGET = 456.49
+fate-swr-resample_exact-s32p-48000-2626: SIZE_TOLERANCE = 576000 - 20510
+
+fate-swr-resample_exact-s32p-48000-44100: CMP_TARGET = 0.74
+fate-swr-resample_exact-s32p-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact-s32p-48000-8000: CMP_TARGET = 62.35
+fate-swr-resample_exact-s32p-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample_exact-s32p-48000-96000: CMP_TARGET = 0.85
+fate-swr-resample_exact-s32p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact-s32p-8000-2626: CMP_TARGET = 2503.33
+fate-swr-resample_exact-s32p-8000-2626: SIZE_TOLERANCE = 96000 - 20486
+
+fate-swr-resample_exact-s32p-8000-44100: CMP_TARGET = 14.61
+fate-swr-resample_exact-s32p-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact-s32p-8000-48000: CMP_TARGET = 14.52
+fate-swr-resample_exact-s32p-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact-s32p-8000-96000: CMP_TARGET = 13.62
+fate-swr-resample_exact-s32p-8000-96000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact-s32p-96000-2626: CMP_TARGET = 675.05
+fate-swr-resample_exact-s32p-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
+
+fate-swr-resample_exact-s32p-96000-44100: CMP_TARGET = 1.41
+fate-swr-resample_exact-s32p-96000-44100: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact-s32p-96000-48000: CMP_TARGET = 1.21
+fate-swr-resample_exact-s32p-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact-s32p-96000-8000: CMP_TARGET = 58.54
+fate-swr-resample_exact-s32p-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
+
+define ARESAMPLE_EXACT_ASYNC
+FATE_SWR_RESAMPLE += fate-swr-resample_exact_async-$(3)-$(1)-$(2)
+fate-swr-resample_exact_async-$(3)-$(1)-$(2): tests/data/asynth-$(1)-1.wav
+fate-swr-resample_exact_async-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -af atrim=end_sample=10240,asetpts=PTS+random\(0\)*200-100,aresample=$(2):async=50:min_hard_comp=0.100000:first_pts=0:internal_sample_fmt=$(3):exact_rational=on:linear_interp=0,aformat=$(3),aresample=$(1):internal_sample_fmt=$(3):exact_rational=on:linear_interp=0 -f wav -c:a pcm_s16le -
+
+fate-swr-resample_exact_async-$(3)-$(1)-$(2): CMP = stddev
+fate-swr-resample_exact_async-$(3)-$(1)-$(2): CMP_UNIT = $(5)
+fate-swr-resample_exact_async-$(3)-$(1)-$(2): FUZZ = 0.1
+fate-swr-resample_exact_async-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav
+endef
+
+fate-swr-resample_exact_async-dblp-44100-48000: CMP_TARGET = 7791.50
+fate-swr-resample_exact_async-dblp-44100-48000: SIZE_TOLERANCE = 529200 - 20300
+
+fate-swr-resample_exact_async-dblp-44100-8000: CMP_TARGET = 4022.87
+fate-swr-resample_exact_async-dblp-44100-8000: SIZE_TOLERANCE = 529200 - 20310
+
+fate-swr-resample_exact_async-dblp-48000-44100: CMP_TARGET = 1923.97
+fate-swr-resample_exact_async-dblp-48000-44100: SIZE_TOLERANCE = 576000 - 20298
+
+fate-swr-resample_exact_async-dblp-48000-8000: CMP_TARGET = 2592.00
+fate-swr-resample_exact_async-dblp-48000-8000: SIZE_TOLERANCE = 576000 - 20304
+
+fate-swr-resample_exact_async-dblp-8000-44100: CMP_TARGET = 11187.24
+fate-swr-resample_exact_async-dblp-8000-44100: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_async-dblp-8000-48000: CMP_TARGET = 11326.80
+fate-swr-resample_exact_async-dblp-8000-48000: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_async-fltp-44100-48000: CMP_TARGET = 7791.50
+fate-swr-resample_exact_async-fltp-44100-48000: SIZE_TOLERANCE = 529200 - 20300
+
+fate-swr-resample_exact_async-fltp-44100-8000: CMP_TARGET = 4022.87
+fate-swr-resample_exact_async-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20310
+
+fate-swr-resample_exact_async-fltp-48000-44100: CMP_TARGET = 1923.97
+fate-swr-resample_exact_async-fltp-48000-44100: SIZE_TOLERANCE = 576000 - 20298
+
+fate-swr-resample_exact_async-fltp-48000-8000: CMP_TARGET = 2592.00
+fate-swr-resample_exact_async-fltp-48000-8000: SIZE_TOLERANCE = 576000 - 20304
+
+fate-swr-resample_exact_async-fltp-8000-44100: CMP_TARGET = 11187.24
+fate-swr-resample_exact_async-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_async-fltp-8000-48000: CMP_TARGET = 11326.80
+fate-swr-resample_exact_async-fltp-8000-48000: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_async-s16p-44100-48000: CMP_TARGET = 7791.50
+fate-swr-resample_exact_async-s16p-44100-48000: SIZE_TOLERANCE = 529200 - 20300
+
+fate-swr-resample_exact_async-s16p-44100-8000: CMP_TARGET = 4023.05
+fate-swr-resample_exact_async-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20310
+
+fate-swr-resample_exact_async-s16p-48000-44100: CMP_TARGET = 1923.96
+fate-swr-resample_exact_async-s16p-48000-44100: SIZE_TOLERANCE = 576000 - 20298
+
+fate-swr-resample_exact_async-s16p-48000-8000: CMP_TARGET = 2592.15
+fate-swr-resample_exact_async-s16p-48000-8000: SIZE_TOLERANCE = 576000 - 20304
+
+fate-swr-resample_exact_async-s16p-8000-44100: CMP_TARGET = 11187.58
+fate-swr-resample_exact_async-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_async-s16p-8000-48000: CMP_TARGET = 11327.48
+fate-swr-resample_exact_async-s16p-8000-48000: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_async-s32p-44100-48000: CMP_TARGET = 7791.50
+fate-swr-resample_exact_async-s32p-44100-48000: SIZE_TOLERANCE = 529200 - 20300
+
+fate-swr-resample_exact_async-s32p-44100-8000: CMP_TARGET = 4022.87
+fate-swr-resample_exact_async-s32p-44100-8000: SIZE_TOLERANCE = 529200 - 20310
+
+fate-swr-resample_exact_async-s32p-48000-44100: CMP_TARGET = 1923.96
+fate-swr-resample_exact_async-s32p-48000-44100: SIZE_TOLERANCE = 576000 - 20298
+
+fate-swr-resample_exact_async-s32p-48000-8000: CMP_TARGET = 2592.00
+fate-swr-resample_exact_async-s32p-48000-8000: SIZE_TOLERANCE = 576000 - 20304
+
+fate-swr-resample_exact_async-s32p-8000-44100: CMP_TARGET = 11187.24
+fate-swr-resample_exact_async-s32p-8000-44100: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_async-s32p-8000-48000: CMP_TARGET = 11326.79
+fate-swr-resample_exact_async-s32p-8000-48000: SIZE_TOLERANCE = 96000 - 20344
+
+define ARESAMPLE_EXACT_LIN
+FATE_SWR_RESAMPLE += fate-swr-resample_exact_lin-$(3)-$(1)-$(2)
+fate-swr-resample_exact_lin-$(3)-$(1)-$(2): tests/data/asynth-$(1)-1.wav
+fate-swr-resample_exact_lin-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -af atrim=end_sample=10240,aresample=$(2):internal_sample_fmt=$(3):exact_rational=on:linear_interp=on,aformat=$(3),aresample=$(1):internal_sample_fmt=$(3):exact_rational=on:linear_interp=on -f wav -c:a pcm_s16le -
+
+fate-swr-resample_exact_lin-$(3)-$(1)-$(2): CMP = stddev
+fate-swr-resample_exact_lin-$(3)-$(1)-$(2): CMP_UNIT = $(5)
+fate-swr-resample_exact_lin-$(3)-$(1)-$(2): FUZZ = 0.1
+fate-swr-resample_exact_lin-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav
+endef
+
+fate-swr-resample_exact_lin-dblp-44100-48000: CMP_TARGET = 9.64
+fate-swr-resample_exact_lin-dblp-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact_lin-dblp-44100-8000: CMP_TARGET = 75.38
+fate-swr-resample_exact_lin-dblp-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_exact_lin-dblp-48000-44100: CMP_TARGET = 0.23
+fate-swr-resample_exact_lin-dblp-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact_lin-dblp-48000-8000: CMP_TARGET = 62.36
+fate-swr-resample_exact_lin-dblp-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample_exact_lin-dblp-8000-44100: CMP_TARGET = 14.59
+fate-swr-resample_exact_lin-dblp-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-dblp-8000-48000: CMP_TARGET = 14.50
+fate-swr-resample_exact_lin-dblp-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-fltp-44100-48000: CMP_TARGET = 9.64
+fate-swr-resample_exact_lin-fltp-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact_lin-fltp-44100-8000: CMP_TARGET = 75.38
+fate-swr-resample_exact_lin-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_exact_lin-fltp-48000-44100: CMP_TARGET = 0.23
+fate-swr-resample_exact_lin-fltp-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact_lin-fltp-48000-8000: CMP_TARGET = 62.36
+fate-swr-resample_exact_lin-fltp-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample_exact_lin-fltp-8000-44100: CMP_TARGET = 14.59
+fate-swr-resample_exact_lin-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-fltp-8000-48000: CMP_TARGET = 14.50
+fate-swr-resample_exact_lin-fltp-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-s16p-44100-48000: CMP_TARGET = 9.66
+fate-swr-resample_exact_lin-s16p-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact_lin-s16p-44100-8000: CMP_TARGET = 75.43
+fate-swr-resample_exact_lin-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_exact_lin-s16p-48000-44100: CMP_TARGET = 0.68
+fate-swr-resample_exact_lin-s16p-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact_lin-s16p-48000-8000: CMP_TARGET = 62.39
+fate-swr-resample_exact_lin-s16p-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample_exact_lin-s16p-8000-44100: CMP_TARGET = 14.63
+fate-swr-resample_exact_lin-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-s16p-8000-48000: CMP_TARGET = 14.54
+fate-swr-resample_exact_lin-s16p-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-s32p-44100-48000: CMP_TARGET = 9.66
+fate-swr-resample_exact_lin-s32p-44100-48000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact_lin-s32p-44100-8000: CMP_TARGET = 75.37
+fate-swr-resample_exact_lin-s32p-44100-8000: SIZE_TOLERANCE = 529200 - 20486
+
+fate-swr-resample_exact_lin-s32p-48000-44100: CMP_TARGET = 0.74
+fate-swr-resample_exact_lin-s32p-48000-44100: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact_lin-s32p-48000-8000: CMP_TARGET = 62.35
+fate-swr-resample_exact_lin-s32p-48000-8000: SIZE_TOLERANCE = 576000 - 20484
+
+fate-swr-resample_exact_lin-s32p-8000-44100: CMP_TARGET = 14.61
+fate-swr-resample_exact_lin-s32p-8000-44100: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-s32p-8000-48000: CMP_TARGET = 14.52
+fate-swr-resample_exact_lin-s32p-8000-48000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-dblp-2626-44100: CMP_TARGET = 1352.60
+fate-swr-resample_exact_lin-dblp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-dblp-2626-48000: CMP_TARGET = 1352.62
+fate-swr-resample_exact_lin-dblp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-dblp-2626-8000: CMP_TARGET = 1352.49
+fate-swr-resample_exact_lin-dblp-2626-8000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-dblp-2626-96000: CMP_TARGET = 1352.62
+fate-swr-resample_exact_lin-dblp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-dblp-44100-2626: CMP_TARGET = 185.49
+fate-swr-resample_exact_lin-dblp-44100-2626: SIZE_TOLERANCE = 529200 - 20490
+
+fate-swr-resample_exact_lin-dblp-44100-96000: CMP_TARGET = 11.45
+fate-swr-resample_exact_lin-dblp-44100-96000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact_lin-dblp-48000-2626: CMP_TARGET = 456.50
+fate-swr-resample_exact_lin-dblp-48000-2626: SIZE_TOLERANCE = 576000 - 20510
+
+fate-swr-resample_exact_lin-dblp-48000-96000: CMP_TARGET = 0.47
+fate-swr-resample_exact_lin-dblp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact_lin-dblp-8000-2626: CMP_TARGET = 2503.28
+fate-swr-resample_exact_lin-dblp-8000-2626: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-dblp-8000-96000: CMP_TARGET = 13.62
+fate-swr-resample_exact_lin-dblp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-dblp-96000-2626: CMP_TARGET = 675.02
+fate-swr-resample_exact_lin-dblp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
+
+fate-swr-resample_exact_lin-dblp-96000-44100: CMP_TARGET = 1.24
+fate-swr-resample_exact_lin-dblp-96000-44100: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact_lin-dblp-96000-48000: CMP_TARGET = 0.99
+fate-swr-resample_exact_lin-dblp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact_lin-dblp-96000-8000: CMP_TARGET = 58.52
+fate-swr-resample_exact_lin-dblp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
+
+fate-swr-resample_exact_lin-fltp-2626-44100: CMP_TARGET = 1352.60
+fate-swr-resample_exact_lin-fltp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-fltp-2626-48000: CMP_TARGET = 1352.62
+fate-swr-resample_exact_lin-fltp-2626-48000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-fltp-2626-8000: CMP_TARGET = 1352.49
+fate-swr-resample_exact_lin-fltp-2626-8000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-fltp-2626-96000: CMP_TARGET = 1352.62
+fate-swr-resample_exact_lin-fltp-2626-96000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-fltp-44100-2626: CMP_TARGET = 185.49
+fate-swr-resample_exact_lin-fltp-44100-2626: SIZE_TOLERANCE = 529200 - 20490
+
+fate-swr-resample_exact_lin-fltp-44100-96000: CMP_TARGET = 11.45
+fate-swr-resample_exact_lin-fltp-44100-96000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact_lin-fltp-48000-2626: CMP_TARGET = 456.50
+fate-swr-resample_exact_lin-fltp-48000-2626: SIZE_TOLERANCE = 576000 - 20510
+
+fate-swr-resample_exact_lin-fltp-48000-96000: CMP_TARGET = 0.47
+fate-swr-resample_exact_lin-fltp-48000-96000: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact_lin-fltp-8000-2626: CMP_TARGET = 2503.28
+fate-swr-resample_exact_lin-fltp-8000-2626: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-fltp-8000-96000: CMP_TARGET = 13.62
+fate-swr-resample_exact_lin-fltp-8000-96000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-fltp-96000-2626: CMP_TARGET = 675.02
+fate-swr-resample_exact_lin-fltp-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
+
+fate-swr-resample_exact_lin-fltp-96000-44100: CMP_TARGET = 1.23
+fate-swr-resample_exact_lin-fltp-96000-44100: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact_lin-fltp-96000-48000: CMP_TARGET = 0.99
+fate-swr-resample_exact_lin-fltp-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact_lin-fltp-96000-8000: CMP_TARGET = 58.52
+fate-swr-resample_exact_lin-fltp-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
+
+fate-swr-resample_exact_lin-s16p-2626-44100: CMP_TARGET = 1392.93
+fate-swr-resample_exact_lin-s16p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-s16p-2626-48000: CMP_TARGET = 1392.97
+fate-swr-resample_exact_lin-s16p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-s16p-2626-8000: CMP_TARGET = 1393.28
+fate-swr-resample_exact_lin-s16p-2626-8000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-s16p-2626-96000: CMP_TARGET = 1393.04
+fate-swr-resample_exact_lin-s16p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-s16p-44100-2626: CMP_TARGET = 185.51
+fate-swr-resample_exact_lin-s16p-44100-2626: SIZE_TOLERANCE = 529200 - 20490
+
+fate-swr-resample_exact_lin-s16p-44100-96000: CMP_TARGET = 11.46
+fate-swr-resample_exact_lin-s16p-44100-96000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact_lin-s16p-48000-2626: CMP_TARGET = 456.56
+fate-swr-resample_exact_lin-s16p-48000-2626: SIZE_TOLERANCE = 576000 - 20510
+
+fate-swr-resample_exact_lin-s16p-48000-96000: CMP_TARGET = 0.73
+fate-swr-resample_exact_lin-s16p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact_lin-s16p-8000-2626: CMP_TARGET = 2503.28
+fate-swr-resample_exact_lin-s16p-8000-2626: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-s16p-8000-96000: CMP_TARGET = 13.65
+fate-swr-resample_exact_lin-s16p-8000-96000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-s16p-96000-2626: CMP_TARGET = 675.07
+fate-swr-resample_exact_lin-s16p-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
+
+fate-swr-resample_exact_lin-s16p-96000-44100: CMP_TARGET = 1.44
+fate-swr-resample_exact_lin-s16p-96000-44100: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact_lin-s16p-96000-48000: CMP_TARGET = 1.12
+fate-swr-resample_exact_lin-s16p-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact_lin-s16p-96000-8000: CMP_TARGET = 58.56
+fate-swr-resample_exact_lin-s16p-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
+
+fate-swr-resample_exact_lin-s32p-2626-44100: CMP_TARGET = 1392.95
+fate-swr-resample_exact_lin-s32p-2626-44100: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-s32p-2626-48000: CMP_TARGET = 1392.98
+fate-swr-resample_exact_lin-s32p-2626-48000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-s32p-2626-8000: CMP_TARGET = 1393.29
+fate-swr-resample_exact_lin-s32p-2626-8000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-s32p-2626-96000: CMP_TARGET = 1392.96
+fate-swr-resample_exact_lin-s32p-2626-96000: SIZE_TOLERANCE = 31512 - 20480
+
+fate-swr-resample_exact_lin-s32p-44100-2626: CMP_TARGET = 185.48
+fate-swr-resample_exact_lin-s32p-44100-2626: SIZE_TOLERANCE = 529200 - 20490
+
+fate-swr-resample_exact_lin-s32p-44100-96000: CMP_TARGET = 11.46
+fate-swr-resample_exact_lin-s32p-44100-96000: SIZE_TOLERANCE = 529200 - 20482
+
+fate-swr-resample_exact_lin-s32p-48000-2626: CMP_TARGET = 456.48
+fate-swr-resample_exact_lin-s32p-48000-2626: SIZE_TOLERANCE = 576000 - 20510
+
+fate-swr-resample_exact_lin-s32p-48000-96000: CMP_TARGET = 0.85
+fate-swr-resample_exact_lin-s32p-48000-96000: SIZE_TOLERANCE = 576000 - 20480
+
+fate-swr-resample_exact_lin-s32p-8000-2626: CMP_TARGET = 2503.28
+fate-swr-resample_exact_lin-s32p-8000-2626: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-s32p-8000-96000: CMP_TARGET = 13.62
+fate-swr-resample_exact_lin-s32p-8000-96000: SIZE_TOLERANCE = 96000 - 20480
+
+fate-swr-resample_exact_lin-s32p-96000-2626: CMP_TARGET = 675.00
+fate-swr-resample_exact_lin-s32p-96000-2626: SIZE_TOLERANCE = 1152000 - 20474
+
+fate-swr-resample_exact_lin-s32p-96000-44100: CMP_TARGET = 1.41
+fate-swr-resample_exact_lin-s32p-96000-44100: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact_lin-s32p-96000-48000: CMP_TARGET = 1.21
+fate-swr-resample_exact_lin-s32p-96000-48000: SIZE_TOLERANCE = 1152000 - 20480
+
+fate-swr-resample_exact_lin-s32p-96000-8000: CMP_TARGET = 58.54
+fate-swr-resample_exact_lin-s32p-96000-8000: SIZE_TOLERANCE = 1152000 - 20496
+
+define ARESAMPLE_EXACT_LIN_ASYNC
+FATE_SWR_RESAMPLE += fate-swr-resample_exact_lin_async-$(3)-$(1)-$(2)
+fate-swr-resample_exact_lin_async-$(3)-$(1)-$(2): tests/data/asynth-$(1)-1.wav
+fate-swr-resample_exact_lin_async-$(3)-$(1)-$(2): CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-$(1)-1.wav -af atrim=end_sample=10240,asetpts=PTS+random\(0\)*200-100,aresample=$(2):async=50:min_hard_comp=0.100000:first_pts=0:internal_sample_fmt=$(3):exact_rational=on:linear_interp=on,aformat=$(3),aresample=$(1):internal_sample_fmt=$(3):exact_rational=on:linear_interp=on -f wav -c:a pcm_s16le -
+
+fate-swr-resample_exact_lin_async-$(3)-$(1)-$(2): CMP = stddev
+fate-swr-resample_exact_lin_async-$(3)-$(1)-$(2): CMP_UNIT = $(5)
+fate-swr-resample_exact_lin_async-$(3)-$(1)-$(2): FUZZ = 0.1
+fate-swr-resample_exact_lin_async-$(3)-$(1)-$(2): REF = tests/data/asynth-$(1)-1.wav
+endef
+
+fate-swr-resample_exact_lin_async-dblp-44100-48000: CMP_TARGET = 7791.72
+fate-swr-resample_exact_lin_async-dblp-44100-48000: SIZE_TOLERANCE = 529200 - 20300
+
+fate-swr-resample_exact_lin_async-dblp-44100-8000: CMP_TARGET = 4023.01
+fate-swr-resample_exact_lin_async-dblp-44100-8000: SIZE_TOLERANCE = 529200 - 20310
+
+fate-swr-resample_exact_lin_async-dblp-48000-44100: CMP_TARGET = 1923.79
+fate-swr-resample_exact_lin_async-dblp-48000-44100: SIZE_TOLERANCE = 576000 - 20298
+
+fate-swr-resample_exact_lin_async-dblp-48000-8000: CMP_TARGET = 2591.72
+fate-swr-resample_exact_lin_async-dblp-48000-8000: SIZE_TOLERANCE = 576000 - 20304
+
+fate-swr-resample_exact_lin_async-dblp-8000-44100: CMP_TARGET = 11187.24
+fate-swr-resample_exact_lin_async-dblp-8000-44100: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_lin_async-dblp-8000-48000: CMP_TARGET = 11326.80
+fate-swr-resample_exact_lin_async-dblp-8000-48000: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_lin_async-fltp-44100-48000: CMP_TARGET = 7791.72
+fate-swr-resample_exact_lin_async-fltp-44100-48000: SIZE_TOLERANCE = 529200 - 20300
+
+fate-swr-resample_exact_lin_async-fltp-44100-8000: CMP_TARGET = 4023.01
+fate-swr-resample_exact_lin_async-fltp-44100-8000: SIZE_TOLERANCE = 529200 - 20310
+
+fate-swr-resample_exact_lin_async-fltp-48000-44100: CMP_TARGET = 1923.79
+fate-swr-resample_exact_lin_async-fltp-48000-44100: SIZE_TOLERANCE = 576000 - 20298
+
+fate-swr-resample_exact_lin_async-fltp-48000-8000: CMP_TARGET = 2591.72
+fate-swr-resample_exact_lin_async-fltp-48000-8000: SIZE_TOLERANCE = 576000 - 20304
+
+fate-swr-resample_exact_lin_async-fltp-8000-44100: CMP_TARGET = 11187.25
+fate-swr-resample_exact_lin_async-fltp-8000-44100: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_lin_async-fltp-8000-48000: CMP_TARGET = 11326.80
+fate-swr-resample_exact_lin_async-fltp-8000-48000: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_lin_async-s16p-44100-48000: CMP_TARGET = 7791.72
+fate-swr-resample_exact_lin_async-s16p-44100-48000: SIZE_TOLERANCE = 529200 - 20300
+
+fate-swr-resample_exact_lin_async-s16p-44100-8000: CMP_TARGET = 4023.19
+fate-swr-resample_exact_lin_async-s16p-44100-8000: SIZE_TOLERANCE = 529200 - 20310
+
+fate-swr-resample_exact_lin_async-s16p-48000-44100: CMP_TARGET = 1923.79
+fate-swr-resample_exact_lin_async-s16p-48000-44100: SIZE_TOLERANCE = 576000 - 20298
+
+fate-swr-resample_exact_lin_async-s16p-48000-8000: CMP_TARGET = 2591.85
+fate-swr-resample_exact_lin_async-s16p-48000-8000: SIZE_TOLERANCE = 576000 - 20304
+
+fate-swr-resample_exact_lin_async-s16p-8000-44100: CMP_TARGET = 11187.57
+fate-swr-resample_exact_lin_async-s16p-8000-44100: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_lin_async-s16p-8000-48000: CMP_TARGET = 11327.48
+fate-swr-resample_exact_lin_async-s16p-8000-48000: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_lin_async-s32p-44100-48000: CMP_TARGET = 7791.72
+fate-swr-resample_exact_lin_async-s32p-44100-48000: SIZE_TOLERANCE = 529200 - 20300
+
+fate-swr-resample_exact_lin_async-s32p-44100-8000: CMP_TARGET = 4023.02
+fate-swr-resample_exact_lin_async-s32p-44100-8000: SIZE_TOLERANCE = 529200 - 20310
+
+fate-swr-resample_exact_lin_async-s32p-48000-44100: CMP_TARGET = 1923.77
+fate-swr-resample_exact_lin_async-s32p-48000-44100: SIZE_TOLERANCE = 576000 - 20298
+
+fate-swr-resample_exact_lin_async-s32p-48000-8000: CMP_TARGET = 2591.71
+fate-swr-resample_exact_lin_async-s32p-48000-8000: SIZE_TOLERANCE = 576000 - 20304
+
+fate-swr-resample_exact_lin_async-s32p-8000-44100: CMP_TARGET = 11187.25
+fate-swr-resample_exact_lin_async-s32p-8000-44100: SIZE_TOLERANCE = 96000 - 20344
+
+fate-swr-resample_exact_lin_async-s32p-8000-48000: CMP_TARGET = 11326.81
+fate-swr-resample_exact_lin_async-s32p-8000-48000: SIZE_TOLERANCE = 96000 - 20344
+
+$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE,s16p,s16le,s16)
+$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE,s32p,s32le,s16)
+$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE,fltp,f32le,s16)
+$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE,dblp,f64le,s16)
+
+$(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_LIN,s16p,s16le,s16)
+$(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_LIN,fltp,f32le,s16)
+$(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_LIN,dblp,f64le,s16)
+
+$(call CROSS_TEST,$(SAMPLERATES_NN),ARESAMPLE_NN,s16p,s16le,s16)
+$(call CROSS_TEST,$(SAMPLERATES_NN),ARESAMPLE_NN,fltp,f32le,s16)
+
+$(call CROSS_TEST,$(SAMPLERATES_NN),ARESAMPLE_ASYNC,s16p,s16le,s16)
+$(call CROSS_TEST,$(SAMPLERATES_NN),ARESAMPLE_ASYNC,fltp,f32le,s16)
+
+$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE_EXACT,s16p,s16le,s16)
+$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE_EXACT,s32p,s32le,s16)
+$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE_EXACT,fltp,f32le,s16)
+$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE_EXACT,dblp,f64le,s16)
+
+$(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_EXACT_ASYNC,s16p,s16le,s16)
+$(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_EXACT_ASYNC,s32p,s32le,s16)
+$(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_EXACT_ASYNC,fltp,f32le,s16)
+$(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_EXACT_ASYNC,dblp,f64le,s16)
+
+$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE_EXACT_LIN,s16p,s16le,s16)
+$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE_EXACT_LIN,s32p,s32le,s16)
+$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE_EXACT_LIN,fltp,f32le,s16)
+$(call CROSS_TEST,$(SAMPLERATES),ARESAMPLE_EXACT_LIN,dblp,f64le,s16)
+
+$(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_EXACT_LIN_ASYNC,s16p,s16le,s16)
+$(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_EXACT_LIN_ASYNC,s32p,s32le,s16)
+$(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_EXACT_LIN_ASYNC,fltp,f32le,s16)
+$(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_EXACT_LIN_ASYNC,dblp,f64le,s16)
+
+FATE_SWR_RESAMPLE-$(call FILTERDEMDECENCMUX, ARESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_SWR_RESAMPLE)
+fate-swr-resample: $(FATE_SWR_RESAMPLE-yes)
+FATE_SWR += $(FATE_SWR_RESAMPLE-yes)
+
+FATE_SWR_AUDIOCONVERT-$(call FILTERDEMDECENCMUX, AFORMAT AEVAL, WAV, PCM_S16LE, PCM_S16LE, WAV) += fate-swr-audioconvert
+fate-swr-audioconvert: tests/data/asynth-44100-1.wav
+fate-swr-audioconvert: REF = tests/data/asynth-44100-1.wav
+fate-swr-audioconvert: CMD = ffmpeg -i $(TARGET_PATH)/tests/data/asynth-44100-1.wav -af "aformat=fltp,aeval=val(0)+(random(0)-0.5)/33000,aformat=fltp" -f wav -c:a pcm_s16le -
+fate-swr-audioconvert: CMP = stddev
+fate-swr-audioconvert: FUZZ = 0
+
+FATE_SWR += $(FATE_SWR_AUDIOCONVERT-yes)
+FATE_FFMPEG += $(FATE_SWR)
+fate-swr: $(FATE_SWR)
diff --git a/tests/fate/libswscale.mak b/tests/fate/libswscale.mak
new file mode 100644
index 0000000000..e72fe590a8
--- /dev/null
+++ b/tests/fate/libswscale.mak
@@ -0,0 +1,7 @@
+FATE_LIBSWSCALE += fate-sws-pixdesc-query
+fate-sws-pixdesc-query: libswscale/tests/pixdesc_query$(EXESUF)
+fate-sws-pixdesc-query: CMD = run libswscale/tests/pixdesc_query
+
+FATE_LIBSWSCALE += $(FATE_LIBSWSCALE-yes)
+FATE-$(CONFIG_SWSCALE) += $(FATE_LIBSWSCALE)
+fate-libswscale: $(FATE_LIBSWSCALE)
diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak
index b4eadda648..d29285328d 100644
--- a/tests/fate/lossless-audio.mak
+++ b/tests/fate/lossless-audio.mak
@@ -1,28 +1,39 @@
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, ALAC) += fate-lossless-alac
+FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, MOV, ALAC) += fate-lossless-alac
 fate-lossless-alac: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/inside.m4a -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MLP, MLP) += fate-lossless-meridianaudio
+FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, MLP, MLP) += fate-lossless-meridianaudio
 fate-lossless-meridianaudio: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, RM, RALF) += fate-ralf
+FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, RM, RALF) += fate-ralf
 fate-ralf: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, SHORTEN, SHORTEN) += fate-lossless-shorten
+FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, SHORTEN, SHORTEN) += fate-lossless-shorten
 fate-lossless-shorten: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, TAK, TAK) += fate-lossless-tak
-fate-lossless-tak: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.tak -f s16le
-fate-lossless-tak: CMP = oneline
-fate-lossless-tak: REF = a28d4e5f2192057f7d4bece870f40bd0
+FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TAK, TAK) += fate-lossless-tak
+fate-lossless-tak: CMD = crc -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.tak
 
 FATE_TRUEHD = fate-lossless-truehd-5.1 fate-lossless-truehd-5.1-downmix-2.0
 fate-lossless-truehd-5.1: CMD = md5 -f truehd -i $(TARGET_SAMPLES)/lossless-audio/truehd_5.1.raw -f s32le
 fate-lossless-truehd-5.1-downmix-2.0: CMD = md5 -f truehd -request_channel_layout 2 -i $(TARGET_SAMPLES)/lossless-audio/truehd_5.1.raw -f s32le
 fate-lossless-truehd: $(FATE_TRUEHD)
-FATE_SAMPLES_AVCONV-$(call DEMDEC, TRUEHD, TRUEHD) += $(FATE_TRUEHD)
+FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TRUEHD, TRUEHD) += $(FATE_TRUEHD)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, TTA, TTA) += fate-lossless-tta
+FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TTA, TTA) += fate-lossless-tta
 fate-lossless-tta: CMD = crc -i $(TARGET_SAMPLES)/lossless-audio/inside.tta
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMALOSSLESS) += fate-lossless-wma
+FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TTA, TTA) += fate-lossless-tta-encrypted
+fate-lossless-tta-encrypted: CMD = crc -password ffmpeg -i $(TARGET_SAMPLES)/lossless-audio/encrypted.tta
+
+FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, ASF, WMALOSSLESS) += fate-lossless-wma fate-lossless-wma24-1 fate-lossless-wma24-2 fate-lossless-wma24-rawtile
 fate-lossless-wma: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le -frames 209
+fate-lossless-wma24-1: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/master_audio_2.0_24bit.wma -f s24le
+fate-lossless-wma24-2: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/Mega_Weird_Audio_Test_24bit.wma -f s24le
+fate-lossless-wma24-rawtile: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/g2_24bit.wma -f s24le
+fate-lossless-wmall: fate-lossless-wma fate-lossless-wma24-1 fate-lossless-wma24-2 fate-lossless-wma24-rawtile
+
+FATE_SAMPLES_LOSSLESS_AUDIO += $(FATE_SAMPLES_LOSSLESS_AUDIO-yes)
+
+FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_LOSSLESS_AUDIO)
+fate-lossless-audio: $(FATE_SAMPLES_LOSSLESS_AUDIO)
+
diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak
index f039492b8e..1e2769c201 100644
--- a/tests/fate/lossless-video.mak
+++ b/tests/fate/lossless-video.mak
@@ -10,7 +10,17 @@ fate-lagarith-yuy2: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-yuy2.avi
 FATE_LAGARITH += fate-lagarith-yv12
 fate-lagarith-yv12: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lag-yv12.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, LAGARITH) += $(FATE_LAGARITH)
+FATE_LAGARITH += fate-lagarith-red
+fate-lagarith-red: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-red.avi
+
+FATE_LAGARITH += fate-lagarith-ticket4119 fate-lagarith-ticket4119-cfr fate-lagarith-ticket4119-vfr fate-lagarith-ticket4119-pass fate-lagarith-ticket4119-drop
+fate-lagarith-ticket4119: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi
+fate-lagarith-ticket4119-cfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync cfr
+fate-lagarith-ticket4119-vfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync vfr
+fate-lagarith-ticket4119-pass: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync passthrough
+fate-lagarith-ticket4119-drop: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync drop
+
+FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LAGARITH) += $(FATE_LAGARITH)
 fate-lagarith: $(FATE_LAGARITH)
 
 FATE_LOCO += fate-loco-rgb
@@ -19,20 +29,25 @@ fate-loco-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-rgb.avi
 FATE_LOCO += fate-loco-yuy2
 fate-loco-yuy2: CMD = framecrc -i $(TARGET_SAMPLES)/loco/pig-loco-0.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, LOCO) += $(FATE_LOCO)
+FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, LOCO) += $(FATE_LOCO)
 fate-loco: $(FATE_LOCO)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, MSRLE) += fate-msrle-8bit
+FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, MSRLE) += fate-msrle-8bit
 fate-msrle-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, MSZH) += fate-mszh
+FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, MSZH) += fate-mszh
 fate-mszh: CMD = framecrc -i $(TARGET_SAMPLES)/lcl/mszh-1frame.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VBLE) += fate-vble
+FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, VBLE) += fate-vble
 fate-vble: CMD = framecrc -i $(TARGET_SAMPLES)/vble/flowers-partial-2MB.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, ZEROCODEC) += fate-zerocodec
+FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZEROCODEC) += fate-zerocodec
 fate-zerocodec: CMD = framecrc -i $(TARGET_SAMPLES)/zerocodec/sample-zeco.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, ZLIB) += fate-zlib
+FATE_LOSSLESS_VIDEO-$(call DEMDEC, AVI, ZLIB) += fate-zlib
 fate-zlib: CMD = framecrc -i $(TARGET_SAMPLES)/lcl/zlib-1frame.avi
+
+FATE_LOSSLESS_VIDEO += $(FATE_LOSSLESS_VIDEO-yes)
+
+FATE_SAMPLES_FFMPEG += $(FATE_LOSSLESS_VIDEO)
+fate-lossless-video: $(FATE_LOSSLESS_VIDEO)
diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak
new file mode 100644
index 0000000000..2747496e1e
--- /dev/null
+++ b/tests/fate/matroska.mak
@@ -0,0 +1,13 @@
+# This tests that the matroska demuxer supports modifying the colorspace
+# properties in remuxing (-c:v copy)
+# It also tests automatic insertion of the vp9_superframe bitstream filter
+FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux
+fate-matroska-remux: CMD = md5pipe -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska
+fate-matroska-remux: CMP = oneline
+fate-matroska-remux: REF = 1ed49a4f2b6790357fac268938357353
+
+FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono
+fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mkv/spherical.mkv
+
+FATE_SAMPLES_AVCONV += $(FATE_MATROSKA-yes)
+FATE_SAMPLES_FFPROBE += $(FATE_MATROSKA_FFPROBE-yes)
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak
index 5c0133d8fd..c450c0d8ea 100644
--- a/tests/fate/microsoft.mak
+++ b/tests/fate/microsoft.mak
@@ -1,8 +1,8 @@
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1
+FATE_MICROSOFT-$(call DEMDEC, AVI, MSMPEG4V1) += fate-msmpeg4v1
 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/msmpeg4v1/mpg4.avi -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS1) += fate-mss1
-fate-mss1: CMD = framecrc -i $(TARGET_SAMPLES)/mss1/screen_codec.wmv -an -pix_fmt rgb24
+FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS1) += fate-mss1-pal
+fate-mss1-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss1/screen_codec.wmv -an
 
 FATE_MSS2 += fate-mss2-pal
 fate-mss2-pal: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/rlepal.wmv
@@ -22,13 +22,19 @@ fate-mss2-wmv: CMD = framecrc -i $(TARGET_SAMPLES)/mss2/msscreencodec.wmv -an -f
 FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MSS2) += $(FATE_MSS2)
 fate-mss2: $(FATE_MSS2)
 
+FATE_MTS2 += fate-mts2-xesc
+fate-mts2-xesc: CMD = framecrc -i $(TARGET_SAMPLES)/mts2/sample.xesc -pix_fmt yuv444p
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MTS2) += $(FATE_MTS2)
+fate-mts2: $(FATE_MTS2)
+
 FATE_MSVIDEO1 += fate-msvideo1-8bit
 fate-msvideo1-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24
 
 FATE_MSVIDEO1 += fate-msvideo1-16bit
 fate-msvideo1-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, MSVIDEO1) += $(FATE_MSVIDEO1)
+FATE_MICROSOFT-$(call DEMDEC, AVI, MSVIDEO1) += $(FATE_MSVIDEO1)
 fate-msvideo1: $(FATE_MSVIDEO1)
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, MTS2) += fate-mts2
@@ -36,16 +42,16 @@ fate-mts2: CMD = framecrc -i $(TARGET_SAMPLES)/mts2/ScreenCapture.xesc
 
 FATE_WMV3_DRM += fate-wmv3-drm-dec
 # discard last packet to avoid fails due to overread of VC-1 decoder
-fate-wmv3-drm-dec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv3/wmv_drm.wmv -an -frames:v 129
+fate-wmv3-drm-dec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -an -frames:v 129
 
 FATE_WMV3_DRM += fate-wmv3-drm-nodec
-fate-wmv3-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv3/wmv_drm.wmv -c copy
+fate-wmv3-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(TARGET_SAMPLES)/wmv8/wmv_drm.wmv -c:a copy -c:v copy
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMV3) += $(FATE_WMV3_DRM)
 fate-wmv3-drm: $(FATE_WMV3_DRM)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ASF, WMV2) += fate-wmv8-intrax8
-fate-wmv8-intrax8: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/wmv8/wmv8_x8intra.wmv -an
+FATE_MICROSOFT-$(call DEMDEC, ASF, WMV2) += fate-wmv8-x8intra
+fate-wmv8-x8intra: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/wmv8/wmv8_x8intra.wmv -an
 
 FATE_VC1-$(CONFIG_VC1_DEMUXER) += fate-vc1_sa00040
 fate-vc1_sa00040: CMD = framecrc -i $(TARGET_SAMPLES)/vc1/SA00040.vc1
@@ -68,8 +74,13 @@ fate-vc1_ilaced_twomv: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vc1/
 FATE_VC1-$(CONFIG_MOV_DEMUXER) += fate-vc1-ism
 fate-vc1-ism: CMD = framecrc -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -an
 
-FATE_SAMPLES_AVCONV-$(CONFIG_VC1_DECODER) += $(FATE_VC1-yes)
+FATE_MICROSOFT-$(CONFIG_VC1_DECODER) += $(FATE_VC1-yes)
 fate-vc1: $(FATE_VC1-yes)
 
-FATE_SAMPLES_AVCONV-$(CONFIG_ASF_DEMUXER) += fate-asf-repldata
+FATE_MICROSOFT-$(CONFIG_ASF_DEMUXER) += fate-asf-repldata
 fate-asf-repldata: CMD = framecrc -i $(TARGET_SAMPLES)/asf/bug821-2.asf -c copy
+
+FATE_MICROSOFT += $(FATE_MICROSOFT-yes)
+
+FATE_SAMPLES_FFMPEG += $(FATE_MICROSOFT)
+fate-microsoft: $(FATE_MICROSOFT)
diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
index 9d64fd3a4a..5013e7d528 100644
--- a/tests/fate/mov.mak
+++ b/tests/fate/mov.mak
@@ -1,21 +1,58 @@
-FATE_MOV += fate-mov-dar
-fate-mov-dar: CMD = probestream display_aspect_ratio $(TARGET_SAMPLES)/mov/displaymatrix.mov
+FATE_MOV = fate-mov-3elist \
+           fate-mov-3elist-1ctts \
+           fate-mov-1elist-1ctts \
+           fate-mov-1elist-noctts \
+           fate-mov-elist-starts-ctts-2ndsample \
+           fate-mov-1elist-ends-last-bframe \
+           fate-mov-2elist-elist1-ends-bframe \
+           fate-mov-3elist-encrypted \
+           fate-mov-gpmf-remux \
+           fate-mov-440hz-10ms \
 
-FATE_MOV += fate-mov-display-matrix
-fate-mov-display-matrix: CMD = probestream matrix $(TARGET_SAMPLES)/mov/displaymatrix.mov
+FATE_MOV_FFPROBE = fate-mov-aac-2048-priming \
+                   fate-mov-zombie \
+                   fate-mov-init-nonkeyframe \
+                   fate-mov-displaymatrix \
+                   fate-mov-spherical-mono \
 
-FATE_MOV += fate-mov-rotation
-fate-mov-rotation: CMD = probestream rotation $(TARGET_SAMPLES)/mov/displaymatrix.mov
+FATE_SAMPLES_AVCONV += $(FATE_MOV)
+FATE_SAMPLES_FFPROBE += $(FATE_MOV_FFPROBE)
 
-FATE_MOV += fate-mov-sar
-fate-mov-sar: CMD = probestream sample_aspect_ratio $(TARGET_SAMPLES)/mov/displaymatrix.mov
+fate-mov: $(FATE_MOV) $(FATE_MOV_FFPROBE)
 
-FATE_MOV += fate-mov-spherical
-fate-mov-spherical: CMD = probestream projection,yaw,pitch,roll,left,top,right,bottom $(TARGET_SAMPLES)/mov/spherical.mov
+# Make sure we handle edit lists correctly in normal cases.
+fate-mov-1elist-noctts: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-1elist-noctts.mov
+fate-mov-1elist-1ctts: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-1elist-1ctts.mov
+fate-mov-3elist: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-3elist.mov
+fate-mov-3elist-1ctts: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-3elist-1ctts.mov
 
-FATE_MOV += fate-mov-stereo3d
-fate-mov-stereo3d: CMD = probestream type $(TARGET_SAMPLES)/mov/spherical.mov
+# Edit list with encryption
+fate-mov-3elist-encrypted: CMD = framemd5 -decryption_key 12345678901234567890123456789012 -i $(TARGET_SAMPLES)/mov/mov-3elist-encrypted.mov
 
-$(FATE_MOV): avprobe$(EXESUF)
-FATE_SAMPLES-$(call ALLYES, AVPROBE MOV_DEMUXER) += $(FATE_MOV)
-fate-mov: $(FATE_MOV)
+# Makes sure that the CTTS is also modified when we fix avindex in mov.c while parsing edit lists.
+fate-mov-elist-starts-ctts-2ndsample: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-elist-starts-ctts-2ndsample.mov
+
+# Makes sure that we handle edit lists ending on a B-frame correctly.
+# The last frame in decoding order which is B-frame should be output, but the last but-one P-frame shouldn't be
+# output.
+fate-mov-1elist-ends-last-bframe: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-1elist-ends-last-bframe.mov
+
+# Makes sure that we handle timestamps of packets in case of multiple edit lists with one of them ending on a B-frame correctly.
+fate-mov-2elist-elist1-ends-bframe: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-2elist-elist1-ends-bframe.mov
+
+# Makes sure that we handle edit lists and start padding correctly.
+fate-mov-440hz-10ms: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/440hz-10ms.m4a
+
+fate-mov-aac-2048-priming: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact $(TARGET_SAMPLES)/mov/aac-2048-priming.mov
+
+fate-mov-zombie: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_streams -show_packets -show_frames -bitexact -print_format compact $(TARGET_SAMPLES)/mov/white_zombie_scrunch-part.mov
+
+fate-mov-init-nonkeyframe: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact -select_streams v $(TARGET_SAMPLES)/mov/mp4-init-nonkeyframe.mp4
+
+fate-mov-displaymatrix: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=display_aspect_ratio,sample_aspect_ratio:stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/displaymatrix.mov
+
+fate-mov-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mov/spherical.mov
+
+fate-mov-gpmf-remux: CMD = md5 -i $(TARGET_SAMPLES)/mov/fake-gp-media-with-real-gpmf.mp4 -map 0 -c copy -fflags +bitexact -f mp4
+fate-mov-gpmf-remux: CMP = oneline
+fate-mov-gpmf-remux: REF = 8f48e435ee1f6b7e173ea756141eabf3
diff --git a/tests/fate/mp3.mak b/tests/fate/mp3.mak
index 3af3135071..b8fde55a8f 100644
--- a/tests/fate/mp3.mak
+++ b/tests/fate/mp3.mak
@@ -1,38 +1,40 @@
 FATE_MP3 += fate-mp3-float-conf-compl
-fate-mp3-float-conf-compl: CMD = avconv -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/compl.bit -f f32le -
+fate-mp3-float-conf-compl: CMD = ffmpeg -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/compl.bit -f f32le -
 fate-mp3-float-conf-compl: REF = $(SAMPLES)/mp3-conformance/compl.f32
 
 FATE_MP3 += fate-mp3-float-conf-he_32khz
-fate-mp3-float-conf-he_32khz: CMD = avconv -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_32khz.bit -af atrim=end_sample=171648 -f f32le -
+fate-mp3-float-conf-he_32khz: CMD = ffmpeg -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_32khz.bit -af atrim=end_sample=171648 -f f32le -
 fate-mp3-float-conf-he_32khz: REF = $(SAMPLES)/mp3-conformance/he_32khz.f32
 
 FATE_MP3 += fate-mp3-float-conf-he_44khz
-fate-mp3-float-conf-he_44khz: CMD = avconv -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_44khz.bit -af atrim=end_sample=471168 -f f32le -
+fate-mp3-float-conf-he_44khz: CMD = ffmpeg -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_44khz.bit -af atrim=end_sample=471168 -f f32le -
 fate-mp3-float-conf-he_44khz: REF = $(SAMPLES)/mp3-conformance/he_44khz.f32
 
 FATE_MP3 += fate-mp3-float-conf-he_48khz
-fate-mp3-float-conf-he_48khz: CMD = avconv -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_48khz.bit -af atrim=end_sample=171648 -f f32le -
+fate-mp3-float-conf-he_48khz: CMD = ffmpeg -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/he_48khz.bit -af atrim=end_sample=171648 -f f32le -
 fate-mp3-float-conf-he_48khz: REF = $(SAMPLES)/mp3-conformance/he_48khz.f32
 
 FATE_MP3 += fate-mp3-float-conf-hecommon
-fate-mp3-float-conf-hecommon: CMD = avconv -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/hecommon.bit -af atrim=end_sample=33408 -f f32le -
+fate-mp3-float-conf-hecommon: CMD = ffmpeg -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/hecommon.bit -af atrim=end_sample=33408 -f f32le -
 fate-mp3-float-conf-hecommon: REF = $(SAMPLES)/mp3-conformance/hecommon.f32
 
 FATE_MP3 += fate-mp3-float-conf-si
-fate-mp3-float-conf-si: CMD = avconv -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si.bit -af atrim=end_sample=134784 -f f32le -
+fate-mp3-float-conf-si: CMD = ffmpeg -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si.bit -af atrim=end_sample=134784 -f f32le -
 fate-mp3-float-conf-si: REF = $(SAMPLES)/mp3-conformance/si.f32
 
 FATE_MP3 += fate-mp3-float-conf-si_block
-fate-mp3-float-conf-si_block: CMD = avconv -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si_block.bit -af atrim=end_sample=72576 -f f32le -
+fate-mp3-float-conf-si_block: CMD = ffmpeg -c:a mp3float -i $(TARGET_SAMPLES)/mp3-conformance/si_block.bit -af atrim=end_sample=72576 -f f32le -
 fate-mp3-float-conf-si_block: REF = $(SAMPLES)/mp3-conformance/si_block.f32
 
 FATE_MP3 += fate-mp3-float-extra_overread
-fate-mp3-float-extra_overread: CMD = avconv -c:a mp3float -i $(TARGET_SAMPLES)/mpegaudio/extra_overread.mp3 -f f32le -
+fate-mp3-float-extra_overread: CMD = ffmpeg -c:a mp3float -i $(TARGET_SAMPLES)/mpegaudio/extra_overread.mp3 -f f32le -
 fate-mp3-float-extra_overread: REF = $(SAMPLES)/mpegaudio/extra_overread.f32
 
 $(FATE_MP3): CMP = oneoff
 $(FATE_MP3): CMP_UNIT = f32
-$(FATE_MP3): FUZZ = 17
+$(FATE_MP3): FUZZ = 18
+
+fate-mp3-float-extra_overread: FUZZ = 23
 
 FATE_MP3-$(call DEMDEC, MP3, MP3FLOAT) += $(FATE_MP3)
 
diff --git a/tests/fate/mpeg4.mak b/tests/fate/mpeg4.mak
index f9b94e6d1c..ed6a2fac20 100644
--- a/tests/fate/mpeg4.mak
+++ b/tests/fate/mpeg4.mak
@@ -1,9 +1,19 @@
 
 MPEG4_RESOLUTION_CHANGE = down-down down-up up-down up-up
 
-fate-mpeg4-resolution-change-%: CMD = framemd5 -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/resize_$(@:fate-mpeg4-resolution-change-%=%).h263
+fate-mpeg4-resolution-change-%: CMD = framemd5 -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/resize_$(@:fate-mpeg4-resolution-change-%=%).h263 -sws_flags +bitexact
 
 FATE_MPEG4-$(call DEMDEC, H263, H263) := $(addprefix fate-mpeg4-resolution-change-, $(MPEG4_RESOLUTION_CHANGE))
 
+fate-mpeg4-bsf-unpack-bframes: CMD = md5 -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -c:v copy -bsf mpeg4_unpack_bframes -f avi
+FATE_MPEG4-$(call ALLYES, AVI_DEMUXER MPEG4_UNPACK_BFRAMES_BSF AVI_MUXER) += fate-mpeg4-bsf-unpack-bframes
+
+fate-mpeg4-packed: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -vsync 1
+FATE_MPEG4-$(call ALLYES, AVI_DEMUXER MPEG4_DECODER) += fate-mpeg4-packed
+
+FATE_MPEG4-$(call DEMDEC, M4V, MPEG4) += fate-m4v  fate-m4v-cfr
+fate-m4v:     CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/demo.m4v
+fate-m4v-cfr: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/demo.m4v -vf fps=5
+
 FATE_SAMPLES_AVCONV += $(FATE_MPEG4-yes)
 fate-mpeg4: $(FATE_MPEG4-yes)
diff --git a/tests/fate/mpegts.mak b/tests/fate/mpegts.mak
new file mode 100644
index 0000000000..bb0d9d98a7
--- /dev/null
+++ b/tests/fate/mpegts.mak
@@ -0,0 +1,14 @@
+#
+# Test probing MPEGTS format and codecs
+#
+PROBE_CODEC_NAME_COMMAND = \
+    ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=codec_name \
+    -print_format default -bitexact -v 0
+
+FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, HEVC, AAC_LATM) += fate-mpegts-probe-latm
+fate-mpegts-probe-latm: SRC = $(TARGET_SAMPLES)/mpegts/loewe.ts
+fate-mpegts-probe-latm: CMD = run $(PROBE_CODEC_NAME_COMMAND) -i "$(SRC)"
+
+FATE_SAMPLES_FFPROBE += $(FATE_MPEGTS_PROBE-yes)
+
+fate-mpegts: $(FATE_MPEGTS_PROBE-yes)
diff --git a/tests/fate/mxf.mak b/tests/fate/mxf.mak
new file mode 100644
index 0000000000..7714b61569
--- /dev/null
+++ b/tests/fate/mxf.mak
@@ -0,0 +1,41 @@
+
+FATE_MXF += fate-mxf-missing-index-demux
+fate-mxf-missing-index-demux: CMD = crc -i $(TARGET_SAMPLES)/mxf/opatom_missing_index.mxf -c:a copy
+
+FATE_MXF += fate-mxf-essencegroup-demux
+fate-mxf-essencegroup-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mxf/opatom_essencegroup_alpha_raw.mxf -c:v copy
+
+FATE_MXF += fate-mxf-multiple-components-demux
+fate-mxf-multiple-components-demux: CMD = framecrc -i $(TARGET_SAMPLES)/mxf/multiple_components.mxf -c:v copy
+
+FATE_MXF += fate-mxf-metadata-source-ref1
+fate-mxf-metadata-source-ref1: CMD = fmtstdout ffmetadata -i $(TARGET_SAMPLES)/mxf/track_01_v02.mxf -fflags +bitexact -flags +bitexact -map 0:0 -map 0:2 -map 0:3  -map_metadata:g -1
+
+FATE_MXF += fate-mxf-metadata-source-ref2
+fate-mxf-metadata-source-ref2: CMD = fmtstdout ffmetadata -i $(TARGET_SAMPLES)/mxf/track_02_a01.mxf -fflags +bitexact -flags +bitexact -map 0:0 -map 0:1 -map 0:3  -map_metadata:g -1
+
+#
+# Tests probing MXF format and stream properties
+#
+PROBE_FORMAT_STREAMS_COMMAND = \
+    ffprobe$(PROGSSUF)$(EXESUF) -show_entries format=format_name,duration,bit_rate:format_tags:streams:stream_tags \
+    -print_format default -bitexact -v 0
+
+FATE_MXF_PROBE-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += fate-mxf-probe-d10
+fate-mxf-probe-d10: SRC = $(TARGET_SAMPLES)/mxf/Sony-00001.mxf
+fate-mxf-probe-d10: CMD = run $(PROBE_FORMAT_STREAMS_COMMAND) -i "$(SRC)"
+
+FATE_MXF_PROBE-$(call ENCDEC, DNXHD, MXF) += fate-mxf-probe-dnxhd
+fate-mxf-probe-dnxhd: SRC = $(TARGET_SAMPLES)/mxf/multiple_components.mxf
+fate-mxf-probe-dnxhd: CMD = run $(PROBE_FORMAT_STREAMS_COMMAND) -i "$(SRC)"
+
+FATE_MXF_PROBE-$(call ENCDEC2, DVVIDEO, PCM_S16LE, MXF) += fate-mxf-probe-dv25
+fate-mxf-probe-dv25: SRC = $(TARGET_SAMPLES)/mxf/Avid-00005.mxf
+fate-mxf-probe-dv25: CMD = run $(PROBE_FORMAT_STREAMS_COMMAND) -i "$(SRC)"
+
+FATE_MXF-$(CONFIG_MXF_DEMUXER) += $(FATE_MXF)
+
+FATE_SAMPLES_AVCONV += $(FATE_MXF-yes)
+FATE_SAMPLES_FFPROBE += $(FATE_MXF_PROBE-yes)
+
+fate-mxf: $(FATE_MXF-yes) $(FATE_MXF_PROBE-yes)
diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak
index 161a94f472..b13d86c138 100644
--- a/tests/fate/opus.mak
+++ b/tests/fate/opus.mak
@@ -14,8 +14,8 @@ OPUS_SAMPLES        = $(addprefix testvector, 08 09 10 12)
 define FATE_OPUS_TEST
 FATE_OPUS     += fate-opus-$(1)
 FATE_OPUS$(2) += fate-opus-$(1)
-fate-opus-$(1): CMD = avconv -i $(TARGET_SAMPLES)/opus/$(1).mka -f f32le -
-fate-opus-$(1): REF = $(SAMPLES)/opus/$(1).f32
+fate-opus-$(1): CMD = ffmpeg -i $(TARGET_SAMPLES)/opus/$(1).mka -f s16le -
+fate-opus-$(1): REF = $(SAMPLES)/opus/$(1).dec
 endef
 
 $(foreach N,$(OPUS_CELT_SAMPLES),  $(eval $(call FATE_OPUS_TEST,$(N),_CELT)))
@@ -26,8 +26,16 @@ $(foreach N,$(OPUS_SAMPLES),       $(eval $(call FATE_OPUS_TEST,$(N),)))
 FATE_OPUS := $(sort $(FATE_OPUS))
 
 $(FATE_OPUS): CMP = stddev
-$(FATE_OPUS): CMP_UNIT = f32
+$(FATE_OPUS): CMP_UNIT = s16
 $(FATE_OPUS): FUZZ = 3
+fate-opus-testvector02: CMP_TARGET = 191
+fate-opus-testvector03: CMP_TARGET = 139
+fate-opus-testvector04: CMP_TARGET = 119
+fate-opus-testvector05: CMP_TARGET = 108
+fate-opus-testvector06: CMP_TARGET = 106
+fate-opus-testvector08: CMP_TARGET = 6
+fate-opus-testvector10: CMP_TARGET = 38
+fate-opus-testvector12: CMP_TARGET = 160
 
 $(FATE_OPUS_CELT): CMP = oneoff
 $(FATE_OPUS_CELT): FUZZ = 6
diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak
index 116b50f10d..053f310b26 100644
--- a/tests/fate/pcm.mak
+++ b/tests/fate/pcm.mak
@@ -1,32 +1,32 @@
-FATE_SAMPLES_PCM += fate-iff-pcm
+FATE_SAMPLES_PCM-$(call DEMDEC, WAV, PCM_U8) += fate-iff-pcm
 fate-iff-pcm: CMD = md5 -i $(TARGET_SAMPLES)/iff/Bells -f s16le
 
-FATE_SAMPLES_PCM += fate-pcm_dvd
+FATE_SAMPLES_PCM-$(call DEMDEC, MPEGPS, PCM_DVD) += fate-pcm_dvd
 fate-pcm_dvd: CMD = framecrc -i $(TARGET_SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
 
-FATE_SAMPLES_PCM += fate-pcm-planar
+FATE_SAMPLES_PCM-$(call DEMDEC, EA, PCM_S16LE_PLANAR) += fate-pcm-planar
 fate-pcm-planar: CMD = framecrc -i $(TARGET_SAMPLES)/ea-mad/xeasport.mad -vn
 
-FATE_SAMPLES_PCM += fate-pcm_s16be-stereo
+FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_S16BE) += fate-pcm_s16be-stereo
 fate-pcm_s16be-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le
 
-FATE_SAMPLES_PCM += fate-pcm_s16le-stereo
+FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_S16LE) += fate-pcm_s16le-stereo
 fate-pcm_s16le-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le
 
-FATE_SAMPLES_PCM += fate-pcm_u8-mono
+FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_U8) += fate-pcm_u8-mono
 fate-pcm_u8-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le
 
-FATE_SAMPLES_PCM += fate-pcm_u8-stereo
+FATE_SAMPLES_PCM-$(call DEMDEC, MOV, PCM_U8) += fate-pcm_u8-stereo
 fate-pcm_u8-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le
 
-FATE_SAMPLES_PCM += fate-w64
+FATE_SAMPLES_PCM-$(call DEMDEC, W64, PCM_S16LE) += fate-w64
 fate-w64: CMD = crc -i $(TARGET_SAMPLES)/w64/w64-pcm16.w64
 
-FATE_PCM += fate-dcinema-encode
+FATE_PCM-$(call ENCMUX, PCM_S24DAUD, DAUD) += fate-dcinema-encode
 fate-dcinema-encode: tests/data/asynth-96000-6.wav
 fate-dcinema-encode: SRC = tests/data/asynth-96000-6.wav
-fate-dcinema-encode: CMD = enc_dec_pcm daud md5 s16le $(SRC) -c:a pcm_s24daud
+fate-dcinema-encode: CMD = enc_dec_pcm daud framemd5 s16le $(SRC) -c:a pcm_s24daud -frames:a 20
 
-FATE_AVCONV += $(FATE_PCM)
-FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM)
-fate-pcm: $(FATE_PCM) $(FATE_SAMPLES_PCM)
+FATE_FFMPEG += $(FATE_PCM-yes)
+FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_PCM-yes)
+fate-pcm: $(FATE_PCM-yes) $(FATE_SAMPLES_PCM-yes)
diff --git a/tests/fate/pixlet.mak b/tests/fate/pixlet.mak
new file mode 100644
index 0000000000..c720f32616
--- /dev/null
+++ b/tests/fate/pixlet.mak
@@ -0,0 +1,5 @@
+FATE_PIXLET += fate-pixlet-rgb
+fate-pixlet-rgb: CMD = framecrc -i $(TARGET_SAMPLES)/pixlet/pixlet_rgb.mov -an -pix_fmt yuv420p16le
+
+FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PIXLET) += $(FATE_PIXLET)
+fate-pixlet: $(FATE_PIXLET)
diff --git a/tests/fate/probe.mak b/tests/fate/probe.mak
index 376dfdd6a6..4be9356f5f 100644
--- a/tests/fate/probe.mak
+++ b/tests/fate/probe.mak
@@ -1,18 +1,20 @@
-FATE_PROBE_FORMAT += fate-probe-format-roundup997
+FATE_PROBE_FORMAT-$(CONFIG_MPEGPS_DEMUXER) += fate-probe-format-roundup997
 fate-probe-format-roundup997:  REF = mpeg
 
-FATE_PROBE_FORMAT += fate-probe-format-roundup1383
+FATE_PROBE_FORMAT-$(CONFIG_MP3_DEMUXER) += fate-probe-format-roundup1383
 fate-probe-format-roundup1383: REF = mp3
 
-FATE_PROBE_FORMAT += fate-probe-format-roundup1414
+FATE_PROBE_FORMAT-$(CONFIG_MPEGPS_DEMUXER) += fate-probe-format-roundup1414
 fate-probe-format-roundup1414: REF = mpeg
 
-FATE_PROBE_FORMAT += fate-probe-format-roundup2015
+FATE_PROBE_FORMAT-$(CONFIG_DV_DEMUXER) += fate-probe-format-roundup2015
 fate-probe-format-roundup2015: REF = dv
 
-FATE_SAMPLES-$(CONFIG_AVPROBE) += $(FATE_PROBE_FORMAT)
+FATE_PROBE_FORMAT = $(FATE_PROBE_FORMAT-yes)
+
+FATE_EXTERN-$(CONFIG_FFPROBE) += $(FATE_PROBE_FORMAT)
 fate-probe-format: $(FATE_PROBE_FORMAT)
 
-$(FATE_PROBE_FORMAT): avprobe$(EXESUF)
+$(FATE_PROBE_FORMAT): ffprobe$(PROGSSUF)$(EXESUF)
 $(FATE_PROBE_FORMAT): CMP = oneline
 fate-probe-format-%: CMD = probefmt $(TARGET_SAMPLES)/probe-format/$(@:fate-probe-format-%=%)
diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak
index 8d4b6ac9a7..f7f52ca7fc 100644
--- a/tests/fate/prores.mak
+++ b/tests/fate/prores.mak
@@ -3,12 +3,20 @@ FATE_PRORES = fate-prores-422                                           \
               fate-prores-422_lt                                        \
               fate-prores-422_proxy                                     \
               fate-prores-alpha                                         \
+              fate-prores-alpha_skip                                    \
+              fate-prores-transparency                                  \
+              fate-prores-transparency_skip                             \
+              fate-prores-gray                                          \
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PRORES) += $(FATE_PRORES)
 fate-prores: $(FATE_PRORES)
 
-fate-prores-422:       CMD = framecrc -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le
-fate-prores-422_hq:    CMD = framecrc -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le
-fate-prores-422_lt:    CMD = framecrc -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le
-fate-prores-422_proxy: CMD = framecrc -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le
-fate-prores-alpha:     CMD = framecrc -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuva444p10le
+fate-prores-422:       CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le
+fate-prores-422_hq:    CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le
+fate-prores-422_lt:    CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le
+fate-prores-422_proxy: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le
+fate-prores-alpha:     CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuva444p10le
+fate-prores-alpha_skip: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuv444p10le
+fate-prores-transparency: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/prores4444_with_transparency.mov -pix_fmt yuva444p10le
+fate-prores-transparency_skip: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_SAMPLES)/prores/prores4444_with_transparency.mov -pix_fmt yuv444p10le
+fate-prores-gray:      CMD = framecrc -flags +bitexact -c:a aac_fixed -i $(TARGET_SAMPLES)/prores/gray.mov -pix_fmt yuv422p10le
diff --git a/tests/fate/qt.mak b/tests/fate/qt.mak
index b51168fbea..c054129f08 100644
--- a/tests/fate/qt.mak
+++ b/tests/fate/qt.mak
@@ -1,59 +1,68 @@
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, EIGHTBPS) += fate-8bps
+FATE_QT-$(call DEMDEC, MOV, EIGHTBPS) += fate-8bps
 fate-8bps: CMD = framecrc -i $(TARGET_SAMPLES)/8bps/full9iron-partial.mov -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, QDM2) += fate-qdm2
+FATE_QT-$(call DEMDEC, MOV, QDM2) += fate-qdm2
 fate-qdm2: CMD = pcm -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov
 fate-qdm2: CMP = oneoff
 fate-qdm2: REF = $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.pcm
 fate-qdm2: FUZZ = 2
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-mono
+FATE_QT-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-mono
 fate-qt-alaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-stereo
+FATE_QT-$(call DEMDEC, MOV, PCM_ALAW) += fate-qt-alaw-stereo
 fate-qt-alaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-alaw.mov -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-mono
+FATE_QT-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-mono
 fate-qt-ima4-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ima4.mov -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-stereo
+FATE_QT-$(call DEMDEC, MOV, ADPCM_IMA_QT) += fate-qt-ima4-stereo
 fate-qt-ima4-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ima4.mov -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-mono
+FATE_QT-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-mono
 fate-qt-mac3-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC3.mov -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-stereo
+FATE_QT-$(call DEMDEC, MOV, MACE3) += fate-qt-mac3-stereo
 fate-qt-mac3-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC3.mov -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-mono
+FATE_QT-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-mono
 fate-qt-mac6-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-8-MAC6.mov -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-stereo
+FATE_QT-$(call DEMDEC, MOV, MACE6) += fate-qt-mac6-stereo
 fate-qt-mac6-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-8-MAC6.mov -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-mono
+FATE_QT-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-mono
 fate-qt-ulaw-mono: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-1-16-B-ulaw.mov -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-stereo
+FATE_QT-$(call DEMDEC, MOV, PCM_MULAW) += fate-qt-ulaw-stereo
 fate-qt-ulaw-stereo: CMD = md5 -i $(TARGET_SAMPLES)/qt-surge-suite/surge-2-16-B-ulaw.mov -f s16le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, QDRAW) += fate-quickdraw
+FATE_QT-$(call DEMDEC, MOV, QDRAW) += fate-quickdraw
 fate-quickdraw: CMD = framecrc -i $(TARGET_SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, RPZA) += fate-rpza
+FATE_QT-$(call DEMDEC, MOV, RPZA) += fate-rpza
 fate-rpza: CMD = framecrc -i $(TARGET_SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, SVQ1) += fate-svq1
+FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1
 fate-svq1: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/marymary-shackles.mov -an -t 10
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, SVQ1) += fate-svq1-headerswap
+FATE_QT-$(call DEMDEC, MOV, SVQ1) += fate-svq1-headerswap
 fate-svq1-headerswap: CMD = framecrc -i $(TARGET_SAMPLES)/svq1/ct_ending_cut.mov -frames 4
 
 FATE_SVQ3 += fate-svq3-1
 fate-svq3-1: CMD = framecrc -i $(TARGET_SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an
 
-FATE_SVQ3 += fate-svq3-2
-fate-svq3-2: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/svq3/svq3_decoding_regression.mov -an
+#FATE_SVQ3 += fate-svq3-2
+#FIXME: first frame changes depending on --enable-memory-poisoning being used to configure or not
+fate-svq3-2: CMD = framecrc -flags +bitexact -ignore_editlist 1 -i $(TARGET_SAMPLES)/svq3/svq3_decoding_regression.mov -an
 
-FATE_SAMPLES_AVCONV-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += $(FATE_SVQ3)
+FATE_SVQ3 += fate-svq3-watermark
+fate-svq3-watermark: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/svq3/svq3_watermark.mov
+
+FATE_QT-$(call ALLYES, MOV_DEMUXER SVQ3_DECODER ZLIB) += $(FATE_SVQ3)
 fate-svq3: $(FATE_SVQ3)
+
+FATE_QT += $(FATE_QT-yes)
+
+FATE_SAMPLES_FFMPEG += $(FATE_QT)
+fate-qt: $(FATE_QT)
diff --git a/tests/fate/real.mak b/tests/fate/real.mak
index f119ce9559..dd5f9c61db 100644
--- a/tests/fate/real.mak
+++ b/tests/fate/real.mak
@@ -1,7 +1,7 @@
 FATE_REALAUDIO-$(call DEMDEC, RM, RA_144) += fate-ra3-144
 fate-ra3-144: CMD = framecrc -i $(TARGET_SAMPLES)/realaudio/ra3.ra
 
-FATE_REALAUDIO-$(call DEMDEC, RM, RA_288) += fate-ra4-288
+#FATE_REALAUDIO-$(call DEMDEC, RM, RA_288) += fate-ra4-288
 fate-ra4-288: CMD = pcm -i $(TARGET_SAMPLES)/realaudio/ra4_288.ra
 fate-ra4-288: REF = $(SAMPLES)/realaudio/ra4_288.pcm
 fate-ra4-288: CMP = oneoff
@@ -20,11 +20,14 @@ fate-ra-cook: CMD = pcm -i $(TARGET_SAMPLES)/real/ra_cook.rm
 fate-ra-cook: CMP = oneoff
 fate-ra-cook: REF = $(SAMPLES)/real/ra_cook.pcm
 
+FATE_REALMEDIA_VIDEO-$(call DEMDEC, RM, RV20) += fate-rv20-1239
+fate-rv20-1239: CMD = framecrc -flags +bitexact -idct simple -lowres 1 -i $(TARGET_SAMPLES)/real/G2_with_SVT_320_240.rm
+
 FATE_REALMEDIA_VIDEO-$(call DEMDEC, RM, RV30) += fate-rv30
 fate-rv30: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/real/rv30.rm -an
 
 FATE_REALMEDIA_VIDEO-$(call DEMDEC, RM, RV40) += fate-rv40
-fate-rv40: CMD = framecrc -i $(TARGET_SAMPLES)/real/spygames-2MB.rmvb -t 10 -an -vsync 0
+fate-rv40: CMD = framecrc -i $(TARGET_SAMPLES)/real/spygames-2MB.rmvb -t 10 -an
 
 FATE_SIPR += fate-sipr-5k0
 fate-sipr-5k0: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_5k0.rm
@@ -39,8 +42,9 @@ fate-sipr-8k5: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_8k5.rm
 fate-sipr-8k5: REF = $(SAMPLES)/sipr/sipr_8k5.pcm
 
 FATE_SIPR += fate-sipr-16k
-fate-sipr-16k: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_16k.rm
+fate-sipr-16k: CMD = pcm -i $(TARGET_SAMPLES)/sipr/sipr_16k.rm -frames:a 3250
 fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm
+fate-sipr-16k: SIZE_TOLERANCE = 40000
 
 $(FATE_SIPR): CMP = oneoff
 
@@ -53,4 +57,4 @@ fate-realmedia-video: $(FATE_REALMEDIA_VIDEO-yes)
 fate-realmedia: fate-realmedia-audio fate-realmedia-video
 fate-real: fate-realaudio fate-realmedia
 
-FATE_SAMPLES_AVCONV += $(FATE_REALAUDIO-yes) $(FATE_REALMEDIA_AUDIO-yes) $(FATE_REALMEDIA_VIDEO-yes)
+FATE_SAMPLES_FFMPEG += $(FATE_REALAUDIO-yes) $(FATE_REALMEDIA_AUDIO-yes) $(FATE_REALMEDIA_VIDEO-yes)
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak
index 575d217d5a..68b4f6f979 100644
--- a/tests/fate/screen.mak
+++ b/tests/fate/screen.mak
@@ -1,8 +1,8 @@
 # FIXME dropped frames in this test because of coarse timebase
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CSCD) += fate-cscd
+FATE_SCREEN-$(call DEMDEC, AVI, CSCD) += fate-cscd
 fate-cscd: CMD = framecrc -i $(TARGET_SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, DXTORY) += fate-dxtory
+FATE_SCREEN-$(call DEMDEC, AVI, DXTORY) += fate-dxtory
 fate-dxtory: CMD = framecrc -i $(TARGET_SAMPLES)/dxtory/dxtory_mic.avi -an
 
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FIC) += fate-fic-avi
@@ -35,7 +35,7 @@ fate-fraps-v4: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/WoW_2006-11-03_14-58-17
 FATE_FRAPS += fate-fraps-v5
 fate-fraps-v5: CMD = framecrc -i $(TARGET_SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS)
+FATE_SCREEN-$(call DEMDEC, AVI, FRAPS) += $(FATE_FRAPS)
 fate-fraps: $(FATE_FRAPS)
 
 FATE_G2M += fate-g2m2
@@ -89,7 +89,7 @@ fate-tscc-15bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/oneminute.avi -t 15 -p
 FATE_TSCC += fate-tscc-32bit
 fate-tscc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, TSCC) += $(FATE_TSCC)
+FATE_SCREEN-$(call DEMDEC, AVI, TSCC) += $(FATE_TSCC)
 fate-tscc: $(FATE_TSCC)
 
 FATE_TSCC2-$(CONFIG_AVI_DEMUXER) += fate-tscc2-avi
@@ -107,7 +107,7 @@ fate-vmnc-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/VMnc/test.avi -pix_fmt rgb2
 FATE_VMNC += fate-vmnc-32bit
 fate-vmnc-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VMNC) += $(FATE_VMNC)
+FATE_SCREEN-$(call DEMDEC, AVI, VMNC) += $(FATE_VMNC)
 fate-vmnc: $(FATE_VMNC)
 
 FATE_ZMBV += fate-zmbv-8bit
@@ -122,5 +122,10 @@ fate-zmbv-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_16bit.avi -pix_fm
 FATE_ZMBV += fate-zmbv-32bit
 fate-zmbv-32bit: CMD = framecrc -i $(TARGET_SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, ZMBV) += $(FATE_ZMBV)
+FATE_SCREEN-$(call DEMDEC, AVI, ZMBV) += $(FATE_ZMBV)
 fate-zmbv: $(FATE_ZMBV)
+
+FATE_SCREEN += $(FATE_SCREEN-yes)
+
+FATE_SAMPLES_FFMPEG += $(FATE_SCREEN)
+fate-screen: $(FATE_SCREEN)
diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak
index 60adab2085..c863b2aaa4 100644
--- a/tests/fate/seek.mak
+++ b/tests/fate/seek.mak
@@ -1,10 +1,15 @@
 # files from fate-acodec
 
-FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_QT,  AIFF)    += adpcm-ima_qt
-FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_WAV, WAV)     += adpcm-ima_wav
-FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_MS,      WAV)     += adpcm-ms
-FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_SWF,     FLV)     += adpcm-swf
-FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_YAMAHA,  WAV)     += adpcm-yamaha
+FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_QT,  AIFF)    += adpcm-ima_qt \
+                                                           adpcm-ima_qt-trellis
+FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_IMA_WAV, WAV)     += adpcm-ima_wav \
+                                                           adpcm-ima_wav-trellis
+FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_MS,      WAV)     += adpcm-ms      \
+                                                           adpcm-ms-trellis
+FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_SWF,     FLV)     += adpcm-swf     \
+                                                           adpcm-swf-trellis
+FATE_SEEK_ACODEC-$(call ENCDEC, ADPCM_YAMAHA,  WAV)     += adpcm-yamaha  \
+                                                           adpcm-yamaha-trellis
 FATE_SEEK_ACODEC-$(call ENCDEC, ALAC,          MOV)     += alac
 FATE_SEEK_ACODEC-$(call ENCDEC, FLAC,          FLAC)    += flac
 FATE_SEEK_ACODEC-$(call ENCDEC, MP2,           MP2 MP3) += mp2
@@ -28,6 +33,11 @@ fate-seek-acodec-adpcm-ima_wav: SRC = fate/acodec-adpcm-ima_wav.wav
 fate-seek-acodec-adpcm-ms:      SRC = fate/acodec-adpcm-ms.wav
 fate-seek-acodec-adpcm-swf:     SRC = fate/acodec-adpcm-swf.flv
 fate-seek-acodec-adpcm-yamaha:  SRC = fate/acodec-adpcm-yamaha.wav
+fate-seek-acodec-adpcm-ima_qt-trellis:  SRC = fate/acodec-adpcm-ima_qt-trellis.aiff
+fate-seek-acodec-adpcm-ima_wav-trellis: SRC = fate/acodec-adpcm-ima_wav-trellis.wav
+fate-seek-acodec-adpcm-ms-trellis:      SRC = fate/acodec-adpcm-ms-trellis.wav
+fate-seek-acodec-adpcm-swf-trellis:     SRC = fate/acodec-adpcm-swf-trellis.flv
+fate-seek-acodec-adpcm-yamaha-trellis:  SRC = fate/acodec-adpcm-yamaha-trellis.wav
 fate-seek-acodec-alac:          SRC = fate/acodec-alac.mov
 fate-seek-acodec-flac:          SRC = fate/acodec-flac.flac
 fate-seek-acodec-mp2:           SRC = fate/acodec-mp2.mp2
@@ -48,99 +58,106 @@ fate-seek-acodec-pcm-u8:        SRC = fate/acodec-pcm-u8.wav
 
 FATE_SEEK += $(FATE_SEEK_ACODEC-yes:%=fate-seek-acodec-%)
 
-# files from fate-vsynth2
-
-FATE_SEEK_VSYNTH2-$(call ENCDEC, ASV1,          AVI)     += asv1
-FATE_SEEK_VSYNTH2-$(call ENCDEC, ASV2,          AVI)     += asv2
-FATE_SEEK_VSYNTH2-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd-720p
-FATE_SEEK_VSYNTH2-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd-720p-rd
-FATE_SEEK_VSYNTH2-$(call ENCDEC, DNXHD,         MOV)     += dnxhd-1080i
-FATE_SEEK_VSYNTH2-$(call ENCDEC, DVVIDEO,       DV)      += dv
-FATE_SEEK_VSYNTH2-$(call ENCDEC, DVVIDEO,       DV)      += dv-411
-FATE_SEEK_VSYNTH2-$(call ENCDEC, DVVIDEO,       DV)      += dv-50
-FATE_SEEK_VSYNTH2-$(call ENCDEC, FFV1,          AVI)     += ffv1
-FATE_SEEK_VSYNTH2-$(call ENCDEC, FLASHSV,       FLV)     += flashsv
-FATE_SEEK_VSYNTH2-$(call ENCDEC, FLV,           FLV)     += flv
-FATE_SEEK_VSYNTH2-$(call ENCDEC, H261,          AVI)     += h261
-FATE_SEEK_VSYNTH2-$(call ENCDEC, H263,          AVI)     += h263
-FATE_SEEK_VSYNTH2-$(call ENCDEC, H263,          AVI)     += h263p
-FATE_SEEK_VSYNTH2-$(call ENCDEC, HUFFYUV,       AVI)     += huffyuv
-FATE_SEEK_VSYNTH2-$(call ENCDEC, JPEGLS,        AVI)     += jpegls
-FATE_SEEK_VSYNTH2-$(call ENCDEC, LJPEG MJPEG,   AVI)     += ljpeg
-FATE_SEEK_VSYNTH2-$(call ENCDEC, MJPEG,         AVI)     += mjpeg
-
-FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) +=    \
-                                                    mpeg1                \
+# files from fate-vsynth_lena
+
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV1,          AVI)     += asv1
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV2,          AVI)     += asv2
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd-720p
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd-720p-rd
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD,         DNXHD)   += dnxhd-4k-hr-lb
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD,         MOV)     += dnxhd-1080i
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO,       DV)      += dv
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO,       DV)      += dv-411
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO,       DV)      += dv-50
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, FFV1,          AVI)     += ffv1
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, FLASHSV,       FLV)     += flashsv
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, FLV,           FLV)     += flv
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, H261,          AVI)     += h261
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, H263,          AVI)     += h263
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, H263,          AVI)     += h263p
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, HUFFYUV,       AVI)     += huffyuv
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, JPEGLS,        AVI)     += jpegls
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, LJPEG MJPEG,   AVI)     += ljpeg
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MJPEG,         AVI)     += mjpeg
+
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) +=    \
+                                                    mpeg1                    \
                                                     mpeg1b
 
-FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) +=    \
-                                                    mpeg2-422            \
-                                                    mpeg2-idct-int       \
-                                                    mpeg2-ilace          \
-                                                    mpeg2-ivlc-qprd      \
-                                                    mpeg2-thread         \
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG2VIDEO, MPEG2VIDEO MPEGVIDEO) +=    \
+                                                    mpeg2-422                \
+                                                    mpeg2-idct-int           \
+                                                    mpeg2-ilace              \
+                                                    mpeg2-ivlc-qprd          \
+                                                    mpeg2-thread             \
                                                     mpeg2-thread-ivlc
 
-FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG4,         MP4 MOV) += mpeg4
-FATE_SEEK_VSYNTH2-$(call ENCDEC, MPEG4, AVI)             += $(FATE_MPEG4_AVI)
-FATE_SEEK_VSYNTH2-$(call ENCDEC, MSMPEG4V3,     AVI)     += msmpeg4
-FATE_SEEK_VSYNTH2-$(call ENCDEC, MSMPEG4V2,     AVI)     += msmpeg4v2
-FATE_SEEK_VSYNTH2-$(call ENCDEC, RAWVIDEO,      AVI)     += rgb
-FATE_SEEK_VSYNTH2-$(call ENCDEC, ROQ,           ROQ)     += roqvideo
-FATE_SEEK_VSYNTH2-$(call ENCDEC, RV10,          RM)      += rv10
-FATE_SEEK_VSYNTH2-$(call ENCDEC, RV20,          RM)      += rv20
-FATE_SEEK_VSYNTH2-$(call ENCDEC, SVQ1,          MOV)     += svq1
-FATE_SEEK_VSYNTH2-$(call ENCDEC, WMV1,          AVI)     += wmv1
-FATE_SEEK_VSYNTH2-$(call ENCDEC, WMV2,          AVI)     += wmv2
-FATE_SEEK_VSYNTH2-$(call ENCDEC, RAWVIDEO,      AVI)     += yuv
-
-fate-seek-vsynth2-asv1:              SRC = fate/vsynth2-asv1.avi
-fate-seek-vsynth2-asv2:              SRC = fate/vsynth2-asv2.avi
-fate-seek-vsynth2-dnxhd-1080i:       SRC = fate/vsynth2-dnxhd-1080i.mov
-fate-seek-vsynth2-dnxhd-720p:        SRC = fate/vsynth2-dnxhd-720p.dnxhd
-fate-seek-vsynth2-dnxhd-720p-rd:     SRC = fate/vsynth2-dnxhd-720p.dnxhd
-fate-seek-vsynth2-dv:                SRC = fate/vsynth2-dv.dv
-fate-seek-vsynth2-dv-411:            SRC = fate/vsynth2-dv-411.dv
-fate-seek-vsynth2-dv-50:             SRC = fate/vsynth2-dv-50.dv
-fate-seek-vsynth2-ffv1:              SRC = fate/vsynth2-ffv1.avi
-fate-seek-vsynth2-flashsv:           SRC = fate/vsynth2-flashsv.flv
-fate-seek-vsynth2-flv:               SRC = fate/vsynth2-flv.flv
-fate-seek-vsynth2-h261:              SRC = fate/vsynth2-h261.avi
-fate-seek-vsynth2-h263:              SRC = fate/vsynth2-h263.avi
-fate-seek-vsynth2-h263p:             SRC = fate/vsynth2-h263p.avi
-fate-seek-vsynth2-huffyuv:           SRC = fate/vsynth2-huffyuv.avi
-fate-seek-vsynth2-jpegls:            SRC = fate/vsynth2-jpegls.avi
-fate-seek-vsynth2-ljpeg:             SRC = fate/vsynth2-ljpeg.avi
-fate-seek-vsynth2-mjpeg:             SRC = fate/vsynth2-mjpeg.avi
-fate-seek-vsynth2-mpeg1:             SRC = fate/vsynth2-mpeg1.mpeg1video
-fate-seek-vsynth2-mpeg1b:            SRC = fate/vsynth2-mpeg1b.mpeg1video
-fate-seek-vsynth2-mpeg2-422:         SRC = fate/vsynth2-mpeg2-422.mpeg2video
-fate-seek-vsynth2-mpeg2-idct-int:    SRC = fate/vsynth2-mpeg2-idct-int.mpeg2video
-fate-seek-vsynth2-mpeg2-ilace:       SRC = fate/vsynth2-mpeg2-ilace.mpeg2video
-fate-seek-vsynth2-mpeg2-ivlc-qprd:   SRC = fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
-fate-seek-vsynth2-mpeg2-thread:      SRC = fate/vsynth2-mpeg2-thread.mpeg2video
-fate-seek-vsynth2-mpeg2-thread-ivlc: SRC = fate/vsynth2-mpeg2-thread-ivlc.mpeg2video
-fate-seek-vsynth2-mpeg4:             SRC = fate/vsynth2-mpeg4.mp4
-fate-seek-vsynth2-mpeg4-adap:        SRC = fate/vsynth2-mpeg4-adap.avi
-fate-seek-vsynth2-mpeg4-adv:         SRC = fate/vsynth2-mpeg4-adv.avi
-fate-seek-vsynth2-mpeg4-error:       SRC = fate/vsynth2-mpeg4-error.avi
-fate-seek-vsynth2-mpeg4-nr:          SRC = fate/vsynth2-mpeg4-nr.avi
-fate-seek-vsynth2-mpeg4-qpel:        SRC = fate/vsynth2-mpeg4-qpel.avi
-fate-seek-vsynth2-mpeg4-qprd:        SRC = fate/vsynth2-mpeg4-qprd.avi
-fate-seek-vsynth2-mpeg4-rc:          SRC = fate/vsynth2-mpeg4-rc.avi
-fate-seek-vsynth2-mpeg4-thread:      SRC = fate/vsynth2-mpeg4-thread.avi
-fate-seek-vsynth2-msmpeg4:           SRC = fate/vsynth2-msmpeg4.avi
-fate-seek-vsynth2-msmpeg4v2:         SRC = fate/vsynth2-msmpeg4v2.avi
-fate-seek-vsynth2-rgb:               SRC = fate/vsynth2-rgb.avi
-fate-seek-vsynth2-roqvideo:          SRC = fate/vsynth2-roqvideo.roq
-fate-seek-vsynth2-rv10:              SRC = fate/vsynth2-rv10.rm
-fate-seek-vsynth2-rv20:              SRC = fate/vsynth2-rv20.rm
-fate-seek-vsynth2-svq1:              SRC = fate/vsynth2-svq1.mov
-fate-seek-vsynth2-wmv1:              SRC = fate/vsynth2-wmv1.avi
-fate-seek-vsynth2-wmv2:              SRC = fate/vsynth2-wmv2.avi
-fate-seek-vsynth2-yuv:               SRC = fate/vsynth2-yuv.avi
-
-FATE_SEEK += $(FATE_SEEK_VSYNTH2-yes:%=fate-seek-vsynth2-%)
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG4,         MP4 MOV) += mpeg4
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG4, AVI)             += $(FATE_MPEG4_AVI)
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MSMPEG4V3,     AVI)     += msmpeg4
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MSMPEG4V2,     AVI)     += msmpeg4v2
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RAWVIDEO,      AVI)     += rgb
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ROQ,           ROQ)     += roqvideo
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RV10,          RM)      += rv10
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RV20,          RM)      += rv20
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SNOW,          AVI)     += snow
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SNOW,          AVI)     += snow-ll
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, SVQ1,          MOV)     += svq1
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, WMV1,          AVI)     += wmv1
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, WMV2,          AVI)     += wmv2
+FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, RAWVIDEO,      AVI)     += yuv
+
+fate-seek-vsynth_lena-asv1:              SRC = fate/vsynth_lena-asv1.avi
+fate-seek-vsynth_lena-asv2:              SRC = fate/vsynth_lena-asv2.avi
+fate-seek-vsynth_lena-dnxhd-1080i:       SRC = fate/vsynth_lena-dnxhd-1080i.mov
+fate-seek-vsynth_lena-dnxhd-720p:        SRC = fate/vsynth_lena-dnxhd-720p.dnxhd
+fate-seek-vsynth_lena-dnxhd-720p-rd:     SRC = fate/vsynth_lena-dnxhd-720p.dnxhd
+fate-seek-vsynth_lena-dnxhd-4k-hr-lb:    SRC = fate/vsynth_lena-dnxhd-4k-hr-lb.dnxhd
+fate-seek-vsynth_lena-dv:                SRC = fate/vsynth_lena-dv.dv
+fate-seek-vsynth_lena-dv-411:            SRC = fate/vsynth_lena-dv-411.dv
+fate-seek-vsynth_lena-dv-50:             SRC = fate/vsynth_lena-dv-50.dv
+fate-seek-vsynth_lena-ffv1:              SRC = fate/vsynth_lena-ffv1.avi
+fate-seek-vsynth_lena-flashsv:           SRC = fate/vsynth_lena-flashsv.flv
+fate-seek-vsynth_lena-flv:               SRC = fate/vsynth_lena-flv.flv
+fate-seek-vsynth_lena-h261:              SRC = fate/vsynth_lena-h261.avi
+fate-seek-vsynth_lena-h263:              SRC = fate/vsynth_lena-h263.avi
+fate-seek-vsynth_lena-h263p:             SRC = fate/vsynth_lena-h263p.avi
+fate-seek-vsynth_lena-huffyuv:           SRC = fate/vsynth_lena-huffyuv.avi
+fate-seek-vsynth_lena-jpegls:            SRC = fate/vsynth_lena-jpegls.avi
+fate-seek-vsynth_lena-ljpeg:             SRC = fate/vsynth_lena-ljpeg.avi
+fate-seek-vsynth_lena-mjpeg:             SRC = fate/vsynth_lena-mjpeg.avi
+fate-seek-vsynth_lena-mpeg1:             SRC = fate/vsynth_lena-mpeg1.mpeg1video
+fate-seek-vsynth_lena-mpeg1b:            SRC = fate/vsynth_lena-mpeg1b.mpeg1video
+fate-seek-vsynth_lena-mpeg2-422:         SRC = fate/vsynth_lena-mpeg2-422.mpeg2video
+fate-seek-vsynth_lena-mpeg2-idct-int:    SRC = fate/vsynth_lena-mpeg2-idct-int.mpeg2video
+fate-seek-vsynth_lena-mpeg2-ilace:       SRC = fate/vsynth_lena-mpeg2-ilace.mpeg2video
+fate-seek-vsynth_lena-mpeg2-ivlc-qprd:   SRC = fate/vsynth_lena-mpeg2-ivlc-qprd.mpeg2video
+fate-seek-vsynth_lena-mpeg2-thread:      SRC = fate/vsynth_lena-mpeg2-thread.mpeg2video
+fate-seek-vsynth_lena-mpeg2-thread-ivlc: SRC = fate/vsynth_lena-mpeg2-thread-ivlc.mpeg2video
+fate-seek-vsynth_lena-mpeg4:             SRC = fate/vsynth_lena-mpeg4.mp4
+fate-seek-vsynth_lena-mpeg4-adap:        SRC = fate/vsynth_lena-mpeg4-adap.avi
+fate-seek-vsynth_lena-mpeg4-adv:         SRC = fate/vsynth_lena-mpeg4-adv.avi
+fate-seek-vsynth_lena-mpeg4-error:       SRC = fate/vsynth_lena-mpeg4-error.avi
+fate-seek-vsynth_lena-mpeg4-nr:          SRC = fate/vsynth_lena-mpeg4-nr.avi
+fate-seek-vsynth_lena-mpeg4-nsse:        SRC = fate/vsynth_lena-mpeg4-nsse.avi
+fate-seek-vsynth_lena-mpeg4-qpel:        SRC = fate/vsynth_lena-mpeg4-qpel.avi
+fate-seek-vsynth_lena-mpeg4-qprd:        SRC = fate/vsynth_lena-mpeg4-qprd.avi
+fate-seek-vsynth_lena-mpeg4-rc:          SRC = fate/vsynth_lena-mpeg4-rc.avi
+fate-seek-vsynth_lena-mpeg4-thread:      SRC = fate/vsynth_lena-mpeg4-thread.avi
+fate-seek-vsynth_lena-msmpeg4:           SRC = fate/vsynth_lena-msmpeg4.avi
+fate-seek-vsynth_lena-msmpeg4v2:         SRC = fate/vsynth_lena-msmpeg4v2.avi
+fate-seek-vsynth_lena-rgb:               SRC = fate/vsynth_lena-rgb.avi
+fate-seek-vsynth_lena-roqvideo:          SRC = fate/vsynth_lena-roqvideo.roq
+fate-seek-vsynth_lena-rv10:              SRC = fate/vsynth_lena-rv10.rm
+fate-seek-vsynth_lena-rv20:              SRC = fate/vsynth_lena-rv20.rm
+fate-seek-vsynth_lena-snow:              SRC = fate/vsynth_lena-snow.avi
+fate-seek-vsynth_lena-snow-ll:           SRC = fate/vsynth_lena-snow-ll.avi
+fate-seek-vsynth_lena-svq1:              SRC = fate/vsynth_lena-svq1.mov
+fate-seek-vsynth_lena-wmv1:              SRC = fate/vsynth_lena-wmv1.avi
+fate-seek-vsynth_lena-wmv2:              SRC = fate/vsynth_lena-wmv2.avi
+fate-seek-vsynth_lena-yuv:               SRC = fate/vsynth_lena-yuv.avi
+
+FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH_LENA-yes:%=fate-seek-vsynth_lena-%)
 
 # files from fate-lavf
 
@@ -151,6 +168,7 @@ FATE_SEEK_LAVF-$(call ENCDEC,  PCM_S16BE,             AU)          += au
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      MP2,       AVI)         += avi
 FATE_SEEK_LAVF-$(call ENCDEC,  BMP,                   IMAGE2)      += bmp
 FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, AVI)         += dv_fmt
+FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       FFM)         += ffm
 FATE_SEEK_LAVF-$(call ENCDEC,  FLV,                   FLV)         += flv_fmt
 FATE_SEEK_LAVF-$(call ENCDEC,  GIF,                   IMAGE2)      += gif
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF)         += gxf
@@ -162,6 +180,10 @@ FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2,       MPEG1SYSTEM MPEGPS) += mpg
 FATE_SEEK_LAVF-$(call ENCDEC,  PCM_MULAW,             PCM_MULAW)   += mulaw
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF)         += mxf
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
+FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, MXF)         += mxf_dv25
+FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO,    PCM_S16LE, MXF)         += mxf_dvcpro50
+FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD,      PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom
+FATE_SEEK_LAVF-$(call ENCDEC2, DNXHD,      PCM_S16LE, MXF_OPATOM MXF) += mxf_opatom_audio
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4,      MP2,       NUT)         += nut
 FATE_SEEK_LAVF-$(call ENCDEC,  FLAC,                  OGG)         += ogg
 FATE_SEEK_LAVF-$(call ENCDEC,  PBM,                   IMAGE2PIPE)  += pbmpipe
@@ -178,6 +200,7 @@ FATE_SEEK_LAVF-$(call ENCDEC,  TIFF,                  IMAGE2)      += tiff
 FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2,       MPEGTS)      += ts
 FATE_SEEK_LAVF-$(call ENCDEC,  PCM_U8,                VOC)         += voc
 FATE_SEEK_LAVF-$(call ENCDEC,  PCM_S16LE,             WAV)         += wav
+FATE_SEEK_LAVF-$(call ENCDEC,  MP2,                   WTV)         += wtv
 FATE_SEEK_LAVF-$(CONFIG_YUV4MPEGPIPE_MUXER)                        += yuv4mpeg
 
 fate-seek-lavf-aiff:     SRC = lavf/lavf.aif
@@ -187,6 +210,7 @@ fate-seek-lavf-au:       SRC = lavf/lavf.au
 fate-seek-lavf-avi:      SRC = lavf/lavf.avi
 fate-seek-lavf-bmp:      SRC = images/bmp/%02d.bmp
 fate-seek-lavf-dv_fmt:   SRC = lavf/lavf.dv
+fate-seek-lavf-ffm:      SRC = lavf/lavf.ffm
 fate-seek-lavf-flv_fmt:  SRC = lavf/lavf.flv
 fate-seek-lavf-gif:      SRC = lavf/lavf.gif
 fate-seek-lavf-gxf:      SRC = lavf/lavf.gxf
@@ -198,6 +222,10 @@ fate-seek-lavf-mpg:      SRC = lavf/lavf.mpg
 fate-seek-lavf-mulaw:    SRC = lavf/lavf.ul
 fate-seek-lavf-mxf:      SRC = lavf/lavf.mxf
 fate-seek-lavf-mxf_d10:  SRC = lavf/lavf.mxf_d10
+fate-seek-lavf-mxf_dv25: SRC = lavf/lavf.mxf_dv25
+fate-seek-lavf-mxf_dvcpro50: SRC = lavf/lavf.mxf_dvcpro50
+fate-seek-lavf-mxf_opatom: SRC = lavf/lavf.mxf_opatom
+fate-seek-lavf-mxf_opatom_audio: SRC = lavf/lavf.mxf_opatom_audio
 fate-seek-lavf-nut:      SRC = lavf/lavf.nut
 fate-seek-lavf-ogg:      SRC = lavf/lavf.ogg
 fate-seek-lavf-pbmpipe:  SRC = lavf/pbmpipe.pbm
@@ -214,14 +242,31 @@ fate-seek-lavf-tiff:     SRC = images/tiff/%02d.tiff
 fate-seek-lavf-ts:       SRC = lavf/lavf.ts
 fate-seek-lavf-voc:      SRC = lavf/lavf.voc
 fate-seek-lavf-wav:      SRC = lavf/lavf.wav
+fate-seek-lavf-wtv:      SRC = lavf/lavf.wtv
 fate-seek-lavf-yuv4mpeg: SRC = lavf/lavf.y4m
 
 FATE_SEEK += $(FATE_SEEK_LAVF-yes:%=fate-seek-lavf-%)
 
-$(FATE_SEEK): libavformat/tests/seek$(EXESUF)
-$(FATE_SEEK): CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_PATH)/tests/data/$(SRC)
-$(FATE_SEEK): fate-seek-%: fate-%
+# extra files
+
+FATE_SEEK_EXTRA-$(CONFIG_MP3_DEMUXER)   += fate-seek-extra-mp3
+FATE_SEEK_EXTRA-$(call ALLYES, CACHE_PROTOCOL PIPE_PROTOCOL MP3_DEMUXER) += fate-seek-cache-pipe
+FATE_SEEK_EXTRA-$(CONFIG_MATROSKA_DEMUXER) += fate-seek-mkv-codec-delay
+FATE_SEEK_EXTRA-$(CONFIG_MOV_DEMUXER) += fate-seek-extra-mp4
+
+fate-seek-extra-mp3:  CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_SAMPLES)/gapless/gapless.mp3 -fastseek 1
+fate-seek-extra-mp4:  CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_SAMPLES)/mov/buck480p30_na.mp4 -duration 180 -frames 4
+fate-seek-cache-pipe: CMD = cat $(TARGET_SAMPLES)/gapless/gapless.mp3 | run libavformat/tests/seek$(EXESUF) cache:pipe:0 -read_ahead_limit -1
+fate-seek-mkv-codec-delay:   CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_SAMPLES)/mkv/codec_delay_opus.mkv
+
+FATE_SEEK_EXTRA += $(FATE_SEEK_EXTRA-yes)
+
+
+$(FATE_SEEK) $(FATE_SAMPLES_SEEK) $(FATE_SEEK_EXTRA): libavformat/tests/seek$(EXESUF)
+$(FATE_SEEK) $(FATE_SAMPLES_SEEK): CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_PATH)/tests/data/$(SRC)
+$(FATE_SEEK) $(FATE_SAMPLES_SEEK): fate-seek-%: fate-%
 fate-seek-%: REF = $(SRC_PATH)/tests/ref/seek/$(@:fate-seek-%=%)
 
 FATE_AVCONV += $(FATE_SEEK)
-fate-seek:     $(FATE_SEEK)
+FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_SEEK) $(FATE_SEEK_EXTRA)
+fate-seek:     $(FATE_SEEK) $(FATE_SAMPLES_SEEK) $(FATE_SEEK_EXTRA)
diff --git a/tests/fate/source-check.sh b/tests/fate/source-check.sh
new file mode 100755
index 0000000000..5f3fd8960e
--- /dev/null
+++ b/tests/fate/source-check.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+cd "$1"/..
+
+git show > /dev/null 2> /dev/null || { cat tests/ref/fate/source ; exit 0; }
+
+echo Files without standard license headers:
+git grep -L -E "This file is part of FFmpeg|This file is part of libswresample|"\
+"Permission to use, copy, modify, and/or distribute this software for any|"\
+"Permission is hereby granted, free of charge, to any person|"\
+"Permission is hereby granted to use, copy, modify, and distribute this|"\
+"Permission is granted to anyone to use this software for any purpose|"\
+"This work is licensed under the terms of the GNU GPL|"\
+"Redistribution and use in source and binary forms, with or without modification|"\
+"This library is free software; you can redistribute it and/or|"\
+"This program is free software; you can redistribute it and/or modify|"\
+"This file is placed in the public domain" | grep -E '\.c$|\.h$|\.S$|\.asm$'
+
+echo Headers without standard inclusion guards:
+for f in `git ls-files | grep '\.h$'` ; do
+    macro="`echo $f | sed \
+        -e 's/^lib//' \
+        -e 's/[^A-Za-z0-9]\{1,\}/_/g' \
+        -e 's/_af_/_/' \
+        -e 's/_vf_/_/' \
+        -e 's/_avf_/_/' \
+        -e 's/_vaf_/_/' \
+    | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
+
+    git grep -L "^#define $macro$" $f
+done
+
+echo "Use of av_clip() where av_clip_uintp2() could be used:"
+git grep -E 'av_clip *\(.*, *0 *, *(3|7|15|31|63|127|255|511|1023|2047|4095|8191|'\
+'16383|32767|65535|131071|262143|524287|1048575|2097151|4194303|8388607|16777215|'\
+'33554431|67108863|134217727|268435455|536870911|1073741823) *\)' | grep -v fate/source
+
+echo "Use of av_clip() where av_clip_intp2() could be used:"
+git grep -E 'av_clip *\(.*, *(-2 *, *1|-4 *, *3|-8 *, *7|-16 *, *15|-32 *, *31|-64'\
+' *, *63|-128 *, *127|-256 *, *255|-512 *, *511|-1024 *, *1023|-2048 *, *2047|-4096'\
+' *, *4095|-8192 *, *8191|-16384 *, *16383|-32768 *, *32767|-65536 *, *65535|-131072'\
+' *, *131071|-262144 *, *262143|-524288 *, *524287|-1048576 *, *1048575|-2097152 *,'\
+' *2097151|-4194304 *, *4194303|-8388608 *, *8388607|-16777216 *, *16777215|-33554432'\
+' *, *33554431|-67108864 *, *67108863|-134217728 *, *134217727|-268435456 *, *'\
+'268435455|-536870912 *, *536870911|-1073741824 *, *1073741823) *\)'| grep -v fate/source
+
+exit 0
diff --git a/tests/fate/source.mak b/tests/fate/source.mak
new file mode 100644
index 0000000000..465ef8525b
--- /dev/null
+++ b/tests/fate/source.mak
@@ -0,0 +1,3 @@
+
+FATE += fate-source
+fate-source: CMD = runlocal fate/source-check.sh
diff --git a/tests/fate/speedhq.mak b/tests/fate/speedhq.mak
new file mode 100644
index 0000000000..32405b710f
--- /dev/null
+++ b/tests/fate/speedhq.mak
@@ -0,0 +1,8 @@
+FATE_SPEEDHQ = fate-speedhq-422                                           \
+               fate-speedhq-422-singlefield
+
+fate-speedhq-422:             CMD = framecrc -flags +bitexact -f rawvideo -c:v speedhq -tag:v SHQ2 -video_size 112x64 -i $(TARGET_SAMPLES)/speedhq/progressive.shq2 -pix_fmt yuv422p
+fate-speedhq-422-singlefield: CMD = framecrc -flags +bitexact -f rawvideo -c:v speedhq -tag:v SHQ2 -video_size 112x32 -i $(TARGET_SAMPLES)/speedhq/singlefield.shq2 -pix_fmt yuv422p
+
+FATE_SAMPLES_FFMPEG-$(call DEMDEC, RAWVIDEO, SPEEDHQ) += $(FATE_SPEEDHQ)
+fate-speedhq: $(FATE_SPEEDHQ)
diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak
new file mode 100644
index 0000000000..8c310adeff
--- /dev/null
+++ b/tests/fate/subtitles.mak
@@ -0,0 +1,109 @@
+FATE_SUBTITLES_ASS-$(call ALLYES, AQTITLE_DEMUXER TEXT_DECODER ICONV) += fate-sub-aqtitle
+fate-sub-aqtitle: CMD = fmtstdout ass -sub_charenc windows-1250 -i $(TARGET_SAMPLES)/sub/AQTitle_capability_tester.aqt
+
+FATE_SUBTITLES_ASS-$(call ALLYES, AVDEVICE LAVFI_INDEV CCAPTION_DECODER MOVIE_FILTER MPEGTS_DEMUXER) += fate-sub-cc
+fate-sub-cc: CMD = fmtstdout ass -f lavfi -i "movie=$(TARGET_SAMPLES)/sub/Closedcaption_rollup.m2v[out0+subcc]"
+
+FATE_SUBTITLES_ASS-$(call ALLYES, AVDEVICE LAVFI_INDEV CCAPTION_DECODER MOVIE_FILTER MPEGTS_DEMUXER) += fate-sub-cc-realtime
+fate-sub-cc-realtime: CMD = fmtstdout ass -real_time 1 -f lavfi -i "movie=$(TARGET_SAMPLES)/sub/Closedcaption_rollup.m2v[out0+subcc]"
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, ASS, ASS) += fate-sub-ass-to-ass-transcode
+fate-sub-ass-to-ass-transcode: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/1ededcbd7b.ass
+
+FATE_SUBTITLES_ASS-$(CONFIG_ASS_DEMUXER) += fate-sub-ssa-to-ass-remux
+fate-sub-ssa-to-ass-remux: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/a9-misc.ssa -c copy
+
+FATE_SUBTITLES-$(call ALLYES, ASS_DEMUXER, MATROSKA_MUXER) += fate-binsub-mksenc
+fate-binsub-mksenc: CMD = md5pipe -i $(TARGET_SAMPLES)/sub/1ededcbd7b.ass -c copy -f matroska -flags +bitexact -fflags +bitexact
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, JACOSUB, JACOSUB) += fate-sub-jacosub
+fate-sub-jacosub: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/JACOsub_capability_tester.jss
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, MICRODVD, MICRODVD) += fate-sub-microdvd
+fate-sub-microdvd: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MicroDVD_capability_tester.sub
+
+FATE_SUBTITLES-$(call ALLYES, MICRODVD_DEMUXER MICRODVD_MUXER) += fate-sub-microdvd-remux
+fate-sub-microdvd-remux: CMD = fmtstdout microdvd -i $(TARGET_SAMPLES)/sub/MicroDVD_capability_tester.sub -c:s copy
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, MOV, MOVTEXT) += fate-sub-movtext
+fate-sub-movtext: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4
+
+FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-binsub-movtextenc
+fate-binsub-movtextenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -fflags +bitexact -movflags frag_keyframe+empty_moov
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2
+fate-sub-mpl2: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPL2_capability_tester.txt
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, MPSUB, TEXT) += fate-sub-mpsub
+fate-sub-mpsub: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPSub_capability_tester.sub
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, MPSUB, TEXT) += fate-sub-mpsub-frames
+fate-sub-mpsub-frames: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPSub_capability_tester_frames.sub
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, PJS, PJS) += fate-sub-pjs
+fate-sub-pjs: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/PJS_capability_tester.pjs
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, REALTEXT, REALTEXT) += fate-sub-realtext
+fate-sub-realtext: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/RealText_capability_tester.rt
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, SAMI, SAMI) += fate-sub-sami
+fate-sub-sami: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/SAMI_capability_tester.smi
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, SAMI, SAMI) += fate-sub-sami2
+fate-sub-sami2: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/SAMI_multilang_tweak_tester.smi
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, SRT, SUBRIP) += fate-sub-srt
+fate-sub-srt: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, SRT, SUBRIP) += fate-sub-srt-badsyntax
+fate-sub-srt-badsyntax: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/badsyntax.srt
+
+FATE_SUBTITLES-$(call ALLYES, SRT_DEMUXER SUBRIP_DECODER SRT_MUXER) += fate-sub-srt-rrn-remux
+fate-sub-srt-rrn-remux: CMD = fmtstdout srt -i $(TARGET_SAMPLES)/sub/ticket5032-rrn.srt -c:s copy
+
+FATE_SUBTITLES-$(call ALLYES, SRT_DEMUXER SUBRIP_DECODER SRT_MUXER) += fate-sub-srt-madness-timeshift
+fate-sub-srt-madness-timeshift: CMD = fmtstdout srt -itsoffset 3.14 -i $(TARGET_SAMPLES)/sub/madness.srt -c:s copy
+
+FATE_SUBTITLES-$(call ALLYES, SRT_DEMUXER SUBRIP_DECODER SRT_MUXER) += fate-sub-srt-empty-events
+fate-sub-srt-empty-events: CMD = fmtstdout srt -i $(TARGET_SAMPLES)/sub/empty-events-2167.srt -c:s copy
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, STL, STL) += fate-sub-stl
+fate-sub-stl: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/STL_capability_tester.stl
+
+FATE_SUBTITLES-$(call ALLYES, MOV_DEMUXER MOVTEXT_DECODER SUBRIP_ENCODER SRT_MUXER) += fate-sub-subripenc
+fate-sub-subripenc: CMD = fmtstdout srt -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -scodec subrip
+
+FATE_SUBTITLES_ASS-$(call ALLYES, SUBVIEWER1_DEMUXER SUBVIEWER1_DECODER ICONV) += fate-sub-subviewer1
+fate-sub-subviewer1: CMD = fmtstdout ass -sub_charenc windows-1250 -i $(TARGET_SAMPLES)/sub/SubViewer1_capability_tester.sub
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, SUBVIEWER, SUBVIEWER) += fate-sub-subviewer
+fate-sub-subviewer: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/SubViewer_capability_tester.sub
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, VPLAYER, VPLAYER) += fate-sub-vplayer
+fate-sub-vplayer: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/VPlayer_capability_tester.txt
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, WEBVTT, WEBVTT) += fate-sub-webvtt
+fate-sub-webvtt: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/WebVTT_capability_tester.vtt
+
+FATE_SUBTITLES_ASS-$(call DEMDEC, WEBVTT, WEBVTT) += fate-sub-webvtt2
+fate-sub-webvtt2: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/WebVTT_extended_tester.vtt
+
+FATE_SUBTITLES-$(call ALLYES, SRT_DEMUXER SUBRIP_DECODER WEBVTT_ENCODER WEBVTT_MUXER) += fate-sub-webvttenc
+fate-sub-webvttenc: CMD = fmtstdout webvtt -i $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt
+
+FATE_SUBTITLES-$(call ALLYES, SRT_DEMUXER SUBRIP_DECODER TEXT_ENCODER SRT_MUXER) += fate-sub-textenc
+fate-sub-textenc: CMD = fmtstdout srt -i $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt -c:s text
+
+FATE_SUBTITLES_ASS-$(call ALLYES, MICRODVD_DEMUXER MICRODVD_DECODER ICONV) += fate-sub-charenc
+fate-sub-charenc: CMD = fmtstdout ass -sub_charenc cp1251 -i $(TARGET_SAMPLES)/sub/cp1251-subtitles.sub
+
+FATE_SUBTITLES-$(call DEMDEC, SCC, CCAPTION) += fate-sub-scc
+fate-sub-scc: CMD = fmtstdout ass -ss 57 -i $(TARGET_SAMPLES)/sub/witch.scc
+
+FATE_SUBTITLES-$(call ENCMUX, ASS, ASS) += $(FATE_SUBTITLES_ASS-yes)
+FATE_SUBTITLES += $(FATE_SUBTITLES-yes)
+
+fate-sub-%: CMP = rawdiff
+
+FATE_SAMPLES_FFMPEG += $(FATE_SUBTITLES)
+fate-subtitles: $(FATE_SUBTITLES)
diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak
index cbd7ad117b..2cf06b36f5 100644
--- a/tests/fate/utvideo.mak
+++ b/tests/fate/utvideo.mak
@@ -28,7 +28,7 @@ fate-utvideo_yuv422_median: CMD = framecrc -i $(TARGET_SAMPLES)/utvideo/utvideo_
 FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, UTVIDEO) += $(FATE_UTVIDEO)
 fate-utvideo: $(FATE_UTVIDEO)
 
-fate-utvideoenc%: CMD = framemd5 -f image2 -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -c:v utvideo -slices 1 -f avi -sws_flags +accurate_rnd+bitexact ${OPTS}
+fate-utvideoenc%: CMD = framemd5 -f image2 -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -c:v utvideo -slices 1 -sws_flags +accurate_rnd+bitexact ${OPTS}
 
 FATE_UTVIDEOENC += fate-utvideoenc_rgba_left
 fate-utvideoenc_rgba_left: OPTS = -pix_fmt rgba -pred left
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index e195254a48..c0344550f9 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -1,40 +1,132 @@
 fate-vsynth1-%: SRC = tests/data/vsynth1.yuv
 fate-vsynth2-%: SRC = tests/data/vsynth2.yuv
+fate-vsynth_lena-%: SRC = tests/data/vsynth_lena.yuv
+fate-vsynth3-%: SRC = tests/data/vsynth3.yuv
 fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@)))
 fate-vsynth%: FMT = avi
-fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p $(DECOPTS)" -keep
+fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)"
+fate-vsynth3-%: CMD = enc_dec "rawvideo -s $(FATEW)x$(FATEH) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s $(FATEW)x$(FATEH) -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)"
 fate-vsynth%: CMP_UNIT = 1
 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)
 
+FATE_VCODEC-$(call ENCDEC, AMV, AVI) += amv
+fate-vsynth%-amv:                ENCOPTS = -strict -1
+
 FATE_VCODEC-$(call ENCDEC, ASV1, AVI)   += asv1
 fate-vsynth%-asv1:               ENCOPTS = -qscale 10
 
 FATE_VCODEC-$(call ENCDEC, ASV2, AVI)   += asv2
 fate-vsynth%-asv2:               ENCOPTS = -qscale 10
 
+FATE_VCODEC-$(call ENCDEC, CINEPAK, MOV) += cinepak
+fate-vsynth%-cinepak:            ENCOPTS  = -c:v cinepak -frames 3
+fate-vsynth%-cinepak:            FMT      = mov
+
 FATE_VCODEC-$(call ENCDEC, CLJR, AVI)   += cljr
+fate-vsynth%-cljr:               ENCOPTS = -strict -1
 
 FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p                  \
                                             dnxhd-720p-rd               \
-                                            dnxhd-720p-10bit
+                                            dnxhd-720p-10bit            \
+                                            dnxhd-720p-hr-lb            \
+                                            dnxhd-4k-hr-lb              \
+                                            dnxhd-uhd-hr-sq             \
+                                            dnxhd-2k-hr-hq              \
+                                            dnxhd-edge1-hr              \
+                                            dnxhd-edge2-hr              \
+                                            dnxhd-edge3-hr
+
+FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p vc2-420p10 vc2-420p12 \
+                                              vc2-422p vc2-422p10 vc2-422p12 \
+                                              vc2-444p vc2-444p10 vc2-444p12
+fate-vsynth1-vc2-%:              FMT      = mov
+fate-vsynth1-vc2-%:              ENCOPTS = -pix_fmt yuv$(@:fate-vsynth1-vc2-%=%) \
+                                           -c:v vc2 -frames 5 -strict -1
+fate-vsynth2-vc2-%:              FMT      = mov
+fate-vsynth2-vc2-%:              ENCOPTS = -pix_fmt yuv$(@:fate-vsynth2-vc2-%=%) \
+                                           -c:v vc2 -frames 5 -strict -1
+fate-vsynth_lena-vc2-%:          FMT      = mov
+fate-vsynth_lena-vc2-%:          ENCOPTS = -pix_fmt yuv$(@:fate-vsynth_lena-vc2-%=%) \
+                                           -c:v vc2 -frames 5 -strict -1
 
 fate-vsynth%-dnxhd-720p:         ENCOPTS = -s hd720 -b 90M              \
-                                           -pix_fmt yuv422p -frames 5
+                                           -pix_fmt yuv422p -frames 5 -qmax 8
 fate-vsynth%-dnxhd-720p:         FMT     = dnxhd
 
 fate-vsynth%-dnxhd-720p-rd:      ENCOPTS = -s hd720 -b 90M -threads 4 -mbd rd \
-                                           -pix_fmt yuv422p -frames 5
+                                           -pix_fmt yuv422p -frames 5 -qmax 8
 fate-vsynth%-dnxhd-720p-rd:      FMT     = dnxhd
 
 fate-vsynth%-dnxhd-720p-10bit:   ENCOPTS = -s hd720 -b 90M              \
-                                           -pix_fmt yuv422p10 -frames 5
+                                           -pix_fmt yuv422p10 -frames 5 -qmax 8
 fate-vsynth%-dnxhd-720p-10bit:   FMT     = dnxhd
 
-FATE_VCODEC-$(call ENCDEC, DNXHD, MOV)  += dnxhd-1080i
-fate-vsynth%-dnxhd-1080i:        ENCOPTS = -s hd1080 -b 120M -flags +ildct \
+fate-vsynth%-dnxhd-720p-hr-lb: ENCOPTS   = -s hd720 -profile:v dnxhr_lb \
+                                           -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-720p-hr-lb: DECOPTS    = -sws_flags area+accurate_rnd+bitexact
+fate-vsynth%-dnxhd-720p-hr-lb: FMT       = dnxhd
+
+fate-vsynth%-dnxhd-4k-hr-lb:  ENCOPTS    = -s 4k -profile:v dnxhr_lb \
+                                           -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-4k-hr-lb:  DECOPTS    = -sws_flags area+accurate_rnd+bitexact
+fate-vsynth%-dnxhd-4k-hr-lb:  FMT        = dnxhd
+
+fate-vsynth%-dnxhd-uhd-hr-sq: ENCOPTS    = -s uhd2160 -profile:v dnxhr_sq \
+                                           -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-uhd-hr-sq: DECOPTS    = -sws_flags area+accurate_rnd+bitexact
+fate-vsynth%-dnxhd-uhd-hr-sq: FMT        = dnxhd
+
+fate-vsynth%-dnxhd-2k-hr-hq:  ENCOPTS    = -s 2k -profile:v dnxhr_hq \
+                                         -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-2k-hr-hq:  DECOPTS    = -sws_flags area+accurate_rnd+bitexact
+fate-vsynth%-dnxhd-2k-hr-hq:  FMT        = dnxhd
+
+fate-vsynth%-dnxhd-edge1-hr:  ENCOPTS    = -s 264x128 -profile:v dnxhr_hq \
                                            -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-edge1-hr:  DECOPTS    = -sws_flags area+accurate_rnd+bitexact
+fate-vsynth%-dnxhd-edge1-hr:  FMT        = dnxhd
+
+fate-vsynth%-dnxhd-edge2-hr:  ENCOPTS    = -s 271x135 -profile:v dnxhr_hq \
+                                           -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-edge2-hr:  DECOPTS    = -sws_flags area+accurate_rnd+bitexact
+fate-vsynth%-dnxhd-edge2-hr:  FMT        = dnxhd
+
+fate-vsynth%-dnxhd-edge3-hr:  ENCOPTS    = -s 257x121 -profile:v dnxhr_hq \
+                                           -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-edge3-hr:  DECOPTS    = -sws_flags area+accurate_rnd+bitexact
+fate-vsynth%-dnxhd-edge3-hr:  FMT        = dnxhd
+
+FATE_VCODEC-$(call ENCDEC, DNXHD, MOV)  += dnxhd-1080i dnxhd-1080i-10bit dnxhd-1080i-colr \
+                                           dnxhd-hr-lb-mov dnxhd-hr-sq-mov dnxhd-hr-hq-mov
+fate-vsynth%-dnxhd-1080i:        ENCOPTS = -s hd1080 -b 120M -flags +ildct \
+                                           -pix_fmt yuv422p -frames 5 -qmax 8
 fate-vsynth%-dnxhd-1080i:        FMT     = mov
 
+fate-vsynth%-dnxhd-1080i-10bit:  ENCOPTS = -s hd1080 -b 185M -flags +ildct \
+                                           -pix_fmt yuv422p10 -frames 5 -qmax 8
+fate-vsynth%-dnxhd-1080i-10bit:  DECOPTS = -sws_flags area+accurate_rnd+bitexact
+fate-vsynth%-dnxhd-1080i-10bit:  FMT     = mov
+
+fate-vsynth%-dnxhd-1080i-colr:   ENCOPTS = -s hd1080 -b 120M -flags +ildct -movflags write_colr \
+                                           -pix_fmt yuv422p -frames 5 -qmax 8
+fate-vsynth%-dnxhd-1080i-colr:   DECOPTS = -sws_flags area+accurate_rnd+bitexact
+fate-vsynth%-dnxhd-1080i-colr:   FMT     = mov
+
+fate-vsynth%-dnxhd-hr-lb-mov:   ENCOPTS = -s uhd2160 -profile:v dnxhr_lb \
+                                           -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-hr-lb-mov:   DECOPTS = -sws_flags area+accurate_rnd+bitexact
+fate-vsynth%-dnxhd-hr-lb-mov:   FMT     = mov
+
+fate-vsynth%-dnxhd-hr-sq-mov:   ENCOPTS = -s 2kscope -profile:v dnxhr_sq \
+                                           -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-hr-sq-mov:   DECOPTS = -sws_flags area+accurate_rnd+bitexact
+fate-vsynth%-dnxhd-hr-sq-mov:   FMT     = mov
+
+fate-vsynth%-dnxhd-hr-hq-mov:   ENCOPTS = -s 2kflat -profile:v dnxhr_hq \
+                                           -pix_fmt yuv422p -frames 5
+fate-vsynth%-dnxhd-hr-hq-mov:   DECOPTS = -sws_flags area+accurate_rnd+bitexact
+fate-vsynth%-dnxhd-hr-hq-mov:   FMT     = mov
+
 FATE_VCODEC-$(call ENCDEC, DVVIDEO, DV) += dv dv-411 dv-50
 fate-vsynth%-dv:                 CODEC   = dvvideo
 fate-vsynth%-dv:                 ENCOPTS = -dct int -s pal
@@ -52,41 +144,82 @@ fate-vsynth%-dv-50:              ENCOPTS = -dct int -s pal -pix_fmt yuv422p \
 fate-vsynth%-dv-50:              DECOPTS = -sws_flags neighbor
 fate-vsynth%-dv-50:              FMT     = dv
 
-FATE_VCODEC-$(call ENCDEC, FFV1, AVI)   += ffv1
-fate-vsynth%-ffv1:               ENCOPTS = -slices 4 -strict -2
-
-FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff
+FATE_VCODEC-$(call ENCDEC, FFV1, AVI)   += ffv1 ffv1-v0 \
+                                           ffv1-v3-yuv420p ffv1-v3-yuv422p10 ffv1-v3-yuv444p16 \
+                                           ffv1-v3-bgr0 ffv1-v3-rgb48
+fate-vsynth%-ffv1:               ENCOPTS = -slices 4
+fate-vsynth%-ffv1-v0:            CODEC   = ffv1
+fate-vsynth%-ffv1-v3-yuv420p:    ENCOPTS = -level 3 -pix_fmt yuv420p
+fate-vsynth%-ffv1-v3-yuv422p10:  ENCOPTS = -level 3 -pix_fmt yuv422p10 \
+                                           -sws_flags neighbor+bitexact
+fate-vsynth%-ffv1-v3-yuv422p10:  DECOPTS = -sws_flags neighbor+bitexact
+fate-vsynth%-ffv1-v3-yuv444p16:  ENCOPTS = -level 3 -pix_fmt yuv444p16 \
+                                           -sws_flags neighbor+bitexact
+fate-vsynth%-ffv1-v3-yuv444p16:  DECOPTS = -sws_flags neighbor+bitexact
+fate-vsynth%-ffv1-v3-bgr0:       ENCOPTS = -level 3 -pix_fmt bgr0 \
+                                           -sws_flags neighbor+bitexact
+fate-vsynth%-ffv1-v3-bgr0:       DECOPTS = -sws_flags neighbor+bitexact
+fate-vsynth%-ffv1-v3-rgb48:      ENCOPTS = -level 3 -pix_fmt rgb48 -strict -2 \
+                                           -sws_flags neighbor+bitexact
+fate-vsynth%-ffv1-v3-rgb48:      DECOPTS = -sws_flags neighbor+bitexact
+
+FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16
+fate-vsynth%-ffvhuff444:         ENCOPTS = -c:v ffvhuff -pix_fmt yuv444p
+fate-vsynth%-ffvhuff420p12:      ENCOPTS = -c:v ffvhuff -pix_fmt yuv420p12le
+fate-vsynth%-ffvhuff422p10left:  ENCOPTS = -c:v ffvhuff -pix_fmt yuv422p10le -pred left
+fate-vsynth%-ffvhuff444p16:      ENCOPTS = -c:v ffvhuff -pix_fmt yuv444p16le -pred plane
 
 FATE_VCODEC-$(call ENCDEC, FLASHSV, FLV) += flashsv
 fate-vsynth%-flashsv:            ENCOPTS = -sws_flags neighbor+full_chroma_int
 fate-vsynth%-flashsv:            DECOPTS = -sws_flags area
 fate-vsynth%-flashsv:            FMT     = flv
 
+FATE_VCODEC-$(call ENCDEC, FLASHSV2, FLV) += flashsv2
+fate-vsynth%-flashsv2:           ENCOPTS = -sws_flags neighbor+full_chroma_int -strict experimental -compression_level 0
+fate-vsynth%-flashsv2:           DECOPTS = -sws_flags area
+fate-vsynth%-flashsv2:           FMT     = flv
+
 FATE_VCODEC-$(call ENCDEC, FLV, FLV)    += flv
 fate-vsynth%-flv:                ENCOPTS = -qscale 10
 fate-vsynth%-flv:                FMT     = flv
 
-FATE_VCODEC-$(call ENCDEC, H261, AVI)   += h261
+FATE_VCODEC-$(call ENCDEC, H261, AVI)   += h261 h261-trellis
 fate-vsynth%-h261:               ENCOPTS = -qscale 11
+fate-vsynth%-h261-trellis:       ENCOPTS = -qscale 12 -trellis 1 -mbd rd
 
 FATE_VCODEC-$(call ENCDEC, H263, AVI)   += h263 h263-obmc h263p
 fate-vsynth%-h263:               ENCOPTS = -qscale 10
 fate-vsynth%-h263-obmc:          ENCOPTS = -qscale 10 -obmc 1
 fate-vsynth%-h263p:              ENCOPTS = -qscale 2 -flags +aic -umv 1 -aiv 1 -ps 300
 
-FATE_VCODEC-$(call ENCDEC, HUFFYUV, AVI) += huffyuv
-fate-vsynth%-huffyuv:            ENCOPTS = -pix_fmt yuv422p -sws_flags neighbor
-fate-vsynth%-huffyuv:            DECOPTS = -strict -2 -sws_flags neighbor
+FATE_VCODEC-$(call ENCDEC, HUFFYUV, AVI) += huffyuv huffyuvbgr24 huffyuvbgra
+fate-vsynth%-huffyuv:            ENCOPTS = -c:v huffyuv -pix_fmt yuv422p -sws_flags neighbor
+fate-vsynth%-huffyuv:            DECOPTS = -sws_flags neighbor
+fate-vsynth%-huffyuvbgr24:       ENCOPTS = -c:v huffyuv -pix_fmt bgr24 -sws_flags neighbor
+fate-vsynth%-huffyuvbgr24:       DECOPTS = -sws_flags neighbor
+fate-vsynth%-huffyuvbgra:        ENCOPTS = -c:v huffyuv -pix_fmt bgr32 -sws_flags neighbor
+fate-vsynth%-huffyuvbgra:        DECOPTS = -sws_flags neighbor
 
 FATE_VCODEC-$(call ENCDEC, JPEGLS, AVI) += jpegls
 fate-vsynth%-jpegls:             ENCOPTS = -sws_flags neighbor+full_chroma_int
 fate-vsynth%-jpegls:             DECOPTS = -sws_flags area
 
+FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97
+fate-vsynth%-jpeg2000:                ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24
+fate-vsynth%-jpeg2000:                DECINOPTS = -c:v jpeg2000
+fate-vsynth%-jpeg2000-97:             ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
+fate-vsynth%-jpeg2000-97:             DECINOPTS = -c:v jpeg2000
+
 FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg
 fate-vsynth%-ljpeg:              ENCOPTS = -strict -1
 
-FATE_VCODEC-$(call ENCDEC, MJPEG, AVI)  += mjpeg
-fate-vsynth%-mjpeg:              ENCOPTS = -qscale 9 -pix_fmt yuvj420p
+FATE_VCODEC-$(call ENCDEC, MJPEG, AVI)  += mjpeg mjpeg-422 mjpeg-444 mjpeg-trell mjpeg-huffman mjpeg-trell-huffman
+fate-vsynth%-mjpeg:                   ENCOPTS = -qscale 9 -pix_fmt yuvj420p
+fate-vsynth%-mjpeg-422:               ENCOPTS = -qscale 9 -pix_fmt yuvj422p
+fate-vsynth%-mjpeg-444:               ENCOPTS = -qscale 9 -pix_fmt yuvj444p
+fate-vsynth%-mjpeg-trell:             ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1
+fate-vsynth%-mjpeg-huffman:           ENCOPTS = -qscale 9 -pix_fmt yuvj420p -huffman optimal
+fate-vsynth%-mjpeg-trell-huffman:     ENCOPTS = -qscale 9 -pix_fmt yuvj420p -trellis 1 -huffman optimal
 
 FATE_VCODEC-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += mpeg1 mpeg1b
 fate-vsynth%-mpeg1:              FMT     = mpeg1video
@@ -141,7 +274,8 @@ FATE_MPEG4_AVI = mpeg4-rc                                               \
                  mpeg4-qpel                                             \
                  mpeg4-thread                                           \
                  mpeg4-error                                            \
-                 mpeg4-nr
+                 mpeg4-nr                                               \
+                 mpeg4-nsse
 
 FATE_VCODEC-$(call ENCDEC, MPEG4, MP4 MOV) += $(FATE_MPEG4_MP4)
 FATE_VCODEC-$(call ENCDEC, MPEG4, AVI)     += $(FATE_MPEG4_AVI)
@@ -165,6 +299,10 @@ fate-vsynth%-mpeg4-error:        ENCOPTS = -qscale 7 -flags +mv4+aic    \
 fate-vsynth%-mpeg4-nr:           ENCOPTS = -qscale 8 -flags +mv4 -mbd rd \
                                            -noise_reduction 200
 
+fate-vsynth%-mpeg4-nsse:         ENCOPTS = -qscale 7 -cmp nsse -subcmp nsse \
+                                           -mbcmp nsse -precmp nsse         \
+                                           -skipcmp nsse
+
 fate-vsynth%-mpeg4-qpel:         ENCOPTS = -qscale 7 -flags +mv4+qpel -mbd 2 \
                                            -bf 2 -cmp 1 -subcmp 2
 
@@ -185,20 +323,47 @@ fate-vsynth%-msmpeg4:            ENCOPTS = -qscale 10
 FATE_VCODEC-$(call ENCDEC, MSMPEG4V2, AVI) += msmpeg4v2
 fate-vsynth%-msmpeg4v2:          ENCOPTS = -qscale 10
 
-FATE_VCODEC-$(call ENCDEC, PRORES, MOV) += prores
-fate-vsynth%-prores:             ENCOPTS = -profile hq
+FATE_VCODEC-$(call ENCDEC, PNG, AVI)    += mpng
+fate-vsynth%-mpng:               CODEC   = png
+
+FATE_VCODEC-$(call ENCDEC, MSVIDEO1, AVI) += msvideo1
+
+FATE_VCODEC-$(call ENCDEC, PRORES, MOV) += prores prores_ks
 fate-vsynth%-prores:             FMT     = mov
 
-FATE_VCODEC-$(call ENCDEC, QTRLE, MOV)  += qtrle
+fate-vsynth%-prores_ks:          ENCOPTS = -profile hq
+fate-vsynth%-prores_ks:          FMT     = mov
+
+FATE_VCODEC-$(call ENCDEC, QTRLE, MOV)  += qtrle qtrlegray
 fate-vsynth%-qtrle:              FMT     = mov
 
-FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += rgb
+fate-vsynth%-qtrlegray:          CODEC   = qtrle
+fate-vsynth%-qtrlegray:          ENCOPTS = -pix_fmt gray
+fate-vsynth%-qtrlegray:          FMT     = mov
+
+FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += rgb bpp1 bpp15
 fate-vsynth%-rgb:                CODEC   = rawvideo
 fate-vsynth%-rgb:                ENCOPTS = -pix_fmt bgr24
+fate-vsynth%-bpp1:               CODEC   = rawvideo
+fate-vsynth%-bpp1:               ENCOPTS = -pix_fmt monow
+fate-vsynth%-bpp15:              CODEC   = rawvideo
+fate-vsynth%-bpp15:              ENCOPTS = -pix_fmt bgr555le
+
+FATE_VCODEC-$(call ENCDEC, RAWVIDEO, MOV) += mov-bgr24 mov-bpp15 mov-bpp16
+fate-vsynth%-mov-bgr24:          CODEC   = rawvideo
+fate-vsynth%-mov-bgr24:          ENCOPTS = -pix_fmt bgr24
+fate-vsynth%-mov-bgr24:          FMT      = mov
+fate-vsynth%-mov-bpp15:          CODEC   = rawvideo
+fate-vsynth%-mov-bpp15:          ENCOPTS = -pix_fmt rgb555le
+fate-vsynth%-mov-bpp15:          FMT      = mov
+fate-vsynth%-mov-bpp16:          CODEC   = rawvideo
+fate-vsynth%-mov-bpp16:          ENCOPTS = -pix_fmt rgb565le
+fate-vsynth%-mov-bpp16:          FMT      = mov
 
 FATE_VCODEC-$(call ENCDEC, ROQ, ROQ)    += roqvideo
 fate-vsynth%-roqvideo:           CODEC   = roqvideo
 fate-vsynth%-roqvideo:           ENCOPTS = -frames 5
+fate-vsynth%-roqvideo:           RAWDECOPTS = -r 30
 fate-vsynth%-roqvideo:           FMT     = roq
 
 FATE_VCODEC-$(call ENCDEC, RV10, RM)    += rv10
@@ -209,13 +374,38 @@ FATE_VCODEC-$(call ENCDEC, RV20, RM)    += rv20
 fate-vsynth%-rv20:               ENCOPTS = -qscale 10
 fate-vsynth%-rv20:               FMT     = rm
 
+FATE_VCODEC-$(call ENCDEC, SNOW, AVI)   += snow snow-hpel snow-ll
+fate-vsynth%-snow:               ENCOPTS = -qscale 2 -flags +qpel \
+                                           -motion_est iter -dia_size 2      \
+                                           -cmp 12 -subcmp 12 -s 128x64
+
+fate-vsynth%-snow-hpel:          ENCOPTS = -qscale 2              \
+                                           -motion_est iter -dia_size 2      \
+                                           -cmp 12 -subcmp 12 -s 128x64
+
+fate-vsynth%-snow-ll:            ENCOPTS = -qscale .001 -pred 1 \
+                                           -flags +mv4+qpel
+
 FATE_VCODEC-$(call ENCDEC, SVQ1, MOV)   += svq1
 fate-vsynth%-svq1:               ENCOPTS = -qscale 3 -pix_fmt yuv410p
 fate-vsynth%-svq1:               FMT     = mov
 
+FATE_VCODEC-$(call ENCDEC, R210, AVI)   += r210
+
 FATE_VCODEC-$(call ENCDEC, V210, AVI)   += v210 v210-10
 fate-vsynth%-v210-10:            ENCOPTS = -pix_fmt yuv422p10
 
+FATE_VCODEC-$(call ENCDEC, V308, AVI)   += v308
+
+FATE_VCODEC-$(call ENCDEC, V408, AVI)   += v408
+fate-vsynth%-v408:               ENCOPTS = -sws_flags neighbor+bitexact
+fate-vsynth%-v408:               DECOPTS = -sws_flags neighbor+bitexact
+
+FATE_VCODEC-$(call ENCDEC, AVUI, MOV)   += avui
+fate-vsynth%-avui:               ENCOPTS = -s pal -strict experimental -sws_flags neighbor+bitexact
+fate-vsynth%-avui:               DECOPTS = -sws_flags neighbor+bitexact
+fate-vsynth%-avui:               FMT     = mov
+
 FATE_VCODEC-$(call ENCDEC, WMV1, AVI)   += wmv1
 fate-vsynth%-wmv1:               ENCOPTS = -qscale 10
 
@@ -225,15 +415,44 @@ fate-vsynth%-wmv2:               ENCOPTS = -qscale 10
 FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv
 fate-vsynth%-yuv:                CODEC = rawvideo
 
+FATE_VCODEC-$(call ENCDEC, XFACE, NUT) += xface
+fate-vsynth%-xface:              ENCOPTS = -s 48x48 -sws_flags neighbor+bitexact
+fate-vsynth%-xface:              DECOPTS = -sws_flags neighbor+bitexact
+fate-vsynth%-xface:              FMT = nut
+
+FATE_VCODEC-$(call ENCDEC, YUV4, AVI) += yuv4
+
+FATE_VCODEC-$(call ENCDEC, Y41P, AVI) += y41p
+
+FATE_VCODEC-$(call ENCDEC, ZLIB, AVI) += zlib
+
 FATE_VCODEC += $(FATE_VCODEC-yes)
 FATE_VSYNTH1 = $(FATE_VCODEC:%=fate-vsynth1-%)
 FATE_VSYNTH2 = $(FATE_VCODEC:%=fate-vsynth2-%)
+FATE_VSYNTH_LENA = $(FATE_VCODEC:%=fate-vsynth_lena-%)
+# Redundant tests because they just resize the input
+RESIZE_OFF   = dnxhd-720p dnxhd-720p-rd dnxhd-720p-10bit dnxhd-1080i \
+               dv dv-411 dv-50 avui snow snow-hpel snow-ll vc2-420p \
+               vc2-420p10 vc2-420p12 vc2-422p vc2-422p10 vc2-422p12 \
+               vc2-444p vc2-444p10 vc2-444p12
+# Incorrect parameters - usually size or color format restrictions
+INC_PAR_OFF  = cinepak h261 h261-trellis h263 h263p h263-obmc msvideo1 \
+               roqvideo rv10 rv20 y41p qtrlegray
+VSYNTH3_OFF  = $(RESIZE_OFF) $(INC_PAR_OFF)
+
+FATE_VCODEC3 = $(filter-out $(VSYNTH3_OFF),$(FATE_VCODEC))
+FATE_VSYNTH3 = $(FATE_VCODEC3:%=fate-vsynth3-%)
 
 $(FATE_VSYNTH1): tests/data/vsynth1.yuv
 $(FATE_VSYNTH2): tests/data/vsynth2.yuv
+$(FATE_VSYNTH_LENA): tests/data/vsynth_lena.yuv
+$(FATE_VSYNTH3): tests/data/vsynth3.yuv
 
-FATE_AVCONV += $(FATE_VSYNTH1) $(FATE_VSYNTH2)
+FATE_AVCONV += $(FATE_VSYNTH1) $(FATE_VSYNTH2) $(FATE_VSYNTH3)
+FATE_SAMPLES_AVCONV += $(FATE_VSYNTH_LENA)
 
 fate-vsynth1: $(FATE_VSYNTH1)
 fate-vsynth2: $(FATE_VSYNTH2)
-fate-vcodec:  fate-vsynth1 fate-vsynth2
+fate-vsynth_lena: $(FATE_VSYNTH_LENA)
+fate-vsynth3: $(FATE_VSYNTH3)
+fate-vcodec:  fate-vsynth1 fate-vsynth_lena fate-vsynth2 fate-vsynth3
diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index 379eb2b0b3..c7f2dcea9e 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -4,40 +4,49 @@ fate-4xm-1: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/version1.4xm -pix_fmt rgb24
 FATE_4XM += fate-4xm-2
 fate-4xm-2: CMD = framecrc -i $(TARGET_SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, FOURXM, FOURXM) += $(FATE_4XM)
+FATE_VIDEO-$(call DEMDEC, FOURXM, FOURXM) += $(FATE_4XM)
 fate-4xm: $(FATE_4XM)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, AASC) += fate-aasc
+FATE_VIDEO-$(call DEMDEC, AVI, ZERO12V) += fate-012v
+fate-012v: CMD = framecrc -i $(TARGET_SAMPLES)/012v/sample.avi -pix_fmt yuv422p16le
+
+FATE_VIDEO-$(call DEMDEC, AVI, AASC) += fate-aasc
 fate-aasc: CMD = framecrc -i $(TARGET_SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, AIC) += fate-aic-oddsize
+FATE_VIDEO-$(call DEMDEC, MOV, AIC) += fate-aic
+fate-aic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/aic/small_apple_intermediate_codec.mov -an -frames:v 15
+
+FATE_VIDEO-$(call DEMDEC, MOV, AIC) += fate-aic-oddsize
 fate-aic-oddsize: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/aic/aic_odd_dimensions.mov
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MM, MMVIDEO) += fate-alg-mm
+FATE_VIDEO-$(call DEMDEC, MM, MMVIDEO) += fate-alg-mm
 fate-alg-mm: CMD = framecrc -i $(TARGET_SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, AMV) += fate-amv
+FATE_VIDEO-$(call DEMDEC, AVI, AMV) += fate-amv
 fate-amv: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, TTY, ANSI) += fate-ansi
+FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi
 fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(TARGET_SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, RPL, ESCAPE124) += fate-armovie-escape124
+FATE_VIDEO-$(call DEMDEC, TTY, ANSI) += fate-ansi256
+fate-ansi256: CMD = framecrc -chars_per_frame 44100 -i $(TARGET_SAMPLES)/ansi/ansi256.ans -pix_fmt rgb24
+
+FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE124) += fate-armovie-escape124
 fate-armovie-escape124: CMD = framecrc -i $(TARGET_SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, RPL, ESCAPE130) += fate-armovie-escape130
+FATE_VIDEO-$(call DEMDEC, RPL, ESCAPE130) += fate-armovie-escape130
 fate-armovie-escape130: CMD = framecrc -i $(TARGET_SAMPLES)/rpl/landing.rpl -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, AURA) += fate-auravision-v1
+FATE_VIDEO-$(call DEMDEC, AVI, AURA) += fate-auravision-v1
 fate-auravision-v1: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/SOUVIDEO.AVI -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, AURA2) += fate-auravision-v2
+FATE_VIDEO-$(call DEMDEC, AVI, AURA2) += fate-auravision-v2
 fate-auravision-v2: CMD = framecrc -i $(TARGET_SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, BETHSOFTVID, BETHSOFTVID) += fate-bethsoft-vid
+FATE_VIDEO-$(call DEMDEC, BETHSOFTVID, BETHSOFTVID) += fate-bethsoft-vid
 fate-bethsoft-vid: CMD = framecrc -i $(TARGET_SAMPLES)/bethsoft-vid/ANIM0001.VID -t 5 -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, BFI, BFI) += fate-bfi
+FATE_VIDEO-$(call DEMDEC, BFI, BFI) += fate-bfi
 fate-bfi: CMD = framecrc -i $(TARGET_SAMPLES)/bfi/2287.bfi -pix_fmt rgb24
 
 FATE_BINK_VIDEO += fate-bink-video-b
@@ -49,37 +58,39 @@ fate-bink-video-f: CMD = framecrc -i $(TARGET_SAMPLES)/bink/hol2br.bik
 FATE_BINK_VIDEO += fate-bink-video-i
 fate-bink-video-i: CMD = framecrc -i $(TARGET_SAMPLES)/bink/RazOnBull.bik -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO)
-fate-bink-video: $(FATE_BINK_VIDEO)
+FATE_VIDEO-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video
+FATE_VIDEO-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video
 fate-bmv-video: CMD = framecrc -i $(TARGET_SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs
+FATE_VIDEO-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs
 fate-cavs: CMD = framecrc -i $(TARGET_SAMPLES)/cavs/cavs.mpg -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics
-fate-cdgraphics: CMD = framecrc -i $(TARGET_SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1
+FATE_VIDEO-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics
+fate-cdgraphics: CMD = framecrc -i $(TARGET_SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgba -t 1
 
 FATE_CFHD-$(CONFIG_AVI_DEMUXER) += fate-cfhd-1
 fate-cfhd-1: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_422.avi -pix_fmt yuv422p10le
 
 FATE_CFHD-$(CONFIG_AVI_DEMUXER) += fate-cfhd-2
-fate-cfhd-2: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_444.avi -pix_fmt yuv422p10le
+fate-cfhd-2: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_444.avi -pix_fmt gbrp12le
 
 FATE_CFHD-$(CONFIG_MOV_DEMUXER) += fate-cfhd-3
 fate-cfhd-3: CMD = framecrc -i $(TARGET_SAMPLES)/cfhd/cfhd_odd.mov -pix_fmt yuv422p10le
 
-FATE_SAMPLES_AVCONV-$(CONFIG_CFHD_DECODER) += $(FATE_CFHD-yes)
+FATE_VIDEO-$(CONFIG_CFHD_DECODER) += $(FATE_CFHD-yes)
 fate-cfhd: $(FATE_CFHD-yes)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CLJR) += fate-cljr
+FATE_VIDEO-$(call DEMDEC, AVI, CLJR) += fate-cljr
 fate-cljr: CMD = framecrc -i $(TARGET_SAMPLES)/cljr/testcljr-partial.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, PNG) += fate-corepng
+FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-corepng
 fate-corepng: CMD = framecrc -i $(TARGET_SAMPLES)/png1/corepng-partial.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs
+FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-rgbapng-4816
+fate-rgbapng-4816: CMD = framecrc -i $(TARGET_SAMPLES)/png1/55c99e750a5fd6_50314226.png
+
+FATE_VIDEO-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs
 fate-creatureshock-avs: CMD = framecrc -i $(TARGET_SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24
 
 FATE_CVID-$(CONFIG_MOV_DEMUXER) += fate-cvid-palette
@@ -91,28 +102,34 @@ fate-cvid-partial: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/laracroft-cinepak-pa
 FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-grayscale
 fate-cvid-grayscale: CMD = framecrc -i $(TARGET_SAMPLES)/cvid/pcitva15.avi -an
 
-FATE_SAMPLES_AVCONV-$(CONFIG_CINEPAK_DECODER) += $(FATE_CVID-yes)
+FATE_VIDEO-$(CONFIG_CINEPAK_DECODER) += $(FATE_CVID-yes)
 fate-cvid: $(FATE_CVID-yes)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, C93, C93) += fate-cyberia-c93
+FATE_VIDEO-$(call DEMDEC, C93, C93) += fate-cyberia-c93
 fate-cyberia-c93: CMD = framecrc -i $(TARGET_SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CYUV) += fate-cyuv
+FATE_VIDEO-$(call DEMDEC, AVI, CYUV) += fate-cyuv
 fate-cyuv: CMD = framecrc -i $(TARGET_SAMPLES)/cyuv/cyuv.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, DSICIN, DSICINVIDEO) += fate-delphine-cin-video
+FATE_VIDEO-$(call DEMDEC, DSICIN, DSICINVIDEO) += fate-delphine-cin-video
 fate-delphine-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ANM, ANM) += fate-deluxepaint-anm
+FATE_VIDEO-$(call DEMDEC, ANM, ANM) += fate-deluxepaint-anm
 fate-deluxepaint-anm: CMD = framecrc -i $(TARGET_SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24
 
+FATE_VIDEO-$(call DEMDEC, DIRAC, DIRAC) += fate-dirac
+fate-dirac: CMD = framecrc -i $(TARGET_SAMPLES)/dirac/vts.profile-main.drc
+
+FATE_VIDEO-$(call DEMDEC, DIRAC, DIRAC) += fate-dirac-low-delay
+fate-dirac-low-delay: CMD = framecrc -i $(TARGET_SAMPLES)/dirac/vts.profile-vc2-low-delay.drc
+
 FATE_DXA += fate-dxa-feeble
 fate-dxa-feeble: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24 -an
 
 FATE_DXA += fate-dxa-scummvm
 fate-dxa-scummvm: CMD = framecrc -i $(TARGET_SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, DXA, DXA) += $(FATE_DXA)
+FATE_VIDEO-$(call DEMDEC, DXA, DXA) += $(FATE_DXA)
 fate-dxa: $(FATE_DXA)
 
 FATE_DXV += fate-dxv-dxt1
@@ -127,14 +144,14 @@ fate-dxv3-dxt1: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-nqna.mov
 FATE_DXV += fate-dxv3-dxt5
 fate-dxv3-dxt5: CMD = framecrc -i $(TARGET_SAMPLES)/dxv/dxv3-nqwa.mov
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, DXV) += $(FATE_DXV)
+FATE_VIDEO-$(call DEMDEC, MOV, DXV) += $(FATE_DXV)
 fate-dxv: $(FATE_DXV)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, SEGAFILM, CINEPAK) += fate-film-cvid
+FATE_VIDEO-$(call DEMDEC, SEGAFILM, CINEPAK) += fate-film-cvid
 fate-film-cvid: CMD = framecrc -i $(TARGET_SAMPLES)/film/logo-capcom.cpk -an
 
 FATE_FLIC += fate-flic-af11-palette-change
-fate-flic-af11-palette-change: CMD = framecrc -i $(TARGET_SAMPLES)/fli/fli-engines.fli -t 3.3 -pix_fmt rgb24
+fate-flic-af11-palette-change: CMD = framecrc -i $(TARGET_SAMPLES)/fli/fli-engines.fli -t 3.31 -pix_fmt rgb24
 
 FATE_FLIC += fate-flic-af12
 fate-flic-af12: CMD = framecrc -i $(TARGET_SAMPLES)/fli/jj00c2.fli -pix_fmt rgb24
@@ -142,17 +159,17 @@ fate-flic-af12: CMD = framecrc -i $(TARGET_SAMPLES)/fli/jj00c2.fli -pix_fmt rgb2
 FATE_FLIC += fate-flic-magiccarpet
 fate-flic-magiccarpet: CMD = framecrc -i $(TARGET_SAMPLES)/fli/intel.dat -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, FLIC, FLIC) += $(FATE_FLIC)
+FATE_VIDEO-$(call DEMDEC, FLIC, FLIC) += $(FATE_FLIC)
 fate-flic: $(FATE_FLIC)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, FRWU) += fate-frwu
+FATE_VIDEO-$(call DEMDEC, AVI, FRWU) += fate-frwu
 fate-frwu: CMD = framecrc -i $(TARGET_SAMPLES)/frwu/frwu.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, IDCIN, IDCIN) += fate-id-cin-video
+FATE_VIDEO-$(call DEMDEC, IDCIN, IDCIN) += fate-id-cin-video
 fate-id-cin-video: CMD = framecrc -i $(TARGET_SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2) += fate-idroq-video-encode
-fate-idroq-video-encode: CMD = md5 -f image2 -c:v pgmyuv -i $(TARGET_SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2
+FATE_VIDEO-$(call ENCDEC, ROQ PGMYUV, ROQ IMAGE2) += fate-idroq-video-encode
+fate-idroq-video-encode: CMD = md5 -f image2 -c:v pgmyuv -i $(TARGET_SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -r 30 -sws_flags +bitexact -vf pad=512:512:80:112 -f roq -t 0.2
 
 FATE_HAP += fate-hap1
 fate-hap1: CMD = framecrc -i $(TARGET_SAMPLES)/hap/hap1.mov
@@ -166,10 +183,10 @@ fate-hapy: CMD = framecrc -i $(TARGET_SAMPLES)/hap/hapy.mov
 FATE_HAP += fate-hap-chunk
 fate-hap-chunk: CMD = framecrc -i $(TARGET_SAMPLES)/hap/hapy-12-chunks.mov
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, HAP) += $(FATE_HAP)
+FATE_VIDEO-$(call DEMDEC, MOV, HAP) += $(FATE_HAP)
 fate-hap: $(FATE_HAP)
 
-FATE_IFF-$(CONFIG_IFF_BYTERUN1_DECODER) += fate-iff-byterun1
+FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-byterun1
 fate-iff-byterun1: CMD = framecrc -i $(TARGET_SAMPLES)/iff/ASH.LBM -pix_fmt rgb24
 
 FATE_IFF-$(CONFIG_EIGHTSVX_FIB_DECODER) += fate-iff-fibonacci
@@ -178,25 +195,25 @@ fate-iff-fibonacci: CMD = md5 -i $(TARGET_SAMPLES)/iff/dasboot-in-compressed -f
 FATE_IFF-$(CONFIG_IFF_ILBM_DECODER) += fate-iff-ilbm
 fate-iff-ilbm: CMD = framecrc -i $(TARGET_SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(CONFIG_IFF_DEMUXER)  += $(FATE_IFF-yes)
+FATE_VIDEO-$(CONFIG_IFF_DEMUXER)  += $(FATE_IFF-yes)
 fate-iff: $(FATE_IFF-yes)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-8bit
+FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-8bit
 fate-interplay-mve-8bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit
+FATE_VIDEO-$(call DEMDEC, IPMOVIE, INTERPLAY_VIDEO) += fate-interplay-mve-16bit
 fate-interplay-mve-16bit: CMD = framecrc -i $(TARGET_SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema
-fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le
+FATE_VIDEO-$(call DEMDEC, MXF, JPEG2000) += fate-jpeg2000-dcinema
+fate-jpeg2000-dcinema: CMD = framecrc -flags +bitexact -c:v jpeg2000 -i $(TARGET_SAMPLES)/jpeg2000/chiens_dcinema2K.mxf -pix_fmt xyz12le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, JV, JV) += fate-jv
+FATE_VIDEO-$(call DEMDEC, JV, JV) += fate-jv
 fate-jv: CMD = framecrc -i $(TARGET_SAMPLES)/jv/intro.jv -an -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, KGV1) += fate-kgv1
+FATE_VIDEO-$(call DEMDEC, AVI, KGV1) += fate-kgv1
 fate-kgv1: CMD = framecrc -i $(TARGET_SAMPLES)/kega/kgv1.avi -pix_fmt rgb555le -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, KMVC) += fate-kmvc
+FATE_VIDEO-$(call DEMDEC, AVI, KMVC) += fate-kmvc
 fate-kmvc: CMD = framecrc -i $(TARGET_SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24
 
 FATE_MAGICYUV += fate-magicyuv-y4444i \
@@ -207,7 +224,7 @@ FATE_MAGICYUV += fate-magicyuv-y4444i \
                  fate-magicyuv-rgba   \
                  fate-magicyuv-rgb
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, MAGICYUV) += $(FATE_MAGICYUV)
+FATE_VIDEO-$(call DEMDEC, AVI, MAGICYUV) += $(FATE_MAGICYUV)
 fate-magicyuv: $(FATE_MAGICYUV)
 
 fate-magicyuv-rgb:    CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_rgb_median.avi
@@ -218,33 +235,43 @@ fate-magicyuv-y422i:  CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv422_media
 fate-magicyuv-y4444i: CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv4444_left_interlaced.avi
 fate-magicyuv-y444:   CMD = framecrc -i $(TARGET_SAMPLES)/magy/magy_yuv444_left.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, EA, MDEC) += fate-mdec
+FATE_VIDEO-$(call DEMDEC, EA, MDEC) += fate-mdec
 fate-mdec: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/ea-dct/NFS2Esprit-partial.dct -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, STR, MDEC) += fate-mdec-v3
+FATE_VIDEO-$(call DEMDEC, STR, MDEC) += fate-mdec-v3
 fate-mdec-v3: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/psx-str/abc000_cut.str -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MSNWC_TCP, MIMIC) += fate-mimic
+FATE_VIDEO-$(call DEMDEC, MSNWC_TCP, MIMIC) += fate-mimic
 fate-mimic: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/mimic/mimic2-womanloveffmpeg.cam
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb
+FATE_VIDEO-$(call DEMDEC, MOV, MJPEGB) += fate-mjpegb
 fate-mjpegb: CMD = framecrc -idct simple -fflags +bitexact -i $(TARGET_SAMPLES)/mjpegb/mjpegb_part.mov -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels
+FATE_VIDEO-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels
 fate-motionpixels: CMD = framecrc -i $(TARGET_SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -frames:v 111
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc
+FATE_VIDEO-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc fate-mpeg2-ticket186
 fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -frames:v 30
+fate-mpeg2-ticket186: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg2/t.mpg -an
+
+FATE_VIDEO-$(call DEMDEC, MPEGPS, MPEG2VIDEO) += fate-mpeg2-ticket6024
+fate-mpeg2-ticket6024: CMD = framecrc -flags +bitexact -idct simple -flags +truncated -i $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg -an
+
+FATE_VIDEO-$(call DEMDEC, MPEGVIDEO, MPEG2VIDEO) += fate-mpeg2-ticket6677
+fate-mpeg2-ticket6677: CMD = framecrc -flags +bitexact -idct simple -vsync drop -i $(TARGET_SAMPLES)/mpeg2/sony-ct3.bs
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MV, MVC1) += fate-mv-mvc1
+FATE_VIDEO-$(call DEMDEC, MV, MVC1) += fate-mv-mvc1
 fate-mv-mvc1: CMD = framecrc -i $(TARGET_SAMPLES)/mv/posture.mv -an -frames 25 -pix_fmt rgb555le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MV, MVC2) += fate-mv-mvc2
+FATE_VIDEO-$(call DEMDEC, MV, MVC2) += fate-mv-mvc2
 fate-mv-mvc2: CMD = framecrc -i $(TARGET_SAMPLES)/mv/12345.mv -an -frames 30 -pix_fmt bgra
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MV, SGIRLE) += fate-mv-sgirle
+FATE_VIDEO-$(call DEMDEC, MV, SGIRLE) += fate-mv-sgirle
 fate-mv-sgirle: CMD = framecrc -i $(TARGET_SAMPLES)/mv/pet-rle.movie -an
 
+FATE_VIDEO-$(call DEMDEC, MXG, MXPEG) += fate-mxpeg
+fate-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/mxpeg/m1.mxg -an
+
 # FIXME dropped frames in this test because of coarse timebase
 FATE_NUV += fate-nuv-rtjpeg
 fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/Today.nuv -an
@@ -252,52 +279,46 @@ fate-nuv-rtjpeg: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/Today.nuv
 FATE_NUV += fate-nuv-rtjpeg-fh
 fate-nuv-rtjpeg-fh: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/nuv/rtjpeg_frameheader.nuv -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, NUV, NUV) += $(FATE_NUV)
+FATE_VIDEO-$(call DEMDEC, NUV, NUV) += $(FATE_NUV)
 fate-nuv: $(FATE_NUV)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, PAF, PAF_VIDEO) += fate-paf-video
+FATE_VIDEO-$(call DEMDEC, PAF, PAF_VIDEO) += fate-paf-video
 fate-paf-video: CMD = framecrc -i $(TARGET_SAMPLES)/paf/hod1-partial.paf -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, PIXLET) += fate-pixlet
-fate-pixlet: CMD = framecrc -i $(TARGET_SAMPLES)/pxlt/pixlet.mov -an -pix_fmt yuv420p16le
-
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, QPEG) += fate-qpeg
+FATE_VIDEO-$(call DEMDEC, AVI, QPEG) += fate-qpeg
 fate-qpeg: CMD = framecrc -i $(TARGET_SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, R210) += fate-r210
+FATE_VIDEO-$(call DEMDEC, AVI, R210) += fate-r210
 fate-r210: CMD = framecrc -i $(TARGET_SAMPLES)/r210/r210.avi -pix_fmt rgb48le
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, RL2, RL2) += fate-rl2
+FATE_VIDEO-$(call DEMDEC, RL2, RL2) += fate-rl2
 fate-rl2: CMD = framecrc -i $(TARGET_SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, ROQ, ROQ) += fate-roqvideo
+FATE_VIDEO-$(call DEMDEC, ROQ, ROQ) += fate-roqvideo
 fate-roqvideo: CMD = framecrc -i $(TARGET_SAMPLES)/idroq/idlogo.roq -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, SMUSH, SANM) += fate-sanm
+FATE_VIDEO-$(call DEMDEC, SMUSH, SANM) += fate-sanm
 fate-sanm: CMD = framecrc -i $(TARGET_SAMPLES)/smush/ronin_part.znm -an -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, VMD, VMDVIDEO) += fate-sierra-vmd-video
+FATE_VIDEO-$(call DEMDEC, VMD, VMDVIDEO) += fate-sierra-vmd-video
 fate-sierra-vmd-video: CMD = framecrc -i $(TARGET_SAMPLES)/vmd/12.vmd -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, SMACKER, SMACKER) += fate-smacker-video
+FATE_VIDEO-$(call DEMDEC, SMACKER, SMACKER) += fate-smacker-video
 fate-smacker-video: CMD = framecrc -i $(TARGET_SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, SMC) += fate-smc
+FATE_VIDEO-$(call DEMDEC, MOV, SMC) += fate-smc
 fate-smc: CMD = framecrc -i $(TARGET_SAMPLES)/smc/cass_schi.qt -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, SP5X) += fate-sp5x
+FATE_VIDEO-$(call DEMDEC, AVI, SP5X) += fate-sp5x
 fate-sp5x: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/sp5x/sp5x_problem.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, SRT, SRT) += fate-sub-srt
-fate-sub-srt: CMD = md5 -i $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt -f ass
-
-FATE_SAMPLES_AVCONV-$(call DEMDEC, THP, THP) += fate-thp
+FATE_VIDEO-$(call DEMDEC, THP, THP) += fate-thp
 fate-thp: CMD = framecrc -idct simple -i $(TARGET_SAMPLES)/thp/pikmin2-opening1-partial.thp -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, TIERTEXSEQ, TIERTEXSEQVIDEO) += fate-tiertex-seq
+FATE_VIDEO-$(call DEMDEC, TIERTEXSEQ, TIERTEXSEQVIDEO) += fate-tiertex-seq
 fate-tiertex-seq: CMD = framecrc -i $(TARGET_SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, TMV, TMV) += fate-tmv
+FATE_VIDEO-$(call DEMDEC, TMV, TMV) += fate-tmv
 fate-tmv: CMD = framecrc -i $(TARGET_SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24
 
 FATE_TXD += fate-txd-16bpp
@@ -309,42 +330,53 @@ fate-txd-odd: CMD = framecrc -i $(TARGET_SAMPLES)/txd/odd.txd -an
 FATE_TXD += fate-txd-pal8
 fate-txd-pal8: CMD = framecrc -i $(TARGET_SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, TXD, TXD) += $(FATE_TXD)
+FATE_VIDEO-$(call DEMDEC, TXD, TXD) += $(FATE_TXD)
 fate-txd: $(FATE_TXD)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, ULTI) += fate-ulti
+FATE_VIDEO-$(call DEMDEC, AVI, ULTI) += fate-ulti
 fate-ulti: CMD = framecrc -i $(TARGET_SAMPLES)/ulti/hit12w.avi -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, V210) += fate-v210
+FATE_VIDEO-$(call DEMDEC, AVI, V210) += fate-v210
 fate-v210: CMD = framecrc -i $(TARGET_SAMPLES)/v210/v210_720p-partial.avi -pix_fmt yuv422p16be -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, MOV, V410) += fate-v410dec
+FATE_VIDEO-$(call DEMDEC, MOV, V410) += fate-v410dec
 fate-v410dec: CMD = framecrc -i $(TARGET_SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le
 
-FATE_SAMPLES_AVCONV-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2) += fate-v410enc
+FATE_VIDEO-$(call ENCDEC, V410 PGMYUV, AVI IMAGE2) += fate-v410enc
 fate-v410enc: $(VREF)
 fate-v410enc: CMD = md5 -f image2 -c:v pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -fflags +bitexact -c:v v410 -f avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, SIFF, VB) += fate-vb
+FATE_VIDEO-$(call DEMDEC, SIFF, VB) += fate-vb
 fate-vb: CMD = framecrc -i $(TARGET_SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, VCR1) += fate-vcr1
+FATE_VIDEO-$(call DEMDEC, AVI, VCR1) += fate-vcr1
 fate-vcr1: CMD = framecrc -i $(TARGET_SAMPLES)/vcr1/VCR1test.avi -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, XL) += fate-videoxl
+FATE_VIDEO-$(call DEMDEC, AVI, MPEG2VIDEO) += fate-vcr2
+fate-vcr2: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/vcr2/VCR2test.avi -an
+
+FATE_VIDEO-$(call DEMDEC, AVI, XL) += fate-videoxl
 fate-videoxl: CMD = framecrc -i $(TARGET_SAMPLES)/vixl/pig-vixl.avi
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, WSVQA, VQA) += fate-vqa-cc
+FATE_VIDEO-$(call DEMDEC, WSVQA, VQA) += fate-vqa-cc
 fate-vqa-cc: CMD = framecrc -i $(TARGET_SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, WC3, XAN_WC3) += fate-wc3movie-xan
+FATE_VIDEO-$(call DEMDEC, WC3, XAN_WC3) += fate-wc3movie-xan
 fate-wc3movie-xan: CMD = framecrc -i $(TARGET_SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, WNV1) += fate-wnv1
+FATE_VIDEO-$(call DEMDEC, AVI, WNV1) += fate-wnv1
 fate-wnv1: CMD = framecrc -i $(TARGET_SAMPLES)/wnv1/wnv1-codec.avi -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, YOP, YOP) += fate-yop
+FATE_VIDEO-$(call DEMDEC, YOP, YOP) += fate-yop
 fate-yop: CMD = framecrc -i $(TARGET_SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, XAN_WC4) += fate-xxan-wc4
+FATE_VIDEO-$(call DEMDEC, AVI, XAN_WC4) += fate-xxan-wc4
 fate-xxan-wc4: CMD = framecrc -i $(TARGET_SAMPLES)/wc4-xan/wc4trailer-partial.avi -an
+
+FATE_VIDEO-$(call DEMDEC, WAV, SMVJPEG) += fate-smvjpeg
+fate-smvjpeg: CMD = framecrc -idct simple -flags +bitexact -i $(TARGET_SAMPLES)/smv/clock.smv -an
+
+FATE_VIDEO += $(FATE_VIDEO-yes)
+
+FATE_SAMPLES_FFMPEG += $(FATE_VIDEO)
+fate-video: $(FATE_VIDEO)
diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak
index 84f380d510..f3a2892399 100644
--- a/tests/fate/voice.mak
+++ b/tests/fate/voice.mak
@@ -1,12 +1,12 @@
 FATE_G722-$(call DEMDEC, G722, ADPCM_G722) += fate-g722dec-1
 fate-g722dec-1: CMD = framecrc -i $(TARGET_SAMPLES)/g722/conf-adminmenu-162.g722
 
-FATE_G722-$(call ENCDEC, ADPCM_G722, G722) += fate-g722-encode
+FATE_G722-$(call ENCMUX, ADPCM_G722, WAV) += fate-g722-encode
 fate-g722-encode: tests/data/asynth-16000-1.wav
 fate-g722-encode: SRC = tests/data/asynth-16000-1.wav
-fate-g722-encode: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g722
+fate-g722-encode: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g722
 
-FATE_SAMPLES_AVCONV += $(FATE_G722-yes)
+FATE_VOICE-yes += $(FATE_G722-yes)
 fate-g722: $(FATE_G722-yes)
 
 FATE_G723_1 += fate-g723_1-dec-1
@@ -33,42 +33,45 @@ fate-g723_1-dec-7: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/dtx6
 FATE_G723_1 += fate-g723_1-dec-8
 fate-g723_1-dec-8: CMD = framecrc -postfilter 1 -i $(TARGET_SAMPLES)/g723_1/dtx63e.tco
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, G723_1, G723_1) += $(FATE_G723_1)
+FATE_VOICE-$(call DEMDEC, G723_1, G723_1) += $(FATE_G723_1)
 fate-g723_1: $(FATE_G723_1)
 
 FATE_G726 += fate-g726-encode-2bit
-fate-g726-encode-2bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 16k
+fate-g726-encode-2bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b:a 16k
 
 FATE_G726 += fate-g726-encode-3bit
-fate-g726-encode-3bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 24k
+fate-g726-encode-3bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b:a 24k
 
 FATE_G726 += fate-g726-encode-4bit
-fate-g726-encode-4bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 32k
+fate-g726-encode-4bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b:a 32k
 
 FATE_G726 += fate-g726-encode-5bit
-fate-g726-encode-5bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 40k
+fate-g726-encode-5bit: CMD = enc_dec_pcm wav framemd5 s16le $(SRC) -c:a g726 -b:a 40k
 
 $(FATE_G726): tests/data/asynth-8000-1.wav
 $(FATE_G726): SRC = tests/data/asynth-8000-1.wav
 
-FATE_SAMPLES_AVCONV-$(call ENCDEC, ADPCM_G726, WAV) += $(FATE_G726)
+FATE_VOICE-$(call ENCMUX, ADPCM_G726, WAV) += $(FATE_G726)
 fate-g726: $(FATE_G726)
 
-FATE_GSM-$(call DEMDEC, WAV, GSM_MS) += fate-gsm-ms
+FATE_GSM-$(call DEMDEC, WAV, GSM) += fate-gsm-ms
 fate-gsm-ms: CMD = framecrc -i $(TARGET_SAMPLES)/gsm/ciao.wav
 
 FATE_GSM-$(call DEMDEC, MOV, GSM) += fate-gsm-toast
 fate-gsm-toast: CMD = framecrc -i $(TARGET_SAMPLES)/gsm/sample-gsm-8000.mov -t 10
 
-FATE_SAMPLES_AVCONV += $(FATE_GSM-yes)
+FATE_VOICE-yes += $(FATE_GSM-yes)
 fate-gsm: $(FATE_GSM-yes)
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, QCP, QCELP) += fate-qcelp
+FATE_VOICE-$(call DEMDEC, QCP, QCELP) += fate-qcelp
 fate-qcelp: CMD = pcm -i $(TARGET_SAMPLES)/qcp/0036580847.QCP
 fate-qcelp: CMP = oneoff
 fate-qcelp: REF = $(SAMPLES)/qcp/0036580847.pcm
 
-FATE_SAMPLES_AVCONV-$(call DEMDEC, WAV, TRUESPEECH) += fate-truespeech
+FATE_VOICE-$(call DEMDEC, WAV, TRUESPEECH) += fate-truespeech
 fate-truespeech: CMD = pcm -i $(TARGET_SAMPLES)/truespeech/a6.wav
 fate-truespeech: CMP = oneoff
 fate-truespeech: REF = $(SAMPLES)/truespeech/a6.pcm
+
+FATE_SAMPLES_FFMPEG += $(FATE_VOICE-yes)
+fate-voice: $(FATE_VOICE-yes)
diff --git a/tests/fate/vorbis.mak b/tests/fate/vorbis.mak
index 4b72373720..354cc57a0f 100644
--- a/tests/fate/vorbis.mak
+++ b/tests/fate/vorbis.mak
@@ -1,3 +1,11 @@
+FATE_VORBIS += fate-vorbis-encode
+fate-vorbis-encode: CMD = enc_dec_pcm ogg wav s16le $(TARGET_SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav -c:a vorbis -strict experimental
+fate-vorbis-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav
+fate-vorbis-encode: CMP_SHIFT = 0
+fate-vorbis-encode: CMP_TARGET = 296
+fate-vorbis-encode: SIZE_TOLERANCE = 3560
+fate-vorbis-encode: FUZZ = 30
+
 FATE_VORBIS += fate-vorbis-1
 fate-vorbis-1: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/1.0.1-test_small.ogg
 fate-vorbis-1: REF = $(SAMPLES)/vorbis/1.0.1-test_small.pcm
@@ -80,6 +88,12 @@ FATE_VORBIS += fate-vorbis-20
 fate-vorbis-20: CMD = pcm -i $(TARGET_SAMPLES)/vorbis/6.ogg
 fate-vorbis-20: REF = $(SAMPLES)/vorbis/6.pcm
 
+FATE_VORBIS_FFPROBE-$(CONFIG_OGG_DEMUXER) += fate-vorbis-1833-chapters
+fate-vorbis-1833-chapters: CMD = probechapters $(TARGET_SAMPLES)/vorbis/vorbis_chapter_extension_demo.ogg
+
+FATE_SAMPLES_FFPROBE += $(FATE_VORBIS_FFPROBE-yes)
+
 FATE_SAMPLES_AVCONV-$(call DEMDEC, OGG, VORBIS) += $(FATE_VORBIS)
-fate-vorbis: $(FATE_VORBIS)
+fate-vorbis: $(FATE_VORBIS) $(FATE_VORBIS_FFPROBE-yes)
 $(FATE_VORBIS): CMP = oneoff
+fate-vorbis-encode: CMP = stddev
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index 75248ec14d..0be5aa2aaa 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -43,12 +43,39 @@ fate-vp60: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/g36.vp6
 FATE_VP6-$(call DEMDEC, EA, VP6) += fate-vp61
 fate-vp61: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
 
-FATE_VP6-$(call DEMDEC, FLV, VP6A) += fate-vp6a
-fate-vp6a: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv
+FATE_VP6-$(call DEMDEC, MOV, VP6A) += fate-vp6a
+fate-vp6a: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.mov
+
+FATE_VP6-$(call DEMDEC, MOV, VP6A) += fate-vp6a-skip_alpha
+fate-vp6a-skip_alpha: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.mov
 
 FATE_VP6-$(call DEMDEC, FLV, VP6F) += fate-vp6f
 fate-vp6f: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/clip1024.flv
 
+FATE_VP8-$(CONFIG_MATROSKA_DEMUXER) += fate-vp8-alpha
+fate-vp8-alpha: CMD = framecrc -i $(TARGET_SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm -c:v copy
+
+FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest
+fate-webm-dash-manifest: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video2.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio2.webm -c copy -map 0 -map 1 -map 2 -map 3 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1 id=1,streams=2,3" -
+
+FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-unaligned-video-streams
+fate-webm-dash-manifest-unaligned-video-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
+
+FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-unaligned-audio-streams
+fate-webm-dash-manifest-unaligned-audio-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
+
+FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-representations
+fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
+
+FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-live
+fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 -debug_mode 1 -
+
+FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-live-bandwidth
+fate-webm-dash-manifest-live-bandwidth: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -bandwidth 100 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -bandwidth 200 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 -debug_mode 1 -
+
+FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-2451
+fate-vp8-2451: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp8/RRSF49-short.webm -vsync cfr -an
+
 FATE_SAMPLES_AVCONV += $(FATE_VP6-yes)
 fate-vp6: $(FATE_VP6-yes)
 
@@ -58,7 +85,7 @@ fate-vp7: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp7/potter-40.vp7
 VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017
 
 define FATE_VP8_SUITE
-FATE_VP8-$(CONFIG_IVF_DEMUXER) += fate-vp8-test-vector$(2)-$(1)
+FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-test-vector$(2)-$(1)
 fate-vp8-test-vector$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp8-test-vectors-r1/vp80-00-comprehensive-$(1).ivf
 fate-vp8-test-vector$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-test-vector-$(1)
 endef
@@ -67,19 +94,19 @@ define FATE_VP8_FULL
 $(foreach N,$(VP8_SUITE),$(eval $(call FATE_VP8_SUITE,$(N),$(1),$(2))))
 
 # FIXME this file contains two frames with identical timestamps,
-# so avconv drops one of them
-FATE_VP8-$(CONFIG_IVF_DEMUXER) += fate-vp8-sign-bias$(1)
+# so ffmpeg drops one of them
+FATE_VP8-$(call DEMDEC, IVF, VP8) += fate-vp8-sign-bias$(1)
 fate-vp8-sign-bias$(1): CMD = framemd5 $(2) -i $(TARGET_SAMPLES)/vp8/sintel-signbias.ivf
 fate-vp8-sign-bias$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-sign-bias
 
-FATE_VP8-$(CONFIG_MATROSKA_DEMUXER) += fate-vp8-size-change$(1)
-fate-vp8-size-change$(1): CMD = framemd5 $(2) -i $(TARGET_SAMPLES)/vp8/frame_size_change.webm -frames:v 30
+FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-size-change$(1)
+fate-vp8-size-change$(1): CMD = framemd5 $(2) -flags +bitexact -i $(TARGET_SAMPLES)/vp8/frame_size_change.webm -frames:v 30 -sws_flags bitexact+bilinear
 fate-vp8-size-change$(1): REF = $(SRC_PATH)/tests/ref/fate/vp8-size-change
 endef
 
-$(call FATE_VP8_FULL)
+$(eval $(call FATE_VP8_FULL))
 
-FATE_SAMPLES_AVCONV-$(CONFIG_VP8_DECODER) += $(FATE_VP8-yes)
+FATE_SAMPLES_AVCONV += $(FATE_VP8-yes)
 fate-vp8: $(FATE_VP8-yes)
 
 define FATE_VP9_SUITE
@@ -88,6 +115,12 @@ fate-vp9$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp9-test-vectors/vp9
 fate-vp9$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9-$(1)
 endef
 
+define FATE_VP9_PROFILE_SUITE
+FATE_VP9-$(CONFIG_MATROSKA_DEMUXER) += fate-vp9p$(2)-$(1)
+fate-vp9p$(2)-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp9$(2)-2-$(1).webm $(3)
+fate-vp9p$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9p$(2)-$(1)
+endef
+
 VP9_Q = 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 \
         16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 \
         32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 \
@@ -95,21 +128,37 @@ VP9_Q = 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 \
 VP9_SHARP = 1 2 3 4 5 6 7
 VP9_SIZE_A = 08 10 16 18 32 34 64 66
 VP9_SIZE_B = 196 198 200 202 208 210 224 226
+VP9_CHROMA_SUBSAMPLE = 422 440 444
+VP9_HIGH_BITDEPTH = 10 12
 
 define FATE_VP9_FULL
-$(foreach Q,$(VP9_Q),$(eval $(call FATE_VP9_SUITE,00-quantizer-$(Q),$(1),$(2))))
-$(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP),$(1),$(2))))
-$(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H),$(1),$(2))))))
-$(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP9_SUITE,03-size-$(W)x$(H),$(1),$(2))))))
-$(eval $(call FATE_VP9_SUITE,03-deltaq,$(1),$(2)))
-$(eval $(call FATE_VP9_SUITE,2pass-akiyo,$(1),$(2)))
-$(eval $(call FATE_VP9_SUITE,parallelmode-akiyo,$(1),$(2)))
-$(eval $(call FATE_VP9_SUITE,segmentation-aq-akiyo,$(1),$(2)))
-$(eval $(call FATE_VP9_SUITE,segmentation-sf-akiyo,$(1),$(2)))
-$(eval $(call FATE_VP9_SUITE,tiling-pedestrian,$(1),$(2)))
+$(foreach Q,$(VP9_Q),$(eval $(call FATE_VP9_SUITE,00-quantizer-$(Q))))
+$(foreach SHARP,$(VP9_SHARP),$(eval $(call FATE_VP9_SUITE,01-sharpness-$(SHARP))))
+$(foreach W,$(VP9_SIZE_A),$(eval $(foreach H,$(VP9_SIZE_A),$(eval $(call FATE_VP9_SUITE,02-size-$(W)x$(H))))))
+$(foreach W,$(VP9_SIZE_B),$(eval $(foreach H,$(VP9_SIZE_B),$(eval $(call FATE_VP9_SUITE,03-size-$(W)x$(H))))))
+$(eval $(call FATE_VP9_SUITE,03-deltaq))
+$(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,04-yuv$(SS),1,)))
+$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv420,2,-pix_fmt yuv420p$(BD)le)))
+$(foreach BD,$(VP9_HIGH_BITDEPTH),$(eval $(foreach SS,$(VP9_CHROMA_SUBSAMPLE),$(eval $(call FATE_VP9_PROFILE_SUITE,20-$(BD)bit-yuv$(SS),3,-pix_fmt yuv$(SS)p$(BD)le)))))
+$(eval $(call FATE_VP9_SUITE,06-bilinear))
+$(eval $(call FATE_VP9_SUITE,09-lf_deltas))
+$(eval $(call FATE_VP9_SUITE,10-show-existing-frame))
+$(eval $(call FATE_VP9_SUITE,10-show-existing-frame2))
+$(eval $(call FATE_VP9_SUITE,15-segkey_adpq))
+$(eval $(call FATE_VP9_SUITE,16-intra-only))
+$(eval $(call FATE_VP9_SUITE,2pass-akiyo))
+$(eval $(call FATE_VP9_SUITE,parallelmode-akiyo))
+$(eval $(call FATE_VP9_SUITE,segmentation-aq-akiyo))
+$(eval $(call FATE_VP9_SUITE,segmentation-sf-akiyo))
+$(eval $(call FATE_VP9_SUITE,tiling-pedestrian))
+$(eval $(call FATE_VP9_SUITE,trac3849))
+$(eval $(call FATE_VP9_SUITE,trac4359))
 endef
 
 $(eval $(call FATE_VP9_FULL))
+FATE_VP9-$(CONFIG_IVF_DEMUXER) += fate-vp9-05-resize
+fate-vp9-05-resize: CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-05-resize.ivf -s 352x288 -sws_flags bitexact+bilinear
+fate-vp9-05-resize: REF = $(SRC_PATH)/tests/ref/fate/vp9-05-resize
 
 FATE_SAMPLES_AVCONV-$(CONFIG_VP9_DECODER) += $(FATE_VP9-yes)
 fate-vp9: $(FATE_VP9-yes)
diff --git a/tests/fate/vqf.mak b/tests/fate/vqf.mak
index 89dbcb1a88..df5ff44f9d 100644
--- a/tests/fate/vqf.mak
+++ b/tests/fate/vqf.mak
@@ -1,7 +1,12 @@
-FATE_SAMPLES_AVCONV-$(call DEMDEC, VQF, TWINVQ) += fate-twinvq
+FATE_VQF-$(call DEMDEC, VQF, TWINVQ) += fate-twinvq
 fate-twinvq: CMD = pcm -i $(TARGET_SAMPLES)/vqf/achterba.vqf
 fate-twinvq: CMP = oneoff
 fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm
 
-FATE_SAMPLES_AVCONV-$(CONFIG_VQF_DEMUXER) += fate-vqf-demux
-fate-vqf-demux: CMD = md5 -i $(TARGET_SAMPLES)/vqf/achterba.vqf -c:a copy -f framecrc
+FATE_VQF-$(CONFIG_VQF_DEMUXER) += fate-vqf-demux
+fate-vqf-demux: CMD = md5 -i $(TARGET_SAMPLES)/vqf/achterba.vqf -c:a copy -flags bitexact -fflags +bitexact -f framecrc
+
+FATE_VQF += $(FATE_VQF-yes)
+
+FATE_SAMPLES_FFMPEG += $(FATE_VQF)
+fate-vqf: $(FATE_VQF)
diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak
index 05538f0d0f..e4e8d47128 100644
--- a/tests/fate/wavpack.mak
+++ b/tests/fate/wavpack.mak
@@ -1,102 +1,102 @@
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += $(FATE_WAVPACK)
+
 # lossless
 
-FATE_WAVPACK += fate-wavpack-lossless-8bit
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-8bit
 fate-wavpack-lossless-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/8bit-partial.wv -f s8
 
-FATE_WAVPACK += fate-wavpack-lossless-12bit
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-12bit
 fate-wavpack-lossless-12bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/12bit-partial.wv -f s16le
 
-FATE_WAVPACK += fate-wavpack-lossless-16bit
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-16bit
 fate-wavpack-lossless-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/16bit-partial.wv -f s16le
 
-FATE_WAVPACK += fate-wavpack-lossless-24bit
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-24bit
 fate-wavpack-lossless-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/24bit-partial.wv -f s24le
 
-FATE_WAVPACK += fate-wavpack-lossless-32bit
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-32bit
 fate-wavpack-lossless-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le
 
-FATE_WAVPACK += fate-wavpack-lossless-float
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-float
 fate-wavpack-lossless-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le
 
 # lossy
 
-FATE_WAVPACK += fate-wavpack-lossy-8bit
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-8bit
 fate-wavpack-lossy-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_8-bit.wv -f s8
 
-FATE_WAVPACK += fate-wavpack-lossy-16bit
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-16bit
 fate-wavpack-lossy-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_16-bit.wv -f s16le
 
-FATE_WAVPACK += fate-wavpack-lossy-24bit
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-24bit
 fate-wavpack-lossy-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f s24le
 
-FATE_WAVPACK += fate-wavpack-lossy-32bit
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-32bit
 fate-wavpack-lossy-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le
 
-FATE_WAVPACK += fate-wavpack-lossy-float
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-float
 fate-wavpack-lossy-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le
 
 # channel configurations
 
-FATE_WAVPACK += fate-wavpack-channels-monofloat
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-monofloat
 fate-wavpack-channels-monofloat: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le
 
-FATE_WAVPACK += fate-wavpack-channels-monoint
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-monoint
 fate-wavpack-channels-monoint: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -f s16le
 
-FATE_WAVPACK += fate-wavpack-channels-4.0
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-4.0
 fate-wavpack-channels-4.0: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/edward_4.0_16bit-partial.wv -f s16le
 
-FATE_WAVPACK += fate-wavpack-channels-5.1
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-5.1
 fate-wavpack-channels-5.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_5.1_16bit-partial.wv -f s16le
 
-FATE_WAVPACK += fate-wavpack-channels-6.1
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-6.1
 fate-wavpack-channels-6.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -f s16le
 
-FATE_WAVPACK += fate-wavpack-channels-7.1
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-7.1
 fate-wavpack-channels-7.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le
 
 # speed modes
 
-FATE_WAVPACK += fate-wavpack-speed-default
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-default
 fate-wavpack-speed-default: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/default-partial.wv  -f s16le
 
-FATE_WAVPACK += fate-wavpack-speed-fast
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-fast
 fate-wavpack-speed-fast: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/fast-partial.wv  -f s16le
 
-FATE_WAVPACK += fate-wavpack-speed-high
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-high
 fate-wavpack-speed-high: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/high-partial.wv  -f s16le
 
-FATE_WAVPACK += fate-wavpack-speed-vhigh
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-vhigh
 fate-wavpack-speed-vhigh: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/vhigh-partial.wv  -f s16le
 
 # special cases
 
-FATE_WAVPACK += fate-wavpack-clipping
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-clipping
 fate-wavpack-clipping: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/clipping.wv -f s16le
 
-FATE_WAVPACK += fate-wavpack-cuesheet
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-cuesheet
 fate-wavpack-cuesheet: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv -f s16le
 
-FATE_WAVPACK += fate-wavpack-falsestereo
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-falsestereo
 fate-wavpack-falsestereo: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/false_stereo.wv -f s16le
 
-FATE_WAVPACK += fate-wavpack-zerolsbs
+FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-zerolsbs
 fate-wavpack-zerolsbs: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/zero_lsbs.wv -f s16le
 
-FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += $(FATE_WAVPACK)
-
 FATE_WAVPACK-$(call DEMDEC, MATROSKA, WAVPACK) += fate-wavpack-matroskamode
 fate-wavpack-matroskamode: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/matroska_mode.mka -f s16le
 
 FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-mono
-fate-wavpack-matroska_mux-mono: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -fflags +bitexact -f matroska
+fate-wavpack-matroska_mux-mono: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -fflags +bitexact -f matroska
 fate-wavpack-matroska_mux-mono: CMP = oneline
-fate-wavpack-matroska_mux-mono: REF = f87d2356f34e1ac0d6a873fac8bc0453
+fate-wavpack-matroska_mux-mono: REF = 11773e2a518edc788475f3880d849230
 
 FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-61
-fate-wavpack-matroska_mux-61: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -fflags +bitexact -f matroska
+fate-wavpack-matroska_mux-61: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -fflags +bitexact -f matroska
 fate-wavpack-matroska_mux-61: CMP = oneline
-fate-wavpack-matroska_mux-61: REF = 6926fde4cb74ec63a5f21a26bec62688
+fate-wavpack-matroska_mux-61: REF = 9641abdf596c10c2e21bd9b026d4bade
 
 FATE_SAMPLES_AVCONV += $(FATE_WAVPACK-yes)
 fate-wavpack: $(FATE_WAVPACK-yes)
diff --git a/tests/fate/wma.mak b/tests/fate/wma.mak
index d2cf4a28ff..12a8fa989a 100644
--- a/tests/fate/wma.mak
+++ b/tests/fate/wma.mak
@@ -1,10 +1,12 @@
 FATE_WMAPRO-$(call DEMDEC, ASF, WMAPRO) += fate-wmapro-2ch
 fate-wmapro-2ch: CMD = pcm -i $(TARGET_SAMPLES)/wmapro/Beethovens_9th-1_small.wma -frames 43
-fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small_v2.pcm
+fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small.pcm
+fate-wmapro-2ch: SIZE_TOLERANCE = 8192
 
 FATE_WMAPRO-$(call DEMDEC, ASF, WMAPRO) += fate-wmapro-5.1
 fate-wmapro-5.1: CMD = pcm -i $(TARGET_SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma -frames 101
-fate-wmapro-5.1: REF = $(SAMPLES)/wmapro/latin_192_mulitchannel_cut_v2.pcm
+fate-wmapro-5.1: REF = $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.pcm
+fate-wmapro-5.1: SIZE_TOLERANCE = 24576
 
 FATE_WMAPRO-$(call DEMDEC, MOV, WMAPRO) += fate-wmapro-ism
 fate-wmapro-ism: CMD = pcm -i $(TARGET_SAMPLES)/isom/vc1-wmapro.ism -vn
diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh
new file mode 100755
index 0000000000..9007fe37ca
--- /dev/null
+++ b/tests/ffserver-regression.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+target_samples=$3
+target_exec=$4
+target_path=$5
+
+#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf
+#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf
+
+. $(dirname $0)/md5.sh
+
+FILES=$(sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html)
+
+rm -f tests/feed1.ffm
+$target_exec ${target_path}/ffserver${PROGSUF} -f "$2" &
+FFSERVER_PID=$!
+echo "Waiting for feeds to startup..."
+sleep 2
+(
+    cd tests/data || exit $?
+    rm -f ff-* ffserver.regression
+    WGET_OPTIONS="--user-agent=NSPlayer -q --proxy=off -e verbose=off -e server_response=off -T3 --tries=1"
+    for file in $FILES; do
+        if [ $(expr $file : "a-*") != 0 ]; then
+            wget $WGET_OPTIONS -O - http://localhost:9999/$file > ff-$file
+        else
+            wget $WGET_OPTIONS -O - http://localhost:9999/$file?date=19700101T000000Z | dd bs=1 count=100000 > ff-$file 2>/dev/null
+        fi
+        do_md5sum ff-$file >>ffserver.regression
+    done
+    wget  $WGET_OPTIONS -O - 'http://localhost:9999/teststat.html?abc' > ff-stat 2>/dev/null
+    do_md5sum ff-stat >>ffserver.regression
+)
+kill $FFSERVER_PID
+wait > /dev/null 2>&1
+rm -f tests/feed1.ffm
+if diff -u "$1" tests/data/ffserver.regression; then
+    echo
+    echo Server regression test succeeded.
+    exit 0
+else
+    echo
+    echo Server regression test: Error.
+    exit 1
+fi
diff --git a/tests/ffserver.conf b/tests/ffserver.conf
new file mode 100644
index 0000000000..3495d959e2
--- /dev/null
+++ b/tests/ffserver.conf
@@ -0,0 +1,311 @@
+#
+# This is a test configuration file. You can invoke it with
+# ../ffserver -f ffserver.conf
+# when in the tests directory and once the vsynth1 subdirectory
+# has been populated. Then point your browser at http://whatever:9999/teststat.html
+# and you can look at the streams
+#
+
+#
+# Port on which the server is listening. You must select a different
+# port from your standard http web server if it is running on the same
+# computer.
+
+HTTPPort 9999
+RTSPPort 9990
+
+# Address on which the server is bound. Only useful if you have
+# several network interfaces.
+
+HTTPBindAddress 0.0.0.0
+
+# Number of simultaneous requests that can be handled. Since FFServer
+# is very fast, this limit is determined mainly by your Internet
+# connection speed.
+
+MaxClients 1000
+
+MaxBandwidth 100000
+
+# Access Log file (uses standard Apache log file format)
+# '-' is the standard output
+
+CustomLog -
+
+##################################################################
+# Definition of the live feeds. Each live feed contains one video
+# and/or audio sequence coming from an ffmpeg encoder or another
+# ffserver. This sequence may be encoded simultaneously with several
+# codecs at several resolutions.
+
+<Feed feed1.ffm>
+
+# You must use 'ffmpeg' to send a live feed to ffserver. In this
+# example, you can type:
+#
+# ffmpeg http://localhost:8090/feed1.ffm
+
+# ffserver can also do time shifting. It means that it can stream any
+# previously recorded live stream. The request should contain:
+# "http://xxxx?date=[YYYY-MM-DDT][[HH:]MM:]SS[.m...]".You must specify
+# a path where the feed is stored on disk. You also specify the
+# maximum size of the feed (100M bytes here). Default:
+# File=/tmp/feed_name.ffm FileMaxSize=5M
+
+File tests/feed1.ffm
+FileMaxSize 100M
+
+# Fire up ffmpeg pointing at this stream
+
+Launch ./ffmpeg -v 0 -y -f image2 -flags +bitexact -fflags +bitexact -i tests/vsynth1/%02d.pgm -flags +bitexact -fflags +bitexact
+
+ACL allow localhost
+</Feed>
+
+##################################################################
+# Now you can define each stream which will be generated from the
+# original audio and video stream. Each format has a filename (here
+# 'test128.mpg'). FFServer will send this stream when answering a
+# request containing this filename.
+
+<Stream test_h.avi>
+Feed feed1.ffm
+Format avi
+#
+BitExact
+DctFastint
+IdctSimple
+VideoFrameRate 10
+VideoSize 352x288
+VideoBitRate 100
+VideoGopSize 30
+NoAudio
+
+PreRoll 10
+StartSendOnKey
+MaxTime 100
+
+</Stream>
+
+<Stream test_l.avi>
+Feed feed1.ffm
+Format avi
+#
+BitExact
+DctFastint
+IdctSimple
+VideoFrameRate 2
+VideoSize 320x240
+VideoBitRate 40
+VideoGopSize 20
+NoAudio
+
+PreRoll 20
+StartSendOnKey
+MaxTime 100
+
+</Stream>
+
+#<Stream test_h.mpg>
+#Feed feed1.ffm
+#
+#VideoFrameRate 10
+#VideoSize 352x288
+#VideoBitRate 100
+#VideoGopSize 30
+#NoAudio
+
+#PreRoll 10
+#StartSendOnKey
+#MaxTime 100
+#
+#</Stream>
+#
+#<Stream test_l.mpg>
+#Feed feed1.ffm
+##
+#VideoFrameRate 2
+#VideoSize 320x240
+#VideoBitRate 40
+#VideoGopSize 20
+#NoAudio
+#
+#PreRoll 20
+#StartSendOnKey
+#MaxTime 100
+#
+#</Stream>
+#
+<Stream test.swf>
+Feed feed1.ffm
+#
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
+VideoFrameRate 10
+VideoSize 352x288
+VideoBitRate 100
+VideoGopSize 30
+NoAudio
+
+PreRoll 10
+StartSendOnKey
+MaxTime 100
+
+</Stream>
+
+<Stream test_h.asf>
+Feed feed1.ffm
+Format asf
+#
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
+VideoFrameRate 10
+VideoSize 320x240
+VideoBitRate 100
+VideoGopSize 30
+NoAudio
+
+PreRoll 10
+StartSendOnKey
+MaxTime 100
+
+AVOptionVideo flags +global_header
+
+Metadata title "Test data stream"
+
+</Stream>
+
+<Stream test_l.asf>
+Feed feed1.ffm
+Format asf
+#
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
+VideoFrameRate 2
+VideoSize 320x240
+VideoBitRate 40
+VideoGopSize 20
+NoAudio
+
+PreRoll 20
+StartSendOnKey
+MaxTime 100
+
+AVOptionVideo flags +global_header
+
+Metadata title "Test data stream"
+
+</Stream>
+
+<Stream test_h.rm>
+
+Feed feed1.ffm
+Format rm
+
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
+VideoBitRate 100
+VideoFrameRate 10
+VideoGopSize 30
+VideoSize    320x240
+NoAudio
+
+PreRoll 10
+StartSendOnKey
+MaxTime 100
+
+</Stream>
+
+<Stream test_l.rm>
+
+Feed feed1.ffm
+Format rm
+
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
+VideoBitRate 40
+VideoFrameRate 2
+VideoGopSize 20
+VideoSize    320x240
+NoAudio
+
+PreRoll 20
+StartSendOnKey
+MaxTime 100
+
+</Stream>
+
+
+<Stream test.jpg>
+
+Feed feed1.ffm
+Format jpeg
+Strict -1
+
+BitExact
+DctFastint
+IdctSimple
+VideoFrameRate 1
+VideoSize 352x288
+NoAudio
+
+PreRoll 2
+
+</Stream>
+
+<Stream test_small.jpg>
+
+Feed feed1.ffm
+Format jpeg
+Strict -1
+
+BitExact
+DctFastint
+IdctSimple
+VideoFrameRate 1
+VideoSize 160x128
+NoAudio
+
+PreRoll 2
+
+</Stream>
+
+<Stream test.mjpg>
+
+Feed feed1.ffm
+Format mpjpeg
+Strict -1
+
+BitExact
+DctFastint
+IdctSimple
+VideoFrameRate 1
+VideoSize    320x240
+NoAudio
+StartSendOnKey
+
+PreRoll 1
+MaxTime 100
+
+</Stream>
+
+
+##################################################################
+# Special stream : server status
+
+<Stream teststat.html>
+
+Format status
+
+</Stream>
+
diff --git a/tests/ffserver.regression.ref b/tests/ffserver.regression.ref
new file mode 100644
index 0000000000..fd8536c853
--- /dev/null
+++ b/tests/ffserver.regression.ref
@@ -0,0 +1,11 @@
+0c9639f09decbc54c9f091dcf1ca0e8f *ff-test_h.avi
+e28ba75853caf975e06d92955c9f7f73 *ff-test_l.avi
+a767dbdf5d1bded3450279f812f97b37 *ff-test.swf
+ca209a0c67afbd3bc3bcde0840f313fc *ff-test_h.asf
+f97a91609bfc8a1857455f17c5ec101c *ff-test_l.asf
+06f5a6a4c5d1c6735f4d0068e825c91f *ff-test_h.rm
+1f57580f02f0317407b3b82a3d5e093f *ff-test_l.rm
+e04e6ebf9584654df131f5eec881ac38 *ff-test.jpg
+f15d43e9d3630601b61a024023249bb8 *ff-test_small.jpg
+4735c72cde67000f12e9d1dbfbd975a7 *ff-test.mjpg
+fd038af80560e15271ce42651093ee43 *ff-stat
diff --git a/tests/filtergraphs/alphamerge_alphaextract_rgb b/tests/filtergraphs/alphamerge_alphaextract_rgb
new file mode 100644
index 0000000000..1aa302de39
--- /dev/null
+++ b/tests/filtergraphs/alphamerge_alphaextract_rgb
@@ -0,0 +1,4 @@
+sws_flags=+accurate_rnd+bitexact;
+format=bgra, split, alphamerge, split [x][y];
+[y]        alphaextract [alpha];
+[x][alpha] alphamerge
diff --git a/tests/filtergraphs/alphamerge_alphaextract_yuv b/tests/filtergraphs/alphamerge_alphaextract_yuv
new file mode 100644
index 0000000000..ef3ea14a44
--- /dev/null
+++ b/tests/filtergraphs/alphamerge_alphaextract_yuv
@@ -0,0 +1,4 @@
+sws_flags=+accurate_rnd+bitexact;
+format=yuv420p, split, alphamerge, split [x][y];
+[y]        alphaextract [alpha];
+[x][alpha] alphamerge
diff --git a/tests/filtergraphs/anequalizer b/tests/filtergraphs/anequalizer
new file mode 100644
index 0000000000..fd4a86f49e
--- /dev/null
+++ b/tests/filtergraphs/anequalizer
@@ -0,0 +1 @@
+anequalizer='c0 f=200 w=200 g=-80 t=1'
diff --git a/tests/filtergraphs/colorkey b/tests/filtergraphs/colorkey
new file mode 100644
index 0000000000..207389ca28
--- /dev/null
+++ b/tests/filtergraphs/colorkey
@@ -0,0 +1,2 @@
+sws_flags=+accurate_rnd+bitexact;
+[1]colorkey=black:0.2:0.5[t],[0][t]overlay=10:main_h-overlay_h-10
diff --git a/tests/filtergraphs/compand b/tests/filtergraphs/compand
new file mode 100644
index 0000000000..b1fdd98142
--- /dev/null
+++ b/tests/filtergraphs/compand
@@ -0,0 +1 @@
+compand='points=-80/-80|-9/-9|0/-5.3|20/2.9'
diff --git a/tests/filtergraphs/concat b/tests/filtergraphs/concat
new file mode 100644
index 0000000000..26bca14c3a
--- /dev/null
+++ b/tests/filtergraphs/concat
@@ -0,0 +1,8 @@
+testsrc=r=5:n=1:d=2 [v1];
+sine=440:b=2:d=1    [a1];
+testsrc=r=5:n=1:d=1 [v2];
+sine=622:b=2:d=2    [a2];
+testsrc=r=5:n=1:d=1 [v3];
+sine=880:b=2:d=1    [a3];
+
+[v1][a1][v2][a2][v3][a3] concat=v=1:a=1:n=3
diff --git a/tests/filtergraphs/firequalizer b/tests/filtergraphs/firequalizer
new file mode 100644
index 0000000000..777dfddc37
--- /dev/null
+++ b/tests/filtergraphs/firequalizer
@@ -0,0 +1,29 @@
+firequalizer    =
+    fft2        = on:
+    gain        = 'sin(0.001*f) - 1':
+    delay       = 0.05,
+
+firequalizer    =
+    gain        = 'if (ch, -0.7 * sin(0.001*f), -0.2 * sin(0.001*f)) - 1':
+    delay       = 0.1:
+    fixed       = on:
+    multi       = on:
+    zero_phase  = on:
+    wfunc       = nuttall,
+
+firequalizer    =
+    fft2        = on:
+    gain_entry  = 'entry(1000, 0); entry(5000, 0.1); entry(10000, 0.2)',
+
+firequalizer    =
+    gain        = 'if (ch, -0.3 * sin(0.001*f), -0.8 * sin(0.001*f)) - 1':
+    delay       = 0.05:
+    multi       = on,
+
+firequalizer    =
+    gain_entry  = 'entry(1000, 0.2); entry(5000, 0.1); entry(10000, 0)',
+
+volume          = 2.8dB,
+
+atrim           =
+    start       = 0.12
diff --git a/tests/filtergraphs/gradfun b/tests/filtergraphs/gradfun
new file mode 100644
index 0000000000..d93dcafe22
--- /dev/null
+++ b/tests/filtergraphs/gradfun
@@ -0,0 +1,2 @@
+sws_flags=+accurate_rnd+bitexact;
+format=gray, perms=random, gradfun=10:8:enable='not(between(n,5,10))'
diff --git a/tests/filtergraphs/hqdn3d b/tests/filtergraphs/hqdn3d
new file mode 100644
index 0000000000..75918226a4
--- /dev/null
+++ b/tests/filtergraphs/hqdn3d
@@ -0,0 +1 @@
+perms=random, hqdn3d=enable='not(between(t,5,6))'
diff --git a/tests/filtergraphs/hstack b/tests/filtergraphs/hstack
new file mode 100644
index 0000000000..ebee1ab443
--- /dev/null
+++ b/tests/filtergraphs/hstack
@@ -0,0 +1 @@
+hstack
diff --git a/tests/filtergraphs/mergeplanes b/tests/filtergraphs/mergeplanes
new file mode 100644
index 0000000000..0058a20f07
--- /dev/null
+++ b/tests/filtergraphs/mergeplanes
@@ -0,0 +1,2 @@
+sws_flags=+accurate_rnd+bitexact;
+format=yuv420p,mergeplanes=0:yuv444p
diff --git a/tests/filtergraphs/overlay b/tests/filtergraphs/overlay
index d646463bfd..f64827466d 100644
--- a/tests/filtergraphs/overlay
+++ b/tests/filtergraphs/overlay
@@ -1,2 +1,3 @@
+sws_flags=+accurate_rnd+bitexact;
 [1:v] scale=50:50 [over];
 [0:v][over] overlay=20:20
diff --git a/tests/filtergraphs/overlay-dvdsub-2397 b/tests/filtergraphs/overlay-dvdsub-2397
new file mode 100644
index 0000000000..64133ffe0f
--- /dev/null
+++ b/tests/filtergraphs/overlay-dvdsub-2397
@@ -0,0 +1,2 @@
+sws_flags=+accurate_rnd+bitexact;
+[0:v][0:s:1]overlay
diff --git a/tests/filtergraphs/overlay_nv12 b/tests/filtergraphs/overlay_nv12
new file mode 100644
index 0000000000..ec82cbef2e
--- /dev/null
+++ b/tests/filtergraphs/overlay_nv12
@@ -0,0 +1,5 @@
+sws_flags=+accurate_rnd+bitexact;
+split [main][over];
+[over] scale=88:72, pad=96:80:4:4 [overf];
+[main] format=nv12 [mainf];
+[mainf][overf] overlay=240:16:format=yuv420, format=yuv420p
diff --git a/tests/filtergraphs/overlay_nv21 b/tests/filtergraphs/overlay_nv21
new file mode 100644
index 0000000000..9c30d07b26
--- /dev/null
+++ b/tests/filtergraphs/overlay_nv21
@@ -0,0 +1,5 @@
+sws_flags=+accurate_rnd+bitexact;
+split [main][over];
+[over] scale=88:72, pad=96:80:4:4 [overf];
+[main] format=nv21 [mainf];
+[mainf][overf] overlay=240:16:format=yuv420, format=yuv420p
diff --git a/tests/filtergraphs/overlay_rgb b/tests/filtergraphs/overlay_rgb
new file mode 100644
index 0000000000..b060c0176b
--- /dev/null
+++ b/tests/filtergraphs/overlay_rgb
@@ -0,0 +1,4 @@
+sws_flags=+accurate_rnd+bitexact;
+split [main][over];
+[over] scale=88:72, pad=96:80:4:4 [overf];
+[main][overf] overlay=240:16:format=rgb
diff --git a/tests/filtergraphs/overlay_yuv420 b/tests/filtergraphs/overlay_yuv420
new file mode 100644
index 0000000000..9ed1b2a57e
--- /dev/null
+++ b/tests/filtergraphs/overlay_yuv420
@@ -0,0 +1,4 @@
+sws_flags=+accurate_rnd+bitexact;
+split [main][over];
+[over] scale=88:72, pad=96:80:4:4 [overf];
+[main][overf] overlay=240:16:format=yuv420
diff --git a/tests/filtergraphs/overlay_yuv422 b/tests/filtergraphs/overlay_yuv422
new file mode 100644
index 0000000000..e5df859381
--- /dev/null
+++ b/tests/filtergraphs/overlay_yuv422
@@ -0,0 +1,4 @@
+sws_flags=+accurate_rnd+bitexact;
+split [main][over];
+[over] scale=88:72, pad=96:80:4:4 [overf];
+[main][overf] overlay=240:16:format=yuv422
diff --git a/tests/filtergraphs/overlay_yuv444 b/tests/filtergraphs/overlay_yuv444
new file mode 100644
index 0000000000..bda0fd6860
--- /dev/null
+++ b/tests/filtergraphs/overlay_yuv444
@@ -0,0 +1,4 @@
+sws_flags=+accurate_rnd+bitexact;
+split [main][over];
+[over] scale=88:72, pad=96:80:4:4 [overf];
+[main][overf] overlay=240:16:format=yuv444
diff --git a/tests/filtergraphs/scale2ref_keep_aspect b/tests/filtergraphs/scale2ref_keep_aspect
new file mode 100644
index 0000000000..f407460ec7
--- /dev/null
+++ b/tests/filtergraphs/scale2ref_keep_aspect
@@ -0,0 +1,5 @@
+sws_flags=+accurate_rnd+bitexact;
+testsrc=size=320x240 [main];
+testsrc=size=640x360 [ref];
+[main][ref] scale2ref=iw/4:ow/mdar [main][ref];
+[ref] nullsink
diff --git a/tests/filtergraphs/scalenorm b/tests/filtergraphs/scalenorm
new file mode 100644
index 0000000000..17b69de186
--- /dev/null
+++ b/tests/filtergraphs/scalenorm
@@ -0,0 +1,4 @@
+sws_flags=+accurate_rnd+bitexact;
+testsrc=s=128x96  : d=1:r=5, format=yuv420p [a];
+testsrc=s=160x120 : d=1:r=5                 [b];
+[a][b] concat=unsafe=1, scale=flags=+accurate_rnd+bitexact
diff --git a/tests/filtergraphs/vstack b/tests/filtergraphs/vstack
new file mode 100644
index 0000000000..9f0e13cab7
--- /dev/null
+++ b/tests/filtergraphs/vstack
@@ -0,0 +1 @@
+vstack
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index fd4f5548d0..45c877e4ac 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -11,17 +11,37 @@ set -e
 
 eval do_$test=y
 
+ENC_OPTS="$ENC_OPTS -metadata title=lavftest"
+
+do_lavf_fate()
+{
+    file=${outfile}lavf.$1
+    input="${target_samples}/$2"
+    do_avconv $file $DEC_OPTS -i "$input" $ENC_OPTS -vcodec copy -acodec copy
+    do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
+}
+
 do_lavf()
 {
     file=${outfile}lavf.$1
-    do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $2 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $3
+    do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $2 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $3
     do_avconv_crc $file $DEC_OPTS -i $target_path/$file $4
 }
 
+do_lavf_timecode_nodrop() { do_lavf $1 "" "$2 -timecode 02:56:14:13"; }
+do_lavf_timecode_drop()   { do_lavf $1 "" "$2 -timecode 02:56:14.13 -r 30000/1001"; }
+
+do_lavf_timecode()
+{
+    do_lavf_timecode_nodrop "$@"
+    do_lavf_timecode_drop "$@"
+    do_lavf $1 "" "$2"
+}
+
 do_streamed_images()
 {
     file=${outfile}${1}pipe.$1
-    do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src -f image2pipe $ENC_OPTS -t 1 -qscale 10
+    do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src -f image2pipe $ENC_OPTS -t 1 -qscale 10
     do_avconv_crc $file $DEC_OPTS -f image2pipe -i $target_path/$file
 }
 
@@ -30,9 +50,9 @@ do_image_formats()
     outfile="$datadir/images/$1/"
     mkdir -p "$outfile"
     file=${outfile}%02d.$1
-    run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $2 $ENC_OPTS $3 -frames 12 -y -qscale 10 $target_path/$file
+    run_avconv $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $2 $ENC_OPTS -frames 13 -y -qscale 10 $target_path/$file
     do_md5sum ${outfile}02.$1
-    do_avconv_crc $file $DEC_OPTS $3 -i $target_path/$file
+    do_avconv_crc $file $DEC_OPTS -i $target_path/$file $3
     echo $(wc -c ${outfile}02.$1)
 }
 
@@ -44,69 +64,142 @@ do_audio_only()
 }
 
 if [ -n "$do_avi" ] ; then
-do_lavf avi "" "-c:a mp2 -ar 44100"
+do_lavf avi "" "-acodec mp2 -ar 44100 -ab 64k -threads 1"
 fi
 
 if [ -n "$do_asf" ] ; then
-do_lavf asf "" "-c:a mp2 -ar 44100" "-r 25"
+do_lavf asf "" "-acodec mp2 -ar 44100 -ab 64k" "-r 25"
 fi
 
 if [ -n "$do_rm" ] ; then
 file=${outfile}lavf.rm
-do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -c:a ac3_fixed -b:a 64k
+do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed -ab 64k
 # broken
 #do_avconv_crc $file -i $target_path/$file
 fi
 
 if [ -n "$do_mpg" ] ; then
-do_lavf mpg "" "-ar 44100"
+do_lavf_timecode mpg "-ab 64k -ar 44100 -threads 1"
 fi
 
 if [ -n "$do_mxf" ] ; then
-do_lavf mxf "-ar 48000" "-bf 2 -timecode_frame_start 264363"
+do_lavf_timecode mxf "-ar 48000 -bf 2 -threads 1"
 fi
 
 if [ -n "$do_mxf_d10" ]; then
-do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -c:v mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
+do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -vcodec mpeg2video -g 0 -flags +ildct+low_delay -dc 10 -non_linear_quant 1 -intra_vlc 1 -qscale 1 -ps 1 -qmin 1 -rc_max_vbv_use 1 -rc_min_vbv_use 1 -pix_fmt yuv422p -minrate 30000k -maxrate 30000k -b 30000k -bufsize 1200000 -top 1 -rc_init_occupancy 1200000 -qmax 12 -f mxf_d10"
+fi
+
+if [ -n "$do_mxf_dv25" ]; then
+do_lavf mxf_dv25 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=4/3 -vcodec dvvideo -pix_fmt yuv420p -b 25000k -top 0 -f mxf"
+fi
+
+if [ -n "$do_mxf_dvcpro50" ]; then
+do_lavf mxf_dvcpro50 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,setdar=16/9 -vcodec dvvideo -pix_fmt yuv422p -b 50000k -top 0 -f mxf"
+fi
+
+if [ -n "$do_mxf_opatom" ]; then
+do_lavf mxf_opatom "" "-s 1920x1080 -vcodec dnxhd -pix_fmt yuv422p -vb 36M -f mxf_opatom -map 0"
+fi
+
+if [ -n "$do_mxf_opatom_audio" ]; then
+do_lavf mxf_opatom_audio "-ar 48000 -ac 1" "-f mxf_opatom -mxf_audio_edit_rate 25 -map 1"
 fi
 
 if [ -n "$do_ts" ] ; then
-do_lavf ts "" "-mpegts_transport_stream_id 42 -ar 44100"
+do_lavf ts "" "-ab 64k -mpegts_transport_stream_id 42 -ar 44100 -threads 1"
 fi
 
 if [ -n "$do_swf" ] ; then
 do_lavf swf "" "-an"
 fi
 
+if [ -n "$do_ffm" ] ; then
+do_lavf ffm "" "-ar 44100 -threads 1"
+fi
+
+if [ -n "$do_flm" ] ; then
+do_lavf flm "" "-pix_fmt rgba"
+fi
+
 if [ -n "$do_flv_fmt" ] ; then
 do_lavf flv "" "-an"
 fi
 
 if [ -n "$do_mov" ] ; then
-do_lavf mov "" "-c:a pcm_alaw -c:v mpeg4"
+mov_common_opt="-acodec pcm_alaw -vcodec mpeg4 -threads 1"
+do_lavf mov "" "-movflags +rtphint $mov_common_opt"
+do_lavf_timecode mov "-movflags +faststart $mov_common_opt"
+do_lavf_timecode mp4 "-vcodec mpeg4 -an -threads 1"
+fi
+
+if [ -n "$do_ismv" ] ; then
+do_lavf_timecode ismv "-an -vcodec mpeg4 -threads 1"
 fi
 
 if [ -n "$do_dv_fmt" ] ; then
+do_lavf_timecode_nodrop dv "-ar 48000 -r 25 -s pal -ac 2"
+do_lavf_timecode_drop   dv "-ar 48000 -pix_fmt yuv411p -s ntsc -ac 2"
 do_lavf dv "-ar 48000 -channel_layout stereo" "-r 25 -s pal"
 fi
 
 if [ -n "$do_gxf" ] ; then
-do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1"
+do_lavf_timecode_nodrop gxf "-ar 48000 -r 25 -s pal -ac 1 -threads 1"
+do_lavf_timecode_drop   gxf "-ar 48000 -s ntsc -ac 1 -threads 1"
+do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1 -threads 1"
 fi
 
 if [ -n "$do_nut" ] ; then
-do_lavf nut "" "-c:a mp2 -ar 44100"
+do_lavf nut "" "-acodec mp2 -ab 64k -ar 44100 -threads 1"
+fi
+
+if [ -n "$do_mka" ] ; then
+do_audio_only mka "" "-c:a tta"
 fi
 
 if [ -n "$do_mkv" ] ; then
-do_lavf mkv "" "-c:a mp2 -c:v mpeg4 -ar 44100"
+do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 \
+ -attach ${raw_src%/*}/00.pgm -metadata:s:t mimetype=image/x-portable-greymap -threads 1"
+do_lavf mkv "" "-acodec mp2 -ab 64k -vcodec mpeg4 -ar 44100 -threads 1"
+fi
+
+if [ -n "$do_mp3" ] ; then
+do_lavf_fate mp3 "mp3-conformance/he_32khz.bit" "-acodec copy"
+fi
+
+if [ -n "$do_latm" ] ; then
+do_lavf_fate latm "aac/al04_44.mp4" "-acodec copy"
+fi
+
+if [ -n "$do_ogg_vp3" ] ; then
+# -idct simple causes different results on different systems
+DEC_OPTS="$DEC_OPTS -idct auto"
+do_lavf_fate ogg "vp3/coeff_level64.mkv"
+fi
+
+if [ -n "$do_ogg_vp8" ] ; then
+do_lavf_fate ogv "vp8/RRSF49-short.webm" "-acodec copy"
+fi
+
+if [ -n "$do_mov_qtrle_mace6" ] ; then
+DEC_OPTS="$DEC_OPTS -idct auto"
+do_lavf_fate mov "qtrle/Animation-16Greys.mov"
+fi
+
+if [ -n "$do_avi_cram" ] ; then
+DEC_OPTS="$DEC_OPTS -idct auto"
+do_lavf_fate avi "cram/toon.avi"
+fi
+
+if [ -n "$do_wtv" ] ; then
+do_lavf wtv "" "-acodec mp2 -threads 1"
 fi
 
 
 # streamed images
 # mjpeg
 #file=${outfile}lavf.mjpeg
-#do_avconv $file -t 1 -qscale 10 -f image2 -c:v pgmyuv -i $raw_src
+#do_avconv $file -t 1 -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src
 #do_avconv_crc $file -i $target_path/$file
 
 if [ -n "$do_pbmpipe" ] ; then
@@ -123,16 +216,37 @@ fi
 
 if [ -n "$do_gif" ] ; then
 file=${outfile}lavf.gif
-do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10 -pix_fmt rgb24
+do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10 -pix_fmt rgb24
+do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24
+fi
+
+if [ -n "$do_apng" ] ; then
+file=${outfile}lavf.apng
+do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1 -pix_fmt rgb24
+do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24
+file_copy=${outfile}lavf.copy.apng
+do_avconv $file_copy $DEC_OPTS -i $file $ENC_OPTS -c copy
+do_avconv_crc $file_copy $DEC_OPTS -i $target_path/$file_copy
+file=${outfile}lavf.png
+do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -pix_fmt rgb24 -frames:v 1 -f apng
 do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24
 fi
 
 if [ -n "$do_yuv4mpeg" ] ; then
 file=${outfile}lavf.y4m
-do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
+do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10
 #do_avconv_crc $file -i $target_path/$file
 fi
 
+if [ -n "$do_fits" ] ; then
+pix_fmts="gray gray16be gbrp gbrap gbrp16be gbrap16be"
+for pix_fmt in $pix_fmts ; do
+    file=${outfile}${pix_fmt}lavf.fits
+    do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -pix_fmt $pix_fmt
+    do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt $pix_fmt
+done
+fi
+
 # image formats
 
 if [ -n "$do_pgm" ] ; then
@@ -145,6 +259,12 @@ fi
 
 if [ -n "$do_png" ] ; then
 do_image_formats png
+do_image_formats png "-pix_fmt gray16be"
+do_image_formats png "-pix_fmt rgb48be"
+fi
+
+if [ -n "$do_xbm" ] ; then
+do_image_formats xbm
 fi
 
 if [ -n "$do_bmp" ] ; then
@@ -164,23 +284,40 @@ do_image_formats sgi
 fi
 
 if [ -n "$do_jpg" ] ; then
-do_image_formats jpg "-pix_fmt yuvj420p" "-f image2"
+do_image_formats jpg "-pix_fmt yuvj420p"
 fi
 
 if [ -n "$do_pam" ] ; then
 do_image_formats pam
+do_image_formats pam "-pix_fmt rgba"
+do_image_formats pam "-pix_fmt gray"
+do_image_formats pam "-pix_fmt gray16be" "-pix_fmt gray16be"
+do_image_formats pam "-pix_fmt rgb48be" "-pix_fmt rgb48be"
+do_image_formats pam "-pix_fmt monob"
 fi
 
 if [ -n "$do_pcx" ] ; then
 do_image_formats pcx
 fi
 
-if [ -n "$do_xwd" ] ; then
-do_image_formats xwd
-fi
-
 if [ -n "$do_dpx" ] ; then
 do_image_formats dpx
+do_image_formats dpx "-pix_fmt gbrp10le" "-pix_fmt gbrp10le"
+do_image_formats dpx "-pix_fmt gbrp12le" "-pix_fmt gbrp12le"
+do_image_formats dpx "-pix_fmt rgb48le"
+do_image_formats dpx "-pix_fmt rgb48le -bits_per_raw_sample 10" "-pix_fmt rgb48le"
+do_image_formats dpx "-pix_fmt rgba64le"
+fi
+
+if [ -n "$do_xwd" ] ; then
+do_image_formats xwd
+do_image_formats xwd "-pix_fmt rgba"
+do_image_formats xwd "-pix_fmt rgb565be"
+do_image_formats xwd "-pix_fmt rgb555be"
+do_image_formats xwd "-pix_fmt rgb8"
+do_image_formats xwd "-pix_fmt rgb4_byte"
+do_image_formats xwd "-pix_fmt gray"
+do_image_formats xwd "-pix_fmt monow"
 fi
 
 if [ -n "$do_sunrast" ] ; then
@@ -193,6 +330,15 @@ if [ -n "$do_wav" ] ; then
 do_audio_only wav
 fi
 
+if [ -n "$do_wav_peak" ] ; then
+do_audio_only peak.wav "" "-write_peak on"
+fi
+
+if [ -n "$do_wav_peak_only" ] ; then
+file=${outfile}lavf.peak_only.wav
+do_avconv $file $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -write_peak only
+fi
+
 if [ -n "$do_alaw" ] ; then
 do_audio_only al "" "" "-ar 44100"
 fi
@@ -214,11 +360,11 @@ do_audio_only aif
 fi
 
 if [ -n "$do_voc" ] ; then
-do_audio_only voc
+do_audio_only voc "" "-acodec pcm_u8"
 fi
 
 if [ -n "$do_voc_s16" ] ; then
-do_audio_only s16.voc "-ac 2" "-c:a pcm_s16le"
+do_audio_only s16.voc "-ac 2" "-acodec pcm_s16le"
 fi
 
 if [ -n "$do_ogg" ] ; then
@@ -229,10 +375,38 @@ if [ -n "$do_rso" ] ; then
 do_audio_only rso
 fi
 
+if [ -n "$do_smjpeg" ] ; then
+do_lavf smjpeg "" "-f smjpeg"
+fi
+
 if [ -n "$do_sox" ] ; then
 do_audio_only sox
 fi
 
+if [ -n "$do_tta" ] ; then
+do_audio_only tta
+fi
+
+if [ -n "$do_caf" ] ; then
+do_audio_only caf
+fi
+
+if [ -n "$do_ast" ] ; then
+do_audio_only ast "-ac 2" "-loopstart 1 -loopend 10"
+fi
+
+if [ -n "$do_ircam" ] ; then
+do_audio_only ircam
+fi
+
+if [ -n "$do_w64" ] ; then
+do_audio_only w64
+fi
+
+if [ -n "$do_wv" ] ; then
+do_audio_only wv
+fi
+
 # pix_fmt conversions
 
 if [ -n "$do_pixfmt" ] ; then
@@ -243,7 +417,7 @@ conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
              monob yuv440p yuvj440p"
 for pix_fmt in $conversions ; do
     file=${outfile}${pix_fmt}.yuv
-    run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \
+    run_avconv $DEC_OPTS -r 1 -f image2 -vcodec pgmyuv -i $raw_src \
                $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst
     do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $target_path/$raw_dst \
                     $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
diff --git a/tests/md5.sh b/tests/md5.sh
index 0b382b1a5e..5e2528cc75 100644
--- a/tests/md5.sh
+++ b/tests/md5.sh
@@ -5,7 +5,7 @@ if [ X"$(echo | md5sum -b 2> /dev/null)" != X ]; then
 elif [ X"$(echo | command md5 2> /dev/null)" != X ]; then
     do_md5sum() { command md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; }
 elif [ -x /sbin/md5 ]; then
-    do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; }
+    do_md5sum() { /sbin/md5 -r $1 | sed 's/\([0-9a-f]\) [ *]*/\1 */'; }
 elif openssl version >/dev/null 2>&1; then
     do_md5sum() { openssl md5 $1 | sed 's/MD5(\(.*\))= \(.*\)/\2 *\1/'; }
 else
diff --git a/tests/ref/acodec/adpcm-adx b/tests/ref/acodec/adpcm-adx
index 2bc49ab94b..8c401001b8 100644
--- a/tests/ref/acodec/adpcm-adx
+++ b/tests/ref/acodec/adpcm-adx
@@ -1,4 +1,4 @@
-0a30509d9296b857e134b762b76dbc31 *tests/data/fate/acodec-adpcm-adx.adx
+6bf1a8e5ec9cc958a31cb2b1b66bfc75 *tests/data/fate/acodec-adpcm-adx.adx
 297720 tests/data/fate/acodec-adpcm-adx.adx
-2dbc601ed5259f4d74dc48ccd8da7eaf *tests/data/fate/acodec-adpcm-adx.out.wav
-stddev: 6989.46 PSNR: 19.44 MAXDIFF:65398 bytes:  1058400/  1058432
+5b5a436ec9d528d6eb0bebaf667521b0 *tests/data/fate/acodec-adpcm-adx.out.wav
+stddev: 2549.93 PSNR: 28.20 MAXDIFF:57514 bytes:  1058400/  1058432
diff --git a/tests/ref/acodec/adpcm-adx-trellis b/tests/ref/acodec/adpcm-adx-trellis
new file mode 100644
index 0000000000..039f69f9db
--- /dev/null
+++ b/tests/ref/acodec/adpcm-adx-trellis
@@ -0,0 +1,4 @@
+6bf1a8e5ec9cc958a31cb2b1b66bfc75 *tests/data/fate/acodec-adpcm-adx-trellis.adx
+297720 tests/data/fate/acodec-adpcm-adx-trellis.adx
+5b5a436ec9d528d6eb0bebaf667521b0 *tests/data/fate/acodec-adpcm-adx-trellis.out.wav
+stddev: 2549.93 PSNR: 28.20 MAXDIFF:57514 bytes:  1058400/  1058432
diff --git a/tests/ref/acodec/adpcm-ima_qt b/tests/ref/acodec/adpcm-ima_qt
index 80015275fc..364dfa1e0e 100644
--- a/tests/ref/acodec/adpcm-ima_qt
+++ b/tests/ref/acodec/adpcm-ima_qt
@@ -1,4 +1,4 @@
-23cbae1182e150ebf28e0abfb9cba127 *tests/data/fate/acodec-adpcm-ima_qt.aiff
+44691f14cf5bbef5005df27c692b93ab *tests/data/fate/acodec-adpcm-ima_qt.aiff
 281252 tests/data/fate/acodec-adpcm-ima_qt.aiff
-b0fafd002c38fb70acaddfda1a31ed61 *tests/data/fate/acodec-adpcm-ima_qt.out.wav
+7d2f26ea48731b2399718de0f6c39f0c *tests/data/fate/acodec-adpcm-ima_qt.out.wav
 stddev:  904.76 PSNR: 37.20 MAXDIFF:34029 bytes:  1058400/  1058560
diff --git a/tests/ref/acodec/adpcm-ima_qt-trellis b/tests/ref/acodec/adpcm-ima_qt-trellis
new file mode 100644
index 0000000000..0a09965e1e
--- /dev/null
+++ b/tests/ref/acodec/adpcm-ima_qt-trellis
@@ -0,0 +1,4 @@
+15f895c2e7119714f94333e3214d8426 *tests/data/fate/acodec-adpcm-ima_qt-trellis.aiff
+281252 tests/data/fate/acodec-adpcm-ima_qt-trellis.aiff
+593d68369c87d4e3b7323b1bea3e9315 *tests/data/fate/acodec-adpcm-ima_qt-trellis.out.wav
+stddev:  716.74 PSNR: 39.22 MAXDIFF:29633 bytes:  1058400/  1058560
diff --git a/tests/ref/acodec/adpcm-ima_wav b/tests/ref/acodec/adpcm-ima_wav
index 6d83fd5f1c..bd3306dfc5 100644
--- a/tests/ref/acodec/adpcm-ima_wav
+++ b/tests/ref/acodec/adpcm-ima_wav
@@ -1,4 +1,4 @@
 56b75c3a6dacedcf2ce7b0586aa33594 *tests/data/fate/acodec-adpcm-ima_wav.wav
 267324 tests/data/fate/acodec-adpcm-ima_wav.wav
-ddddfa47302da540abf19224202bef57 *tests/data/fate/acodec-adpcm-ima_wav.out.wav
+78a2af1c895792d0c221d127bdd48ece *tests/data/fate/acodec-adpcm-ima_wav.out.wav
 stddev:  903.51 PSNR: 37.21 MAXDIFF:34026 bytes:  1058400/  1061748
diff --git a/tests/ref/acodec/adpcm-ima_wav-trellis b/tests/ref/acodec/adpcm-ima_wav-trellis
new file mode 100644
index 0000000000..10d78c74f2
--- /dev/null
+++ b/tests/ref/acodec/adpcm-ima_wav-trellis
@@ -0,0 +1,4 @@
+f9075c7a3adb2cd114b0bac69afcada6 *tests/data/fate/acodec-adpcm-ima_wav-trellis.wav
+267324 tests/data/fate/acodec-adpcm-ima_wav-trellis.wav
+26a9b280c14737b159c56e60181f1170 *tests/data/fate/acodec-adpcm-ima_wav-trellis.out.wav
+stddev:  710.03 PSNR: 39.30 MAXDIFF:25944 bytes:  1058400/  1061748
diff --git a/tests/ref/acodec/adpcm-ms b/tests/ref/acodec/adpcm-ms
index eb8515d986..c760b783c2 100644
--- a/tests/ref/acodec/adpcm-ms
+++ b/tests/ref/acodec/adpcm-ms
@@ -1,4 +1,4 @@
 a407b87daeef5b25dfb6c5b3f519e9c1 *tests/data/fate/acodec-adpcm-ms.wav
 268378 tests/data/fate/acodec-adpcm-ms.wav
-22863fb278c4e0ebe9c34cb15db5dd6b *tests/data/fate/acodec-adpcm-ms.out.wav
+7be370f937c51e8a967e6a3d08d5156a *tests/data/fate/acodec-adpcm-ms.out.wav
 stddev: 1050.01 PSNR: 35.91 MAXDIFF:29806 bytes:  1058400/  1060576
diff --git a/tests/ref/acodec/adpcm-ms-trellis b/tests/ref/acodec/adpcm-ms-trellis
new file mode 100644
index 0000000000..8587e703c6
--- /dev/null
+++ b/tests/ref/acodec/adpcm-ms-trellis
@@ -0,0 +1,4 @@
+7ed05f7a88046aa4cd547ddf71953637 *tests/data/fate/acodec-adpcm-ms-trellis.wav
+268378 tests/data/fate/acodec-adpcm-ms-trellis.wav
+ed9d9cdfd264f2ec6c79127c04dd224e *tests/data/fate/acodec-adpcm-ms-trellis.out.wav
+stddev:  896.03 PSNR: 37.28 MAXDIFF:28029 bytes:  1058400/  1060576
diff --git a/tests/ref/acodec/adpcm-swf b/tests/ref/acodec/adpcm-swf
index fddb771c8b..2cb9e905ca 100644
--- a/tests/ref/acodec/adpcm-swf
+++ b/tests/ref/acodec/adpcm-swf
@@ -1,4 +1,4 @@
 42d4639866ed4d692eaf126228a4fa2a *tests/data/fate/acodec-adpcm-swf.flv
 269166 tests/data/fate/acodec-adpcm-swf.flv
-f7df69d3fe708303820f2a9d00140a5b *tests/data/fate/acodec-adpcm-swf.out.wav
+628089745a7059ae4055c2515b6d668b *tests/data/fate/acodec-adpcm-swf.out.wav
 stddev:  933.58 PSNR: 36.93 MAXDIFF:51119 bytes:  1058400/  1064960
diff --git a/tests/ref/acodec/adpcm-swf-trellis b/tests/ref/acodec/adpcm-swf-trellis
new file mode 100644
index 0000000000..a2bb565e1c
--- /dev/null
+++ b/tests/ref/acodec/adpcm-swf-trellis
@@ -0,0 +1,4 @@
+ec8859b3206ea0c45701fbdcf60dbe48 *tests/data/fate/acodec-adpcm-swf-trellis.flv
+269166 tests/data/fate/acodec-adpcm-swf-trellis.flv
+29820ce5b95b3b0a2feafa808cc264a7 *tests/data/fate/acodec-adpcm-swf-trellis.out.wav
+stddev:  747.92 PSNR: 38.85 MAXDIFF:51119 bytes:  1058400/  1064960
diff --git a/tests/ref/acodec/adpcm-yamaha b/tests/ref/acodec/adpcm-yamaha
index da60f44d58..f3e6dbede2 100644
--- a/tests/ref/acodec/adpcm-yamaha
+++ b/tests/ref/acodec/adpcm-yamaha
@@ -1,4 +1,4 @@
-e9c14f701d25947317db9367b9dc772d *tests/data/fate/acodec-adpcm-yamaha.wav
+245c194e84d482a70ca89de9c0bbd591 *tests/data/fate/acodec-adpcm-yamaha.wav
 265274 tests/data/fate/acodec-adpcm-yamaha.wav
-1488b5974fa040a65f0d407fc0224c6a *tests/data/fate/acodec-adpcm-yamaha.out.wav
-stddev: 1247.60 PSNR: 34.41 MAXDIFF:39895 bytes:  1058400/  1060864
+758b4aee62964831d0a335ada9672104 *tests/data/fate/acodec-adpcm-yamaha.out.wav
+stddev: 1242.71 PSNR: 34.44 MAXDIFF:39960 bytes:  1058400/  1060864
diff --git a/tests/ref/acodec/adpcm-yamaha-trellis b/tests/ref/acodec/adpcm-yamaha-trellis
new file mode 100644
index 0000000000..909a95139b
--- /dev/null
+++ b/tests/ref/acodec/adpcm-yamaha-trellis
@@ -0,0 +1,4 @@
+c8306ada93ef52b1e87b6758853f4937 *tests/data/fate/acodec-adpcm-yamaha-trellis.wav
+265274 tests/data/fate/acodec-adpcm-yamaha-trellis.wav
+8ad27b0ea7e13e70ed334b5ec26c62ef *tests/data/fate/acodec-adpcm-yamaha-trellis.out.wav
+stddev:  926.56 PSNR: 36.99 MAXDIFF:33570 bytes:  1058400/  1060864
diff --git a/tests/ref/acodec/adpcm_ima_qt b/tests/ref/acodec/adpcm_ima_qt
new file mode 100644
index 0000000000..a50c30a27c
--- /dev/null
+++ b/tests/ref/acodec/adpcm_ima_qt
@@ -0,0 +1,4 @@
+23cbae1182e150ebf28e0abfb9cba127 *./tests/data/acodec/adpcm_qt.aiff
+281252 ./tests/data/acodec/adpcm_qt.aiff
+b0fafd002c38fb70acaddfda1a31ed61 *./tests/data/adpcm_ima_qt.acodec.out.wav
+stddev:  904.76 PSNR: 37.20 MAXDIFF:34029 bytes:  1058560/  1058400
diff --git a/tests/ref/acodec/alac b/tests/ref/acodec/alac
index dde0e364fa..7d6ebe8c8b 100644
--- a/tests/ref/acodec/alac
+++ b/tests/ref/acodec/alac
@@ -1,4 +1,4 @@
-98cfcf6cf139844ca27d16f1fc64f62c *tests/data/fate/acodec-alac.mov
-389258 tests/data/fate/acodec-alac.mov
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-alac.out.wav
+8d9fb9f5433962e7880b666e6e2e428e *tests/data/fate/acodec-alac.mov
+389018 tests/data/fate/acodec-alac.mov
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-alac.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/flac b/tests/ref/acodec/flac
index 3ef32c26dc..c2e7f2099b 100644
--- a/tests/ref/acodec/flac
+++ b/tests/ref/acodec/flac
@@ -1,4 +1,4 @@
-f582b59cc68adfcb3342dcfd7e020b71 *tests/data/fate/acodec-flac.flac
-361581 tests/data/fate/acodec-flac.flac
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-flac.out.wav
+151eef9097f944726968bec48649f00a *tests/data/fate/acodec-flac.flac
+361582 tests/data/fate/acodec-flac.flac
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-flac.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/flac-exact-rice b/tests/ref/acodec/flac-exact-rice
new file mode 100644
index 0000000000..6f6d27427d
--- /dev/null
+++ b/tests/ref/acodec/flac-exact-rice
@@ -0,0 +1,4 @@
+aab144de213ae684ca008a3e0afe5e28 *tests/data/fate/acodec-flac-exact-rice.flac
+360454 tests/data/fate/acodec-flac-exact-rice.flac
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-flac-exact-rice.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/g723_1 b/tests/ref/acodec/g723_1
new file mode 100644
index 0000000000..e33fe3d207
--- /dev/null
+++ b/tests/ref/acodec/g723_1
@@ -0,0 +1,4 @@
+dec0deb2425e908d232d2471acff04a3 *tests/data/fate/acodec-g723_1.g723_1
+4800 tests/data/fate/acodec-g723_1.g723_1
+c3b9055d1830969c10d08762fae0b787 *tests/data/fate/acodec-g723_1.out.wav
+stddev: 8423.47 PSNR: 17.82 MAXDIFF:53292 bytes:    95992/    96000
diff --git a/tests/ref/acodec/mp2 b/tests/ref/acodec/mp2
index 42381b4784..57b83ac747 100644
--- a/tests/ref/acodec/mp2
+++ b/tests/ref/acodec/mp2
@@ -1,4 +1,4 @@
 f6eb0a205350bbd7fb1028a01c7ae8aa *tests/data/fate/acodec-mp2.mp2
 96130 tests/data/fate/acodec-mp2.mp2
-5a669ca7321adc6ab66a3eade4035909 *tests/data/fate/acodec-mp2.out.wav
+74c7b6b15a001add199619fafe4059a1 *tests/data/fate/acodec-mp2.out.wav
 stddev: 4384.33 PSNR: 23.49 MAXDIFF:52631 bytes:  1058400/  1057916
diff --git a/tests/ref/acodec/mp2fixed b/tests/ref/acodec/mp2fixed
new file mode 100644
index 0000000000..bf8cc7f372
--- /dev/null
+++ b/tests/ref/acodec/mp2fixed
@@ -0,0 +1,4 @@
+05445de0f0305df85db4ed0ce94e5f4c *tests/data/fate/acodec-mp2fixed.mp2
+288391 tests/data/fate/acodec-mp2fixed.mp2
+b1b4a13e42db11e9fb1bd2c93692d548 *tests/data/fate/acodec-mp2fixed.out.wav
+stddev: 3653.84 PSNR: 25.07 MAXDIFF:39970 bytes:  1058400/  1057916
diff --git a/tests/ref/acodec/pcm-alaw b/tests/ref/acodec/pcm-alaw
index 28ce960efe..00555e3341 100644
--- a/tests/ref/acodec/pcm-alaw
+++ b/tests/ref/acodec/pcm-alaw
@@ -1,4 +1,4 @@
 a2dd6a934ec6d5ec901a211652e85227 *tests/data/fate/acodec-pcm-alaw.wav
 529258 tests/data/fate/acodec-pcm-alaw.wav
-f323f7551ffad91de8613f44dcb198b6 *tests/data/fate/acodec-pcm-alaw.out.wav
+0568b0b9a72e31559e150e7e09d301cd *tests/data/fate/acodec-pcm-alaw.out.wav
 stddev:  101.67 PSNR: 56.19 MAXDIFF:  515 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-f32be b/tests/ref/acodec/pcm-f32be
index 5b0f4980d5..b98c0b7a23 100644
--- a/tests/ref/acodec/pcm-f32be
+++ b/tests/ref/acodec/pcm-f32be
@@ -1,4 +1,4 @@
-118ff3dc83c62ce9ce669eef57e55bb2 *tests/data/fate/acodec-pcm-f32be.au
-2116824 tests/data/fate/acodec-pcm-f32be.au
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-f32be.out.wav
+e74eb6b65cb397ce541bac120b00680a *tests/data/fate/acodec-pcm-f32be.au
+2116832 tests/data/fate/acodec-pcm-f32be.au
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-f32be.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-f32le b/tests/ref/acodec/pcm-f32le
index 681f0836c8..c0fdd70cd2 100644
--- a/tests/ref/acodec/pcm-f32le
+++ b/tests/ref/acodec/pcm-f32le
@@ -1,4 +1,4 @@
 653d82a64b7bd96ac193e105e9f92d4c *tests/data/fate/acodec-pcm-f32le.wav
 2116880 tests/data/fate/acodec-pcm-f32le.wav
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-f32le.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-f32le.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-f64be b/tests/ref/acodec/pcm-f64be
index dd882d38b8..e0e03079d0 100644
--- a/tests/ref/acodec/pcm-f64be
+++ b/tests/ref/acodec/pcm-f64be
@@ -1,4 +1,4 @@
-8112296b1ed94f72f20d04b1a54850a7 *tests/data/fate/acodec-pcm-f64be.au
-4233624 tests/data/fate/acodec-pcm-f64be.au
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-f64be.out.wav
+8c8ba9d2c68384c5f077306e220f1188 *tests/data/fate/acodec-pcm-f64be.au
+4233632 tests/data/fate/acodec-pcm-f64be.au
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-f64be.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-f64le b/tests/ref/acodec/pcm-f64le
index c6cb027220..5c90e7bbbd 100644
--- a/tests/ref/acodec/pcm-f64le
+++ b/tests/ref/acodec/pcm-f64le
@@ -1,4 +1,4 @@
 48b4cd378f47a50dc902aa03cc8280ed *tests/data/fate/acodec-pcm-f64le.wav
 4233680 tests/data/fate/acodec-pcm-f64le.wav
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-f64le.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-f64le.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-mulaw b/tests/ref/acodec/pcm-mulaw
index bd2a1e81b5..f5c117de18 100644
--- a/tests/ref/acodec/pcm-mulaw
+++ b/tests/ref/acodec/pcm-mulaw
@@ -1,4 +1,4 @@
 fd10ee54bd298fc29fd6fc70baa71414 *tests/data/fate/acodec-pcm-mulaw.wav
 529258 tests/data/fate/acodec-pcm-mulaw.wav
-7ae8c3fc804bd574006fd547fe28980c *tests/data/fate/acodec-pcm-mulaw.out.wav
+1c3eeaa8814ebd4916780dff80ed6dc5 *tests/data/fate/acodec-pcm-mulaw.out.wav
 stddev:  103.38 PSNR: 56.04 MAXDIFF:  644 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-s16be b/tests/ref/acodec/pcm-s16be
index 61e566471e..a9b4593b54 100644
--- a/tests/ref/acodec/pcm-s16be
+++ b/tests/ref/acodec/pcm-s16be
@@ -1,4 +1,4 @@
-b650d16f5ac191c41d5fa3657cf4c1ac *tests/data/fate/acodec-pcm-s16be.mov
-1060097 tests/data/fate/acodec-pcm-s16be.mov
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s16be.out.wav
+d2515f35266ae6dba525c700bb76d893 *tests/data/fate/acodec-pcm-s16be.mov
+1059069 tests/data/fate/acodec-pcm-s16be.mov
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s16be.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-s16be_planar b/tests/ref/acodec/pcm-s16be_planar
new file mode 100644
index 0000000000..12ebdee03f
--- /dev/null
+++ b/tests/ref/acodec/pcm-s16be_planar
@@ -0,0 +1,4 @@
+b2acc0309be76b5f6200b525281a9037 *tests/data/fate/acodec-pcm-s16be_planar.nut
+1060727 tests/data/fate/acodec-pcm-s16be_planar.nut
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s16be_planar.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-s16le b/tests/ref/acodec/pcm-s16le
index 51366ad0d7..5fa80bd7a2 100644
--- a/tests/ref/acodec/pcm-s16le
+++ b/tests/ref/acodec/pcm-s16le
@@ -1,4 +1,4 @@
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s16le.wav
-1058446 tests/data/fate/acodec-pcm-s16le.wav
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s16le.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s16le.wav
+1058444 tests/data/fate/acodec-pcm-s16le.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s16le.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-s16le_planar b/tests/ref/acodec/pcm-s16le_planar
new file mode 100644
index 0000000000..cc5c3c65ac
--- /dev/null
+++ b/tests/ref/acodec/pcm-s16le_planar
@@ -0,0 +1,4 @@
+15aa8f9d8ca30a17c7821acfcd9d87f9 *tests/data/fate/acodec-pcm-s16le_planar.nut
+1060727 tests/data/fate/acodec-pcm-s16le_planar.nut
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s16le_planar.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-s24be b/tests/ref/acodec/pcm-s24be
index f673040896..916aceb01b 100644
--- a/tests/ref/acodec/pcm-s24be
+++ b/tests/ref/acodec/pcm-s24be
@@ -1,4 +1,4 @@
-0bd99d1273fb1fb78055cf97f3efe299 *tests/data/fate/acodec-pcm-s24be.mov
-1589297 tests/data/fate/acodec-pcm-s24be.mov
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s24be.out.wav
+0f4a37a77619124f486f656f03c53d33 *tests/data/fate/acodec-pcm-s24be.mov
+1588323 tests/data/fate/acodec-pcm-s24be.mov
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s24be.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-s24le b/tests/ref/acodec/pcm-s24le
index a7e77e2fc1..cf5ae1a2ac 100644
--- a/tests/ref/acodec/pcm-s24le
+++ b/tests/ref/acodec/pcm-s24le
@@ -1,4 +1,4 @@
 18ea73985dbdf59e23f5aba66145e6fe *tests/data/fate/acodec-pcm-s24le.wav
 1587668 tests/data/fate/acodec-pcm-s24le.wav
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s24le.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s24le.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-s24le_planar b/tests/ref/acodec/pcm-s24le_planar
new file mode 100644
index 0000000000..5e83a1904d
--- /dev/null
+++ b/tests/ref/acodec/pcm-s24le_planar
@@ -0,0 +1,4 @@
+1c746862c9d79c57e275266f63822b29 *tests/data/fate/acodec-pcm-s24le_planar.nut
+1590256 tests/data/fate/acodec-pcm-s24le_planar.nut
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s24le_planar.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-s32be b/tests/ref/acodec/pcm-s32be
index 1b6dec962c..5a48bb2757 100644
--- a/tests/ref/acodec/pcm-s32be
+++ b/tests/ref/acodec/pcm-s32be
@@ -1,4 +1,4 @@
-7ebffb0bd01c02b9953ee5b1e2f47910 *tests/data/fate/acodec-pcm-s32be.mov
-2118497 tests/data/fate/acodec-pcm-s32be.mov
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s32be.out.wav
+d6380bf54ac3e452c190ce302c264bf0 *tests/data/fate/acodec-pcm-s32be.mov
+2117527 tests/data/fate/acodec-pcm-s32be.mov
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s32be.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-s32le b/tests/ref/acodec/pcm-s32le
index 1c3e412427..47c736b9c1 100644
--- a/tests/ref/acodec/pcm-s32le
+++ b/tests/ref/acodec/pcm-s32le
@@ -1,4 +1,4 @@
 8d8849fa5c5d91b9cb74f5c74e937faf *tests/data/fate/acodec-pcm-s32le.wav
 2116868 tests/data/fate/acodec-pcm-s32le.wav
-64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-s32le.out.wav
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s32le.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-s32le_planar b/tests/ref/acodec/pcm-s32le_planar
new file mode 100644
index 0000000000..ff3051bf84
--- /dev/null
+++ b/tests/ref/acodec/pcm-s32le_planar
@@ -0,0 +1,4 @@
+d142973733ff4d61644b704438a4ba32 *tests/data/fate/acodec-pcm-s32le_planar.nut
+2120202 tests/data/fate/acodec-pcm-s32le_planar.nut
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-s32le_planar.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-s8 b/tests/ref/acodec/pcm-s8
index c947729924..14f4c8562b 100644
--- a/tests/ref/acodec/pcm-s8
+++ b/tests/ref/acodec/pcm-s8
@@ -1,4 +1,4 @@
-3b52f563e8e99aa26253eff154980a93 *tests/data/fate/acodec-pcm-s8.mov
-530897 tests/data/fate/acodec-pcm-s8.mov
-651d4eb8d98dfcdda96ae6c43d8f156b *tests/data/fate/acodec-pcm-s8.out.wav
+00a9d90e06e8ecb79e5dd4c6c8460836 *tests/data/fate/acodec-pcm-s8.mov
+529853 tests/data/fate/acodec-pcm-s8.mov
+652edf30f35ad89bf27bcc9d2f9c7b53 *tests/data/fate/acodec-pcm-s8.out.wav
 stddev:  147.89 PSNR: 52.93 MAXDIFF:  255 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-s8_planar b/tests/ref/acodec/pcm-s8_planar
new file mode 100644
index 0000000000..9cd795dc45
--- /dev/null
+++ b/tests/ref/acodec/pcm-s8_planar
@@ -0,0 +1,4 @@
+f04f79b2e90921a513f2d22fdab0dc47 *tests/data/fate/acodec-pcm-s8_planar.nut
+531105 tests/data/fate/acodec-pcm-s8_planar.nut
+652edf30f35ad89bf27bcc9d2f9c7b53 *tests/data/fate/acodec-pcm-s8_planar.out.wav
+stddev:  147.89 PSNR: 52.93 MAXDIFF:  255 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-u16be b/tests/ref/acodec/pcm-u16be
new file mode 100644
index 0000000000..015340cb8a
--- /dev/null
+++ b/tests/ref/acodec/pcm-u16be
@@ -0,0 +1,4 @@
+abc31c722aee72f21b5f858731c28fb9 *tests/data/fate/acodec-pcm-u16be.nut
+1060720 tests/data/fate/acodec-pcm-u16be.nut
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u16be.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-u16le b/tests/ref/acodec/pcm-u16le
new file mode 100644
index 0000000000..7efb086172
--- /dev/null
+++ b/tests/ref/acodec/pcm-u16le
@@ -0,0 +1,4 @@
+80cf805a16a6b4f02f46ff9008ca16f7 *tests/data/fate/acodec-pcm-u16le.nut
+1060720 tests/data/fate/acodec-pcm-u16le.nut
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u16le.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-u24be b/tests/ref/acodec/pcm-u24be
new file mode 100644
index 0000000000..ef423ea10d
--- /dev/null
+++ b/tests/ref/acodec/pcm-u24be
@@ -0,0 +1,4 @@
+c5b7d1898d8f5d6675ba543d2830bbaf *tests/data/fate/acodec-pcm-u24be.nut
+1590249 tests/data/fate/acodec-pcm-u24be.nut
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u24be.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-u24le b/tests/ref/acodec/pcm-u24le
new file mode 100644
index 0000000000..4010a1a3f3
--- /dev/null
+++ b/tests/ref/acodec/pcm-u24le
@@ -0,0 +1,4 @@
+884a3a562a8005084fde088fc3a74283 *tests/data/fate/acodec-pcm-u24le.nut
+1590249 tests/data/fate/acodec-pcm-u24le.nut
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u24le.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-u32be b/tests/ref/acodec/pcm-u32be
new file mode 100644
index 0000000000..358a01ef99
--- /dev/null
+++ b/tests/ref/acodec/pcm-u32be
@@ -0,0 +1,4 @@
+88d1f0b98e2878f0a45abde7ad73e9f1 *tests/data/fate/acodec-pcm-u32be.nut
+2120195 tests/data/fate/acodec-pcm-u32be.nut
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u32be.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-u32le b/tests/ref/acodec/pcm-u32le
new file mode 100644
index 0000000000..6857ec02c3
--- /dev/null
+++ b/tests/ref/acodec/pcm-u32le
@@ -0,0 +1,4 @@
+7257d6251524479c563c9f17a2642222 *tests/data/fate/acodec-pcm-u32le.nut
+2120195 tests/data/fate/acodec-pcm-u32le.nut
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u32le.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/pcm-u8 b/tests/ref/acodec/pcm-u8
index 80e70eab04..c9bf04acd5 100644
--- a/tests/ref/acodec/pcm-u8
+++ b/tests/ref/acodec/pcm-u8
@@ -1,4 +1,4 @@
-70fecbae732f81143a560c7315eda49a *tests/data/fate/acodec-pcm-u8.wav
-529246 tests/data/fate/acodec-pcm-u8.wav
-651d4eb8d98dfcdda96ae6c43d8f156b *tests/data/fate/acodec-pcm-u8.out.wav
+98cadb3502dbdc99e6e077c28b1a036c *tests/data/fate/acodec-pcm-u8.wav
+529244 tests/data/fate/acodec-pcm-u8.wav
+652edf30f35ad89bf27bcc9d2f9c7b53 *tests/data/fate/acodec-pcm-u8.out.wav
 stddev:  147.89 PSNR: 52.93 MAXDIFF:  255 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/roqaudio b/tests/ref/acodec/roqaudio
new file mode 100644
index 0000000000..f513a03975
--- /dev/null
+++ b/tests/ref/acodec/roqaudio
@@ -0,0 +1,4 @@
+75859976d7098588aeaebbc5551484a9 *tests/data/fate/acodec-roqaudio.roq
+265992 tests/data/fate/acodec-roqaudio.roq
+2057ed235e9d4e727e13bf57f3891093 *tests/data/fate/acodec-roqaudio.out.wav
+stddev: 4481.70 PSNR: 23.30 MAXDIFF:46250 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/s302m b/tests/ref/acodec/s302m
new file mode 100644
index 0000000000..63e39edef9
--- /dev/null
+++ b/tests/ref/acodec/s302m
@@ -0,0 +1,4 @@
+165d022ab86306d069797acff0c1e295 *tests/data/fate/acodec-s302m.mpegts
+1589164 tests/data/fate/acodec-s302m.mpegts
+31f25a0020fd9017de9c3c608316854b *tests/data/fate/acodec-s302m.out.wav
+stddev:  986.94 PSNR: 36.44 MAXDIFF:18571 bytes:  1058400/  1056708
diff --git a/tests/ref/acodec/tta b/tests/ref/acodec/tta
new file mode 100644
index 0000000000..8e183f9922
--- /dev/null
+++ b/tests/ref/acodec/tta
@@ -0,0 +1,4 @@
+847d065f082ac94825728b5f1af853eb *tests/data/fate/acodec-tta.tta
+330583 tests/data/fate/acodec-tta.tta
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-tta.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/acodec/wavpack b/tests/ref/acodec/wavpack
new file mode 100644
index 0000000000..02f09ae5ed
--- /dev/null
+++ b/tests/ref/acodec/wavpack
@@ -0,0 +1,4 @@
+000420796cc3e526650ce6f4c6334471 *tests/data/fate/acodec-wavpack.wv
+338166 tests/data/fate/acodec-wavpack.wv
+95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-wavpack.out.wav
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400
diff --git a/tests/ref/fate/012v b/tests/ref/fate/012v
new file mode 100644
index 0000000000..198bba3fa5
--- /dev/null
+++ b/tests/ref/fate/012v
@@ -0,0 +1,6 @@
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 316x240
+#sar 0: 0/1
+0,          0,          0,        1,   303360, 0xc5439580
diff --git a/tests/ref/fate/4xm-1 b/tests/ref/fate/4xm-1
index d38a47a1ad..96f3539406 100644
--- a/tests/ref/fate/4xm-1
+++ b/tests/ref/fate/4xm-1
@@ -1,16 +1,20 @@
 #tb 0: 1/15
-0,          0,          0,        1,   921600, 0xd08f97c7
-0,          1,          1,        1,   921600, 0xc433a85b
-0,          2,          2,        1,   921600, 0x7ffeee42
-0,          3,          3,        1,   921600, 0xc0ad9f52
-0,          4,          4,        1,   921600, 0xb0235112
-0,          5,          5,        1,   921600, 0xcbdd9805
-0,          6,          6,        1,   921600, 0x5468bdb9
-0,          7,          7,        1,   921600, 0x2f0c63fd
-0,          8,          8,        1,   921600, 0xf1de04f0
-0,          9,          9,        1,   921600, 0x95709ce2
-0,         10,         10,        1,   921600, 0x69037c4a
-0,         11,         11,        1,   921600, 0x513f8a98
-0,         12,         12,        1,   921600, 0x55b82fa1
-0,         13,         13,        1,   921600, 0x5c8ace28
-0,         14,         14,        1,   921600, 0xb019770a
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+0,          0,          0,        1,   921600, 0xd82e4d57
+0,          1,          1,        1,   921600, 0x83f2349c
+0,          2,          2,        1,   921600, 0x70d87db0
+0,          3,          3,        1,   921600, 0x66d27b93
+0,          4,          4,        1,   921600, 0xb730941c
+0,          5,          5,        1,   921600, 0x15da4934
+0,          6,          6,        1,   921600, 0x1953968a
+0,          7,          7,        1,   921600, 0xf0d730a0
+0,          8,          8,        1,   921600, 0x35a7d30c
+0,          9,          9,        1,   921600, 0x33667f62
+0,         10,         10,        1,   921600, 0xf4707f6b
+0,         11,         11,        1,   921600, 0xaac6c392
+0,         12,         12,        1,   921600, 0x68397d16
+0,         13,         13,        1,   921600, 0xb2aa0450
+0,         14,         14,        1,   921600, 0xba25c62e
diff --git a/tests/ref/fate/4xm-2 b/tests/ref/fate/4xm-2
index 35b0797439..c28dc1465f 100644
--- a/tests/ref/fate/4xm-2
+++ b/tests/ref/fate/4xm-2
@@ -1,4 +1,8 @@
-#tb 0: 1/6
+#tb 0: 4/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 240x112
+#sar 0: 0/1
 0,          0,          0,        1,    80640, 0x00000000
 0,          1,          1,        1,    80640, 0x3a942680
 0,          2,          2,        1,    80640, 0x3a942680
@@ -6,153 +10,153 @@
 0,          4,          4,        1,    80640, 0x3a942680
 0,          5,          5,        1,    80640, 0x3a942680
 0,          6,          6,        1,    80640, 0x3a942680
-0,          7,          7,        1,    80640, 0x1956ebfc
-0,          8,          8,        1,    80640, 0x61686290
-0,          9,          9,        1,    80640, 0x7e2c2753
-0,         10,         10,        1,    80640, 0x63e5e14f
-0,         11,         11,        1,    80640, 0xa775947a
-0,         12,         12,        1,    80640, 0x4b91b93d
-0,         13,         13,        1,    80640, 0x83345f32
-0,         14,         14,        1,    80640, 0x5d3a3374
-0,         15,         15,        1,    80640, 0x164808c5
-0,         16,         16,        1,    80640, 0xfd0189af
-0,         17,         17,        1,    80640, 0x062f9389
-0,         18,         18,        1,    80640, 0xe4dcaff8
-0,         19,         19,        1,    80640, 0xb2d9ec51
-0,         20,         20,        1,    80640, 0x3b4d5331
-0,         21,         21,        1,    80640, 0xfcbd8da1
-0,         22,         22,        1,    80640, 0xa0732142
-0,         23,         23,        1,    80640, 0x6438df5f
-0,         24,         24,        1,    80640, 0x614302fa
-0,         25,         25,        1,    80640, 0x53edf986
-0,         26,         26,        1,    80640, 0x6dfe13f0
-0,         27,         27,        1,    80640, 0x0b2194c3
-0,         28,         28,        1,    80640, 0xe0436945
-0,         29,         29,        1,    80640, 0x8d8ba77f
-0,         30,         30,        1,    80640, 0x9c723388
-0,         31,         31,        1,    80640, 0x336bd2a2
-0,         32,         32,        1,    80640, 0x5905fd0b
-0,         33,         33,        1,    80640, 0x2ca368bb
-0,         34,         34,        1,    80640, 0x38c1e5ec
-0,         35,         35,        1,    80640, 0xe439a194
-0,         36,         36,        1,    80640, 0xe7a19a64
-0,         37,         37,        1,    80640, 0xbe7f9094
-0,         38,         38,        1,    80640, 0x0b2cbec9
-0,         39,         39,        1,    80640, 0x8050bf7d
-0,         40,         40,        1,    80640, 0x4e9d4e78
-0,         41,         41,        1,    80640, 0xaa7bb85d
-0,         42,         42,        1,    80640, 0x6e42b1a6
-0,         43,         43,        1,    80640, 0x27043fe0
-0,         44,         44,        1,    80640, 0xe04bd5e6
-0,         45,         45,        1,    80640, 0xd60762d6
-0,         46,         46,        1,    80640, 0x2729df8f
-0,         47,         47,        1,    80640, 0x1b62c4f7
-0,         48,         48,        1,    80640, 0xe6b5d2f7
-0,         49,         49,        1,    80640, 0xf5885096
-0,         50,         50,        1,    80640, 0xe7625cf6
-0,         51,         51,        1,    80640, 0xed804de6
-0,         52,         52,        1,    80640, 0x3f92728e
-0,         53,         53,        1,    80640, 0x353e4b0d
-0,         54,         54,        1,    80640, 0x70b0228c
-0,         55,         55,        1,    80640, 0x851bd554
-0,         56,         56,        1,    80640, 0x594f22eb
-0,         57,         57,        1,    80640, 0xa2267c0b
-0,         58,         58,        1,    80640, 0xdc0fbafb
-0,         59,         59,        1,    80640, 0xd596b763
-0,         60,         60,        1,    80640, 0x3b9c4b1b
-0,         61,         61,        1,    80640, 0x218ac4b4
-0,         62,         62,        1,    80640, 0x4af393a4
-0,         63,         63,        1,    80640, 0x66c098c5
-0,         64,         64,        1,    80640, 0x7cc91e86
-0,         65,         65,        1,    80640, 0xba282a2e
-0,         66,         66,        1,    80640, 0x50932be6
-0,         67,         67,        1,    80640, 0x6531386e
-0,         68,         68,        1,    80640, 0x2616235f
-0,         69,         69,        1,    80640, 0x27aad18a
-0,         70,         70,        1,    80640, 0x67491df3
-0,         71,         71,        1,    80640, 0x167028f1
-0,         72,         72,        1,    80640, 0xa4229420
-0,         73,         73,        1,    80640, 0x77eaed07
-0,         74,         74,        1,    80640, 0xbdf7d8e8
-0,         75,         75,        1,    80640, 0xc2ac8545
-0,         76,         76,        1,    80640, 0xf3fe64ec
-0,         77,         77,        1,    80640, 0x66451d43
-0,         78,         78,        1,    80640, 0x1af2f05e
-0,         79,         79,        1,    80640, 0x2a63c2c4
-0,         80,         80,        1,    80640, 0xe4e07a0f
-0,         81,         81,        1,    80640, 0x598e8b11
-0,         82,         82,        1,    80640, 0xb2ebb868
-0,         83,         83,        1,    80640, 0xa4b6bb8a
-0,         84,         84,        1,    80640, 0x5037e910
-0,         85,         85,        1,    80640, 0x0c55f6c0
-0,         86,         86,        1,    80640, 0x3f4704f7
-0,         87,         87,        1,    80640, 0xa6a8e810
-0,         88,         88,        1,    80640, 0xedbfcfb0
-0,         89,         89,        1,    80640, 0xe568caa0
-0,         90,         90,        1,    80640, 0xdf21cc20
-0,         91,         91,        1,    80640, 0xb66cd4a8
-0,         92,         92,        1,    80640, 0xcd26c9c8
-0,         93,         93,        1,    80640, 0x5fe8d598
-0,         94,         94,        1,    80640, 0xed0dc9c8
-0,         95,         95,        1,    80640, 0x8313d288
-0,         96,         96,        1,    80640, 0x9ccdd4a0
-0,         97,         97,        1,    80640, 0x66ffe970
-0,         98,         98,        1,    80640, 0xf68ad1c8
-0,         99,         99,        1,    80640, 0xd570f658
-0,        100,        100,        1,    80640, 0x8c39d998
-0,        101,        101,        1,    80640, 0xe18fe5e0
-0,        102,        102,        1,    80640, 0xbbe7e340
-0,        103,        103,        1,    80640, 0x9a90d470
-0,        104,        104,        1,    80640, 0xd2bbced0
-0,        105,        105,        1,    80640, 0xbbf9dce0
-0,        106,        106,        1,    80640, 0x4ff7c888
-0,        107,        107,        1,    80640, 0xc2e7e1f0
-0,        108,        108,        1,    80640, 0x2104e3b0
-0,        109,        109,        1,    80640, 0xaef5e8f0
-0,        110,        110,        1,    80640, 0xc477e890
-0,        111,        111,        1,    80640, 0xb12df778
-0,        112,        112,        1,    80640, 0xd2115720
-0,        113,        113,        1,    80640, 0x620b6538
-0,        114,        114,        1,    80640, 0x894a8db8
-0,        115,        115,        1,    80640, 0x8da3bcb0
-0,        116,        116,        1,    80640, 0x96be8930
-0,        117,        117,        1,    80640, 0xe69dc1f0
-0,        118,        118,        1,    80640, 0x42b8d4e0
-0,        119,        119,        1,    80640, 0x0a8da4f0
-0,        120,        120,        1,    80640, 0x245fd3d8
-0,        121,        121,        1,    80640, 0x3fd1e858
-0,        122,        122,        1,    80640, 0xe2c299f0
-0,        123,        123,        1,    80640, 0xda1cddd0
-0,        124,        124,        1,    80640, 0xf126e498
-0,        125,        125,        1,    80640, 0xc85ab920
-0,        126,        126,        1,    80640, 0x52f39de8
-0,        127,        127,        1,    80640, 0xd0daac60
-0,        128,        128,        1,    80640, 0xef323347
-0,        129,        129,        1,    80640, 0xcc063317
-0,        130,        130,        1,    80640, 0xb6f53057
-0,        131,        131,        1,    80640, 0x5fe53b07
-0,        132,        132,        1,    80640, 0x63183d7f
-0,        133,        133,        1,    80640, 0x91a44bbf
-0,        134,        134,        1,    80640, 0xa433480f
-0,        135,        135,        1,    80640, 0xe90652ef
-0,        136,        136,        1,    80640, 0xe96e35bf
-0,        137,        137,        1,    80640, 0x84ff2ccf
-0,        138,        138,        1,    80640, 0x930f2b07
-0,        139,        139,        1,    80640, 0x5a1228d7
-0,        140,        140,        1,    80640, 0x29f226ef
-0,        141,        141,        1,    80640, 0xd35136df
-0,        142,        142,        1,    80640, 0x0e2d407f
-0,        143,        143,        1,    80640, 0x34a93267
-0,        144,        144,        1,    80640, 0x7ae82af7
-0,        145,        145,        1,    80640, 0xb20c2477
-0,        146,        146,        1,    80640, 0xa104218f
-0,        147,        147,        1,    80640, 0xcb1121e7
-0,        148,        148,        1,    80640, 0xaca04751
-0,        149,        149,        1,    80640, 0x3a51c704
-0,        150,        150,        1,    80640, 0xfa632e3d
-0,        151,        151,        1,    80640, 0x61c9407c
-0,        152,        152,        1,    80640, 0xe9a08dd9
-0,        153,        153,        1,    80640, 0xebf3c623
+0,          7,          7,        1,    80640, 0xa731901a
+0,          8,          8,        1,    80640, 0x0a1e5b3d
+0,          9,          9,        1,    80640, 0x2c66418f
+0,         10,         10,        1,    80640, 0xaaf8575a
+0,         11,         11,        1,    80640, 0x2d1a60b1
+0,         12,         12,        1,    80640, 0x646d6e66
+0,         13,         13,        1,    80640, 0x090de107
+0,         14,         14,        1,    80640, 0x90991f6c
+0,         15,         15,        1,    80640, 0xda862969
+0,         16,         16,        1,    80640, 0x5434e1ec
+0,         17,         17,        1,    80640, 0x4e981ce7
+0,         18,         18,        1,    80640, 0x97eb4000
+0,         19,         19,        1,    80640, 0xbfb375b0
+0,         20,         20,        1,    80640, 0x1529d95d
+0,         21,         21,        1,    80640, 0x2c0015af
+0,         22,         22,        1,    80640, 0x63779ce1
+0,         23,         23,        1,    80640, 0x3f2b3949
+0,         24,         24,        1,    80640, 0xe3cf3be4
+0,         25,         25,        1,    80640, 0x54451a22
+0,         26,         26,        1,    80640, 0xc2901d91
+0,         27,         27,        1,    80640, 0x312f8b7e
+0,         28,         28,        1,    80640, 0x99734f4e
+0,         29,         29,        1,    80640, 0xe50b8391
+0,         30,         30,        1,    80640, 0x7c6b04e4
+0,         31,         31,        1,    80640, 0x04989996
+0,         32,         32,        1,    80640, 0x30c3c00f
+0,         33,         33,        1,    80640, 0x77172ba4
+0,         34,         34,        1,    80640, 0x1257a596
+0,         35,         35,        1,    80640, 0x657e5fa8
+0,         36,         36,        1,    80640, 0xe66958ef
+0,         37,         37,        1,    80640, 0xbf7f4f0a
+0,         38,         38,        1,    80640, 0x588ac70e
+0,         39,         39,        1,    80640, 0xb1a91c4b
+0,         40,         40,        1,    80640, 0x5b73de24
+0,         41,         41,        1,    80640, 0xa3c15e73
+0,         42,         42,        1,    80640, 0x7326196b
+0,         43,         43,        1,    80640, 0x1aa52b88
+0,         44,         44,        1,    80640, 0x0029f511
+0,         45,         45,        1,    80640, 0x2398433a
+0,         46,         46,        1,    80640, 0xef9ab870
+0,         47,         47,        1,    80640, 0xb1ac9b79
+0,         48,         48,        1,    80640, 0x1cc2ab3b
+0,         49,         49,        1,    80640, 0x41362b53
+0,         50,         50,        1,    80640, 0x81e33811
+0,         51,         51,        1,    80640, 0x621d285a
+0,         52,         52,        1,    80640, 0x84e84c24
+0,         53,         53,        1,    80640, 0xbb8c2939
+0,         54,         54,        1,    80640, 0x6c6905a8
+0,         55,         55,        1,    80640, 0xc60bbaf0
+0,         56,         56,        1,    80640, 0xc80d08c8
+0,         57,         57,        1,    80640, 0xc5646343
+0,         58,         58,        1,    80640, 0x3df7a287
+0,         59,         59,        1,    80640, 0x628e9f78
+0,         60,         60,        1,    80640, 0x58f93044
+0,         61,         61,        1,    80640, 0x8ee3a59f
+0,         62,         62,        1,    80640, 0xaa297416
+0,         63,         63,        1,    80640, 0x7bbd7307
+0,         64,         64,        1,    80640, 0x12dbee42
+0,         65,         65,        1,    80640, 0xaea5fb22
+0,         66,         66,        1,    80640, 0x9405fd0b
+0,         67,         67,        1,    80640, 0x59400b6f
+0,         68,         68,        1,    80640, 0x70beeba0
+0,         69,         69,        1,    80640, 0xdc0681ae
+0,         70,         70,        1,    80640, 0xe4a3c803
+0,         71,         71,        1,    80640, 0x3424c568
+0,         72,         72,        1,    80640, 0xeb72838d
+0,         73,         73,        1,    80640, 0x671fbff3
+0,         74,         74,        1,    80640, 0xa4b849bd
+0,         75,         75,        1,    80640, 0xf4c2be6f
+0,         76,         76,        1,    80640, 0xb91988fd
+0,         77,         77,        1,    80640, 0xd0e5bf3a
+0,         78,         78,        1,    80640, 0x78c2b0bc
+0,         79,         79,        1,    80640, 0xcf2deb74
+0,         80,         80,        1,    80640, 0x84a9081b
+0,         81,         81,        1,    80640, 0x9931e9b1
+0,         82,         82,        1,    80640, 0x1ce6b59d
+0,         83,         83,        1,    80640, 0x24a31152
+0,         84,         84,        1,    80640, 0x206f4677
+0,         85,         85,        1,    80640, 0x507755ab
+0,         86,         86,        1,    80640, 0xc4b5643a
+0,         87,         87,        1,    80640, 0x197445f7
+0,         88,         88,        1,    80640, 0x53232d2a
+0,         89,         89,        1,    80640, 0x33ae27d4
+0,         90,         90,        1,    80640, 0x77bb2925
+0,         91,         91,        1,    80640, 0xb0d53220
+0,         92,         92,        1,    80640, 0xacdb26fc
+0,         93,         93,        1,    80640, 0xa83d32e1
+0,         94,         94,        1,    80640, 0xe2002717
+0,         95,         95,        1,    80640, 0xb1722fed
+0,         96,         96,        1,    80640, 0xa7de3206
+0,         97,         97,        1,    80640, 0x68f94780
+0,         98,         98,        1,    80640, 0x2bcc2f28
+0,         99,         99,        1,    80640, 0xaf9354e5
+0,        100,        100,        1,    80640, 0x45b4375c
+0,        101,        101,        1,    80640, 0x60e043ee
+0,        102,        102,        1,    80640, 0x9ed5411e
+0,        103,        103,        1,    80640, 0xbae131ce
+0,        104,        104,        1,    80640, 0x33be2be6
+0,        105,        105,        1,    80640, 0xdadb3a4c
+0,        106,        106,        1,    80640, 0xe9e72559
+0,        107,        107,        1,    80640, 0x9fe93f8c
+0,        108,        108,        1,    80640, 0xc20b413a
+0,        109,        109,        1,    80640, 0x02c74699
+0,        110,        110,        1,    80640, 0x1b284634
+0,        111,        111,        1,    80640, 0xb7ea559e
+0,        112,        112,        1,    80640, 0x62e3b0e1
+0,        113,        113,        1,    80640, 0x8b6bbf68
+0,        114,        114,        1,    80640, 0x04d2e8d8
+0,        115,        115,        1,    80640, 0xc6961955
+0,        116,        116,        1,    80640, 0xf318e461
+0,        117,        117,        1,    80640, 0x55231e8f
+0,        118,        118,        1,    80640, 0x772f325e
+0,        119,        119,        1,    80640, 0x31480120
+0,        120,        120,        1,    80640, 0x5eda30fe
+0,        121,        121,        1,    80640, 0x5c534632
+0,        122,        122,        1,    80640, 0xaca0f5c9
+0,        123,        123,        1,    80640, 0x9ec83b5a
+0,        124,        124,        1,    80640, 0x65944233
+0,        125,        125,        1,    80640, 0xbf7e15f0
+0,        126,        126,        1,    80640, 0xf985f9b7
+0,        127,        127,        1,    80640, 0x0e7a0887
+0,        128,        128,        1,    80640, 0xee33931b
+0,        129,        129,        1,    80640, 0xea6b92f8
+0,        130,        130,        1,    80640, 0xde559025
+0,        131,        131,        1,    80640, 0x970c9af6
+0,        132,        132,        1,    80640, 0x6a579d8a
+0,        133,        133,        1,    80640, 0x7053ac0c
+0,        134,        134,        1,    80640, 0x6d6ca81b
+0,        135,        135,        1,    80640, 0x6ffdb338
+0,        136,        136,        1,    80640, 0x402f953f
+0,        137,        137,        1,    80640, 0x24358c04
+0,        138,        138,        1,    80640, 0x26298a25
+0,        139,        139,        1,    80640, 0xbc0487e7
+0,        140,        140,        1,    80640, 0xf8c885fd
+0,        141,        141,        1,    80640, 0x98a79695
+0,        142,        142,        1,    80640, 0x846aa04b
+0,        143,        143,        1,    80640, 0x22ba919b
+0,        144,        144,        1,    80640, 0xcba08a11
+0,        145,        145,        1,    80640, 0xfba0836c
+0,        146,        146,        1,    80640, 0xb7ff8059
+0,        147,        147,        1,    80640, 0xb15080bb
+0,        148,        148,        1,    80640, 0x42627aed
+0,        149,        149,        1,    80640, 0xd045d485
+0,        150,        150,        1,    80640, 0xf22e7545
+0,        151,        151,        1,    80640, 0xe24a41fc
+0,        152,        152,        1,    80640, 0x854696ac
+0,        153,        153,        1,    80640, 0x6722f8f2
 0,        154,        154,        1,    80640, 0x00000000
 0,        155,        155,        1,    80640, 0x0f412500
 0,        156,        156,        1,    80640, 0x0f412500
@@ -160,16 +164,16 @@
 0,        158,        158,        1,    80640, 0xb6634270
 0,        159,        159,        1,    80640, 0x9e43a4a0
 0,        160,        160,        1,    80640, 0x136ab60b
-0,        161,        161,        1,    80640, 0x6ce3254e
-0,        162,        162,        1,    80640, 0xf4340d15
-0,        163,        163,        1,    80640, 0x73861114
-0,        164,        164,        1,    80640, 0x36b300d3
-0,        165,        165,        1,    80640, 0x2ddde523
-0,        166,        166,        1,    80640, 0xfdd79c02
-0,        167,        167,        1,    80640, 0xe6cc4fe9
-0,        168,        168,        1,    80640, 0x5b13e2b9
-0,        169,        169,        1,    80640, 0x0d588e70
-0,        170,        170,        1,    80640, 0xc6e4023f
-0,        171,        171,        1,    80640, 0xf54c496f
-0,        172,        172,        1,    80640, 0xa315a5cf
-0,        173,        173,        1,    80640, 0x2d2ac9c7
+0,        161,        161,        1,    80640, 0xe43625dc
+0,        162,        162,        1,    80640, 0xc2eb0f8c
+0,        163,        163,        1,    80640, 0x99af167d
+0,        164,        164,        1,    80640, 0xd9cb0a37
+0,        165,        165,        1,    80640, 0x1f2cf2ce
+0,        166,        166,        1,    80640, 0x00eeae7f
+0,        167,        167,        1,    80640, 0xcc1d666c
+0,        168,        168,        1,    80640, 0x77d6fcc9
+0,        169,        169,        1,    80640, 0x58c8acc6
+0,        170,        170,        1,    80640, 0xd026238d
+0,        171,        171,        1,    80640, 0xfefb6c9b
+0,        172,        172,        1,    80640, 0xa9a5cb36
+0,        173,        173,        1,    80640, 0xc845f000
diff --git a/tests/ref/fate/8bps b/tests/ref/fate/8bps
index 869d38c275..dab2b908db 100644
--- a/tests/ref/fate/8bps
+++ b/tests/ref/fate/8bps
@@ -1,36 +1,45 @@
-#tb 0: 1/125
+#tb 0: 2/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 360x240
+#sar 0: 9/10
 #tb 1: 1/22050
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 22050
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   259200, 0x7e91df07
 1,          0,          0,     1024,     2048, 0x3d042426
 1,       1024,       1024,     1024,     2048, 0x5bcae456
-0,         10,         10,        1,   259200, 0x7e91df07
+0,          1,          1,        1,   259200, 0x7e91df07
 1,       2048,       2048,     1024,     2048, 0xb6043655
 1,       3072,       3072,     1024,     2048, 0x6fdaffad
-0,         20,         20,        1,   259200, 0xc468c119
+0,          2,          2,        1,   259200, 0xc468c119
 1,       4096,       4096,     1024,     2048, 0xf86700cb
 1,       5120,       5120,     1024,     2048, 0x045e46c1
-0,         30,         30,        1,   259200, 0x0e058930
+0,          3,          3,        1,   259200, 0x0e058930
 1,       6144,       6144,     1024,     2048, 0x000df0e5
-0,         40,         40,        1,   259200, 0xa0261310
+0,          4,          4,        1,   259200, 0xa0261310
 1,       7168,       7168,     1024,     2048, 0x8f5f12fb
 1,       8192,       8192,     1024,     2048, 0xd516f6b0
-0,         50,         50,        1,   259200, 0x78ca9aba
+0,          5,          5,        1,   259200, 0x78ca9aba
 1,       9216,       9216,     1024,     2048, 0xa1fe2bd3
 1,      10240,      10240,     1024,     2048, 0x3647087a
-0,         60,         60,        1,   259200, 0x4971f7b3
+0,          6,          6,        1,   259200, 0x4971f7b3
 1,      11264,      11264,     1024,     2048, 0xd2ee584e
 1,      12288,      12288,     1024,     2048, 0xf132088c
-0,         70,         70,        1,   259200, 0x7dc2cff7
+0,          7,          7,        1,   259200, 0x7dc2cff7
 1,      13312,      13312,     1024,     2048, 0x1efc0eb1
-0,         80,         80,        1,   259200, 0x8cbc53d5
+0,          8,          8,        1,   259200, 0x8cbc53d5
 1,      14336,      14336,     1024,     2048, 0xeb73f402
 1,      15360,      15360,     1024,     2048, 0x75cb3d20
-0,         90,         90,        1,   259200, 0xcccd77e3
+0,          9,          9,        1,   259200, 0xcccd77e3
 1,      16384,      16384,     1024,     2048, 0x85a501b6
 1,      17408,      17408,     1024,     2048, 0xa4eb312d
-0,        100,        100,        1,   259200, 0x6b3e0fb3
+0,         10,         10,        1,   259200, 0x6b3e0fb3
 1,      18432,      18432,     1024,     2048, 0xf0aaf8c7
-0,        110,        110,        1,   259200, 0x281dd175
+0,         11,         11,        1,   259200, 0x281dd175
 1,      19456,      19456,     1024,     2048, 0x65371cda
 1,      20480,      20480,     1024,     2048, 0x25512cd6
 1,      21504,      21504,     1024,     2048, 0xc81410e3
diff --git a/tests/ref/fate/aac-autobsf-adtstoasc b/tests/ref/fate/aac-autobsf-adtstoasc
new file mode 100644
index 0000000000..9ca8e7ed9e
--- /dev/null
+++ b/tests/ref/fate/aac-autobsf-adtstoasc
@@ -0,0 +1,43 @@
+b0375ba00bcbd55023a176255b8d4ba2 *tests/data/fate/aac-autobsf-adtstoasc.matroska
+6728 tests/data/fate/aac-autobsf-adtstoasc.matroska
+#extradata 0:        2, 0x0030001c
+#tb 0: 1/1000
+#media_type 0: audio
+#codec_id 0: aac
+#sample_rate 0: 16000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+0,          0,          0,       64,        4, 0x02f70117
+0,         64,         64,       64,      163, 0xd5f85007
+0,        128,        128,       64,      127, 0x66484065
+0,        192,        192,       64,       94, 0x55222bd6
+0,        256,        256,       64,      314, 0x3c7e923a
+0,        320,        320,       64,      207, 0x1efc5d1b
+0,        384,        384,       64,      119, 0xb2a13601
+0,        448,        448,       64,      184, 0xcafc6091
+0,        512,        512,       64,      132, 0xddd33c0b
+0,        576,        576,       64,      152, 0x83935031
+0,        640,        640,       64,      227, 0x32a86bc4
+0,        704,        704,       64,      122, 0xd04e3571
+0,        768,        768,       64,      163, 0x57d44d16
+0,        832,        832,       64,      147, 0x226043d7
+0,        896,        896,       64,      119, 0x8ad931ed
+0,        960,        960,       64,      153, 0xbb6e432f
+0,       1024,       1024,       64,      185, 0xa01f4ff3
+0,       1088,       1088,       64,      126, 0x85503ce6
+0,       1152,       1152,       64,      246, 0x652c7b59
+0,       1216,       1216,       64,      162, 0xc9f04da0
+0,       1280,       1280,       64,      135, 0x71fa3be0
+0,       1344,       1344,       64,      246, 0x7a6f7788
+0,       1408,       1408,       64,      262, 0xd3097781
+0,       1472,       1472,       64,       60, 0x09a118f5
+0,       1536,       1536,       64,      255, 0xbab5793c
+0,       1600,       1600,       64,      153, 0x6b6a44fb
+0,       1664,       1664,       64,      160, 0x550e4530
+0,       1728,       1728,       64,      215, 0x7fe66144
+0,       1792,       1792,       64,      144, 0xcd723f7d
+0,       1856,       1856,       64,      187, 0x2a0b5c1b
+0,       1920,       1920,       64,      177, 0xb8c355d5
+0,       1984,       1984,       64,      156, 0x867d4f3a
+0,       2048,       2048,       64,      201, 0x62745ff9
+0,       2112,       2112,       64,      137, 0x90c639e0
diff --git a/tests/ref/fate/aasc b/tests/ref/fate/aasc
index 83f83b984b..f69376e679 100644
--- a/tests/ref/fate/aasc
+++ b/tests/ref/fate/aasc
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x175
+#sar 0: 0/1
 0,          0,          0,        1,   168000, 0x00000000
 0,          1,          1,        1,   168000, 0x00000000
 0,          2,          2,        1,   168000, 0x00000000
diff --git a/tests/ref/fate/acodec-aref b/tests/ref/fate/acodec-aref
new file mode 100644
index 0000000000..d70876d9d9
--- /dev/null
+++ b/tests/ref/fate/acodec-aref
@@ -0,0 +1,4 @@
+64151e4bcc2b717aa5a8454d424d6a1f *./tests/data/acodec.ref.wav
+1058446 ./tests/data/acodec.ref.wav
+ce524631c2ad0a40aaab46e3a80a1176 *./tests/data/acodec-16000-1.ref.wav
+192046 ./tests/data/acodec-16000-1.ref.wav
diff --git a/tests/ref/fate/adpcm-4xm b/tests/ref/fate/adpcm-4xm
new file mode 100644
index 0000000000..cfde412da8
--- /dev/null
+++ b/tests/ref/fate/adpcm-4xm
@@ -0,0 +1,32 @@
+#tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1472,     5888, 0x9086e310
+0,       1476,       1476,     1472,     5888, 0xac8491f5
+0,       2952,       2952,     1472,     5888, 0xc9a08b6b
+0,       4428,       4428,     1472,     5888, 0x4cff893b
+0,       5904,       5904,     1464,     5856, 0xfb914624
+0,       7372,       7372,     1472,     5888, 0x1dd9781f
+0,       8848,       8848,     1472,     5888, 0x75937688
+0,      10324,      10324,     1472,     5888, 0x6c93a266
+0,      11800,      11800,     1464,     5856, 0xb14e6783
+0,      13268,      13268,     1472,     5888, 0x4d268759
+0,      14744,      14744,     1472,     5888, 0xce44b8c6
+0,      16220,      16220,     1472,     5888, 0xf99f7347
+0,      17696,      17696,     1464,     5856, 0x35591adc
+0,      19164,      19164,     1472,     5888, 0x67692338
+0,      20640,      20640,     1472,     5888, 0x6465addd
+0,      22116,      22116,     1472,     5888, 0x22c66aaf
+0,      23592,      23592,     1464,     5856, 0x016b78d9
+0,      25060,      25060,     1472,     5888, 0xa9a03855
+0,      26536,      26536,     1472,     5888, 0x1aa0603f
+0,      28012,      28012,     1472,     5888, 0x190a25a1
+0,      29488,      29488,     1464,     5856, 0xc6ad8bc0
+0,      30956,      30956,     1472,     5888, 0x42bb9d6b
+0,      32432,      32432,     1472,     5888, 0x797694d7
+0,      33908,      33908,     1472,     5888, 0xd2d1fa69
+0,      35384,      35384,     1464,     5856, 0x61624e9b
+0,      36852,      36852,     1472,     5888, 0x14bf8ec0
diff --git a/tests/ref/fate/adpcm-afc b/tests/ref/fate/adpcm-afc
new file mode 100644
index 0000000000..6d8e732454
--- /dev/null
+++ b/tests/ref/fate/adpcm-afc
@@ -0,0 +1,18 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,    17920,    71680, 0x52373bc9
+0,      17920,      17920,    17920,    71680, 0x1f854b27
+0,      35840,      35840,    17920,    71680, 0x3d265a6d
+0,      53760,      53760,    17920,    71680, 0x7e38d624
+0,      71680,      71680,    17920,    71680, 0x003b7616
+0,      89600,      89600,    17920,    71680, 0x9fed7ca7
+0,     107520,     107520,    17920,    71680, 0x22af668c
+0,     125440,     125440,    17920,    71680, 0xefd95c4a
+0,     143360,     143360,    17920,    71680, 0x8b68142e
+0,     161280,     161280,    17920,    71680, 0x0a0614fa
+0,     179200,     179200,    17920,    71680, 0x22ababa3
+0,     197120,     197120,    17920,    71680, 0xda4b1708
diff --git a/tests/ref/fate/adpcm-dtk b/tests/ref/fate/adpcm-dtk
new file mode 100644
index 0000000000..f3ade6d505
--- /dev/null
+++ b/tests/ref/fate/adpcm-dtk
@@ -0,0 +1,38 @@
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 48000
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,      896,     3584, 0xdae789d5
+0,        896,        896,      896,     3584, 0x168ed9b6
+0,       1792,       1792,      896,     3584, 0x8920c8d5
+0,       2688,       2688,      896,     3584, 0xaf0a3245
+0,       3584,       3584,      896,     3584, 0x884ee935
+0,       4480,       4480,      896,     3584, 0xe6a832ad
+0,       5376,       5376,      896,     3584, 0x1fa12ea2
+0,       6272,       6272,      896,     3584, 0xf119198c
+0,       7168,       7168,      896,     3584, 0x0a6dbf72
+0,       8064,       8064,      896,     3584, 0xd3467881
+0,       8960,       8960,      896,     3584, 0x25d504ec
+0,       9856,       9856,      896,     3584, 0x452730c9
+0,      10752,      10752,      896,     3584, 0x42b92ff1
+0,      11648,      11648,      896,     3584, 0x85c67bf3
+0,      12544,      12544,      896,     3584, 0xab4d99e9
+0,      13440,      13440,      896,     3584, 0xe5bfc4da
+0,      14336,      14336,      896,     3584, 0x7a5210e9
+0,      15232,      15232,      896,     3584, 0x5265fcd3
+0,      16128,      16128,      896,     3584, 0x76531427
+0,      17024,      17024,      896,     3584, 0xb2b8d7ab
+0,      17920,      17920,      896,     3584, 0x05a453e8
+0,      18816,      18816,      896,     3584, 0x742c45bb
+0,      19712,      19712,      896,     3584, 0x57aaee3b
+0,      20608,      20608,      896,     3584, 0x997bf703
+0,      21504,      21504,      896,     3584, 0xe2d14b13
+0,      22400,      22400,      896,     3584, 0xdafbdd2f
+0,      23296,      23296,      896,     3584, 0x448cec3a
+0,      24192,      24192,      896,     3584, 0xe6f6fb9c
+0,      25088,      25088,      896,     3584, 0x0310276a
+0,      25984,      25984,      896,     3584, 0x44bf04e9
+0,      26880,      26880,      896,     3584, 0xe2105d33
+0,      27776,      27776,      896,     3584, 0x08b7d5e0
diff --git a/tests/ref/fate/adpcm-ea-1 b/tests/ref/fate/adpcm-ea-1
index f5a33df710..76be8e8511 100644
--- a/tests/ref/fate/adpcm-ea-1
+++ b/tests/ref/fate/adpcm-ea-1
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1484,     5936, 0x00000000
 0,       1484,       1484,     1456,     5824, 0x00000000
 0,       2940,       2940,     1484,     5936, 0x00000000
diff --git a/tests/ref/fate/adpcm-ea-2 b/tests/ref/fate/adpcm-ea-2
index f58d9a00ce..91440874a0 100644
--- a/tests/ref/fate/adpcm-ea-2
+++ b/tests/ref/fate/adpcm-ea-2
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1484,     5936, 0xea261a29
 0,       1484,       1484,     1456,     5824, 0x253df061
 0,       2940,       2940,     1484,     5936, 0x603a5bd7
diff --git a/tests/ref/fate/adpcm-ea-maxis-xa b/tests/ref/fate/adpcm-ea-maxis-xa
index 5d6b5c07dc..c919a67545 100644
--- a/tests/ref/fate/adpcm-ea-maxis-xa
+++ b/tests/ref/fate/adpcm-ea-maxis-xa
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,       28,      112, 0x291d1be4
 0,         28,         28,       28,      112, 0xf08d33cc
 0,         56,         56,       28,      112, 0x5b1521de
diff --git a/tests/ref/fate/adpcm-ea-r1 b/tests/ref/fate/adpcm-ea-r1
index 74d15c6f67..4e5fb6788f 100644
--- a/tests/ref/fate/adpcm-ea-r1
+++ b/tests/ref/fate/adpcm-ea-r1
@@ -1,4 +1,9 @@
 #tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 48000
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1624,     6496, 0x00000000
 0,       1624,       1624,     1596,     6384, 0x00000000
 0,       3220,       3220,     1596,     6384, 0x00000000
diff --git a/tests/ref/fate/adpcm-ima-amv b/tests/ref/fate/adpcm-ima-amv
index 6c2fa32726..eb174dfa81 100644
--- a/tests/ref/fate/adpcm-ima-amv
+++ b/tests/ref/fate/adpcm-ima-amv
@@ -1,161 +1,166 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,     1378,     2756, 0x0af35034
 0,       1378,       1378,     1378,     2756, 0x8462443f
 0,       2756,       2756,     1378,     2756, 0x9f493ba6
 0,       4134,       4134,     1378,     2756, 0x634e5f06
-0,       5513,       5513,     1380,     2760, 0x51f35cd4
-0,       6891,       6891,     1378,     2756, 0x011c51e5
-0,       8269,       8269,     1378,     2756, 0x8c2c198c
-0,       9647,       9647,     1378,     2756, 0x2b4a3397
-0,      11025,      11025,     1378,     2756, 0x63794f22
-0,      12403,      12403,     1378,     2756, 0xfc363898
-0,      13781,      13781,     1378,     2756, 0x0da5486e
-0,      15159,      15159,     1378,     2756, 0xbae17a5f
+0,       5512,       5512,     1380,     2760, 0x51f35cd4
+0,       6892,       6892,     1378,     2756, 0x011c51e5
+0,       8270,       8270,     1378,     2756, 0x8c2c198c
+0,       9648,       9648,     1378,     2756, 0x2b4a3397
+0,      11026,      11026,     1378,     2756, 0x63794f22
+0,      12404,      12404,     1378,     2756, 0xfc363898
+0,      13782,      13782,     1378,     2756, 0x0da5486e
+0,      15160,      15160,     1378,     2756, 0xbae17a5f
 0,      16538,      16538,     1380,     2760, 0xba266e1b
-0,      17916,      17916,     1378,     2756, 0xdfb61002
-0,      19294,      19294,     1378,     2756, 0x15d029da
-0,      20672,      20672,     1378,     2756, 0x7bc82012
-0,      22050,      22050,     1378,     2756, 0x002e6999
-0,      23428,      23428,     1378,     2756, 0x96346ba6
-0,      24806,      24806,     1378,     2756, 0x3d54543b
-0,      26184,      26184,     1380,     2760, 0x601786e1
-0,      27563,      27563,     1378,     2756, 0xf22a5793
-0,      28941,      28941,     1378,     2756, 0x21f54d49
-0,      30319,      30319,     1378,     2756, 0x0c6d4399
-0,      31697,      31697,     1378,     2756, 0x17282f8e
-0,      33075,      33075,     1378,     2756, 0xeb698f75
-0,      34453,      34453,     1378,     2756, 0x935e1de2
-0,      35831,      35831,     1380,     2760, 0xb6fb4293
-0,      37209,      37209,     1378,     2756, 0x485053dc
-0,      38588,      38588,     1378,     2756, 0x24c35027
-0,      39966,      39966,     1378,     2756, 0x09f323ee
-0,      41344,      41344,     1378,     2756, 0xbc7d58d5
-0,      42722,      42722,     1378,     2756, 0xaefd487c
-0,      44100,      44100,     1378,     2756, 0xaca16cc0
-0,      45478,      45478,     1380,     2760, 0x98a76091
-0,      46856,      46856,     1378,     2756, 0x5d357141
-0,      48234,      48234,     1378,     2756, 0x65ea2657
-0,      49613,      49613,     1378,     2756, 0xb5e1334a
-0,      50991,      50991,     1378,     2756, 0x32cd5d91
-0,      52369,      52369,     1378,     2756, 0xdc23722b
-0,      53747,      53747,     1378,     2756, 0x2ba34684
-0,      55125,      55125,     1378,     2756, 0xf9755ba8
-0,      56503,      56503,     1380,     2760, 0x24221ddb
-0,      57881,      57881,     1378,     2756, 0xef843aa4
-0,      59259,      59259,     1378,     2756, 0x420442fe
-0,      60638,      60638,     1378,     2756, 0x5a0933cb
-0,      62016,      62016,     1378,     2756, 0xef5f6d61
-0,      63394,      63394,     1378,     2756, 0xe57e6dc0
-0,      64772,      64772,     1378,     2756, 0xc0f0495a
-0,      66150,      66150,     1380,     2760, 0x2c3b55df
-0,      67528,      67528,     1378,     2756, 0x39c2586c
-0,      68906,      68906,     1378,     2756, 0x7ffc46e5
-0,      70284,      70284,     1378,     2756, 0xa2766664
-0,      71663,      71663,     1378,     2756, 0xacb50c6c
-0,      73041,      73041,     1378,     2756, 0x7f659084
-0,      74419,      74419,     1378,     2756, 0xc72e6a12
-0,      75797,      75797,     1380,     2760, 0xdb6944df
-0,      77175,      77175,     1378,     2756, 0x954f45c1
-0,      78553,      78553,     1378,     2756, 0xa9484240
-0,      79931,      79931,     1378,     2756, 0x1d595349
-0,      81309,      81309,     1378,     2756, 0xcf2a565e
-0,      82688,      82688,     1378,     2756, 0x391028d5
-0,      84066,      84066,     1378,     2756, 0x348db7ad
-0,      85444,      85444,     1380,     2760, 0xb69b5e3a
-0,      86822,      86822,     1378,     2756, 0xe3635fbe
-0,      88200,      88200,     1378,     2756, 0xdcad3654
-0,      89578,      89578,     1378,     2756, 0x5c17abef
-0,      90956,      90956,     1378,     2756, 0xb3235184
-0,      92334,      92334,     1378,     2756, 0xdabb64a6
-0,      93713,      93713,     1378,     2756, 0xa95dc58d
-0,      95091,      95091,     1380,     2760, 0x8e7ac9eb
-0,      96469,      96469,     1378,     2756, 0x492b658e
-0,      97847,      97847,     1378,     2756, 0x377483ab
-0,      99225,      99225,     1378,     2756, 0x2c250279
-0,     100603,     100603,     1378,     2756, 0x704dbdb3
-0,     101981,     101981,     1378,     2756, 0x800d7da2
-0,     103359,     103359,     1378,     2756, 0x872aa32e
-0,     104738,     104738,     1378,     2756, 0x2d4837fe
-0,     106116,     106116,     1380,     2760, 0xc89ea57e
-0,     107494,     107494,     1378,     2756, 0x6447d7ef
-0,     108872,     108872,     1378,     2756, 0x144f59cc
-0,     110250,     110250,     1378,     2756, 0xc667154e
-0,     111628,     111628,     1378,     2756, 0xf0de66ae
-0,     113006,     113006,     1378,     2756, 0xeabf3c32
-0,     114384,     114384,     1378,     2756, 0xe98e81d1
-0,     115763,     115763,     1380,     2760, 0x56aa5889
-0,     117141,     117141,     1378,     2756, 0x4fd34c0e
-0,     118519,     118519,     1378,     2756, 0x67cf6912
-0,     119897,     119897,     1378,     2756, 0xfa944def
-0,     121275,     121275,     1378,     2756, 0xc12f23b2
-0,     122653,     122653,     1378,     2756, 0x5ea325a2
-0,     124031,     124031,     1378,     2756, 0x2b245824
-0,     125409,     125409,     1380,     2760, 0x90ac533e
-0,     126788,     126788,     1378,     2756, 0xcca34d26
-0,     128166,     128166,     1378,     2756, 0xb5f820d0
-0,     129544,     129544,     1378,     2756, 0x27f24335
-0,     130922,     130922,     1378,     2756, 0x4a9e87b7
-0,     132300,     132300,     1378,     2756, 0xbd076129
-0,     133678,     133678,     1378,     2756, 0x2e0e3f2e
-0,     135056,     135056,     1380,     2760, 0xdf534478
-0,     136434,     136434,     1378,     2756, 0xca000a2e
-0,     137813,     137813,     1378,     2756, 0x87472df3
-0,     139191,     139191,     1378,     2756, 0x16733810
-0,     140569,     140569,     1378,     2756, 0xfa0734b4
-0,     141947,     141947,     1378,     2756, 0x5eff3fc4
-0,     143325,     143325,     1378,     2756, 0xf35346bd
-0,     144703,     144703,     1378,     2756, 0xac6411c5
-0,     146081,     146081,     1380,     2760, 0x478c3c56
-0,     147459,     147459,     1378,     2756, 0xebd30bdd
-0,     148838,     148838,     1378,     2756, 0xaef95a31
-0,     150216,     150216,     1378,     2756, 0x8aad29d1
-0,     151594,     151594,     1378,     2756, 0x626863f0
-0,     152972,     152972,     1378,     2756, 0x68c05707
-0,     154350,     154350,     1378,     2756, 0x437c5e8d
-0,     155728,     155728,     1380,     2760, 0x8eca4bdb
-0,     157106,     157106,     1378,     2756, 0x62bd4162
-0,     158484,     158484,     1378,     2756, 0x9f744aa4
-0,     159863,     159863,     1378,     2756, 0x0f3f6409
-0,     161241,     161241,     1378,     2756, 0x3fee827a
-0,     162619,     162619,     1378,     2756, 0x48a0ac19
-0,     163997,     163997,     1378,     2756, 0x8e4ce0d0
-0,     165375,     165375,     1380,     2760, 0xcda82236
-0,     166753,     166753,     1378,     2756, 0x0e523255
-0,     168131,     168131,     1378,     2756, 0x84103d30
-0,     169509,     169509,     1378,     2756, 0x13941cde
-0,     170888,     170888,     1378,     2756, 0x9fc834c5
-0,     172266,     172266,     1378,     2756, 0xc0217a77
-0,     173644,     173644,     1378,     2756, 0x3f643659
-0,     175022,     175022,     1380,     2760, 0x9dbd6002
-0,     176400,     176400,     1378,     2756, 0x94f046fb
-0,     177778,     177778,     1378,     2756, 0xab01fb12
-0,     179156,     179156,     1378,     2756, 0x04cffe5c
-0,     180534,     180534,     1378,     2756, 0xef661c5e
-0,     181913,     181913,     1378,     2756, 0x094c5fc5
-0,     183291,     183291,     1378,     2756, 0xe0c1486a
-0,     184669,     184669,     1380,     2760, 0x8c3535b7
-0,     186047,     186047,     1378,     2756, 0x594934aa
-0,     187425,     187425,     1378,     2756, 0x74007238
-0,     188803,     188803,     1378,     2756, 0x61f1394d
-0,     190181,     190181,     1378,     2756, 0x72584f07
-0,     191559,     191559,     1378,     2756, 0xced9acf9
-0,     192938,     192938,     1378,     2756, 0x7d2e3ea1
-0,     194316,     194316,     1378,     2756, 0x56c06897
-0,     195694,     195694,     1380,     2760, 0x19983bbf
-0,     197072,     197072,     1378,     2756, 0x4f884f27
-0,     198450,     198450,     1378,     2756, 0x81ab2f63
-0,     199828,     199828,     1378,     2756, 0x448e681d
-0,     201206,     201206,     1378,     2756, 0x0ba9826e
-0,     202584,     202584,     1378,     2756, 0x049f36fa
-0,     203963,     203963,     1378,     2756, 0x096a2b62
-0,     205341,     205341,     1380,     2760, 0x579e2035
-0,     206719,     206719,     1378,     2756, 0xd13e30e1
-0,     208097,     208097,     1378,     2756, 0x30b6412b
-0,     209475,     209475,     1378,     2756, 0xbb1c3268
-0,     210853,     210853,     1378,     2756, 0xbc175b6a
-0,     212231,     212231,     1378,     2756, 0xf8d160e2
-0,     213609,     213609,     1378,     2756, 0xc1048154
-0,     214988,     214988,     1380,     2760, 0xb83548f4
-0,     216366,     216366,     1378,     2756, 0x22647962
-0,     217744,     217744,     1378,     2756, 0x14ca54d3
-0,     219122,     219122,     1378,     2756, 0x58754b3a
+0,      17918,      17918,     1378,     2756, 0xdfb61002
+0,      19296,      19296,     1378,     2756, 0x15d029da
+0,      20674,      20674,     1378,     2756, 0x7bc82012
+0,      22052,      22052,     1378,     2756, 0x002e6999
+0,      23430,      23430,     1378,     2756, 0x96346ba6
+0,      24808,      24808,     1378,     2756, 0x3d54543b
+0,      26186,      26186,     1380,     2760, 0x601786e1
+0,      27566,      27566,     1378,     2756, 0xf22a5793
+0,      28944,      28944,     1378,     2756, 0x21f54d49
+0,      30322,      30322,     1378,     2756, 0x0c6d4399
+0,      31700,      31700,     1378,     2756, 0x17282f8e
+0,      33078,      33078,     1378,     2756, 0xeb698f75
+0,      34456,      34456,     1378,     2756, 0x935e1de2
+0,      35834,      35834,     1380,     2760, 0xb6fb4293
+0,      37214,      37214,     1378,     2756, 0x485053dc
+0,      38592,      38592,     1378,     2756, 0x24c35027
+0,      39970,      39970,     1378,     2756, 0x09f323ee
+0,      41348,      41348,     1378,     2756, 0xbc7d58d5
+0,      42726,      42726,     1378,     2756, 0xaefd487c
+0,      44104,      44104,     1378,     2756, 0xaca16cc0
+0,      45482,      45482,     1380,     2760, 0x98a76091
+0,      46862,      46862,     1378,     2756, 0x5d357141
+0,      48240,      48240,     1378,     2756, 0x65ea2657
+0,      49618,      49618,     1378,     2756, 0xb5e1334a
+0,      50996,      50996,     1378,     2756, 0x32cd5d91
+0,      52374,      52374,     1378,     2756, 0xdc23722b
+0,      53752,      53752,     1378,     2756, 0x2ba34684
+0,      55130,      55130,     1378,     2756, 0xf9755ba8
+0,      56508,      56508,     1380,     2760, 0x24221ddb
+0,      57888,      57888,     1378,     2756, 0xef843aa4
+0,      59266,      59266,     1378,     2756, 0x420442fe
+0,      60644,      60644,     1378,     2756, 0x5a0933cb
+0,      62022,      62022,     1378,     2756, 0xef5f6d61
+0,      63400,      63400,     1378,     2756, 0xe57e6dc0
+0,      64778,      64778,     1378,     2756, 0xc0f0495a
+0,      66156,      66156,     1380,     2760, 0x2c3b55df
+0,      67536,      67536,     1378,     2756, 0x39c2586c
+0,      68914,      68914,     1378,     2756, 0x7ffc46e5
+0,      70292,      70292,     1378,     2756, 0xa2766664
+0,      71670,      71670,     1378,     2756, 0xacb50c6c
+0,      73048,      73048,     1378,     2756, 0x7f659084
+0,      74426,      74426,     1378,     2756, 0xc72e6a12
+0,      75804,      75804,     1380,     2760, 0xdb6944df
+0,      77184,      77184,     1378,     2756, 0x954f45c1
+0,      78562,      78562,     1378,     2756, 0xa9484240
+0,      79940,      79940,     1378,     2756, 0x1d595349
+0,      81318,      81318,     1378,     2756, 0xcf2a565e
+0,      82696,      82696,     1378,     2756, 0x391028d5
+0,      84074,      84074,     1378,     2756, 0x348db7ad
+0,      85452,      85452,     1380,     2760, 0xb69b5e3a
+0,      86832,      86832,     1378,     2756, 0xe3635fbe
+0,      88210,      88210,     1378,     2756, 0xdcad3654
+0,      89588,      89588,     1378,     2756, 0x5c17abef
+0,      90966,      90966,     1378,     2756, 0xb3235184
+0,      92344,      92344,     1378,     2756, 0xdabb64a6
+0,      93722,      93722,     1378,     2756, 0xa95dc58d
+0,      95100,      95100,     1380,     2760, 0x8e7ac9eb
+0,      96480,      96480,     1378,     2756, 0x492b658e
+0,      97858,      97858,     1378,     2756, 0x377483ab
+0,      99236,      99236,     1378,     2756, 0x2c250279
+0,     100614,     100614,     1378,     2756, 0x704dbdb3
+0,     101992,     101992,     1378,     2756, 0x800d7da2
+0,     103370,     103370,     1378,     2756, 0x872aa32e
+0,     104748,     104748,     1378,     2756, 0x2d4837fe
+0,     106126,     106126,     1380,     2760, 0xc89ea57e
+0,     107506,     107506,     1378,     2756, 0x6447d7ef
+0,     108884,     108884,     1378,     2756, 0x144f59cc
+0,     110262,     110262,     1378,     2756, 0xc667154e
+0,     111640,     111640,     1378,     2756, 0xf0de66ae
+0,     113018,     113018,     1378,     2756, 0xeabf3c32
+0,     114396,     114396,     1378,     2756, 0xe98e81d1
+0,     115774,     115774,     1380,     2760, 0x56aa5889
+0,     117154,     117154,     1378,     2756, 0x4fd34c0e
+0,     118532,     118532,     1378,     2756, 0x67cf6912
+0,     119910,     119910,     1378,     2756, 0xfa944def
+0,     121288,     121288,     1378,     2756, 0xc12f23b2
+0,     122666,     122666,     1378,     2756, 0x5ea325a2
+0,     124044,     124044,     1378,     2756, 0x2b245824
+0,     125422,     125422,     1380,     2760, 0x90ac533e
+0,     126802,     126802,     1378,     2756, 0xcca34d26
+0,     128180,     128180,     1378,     2756, 0xb5f820d0
+0,     129558,     129558,     1378,     2756, 0x27f24335
+0,     130936,     130936,     1378,     2756, 0x4a9e87b7
+0,     132314,     132314,     1378,     2756, 0xbd076129
+0,     133692,     133692,     1378,     2756, 0x2e0e3f2e
+0,     135070,     135070,     1380,     2760, 0xdf534478
+0,     136450,     136450,     1378,     2756, 0xca000a2e
+0,     137828,     137828,     1378,     2756, 0x87472df3
+0,     139206,     139206,     1378,     2756, 0x16733810
+0,     140584,     140584,     1378,     2756, 0xfa0734b4
+0,     141962,     141962,     1378,     2756, 0x5eff3fc4
+0,     143340,     143340,     1378,     2756, 0xf35346bd
+0,     144718,     144718,     1378,     2756, 0xac6411c5
+0,     146096,     146096,     1380,     2760, 0x478c3c56
+0,     147476,     147476,     1378,     2756, 0xebd30bdd
+0,     148854,     148854,     1378,     2756, 0xaef95a31
+0,     150232,     150232,     1378,     2756, 0x8aad29d1
+0,     151610,     151610,     1378,     2756, 0x626863f0
+0,     152988,     152988,     1378,     2756, 0x68c05707
+0,     154366,     154366,     1378,     2756, 0x437c5e8d
+0,     155744,     155744,     1380,     2760, 0x8eca4bdb
+0,     157124,     157124,     1378,     2756, 0x62bd4162
+0,     158502,     158502,     1378,     2756, 0x9f744aa4
+0,     159880,     159880,     1378,     2756, 0x0f3f6409
+0,     161258,     161258,     1378,     2756, 0x3fee827a
+0,     162636,     162636,     1378,     2756, 0x48a0ac19
+0,     164014,     164014,     1378,     2756, 0x8e4ce0d0
+0,     165392,     165392,     1380,     2760, 0xcda82236
+0,     166772,     166772,     1378,     2756, 0x0e523255
+0,     168150,     168150,     1378,     2756, 0x84103d30
+0,     169528,     169528,     1378,     2756, 0x13941cde
+0,     170906,     170906,     1378,     2756, 0x9fc834c5
+0,     172284,     172284,     1378,     2756, 0xc0217a77
+0,     173662,     173662,     1378,     2756, 0x3f643659
+0,     175040,     175040,     1380,     2760, 0x9dbd6002
+0,     176420,     176420,     1378,     2756, 0x94f046fb
+0,     177798,     177798,     1378,     2756, 0xab01fb12
+0,     179176,     179176,     1378,     2756, 0x04cffe5c
+0,     180554,     180554,     1378,     2756, 0xef661c5e
+0,     181932,     181932,     1378,     2756, 0x094c5fc5
+0,     183310,     183310,     1378,     2756, 0xe0c1486a
+0,     184688,     184688,     1380,     2760, 0x8c3535b7
+0,     186068,     186068,     1378,     2756, 0x594934aa
+0,     187446,     187446,     1378,     2756, 0x74007238
+0,     188824,     188824,     1378,     2756, 0x61f1394d
+0,     190202,     190202,     1378,     2756, 0x72584f07
+0,     191580,     191580,     1378,     2756, 0xced9acf9
+0,     192958,     192958,     1378,     2756, 0x7d2e3ea1
+0,     194336,     194336,     1378,     2756, 0x56c06897
+0,     195714,     195714,     1380,     2760, 0x19983bbf
+0,     197094,     197094,     1378,     2756, 0x4f884f27
+0,     198472,     198472,     1378,     2756, 0x81ab2f63
+0,     199850,     199850,     1378,     2756, 0x448e681d
+0,     201228,     201228,     1378,     2756, 0x0ba9826e
+0,     202606,     202606,     1378,     2756, 0x049f36fa
+0,     203984,     203984,     1378,     2756, 0x096a2b62
+0,     205362,     205362,     1380,     2760, 0x579e2035
+0,     206742,     206742,     1378,     2756, 0xd13e30e1
+0,     208120,     208120,     1378,     2756, 0x30b6412b
+0,     209498,     209498,     1378,     2756, 0xbb1c3268
+0,     210876,     210876,     1378,     2756, 0xbc175b6a
+0,     212254,     212254,     1378,     2756, 0xf8d160e2
+0,     213632,     213632,     1378,     2756, 0xc1048154
+0,     215010,     215010,     1380,     2760, 0xb83548f4
+0,     216390,     216390,     1378,     2756, 0x22647962
+0,     217768,     217768,     1378,     2756, 0x14ca54d3
+0,     219146,     219146,     1354,     2708, 0x85e82e8d
diff --git a/tests/ref/fate/adpcm-ima-ea-eacs b/tests/ref/fate/adpcm-ima-ea-eacs
index 9887296f45..fcfcbeb175 100644
--- a/tests/ref/fate/adpcm-ima-ea-eacs
+++ b/tests/ref/fate/adpcm-ima-ea-eacs
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1468,     5872, 0x00000000
 0,       1468,       1468,     1468,     5872, 0x00000000
 0,       2936,       2936,     1468,     5872, 0x00000000
diff --git a/tests/ref/fate/adpcm-ima-ea-sead b/tests/ref/fate/adpcm-ima-ea-sead
index 17c10875a6..2d52efe3c0 100644
--- a/tests/ref/fate/adpcm-ima-ea-sead
+++ b/tests/ref/fate/adpcm-ima-ea-sead
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,      736,     2944, 0x00000000
 0,        736,        736,     1472,     5888, 0x5ae3c2a4
 0,       2208,       2208,     1472,     5888, 0x158fbcb4
diff --git a/tests/ref/fate/adpcm-ima-oki b/tests/ref/fate/adpcm-ima-oki
new file mode 100644
index 0000000000..c6f1ee1e63
--- /dev/null
+++ b/tests/ref/fate/adpcm-ima-oki
@@ -0,0 +1 @@
+641049800e735b62e975baacc9a011a4
diff --git a/tests/ref/fate/adpcm-ima-rad b/tests/ref/fate/adpcm-ima-rad
new file mode 100644
index 0000000000..c5de1a64e6
--- /dev/null
+++ b/tests/ref/fate/adpcm-ima-rad
@@ -0,0 +1 @@
+495f0ae514c28c6bdcbd40811a17e2a5
diff --git a/tests/ref/fate/adpcm-ima-smjpeg b/tests/ref/fate/adpcm-ima-smjpeg
index 45cb97bfc1..d56014ea01 100644
--- a/tests/ref/fate/adpcm-ima-smjpeg
+++ b/tests/ref/fate/adpcm-ima-smjpeg
@@ -1,351 +1,356 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      512,     1024, 0x00000000
-0,        507,        507,      512,     1024, 0x00000000
-0,       1014,       1014,      512,     1024, 0xd89a448e
-0,       1521,       1521,      512,     1024, 0x695b369c
-0,       2029,       2029,      512,     1024, 0xc8ba5707
-0,       2558,       2558,      512,     1024, 0xdf241fc6
-0,       3065,       3065,      512,     1024, 0x61cf4166
-0,       3572,       3572,      512,     1024, 0x97cbc386
-0,       4079,       4079,      512,     1024, 0x44899d04
-0,       4586,       4586,      512,     1024, 0xa7cbaa62
-0,       5116,       5116,      512,     1024, 0xa7aea60c
-0,       5623,       5623,      512,     1024, 0xd7b18a89
-0,       6130,       6130,      512,     1024, 0x268e81f6
-0,       6637,       6637,      512,     1024, 0x9cf83a2f
-0,       7166,       7166,      512,     1024, 0x5559b508
-0,       7673,       7673,      512,     1024, 0xe1b9e71c
-0,       8181,       8181,      512,     1024, 0xdcee733e
-0,       8688,       8688,      512,     1024, 0xe5918f60
-0,       9195,       9195,      512,     1024, 0x29dbd209
-0,       9724,       9724,      512,     1024, 0x9bcbcf16
-0,      10231,      10231,      512,     1024, 0x86f5f458
-0,      10738,      10738,      512,     1024, 0xabcbda86
-0,      11246,      11246,      512,     1024, 0xc51f77b9
-0,      11775,      11775,      512,     1024, 0xf6b3a504
-0,      12282,      12282,      512,     1024, 0x1af3e40e
-0,      12789,      12789,      512,     1024, 0x3866b03b
-0,      13296,      13296,      512,     1024, 0xbc005403
-0,      13803,      13803,      512,     1024, 0xe9dfcc51
-0,      14333,      14333,      512,     1024, 0x83c837cb
-0,      14840,      14840,      512,     1024, 0xfa649580
-0,      15347,      15347,      512,     1024, 0x519452ea
-0,      15854,      15854,      512,     1024, 0xd4978774
-0,      16383,      16383,      512,     1024, 0xe2a3b1cd
-0,      16890,      16890,      512,     1024, 0x9a9472ad
-0,      17397,      17397,      512,     1024, 0xa12d4060
-0,      17905,      17905,      512,     1024, 0x31fb0646
-0,      18412,      18412,      512,     1024, 0xfc44343f
-0,      18941,      18941,      512,     1024, 0x0847751a
-0,      19448,      19448,      512,     1024, 0x227968a2
-0,      19955,      19955,      512,     1024, 0x7cce9f1c
-0,      20462,      20462,      512,     1024, 0xb8356713
-0,      20992,      20992,      512,     1024, 0xb29f6e6f
-0,      21499,      21499,      512,     1024, 0x9e1430ab
-0,      22006,      22006,      512,     1024, 0x26d85423
-0,      22513,      22513,      512,     1024, 0x6496547d
-0,      23020,      23020,      512,     1024, 0x316b1a86
-0,      23549,      23549,      512,     1024, 0x3cd83afc
-0,      24057,      24057,      512,     1024, 0x993ff633
-0,      24564,      24564,      512,     1024, 0x0708d1a2
-0,      25071,      25071,      512,     1024, 0xd7230db9
-0,      25578,      25578,      512,     1024, 0xbb0779ca
-0,      26107,      26107,      512,     1024, 0xc6094e1b
-0,      26614,      26614,      512,     1024, 0x15a8b039
-0,      27122,      27122,      512,     1024, 0xd6dbe88c
-0,      27629,      27629,      512,     1024, 0x7e8d1140
-0,      28158,      28158,      512,     1024, 0xef88e525
-0,      28665,      28665,      512,     1024, 0x44e21149
-0,      29172,      29172,      512,     1024, 0x65b0f5f4
-0,      29679,      29679,      512,     1024, 0xb955f687
-0,      30186,      30186,      512,     1024, 0xc85fba9c
-0,      30716,      30716,      512,     1024, 0xf59655ad
-0,      31223,      31223,      512,     1024, 0x6de80bf1
-0,      31730,      31730,      512,     1024, 0x2dcf6e41
-0,      32237,      32237,      512,     1024, 0xd0ddcf8a
-0,      32766,      32766,      512,     1024, 0x00135c2d
-0,      33273,      33273,      512,     1024, 0x697f8efd
-0,      33781,      33781,      512,     1024, 0x7a9bada5
-0,      34288,      34288,      512,     1024, 0x0d22783c
-0,      34795,      34795,      512,     1024, 0x7726d07d
-0,      35324,      35324,      512,     1024, 0xa2f14f67
-0,      35831,      35831,      512,     1024, 0x7f51060d
-0,      36338,      36338,      512,     1024, 0xc4ec6aea
-0,      36846,      36846,      512,     1024, 0x9bb37ca4
-0,      37375,      37375,      512,     1024, 0x9b085577
-0,      37882,      37882,      512,     1024, 0x8812f8af
-0,      38389,      38389,      512,     1024, 0x788f5221
-0,      38896,      38896,      512,     1024, 0x3a2ce642
-0,      39403,      39403,      512,     1024, 0x72415692
-0,      39933,      39933,      512,     1024, 0xe3dcc105
-0,      40440,      40440,      512,     1024, 0xb26c0599
-0,      40947,      40947,      512,     1024, 0x5c9e55eb
-0,      41454,      41454,      512,     1024, 0x8fe88707
-0,      41983,      41983,      512,     1024, 0xc5d7beb6
-0,      42490,      42490,      512,     1024, 0xe1d3a3b4
-0,      42998,      42998,      512,     1024, 0x012da0c6
-0,      43505,      43505,      512,     1024, 0x8d010922
-0,      44012,      44012,      512,     1024, 0x3366eb0d
-0,      44541,      44541,      512,     1024, 0xc9381a27
-0,      45048,      45048,      512,     1024, 0x0774f685
-0,      45555,      45555,      512,     1024, 0xc5cae0a5
-0,      46062,      46062,      512,     1024, 0xa6f4737c
-0,      46592,      46592,      512,     1024, 0x8fb6d0d1
-0,      47099,      47099,      512,     1024, 0x05f579c2
-0,      47606,      47606,      512,     1024, 0x56905d99
-0,      48113,      48113,      512,     1024, 0x002ee18d
-0,      48620,      48620,      512,     1024, 0xeb37ef51
-0,      49149,      49149,      512,     1024, 0x38025635
-0,      49657,      49657,      512,     1024, 0x4fe643c8
-0,      50164,      50164,      512,     1024, 0x11d66ab1
-0,      50671,      50671,      512,     1024, 0xcc3051e9
-0,      51178,      51178,      512,     1024, 0xcd93e854
-0,      51707,      51707,      512,     1024, 0x38f1196d
-0,      52214,      52214,      512,     1024, 0x657a15fc
-0,      52722,      52722,      512,     1024, 0x669ce2a9
-0,      53229,      53229,      512,     1024, 0x95862dda
-0,      53758,      53758,      512,     1024, 0x1726a7b2
-0,      54265,      54265,      512,     1024, 0xd6ece2a1
-0,      54772,      54772,      512,     1024, 0x33ab9553
-0,      55279,      55279,      512,     1024, 0xd50c73a6
-0,      55787,      55787,      512,     1024, 0xfe25b63a
-0,      56316,      56316,      512,     1024, 0x7e2959e3
-0,      56823,      56823,      512,     1024, 0xa4c07b34
-0,      57330,      57330,      512,     1024, 0xd6d8f15c
-0,      57837,      57837,      512,     1024, 0x1eccddd7
-0,      58366,      58366,      512,     1024, 0x2b69f9cb
-0,      58874,      58874,      512,     1024, 0x667b775f
-0,      59381,      59381,      512,     1024, 0xad3b84e9
-0,      59888,      59888,      512,     1024, 0x4f29fc67
-0,      60395,      60395,      512,     1024, 0x8d611ab7
-0,      60924,      60924,      512,     1024, 0x278966ea
-0,      61431,      61431,      512,     1024, 0xaf33812b
-0,      61938,      61938,      512,     1024, 0xa55f4265
-0,      62446,      62446,      512,     1024, 0x023cb51c
-0,      62975,      62975,      512,     1024, 0x1d1f1005
-0,      63482,      63482,      512,     1024, 0x874cccf7
-0,      63989,      63989,      512,     1024, 0xda705428
-0,      64496,      64496,      512,     1024, 0x48d9b440
-0,      65003,      65003,      512,     1024, 0xa14e0712
-0,      65533,      65533,      512,     1024, 0x7efbad1f
-0,      66040,      66040,      512,     1024, 0xdb82c17f
-0,      66547,      66547,      512,     1024, 0xcbe87613
-0,      67054,      67054,      512,     1024, 0x3a63df1d
-0,      67583,      67583,      512,     1024, 0xd5636bba
-0,      68090,      68090,      512,     1024, 0x9397af23
-0,      68598,      68598,      512,     1024, 0x32a07c98
-0,      69105,      69105,      512,     1024, 0x202ca667
-0,      69612,      69612,      512,     1024, 0xdf969011
-0,      70141,      70141,      512,     1024, 0xc434d238
-0,      70648,      70648,      512,     1024, 0xe9ad7562
-0,      71155,      71155,      512,     1024, 0xb51b6b50
-0,      71663,      71663,      512,     1024, 0xe70aecd3
-0,      72192,      72192,      512,     1024, 0x03c816b2
-0,      72699,      72699,      512,     1024, 0x869fdf25
-0,      73206,      73206,      512,     1024, 0xd40a0a62
-0,      73713,      73713,      512,     1024, 0x5af7dd35
-0,      74220,      74220,      512,     1024, 0x891ffc72
-0,      74750,      74750,      512,     1024, 0x1ff68a08
-0,      75257,      75257,      512,     1024, 0x5a7517a9
-0,      75764,      75764,      512,     1024, 0x0f959f74
-0,      76271,      76271,      512,     1024, 0xe92a12a2
-0,      76778,      76778,      512,     1024, 0x38000e55
-0,      77307,      77307,      512,     1024, 0x39fbdd70
-0,      77814,      77814,      512,     1024, 0xca3d9184
-0,      78322,      78322,      512,     1024, 0x66c8995b
-0,      78829,      78829,      512,     1024, 0xac25acea
-0,      79358,      79358,      512,     1024, 0x3cd1046c
-0,      79865,      79865,      512,     1024, 0x6a1df31c
-0,      80372,      80372,      512,     1024, 0x21ca10a1
-0,      80879,      80879,      512,     1024, 0x1aeccedc
-0,      81387,      81387,      512,     1024, 0xddea1335
-0,      81916,      81916,      512,     1024, 0x19f5ca9f
-0,      82423,      82423,      512,     1024, 0x88e95e43
-0,      82930,      82930,      512,     1024, 0x726284fe
-0,      83437,      83437,      512,     1024, 0x6b85b40e
-0,      83966,      83966,      512,     1024, 0x111fee2a
-0,      84474,      84474,      512,     1024, 0x3656b588
-0,      84981,      84981,      512,     1024, 0xa5a2b552
-0,      85488,      85488,      512,     1024, 0x38fb2467
-0,      85995,      85995,      512,     1024, 0xaa919ccc
-0,      86524,      86524,      512,     1024, 0x15993dbc
-0,      87031,      87031,      512,     1024, 0xbe01a7b9
-0,      87539,      87539,      512,     1024, 0xefe93c09
-0,      88046,      88046,      512,     1024, 0x1bb566e5
-0,      88575,      88575,      512,     1024, 0x15ce6237
-0,      89082,      89082,      512,     1024, 0xa8552e66
-0,      89589,      89589,      512,     1024, 0x9d80187e
-0,      90096,      90096,      512,     1024, 0x5df3fc30
-0,      90603,      90603,      512,     1024, 0x1a312aa5
-0,      91133,      91133,      512,     1024, 0x6bb8e302
-0,      91640,      91640,      512,     1024, 0xbd9684bb
-0,      92147,      92147,      512,     1024, 0x78b0b166
-0,      92654,      92654,      512,     1024, 0xd9af5eae
-0,      93183,      93183,      512,     1024, 0xdb90fe82
-0,      93690,      93690,      512,     1024, 0x327614e9
-0,      94198,      94198,      512,     1024, 0x1f19b7fe
-0,      94705,      94705,      512,     1024, 0x46c53f96
-0,      95212,      95212,      512,     1024, 0x921b2189
-0,      95741,      95741,      512,     1024, 0xa8fbc85a
-0,      96248,      96248,      512,     1024, 0xabfdaaae
-0,      96755,      96755,      512,     1024, 0x6acc7387
-0,      97263,      97263,      512,     1024, 0x0d9c27b5
-0,      97792,      97792,      512,     1024, 0xba4dd809
-0,      98299,      98299,      512,     1024, 0x2a2ad521
-0,      98806,      98806,      512,     1024, 0x892de38a
-0,      99313,      99313,      512,     1024, 0xdc97a2eb
-0,      99820,      99820,      512,     1024, 0x4f614ca4
-0,     100350,     100350,      512,     1024, 0x9c8a77ea
-0,     100857,     100857,      512,     1024, 0x2d30e646
-0,     101364,     101364,      512,     1024, 0x74e800a7
-0,     101871,     101871,      512,     1024, 0x1e01fb02
-0,     102378,     102378,      512,     1024, 0x4ed2c1d8
-0,     102907,     102907,      512,     1024, 0xf2fdbe63
-0,     103415,     103415,      512,     1024, 0x8d6f63a1
-0,     103922,     103922,      512,     1024, 0xded468d9
-0,     104429,     104429,      512,     1024, 0xccad839e
-0,     104958,     104958,      512,     1024, 0xdde7c082
-0,     105465,     105465,      512,     1024, 0x548613c5
-0,     105972,     105972,      512,     1024, 0x383909bd
-0,     106479,     106479,      512,     1024, 0xfd37627b
-0,     106987,     106987,      512,     1024, 0x6d95a481
-0,     107516,     107516,      512,     1024, 0x56aa87fa
-0,     108023,     108023,      512,     1024, 0x7b67258c
-0,     108530,     108530,      512,     1024, 0x7dd99a92
-0,     109037,     109037,      512,     1024, 0x4a66d102
-0,     109566,     109566,      512,     1024, 0x7b3fce51
-0,     110074,     110074,      512,     1024, 0xbbd968aa
-0,     110581,     110581,      512,     1024, 0x8283ec36
-0,     111088,     111088,      512,     1024, 0x3c96493d
-0,     111595,     111595,      512,     1024, 0xfa4f8cf8
-0,     112124,     112124,      512,     1024, 0xe2cf872d
-0,     112631,     112631,      512,     1024, 0x0a9e7aa6
-0,     113139,     113139,      512,     1024, 0x6e7a0550
-0,     113646,     113646,      512,     1024, 0x3acfea2f
-0,     114175,     114175,      512,     1024, 0x7111d0fa
-0,     114682,     114682,      512,     1024, 0xe9a1eca9
-0,     115189,     115189,      512,     1024, 0x24da6c46
-0,     115696,     115696,      512,     1024, 0x117cff37
-0,     116204,     116204,      512,     1024, 0x0f27cab6
-0,     116733,     116733,      512,     1024, 0x69b6b4e6
-0,     117240,     117240,      512,     1024, 0x1e6cc841
-0,     117747,     117747,      512,     1024, 0xb01e2365
-0,     118254,     118254,      512,     1024, 0x14e200d3
-0,     118783,     118783,      512,     1024, 0xd1184c98
-0,     119291,     119291,      512,     1024, 0xef9140e9
-0,     119798,     119798,      512,     1024, 0x4cbb645e
-0,     120305,     120305,      512,     1024, 0xe7fe2f06
-0,     120812,     120812,      512,     1024, 0xf8c45028
-0,     121341,     121341,      512,     1024, 0x561358f4
-0,     121848,     121848,      512,     1024, 0xd0129b77
-0,     122355,     122355,      512,     1024, 0xcc636e88
-0,     122863,     122863,      512,     1024, 0xe9406321
-0,     123392,     123392,      512,     1024, 0x9f16a041
-0,     123899,     123899,      512,     1024, 0x468bf409
-0,     124406,     124406,      512,     1024, 0x3df70f7b
-0,     124913,     124913,      512,     1024, 0xa880b11b
-0,     125420,     125420,      512,     1024, 0x3286c489
-0,     125950,     125950,      512,     1024, 0x39fe9ebc
-0,     126457,     126457,      512,     1024, 0xc533d83b
-0,     126964,     126964,      512,     1024, 0x153b195d
-0,     127471,     127471,      512,     1024, 0xd84786a1
-0,     127978,     127978,      512,     1024, 0xdc295aaa
-0,     128507,     128507,      512,     1024, 0xfb764d8c
-0,     129015,     129015,      512,     1024, 0xeebc9db9
-0,     129522,     129522,      512,     1024, 0x7ba9403e
-0,     130029,     130029,      512,     1024, 0x4e5571ec
-0,     130558,     130558,      512,     1024, 0xd965fad4
-0,     131065,     131065,      512,     1024, 0x87e259f2
-0,     131572,     131572,      512,     1024, 0xae7e533b
-0,     132080,     132080,      512,     1024, 0x313cf4d6
-0,     132587,     132587,      512,     1024, 0xe1844c90
-0,     133116,     133116,      512,     1024, 0xbb057b44
-0,     133623,     133623,      512,     1024, 0xa5099687
-0,     134130,     134130,      512,     1024, 0xbff10707
-0,     134637,     134637,      512,     1024, 0x37c4ffc0
-0,     135167,     135167,      512,     1024, 0xf9fb6caa
-0,     135674,     135674,      512,     1024, 0x3b6a3a1f
-0,     136181,     136181,      512,     1024, 0x83431edb
-0,     136688,     136688,      512,     1024, 0x1eb713cf
-0,     137195,     137195,      512,     1024, 0xd7b07a6d
-0,     137724,     137724,      512,     1024, 0x81ae3391
-0,     138231,     138231,      512,     1024, 0xf150130a
-0,     138739,     138739,      512,     1024, 0x09678eaa
-0,     139246,     139246,      512,     1024, 0xb94e06f1
-0,     139775,     139775,      512,     1024, 0x67b1dbc9
-0,     140282,     140282,      512,     1024, 0xd6edc235
-0,     140789,     140789,      512,     1024, 0x34e4c499
-0,     141296,     141296,      512,     1024, 0xeefd89c0
-0,     141804,     141804,      512,     1024, 0x38afdaf1
-0,     142333,     142333,      512,     1024, 0x29a60d76
-0,     142840,     142840,      512,     1024, 0xe28a4372
-0,     143347,     143347,      512,     1024, 0x7089454d
-0,     143854,     143854,      512,     1024, 0x0c01bb7b
-0,     144383,     144383,      512,     1024, 0xbd776a72
-0,     144891,     144891,      512,     1024, 0x86776fd0
-0,     145398,     145398,      512,     1024, 0xb37c88f7
-0,     145905,     145905,      512,     1024, 0x5f90aaf8
-0,     146412,     146412,      512,     1024, 0x203d4222
-0,     146941,     146941,      512,     1024, 0x382692a6
-0,     147448,     147448,      512,     1024, 0xf37c95fd
-0,     147956,     147956,      512,     1024, 0x6c0b8877
-0,     148463,     148463,      512,     1024, 0x2e54a8b6
-0,     148992,     148992,      512,     1024, 0x7f266488
-0,     149499,     149499,      512,     1024, 0xfbf20f9a
-0,     150006,     150006,      512,     1024, 0xf2985cc0
-0,     150513,     150513,      512,     1024, 0xc7075340
-0,     151020,     151020,      512,     1024, 0xe4585695
-0,     151550,     151550,      512,     1024, 0xbdffa380
-0,     152057,     152057,      512,     1024, 0x2422a8a9
-0,     152564,     152564,      512,     1024, 0x59cbd75f
-0,     153071,     153071,      512,     1024, 0x04ad1a8c
-0,     153578,     153578,      512,     1024, 0x33c09191
-0,     154107,     154107,      512,     1024, 0x55efa6fd
-0,     154615,     154615,      512,     1024, 0xf73d0e5d
-0,     155122,     155122,      512,     1024, 0x6141ebae
-0,     155629,     155629,      512,     1024, 0x7db17a68
-0,     156158,     156158,      512,     1024, 0xa6c690b6
-0,     156665,     156665,      512,     1024, 0xa6fd6725
-0,     157172,     157172,      512,     1024, 0x50a90b9b
-0,     157680,     157680,      512,     1024, 0xef990dc8
-0,     158187,     158187,      512,     1024, 0x75adf6b5
-0,     158716,     158716,      512,     1024, 0x61eac43e
-0,     159223,     159223,      512,     1024, 0x67797a19
-0,     159730,     159730,      512,     1024, 0xf325277a
-0,     160237,     160237,      512,     1024, 0x18bf254a
-0,     160767,     160767,      512,     1024, 0x2ce6bee3
-0,     161274,     161274,      512,     1024, 0x8d320860
-0,     161781,     161781,      512,     1024, 0xc979b6e8
-0,     162288,     162288,      512,     1024, 0xdb644b41
-0,     162795,     162795,      512,     1024, 0xe1b368ba
-0,     163324,     163324,      512,     1024, 0xacc53d15
-0,     163832,     163832,      512,     1024, 0x42ea8c18
-0,     164339,     164339,      512,     1024, 0xe52c99a4
-0,     164846,     164846,      512,     1024, 0xd7db54a6
-0,     165375,     165375,      512,     1024, 0x7f27a7e3
-0,     165882,     165882,      512,     1024, 0xf7ffeaa9
-0,     166389,     166389,      512,     1024, 0x792b6088
-0,     166896,     166896,      512,     1024, 0x61d99724
-0,     167404,     167404,      512,     1024, 0x5213720e
-0,     167933,     167933,      512,     1024, 0xac09dd30
-0,     168440,     168440,      512,     1024, 0x960bf6bb
-0,     168947,     168947,      512,     1024, 0xc90168e1
-0,     169454,     169454,      512,     1024, 0x43b45768
-0,     169983,     169983,      512,     1024, 0x935d60a1
-0,     170491,     170491,      512,     1024, 0x9a342ef2
-0,     170998,     170998,      512,     1024, 0xc894709f
-0,     171505,     171505,      512,     1024, 0x59b43b07
-0,     172012,     172012,      512,     1024, 0x36a1a98d
-0,     172541,     172541,      512,     1024, 0x9e1a121c
-0,     173048,     173048,      512,     1024, 0x02208b78
-0,     173556,     173556,      512,     1024, 0xd1d7b274
-0,     174063,     174063,      512,     1024, 0xdacd5096
-0,     174592,     174592,      512,     1024, 0x51b71ead
-0,     175099,     175099,      512,     1024, 0xd009a7ca
-0,     175606,     175606,      512,     1024, 0xb6d5a938
-0,     176113,     176113,      512,     1024, 0xf3d45e47
-0,     176621,     176621,      512,     1024, 0xea8e04fc
-0,     177150,     177150,      512,     1024, 0x0b928bd8
-0,     177657,     177657,      512,     1024, 0x0f02caec
-0,     178164,     178164,      512,     1024, 0xe2b137a8
-0,     178671,     178671,      512,     1024, 0xd5f94892
+0,        512,        512,      512,     1024, 0x00000000
+0,       1024,       1024,      512,     1024, 0xed2d3f6b
+0,       1533,       1533,      512,     1024, 0x51f6ccb3
+0,       2040,       2040,      512,     1024, 0x58bd75aa
+0,       2552,       2552,      512,     1024, 0xd857a310
+0,       3064,       3064,      512,     1024, 0xc483a5b8
+0,       3576,       3576,      512,     1024, 0x923ecf67
+0,       4088,       4088,      512,     1024, 0xf87dcd53
+0,       4598,       4598,      512,     1024, 0xdc32c002
+0,       5110,       5110,      512,     1024, 0xb760def1
+0,       5622,       5622,      512,     1024, 0x6838d2b2
+0,       6134,       6134,      512,     1024, 0xe45aca1e
+0,       6646,       6646,      512,     1024, 0xde1fb955
+0,       7158,       7158,      512,     1024, 0x9e23b949
+0,       7670,       7670,      512,     1024, 0x840cc000
+0,       8182,       8182,      512,     1024, 0x0a29cbfa
+0,       8694,       8694,      512,     1024, 0x9871d4c4
+0,       9206,       9206,      512,     1024, 0xb35dc9f2
+0,       9718,       9718,      512,     1024, 0xf37fda0a
+0,      10230,      10230,      512,     1024, 0xa640f990
+0,      10742,      10742,      512,     1024, 0x516fe6f5
+0,      11254,      11254,      512,     1024, 0xc78bc6a6
+0,      11766,      11766,      512,     1024, 0x700fd6ee
+0,      12278,      12278,      512,     1024, 0x5383d5ad
+0,      12790,      12790,      512,     1024, 0xbe01d091
+0,      13302,      13302,      512,     1024, 0x72dfcfc7
+0,      13814,      13814,      512,     1024, 0xd8fecea9
+0,      14326,      14326,      512,     1024, 0xa464d79b
+0,      14838,      14838,      512,     1024, 0xf394e2cb
+0,      15350,      15350,      512,     1024, 0xa301ec49
+0,      15862,      15862,      512,     1024, 0x5e09d60f
+0,      16374,      16374,      512,     1024, 0xd13edd6f
+0,      16886,      16886,      512,     1024, 0x7423ef39
+0,      17398,      17398,      512,     1024, 0x96e2f083
+0,      17910,      17910,      512,     1024, 0x5ed7dbee
+0,      18422,      18422,      512,     1024, 0x3874f714
+0,      18934,      18934,      512,     1024, 0xa5e6edab
+0,      19446,      19446,      512,     1024, 0x0a04ee3a
+0,      19958,      19958,      512,     1024, 0xadfee6b9
+0,      20470,      20470,      512,     1024, 0xd0bbe6d2
+0,      20982,      20982,      512,     1024, 0x223eebb7
+0,      21494,      21494,      512,     1024, 0x0473e479
+0,      22006,      22006,      512,     1024, 0xdf15e51e
+0,      22518,      22518,      512,     1024, 0xa954e483
+0,      23030,      23030,      512,     1024, 0x6df3ed03
+0,      23542,      23542,      512,     1024, 0x0860e544
+0,      24054,      24054,      512,     1024, 0xc241e8dc
+0,      24566,      24566,      512,     1024, 0xd0e1d6a4
+0,      25078,      25078,      512,     1024, 0xcb2ff988
+0,      25590,      25590,      512,     1024, 0x51fae08e
+0,      26102,      26102,      512,     1024, 0xae39f2fc
+0,      26614,      26614,      512,     1024, 0xfd74f07c
+0,      27126,      27126,      512,     1024, 0x1936edc1
+0,      27638,      27638,      512,     1024, 0x95f8deae
+0,      28150,      28150,      512,     1024, 0x93bdf605
+0,      28662,      28662,      512,     1024, 0x7a07dd32
+0,      29174,      29174,      512,     1024, 0x6889fdc1
+0,      29686,      29686,      512,     1024, 0x989bf024
+0,      30198,      30198,      512,     1024, 0xc764ce80
+0,      30710,      30710,      512,     1024, 0x0e62d721
+0,      31222,      31222,      512,     1024, 0x59c2fbe3
+0,      31734,      31734,      512,     1024, 0xf14ee29d
+0,      32246,      32246,      512,     1024, 0x02a0f21b
+0,      32758,      32758,      512,     1024, 0xadb3d361
+0,      33270,      33270,      512,     1024, 0xdcb3d1fc
+0,      33782,      33782,      512,     1024, 0x2924f9dc
+0,      34294,      34294,      512,     1024, 0x7507ebec
+0,      34806,      34806,      512,     1024, 0xe009f343
+0,      35318,      35318,      512,     1024, 0x21e9e7ac
+0,      35830,      35830,      512,     1024, 0x845bda9e
+0,      36342,      36342,      512,     1024, 0xb1b3e632
+0,      36854,      36854,      512,     1024, 0x61ccf593
+0,      37366,      37366,      512,     1024, 0x8cdbf603
+0,      37878,      37878,      512,     1024, 0xf8f7e673
+0,      38390,      38390,      512,     1024, 0x55efdd24
+0,      38902,      38902,      512,     1024, 0x4059e8ff
+0,      39414,      39414,      512,     1024, 0xb3afe5be
+0,      39926,      39926,      512,     1024, 0x7236e965
+0,      40438,      40438,      512,     1024, 0xe683db69
+0,      40950,      40950,      512,     1024, 0x29e3d93c
+0,      41462,      41462,      512,     1024, 0x74f2f27f
+0,      41974,      41974,      512,     1024, 0x32cde3ba
+0,      42486,      42486,      512,     1024, 0xe907f171
+0,      42998,      42998,      512,     1024, 0x206ae2a5
+0,      43510,      43510,      512,     1024, 0x6379efa1
+0,      44022,      44022,      512,     1024, 0x0f0fee85
+0,      44534,      44534,      512,     1024, 0x3195e314
+0,      45046,      45046,      512,     1024, 0x4646ead3
+0,      45558,      45558,      512,     1024, 0x5635dcf5
+0,      46070,      46070,      512,     1024, 0xd76fc780
+0,      46582,      46582,      512,     1024, 0x847ff8a5
+0,      47094,      47094,      512,     1024, 0xaca8eda3
+0,      47606,      47606,      512,     1024, 0x9a2de1ea
+0,      48118,      48118,      512,     1024, 0xc92ff23a
+0,      48630,      48630,      512,     1024, 0x0e0ef038
+0,      49142,      49142,      512,     1024, 0xc32cf495
+0,      49654,      49654,      512,     1024, 0x6ab1ec79
+0,      50166,      50166,      512,     1024, 0xe43cd8d6
+0,      50678,      50678,      512,     1024, 0x4ba2deab
+0,      51190,      51190,      512,     1024, 0x6d16ea0e
+0,      51702,      51702,      512,     1024, 0xe5b0ee70
+0,      52214,      52214,      512,     1024, 0xcf6cf074
+0,      52726,      52726,      512,     1024, 0x2206e61d
+0,      53238,      53238,      512,     1024, 0xfbb9e7e7
+0,      53750,      53750,      512,     1024, 0x2bc1e115
+0,      54262,      54262,      512,     1024, 0x4ca6e5c5
+0,      54774,      54774,      512,     1024, 0x061cead0
+0,      55286,      55286,      512,     1024, 0x3dc9f950
+0,      55798,      55798,      512,     1024, 0x9399f10d
+0,      56310,      56310,      512,     1024, 0xa2bff5ae
+0,      56822,      56822,      512,     1024, 0xd21de569
+0,      57334,      57334,      512,     1024, 0x1c45e3be
+0,      57846,      57846,      512,     1024, 0xff5dff1c
+0,      58358,      58358,      512,     1024, 0x992df5d3
+0,      58870,      58870,      512,     1024, 0xafedea2f
+0,      59382,      59382,      512,     1024, 0x6e73d6a8
+0,      59894,      59894,      512,     1024, 0x72dff283
+0,      60406,      60406,      512,     1024, 0x50b5f1a6
+0,      60918,      60918,      512,     1024, 0xffe1decb
+0,      61430,      61430,      512,     1024, 0x8993ecff
+0,      61942,      61942,      512,     1024, 0x954bd63a
+0,      62454,      62454,      512,     1024, 0x4707f577
+0,      62966,      62966,      512,     1024, 0x7a88f81f
+0,      63478,      63478,      512,     1024, 0xc771f537
+0,      63990,      63990,      512,     1024, 0x7aade6af
+0,      64502,      64502,      512,     1024, 0x8af5ede5
+0,      65014,      65014,      512,     1024, 0x7500f3f1
+0,      65526,      65526,      512,     1024, 0xea36f707
+0,      66038,      66038,      512,     1024, 0x1a26e39a
+0,      66550,      66550,      512,     1024, 0xa04cf00d
+0,      67062,      67062,      512,     1024, 0xc362f182
+0,      67574,      67574,      512,     1024, 0x79c8f82c
+0,      68086,      68086,      512,     1024, 0x6480eee1
+0,      68598,      68598,      512,     1024, 0x7152eaa0
+0,      69110,      69110,      512,     1024, 0x5dfee6a9
+0,      69622,      69622,      512,     1024, 0x0afae660
+0,      70134,      70134,      512,     1024, 0xdc98e9fc
+0,      70646,      70646,      512,     1024, 0x10b7da06
+0,      71158,      71158,      512,     1024, 0x0571e585
+0,      71670,      71670,      512,     1024, 0x18ddf45e
+0,      72182,      72182,      512,     1024, 0x2cbef242
+0,      72694,      72694,      512,     1024, 0xf5380845
+0,      73206,      73206,      512,     1024, 0x34fff45e
+0,      73718,      73718,      512,     1024, 0x6f97e490
+0,      74230,      74230,      512,     1024, 0x77d6f0db
+0,      74742,      74742,      512,     1024, 0xa25ce2db
+0,      75254,      75254,      512,     1024, 0x8260e4e9
+0,      75766,      75766,      512,     1024, 0xc3b2f7d2
+0,      76278,      76278,      512,     1024, 0x82a7edae
+0,      76790,      76790,      512,     1024, 0x7d08dd54
+0,      77302,      77302,      512,     1024, 0x9059eda6
+0,      77814,      77814,      512,     1024, 0xbebaec88
+0,      78326,      78326,      512,     1024, 0xd9afd586
+0,      78838,      78838,      512,     1024, 0x0ca3e622
+0,      79350,      79350,      512,     1024, 0x4123e9e6
+0,      79862,      79862,      512,     1024, 0x2ff9f95c
+0,      80374,      80374,      512,     1024, 0x8522e261
+0,      80886,      80886,      512,     1024, 0xe4f8f499
+0,      81398,      81398,      512,     1024, 0x34f3f2bd
+0,      81910,      81910,      512,     1024, 0x82efe863
+0,      82422,      82422,      512,     1024, 0x9966fcea
+0,      82934,      82934,      512,     1024, 0xe94de3fd
+0,      83446,      83446,      512,     1024, 0x1ce0e27b
+0,      83958,      83958,      512,     1024, 0xd718dcde
+0,      84470,      84470,      512,     1024, 0xd503e724
+0,      84982,      84982,      512,     1024, 0x427ee3b2
+0,      85494,      85494,      512,     1024, 0x4512dcc4
+0,      86006,      86006,      512,     1024, 0xcf31e77c
+0,      86518,      86518,      512,     1024, 0xeb41ea81
+0,      87030,      87030,      512,     1024, 0xfa43e67c
+0,      87542,      87542,      512,     1024, 0x8162f3c9
+0,      88054,      88054,      512,     1024, 0x1b55f6b0
+0,      88566,      88566,      512,     1024, 0x3ebeec44
+0,      89078,      89078,      512,     1024, 0x740fe0c4
+0,      89590,      89590,      512,     1024, 0x8fb4e8b2
+0,      90102,      90102,      512,     1024, 0xe49de6a2
+0,      90614,      90614,      512,     1024, 0xd64febdf
+0,      91126,      91126,      512,     1024, 0x0e74ee08
+0,      91638,      91638,      512,     1024, 0x6c0ddf07
+0,      92150,      92150,      512,     1024, 0x7fb8e3c9
+0,      92662,      92662,      512,     1024, 0x52bfe96c
+0,      93174,      93174,      512,     1024, 0xfc22ee64
+0,      93686,      93686,      512,     1024, 0xe20ae718
+0,      94198,      94198,      512,     1024, 0xa94be395
+0,      94710,      94710,      512,     1024, 0xded306d0
+0,      95222,      95222,      512,     1024, 0x31f7c831
+0,      95734,      95734,      512,     1024, 0x0ffde0a8
+0,      96246,      96246,      512,     1024, 0xc692e3e0
+0,      96758,      96758,      512,     1024, 0x1d8ff7c7
+0,      97270,      97270,      512,     1024, 0x038ee172
+0,      97782,      97782,      512,     1024, 0x9a1eef59
+0,      98294,      98294,      512,     1024, 0x158fe750
+0,      98806,      98806,      512,     1024, 0xac15e42c
+0,      99318,      99318,      512,     1024, 0x6323ed44
+0,      99830,      99830,      512,     1024, 0xd10ce4bb
+0,     100342,     100342,      512,     1024, 0xc1cce296
+0,     100854,     100854,      512,     1024, 0x0782f094
+0,     101366,     101366,      512,     1024, 0xd109de36
+0,     101878,     101878,      512,     1024, 0x175600fb
+0,     102390,     102390,      512,     1024, 0x95d5e8d9
+0,     102902,     102902,      512,     1024, 0xebb6eee1
+0,     103414,     103414,      512,     1024, 0x187cfadc
+0,     103926,     103926,      512,     1024, 0xce35fa5c
+0,     104438,     104438,      512,     1024, 0x8327eea2
+0,     104950,     104950,      512,     1024, 0x5543f219
+0,     105462,     105462,      512,     1024, 0xaacbe0dc
+0,     105974,     105974,      512,     1024, 0xa538e9fb
+0,     106486,     106486,      512,     1024, 0x4dcbe655
+0,     106998,     106998,      512,     1024, 0x86b6d93b
+0,     107510,     107510,      512,     1024, 0x1a06f878
+0,     108022,     108022,      512,     1024, 0xd926e8ef
+0,     108534,     108534,      512,     1024, 0xc624db2f
+0,     109046,     109046,      512,     1024, 0x2153e20d
+0,     109558,     109558,      512,     1024, 0x01dce868
+0,     110070,     110070,      512,     1024, 0xfa5fd3cd
+0,     110582,     110582,      512,     1024, 0x2adef2d5
+0,     111094,     111094,      512,     1024, 0x4f48f8e2
+0,     111606,     111606,      512,     1024, 0x613feeee
+0,     112118,     112118,      512,     1024, 0x3780de8a
+0,     112630,     112630,      512,     1024, 0x2093eb65
+0,     113142,     113142,      512,     1024, 0x54baebbb
+0,     113654,     113654,      512,     1024, 0x8686dd7c
+0,     114166,     114166,      512,     1024, 0x7f8ae80c
+0,     114678,     114678,      512,     1024, 0x7aede972
+0,     115190,     115190,      512,     1024, 0x971bebc0
+0,     115702,     115702,      512,     1024, 0x2dd5fd4b
+0,     116214,     116214,      512,     1024, 0xb1b3e4a3
+0,     116726,     116726,      512,     1024, 0x192defc6
+0,     117238,     117238,      512,     1024, 0x5e46ec44
+0,     117750,     117750,      512,     1024, 0xe6d8e05a
+0,     118262,     118262,      512,     1024, 0x7e2fe2b0
+0,     118774,     118774,      512,     1024, 0x9e3bdf80
+0,     119286,     119286,      512,     1024, 0xa98cd85e
+0,     119798,     119798,      512,     1024, 0x6061e0c4
+0,     120310,     120310,      512,     1024, 0x6112f3fc
+0,     120822,     120822,      512,     1024, 0x99bdfb01
+0,     121334,     121334,      512,     1024, 0x3f5df3ca
+0,     121846,     121846,      512,     1024, 0xf5ebeb05
+0,     122358,     122358,      512,     1024, 0x8498e565
+0,     122870,     122870,      512,     1024, 0x0497f0b7
+0,     123382,     123382,      512,     1024, 0x626ae800
+0,     123894,     123894,      512,     1024, 0xfb71eec4
+0,     124406,     124406,      512,     1024, 0xa86ee739
+0,     124918,     124918,      512,     1024, 0x25c0e050
+0,     125430,     125430,      512,     1024, 0x6027e91e
+0,     125942,     125942,      512,     1024, 0x6772df6e
+0,     126454,     126454,      512,     1024, 0xfefff844
+0,     126966,     126966,      512,     1024, 0x547be862
+0,     127478,     127478,      512,     1024, 0xca84e795
+0,     127990,     127990,      512,     1024, 0xd124db3e
+0,     128502,     128502,      512,     1024, 0xcaf3deb5
+0,     129014,     129014,      512,     1024, 0x487ce92d
+0,     129526,     129526,      512,     1024, 0x117feb95
+0,     130038,     130038,      512,     1024, 0x7b63de3d
+0,     130550,     130550,      512,     1024, 0xa529d8e1
+0,     131062,     131062,      512,     1024, 0x56f6da26
+0,     131574,     131574,      512,     1024, 0xffb8d5af
+0,     132086,     132086,      512,     1024, 0xeecbdc04
+0,     132598,     132598,      512,     1024, 0xfc59d2d2
+0,     133110,     133110,      512,     1024, 0xaf7acef7
+0,     133622,     133622,      512,     1024, 0x3f9bf258
+0,     134134,     134134,      512,     1024, 0xcf54e9d6
+0,     134646,     134646,      512,     1024, 0x680cd0aa
+0,     135158,     135158,      512,     1024, 0x3c1bdc1f
+0,     135670,     135670,      512,     1024, 0x8c8ffe22
+0,     136182,     136182,      512,     1024, 0xf415d362
+0,     136694,     136694,      512,     1024, 0x8c8cdaa9
+0,     137206,     137206,      512,     1024, 0x9531e9f1
+0,     137718,     137718,      512,     1024, 0x223ce536
+0,     138230,     138230,      512,     1024, 0xdfbce5f9
+0,     138742,     138742,      512,     1024, 0x20b6ed7d
+0,     139254,     139254,      512,     1024, 0x1a17e109
+0,     139766,     139766,      512,     1024, 0xc672eaea
+0,     140278,     140278,      512,     1024, 0x12a7dc5e
+0,     140790,     140790,      512,     1024, 0x4497f342
+0,     141302,     141302,      512,     1024, 0xdfb5db4b
+0,     141814,     141814,      512,     1024, 0xde48ef6c
+0,     142326,     142326,      512,     1024, 0x1d98e316
+0,     142838,     142838,      512,     1024, 0xbd2ad72f
+0,     143350,     143350,      512,     1024, 0xf1aad776
+0,     143862,     143862,      512,     1024, 0x4db3e3c0
+0,     144374,     144374,      512,     1024, 0x832de0a0
+0,     144886,     144886,      512,     1024, 0xc5f0ef25
+0,     145398,     145398,      512,     1024, 0x419bda6e
+0,     145910,     145910,      512,     1024, 0x5de7f77e
+0,     146422,     146422,      512,     1024, 0x0063ec9a
+0,     146934,     146934,      512,     1024, 0x10c3d470
+0,     147446,     147446,      512,     1024, 0xba66d226
+0,     147958,     147958,      512,     1024, 0xea47ded3
+0,     148470,     148470,      512,     1024, 0x6202d67b
+0,     148982,     148982,      512,     1024, 0x3f80e7cf
+0,     149494,     149494,      512,     1024, 0x4e64eaae
+0,     150006,     150006,      512,     1024, 0x2108e83d
+0,     150518,     150518,      512,     1024, 0x38c3dec1
+0,     151030,     151030,      512,     1024, 0x46d3f77a
+0,     151542,     151542,      512,     1024, 0x4838e787
+0,     152054,     152054,      512,     1024, 0xc71df16d
+0,     152566,     152566,      512,     1024, 0xdbe4ebbd
+0,     153078,     153078,      512,     1024, 0xa156d07b
+0,     153590,     153590,      512,     1024, 0x34eddc80
+0,     154102,     154102,      512,     1024, 0xe840e87c
+0,     154614,     154614,      512,     1024, 0x6accf8f5
+0,     155126,     155126,      512,     1024, 0xa1dbebb9
+0,     155638,     155638,      512,     1024, 0x6d07d98c
+0,     156150,     156150,      512,     1024, 0x94c7e805
+0,     156662,     156662,      512,     1024, 0x5199e586
+0,     157174,     157174,      512,     1024, 0xe797e1aa
+0,     157686,     157686,      512,     1024, 0xff19eda7
+0,     158198,     158198,      512,     1024, 0x9cb9d040
+0,     158710,     158710,      512,     1024, 0xaeedd325
+0,     159222,     159222,      512,     1024, 0xf5ade306
+0,     159734,     159734,      512,     1024, 0x54a5e129
+0,     160246,     160246,      512,     1024, 0x6665ddeb
+0,     160758,     160758,      512,     1024, 0x9d18e033
+0,     161270,     161270,      512,     1024, 0x7f23df74
+0,     161782,     161782,      512,     1024, 0x7c34f158
+0,     162294,     162294,      512,     1024, 0x47f6dae2
+0,     162806,     162806,      512,     1024, 0x5ffdd903
+0,     163318,     163318,      512,     1024, 0x8233d108
+0,     163830,     163830,      512,     1024, 0x45c6e20d
+0,     164342,     164342,      512,     1024, 0xae11fa6e
+0,     164854,     164854,      512,     1024, 0xa30defd2
+0,     165366,     165366,      512,     1024, 0xfc1ecccf
+0,     165878,     165878,      512,     1024, 0x920edc94
+0,     166390,     166390,      512,     1024, 0xd7f3dc58
+0,     166902,     166902,      512,     1024, 0x4972d37d
+0,     167414,     167414,      512,     1024, 0xfefef358
+0,     167926,     167926,      512,     1024, 0x3648e473
+0,     168438,     168438,      512,     1024, 0x58dee6c3
+0,     168950,     168950,      512,     1024, 0x9cc6df27
+0,     169462,     169462,      512,     1024, 0x6adfe99c
+0,     169974,     169974,      512,     1024, 0x6a56e11f
+0,     170486,     170486,      512,     1024, 0x4860edf1
+0,     170998,     170998,      512,     1024, 0x9132f10a
+0,     171510,     171510,      512,     1024, 0x3e09d209
+0,     172022,     172022,      512,     1024, 0x4b6bf4d8
+0,     172534,     172534,      512,     1024, 0x0cd5e838
+0,     173046,     173046,      512,     1024, 0x080be078
+0,     173558,     173558,      512,     1024, 0xfdb0e31c
+0,     174070,     174070,      512,     1024, 0xced5e7bd
+0,     174582,     174582,      512,     1024, 0x65b3e435
+0,     175094,     175094,      512,     1024, 0x5b5bfe2e
+0,     175606,     175606,      512,     1024, 0xa8bde3cb
+0,     176118,     176118,      512,     1024, 0xfd0fdefa
+0,     176630,     176630,      512,     1024, 0xbec4ef95
+0,     177142,     177142,      512,     1024, 0x683ad8dd
+0,     177654,     177654,      512,     1024, 0x8eefeb77
+0,     178166,     178166,      512,     1024, 0x84fc5878
+0,     178678,     178678,      512,     1024, 0x9a0ded60
diff --git a/tests/ref/fate/adpcm-ima-ws b/tests/ref/fate/adpcm-ima-ws
index 61e0def729..d1e6b615dc 100644
--- a/tests/ref/fate/adpcm-ima-ws
+++ b/tests/ref/fate/adpcm-ima-ws
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,    11024,    22048, 0x0665d7f4
 0,      11024,      11024,     1470,     2940, 0x0f3c64cb
 0,      12494,      12494,     1470,     2940, 0xc90b9e78
diff --git a/tests/ref/fate/adpcm-ms-mono b/tests/ref/fate/adpcm-ms-mono
index c4567087bc..e3f217d18e 100644
--- a/tests/ref/fate/adpcm-ms-mono
+++ b/tests/ref/fate/adpcm-ms-mono
@@ -1,4 +1,9 @@
 #tb 0: 1/11025
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 11025
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      500,     1000, 0x64cd9403
 0,        500,        500,      500,     1000, 0xa4ef8a9d
 0,       1000,       1000,      500,     1000, 0x75c19868
diff --git a/tests/ref/fate/adpcm-thp b/tests/ref/fate/adpcm-thp
index 72aff61ade..592c6610ad 100644
--- a/tests/ref/fate/adpcm-thp
+++ b/tests/ref/fate/adpcm-thp
@@ -1,72 +1,77 @@
 #tb 0: 1/32000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 32000
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1078,     4312, 0x469714f6
-0,       1078,       1078,     1064,     4256, 0xe03dd882
-0,       2142,       2142,     1078,     4312, 0x46b901f7
-0,       3220,       3220,     1064,     4256, 0x8d4a54e4
-0,       4284,       4284,     1064,     4256, 0xfd616b67
-0,       5348,       5348,     1078,     4312, 0xefe62302
-0,       6426,       6426,     1064,     4256, 0xab11684e
-0,       7490,       7490,     1064,     4256, 0xb4b3feb8
-0,       8554,       8554,     1078,     4312, 0x71db6461
-0,       9632,       9632,     1064,     4256, 0x090e5efa
-0,      10696,      10696,     1064,     4256, 0x36f49c28
-0,      11760,      11760,     1078,     4312, 0x0fe3d262
-0,      12838,      12838,     1064,     4256, 0x199ce269
-0,      13902,      13902,     1064,     4256, 0x98342d05
-0,      14966,      14966,     1078,     4312, 0xb6fb7ebe
-0,      16044,      16044,     1064,     4256, 0x033dd562
-0,      17108,      17108,     1064,     4256, 0xc2cc17e0
-0,      18172,      18172,     1078,     4312, 0x4bb3ff50
-0,      19250,      19250,     1064,     4256, 0x6f2671ef
-0,      20314,      20314,     1064,     4256, 0x5a337bf4
-0,      21378,      21378,     1078,     4312, 0xa71f6967
-0,      22456,      22456,     1064,     4256, 0x48084aa9
-0,      23520,      23520,     1064,     4256, 0x3cce4218
-0,      24584,      24584,     1078,     4312, 0xcbb8f73d
-0,      25662,      25662,     1064,     4256, 0x36825021
-0,      26726,      26726,     1064,     4256, 0xeae036c6
-0,      27790,      27790,     1078,     4312, 0x0d650ac6
-0,      28868,      28868,     1064,     4256, 0xfba4f58c
-0,      29932,      29932,     1064,     4256, 0x54311f9b
-0,      30996,      30996,     1078,     4312, 0x286386b3
-0,      32074,      32074,     1064,     4256, 0x871896de
-0,      33138,      33138,     1064,     4256, 0x9ef9f970
-0,      34202,      34202,     1078,     4312, 0xf9ae97f1
-0,      35280,      35280,     1064,     4256, 0x0ad0d765
-0,      36344,      36344,     1064,     4256, 0x8e6aa9b5
-0,      37408,      37408,     1078,     4312, 0x8362787b
-0,      38486,      38486,     1064,     4256, 0x9b6a5d9c
-0,      39550,      39550,     1064,     4256, 0xfb715d8f
-0,      40614,      40614,     1078,     4312, 0x02bd8075
-0,      41692,      41692,     1064,     4256, 0x428eb932
-0,      42756,      42756,     1064,     4256, 0x17ea8c94
-0,      43820,      43820,     1078,     4312, 0xb3e761d7
-0,      44898,      44898,     1064,     4256, 0x0919755a
-0,      45962,      45962,     1064,     4256, 0x5e520edd
-0,      47026,      47026,     1078,     4312, 0x69aa070e
-0,      48104,      48104,     1064,     4256, 0xf8192f7d
-0,      49168,      49168,     1064,     4256, 0xaad4475c
-0,      50232,      50232,     1078,     4312, 0x0cabcfcb
-0,      51310,      51310,     1064,     4256, 0x952f0f96
-0,      52374,      52374,     1064,     4256, 0x1b805a0c
-0,      53438,      53438,     1078,     4312, 0x93043d2a
-0,      54516,      54516,     1064,     4256, 0x38b99e44
-0,      55580,      55580,     1064,     4256, 0x60cc52ff
-0,      56644,      56644,     1078,     4312, 0x6a875849
-0,      57722,      57722,     1064,     4256, 0xd08d6d0e
-0,      58786,      58786,     1064,     4256, 0x36bfe48e
-0,      59850,      59850,     1078,     4312, 0x795c6134
-0,      60928,      60928,     1064,     4256, 0x4fd79583
-0,      61992,      61992,     1064,     4256, 0x65e2ab9f
-0,      63056,      63056,     1078,     4312, 0xedeede4a
-0,      64134,      64134,     1064,     4256, 0x097e0d09
-0,      65198,      65198,     1064,     4256, 0x58afa133
-0,      66262,      66262,     1078,     4312, 0x442525b5
-0,      67340,      67340,     1064,     4256, 0x6645c591
-0,      68404,      68404,     1064,     4256, 0xb0dd948a
-0,      69468,      69468,     1078,     4312, 0x12684e69
-0,      70546,      70546,     1064,     4256, 0xb45098e3
-0,      71610,      71610,     1064,     4256, 0xb6d3c61c
-0,      72674,      72674,     1078,     4312, 0xb46b5b22
-0,      73752,      73752,     1064,     4256, 0x9a556830
-0,      74816,      74816,     1064,     4256, 0x67ca2b35
+0,       1078,       1078,     1064,     4256, 0x6ca28f25
+0,       2142,       2142,     1078,     4312, 0xd466f806
+0,       3220,       3220,     1064,     4256, 0x59d69463
+0,       4284,       4284,     1064,     4256, 0xf4805f42
+0,       5348,       5348,     1078,     4312, 0x579f22aa
+0,       6426,       6426,     1064,     4256, 0xbdc88f45
+0,       7490,       7490,     1064,     4256, 0xc71ebf04
+0,       8554,       8554,     1078,     4312, 0xc1c86e49
+0,       9632,       9632,     1064,     4256, 0x96365506
+0,      10696,      10696,     1064,     4256, 0xaf59bfe5
+0,      11760,      11760,     1078,     4312, 0x4f00811d
+0,      12838,      12838,     1064,     4256, 0x0d8a243a
+0,      13902,      13902,     1064,     4256, 0x98fc3477
+0,      14966,      14966,     1078,     4312, 0xbf327cc1
+0,      16044,      16044,     1064,     4256, 0xdc52d5bd
+0,      17108,      17108,     1064,     4256, 0x29eb1ca6
+0,      18172,      18172,     1078,     4312, 0xf647067f
+0,      19250,      19250,     1064,     4256, 0x4f4b70db
+0,      20314,      20314,     1064,     4256, 0xa73b7e5d
+0,      21378,      21378,     1078,     4312, 0x1f5464ff
+0,      22456,      22456,     1064,     4256, 0xcd7a46f2
+0,      23520,      23520,     1064,     4256, 0x7e203f8e
+0,      24584,      24584,     1078,     4312, 0x82e5f5ee
+0,      25662,      25662,     1064,     4256, 0xfbb65050
+0,      26726,      26726,     1064,     4256, 0x474d33ff
+0,      27790,      27790,     1078,     4312, 0x737a0586
+0,      28868,      28868,     1064,     4256, 0xf677f86a
+0,      29932,      29932,     1064,     4256, 0xe35919f9
+0,      30996,      30996,     1078,     4312, 0x74f382b2
+0,      32074,      32074,     1064,     4256, 0xe10095c1
+0,      33138,      33138,     1064,     4256, 0x5af2f855
+0,      34202,      34202,     1078,     4312, 0x55239722
+0,      35280,      35280,     1064,     4256, 0xf904da45
+0,      36344,      36344,     1064,     4256, 0xdd8ca94f
+0,      37408,      37408,     1078,     4312, 0xcc7a76f6
+0,      38486,      38486,     1064,     4256, 0x67aa5b74
+0,      39550,      39550,     1064,     4256, 0x6559608f
+0,      40614,      40614,     1078,     4312, 0x7d297e71
+0,      41692,      41692,     1064,     4256, 0x15c2b2e3
+0,      42756,      42756,     1064,     4256, 0x0bf2896c
+0,      43820,      43820,     1078,     4312, 0x17f75da7
+0,      44898,      44898,     1064,     4256, 0x90b27489
+0,      45962,      45962,     1064,     4256, 0xcc7d0de4
+0,      47026,      47026,     1078,     4312, 0x0c8a0586
+0,      48104,      48104,     1064,     4256, 0x184a2e34
+0,      49168,      49168,     1064,     4256, 0xfe354354
+0,      50232,      50232,     1078,     4312, 0x4e3bd1c1
+0,      51310,      51310,     1064,     4256, 0x37a50e20
+0,      52374,      52374,     1064,     4256, 0x2556584a
+0,      53438,      53438,     1078,     4312, 0x380f3466
+0,      54516,      54516,     1064,     4256, 0x25b4a1db
+0,      55580,      55580,     1064,     4256, 0x77f15645
+0,      56644,      56644,     1078,     4312, 0x278b5864
+0,      57722,      57722,     1064,     4256, 0xcf2e701d
+0,      58786,      58786,     1064,     4256, 0x8924e60f
+0,      59850,      59850,     1078,     4312, 0x54db60f9
+0,      60928,      60928,     1064,     4256, 0x365993ef
+0,      61992,      61992,     1064,     4256, 0x37e4a996
+0,      63056,      63056,     1078,     4312, 0x0b9bda87
+0,      64134,      64134,     1064,     4256, 0x2eed0d61
+0,      65198,      65198,     1064,     4256, 0xa826a02f
+0,      66262,      66262,     1078,     4312, 0x9620255e
+0,      67340,      67340,     1064,     4256, 0x0f3cc6f2
+0,      68404,      68404,     1064,     4256, 0x14d89149
+0,      69468,      69468,     1078,     4312, 0x87c74a3d
+0,      70546,      70546,     1064,     4256, 0x73ca9dd9
+0,      71610,      71610,     1064,     4256, 0x8419cab6
+0,      72674,      72674,     1078,     4312, 0x7d1c59ec
+0,      73752,      73752,     1064,     4256, 0xbf927052
+0,      74816,      74816,     1064,     4256, 0x4a422bc3
diff --git a/tests/ref/fate/adpcm-vima b/tests/ref/fate/adpcm-vima
index 6984c5dfc6..b22f128be5 100644
--- a/tests/ref/fate/adpcm-vima
+++ b/tests/ref/fate/adpcm-vima
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,    73500,   294000, 0x37d439ee
 0,      73500,      73500,     1470,     5880, 0xe524b177
 0,      74970,      74970,     1470,     5880, 0x9e784af1
diff --git a/tests/ref/fate/adpcm-xa b/tests/ref/fate/adpcm-xa
index 04be2b9067..15b62ec4a5 100644
--- a/tests/ref/fate/adpcm-xa
+++ b/tests/ref/fate/adpcm-xa
@@ -1,4 +1,9 @@
 #tb 0: 1/37800
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 37800
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     2016,     8064, 0xa307ed8c
 0,       2016,       2016,     2016,     8064, 0xd2551927
 0,       4032,       4032,     2016,     8064, 0x3264a799
diff --git a/tests/ref/fate/adts-id3v1-demux b/tests/ref/fate/adts-id3v1-demux
new file mode 100644
index 0000000000..7caa5d6870
--- /dev/null
+++ b/tests/ref/fate/adts-id3v1-demux
@@ -0,0 +1,11 @@
+#tb 0: 1/28224000
+#media_type 0: audio
+#codec_id 0: aac
+#sample_rate 0: 48000
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,   602112,      474, 0x4c90e7c4
+0,     602112,     602112,   602112,      471, 0xb8b5e75d
+0,    1204224,    1204224,   602112,      502, 0xe943efd1
+0,    1806336,    1806336,   602112,      495, 0x9c3cec74
+0,    2408448,    2408448,   602112,      493, 0x03b2fa4b
diff --git a/tests/ref/fate/adtstoasc_ticket3715 b/tests/ref/fate/adtstoasc_ticket3715
new file mode 100644
index 0000000000..96795a2ca3
--- /dev/null
+++ b/tests/ref/fate/adtstoasc_ticket3715
@@ -0,0 +1,95 @@
+0221e04333e6ac432fa42960502f0d5a *tests/data/fate/adtstoasc_ticket3715.mov
+33324 tests/data/fate/adtstoasc_ticket3715.mov
+#extradata 0:        2, 0x00340022
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: aac
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,      371, 0x14b11a4f
+0,       1024,       1024,     1024,      402, 0x2f00c487
+0,       2048,       2048,     1024,      403, 0x1959c0d4
+0,       3072,       3072,     1024,      396, 0x98a9c134
+0,       4096,       4096,     1024,      405, 0xf0a5c8c7
+0,       5120,       5120,     1024,      432, 0xefaed68f
+0,       6144,       6144,     1024,      369, 0x41e4bc81
+0,       7168,       7168,     1024,      370, 0x0052ba67
+0,       8192,       8192,     1024,      426, 0x9b61d389
+0,       9216,       9216,     1024,      346, 0xf24aacf8
+0,      10240,      10240,     1024,      361, 0x815aa4b9
+0,      11264,      11264,     1024,      370, 0xad0db010
+0,      12288,      12288,     1024,      370, 0x6e27bdca
+0,      13312,      13312,     1024,      358, 0x973caed2
+0,      14336,      14336,     1024,      362, 0x8c57b25c
+0,      15360,      15360,     1024,      359, 0x8c6ab063
+0,      16384,      16384,     1024,      373, 0x7838b78f
+0,      17408,      17408,     1024,      489, 0x8fc2f7f0
+0,      18432,      18432,     1024,      346, 0x4ac8b6f8
+0,      19456,      19456,     1024,      341, 0xb537abef
+0,      20480,      20480,     1024,      352, 0xcc43b761
+0,      21504,      21504,     1024,      355, 0xb1b2b234
+0,      22528,      22528,     1024,      354, 0xa865a68c
+0,      23552,      23552,     1024,      370, 0xcad4ace5
+0,      24576,      24576,     1024,      369, 0x4911addc
+0,      25600,      25600,     1024,      363, 0x5a14a836
+0,      26624,      26624,     1024,      361, 0x6d10b6ba
+0,      27648,      27648,     1024,      365, 0xfe1bb5f3
+0,      28672,      28672,     1024,      362, 0x6fc5b252
+0,      29696,      29696,     1024,      366, 0xa122b655
+0,      30720,      30720,     1024,      371, 0xd338ae3d
+0,      31744,      31744,     1024,      363, 0xd977ad97
+0,      32768,      32768,     1024,      384, 0xe443bcc4
+0,      33792,      33792,     1024,      374, 0x281bb8cb
+0,      34816,      34816,     1024,      387, 0x2d70bfef
+0,      35840,      35840,     1024,      363, 0xa6e1b7a6
+0,      36864,      36864,     1024,      387, 0xc5d5c62b
+0,      37888,      37888,     1024,      378, 0xdf71c12f
+0,      38912,      38912,     1024,      377, 0xba9fbead
+0,      39936,      39936,     1024,      359, 0x4495babf
+0,      40960,      40960,     1024,      373, 0x6fbeb8ad
+0,      41984,      41984,     1024,      446, 0x3f98e19a
+0,      43008,      43008,     1024,      348, 0x7aa8b3d0
+0,      44032,      44032,     1024,      355, 0x3cf9abde
+0,      45056,      45056,     1024,      360, 0x3b93aa3d
+0,      46080,      46080,     1024,      411, 0x4534cd86
+0,      47104,      47104,     1024,      402, 0xf215cc44
+0,      48128,      48128,     1024,      483, 0xcf47f39e
+0,      49152,      49152,     1024,      343, 0xcbdeaf99
+0,      50176,      50176,     1024,      343, 0x8444aa2b
+0,      51200,      51200,     1024,      343, 0x5a46a569
+0,      52224,      52224,     1024,      345, 0x3b03a951
+0,      53248,      53248,     1024,      346, 0xff43a665
+0,      54272,      54272,     1024,      355, 0xedb1ac99
+0,      55296,      55296,     1024,      368, 0xb09cb70f
+0,      56320,      56320,     1024,      437, 0xfdd5ea5e
+0,      57344,      57344,     1024,      334, 0x8c35a4b9
+0,      58368,      58368,     1024,      395, 0xb777c61b
+0,      59392,      59392,     1024,      372, 0xafacb084
+0,      60416,      60416,     1024,      350, 0x1ab0a8c8
+0,      61440,      61440,     1024,      342, 0xb6e1a569
+0,      62464,      62464,     1024,      351, 0x583ba6f8
+0,      63488,      63488,     1024,      360, 0xc72ba9a4
+0,      64512,      64512,     1024,      360, 0xb30bae66
+0,      65536,      65536,     1024,      385, 0x4c38bd75
+0,      66560,      66560,     1024,      471, 0xd47df0d5
+0,      67584,      67584,     1024,      339, 0x9bf1a445
+0,      68608,      68608,     1024,      354, 0xf336b051
+0,      69632,      69632,     1024,      348, 0x6d06af84
+0,      70656,      70656,     1024,      355, 0xa4e1acf7
+0,      71680,      71680,     1024,      348, 0xcd0eac56
+0,      72704,      72704,     1024,      395, 0xb298c18b
+0,      73728,      73728,     1024,      427, 0x3dc9dcc0
+0,      74752,      74752,     1024,      344, 0x01c8ae69
+0,      75776,      75776,     1024,      356, 0xc38ca6f8
+0,      76800,      76800,     1024,      372, 0xd35db793
+0,      77824,      77824,     1024,      371, 0xd4cabb37
+0,      78848,      78848,     1024,      371, 0x69c3ac44
+0,      79872,      79872,     1024,      365, 0xe9cfb1ce
+0,      80896,      80896,     1024,      369, 0xb977bbc6
+0,      81920,      81920,     1024,      416, 0xa04fd851
+0,      82944,      82944,     1024,      461, 0x0c36eb7b
+0,      83968,      83968,     1024,      465, 0xeb3ce0af
+0,      84992,      84992,     1024,      326, 0x7be4a667
+0,      86016,      86016,     1024,      339, 0x2cf4a71f
+0,      87040,      87040,     1028,      258, 0xd4007ad4
diff --git a/tests/ref/fate/aic b/tests/ref/fate/aic
new file mode 100644
index 0000000000..1f50350b96
--- /dev/null
+++ b/tests/ref/fate/aic
@@ -0,0 +1,20 @@
+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1440x1080
+#sar 0: 4/3
+0,          0,          0,        1,  2332800, 0xd941b42f
+0,          1,          1,        1,  2332800, 0xd941b42f
+0,          2,          2,        1,  2332800, 0xae0f5983
+0,          3,          3,        1,  2332800, 0x51cfc127
+0,          4,          4,        1,  2332800, 0x24d40447
+0,          5,          5,        1,  2332800, 0x858a9f51
+0,          6,          6,        1,  2332800, 0x533b48e8
+0,          7,          7,        1,  2332800, 0x2fd73267
+0,          8,          8,        1,  2332800, 0x153566c7
+0,          9,          9,        1,  2332800, 0xa1c49c45
+0,         10,         10,        1,  2332800, 0xb966e25a
+0,         11,         11,        1,  2332800, 0xd0ce5985
+0,         12,         12,        1,  2332800, 0x0029a52e
+0,         13,         13,        1,  2332800, 0x893116c5
+0,         14,         14,        1,  2332800, 0x073d2491
diff --git a/tests/ref/fate/aic-oddsize b/tests/ref/fate/aic-oddsize
index ba4a6256a9..3763e32b2c 100644
--- a/tests/ref/fate/aic-oddsize
+++ b/tests/ref/fate/aic-oddsize
@@ -1,58 +1,62 @@
-#tb 0: 1/14587
-0,          0,          0,        0,   174243, 0xa40491e1
-0,       1000,       1000,        0,   174243, 0xa12cbb56
-0,       2000,       2000,        0,   174243, 0xa12cbb56
-0,       3000,       3000,        0,   174243, 0xa12cbb56
-0,       4000,       4000,        0,   174243, 0xa12cbb56
-0,       5000,       5000,        0,   174243, 0xa12cbb56
-0,       6000,       6000,        0,   174243, 0xa12cbb56
-0,       7000,       7000,        0,   174243, 0xa12cbb56
-0,       8000,       8000,        0,   174243, 0xa12cbb56
-0,       9000,       9000,        0,   174243, 0x4e7b7299
-0,      10000,      10000,        0,   174243, 0x31573b99
-0,      11000,      11000,        0,   174243, 0x013397b6
-0,      12000,      12000,        0,   174243, 0xdd988ab8
-0,      13000,      13000,        0,   174243, 0xd6d96b1e
-0,      14000,      14000,        0,   174243, 0xd6d96b1e
-0,      15000,      15000,        0,   174243, 0xd6d96b1e
-0,      16000,      16000,        0,   174243, 0x111627d3
-0,      17000,      17000,        0,   174243, 0x284d9ab7
-0,      18000,      18000,        0,   174243, 0xa348c492
-0,      19000,      19000,        0,   174243, 0xa348c492
-0,      20000,      20000,        0,   174243, 0xa348c492
-0,      21000,      21000,        0,   174243, 0xa348c492
-0,      22000,      22000,        0,   174243, 0x2d22c3b8
-0,      23000,      23000,        0,   174243, 0x2d22c3b8
-0,      24000,      24000,        0,   174243, 0x2d22c3b8
-0,      25000,      25000,        0,   174243, 0x2d22c3b8
-0,      26000,      26000,        0,   174243, 0xa6d7c890
-0,      27000,      27000,        0,   174243, 0x8068bfbb
-0,      28000,      28000,        0,   174243, 0x420ae647
-0,      29000,      29000,        0,   174243, 0xc5467756
-0,      30000,      30000,        0,   174243, 0x238a13dd
-0,      31000,      31000,        0,   174243, 0x5bab75dc
-0,      32000,      32000,        0,   174243, 0x14d7f61f
-0,      33000,      33000,        0,   174243, 0x2e1d334f
-0,      34000,      34000,        0,   174243, 0xeade7dc0
-0,      35000,      35000,        0,   174243, 0xeade7dc0
-0,      36000,      36000,        0,   174243, 0xeade7dc0
-0,      37000,      37000,        0,   174243, 0xeade7dc0
-0,      38000,      38000,        0,   174243, 0x088c7ef9
-0,      39000,      39000,        0,   174243, 0x70a3554e
-0,      40000,      40000,        0,   174243, 0x0753d1d4
-0,      41000,      41000,        0,   174243, 0x8266bd6d
-0,      42000,      42000,        0,   174243, 0x4ce3cda9
-0,      43000,      43000,        0,   174243, 0x4ce3cda9
-0,      44000,      44000,        0,   174243, 0x4ce3cda9
-0,      45000,      45000,        0,   174243, 0x4ce3cda9
-0,      46000,      46000,        0,   174243, 0xe5f7cd98
-0,      47000,      47000,        0,   174243, 0xe5f7cd98
-0,      48000,      48000,        0,   174243, 0xe5f7cd98
-0,      49000,      49000,        0,   174243, 0xe5f7cd98
-0,      50000,      50000,        0,   174243, 0x78c5cdb7
-0,      51000,      51000,        0,   174243, 0x78c5cdb7
-0,      52000,      52000,        0,   174243, 0x78c5cdb7
-0,      53000,      53000,        0,   174243, 0xce7ccd92
-0,      54000,      54000,        0,   174243, 0xce7ccd92
-0,      55000,      55000,        0,   174243, 0xce7ccd92
-0,      56000,      56000,        0,   174243, 0xce7ccd92
+#tb 0: 1000/14587
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 481x241
+#sar 0: 0/1
+0,          0,          0,        1,   174243, 0xa40491e1
+0,          1,          1,        1,   174243, 0xa12cbb56
+0,          2,          2,        1,   174243, 0xa12cbb56
+0,          3,          3,        1,   174243, 0xa12cbb56
+0,          4,          4,        1,   174243, 0xa12cbb56
+0,          5,          5,        1,   174243, 0xa12cbb56
+0,          6,          6,        1,   174243, 0xa12cbb56
+0,          7,          7,        1,   174243, 0xa12cbb56
+0,          8,          8,        1,   174243, 0xa12cbb56
+0,          9,          9,        1,   174243, 0x4e7b7299
+0,         10,         10,        1,   174243, 0x31573b99
+0,         11,         11,        1,   174243, 0x013397b6
+0,         12,         12,        1,   174243, 0xdd988ab8
+0,         13,         13,        1,   174243, 0xd6d96b1e
+0,         14,         14,        1,   174243, 0xd6d96b1e
+0,         15,         15,        1,   174243, 0xd6d96b1e
+0,         16,         16,        1,   174243, 0x111627d3
+0,         17,         17,        1,   174243, 0x284d9ab7
+0,         18,         18,        1,   174243, 0xa348c492
+0,         19,         19,        1,   174243, 0xa348c492
+0,         20,         20,        1,   174243, 0xa348c492
+0,         21,         21,        1,   174243, 0xa348c492
+0,         22,         22,        1,   174243, 0x2d22c3b8
+0,         23,         23,        1,   174243, 0x2d22c3b8
+0,         24,         24,        1,   174243, 0x2d22c3b8
+0,         25,         25,        1,   174243, 0x2d22c3b8
+0,         26,         26,        1,   174243, 0xa6d7c890
+0,         27,         27,        1,   174243, 0x8068bfbb
+0,         28,         28,        1,   174243, 0x420ae647
+0,         29,         29,        1,   174243, 0xc5467756
+0,         30,         30,        1,   174243, 0x238a13dd
+0,         31,         31,        1,   174243, 0x5bab75dc
+0,         32,         32,        1,   174243, 0x14d7f61f
+0,         33,         33,        1,   174243, 0x2e1d334f
+0,         34,         34,        1,   174243, 0xeade7dc0
+0,         35,         35,        1,   174243, 0xeade7dc0
+0,         36,         36,        1,   174243, 0xeade7dc0
+0,         37,         37,        1,   174243, 0xeade7dc0
+0,         38,         38,        1,   174243, 0x088c7ef9
+0,         39,         39,        1,   174243, 0x70a3554e
+0,         40,         40,        1,   174243, 0x0753d1d4
+0,         41,         41,        1,   174243, 0x8266bd6d
+0,         42,         42,        1,   174243, 0x4ce3cda9
+0,         43,         43,        1,   174243, 0x4ce3cda9
+0,         44,         44,        1,   174243, 0x4ce3cda9
+0,         45,         45,        1,   174243, 0x4ce3cda9
+0,         46,         46,        1,   174243, 0xe5f7cd98
+0,         47,         47,        1,   174243, 0xe5f7cd98
+0,         48,         48,        1,   174243, 0xe5f7cd98
+0,         49,         49,        1,   174243, 0xe5f7cd98
+0,         50,         50,        1,   174243, 0x78c5cdb7
+0,         51,         51,        1,   174243, 0x78c5cdb7
+0,         52,         52,        1,   174243, 0x78c5cdb7
+0,         53,         53,        1,   174243, 0xce7ccd92
+0,         54,         54,        1,   174243, 0xce7ccd92
+0,         55,         55,        1,   174243, 0xce7ccd92
+0,         56,         56,        1,   174243, 0xce7ccd92
diff --git a/tests/ref/fate/alg-mm b/tests/ref/fate/alg-mm
index 5d97de9b92..5788012713 100644
--- a/tests/ref/fate/alg-mm
+++ b/tests/ref/fate/alg-mm
@@ -1,4 +1,8 @@
 #tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x160
+#sar 0: 0/1
 0,          0,          0,        1,   122880, 0x4ed8123f
 0,          1,          1,        1,   122880, 0xc4c35304
 0,          2,          2,        1,   122880, 0xbd3015fd
diff --git a/tests/ref/fate/aliaspix-bgr b/tests/ref/fate/aliaspix-bgr
index 235a5acf69..f5c6b7d475 100644
--- a/tests/ref/fate/aliaspix-bgr
+++ b/tests/ref/fate/aliaspix-bgr
@@ -1,2 +1,6 @@
 #tb 0: 1/25
-0,          0,          0,        1,    36000, 0x9ff1ba55
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 201x79
+#sar 0: 0/1
+0,          0,          0,        1,    47637, 0xcb77368f
diff --git a/tests/ref/fate/aliaspix-gray b/tests/ref/fate/aliaspix-gray
index 74cf6a20bc..aa7b4649b2 100644
--- a/tests/ref/fate/aliaspix-gray
+++ b/tests/ref/fate/aliaspix-gray
@@ -1,2 +1,6 @@
 #tb 0: 1/25
-0,          0,          0,        1,    12000, 0x29f8832c
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 199x81
+#sar 0: 0/1
+0,          0,          0,        1,    16119, 0x3d0785f5
diff --git a/tests/ref/fate/amv b/tests/ref/fate/amv
index 407f077c7e..4b2c1682ac 100644
--- a/tests/ref/fate/amv
+++ b/tests/ref/fate/amv
@@ -1,4 +1,8 @@
 #tb 0: 1/16
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    28800, 0x026058a9
 0,          1,          1,        1,    28800, 0x5dc728de
 0,          2,          2,        1,    28800, 0x83e19a2c
diff --git a/tests/ref/fate/ansi b/tests/ref/fate/ansi
index 78e853fc0b..5cf6ff95ca 100644
--- a/tests/ref/fate/ansi
+++ b/tests/ref/fate/ansi
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x400
+#sar 0: 0/1
 0,          0,          0,        1,   768000, 0x772dd3d0
 0,          1,          1,        1,   768000, 0xd7dab1d1
 0,          2,          2,        1,   768000, 0x0e56f2d3
diff --git a/tests/ref/fate/ansi256 b/tests/ref/fate/ansi256
new file mode 100644
index 0000000000..f68a0d1fbe
--- /dev/null
+++ b/tests/ref/fate/ansi256
@@ -0,0 +1,13 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x400
+#sar 0: 0/1
+0,          0,          0,        1,   768000, 0x4dfbb6d0
+0,          1,          1,        1,   768000, 0x22652a22
+0,          2,          2,        1,   768000, 0x6c613e8c
+0,          3,          3,        1,   768000, 0x82471f25
+0,          4,          4,        1,   768000, 0xd8dc5ac6
+0,          5,          5,        1,   768000, 0x1afdc026
+0,          6,          6,        1,   768000, 0x518f3ba1
+0,          7,          7,        1,   768000, 0xa82a8e4b
diff --git a/tests/ref/fate/api-h264 b/tests/ref/fate/api-h264
new file mode 100644
index 0000000000..e1b29f0f2c
--- /dev/null
+++ b/tests/ref/fate/api-h264
@@ -0,0 +1,18 @@
+#tb 0: 1/1200000
+0,          0,          0,    48000,    38016, 0xb9ac19bd
+0,          1,          1,    48000,    38016, 0x53c91566
+0,          2,          2,    48000,    38016, 0xb5bd089f
+0,          3,          3,    48000,    38016, 0xb81320bb
+0,          4,          4,    48000,    38016, 0x7c793dce
+0,          5,          5,    48000,    38016, 0x3d605b31
+0,          6,          6,    48000,    38016, 0x40216830
+0,          7,          7,    48000,    38016, 0x11c48f52
+0,          8,          8,    48000,    38016, 0x0f37a013
+0,          9,          9,    48000,    38016, 0xb06cb753
+0,         10,         10,    48000,    38016, 0x6233ca83
+0,         11,         11,    48000,    38016, 0x02b6d5a1
+0,         12,         12,    48000,    38016, 0xf76cc409
+0,         13,         13,    48000,    38016, 0xd19fa5c3
+0,         14,         14,    48000,    38016, 0x8d1c8a02
+0,         15,         15,    48000,    38016, 0x6802966d
+0,         16,         16,    48000,    38016, 0x107fb055
diff --git a/tests/ref/fate/api-mjpeg-codec-param b/tests/ref/fate/api-mjpeg-codec-param
new file mode 100644
index 0000000000..178b7c73cb
--- /dev/null
+++ b/tests/ref/fate/api-mjpeg-codec-param
@@ -0,0 +1,278 @@
+stream=0, decode=0
+    b=0
+    ab=0
+    bt=4000000
+    flags=0x00000000
+    time_base=0/1
+    g=12
+    ar=0
+    ac=0
+    cutoff=0
+    frame_size=0
+    delay=0
+    qcomp=0.500000
+    qblur=0.500000
+    qmin=2
+    qmax=31
+    qdiff=3
+    bf=0
+    b_qfactor=1.250000
+    b_strategy=0
+    ps=0
+    mv_bits=0
+    header_bits=0
+    i_tex_bits=0
+    p_tex_bits=0
+    i_count=0
+    p_count=0
+    skip_count=0
+    misc_bits=0
+    frame_bits=0
+    codec_tag=0
+    bug=0x00000001
+    strict=0
+    b_qoffset=1.250000
+    err_detect=0x00000000
+    has_b_frames=0
+    block_align=0
+    mpeg_quant=0
+    rc_override_count=0
+    maxrate=0
+    minrate=0
+    bufsize=0
+    i_qfactor=-0.800000
+    i_qoffset=0.000000
+    dct=0
+    lumi_mask=0.000000
+    tcplx_mask=0.000000
+    scplx_mask=0.000000
+    p_mask=0.000000
+    dark_mask=0.000000
+    idct=0
+    slice_count=0
+    ec=0x00000003
+    bits_per_coded_sample=0
+    pred=0
+    aspect=180/180
+    sar=180/180
+    debug=0x00000000
+    cmp=0
+    subcmp=0
+    mbcmp=0
+    ildctcmp=8
+    dia_size=0
+    last_pred=0
+    preme=0
+    precmp=0
+    pre_dia_size=0
+    subq=8
+    me_range=0
+    global_quality=0
+    coder=0
+    context=0
+    slice_flags=0
+    mbd=0
+    sc_threshold=0
+    nr=0
+    rc_init_occupancy=0
+    flags2=0x00000000
+    threads=1
+    dc=0
+    nssew=8
+    skip_top=0
+    skip_bottom=0
+    profile=-99
+    level=-99
+    lowres=0
+    skip_threshold=0
+    skip_factor=0
+    skip_exp=0
+    skipcmp=13
+    mblmin=236
+    mblmax=3658
+    mepc=256
+    skip_loop_filter=0
+    skip_idct=0
+    skip_frame=0
+    bidir_refine=1
+    brd_scale=0
+    keyint_min=25
+    refs=1
+    chromaoffset=0
+    trellis=0
+    mv0_threshold=256
+    b_sensitivity=40
+    compression_level=-1
+    min_prediction_order=-1
+    max_prediction_order=-1
+    timecode_frame_start=-1
+    bits_per_raw_sample=8
+    channel_layout=0
+    request_channel_layout=0
+    rc_max_vbv_use=0.000000
+    rc_min_vbv_use=3.000000
+    ticks_per_frame=1
+    color_primaries=2
+    color_trc=2
+    colorspace=5
+    color_range=2
+    chroma_sample_location=2
+    log_level_offset=0
+    slices=0
+    thread_type=0x00000003
+    audio_service_type=0
+    request_sample_fmt=none
+    pkt_timebase=1/25
+    sub_charenc=
+    sub_charenc_mode=0x00000000
+    sub_text_format=1
+    refcounted_frames=false
+    side_data_only_packets=true
+    apply_cropping=true
+    skip_alpha=false
+    field_order=0
+    dump_separator=
+    codec_whitelist=
+    pixel_format=yuvj422p
+    video_size=400x225
+    max_pixels=2147483647
+    hwaccel_flags=0x00000001
+stream=0, decode=1
+    b=0
+    ab=0
+    bt=4000000
+    flags=0x00000000
+    time_base=0/1
+    g=12
+    ar=0
+    ac=0
+    cutoff=0
+    frame_size=0
+    delay=0
+    qcomp=0.500000
+    qblur=0.500000
+    qmin=2
+    qmax=31
+    qdiff=3
+    bf=0
+    b_qfactor=1.250000
+    b_strategy=0
+    ps=0
+    mv_bits=0
+    header_bits=0
+    i_tex_bits=0
+    p_tex_bits=0
+    i_count=0
+    p_count=0
+    skip_count=0
+    misc_bits=0
+    frame_bits=0
+    codec_tag=0
+    bug=0x00000001
+    strict=0
+    b_qoffset=1.250000
+    err_detect=0x00000000
+    has_b_frames=0
+    block_align=0
+    mpeg_quant=0
+    rc_override_count=0
+    maxrate=0
+    minrate=0
+    bufsize=0
+    i_qfactor=-0.800000
+    i_qoffset=0.000000
+    dct=0
+    lumi_mask=0.000000
+    tcplx_mask=0.000000
+    scplx_mask=0.000000
+    p_mask=0.000000
+    dark_mask=0.000000
+    idct=0
+    slice_count=0
+    ec=0x00000003
+    bits_per_coded_sample=0
+    pred=0
+    aspect=180/180
+    sar=180/180
+    debug=0x00000000
+    cmp=0
+    subcmp=0
+    mbcmp=0
+    ildctcmp=8
+    dia_size=0
+    last_pred=0
+    preme=0
+    precmp=0
+    pre_dia_size=0
+    subq=8
+    me_range=0
+    global_quality=0
+    coder=0
+    context=0
+    slice_flags=0
+    mbd=0
+    sc_threshold=0
+    nr=0
+    rc_init_occupancy=0
+    flags2=0x00000000
+    threads=1
+    dc=0
+    nssew=8
+    skip_top=0
+    skip_bottom=0
+    profile=-99
+    level=-99
+    lowres=0
+    skip_threshold=0
+    skip_factor=0
+    skip_exp=0
+    skipcmp=13
+    mblmin=236
+    mblmax=3658
+    mepc=256
+    skip_loop_filter=0
+    skip_idct=0
+    skip_frame=0
+    bidir_refine=1
+    brd_scale=0
+    keyint_min=25
+    refs=1
+    chromaoffset=0
+    trellis=0
+    mv0_threshold=256
+    b_sensitivity=40
+    compression_level=-1
+    min_prediction_order=-1
+    max_prediction_order=-1
+    timecode_frame_start=-1
+    bits_per_raw_sample=8
+    channel_layout=0
+    request_channel_layout=0
+    rc_max_vbv_use=0.000000
+    rc_min_vbv_use=3.000000
+    ticks_per_frame=1
+    color_primaries=2
+    color_trc=2
+    colorspace=5
+    color_range=2
+    chroma_sample_location=2
+    log_level_offset=0
+    slices=0
+    thread_type=0x00000003
+    audio_service_type=0
+    request_sample_fmt=none
+    pkt_timebase=1/25
+    sub_charenc=
+    sub_charenc_mode=0x00000000
+    sub_text_format=1
+    refcounted_frames=false
+    side_data_only_packets=true
+    apply_cropping=true
+    skip_alpha=false
+    field_order=0
+    dump_separator=
+    codec_whitelist=
+    pixel_format=yuvj422p
+    video_size=400x225
+    max_pixels=2147483647
+    hwaccel_flags=0x00000001
diff --git a/tests/ref/fate/api-png-codec-param b/tests/ref/fate/api-png-codec-param
new file mode 100644
index 0000000000..c6ea7c6296
--- /dev/null
+++ b/tests/ref/fate/api-png-codec-param
@@ -0,0 +1,278 @@
+stream=0, decode=0
+    b=0
+    ab=0
+    bt=4000000
+    flags=0x00000000
+    time_base=0/1
+    g=12
+    ar=0
+    ac=0
+    cutoff=0
+    frame_size=0
+    delay=0
+    qcomp=0.500000
+    qblur=0.500000
+    qmin=2
+    qmax=31
+    qdiff=3
+    bf=0
+    b_qfactor=1.250000
+    b_strategy=0
+    ps=0
+    mv_bits=0
+    header_bits=0
+    i_tex_bits=0
+    p_tex_bits=0
+    i_count=0
+    p_count=0
+    skip_count=0
+    misc_bits=0
+    frame_bits=0
+    codec_tag=0
+    bug=0x00000001
+    strict=0
+    b_qoffset=1.250000
+    err_detect=0x00000000
+    has_b_frames=0
+    block_align=0
+    mpeg_quant=0
+    rc_override_count=0
+    maxrate=0
+    minrate=0
+    bufsize=0
+    i_qfactor=-0.800000
+    i_qoffset=0.000000
+    dct=0
+    lumi_mask=0.000000
+    tcplx_mask=0.000000
+    scplx_mask=0.000000
+    p_mask=0.000000
+    dark_mask=0.000000
+    idct=0
+    slice_count=0
+    ec=0x00000003
+    bits_per_coded_sample=0
+    pred=0
+    aspect=2835/2835
+    sar=2835/2835
+    debug=0x00000000
+    cmp=0
+    subcmp=0
+    mbcmp=0
+    ildctcmp=8
+    dia_size=0
+    last_pred=0
+    preme=0
+    precmp=0
+    pre_dia_size=0
+    subq=8
+    me_range=0
+    global_quality=0
+    coder=0
+    context=0
+    slice_flags=0
+    mbd=0
+    sc_threshold=0
+    nr=0
+    rc_init_occupancy=0
+    flags2=0x00000000
+    threads=1
+    dc=0
+    nssew=8
+    skip_top=0
+    skip_bottom=0
+    profile=-99
+    level=-99
+    lowres=0
+    skip_threshold=0
+    skip_factor=0
+    skip_exp=0
+    skipcmp=13
+    mblmin=236
+    mblmax=3658
+    mepc=256
+    skip_loop_filter=0
+    skip_idct=0
+    skip_frame=0
+    bidir_refine=1
+    brd_scale=0
+    keyint_min=25
+    refs=1
+    chromaoffset=0
+    trellis=0
+    mv0_threshold=256
+    b_sensitivity=40
+    compression_level=-1
+    min_prediction_order=-1
+    max_prediction_order=-1
+    timecode_frame_start=-1
+    bits_per_raw_sample=0
+    channel_layout=0
+    request_channel_layout=0
+    rc_max_vbv_use=0.000000
+    rc_min_vbv_use=3.000000
+    ticks_per_frame=1
+    color_primaries=2
+    color_trc=2
+    colorspace=2
+    color_range=2
+    chroma_sample_location=0
+    log_level_offset=0
+    slices=0
+    thread_type=0x00000003
+    audio_service_type=0
+    request_sample_fmt=none
+    pkt_timebase=1/25
+    sub_charenc=
+    sub_charenc_mode=0x00000000
+    sub_text_format=1
+    refcounted_frames=false
+    side_data_only_packets=true
+    apply_cropping=true
+    skip_alpha=false
+    field_order=0
+    dump_separator=
+    codec_whitelist=
+    pixel_format=rgba
+    video_size=128x128
+    max_pixels=2147483647
+    hwaccel_flags=0x00000001
+stream=0, decode=1
+    b=0
+    ab=0
+    bt=4000000
+    flags=0x00000000
+    time_base=0/1
+    g=12
+    ar=0
+    ac=0
+    cutoff=0
+    frame_size=0
+    delay=0
+    qcomp=0.500000
+    qblur=0.500000
+    qmin=2
+    qmax=31
+    qdiff=3
+    bf=0
+    b_qfactor=1.250000
+    b_strategy=0
+    ps=0
+    mv_bits=0
+    header_bits=0
+    i_tex_bits=0
+    p_tex_bits=0
+    i_count=0
+    p_count=0
+    skip_count=0
+    misc_bits=0
+    frame_bits=0
+    codec_tag=0
+    bug=0x00000001
+    strict=0
+    b_qoffset=1.250000
+    err_detect=0x00000000
+    has_b_frames=0
+    block_align=0
+    mpeg_quant=0
+    rc_override_count=0
+    maxrate=0
+    minrate=0
+    bufsize=0
+    i_qfactor=-0.800000
+    i_qoffset=0.000000
+    dct=0
+    lumi_mask=0.000000
+    tcplx_mask=0.000000
+    scplx_mask=0.000000
+    p_mask=0.000000
+    dark_mask=0.000000
+    idct=0
+    slice_count=0
+    ec=0x00000003
+    bits_per_coded_sample=0
+    pred=0
+    aspect=2835/2835
+    sar=2835/2835
+    debug=0x00000000
+    cmp=0
+    subcmp=0
+    mbcmp=0
+    ildctcmp=8
+    dia_size=0
+    last_pred=0
+    preme=0
+    precmp=0
+    pre_dia_size=0
+    subq=8
+    me_range=0
+    global_quality=0
+    coder=0
+    context=0
+    slice_flags=0
+    mbd=0
+    sc_threshold=0
+    nr=0
+    rc_init_occupancy=0
+    flags2=0x00000000
+    threads=1
+    dc=0
+    nssew=8
+    skip_top=0
+    skip_bottom=0
+    profile=-99
+    level=-99
+    lowres=0
+    skip_threshold=0
+    skip_factor=0
+    skip_exp=0
+    skipcmp=13
+    mblmin=236
+    mblmax=3658
+    mepc=256
+    skip_loop_filter=0
+    skip_idct=0
+    skip_frame=0
+    bidir_refine=1
+    brd_scale=0
+    keyint_min=25
+    refs=1
+    chromaoffset=0
+    trellis=0
+    mv0_threshold=256
+    b_sensitivity=40
+    compression_level=-1
+    min_prediction_order=-1
+    max_prediction_order=-1
+    timecode_frame_start=-1
+    bits_per_raw_sample=0
+    channel_layout=0
+    request_channel_layout=0
+    rc_max_vbv_use=0.000000
+    rc_min_vbv_use=3.000000
+    ticks_per_frame=1
+    color_primaries=2
+    color_trc=2
+    colorspace=2
+    color_range=2
+    chroma_sample_location=0
+    log_level_offset=0
+    slices=0
+    thread_type=0x00000003
+    audio_service_type=0
+    request_sample_fmt=none
+    pkt_timebase=1/25
+    sub_charenc=
+    sub_charenc_mode=0x00000000
+    sub_text_format=1
+    refcounted_frames=false
+    side_data_only_packets=true
+    apply_cropping=true
+    skip_alpha=false
+    field_order=0
+    dump_separator=
+    codec_whitelist=
+    pixel_format=rgba
+    video_size=128x128
+    max_pixels=2147483647
+    hwaccel_flags=0x00000001
diff --git a/tests/ref/fate/apng-clock b/tests/ref/fate/apng-clock
new file mode 100644
index 0000000000..c0480fd4e6
--- /dev/null
+++ b/tests/ref/fate/apng-clock
@@ -0,0 +1,45 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 150x150
+#sar 0: 0/1
+0,          0,          0,        1,    23524, 0xf09caaa1
+0,          1,          1,        1,    23524, 0x1a329f21
+0,          2,          2,        1,    23524, 0x9b0ca017
+0,          3,          3,        1,    23524, 0x73b09deb
+0,          4,          4,        1,    23524, 0x23039f49
+0,          5,          5,        1,    23524, 0x58869e7b
+0,          6,          6,        1,    23524, 0xc26397d2
+0,          7,          7,        1,    23524, 0xe07f7d87
+0,          8,          8,        1,    23524, 0x619a82ba
+0,          9,          9,        1,    23524, 0x696c9757
+0,         10,         10,        1,    23524, 0x7303a4a6
+0,         11,         11,        1,    23524, 0x1e149aee
+0,         12,         12,        1,    23524, 0x78dd97e0
+0,         13,         13,        1,    23524, 0xad8092d3
+0,         14,         14,        1,    23524, 0x27c090b4
+0,         15,         15,        1,    23524, 0x904c97be
+0,         16,         16,        1,    23524, 0x54d29b9e
+0,         17,         17,        1,    23524, 0x57689bfa
+0,         18,         18,        1,    23524, 0x2772a00e
+0,         19,         19,        1,    23524, 0x6a769ef6
+0,         20,         20,        1,    23524, 0x94d8aad5
+0,         21,         21,        1,    23524, 0x52f79ec4
+0,         22,         22,        1,    23524, 0x99ee9fbc
+0,         23,         23,        1,    23524, 0xbd6a9e4d
+0,         24,         24,        1,    23524, 0xaf4aa1cf
+0,         25,         25,        1,    23524, 0xdb929f98
+0,         26,         26,        1,    23524, 0x9e189a6f
+0,         27,         27,        1,    23524, 0x3ffb9410
+0,         28,         28,        1,    23524, 0x6fc9917d
+0,         29,         29,        1,    23524, 0xe43e94ca
+0,         30,         30,        1,    23524, 0x03b6a24f
+0,         31,         31,        1,    23524, 0xc54f99b3
+0,         32,         32,        1,    23524, 0x4b9a9748
+0,         33,         33,        1,    23524, 0x25a19003
+0,         34,         34,        1,    23524, 0x2b9d77cc
+0,         35,         35,        1,    23524, 0x4a5a9217
+0,         36,         36,        1,    23524, 0x241b9a7c
+0,         37,         37,        1,    23524, 0xc9d39b38
+0,         38,         38,        1,    23524, 0xcca69f30
+0,         39,         39,        1,    23524, 0xe50f9ec9
diff --git a/tests/ref/fate/apng-osample b/tests/ref/fate/apng-osample
new file mode 100644
index 0000000000..5fca5e667d
--- /dev/null
+++ b/tests/ref/fate/apng-osample
@@ -0,0 +1,11 @@
+#tb 0: 3/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 116x135
+#sar 0: 0/1
+0,          0,          0,        1,    62640, 0x31eb581d
+0,          3,          3,        1,    62640, 0x29e11b82
+0,          6,          6,        1,    62640, 0x207ed588
+0,          9,          9,        1,    62640, 0x3845c906
+0,         12,         12,        1,    62640, 0x6797fe69
+0,         15,         15,        1,    62640, 0x1f086a09
diff --git a/tests/ref/fate/armovie-escape124 b/tests/ref/fate/armovie-escape124
index c686327c9e..398ff767b6 100644
--- a/tests/ref/fate/armovie-escape124
+++ b/tests/ref/fate/armovie-escape124
@@ -1,106 +1,115 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 #tb 1: 1/44100
-0,          0,          0,        1,   230400, 0x5288d70f
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 44100
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,          0,          0,        1,   230400, 0xd133e177
 1,          0,          0,    44100,   176400, 0xdd61578c
-0,          1,          1,        1,   230400, 0x2d3c1066
-0,          2,          2,        1,   230400, 0x89eb5b4a
-0,          3,          3,        1,   230400, 0x24c2d2e7
-0,          4,          4,        1,   230400, 0x9271cb38
-0,          5,          5,        1,   230400, 0xc74a5009
-0,          6,          6,        1,   230400, 0x61d70705
-0,          7,          7,        1,   230400, 0x6bb2c252
-0,          8,          8,        1,   230400, 0x6b3ac910
-0,          9,          9,        1,   230400, 0x44071f28
-0,         10,         10,        1,   230400, 0x8abd00fe
-0,         11,         11,        1,   230400, 0xcbe3395d
-0,         12,         12,        1,   230400, 0x603e7b7a
-0,         13,         13,        1,   230400, 0x2ca8865b
-0,         14,         14,        1,   230400, 0x11b4c665
-0,         15,         15,        1,   230400, 0x3f19787c
-0,         16,         16,        1,   230400, 0x651d24b6
-0,         17,         17,        1,   230400, 0x325d05af
-0,         18,         18,        1,   230400, 0x4f89d8a8
-0,         19,         19,        1,   230400, 0xb07647f0
-0,         20,         20,        1,   230400, 0x71141237
-0,         21,         21,        1,   230400, 0xa848a2d2
-0,         22,         22,        1,   230400, 0x3fbe4b58
-0,         23,         23,        1,   230400, 0xa1e235a0
-0,         24,         24,        1,   230400, 0x9bcf607a
-0,         25,         25,        1,   230400, 0x3302e9eb
+0,          1,          1,        1,   230400, 0xe3501bb2
+0,          2,          2,        1,   230400, 0x44da84f0
+0,          3,          3,        1,   230400, 0xe0fd17ed
+0,          4,          4,        1,   230400, 0xef4e08c7
+0,          5,          5,        1,   230400, 0xf52f82b5
+0,          6,          6,        1,   230400, 0x05eb186c
+0,          7,          7,        1,   230400, 0x0653f05d
+0,          8,          8,        1,   230400, 0xde1a0735
+0,          9,          9,        1,   230400, 0x6045576e
+0,         10,         10,        1,   230400, 0xac9444c4
+0,         11,         11,        1,   230400, 0x5f7f82fb
+0,         12,         12,        1,   230400, 0xaf4718ce
+0,         13,         13,        1,   230400, 0x117d5787
+0,         14,         14,        1,   230400, 0x319ac1f5
+0,         15,         15,        1,   230400, 0xd05cb30a
+0,         16,         16,        1,   230400, 0x96107c72
+0,         17,         17,        1,   230400, 0x73ff0a30
+0,         18,         18,        1,   230400, 0x865d0f3e
+0,         19,         19,        1,   230400, 0x3384ad55
+0,         20,         20,        1,   230400, 0x6694b2ea
+0,         21,         21,        1,   230400, 0x324f5cb8
+0,         22,         22,        1,   230400, 0x2de7c12f
+0,         23,         23,        1,   230400, 0x57fedb1a
+0,         24,         24,        1,   230400, 0xf46f2abf
+0,         25,         25,        1,   230400, 0xe5fead9b
 1,      44100,      44100,    44100,   176400, 0x0b9e6d67
-0,         26,         26,        1,   230400, 0xd731ba90
-0,         27,         27,        1,   230400, 0x821eedcf
-0,         28,         28,        1,   230400, 0xd068a93d
-0,         29,         29,        1,   230400, 0x2811d46e
-0,         30,         30,        1,   230400, 0xd9740446
-0,         31,         31,        1,   230400, 0x1bce0df6
-0,         32,         32,        1,   230400, 0x44bc60ad
-0,         33,         33,        1,   230400, 0xf56f6200
-0,         34,         34,        1,   230400, 0x874a2264
-0,         35,         35,        1,   230400, 0xaa155c0e
-0,         36,         36,        1,   230400, 0x595392d4
-0,         37,         37,        1,   230400, 0x58dc57de
-0,         38,         38,        1,   230400, 0x1c06733e
-0,         39,         39,        1,   230400, 0x6807b1db
-0,         40,         40,        1,   230400, 0x3fedff87
-0,         41,         41,        1,   230400, 0x3e38cc13
-0,         42,         42,        1,   230400, 0x6685ec35
-0,         43,         43,        1,   230400, 0x6c0742fd
-0,         44,         44,        1,   230400, 0x8108f83c
-0,         45,         45,        1,   230400, 0xc0e217c8
-0,         46,         46,        1,   230400, 0xb22ca65d
-0,         47,         47,        1,   230400, 0xd54cec93
-0,         48,         48,        1,   230400, 0xd9d61de3
-0,         49,         49,        1,   230400, 0x7e0f9675
-0,         50,         50,        1,   230400, 0x9869f5b7
+0,         26,         26,        1,   230400, 0x65764edb
+0,         27,         27,        1,   230400, 0xeabdcf53
+0,         28,         28,        1,   230400, 0xaeb659fc
+0,         29,         29,        1,   230400, 0x5ec97eb1
+0,         30,         30,        1,   230400, 0x2482abae
+0,         31,         31,        1,   230400, 0x297fb0c8
+0,         32,         32,        1,   230400, 0x57a52a3d
+0,         33,         33,        1,   230400, 0x44040e98
+0,         34,         34,        1,   230400, 0xa150e542
+0,         35,         35,        1,   230400, 0x0a1e1296
+0,         36,         36,        1,   230400, 0xf1085864
+0,         37,         37,        1,   230400, 0xe7a13b40
+0,         38,         38,        1,   230400, 0x759d384d
+0,         39,         39,        1,   230400, 0x72e08991
+0,         40,         40,        1,   230400, 0x10a4bbc9
+0,         41,         41,        1,   230400, 0xb258ac16
+0,         42,         42,        1,   230400, 0xde06facb
+0,         43,         43,        1,   230400, 0x94284e11
+0,         44,         44,        1,   230400, 0xedf23092
+0,         45,         45,        1,   230400, 0xc2be6319
+0,         46,         46,        1,   230400, 0x103a0b7b
+0,         47,         47,        1,   230400, 0x3415888b
+0,         48,         48,        1,   230400, 0x5ecaac75
+0,         49,         49,        1,   230400, 0xb9ba503e
+0,         50,         50,        1,   230400, 0xb20ccf57
 1,      88200,      88200,    44100,   176400, 0x2793fad7
-0,         51,         51,        1,   230400, 0x22f33400
-0,         52,         52,        1,   230400, 0x31b999bd
-0,         53,         53,        1,   230400, 0x36c23878
-0,         54,         54,        1,   230400, 0x06093a30
-0,         55,         55,        1,   230400, 0x213f1718
-0,         56,         56,        1,   230400, 0x83683006
-0,         57,         57,        1,   230400, 0x0bfcec36
-0,         58,         58,        1,   230400, 0x01b77825
-0,         59,         59,        1,   230400, 0x650a5ea2
-0,         60,         60,        1,   230400, 0xd8b2c559
-0,         61,         61,        1,   230400, 0xb012eb10
-0,         62,         62,        1,   230400, 0x135d53a4
-0,         63,         63,        1,   230400, 0x98dd0712
-0,         64,         64,        1,   230400, 0x75240ac0
-0,         65,         65,        1,   230400, 0xa16769d5
-0,         66,         66,        1,   230400, 0x3e08cda3
-0,         67,         67,        1,   230400, 0xcd20d561
-0,         68,         68,        1,   230400, 0x3531577d
-0,         69,         69,        1,   230400, 0x65ff4c82
-0,         70,         70,        1,   230400, 0x8fd4a580
-0,         71,         71,        1,   230400, 0x3cf7af4c
-0,         72,         72,        1,   230400, 0xda7a9202
-0,         73,         73,        1,   230400, 0x4bebc138
-0,         74,         74,        1,   230400, 0x5517e685
-0,         75,         75,        1,   230400, 0x95f6c7a3
+0,         51,         51,        1,   230400, 0x0dba31ed
+0,         52,         52,        1,   230400, 0x91c5e7d4
+0,         53,         53,        1,   230400, 0x09ac954b
+0,         54,         54,        1,   230400, 0xe9c3d563
+0,         55,         55,        1,   230400, 0xf46eef67
+0,         56,         56,        1,   230400, 0x117f4b80
+0,         57,         57,        1,   230400, 0x61714860
+0,         58,         58,        1,   230400, 0x5c7112d0
+0,         59,         59,        1,   230400, 0xd42c51e7
+0,         60,         60,        1,   230400, 0x425f0c99
+0,         61,         61,        1,   230400, 0x4c398834
+0,         62,         62,        1,   230400, 0x237f89c2
+0,         63,         63,        1,   230400, 0xd2e29b05
+0,         64,         64,        1,   230400, 0x204a054b
+0,         65,         65,        1,   230400, 0x25a9faf7
+0,         66,         66,        1,   230400, 0x83f6c1a8
+0,         67,         67,        1,   230400, 0xe48321b9
+0,         68,         68,        1,   230400, 0x714c1005
+0,         69,         69,        1,   230400, 0x36cc58e9
+0,         70,         70,        1,   230400, 0x5e9ffdd9
+0,         71,         71,        1,   230400, 0x582b55dc
+0,         72,         72,        1,   230400, 0x139a7f39
+0,         73,         73,        1,   230400, 0xefb5f998
+0,         74,         74,        1,   230400, 0xeb736da8
+0,         75,         75,        1,   230400, 0x488f9847
 1,     132300,     132300,    44100,   176400, 0xe2649a4a
-0,         76,         76,        1,   230400, 0x9849ebf9
-0,         77,         77,        1,   230400, 0xd77e1c7d
-0,         78,         78,        1,   230400, 0x4dc6c923
-0,         79,         79,        1,   230400, 0x7ce817c8
-0,         80,         80,        1,   230400, 0xafb4acde
-0,         81,         81,        1,   230400, 0xd0030b2c
-0,         82,         82,        1,   230400, 0xb3acb77c
-0,         83,         83,        1,   230400, 0x4d32b61c
-0,         84,         84,        1,   230400, 0x2436a915
-0,         85,         85,        1,   230400, 0xa6fd831f
-0,         86,         86,        1,   230400, 0x6c6edfca
-0,         87,         87,        1,   230400, 0x4b30d72e
-0,         88,         88,        1,   230400, 0x59f46a8a
-0,         89,         89,        1,   230400, 0xa2d0435f
-0,         90,         90,        1,   230400, 0x463872c4
-0,         91,         91,        1,   230400, 0x1d7e870a
-0,         92,         92,        1,   230400, 0x74f4e530
-0,         93,         93,        1,   230400, 0xbc61053d
-0,         94,         94,        1,   230400, 0x5fb238dc
-0,         95,         95,        1,   230400, 0x14a29d83
-0,         96,         96,        1,   230400, 0x3fd1d09b
-0,         97,         97,        1,   230400, 0x098afc13
-0,         98,         98,        1,   230400, 0x9bd12a62
-0,         99,         99,        1,   230400, 0x7bf71419
+0,         76,         76,        1,   230400, 0x6ab20741
+0,         77,         77,        1,   230400, 0xa73686f0
+0,         78,         78,        1,   230400, 0x67878643
+0,         79,         79,        1,   230400, 0x83bb241b
+0,         80,         80,        1,   230400, 0xe6b70660
+0,         81,         81,        1,   230400, 0x87f5aca3
+0,         82,         82,        1,   230400, 0x29c79bc3
+0,         83,         83,        1,   230400, 0xcadbd70b
+0,         84,         84,        1,   230400, 0x8cdcfdee
+0,         85,         85,        1,   230400, 0x90aa0442
+0,         86,         86,        1,   230400, 0xa68e87b7
+0,         87,         87,        1,   230400, 0xa2c49e58
+0,         88,         88,        1,   230400, 0x9a9a4c55
+0,         89,         89,        1,   230400, 0x06b53aed
+0,         90,         90,        1,   230400, 0x79e1808a
+0,         91,         91,        1,   230400, 0x3e53a411
+0,         92,         92,        1,   230400, 0xfebc13ca
+0,         93,         93,        1,   230400, 0x1f1f443b
+0,         94,         94,        1,   230400, 0xd0db806a
+0,         95,         95,        1,   230400, 0x6f2aee94
+0,         96,         96,        1,   230400, 0xe8cc23ba
+0,         97,         97,        1,   230400, 0x2edf510b
+0,         98,         98,        1,   230400, 0x87118129
+0,         99,         99,        1,   230400, 0x1dd1709a
diff --git a/tests/ref/fate/armovie-escape130 b/tests/ref/fate/armovie-escape130
index ee4ec26ee1..6925a48e39 100644
--- a/tests/ref/fate/armovie-escape130
+++ b/tests/ref/fate/armovie-escape130
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x160
+#sar 0: 0/1
 0,          0,          0,        1,    76800, 0x860502ee
 0,          1,          1,        1,    76800, 0x055da755
 0,          2,          2,        1,    76800, 0x67969220
diff --git a/tests/ref/fate/asf-repldata b/tests/ref/fate/asf-repldata
index 5abc9da02c..94744569f2 100644
--- a/tests/ref/fate/asf-repldata
+++ b/tests/ref/fate/asf-repldata
@@ -1,15 +1,19 @@
 #tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: msmpeg4v3
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        0,    23374, 0x8725b3b8
-0,        122,        122,        0,    13732, 0x3ac8531a
-0,        245,        245,        0,      615, 0xd31641b4
-0,        367,        367,        0,     6361, 0xf263af54
-0,        490,        490,        0,      320, 0xd6f2d6b8
-0,        612,        612,        0,     3750, 0xfcf1d501
-0,        735,        735,        0,     2541, 0xd9fc04f9
-0,        857,        857,        0,      205, 0x4d38a947
-0,        980,        980,        0,     2166, 0x2f1e7d74
-0,       1102,       1102,        0,     1667, 0x0cd84b61
-0,       1224,       1224,        0,    13645, 0x543bd032
-0,       1347,       1347,        0,     5953, 0xc3037c73
+0,        122,        122,        0,    13732, 0x3ac8531a, F=0x0
+0,        245,        245,        0,      615, 0xd31641b4, F=0x0
+0,        367,        367,        0,     6361, 0xf263af54, F=0x0
+0,        490,        490,        0,      320, 0xd6f2d6b8, F=0x0
+0,        612,        612,        0,     3750, 0xfcf1d501, F=0x0
+0,        735,        735,        0,     2541, 0xd9fc04f9, F=0x0
+0,        857,        857,        0,      205, 0x4d38a947, F=0x0
+0,        980,        980,        0,     2166, 0x2f1e7d74, F=0x0
+0,       1102,       1102,        0,     1667, 0x0cd84b61, F=0x0
+0,       1224,       1224,        0,    13645, 0x543bd032, F=0x0
+0,       1347,       1347,        0,     5953, 0xc3037c73, F=0x0
 0,       1469,       1469,        0,    36169, 0xca9f716d
-0,       1592,       1592,        0,     3030, 0x9aba5683
+0,       1592,       1592,        0,     3030, 0x9aba5683, F=0x0
diff --git a/tests/ref/fate/ast b/tests/ref/fate/ast
new file mode 100644
index 0000000000..5b89c2b1ef
--- /dev/null
+++ b/tests/ref/fate/ast
@@ -0,0 +1 @@
+CRC=0x87713611
diff --git a/tests/ref/fate/async b/tests/ref/fate/async
new file mode 100644
index 0000000000..c4c0b0beba
--- /dev/null
+++ b/tests/ref/fate/async
@@ -0,0 +1,9 @@
+open: 0
+size: 2048
+read: 2048
+read: 0
+seek: 1536
+read: 512
+read: 0
+open: 0
+read: -10000
diff --git a/tests/ref/fate/audio_fifo b/tests/ref/fate/audio_fifo
new file mode 100644
index 0000000000..6c6538b566
--- /dev/null
+++ b/tests/ref/fate/audio_fifo
@@ -0,0 +1,228 @@
+
+TEST: 1
+
+written: 12
+written: 12
+remaining samples in audio_fifo: 24
+
+read: 12
+00 01 02 03 04 05 06 07 08 09 0a 0b
+remaining samples in audio_fifo: 12
+
+peek:
+00 01 02 03 04 05 06 07 08 09 0a 0b
+
+peek_at:
+0:
+00
+1:
+01
+2:
+02
+3:
+03
+4:
+04
+5:
+05
+6:
+06
+7:
+07
+8:
+08
+9:
+09
+10:
+0a
+11:
+0b
+
+
+TEST: 2
+
+written: 6
+written: 6
+remaining samples in audio_fifo: 12
+
+read: 6
+00 01 02 03 04 05
+06 07 08 09 0a 0b
+remaining samples in audio_fifo: 6
+
+peek:
+00 01 02 03 04 05
+06 07 08 09 0a 0b
+
+peek_at:
+0:
+00
+06
+1:
+01
+07
+2:
+02
+08
+3:
+03
+09
+4:
+04
+0a
+5:
+05
+0b
+
+
+TEST: 3
+
+written: 12
+written: 12
+remaining samples in audio_fifo: 24
+
+read: 12
+0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000a 000b
+remaining samples in audio_fifo: 12
+
+peek:
+0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000a 000b
+
+peek_at:
+0:
+0000
+1:
+0001
+2:
+0002
+3:
+0003
+4:
+0004
+5:
+0005
+6:
+0006
+7:
+0007
+8:
+0008
+9:
+0009
+10:
+000a
+11:
+000b
+
+
+TEST: 4
+
+written: 6
+written: 6
+remaining samples in audio_fifo: 12
+
+read: 6
+0000 0001 0002 0003 0004 0005
+0006 0007 0008 0009 000a 000b
+remaining samples in audio_fifo: 6
+
+peek:
+0000 0001 0002 0003 0004 0005
+0006 0007 0008 0009 000a 000b
+
+peek_at:
+0:
+0000
+0006
+1:
+0001
+0007
+2:
+0002
+0008
+3:
+0003
+0009
+4:
+0004
+000a
+5:
+0005
+000b
+
+
+TEST: 5
+
+written: 12
+written: 12
+remaining samples in audio_fifo: 24
+
+read: 12
+00000000 3f800000 40000000 40400000 40800000 40a00000 40c00000 40e00000 41000000 41100000 41200000 41300000
+remaining samples in audio_fifo: 12
+
+peek:
+00000000 3f800000 40000000 40400000 40800000 40a00000 40c00000 40e00000 41000000 41100000 41200000 41300000
+
+peek_at:
+0:
+00000000
+1:
+3f800000
+2:
+40000000
+3:
+40400000
+4:
+40800000
+5:
+40a00000
+6:
+40c00000
+7:
+40e00000
+8:
+41000000
+9:
+41100000
+10:
+41200000
+11:
+41300000
+
+
+TEST: 6
+
+written: 6
+written: 6
+remaining samples in audio_fifo: 12
+
+read: 6
+00000000 3f800000 40000000 40400000 40800000 40a00000
+40c00000 40e00000 41000000 41100000 41200000 41300000
+remaining samples in audio_fifo: 6
+
+peek:
+00000000 3f800000 40000000 40400000 40800000 40a00000
+40c00000 40e00000 41000000 41100000 41200000 41300000
+
+peek_at:
+0:
+00000000
+40c00000
+1:
+3f800000
+40e00000
+2:
+40000000
+41000000
+3:
+40400000
+41100000
+4:
+40800000
+41200000
+5:
+40a00000
+41300000
+
diff --git a/tests/ref/fate/audiomatch-afconvert-16000-mono-he-adts b/tests/ref/fate/audiomatch-afconvert-16000-mono-he-adts
new file mode 100644
index 0000000000..bbbf8ffc72
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-16000-mono-he-adts
@@ -0,0 +1 @@
+presig: 2593 postsig:223 c: 0.9835 lenerr:2816
diff --git a/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a b/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a
new file mode 100644
index 0000000000..f6f8df5e00
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a
@@ -0,0 +1 @@
+presig: 481 postsig:223 c: 0.9835 lenerr:704
diff --git a/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-adts b/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-adts
new file mode 100644
index 0000000000..bf6ecf633e
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-adts
@@ -0,0 +1 @@
+presig: 2112 postsig:704 c: 0.9842 lenerr:2816
diff --git a/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-m4a b/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-m4a
new file mode 100644
index 0000000000..75cd54ed03
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-16000-mono-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:704 c: 0.9842 lenerr:704
diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-adts b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-adts
new file mode 100644
index 0000000000..2e29599cf1
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-adts
@@ -0,0 +1 @@
+presig: 5186 postsig:446 c: 0.9895 lenerr:5632
diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a
new file mode 100644
index 0000000000..9ba0ef2338
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a
@@ -0,0 +1 @@
+presig: 962 postsig:446 c: 0.9895 lenerr:1408
diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts
new file mode 100644
index 0000000000..32b2627946
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts
@@ -0,0 +1 @@
+presig: 5186 postsig:446 c: 0.9839 lenerr:5632
diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a
new file mode 100644
index 0000000000..d4fc21bda5
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a
@@ -0,0 +1 @@
+presig: 962 postsig:446 c: 0.9839 lenerr:1408
diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-adts b/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-adts
new file mode 100644
index 0000000000..360049f016
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-adts
@@ -0,0 +1 @@
+presig: 4224 postsig:1408 c: 0.9985 lenerr:5632
diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-m4a b/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-m4a
new file mode 100644
index 0000000000..f86ccb4cc6
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:1408 c: 0.9985 lenerr:1408
diff --git a/tests/ref/fate/audiomatch-afconvert-44100-mono-he-adts b/tests/ref/fate/audiomatch-afconvert-44100-mono-he-adts
new file mode 100644
index 0000000000..f3394839a4
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-44100-mono-he-adts
@@ -0,0 +1 @@
+presig: 5186 postsig:822 c: 0.9911 lenerr:6008
diff --git a/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a b/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a
new file mode 100644
index 0000000000..0ad4911ff8
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a
@@ -0,0 +1 @@
+presig: 962 postsig:822 c: 0.9911 lenerr:1784
diff --git a/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-adts b/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-adts
new file mode 100644
index 0000000000..523cb1f5ce
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-adts
@@ -0,0 +1 @@
+presig: 2112 postsig:824 c: 0.9995 lenerr:2936
diff --git a/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-m4a b/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-m4a
new file mode 100644
index 0000000000..9db2d81085
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-44100-mono-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:824 c: 0.9995 lenerr:824
diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-adts b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-adts
new file mode 100644
index 0000000000..b8fd805b87
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-adts
@@ -0,0 +1 @@
+presig: 10372 postsig:1644 c: 0.9890 lenerr:12016
diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a
new file mode 100644
index 0000000000..ff5540b572
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a
@@ -0,0 +1 @@
+presig: 1924 postsig:1644 c: 0.9890 lenerr:3568
diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-adts b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-adts
new file mode 100644
index 0000000000..7e72d37768
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-adts
@@ -0,0 +1 @@
+presig: 10372 postsig:1644 c: 0.9909 lenerr:12016
diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a
new file mode 100644
index 0000000000..f8214cfbdc
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a
@@ -0,0 +1 @@
+presig: 1924 postsig:1644 c: 0.9909 lenerr:3568
diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-adts b/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-adts
new file mode 100644
index 0000000000..bca902ba95
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-adts
@@ -0,0 +1 @@
+presig: 4224 postsig:1648 c: 1.0006 lenerr:5872
diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-m4a b/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-m4a
new file mode 100644
index 0000000000..51f23c78cd
--- /dev/null
+++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:1648 c: 1.0006 lenerr:1648
diff --git a/tests/ref/fate/audiomatch-dolby-44100-mono-he-mp4 b/tests/ref/fate/audiomatch-dolby-44100-mono-he-mp4
new file mode 100644
index 0000000000..698c196b88
--- /dev/null
+++ b/tests/ref/fate/audiomatch-dolby-44100-mono-he-mp4
@@ -0,0 +1 @@
+presig: 5569 postsig:-1609 c: 0.9702 lenerr:3960
diff --git a/tests/ref/fate/audiomatch-dolby-44100-mono-lc-mp4 b/tests/ref/fate/audiomatch-dolby-44100-mono-lc-mp4
new file mode 100644
index 0000000000..dfc030efff
--- /dev/null
+++ b/tests/ref/fate/audiomatch-dolby-44100-mono-lc-mp4
@@ -0,0 +1 @@
+presig: 2973 postsig:-37 c: 0.9998 lenerr:2936
diff --git a/tests/ref/fate/audiomatch-dolby-44100-stereo-he-mp4 b/tests/ref/fate/audiomatch-dolby-44100-stereo-he-mp4
new file mode 100644
index 0000000000..2de86acafd
--- /dev/null
+++ b/tests/ref/fate/audiomatch-dolby-44100-stereo-he-mp4
@@ -0,0 +1 @@
+presig: 11160 postsig:-3240 c: 0.9703 lenerr:7920
diff --git a/tests/ref/fate/audiomatch-dolby-44100-stereo-he2-mp4 b/tests/ref/fate/audiomatch-dolby-44100-stereo-he2-mp4
new file mode 100644
index 0000000000..67edc2bcb8
--- /dev/null
+++ b/tests/ref/fate/audiomatch-dolby-44100-stereo-he2-mp4
@@ -0,0 +1 @@
+presig: 15884 postsig:228 c: 0.8390 lenerr:16112
diff --git a/tests/ref/fate/audiomatch-dolby-44100-stereo-lc-mp4 b/tests/ref/fate/audiomatch-dolby-44100-stereo-lc-mp4
new file mode 100644
index 0000000000..f1be5cb7f3
--- /dev/null
+++ b/tests/ref/fate/audiomatch-dolby-44100-stereo-lc-mp4
@@ -0,0 +1 @@
+presig: 5760 postsig:-1936 c: 0.9837 lenerr:3824
diff --git a/tests/ref/fate/audiomatch-faac-16000-mono-lc-adts b/tests/ref/fate/audiomatch-faac-16000-mono-lc-adts
new file mode 100644
index 0000000000..b2615dfc83
--- /dev/null
+++ b/tests/ref/fate/audiomatch-faac-16000-mono-lc-adts
@@ -0,0 +1 @@
+presig: 0 postsig:768 c: 1.0011 lenerr:768
diff --git a/tests/ref/fate/audiomatch-faac-16000-mono-lc-m4a b/tests/ref/fate/audiomatch-faac-16000-mono-lc-m4a
new file mode 100644
index 0000000000..b2615dfc83
--- /dev/null
+++ b/tests/ref/fate/audiomatch-faac-16000-mono-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:768 c: 1.0011 lenerr:768
diff --git a/tests/ref/fate/audiomatch-faac-16000-stereo-lc-adts b/tests/ref/fate/audiomatch-faac-16000-stereo-lc-adts
new file mode 100644
index 0000000000..b0fa495fa5
--- /dev/null
+++ b/tests/ref/fate/audiomatch-faac-16000-stereo-lc-adts
@@ -0,0 +1 @@
+presig: 0 postsig:1536 c: 1.0011 lenerr:1536
diff --git a/tests/ref/fate/audiomatch-faac-16000-stereo-lc-m4a b/tests/ref/fate/audiomatch-faac-16000-stereo-lc-m4a
new file mode 100644
index 0000000000..b0fa495fa5
--- /dev/null
+++ b/tests/ref/fate/audiomatch-faac-16000-stereo-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:1536 c: 1.0011 lenerr:1536
diff --git a/tests/ref/fate/audiomatch-faac-44100-mono-lc-adts b/tests/ref/fate/audiomatch-faac-44100-mono-lc-adts
new file mode 100644
index 0000000000..66faeb696c
--- /dev/null
+++ b/tests/ref/fate/audiomatch-faac-44100-mono-lc-adts
@@ -0,0 +1 @@
+presig: 0 postsig:888 c: 0.9882 lenerr:888
diff --git a/tests/ref/fate/audiomatch-faac-44100-mono-lc-m4a b/tests/ref/fate/audiomatch-faac-44100-mono-lc-m4a
new file mode 100644
index 0000000000..66faeb696c
--- /dev/null
+++ b/tests/ref/fate/audiomatch-faac-44100-mono-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:888 c: 0.9882 lenerr:888
diff --git a/tests/ref/fate/audiomatch-faac-44100-stereo-lc-adts b/tests/ref/fate/audiomatch-faac-44100-stereo-lc-adts
new file mode 100644
index 0000000000..c40a48e1b9
--- /dev/null
+++ b/tests/ref/fate/audiomatch-faac-44100-stereo-lc-adts
@@ -0,0 +1 @@
+presig: 0 postsig:1776 c: 0.9882 lenerr:1776
diff --git a/tests/ref/fate/audiomatch-faac-44100-stereo-lc-m4a b/tests/ref/fate/audiomatch-faac-44100-stereo-lc-m4a
new file mode 100644
index 0000000000..c40a48e1b9
--- /dev/null
+++ b/tests/ref/fate/audiomatch-faac-44100-stereo-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:1776 c: 0.9882 lenerr:1776
diff --git a/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a b/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a
new file mode 100644
index 0000000000..4ee764e967
--- /dev/null
+++ b/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a
@@ -0,0 +1 @@
+presig: -4 postsig:196 c: 0.9736 lenerr:192
diff --git a/tests/ref/fate/audiomatch-nero-16000-mono-lc-m4a b/tests/ref/fate/audiomatch-nero-16000-mono-lc-m4a
new file mode 100644
index 0000000000..440c419793
--- /dev/null
+++ b/tests/ref/fate/audiomatch-nero-16000-mono-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:192 c: 0.9965 lenerr:192
diff --git a/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a b/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a
new file mode 100644
index 0000000000..cdc31c12ef
--- /dev/null
+++ b/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a
@@ -0,0 +1 @@
+presig: -8 postsig:392 c: 0.9777 lenerr:384
diff --git a/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a b/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a
new file mode 100644
index 0000000000..74d549780d
--- /dev/null
+++ b/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a
@@ -0,0 +1 @@
+presig: 2 postsig:2590 c: 0.9934 lenerr:2592
diff --git a/tests/ref/fate/audiomatch-nero-16000-stereo-lc-m4a b/tests/ref/fate/audiomatch-nero-16000-stereo-lc-m4a
new file mode 100644
index 0000000000..f36c3c8ad9
--- /dev/null
+++ b/tests/ref/fate/audiomatch-nero-16000-stereo-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:384 c: 0.9961 lenerr:384
diff --git a/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a b/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a
new file mode 100644
index 0000000000..b5dcd9daeb
--- /dev/null
+++ b/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:1336 c: 0.9973 lenerr:1336
diff --git a/tests/ref/fate/audiomatch-nero-44100-mono-lc-m4a b/tests/ref/fate/audiomatch-nero-44100-mono-lc-m4a
new file mode 100644
index 0000000000..87b074a75f
--- /dev/null
+++ b/tests/ref/fate/audiomatch-nero-44100-mono-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:312 c: 0.9986 lenerr:312
diff --git a/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a b/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a
new file mode 100644
index 0000000000..42a87c08e3
--- /dev/null
+++ b/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a
@@ -0,0 +1 @@
+presig: -2 postsig:2674 c: 0.9986 lenerr:2672
diff --git a/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a b/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a
new file mode 100644
index 0000000000..3fa2cdba2b
--- /dev/null
+++ b/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a
@@ -0,0 +1 @@
+presig: 2 postsig:782 c: 0.9980 lenerr:784
diff --git a/tests/ref/fate/audiomatch-nero-44100-stereo-lc-m4a b/tests/ref/fate/audiomatch-nero-44100-stereo-lc-m4a
new file mode 100644
index 0000000000..11bc41fa73
--- /dev/null
+++ b/tests/ref/fate/audiomatch-nero-44100-stereo-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:624 c: 0.9954 lenerr:624
diff --git a/tests/ref/fate/audiomatch-quicktime7-44100-stereo-lc-mp4 b/tests/ref/fate/audiomatch-quicktime7-44100-stereo-lc-mp4
new file mode 100644
index 0000000000..b11a4861dc
--- /dev/null
+++ b/tests/ref/fate/audiomatch-quicktime7-44100-stereo-lc-mp4
@@ -0,0 +1 @@
+presig: 4220 postsig:-2444 c: 0.9768 lenerr:1776
diff --git a/tests/ref/fate/audiomatch-quicktimeX-44100-stereo-lc-m4a b/tests/ref/fate/audiomatch-quicktimeX-44100-stereo-lc-m4a
new file mode 100644
index 0000000000..9fdaf2255b
--- /dev/null
+++ b/tests/ref/fate/audiomatch-quicktimeX-44100-stereo-lc-m4a
@@ -0,0 +1 @@
+presig: 0 postsig:1648 c: 0.9994 lenerr:1648
diff --git a/tests/ref/fate/audiomatch-square-aac b/tests/ref/fate/audiomatch-square-aac
new file mode 100644
index 0000000000..b3480d5174
--- /dev/null
+++ b/tests/ref/fate/audiomatch-square-aac
@@ -0,0 +1 @@
+presig: 0 postsig:892 c: 0.9983 lenerr:892
diff --git a/tests/ref/fate/audiomatch-square-mp3 b/tests/ref/fate/audiomatch-square-mp3
new file mode 100644
index 0000000000..8de55c2f41
--- /dev/null
+++ b/tests/ref/fate/audiomatch-square-mp3
@@ -0,0 +1 @@
+presig: 0 postsig:0 c: 0.9447 lenerr:0
diff --git a/tests/ref/fate/auravision-v1 b/tests/ref/fate/auravision-v1
index 456f399ec8..25a15ce1c6 100644
--- a/tests/ref/fate/auravision-v1
+++ b/tests/ref/fate/auravision-v1
@@ -1,4 +1,8 @@
 #tb 0: 33339/500000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    28800, 0x4a4efbbc
 0,          1,          1,        1,    28800, 0xc6c7e26a
 0,          2,          2,        1,    28800, 0x6cd40913
diff --git a/tests/ref/fate/auravision-v2 b/tests/ref/fate/auravision-v2
index f1e8e3a9e1..498944acc1 100644
--- a/tests/ref/fate/auravision-v2
+++ b/tests/ref/fate/auravision-v2
@@ -1,3 +1,7 @@
 #tb 0: 33333/1000000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x180
+#sar 0: 0/1
 0,          0,          0,        1,   115200, 0x2f247f66
 0,          1,          1,        1,   115200, 0xf492929e
diff --git a/tests/ref/fate/avio-direct b/tests/ref/fate/avio-direct
new file mode 100644
index 0000000000..c0628e9ac4
--- /dev/null
+++ b/tests/ref/fate/avio-direct
@@ -0,0 +1,63 @@
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 288x168
+#sar 0: 0/1
+0,          0,          0,        1,   145152, 0x8458d4cb
+0,          1,          1,        1,   145152, 0xa694d7c7
+0,          2,          2,        1,   145152, 0x2bd4bfc9
+0,          3,          3,        1,   145152, 0xe53b1616
+0,          4,          4,        1,   145152, 0x6a0a806a
+0,          5,          5,        1,   145152, 0x45f7b8e6
+0,          6,          6,        1,   145152, 0x4e14150e
+0,          7,          7,        1,   145152, 0xe1cd9b6f
+0,          8,          8,        1,   145152, 0x5b5802d7
+0,          9,          9,        1,   145152, 0xb03da5e7
+0,         10,         10,        1,   145152, 0x3436b06e
+0,         11,         11,        1,   145152, 0x4535e638
+0,         12,         12,        1,   145152, 0x72934af1
+0,         13,         13,        1,   145152, 0xb672d459
+0,         14,         14,        1,   145152, 0xab57491b
+0,         15,         15,        1,   145152, 0xdbac3480
+0,         16,         16,        1,   145152, 0x54215962
+0,         17,         17,        1,   145152, 0x451f456e
+0,         18,         18,        1,   145152, 0xa17655d1
+0,         19,         19,        1,   145152, 0xce95422c
+0,         20,         20,        1,   145152, 0xe0ee8e77
+0,         21,         21,        1,   145152, 0xdaabe277
+0,         22,         22,        1,   145152, 0xc21bb665
+0,         23,         23,        1,   145152, 0x1e74270e
+0,         24,         24,        1,   145152, 0xae7bac5f
+0,         25,         25,        1,   145152, 0xf62442ed
+0,         26,         26,        1,   145152, 0x5c8d8984
+0,         27,         27,        1,   145152, 0x97a69fe7
+0,         28,         28,        1,   145152, 0x1f244d19
+0,         29,         29,        1,   145152, 0x2758bc25
+0,         30,         30,        1,   145152, 0xf43ddb89
+0,         31,         31,        1,   145152, 0x086a524e
+0,         32,         32,        1,   145152, 0x8b464d4d
+0,         33,         33,        1,   145152, 0xb77b63d2
+0,         34,         34,        1,   145152, 0xfd842fa8
+0,         35,         35,        1,   145152, 0xa98b6dbe
+0,         36,         36,        1,   145152, 0xdedbab2c
+0,         37,         37,        1,   145152, 0x24e19172
+0,         38,         38,        1,   145152, 0x1ef456f6
+0,         39,         39,        1,   145152, 0xaceabdf0
+0,         40,         40,        1,   145152, 0xb54de3d9
+0,         41,         41,        1,   145152, 0x3af0df9b
+0,         42,         42,        1,   145152, 0xf89fbd9a
+0,         43,         43,        1,   145152, 0xc6a9673c
+0,         44,         44,        1,   145152, 0x6d5a929e
+0,         45,         45,        1,   145152, 0x879e7d9b
+0,         46,         46,        1,   145152, 0x233c14eb
+0,         47,         47,        1,   145152, 0x8246f081
+0,         48,         48,        1,   145152, 0x3366c4bf
+0,         49,         49,        1,   145152, 0x6b0203da
+0,         50,         50,        1,   145152, 0x48a00163
+0,         51,         51,        1,   145152, 0xe956ac2c
+0,         52,         52,        1,   145152, 0xa2511283
+0,         53,         53,        1,   145152, 0x7e03222d
+0,         54,         54,        1,   145152, 0xc31a7a40
+0,         55,         55,        1,   145152, 0x80448031
+0,         56,         56,        1,   145152, 0xe3b1fbf7
+0,         57,         57,        1,   145152, 0xa00395a4
diff --git a/tests/ref/fate/avstring b/tests/ref/fate/avstring
index bc231e8148..1ca9be52ed 100644
--- a/tests/ref/fate/avstring
+++ b/tests/ref/fate/avstring
@@ -25,3 +25,12 @@ Testing av_get_token()
 |'foo : \ \  '   : blahblah| -> |foo : \ \  | + |: blahblah|
 |'\fo\o:': blahblah| -> |\fo\o:| + |: blahblah|
 |\'fo\o\:':  foo  '  :blahblah| -> |'foo::  foo  | + |:blahblah|
+Testing av_append_path_component()
+(null) = (null)
+path = path
+comp = comp
+path/comp = path/comp
+path/comp = path/comp
+path/comp = path/comp
+path/comp = path/comp
+path/path2/comp/comp2 = path/path2/comp/comp2
diff --git a/tests/ref/fate/bcstm b/tests/ref/fate/bcstm
new file mode 100644
index 0000000000..cde12b678e
--- /dev/null
+++ b/tests/ref/fate/bcstm
@@ -0,0 +1 @@
+CRC=0xca62d03b
diff --git a/tests/ref/fate/bethsoft-vid b/tests/ref/fate/bethsoft-vid
index 535888b69e..25a62ae515 100644
--- a/tests/ref/fate/bethsoft-vid
+++ b/tests/ref/fate/bethsoft-vid
@@ -1,143 +1,152 @@
-#tb 0: 185/11111
+#tb 0: 1/14
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
 #tb 1: 1/11111
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 11111
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   192000, 0x00000000
 1,          0,          0,      740,     1480, 0x00000000
-0,          4,          4,        1,   192000, 0x01a6cf45
 1,        740,        740,      740,     1480, 0x20a92bd4
-0,          8,          8,        1,   192000, 0xd07d57e9
+0,          1,          1,        1,   192000, 0x5a5acf57
 1,       1480,       1480,      925,     1850, 0xa9e48a74
-0,         13,         13,        1,   192000, 0x3cb1dff5
+0,          2,          2,        1,   192000, 0xbd055cf1
+0,          3,          3,        1,   192000, 0x28b1eefc
 1,       2405,       2405,      740,     1480, 0x23ecd018
-0,         17,         17,        1,   192000, 0xd1aaa8fb
 1,       3145,       3145,      740,     1480, 0x206bb915
-0,         21,         21,        1,   192000, 0x75f526cd
+0,          4,          4,        1,   192000, 0x0636bacd
 1,       3885,       3885,      925,     1850, 0xb0e10e75
-0,         26,         26,        1,   192000, 0x0f673577
+0,          5,          5,        1,   192000, 0xbfd33cbd
+0,          6,          6,        1,   192000, 0x0bd150ef
 1,       4810,       4810,      740,     1480, 0x8d9baedd
-0,         30,         30,        1,   192000, 0x897b6781
 1,       5550,       5550,      740,     1480, 0xb802aae1
-0,         34,         34,        1,   192000, 0x81e6b7f7
+0,          7,          7,        1,   192000, 0x780d891e
 1,       6290,       6290,      740,     1480, 0xecd7b5cc
-0,         38,         38,        1,   192000, 0x1f45ce61
+0,          8,          8,        1,   192000, 0xacf5e205
 1,       7030,       7030,      925,     1850, 0x16861355
-0,         43,         43,        1,   192000, 0x5a0772a6
+0,          9,          9,        1,   192000, 0x37c900dc
+0,         10,         10,        1,   192000, 0x4ee6add7
 1,       7955,       7955,      740,     1480, 0xa51690bd
-0,         47,         47,        1,   192000, 0xf78732b3
 1,       8695,       8695,      740,     1480, 0xdd0b90d1
-0,         51,         51,        1,   192000, 0x8427f9e5
+0,         11,         11,        1,   192000, 0x1844783a
 1,       9435,       9435,      925,     1850, 0x3ce6e333
-0,         56,         56,        1,   192000, 0x40473f11
+0,         12,         12,        1,   192000, 0x7bf84848
+0,         13,         13,        1,   192000, 0x1ec296bc
 1,      10360,      10360,      740,     1480, 0xf8ce8ea3
-0,         60,         60,        1,   192000, 0x173ceebe
 1,      11100,      11100,      740,     1480, 0xda4597af
-0,         64,         64,        1,   192000, 0x136b9516
+0,         14,         14,        1,   192000, 0xbaeb5292
 1,      11840,      11840,      740,     1480, 0x918f7cb3
-0,         68,         68,        1,   192000, 0x138d11ae
+0,         15,         15,        1,   192000, 0xcb18038d
 1,      12580,      12580,      925,     1850, 0xca6edb15
-0,         73,         73,        1,   192000, 0x063dbff3
+0,         16,         16,        1,   192000, 0xb3cc8b65
+0,         17,         17,        1,   192000, 0x6f164685
 1,      13505,      13505,      740,     1480, 0xba279597
-0,         77,         77,        1,   192000, 0x5280852f
 1,      14245,      14245,      740,     1480, 0xc5a38a9e
-0,         81,         81,        1,   192000, 0x99943a8f
+0,         18,         18,        1,   192000, 0x304917c9
 1,      14985,      14985,      925,     1850, 0x8147eef5
-0,         86,         86,        1,   192000, 0x0330a728
+0,         19,         19,        1,   192000, 0x8269daa1
+0,         20,         20,        1,   192000, 0x04d3500d
 1,      15910,      15910,      740,     1480, 0xce2c7cb5
-0,         90,         90,        1,   192000, 0x5d35467d
 1,      16650,      16650,      740,     1480, 0x4282819f
-0,         94,         94,        1,   192000, 0xfd436343
+0,         21,         21,        1,   192000, 0x9788f7a5
 1,      17390,      17390,      740,     1480, 0xbdbb8da6
-0,         98,         98,        1,   192000, 0xc323fcfe
+0,         22,         22,        1,   192000, 0x05351c98
 1,      18130,      18130,      925,     1850, 0xdbbeea10
-0,        103,        103,        1,   192000, 0x2a1530a0
+0,         23,         23,        1,   192000, 0xcc8bba97
+0,         24,         24,        1,   192000, 0x76caf27b
 1,      19055,      19055,      740,     1480, 0xbe6a77c2
-0,        107,        107,        1,   192000, 0xbd43bb60
 1,      19795,      19795,      740,     1480, 0xa85c75b2
-0,        111,        111,        1,   192000, 0xa47f5eab
+0,         25,         25,        1,   192000, 0x28648040
 1,      20535,      20535,      925,     1850, 0xa45bde21
-0,        116,        116,        1,   192000, 0xff17f5f7
+0,         26,         26,        1,   192000, 0x99ea251f
+0,         27,         27,        1,   192000, 0x20e7bf4d
 1,      21460,      21460,      740,     1480, 0x84aa7895
-0,        120,        120,        1,   192000, 0xb4140b55
 1,      22200,      22200,      740,     1480, 0x147f7d9f
-0,        124,        124,        1,   192000, 0xb8782cc4
+0,         28,         28,        1,   192000, 0x046ed625
 1,      22940,      22940,      740,     1480, 0xc8e77b85
-0,        128,        128,        1,   192000, 0x92975b8b
+0,         29,         29,        1,   192000, 0x1613fb12
 1,      23680,      23680,      925,     1850, 0x10d4d81b
-0,        133,        133,        1,   192000, 0xf42a64d6
+0,         30,         30,        1,   192000, 0xd8b52d16
+0,         31,         31,        1,   192000, 0x31443aa9
 1,      24605,      24605,      740,     1480, 0xb4ae8bb1
-0,        137,        137,        1,   192000, 0x2cc7077d
 1,      25345,      25345,      740,     1480, 0x3ef782a5
-0,        141,        141,        1,   192000, 0x00080cc8
+0,         32,         32,        1,   192000, 0xd426de3d
 1,      26085,      26085,      925,     1850, 0xdeebda14
-0,        146,        146,        1,   192000, 0x584b48f3
+0,         33,         33,        1,   192000, 0xb2bce77b
+0,         34,         34,        1,   192000, 0x25a52805
 1,      27010,      27010,      740,     1480, 0x4c7e7bbb
-0,        150,        150,        1,   192000, 0xd68f57da
 1,      27750,      27750,      740,     1480, 0x0e0e9198
-0,        154,        154,        1,   192000, 0x60158422
+0,         35,         35,        1,   192000, 0x04f03a87
 1,      28490,      28490,      740,     1480, 0x5c1f819f
-0,        158,        158,        1,   192000, 0xd7fb89e6
+0,         36,         36,        1,   192000, 0x41d56889
 1,      29230,      29230,      925,     1850, 0x0e4cf6ff
-0,        163,        163,        1,   192000, 0x97f1c76a
+0,         37,         37,        1,   192000, 0x3d4d6de9
 1,      30155,      30155,      740,     1480, 0x374388a7
-0,        167,        167,        1,   192000, 0x46c4bb9e
+0,         38,         38,        1,   192000, 0xa7a2abfe
 1,      30895,      30895,      740,     1480, 0xed729389
-0,        171,        171,        1,   192000, 0xd32f9b66
+0,         39,         39,        1,   192000, 0x663e9fca
 1,      31635,      31635,      925,     1850, 0xe0f1e43f
-0,        176,        176,        1,   192000, 0x74f43886
+0,         40,         40,        1,   192000, 0x29a67f86
+0,         41,         41,        1,   192000, 0x51531bb0
 1,      32560,      32560,      740,     1480, 0x3b27839a
-0,        180,        180,        1,   192000, 0x3c4e47df
 1,      33300,      33300,      740,     1480, 0xe6287e94
-0,        184,        184,        1,   192000, 0xb5ac0a58
+0,         42,         42,        1,   192000, 0xd993277e
 1,      34040,      34040,      740,     1480, 0x7e0d84b5
-0,        188,        188,        1,   192000, 0xcc572b31
+0,         43,         43,        1,   192000, 0x4873e583
 1,      34780,      34780,      925,     1850, 0xf08bebf7
-0,        193,        193,        1,   192000, 0xb1739d26
+0,         44,         44,        1,   192000, 0x06df053b
 1,      35705,      35705,      740,     1480, 0x94cf73a0
-0,        197,        197,        1,   192000, 0x73da5473
+0,         45,         45,        1,   192000, 0x044f7698
 1,      36445,      36445,      740,     1480, 0xfef384ae
-0,        201,        201,        1,   192000, 0x5f79f5bc
+0,         46,         46,        1,   192000, 0xc2302a45
 1,      37185,      37185,      925,     1850, 0x3b93e0f7
-0,        206,        206,        1,   192000, 0x0affc0a0
+0,         47,         47,        1,   192000, 0xbdfec8ee
+0,         48,         48,        1,   192000, 0x3b739286
 1,      38110,      38110,      740,     1480, 0x28d27bae
-0,        210,        210,        1,   192000, 0x2b4d5c1c
 1,      38850,      38850,      740,     1480, 0x94d57da5
-0,        214,        214,        1,   192000, 0x309b41bc
+0,         49,         49,        1,   192000, 0x3ca82cd6
 1,      39590,      39590,      740,     1480, 0xc9327db5
-0,        218,        218,        1,   192000, 0xd42b6424
+0,         50,         50,        1,   192000, 0x25af10f2
 1,      40330,      40330,      925,     1850, 0xe781f604
-0,        223,        223,        1,   192000, 0x4795c948
+0,         51,         51,        1,   192000, 0x09ce32bf
 1,      41255,      41255,      740,     1480, 0x752f8c5b
-0,        227,        227,        1,   192000, 0xbc1a3a8b
+0,         52,         52,        1,   192000, 0xdab399c2
 1,      41995,      41995,      740,     1480, 0x30068032
-0,        231,        231,        1,   192000, 0x16529c5b
+0,         53,         53,        1,   192000, 0x77400d93
 1,      42735,      42735,      925,     1850, 0x7895023e
-0,        236,        236,        1,   192000, 0x6b1b31ba
+0,         54,         54,        1,   192000, 0x5e8e6fe7
+0,         55,         55,        1,   192000, 0x277506c9
 1,      43660,      43660,      740,     1480, 0xa1e0a6e1
-0,        240,        240,        1,   192000, 0x569182ce
 1,      44400,      44400,      740,     1480, 0x6af4b500
-0,        244,        244,        1,   192000, 0xe6ea9866
+0,         56,         56,        1,   192000, 0xe91b59ac
 1,      45140,      45140,      740,     1480, 0xc26ea4c7
-0,        248,        248,        1,   192000, 0x102c6076
+0,         57,         57,        1,   192000, 0xc2aa6e19
 1,      45880,      45880,      925,     1850, 0x16a72419
-0,        253,        253,        1,   192000, 0xb29f527a
+0,         58,         58,        1,   192000, 0x12c63645
 1,      46805,      46805,      740,     1480, 0x1794aacc
-0,        257,        257,        1,   192000, 0x040b4eee
+0,         59,         59,        1,   192000, 0xa39f27d6
 1,      47545,      47545,      740,     1480, 0x2ecad8d0
-0,        261,        261,        1,   192000, 0x92574f4a
+0,         60,         60,        1,   192000, 0x20c32512
 1,      48285,      48285,      925,     1850, 0x2e645e07
-0,        266,        266,        1,   192000, 0x1e8acdce
+0,         61,         61,        1,   192000, 0x385a26a0
+0,         62,         62,        1,   192000, 0x2566a70c
 1,      49210,      49210,      740,     1480, 0x1c54dfe7
-0,        270,        270,        1,   192000, 0x1becf516
 1,      49950,      49950,      740,     1480, 0xbd35feec
-0,        274,        274,        1,   192000, 0xb62e9776
+0,         63,         63,        1,   192000, 0x7105cfb9
 1,      50690,      50690,      740,     1480, 0x419403d6
-0,        278,        278,        1,   192000, 0xed37a08e
+0,         64,         64,        1,   192000, 0x725671a2
 1,      51430,      51430,      925,     1850, 0x78699d2a
-0,        283,        283,        1,   192000, 0xc0719912
+0,         65,         65,        1,   192000, 0x3ff2782a
 1,      52355,      52355,      740,     1480, 0x74ec68e0
-0,        287,        287,        1,   192000, 0x24cf7a7e
+0,         66,         66,        1,   192000, 0xdc0571c3
 1,      53095,      53095,      740,     1480, 0x76af64d9
-0,        291,        291,        1,   192000, 0x0307f62f
+0,         67,         67,        1,   192000, 0x4a6a5405
 1,      53835,      53835,      925,     1850, 0x5a303d1a
-0,        296,        296,        1,   192000, 0x79b7417b
+0,         68,         68,        1,   192000, 0x3ec3cce1
 1,      54760,      54760,      537,     1074, 0x142ce7ba
+0,         69,         69,        1,   192000, 0x159313a8
 1,      55297,      55297,      258,      516, 0x98885b26
diff --git a/tests/ref/fate/bfi b/tests/ref/fate/bfi
index 0d3d8f2b0a..277c93543e 100644
--- a/tests/ref/fate/bfi
+++ b/tests/ref/fate/bfi
@@ -1,5 +1,14 @@
 #tb 0: 1/9
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x140
+#sar 0: 0/1
 #tb 1: 1/11025
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 11025
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   134400, 0xc218b00c
 1,          0,          0,     8884,    17768, 0x07df135c
 0,          1,          1,        1,   134400, 0x114daf7c
diff --git a/tests/ref/fate/bfstm b/tests/ref/fate/bfstm
new file mode 100644
index 0000000000..4696ca67f9
--- /dev/null
+++ b/tests/ref/fate/bfstm
@@ -0,0 +1 @@
+CRC=0xbd3d0d33
diff --git a/tests/ref/fate/bink-video-b b/tests/ref/fate/bink-video-b
index c772eda288..663457a3f1 100644
--- a/tests/ref/fate/bink-video-b
+++ b/tests/ref/fate/bink-video-b
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x116
+#sar 0: 0/1
 0,          0,          0,        1,    34800, 0x4fd0a8e4
 0,          1,          1,        1,    34800, 0xd381a7b7
 0,          2,          2,        1,    34800, 0x688ca315
diff --git a/tests/ref/fate/bink-video-f b/tests/ref/fate/bink-video-f
index 40bc5a929e..912ceedaf9 100644
--- a/tests/ref/fate/bink-video-f
+++ b/tests/ref/fate/bink-video-f
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   460800, 0xb06f7841
 0,          1,          1,        1,   460800, 0x7ed06412
 0,          2,          2,        1,   460800, 0xe82b5c3d
diff --git a/tests/ref/fate/bink-video-i b/tests/ref/fate/bink-video-i
index 32c5e10ec1..0d67e98aa3 100644
--- a/tests/ref/fate/bink-video-i
+++ b/tests/ref/fate/bink-video-i
@@ -1,4 +1,8 @@
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   460800, 0xaef133d9
 0,          1,          1,        1,   460800, 0x2da1248b
 0,          2,          2,        1,   460800, 0x3d7945b4
diff --git a/tests/ref/fate/binsub-mksenc b/tests/ref/fate/binsub-mksenc
new file mode 100644
index 0000000000..f247d9d22d
--- /dev/null
+++ b/tests/ref/fate/binsub-mksenc
@@ -0,0 +1 @@
+f80f42e646fce972e73aa6d99dcfa470
diff --git a/tests/ref/fate/binsub-movtextenc b/tests/ref/fate/binsub-movtextenc
new file mode 100644
index 0000000000..22ee85a2f8
--- /dev/null
+++ b/tests/ref/fate/binsub-movtextenc
@@ -0,0 +1 @@
+af6a8f38d7c11d9af7823cc44554d2ad
diff --git a/tests/ref/fate/bmp-15bit b/tests/ref/fate/bmp-15bit
index a0f3bbf1db..29b6335b2d 100644
--- a/tests/ref/fate/bmp-15bit
+++ b/tests/ref/fate/bmp-15bit
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    16256, 0xdbcf881d
diff --git a/tests/ref/fate/bmp-15bit-mask b/tests/ref/fate/bmp-15bit-mask
index a0f3bbf1db..29b6335b2d 100644
--- a/tests/ref/fate/bmp-15bit-mask
+++ b/tests/ref/fate/bmp-15bit-mask
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    16256, 0xdbcf881d
diff --git a/tests/ref/fate/bmp-16bit-mask b/tests/ref/fate/bmp-16bit-mask
index afa5ab4591..8760ff8d60 100644
--- a/tests/ref/fate/bmp-16bit-mask
+++ b/tests/ref/fate/bmp-16bit-mask
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    16256, 0x44675948
diff --git a/tests/ref/fate/bmp-1bit b/tests/ref/fate/bmp-1bit
index 1c825b1498..a40328f8ca 100644
--- a/tests/ref/fate/bmp-1bit
+++ b/tests/ref/fate/bmp-1bit
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0x4c968301
diff --git a/tests/ref/fate/bmp-24bit b/tests/ref/fate/bmp-24bit
index 8f1a615a9c..6394d2f59c 100644
--- a/tests/ref/fate/bmp-24bit
+++ b/tests/ref/fate/bmp-24bit
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0x325dd8d9
diff --git a/tests/ref/fate/bmp-32bit b/tests/ref/fate/bmp-32bit
index 8f1a615a9c..6394d2f59c 100644
--- a/tests/ref/fate/bmp-32bit
+++ b/tests/ref/fate/bmp-32bit
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0x325dd8d9
diff --git a/tests/ref/fate/bmp-32bit-mask b/tests/ref/fate/bmp-32bit-mask
index 8f1a615a9c..6394d2f59c 100644
--- a/tests/ref/fate/bmp-32bit-mask
+++ b/tests/ref/fate/bmp-32bit-mask
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0x325dd8d9
diff --git a/tests/ref/fate/bmp-4bit b/tests/ref/fate/bmp-4bit
index c0eedf1948..b4262c9bf6 100644
--- a/tests/ref/fate/bmp-4bit
+++ b/tests/ref/fate/bmp-4bit
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0x322d81f4
diff --git a/tests/ref/fate/bmp-4bit-os2 b/tests/ref/fate/bmp-4bit-os2
index 8a5f6589c2..9cf9cf0e50 100644
--- a/tests/ref/fate/bmp-4bit-os2
+++ b/tests/ref/fate/bmp-4bit-os2
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 300x22
+#sar 0: 0/1
 0,          0,          0,        1,    19800, 0x563b599a
diff --git a/tests/ref/fate/bmp-8bit b/tests/ref/fate/bmp-8bit
index 887113cdb5..3ecea53d6b 100644
--- a/tests/ref/fate/bmp-8bit
+++ b/tests/ref/fate/bmp-8bit
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0xa7aa6b9b
diff --git a/tests/ref/fate/bmp-8bit-os2 b/tests/ref/fate/bmp-8bit-os2
index 887113cdb5..3ecea53d6b 100644
--- a/tests/ref/fate/bmp-8bit-os2
+++ b/tests/ref/fate/bmp-8bit-os2
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0xa7aa6b9b
diff --git a/tests/ref/fate/bmp-rle4 b/tests/ref/fate/bmp-rle4
index c0eedf1948..b4262c9bf6 100644
--- a/tests/ref/fate/bmp-rle4
+++ b/tests/ref/fate/bmp-rle4
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0x322d81f4
diff --git a/tests/ref/fate/bmp-rle8 b/tests/ref/fate/bmp-rle8
index 887113cdb5..3ecea53d6b 100644
--- a/tests/ref/fate/bmp-rle8
+++ b/tests/ref/fate/bmp-rle8
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x64
+#sar 0: 0/1
 0,          0,          0,        1,    24384, 0xa7aa6b9b
diff --git a/tests/ref/fate/bmpparser b/tests/ref/fate/bmpparser
index e7022b1cab..9340743c6f 100644
--- a/tests/ref/fate/bmpparser
+++ b/tests/ref/fate/bmpparser
@@ -1,5 +1,9 @@
 #tb 0: 1/25
-0,          0,          0,        1,   203280, 0x47c3e3a0
-0,          1,          1,        1,   203280, 0x6494c4db
-0,          2,          2,        1,   203280, 0x042fe3a0
-0,          3,          3,        1,   203280, 0xba9be3a0
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 40x30
+#sar 0: 0/1
+0,          0,          0,        1,     3600, 0xd3a7c583
+0,          1,          1,        1,     3600, 0x4602bbf9
+0,          2,          2,        1,     3600, 0x3a96b8f8
+0,          3,          3,        1,     3600, 0xb343b17f
diff --git a/tests/ref/fate/bmv-audio b/tests/ref/fate/bmv-audio
index 746bb0cd7a..6e1a4c2fe9 100644
--- a/tests/ref/fate/bmv-audio
+++ b/tests/ref/fate/bmv-audio
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1856,     7424, 0x18540b36
 0,       1856,       1856,     1824,     7296, 0x5acd2484
 0,       3680,       3680,     1856,     7424, 0xa1bc5c5a
diff --git a/tests/ref/fate/bmv-video b/tests/ref/fate/bmv-video
index f19cd45edc..d360d58c16 100644
--- a/tests/ref/fate/bmv-video
+++ b/tests/ref/fate/bmv-video
@@ -1,4 +1,8 @@
 #tb 0: 1/12
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x429
+#sar 0: 0/1
 0,          0,          0,        1,   823680, 0xddb8a306
 0,          1,          1,        1,   823680, 0xa95375c8
 0,          2,          2,        1,   823680, 0xa95375c8
diff --git a/tests/ref/fate/bprint b/tests/ref/fate/bprint
new file mode 100644
index 0000000000..b33c1ae6e7
--- /dev/null
+++ b/tests/ref/fate/bprint
@@ -0,0 +1,16 @@
+Short text in unlimited buffer: 174/174
+       1
+       1       1
+       1       2       1
+       1       3       3       1
+       1       4       6       4       1
+       1       5      10      10       5       1
+
+Long text in unlimited buffer: 2834/2834
+Long text in limited buffer: 2047/2834
+Short text in automatic buffer: 174/174
+Long text in automatic buffer: 1000/2834
+Long text count only buffer: 0/2834
+Long text count only buffer: 255/2834
+strftime full: 255/10 "2000-12-20"
+strftime truncated: 255/10 "2000-12"
diff --git a/tests/ref/fate/brenderpix-24 b/tests/ref/fate/brenderpix-24
index 32b29a042d..be81fc2387 100644
--- a/tests/ref/fate/brenderpix-24
+++ b/tests/ref/fate/brenderpix-24
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    32768, 0x18bc6caa
diff --git a/tests/ref/fate/brenderpix-565 b/tests/ref/fate/brenderpix-565
index c243a4cf5a..bc92766f58 100644
--- a/tests/ref/fate/brenderpix-565
+++ b/tests/ref/fate/brenderpix-565
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    32768, 0xfd855dda
diff --git a/tests/ref/fate/brenderpix-defpal b/tests/ref/fate/brenderpix-defpal
index 6c55740885..c5632ae744 100644
--- a/tests/ref/fate/brenderpix-defpal
+++ b/tests/ref/fate/brenderpix-defpal
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 0/1
 0,          0,          0,        1,   196608, 0xada11d14
diff --git a/tests/ref/fate/brenderpix-intpal b/tests/ref/fate/brenderpix-intpal
index 473b1532ec..789c87d024 100644
--- a/tests/ref/fate/brenderpix-intpal
+++ b/tests/ref/fate/brenderpix-intpal
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 0/1
 0,          0,          0,        1,   196608, 0x9662f917
diff --git a/tests/ref/fate/brenderpix-y400a b/tests/ref/fate/brenderpix-y400a
index 00e154009d..1f7c8db916 100644
--- a/tests/ref/fate/brenderpix-y400a
+++ b/tests/ref/fate/brenderpix-y400a
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x96
+#sar 0: 0/1
 0,          0,          0,        1,     3072, 0x48280456
diff --git a/tests/ref/fate/brstm b/tests/ref/fate/brstm
new file mode 100644
index 0000000000..d183b3f46a
--- /dev/null
+++ b/tests/ref/fate/brstm
@@ -0,0 +1 @@
+CRC=0x1feb92a8
diff --git a/tests/ref/fate/canopus-cllc-argb b/tests/ref/fate/canopus-cllc-argb
index 4a5dce56db..bab7ed79ee 100644
--- a/tests/ref/fate/canopus-cllc-argb
+++ b/tests/ref/fate/canopus-cllc-argb
@@ -1,4 +1,8 @@
 #tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 1/1
 0,          0,          0,        1,  3686400, 0xb37a6e69
 0,          1,          1,        1,  3686400, 0x66a45032
 0,          2,          2,        1,  3686400, 0xdf0c861f
diff --git a/tests/ref/fate/canopus-cllc-rgb b/tests/ref/fate/canopus-cllc-rgb
index b4ca0553db..e9f54d1a41 100644
--- a/tests/ref/fate/canopus-cllc-rgb
+++ b/tests/ref/fate/canopus-cllc-rgb
@@ -1,4 +1,8 @@
 #tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 1/1
 0,          0,          0,        1,   921600, 0x82e44cb9
 0,          1,          1,        1,   921600, 0x6ecc8a6c
 0,          2,          2,        1,   921600, 0x0dc31839
diff --git a/tests/ref/fate/canopus-cllc-yuy2-noblock b/tests/ref/fate/canopus-cllc-yuy2-noblock
index 6ad59d504a..6242a82966 100644
--- a/tests/ref/fate/canopus-cllc-yuy2-noblock
+++ b/tests/ref/fate/canopus-cllc-yuy2-noblock
@@ -1,4 +1,8 @@
 #tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 1/1
 0,          0,          0,        1,   614400, 0x088c51de
 0,          1,          1,        1,   614400, 0x93fff662
 0,          2,          2,        1,   614400, 0x90ba6c28
diff --git a/tests/ref/fate/canopus-hq_hqa-hq b/tests/ref/fate/canopus-hq_hqa-hq
index ca376dc7b4..657e1e1457 100644
--- a/tests/ref/fate/canopus-hq_hqa-hq
+++ b/tests/ref/fate/canopus-hq_hqa-hq
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 64/45
 0,          0,          0,        1,   829440, 0x8b6b2f6d
 0,          1,          1,        1,   829440, 0x70382bf0
 0,          2,          2,        1,   829440, 0xbfdf1f8d
diff --git a/tests/ref/fate/canopus-hq_hqa-hqa b/tests/ref/fate/canopus-hq_hqa-hqa
index 0996500884..1fd5bf7723 100644
--- a/tests/ref/fate/canopus-hq_hqa-hqa
+++ b/tests/ref/fate/canopus-hq_hqa-hqa
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
 0,          0,          0,        1,  6220800, 0x2b2b17cc
diff --git a/tests/ref/fate/canopus-hq_hqa-inter b/tests/ref/fate/canopus-hq_hqa-inter
index 2880c95427..e4bbb5ec24 100644
--- a/tests/ref/fate/canopus-hq_hqa-inter
+++ b/tests/ref/fate/canopus-hq_hqa-inter
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
 0,          0,          0,        1,  4147200, 0x418ecfe5
diff --git a/tests/ref/fate/canopus-hqx422 b/tests/ref/fate/canopus-hqx422
index 2e1fdf1bfd..5501abd888 100644
--- a/tests/ref/fate/canopus-hqx422
+++ b/tests/ref/fate/canopus-hqx422
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 64/45
 0,          0,          0,        1,  1658880, 0x823fcbac
diff --git a/tests/ref/fate/canopus-hqx422a b/tests/ref/fate/canopus-hqx422a
index 0fd25774f0..e22af120ba 100644
--- a/tests/ref/fate/canopus-hqx422a
+++ b/tests/ref/fate/canopus-hqx422a
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
 0,          0,          0,        1,  8294400, 0x9a22bebf
diff --git a/tests/ref/fate/cavs b/tests/ref/fate/cavs
index c96468a27b..ddcbe04d15 100644
--- a/tests/ref/fate/cavs
+++ b/tests/ref/fate/cavs
@@ -1,171 +1,175 @@
-#tb 0: 1/90000
-0,          0,          0,        0,   622080, 0x76183b91
-0,       3624,       3624,        0,   622080, 0x2ca5e808
-0,       7248,       7248,        0,   622080, 0xc503eda4
-0,      10872,      10872,        0,   622080, 0xa0dbf06c
-0,      14496,      14496,        0,   622080, 0xf4363cfa
-0,      18120,      18120,        0,   622080, 0xaa7dd9b8
-0,      21744,      21744,        0,   622080, 0x3ab6223b
-0,      25368,      25368,        0,   622080, 0xe402644b
-0,      28992,      28992,        0,   622080, 0xd0da3ade
-0,      32616,      32616,        0,   622080, 0x0aff6151
-0,      36240,      36240,        0,   622080, 0x02aea3d5
-0,      39864,      39864,        0,   622080, 0x5d8eeccd
-0,      43488,      43488,        0,   622080, 0x54384735
-0,      47112,      47112,        0,   622080, 0x890d71c2
-0,      50736,      50736,        0,   622080, 0xc60ae25b
-0,      54360,      54360,        0,   622080, 0xe589e774
-0,      57984,      57984,        0,   622080, 0x03471e74
-0,      61608,      61608,        0,   622080, 0x4e22302c
-0,      65232,      65232,        0,   622080, 0x00333583
-0,      68856,      68856,        0,   622080, 0xd6eae7d9
-0,      72480,      72480,        0,   622080, 0x72fe94f7
-0,      76104,      76104,        0,   622080, 0x3ebbad1e
-0,      79728,      79728,        0,   622080, 0x2fb1de4b
-0,      83352,      83352,        0,   622080, 0x3bfea6d2
-0,      86976,      86976,        0,   622080, 0x0fb551b2
-0,      90600,      90600,        0,   622080, 0xb203284f
-0,      94224,      94224,        0,   622080, 0xb3baac30
-0,      97200,      97200,        0,   622080, 0x15f2c1c7
-0,     100824,     100824,        0,   622080, 0xb2b530ce
-0,     104448,     104448,        0,   622080, 0xbbaaf241
-0,     108072,     108072,        0,   622080, 0x01bc9dfc
-0,     111696,     111696,        0,   622080, 0x8a449a42
-0,     115320,     115320,        0,   622080, 0xdc63d73f
-0,     118944,     118944,        0,   622080, 0xf06bc231
-0,     122568,     122568,        0,   622080, 0x19e04295
-0,     126192,     126192,        0,   622080, 0x1e7d1acd
-0,     129816,     129816,        0,   622080, 0x43878b48
-0,     133440,     133440,        0,   622080, 0xcd94b702
-0,     137064,     137064,        0,   622080, 0xd2706cf1
-0,     140688,     140688,        0,   622080, 0x47d636f3
-0,     144312,     144312,        0,   622080, 0x4a516acc
-0,     147936,     147936,        0,   622080, 0x52b7d89a
-0,     151560,     151560,        0,   622080, 0xc9ba03be
-0,     155184,     155184,        0,   622080, 0x6d17785e
-0,     158808,     158808,        0,   622080, 0x8264871b
-0,     162432,     162432,        0,   622080, 0xd59c84c0
-0,     166056,     166056,        0,   622080, 0x2b86d6cd
-0,     169680,     169680,        0,   622080, 0x9c5a5f51
-0,     173304,     173304,        0,   622080, 0x221f79ca
-0,     176928,     176928,        0,   622080, 0x98edb3ec
-0,     180552,     180552,        0,   622080, 0x9a31262c
-0,     184176,     184176,        0,   622080, 0x18f48378
-0,     187800,     187800,        0,   622080, 0x957c3d9c
-0,     191424,     191424,        0,   622080, 0x9cc6866e
-0,     195048,     195048,        0,   622080, 0x45613726
-0,     198672,     198672,        0,   622080, 0x7a6c5e65
-0,     202296,     202296,        0,   622080, 0x976d7a11
-0,     205200,     205200,        0,   622080, 0x192aea08
-0,     208824,     208824,        0,   622080, 0x8d4fc823
-0,     212448,     212448,        0,   622080, 0x1f9c55d7
-0,     216072,     216072,        0,   622080, 0xd4336d41
-0,     219696,     219696,        0,   622080, 0x7aa650cd
-0,     223320,     223320,        0,   622080, 0x8efaaeb1
-0,     226944,     226944,        0,   622080, 0x3d8c3053
-0,     230568,     230568,        0,   622080, 0x1e2b64b0
-0,     234192,     234192,        0,   622080, 0x0436b1a7
-0,     237816,     237816,        0,   622080, 0xc5120072
-0,     241440,     241440,        0,   622080, 0x0203b245
-0,     245064,     245064,        0,   622080, 0x9815582b
-0,     248688,     248688,        0,   622080, 0x3c60c359
-0,     252312,     252312,        0,   622080, 0x1a26b948
-0,     255936,     255936,        0,   622080, 0x56079812
-0,     259560,     259560,        0,   622080, 0x7b192a55
-0,     263184,     263184,        0,   622080, 0x335632ab
-0,     266808,     266808,        0,   622080, 0xd0c12eb8
-0,     270432,     270432,        0,   622080, 0x93bf46cb
-0,     274056,     274056,        0,   622080, 0xce67ce24
-0,     277680,     277680,        0,   622080, 0xff95bb26
-0,     281304,     281304,        0,   622080, 0x5e750705
-0,     284928,     284928,        0,   622080, 0x45a35725
-0,     288552,     288552,        0,   622080, 0xd8e93c39
-0,     292176,     292176,        0,   622080, 0xa9f8db50
-0,     295800,     295800,        0,   622080, 0xf90a862e
-0,     299424,     299424,        0,   622080, 0x5e5a4216
-0,     303048,     303048,        0,   622080, 0xaaf45ed6
-0,     306672,     306672,        0,   622080, 0x1933cda5
-0,     310296,     310296,        0,   622080, 0x7ff68d91
-0,     313200,     313200,        0,   622080, 0x10038fe9
-0,     316824,     316824,        0,   622080, 0x9b3425a6
-0,     320448,     320448,        0,   622080, 0x8d2a141d
-0,     324072,     324072,        0,   622080, 0x698a333e
-0,     327696,     327696,        0,   622080, 0x334685d1
-0,     331320,     331320,        0,   622080, 0x40317d40
-0,     334944,     334944,        0,   622080, 0xd3c6f519
-0,     338568,     338568,        0,   622080, 0xfc2210c2
-0,     342192,     342192,        0,   622080, 0x3761df34
-0,     345816,     345816,        0,   622080, 0xef25462a
-0,     349440,     349440,        0,   622080, 0x0fd38121
-0,     353064,     353064,        0,   622080, 0x184856a6
-0,     356688,     356688,        0,   622080, 0xc57c9f12
-0,     360312,     360312,        0,   622080, 0x39874291
-0,     363936,     363936,        0,   622080, 0x7c13cec4
-0,     367560,     367560,        0,   622080, 0xc4192a76
-0,     371184,     371184,        0,   622080, 0x2af404e3
-0,     374808,     374808,        0,   622080, 0x1ee18f41
-0,     378432,     378432,        0,   622080, 0xfb4d9ee5
-0,     382056,     382056,        0,   622080, 0x50aae4ff
-0,     385680,     385680,        0,   622080, 0x030f91fe
-0,     389304,     389304,        0,   622080, 0x3a3ee08c
-0,     392928,     392928,        0,   622080, 0x50121423
-0,     396552,     396552,        0,   622080, 0xda39e2d6
-0,     400176,     400176,        0,   622080, 0x9e13ccd6
-0,     403800,     403800,        0,   622080, 0xb72a22a7
-0,     407424,     407424,        0,   622080, 0xb76904d5
-0,     411048,     411048,        0,   622080, 0xcffa04a8
-0,     414672,     414672,        0,   622080, 0x2984bf3f
-0,     418296,     418296,        0,   622080, 0x274b5778
-0,     421200,     421200,        0,   622080, 0xf059413a
-0,     424824,     424824,        0,   622080, 0x969fae57
-0,     428448,     428448,        0,   622080, 0x75c29097
-0,     432072,     432072,        0,   622080, 0x2bf3b07d
-0,     435696,     435696,        0,   622080, 0x9f43271d
-0,     439320,     439320,        0,   622080, 0x67bf23f3
-0,     442944,     442944,        0,   622080, 0xa8edcf33
-0,     446568,     446568,        0,   622080, 0x17a0789e
-0,     450192,     450192,        0,   622080, 0x14b67cc7
-0,     453816,     453816,        0,   622080, 0x779215cd
-0,     457440,     457440,        0,   622080, 0x8b460a21
-0,     461064,     461064,        0,   622080, 0x0502ad7d
-0,     464688,     464688,        0,   622080, 0x6860678f
-0,     468312,     468312,        0,   622080, 0xe180469e
-0,     471936,     471936,        0,   622080, 0x9a992835
-0,     475560,     475560,        0,   622080, 0x2efafa33
-0,     479184,     479184,        0,   622080, 0xe24e59b2
-0,     482808,     482808,        0,   622080, 0xfb774d53
-0,     486432,     486432,        0,   622080, 0x3de4ea81
-0,     490056,     490056,        0,   622080, 0xaf9aa1d6
-0,     493680,     493680,        0,   622080, 0xa0e3722f
-0,     497304,     497304,        0,   622080, 0x81684492
-0,     500928,     500928,        0,   622080, 0xa4e971fb
-0,     504552,     504552,        0,   622080, 0x4a1903c8
-0,     508176,     508176,        0,   622080, 0x26304e4a
-0,     511800,     511800,        0,   622080, 0x867983a4
-0,     515424,     515424,        0,   622080, 0x2e7e4d13
-0,     519048,     519048,        0,   622080, 0x736f4682
-0,     522672,     522672,        0,   622080, 0x426a95fa
-0,     526296,     526296,        0,   622080, 0x2bc8850c
-0,     529200,     529200,        0,   622080, 0x047e77ab
-0,     532824,     532824,        0,   622080, 0x414ab77f
-0,     536448,     536448,        0,   622080, 0x42681090
-0,     540072,     540072,        0,   622080, 0x80744ccb
-0,     543696,     543696,        0,   622080, 0x50e2ecc0
-0,     547320,     547320,        0,   622080, 0x5c9fe70e
-0,     550944,     550944,        0,   622080, 0x016461ee
-0,     554568,     554568,        0,   622080, 0xd42f019a
-0,     558192,     558192,        0,   622080, 0x8171bf41
-0,     561816,     561816,        0,   622080, 0xf4d8ef7e
-0,     565440,     565440,        0,   622080, 0xf2d513c8
-0,     569064,     569064,        0,   622080, 0xb5b07704
-0,     572688,     572688,        0,   622080, 0x2168a07a
-0,     576312,     576312,        0,   622080, 0x840418f9
-0,     579936,     579936,        0,   622080, 0xd36f1b7c
-0,     583560,     583560,        0,   622080, 0x52532604
-0,     587184,     587184,        0,   622080, 0x0856d6eb
-0,     590808,     590808,        0,   622080, 0x21748734
-0,     594432,     594432,        0,   622080, 0xbd315c05
-0,     598056,     598056,        0,   622080, 0x1cea8103
-0,     601680,     601680,        0,   622080, 0x71f6e3cb
-0,     605304,     605304,        0,   622080, 0xb12d7aa7
-0,     608928,     608928,        0,   622080, 0x549b2acb
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 0/1
+0,          0,          0,        1,   622080, 0x2276bc78
+0,          1,          1,        1,   622080, 0xda1f698a
+0,          2,          2,        1,   622080, 0xb9907023
+0,          3,          3,        1,   622080, 0xc1c05e44
+0,          4,          4,        1,   622080, 0x9366d0a7
+0,          5,          5,        1,   622080, 0xbf92812d
+0,          6,          6,        1,   622080, 0xd6b1cb3e
+0,          7,          7,        1,   622080, 0x8be011f6
+0,          8,          8,        1,   622080, 0xfde1f1de
+0,          9,          9,        1,   622080, 0xabad03c3
+0,         10,         10,        1,   622080, 0x74204d0a
+0,         11,         11,        1,   622080, 0x220a9de9
+0,         12,         12,        1,   622080, 0x913be934
+0,         13,         13,        1,   622080, 0xab47295b
+0,         14,         14,        1,   622080, 0x1938afc3
+0,         15,         15,        1,   622080, 0x3a5fbe19
+0,         16,         16,        1,   622080, 0x8c15f517
+0,         17,         17,        1,   622080, 0x78410c15
+0,         18,         18,        1,   622080, 0xe2861423
+0,         19,         19,        1,   622080, 0x1dfac8aa
+0,         20,         20,        1,   622080, 0x07b57615
+0,         21,         21,        1,   622080, 0xe9558e77
+0,         22,         22,        1,   622080, 0x917abfc8
+0,         23,         23,        1,   622080, 0xe13d883b
+0,         24,         24,        1,   622080, 0x8abb3304
+0,         25,         25,        1,   622080, 0xc3f10a22
+0,         26,         26,        1,   622080, 0x0ecf8c84
+0,         27,         27,        1,   622080, 0xc3eba1dd
+0,         28,         28,        1,   622080, 0x147d28fd
+0,         29,         29,        1,   622080, 0xba0be99c
+0,         30,         30,        1,   622080, 0xa6d99d9e
+0,         31,         31,        1,   622080, 0xf173991c
+0,         32,         32,        1,   622080, 0x0779d637
+0,         33,         33,        1,   622080, 0xc1f8c139
+0,         34,         34,        1,   622080, 0x7d3a42fc
+0,         35,         35,        1,   622080, 0xcd621bc9
+0,         36,         36,        1,   622080, 0x03cc8d02
+0,         37,         37,        1,   622080, 0xac39b968
+0,         38,         38,        1,   622080, 0xb7896f8c
+0,         39,         39,        1,   622080, 0x57c4399d
+0,         40,         40,        1,   622080, 0xcdc16dc1
+0,         41,         41,        1,   622080, 0x9621db44
+0,         42,         42,        1,   622080, 0xd59d064c
+0,         43,         43,        1,   622080, 0x17a97e5d
+0,         44,         44,        1,   622080, 0xde7789e8
+0,         45,         45,        1,   622080, 0xf5708808
+0,         46,         46,        1,   622080, 0x5b94d8fd
+0,         47,         47,        1,   622080, 0x98bf5f8f
+0,         48,         48,        1,   622080, 0x92107bf6
+0,         49,         49,        1,   622080, 0x86a1b601
+0,         50,         50,        1,   622080, 0x9d7f28c0
+0,         51,         51,        1,   622080, 0x185a85bb
+0,         52,         52,        1,   622080, 0x10a34015
+0,         53,         53,        1,   622080, 0xea21890e
+0,         54,         54,        1,   622080, 0x9a64399a
+0,         55,         55,        1,   622080, 0x2bb460d2
+0,         56,         56,        1,   622080, 0x73ce7c21
+0,         57,         57,        1,   622080, 0x6289ebca
+0,         58,         58,        1,   622080, 0x63a2c57e
+0,         59,         59,        1,   622080, 0xaf5a5123
+0,         60,         60,        1,   622080, 0xcc3062c7
+0,         61,         61,        1,   622080, 0xac434664
+0,         62,         62,        1,   622080, 0x7d5fa464
+0,         63,         63,        1,   622080, 0xd2c4260a
+0,         64,         64,        1,   622080, 0xe2f95a6c
+0,         65,         65,        1,   622080, 0xe073a85a
+0,         66,         66,        1,   622080, 0x34b9f64b
+0,         67,         67,        1,   622080, 0x861da899
+0,         68,         68,        1,   622080, 0x611d4ed5
+0,         69,         69,        1,   622080, 0x3077b9de
+0,         70,         70,        1,   622080, 0x4dedaf9f
+0,         71,         71,        1,   622080, 0xe48d8e8b
+0,         72,         72,        1,   622080, 0x5db2207a
+0,         73,         73,        1,   622080, 0xf10128ab
+0,         74,         74,        1,   622080, 0xd8fd249e
+0,         75,         75,        1,   622080, 0x8f643cc2
+0,         76,         76,        1,   622080, 0xfe1cc433
+0,         77,         77,        1,   622080, 0x3af0b0f4
+0,         78,         78,        1,   622080, 0x4a75fcc8
+0,         79,         79,        1,   622080, 0x48874d71
+0,         80,         80,        1,   622080, 0x3eb5324f
+0,         81,         81,        1,   622080, 0xd7a7d172
+0,         82,         82,        1,   622080, 0x32a17c2a
+0,         83,         83,        1,   622080, 0xcf1137bb
+0,         84,         84,        1,   622080, 0x622e54a2
+0,         85,         85,        1,   622080, 0x0b73c385
+0,         86,         86,        1,   622080, 0x47f082fb
+0,         87,         87,        1,   622080, 0xe7e68540
+0,         88,         88,        1,   622080, 0x77551fde
+0,         89,         89,        1,   622080, 0xa70b0faf
+0,         90,         90,        1,   622080, 0x05ee3436
+0,         91,         91,        1,   622080, 0x2d2f86a9
+0,         92,         92,        1,   622080, 0x78b07e1f
+0,         93,         93,        1,   622080, 0x9714f5fc
+0,         94,         94,        1,   622080, 0x521d118c
+0,         95,         95,        1,   622080, 0x0102e005
+0,         96,         96,        1,   622080, 0x20b1470c
+0,         97,         97,        1,   622080, 0x828f8212
+0,         98,         98,        1,   622080, 0x6fbb57b5
+0,         99,         99,        1,   622080, 0x3b19a01f
+0,        100,        100,        1,   622080, 0x114d43b2
+0,        101,        101,        1,   622080, 0xeca5cfda
+0,        102,        102,        1,   622080, 0x8ca12ba6
+0,        103,        103,        1,   622080, 0xc11e061b
+0,        104,        104,        1,   622080, 0xca6c905a
+0,        105,        105,        1,   622080, 0x9c2ca00f
+0,        106,        106,        1,   622080, 0x8641e615
+0,        107,        107,        1,   622080, 0x90e1930f
+0,        108,        108,        1,   622080, 0xa2eae188
+0,        109,        109,        1,   622080, 0x9be41511
+0,        110,        110,        1,   622080, 0x4268e3b3
+0,        111,        111,        1,   622080, 0x69d0cdd5
+0,        112,        112,        1,   622080, 0x437223c2
+0,        113,        113,        1,   622080, 0x669205c5
+0,        114,        114,        1,   622080, 0x85f1059b
+0,        115,        115,        1,   622080, 0x1595c0a9
+0,        116,        116,        1,   622080, 0xa7fa58c4
+0,        117,        117,        1,   622080, 0x839c42c2
+0,        118,        118,        1,   622080, 0xfadaa4c1
+0,        119,        119,        1,   622080, 0xdbd08677
+0,        120,        120,        1,   622080, 0xbc529d52
+0,        121,        121,        1,   622080, 0x9c9013f3
+0,        122,        122,        1,   622080, 0x7ea9112f
+0,        123,        123,        1,   622080, 0xbb49bc2c
+0,        124,        124,        1,   622080, 0x18c9656f
+0,        125,        125,        1,   622080, 0x637f698e
+0,        126,        126,        1,   622080, 0x4f66028c
+0,        127,        127,        1,   622080, 0xaf1bf6eb
+0,        128,        128,        1,   622080, 0x22c19a51
+0,        129,        129,        1,   622080, 0x085d547a
+0,        130,        130,        1,   622080, 0x11143435
+0,        131,        131,        1,   622080, 0x3a6d15b9
+0,        132,        132,        1,   622080, 0xd380e7cb
+0,        133,        133,        1,   622080, 0xfd1247d5
+0,        134,        134,        1,   622080, 0xd0de3b55
+0,        135,        135,        1,   622080, 0xa876d813
+0,        136,        136,        1,   622080, 0xdc8d8f66
+0,        137,        137,        1,   622080, 0x3a8e5ffe
+0,        138,        138,        1,   622080, 0x1a8a31da
+0,        139,        139,        1,   622080, 0x7e975fba
+0,        140,        140,        1,   622080, 0x242ef158
+0,        141,        141,        1,   622080, 0xbcad3b81
+0,        142,        142,        1,   622080, 0x5db0701f
+0,        143,        143,        1,   622080, 0x4cbf3ab5
+0,        144,        144,        1,   622080, 0xed603395
+0,        145,        145,        1,   622080, 0xd098834b
+0,        146,        146,        1,   622080, 0x92b972e0
+0,        147,        147,        1,   622080, 0xdd4f64d5
+0,        148,        148,        1,   622080, 0x60b1a37b
+0,        149,        149,        1,   622080, 0xed6efdba
+0,        150,        150,        1,   622080, 0xa30235f6
+0,        151,        151,        1,   622080, 0x3419d5c3
+0,        152,        152,        1,   622080, 0x1adbd052
+0,        153,        153,        1,   622080, 0x88e14b04
+0,        154,        154,        1,   622080, 0xca66eada
+0,        155,        155,        1,   622080, 0xa6daa83c
+0,        156,        156,        1,   622080, 0x7ea4d899
+0,        157,        157,        1,   622080, 0x4929fce5
+0,        158,        158,        1,   622080, 0x3c2d6009
+0,        159,        159,        1,   622080, 0xa40e8949
+0,        160,        160,        1,   622080, 0x624801ea
+0,        161,        161,        1,   622080, 0x7877045d
+0,        162,        162,        1,   622080, 0x8dae0e94
+0,        163,        163,        1,   622080, 0xaed5bfd9
+0,        164,        164,        1,   622080, 0x17ab701c
+0,        165,        165,        1,   622080, 0x564f44e8
+0,        166,        166,        1,   622080, 0x05496a5d
+0,        167,        167,        1,   622080, 0xdcb4cee8
+0,        168,        168,        1,   622080, 0xb41172e5
+0,        169,        169,        1,   622080, 0x56c72478
diff --git a/tests/ref/fate/cbs-h264-AUD_MW_E b/tests/ref/fate/cbs-h264-AUD_MW_E
new file mode 100644
index 0000000000..f204792416
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-AUD_MW_E
@@ -0,0 +1 @@
+9b8884667eda0b9853bec631458686ce
diff --git a/tests/ref/fate/cbs-h264-BASQP1_Sony_C b/tests/ref/fate/cbs-h264-BASQP1_Sony_C
new file mode 100644
index 0000000000..c2185c770b
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-BASQP1_Sony_C
@@ -0,0 +1 @@
+00c52ae60bf9a41ae1145fbf5fea9838
diff --git a/tests/ref/fate/cbs-h264-CABACI3_Sony_B b/tests/ref/fate/cbs-h264-CABACI3_Sony_B
new file mode 100644
index 0000000000..59aeb72155
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-CABACI3_Sony_B
@@ -0,0 +1 @@
+2d94c80b858aec880530bad47afe3668
diff --git a/tests/ref/fate/cbs-h264-CVBS3_Sony_C b/tests/ref/fate/cbs-h264-CVBS3_Sony_C
new file mode 100644
index 0000000000..55f5e0b50e
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-CVBS3_Sony_C
@@ -0,0 +1 @@
+59ff1df9b25e80277cad4ad99e634df6
diff --git a/tests/ref/fate/cbs-h264-CVFC1_Sony_C b/tests/ref/fate/cbs-h264-CVFC1_Sony_C
new file mode 100644
index 0000000000..98004cf63c
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-CVFC1_Sony_C
@@ -0,0 +1 @@
+669f4f3d3ae35fa5a6f5c94e48776dcf
diff --git a/tests/ref/fate/cbs-h264-CVMANL1_TOSHIBA_B b/tests/ref/fate/cbs-h264-CVMANL1_TOSHIBA_B
new file mode 100644
index 0000000000..14aa45300d
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-CVMANL1_TOSHIBA_B
@@ -0,0 +1 @@
+0c1d9694df747cc4697caf866bd3051a
diff --git a/tests/ref/fate/cbs-h264-CVNLFI1_Sony_C b/tests/ref/fate/cbs-h264-CVNLFI1_Sony_C
new file mode 100644
index 0000000000..d5f5ad1931
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-CVNLFI1_Sony_C
@@ -0,0 +1 @@
+7817d89bd749bc617a225978958a3af0
diff --git a/tests/ref/fate/cbs-h264-CVSE2_Sony_B b/tests/ref/fate/cbs-h264-CVSE2_Sony_B
new file mode 100644
index 0000000000..7845723edd
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-CVSE2_Sony_B
@@ -0,0 +1 @@
+ca8bdba497bd2f3b97c50d59692eb537
diff --git a/tests/ref/fate/cbs-h264-CVWP1_TOSHIBA_E b/tests/ref/fate/cbs-h264-CVWP1_TOSHIBA_E
new file mode 100644
index 0000000000..4cb9c475fc
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-CVWP1_TOSHIBA_E
@@ -0,0 +1 @@
+01290611165b8d8ccba8468f3dae4c4d
diff --git a/tests/ref/fate/cbs-h264-FM1_BT_B b/tests/ref/fate/cbs-h264-FM1_BT_B
new file mode 100644
index 0000000000..862de950de
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-FM1_BT_B
@@ -0,0 +1 @@
+f7d5474ec576eea3f70d83a26a641a60
diff --git a/tests/ref/fate/cbs-h264-MR1_BT_A b/tests/ref/fate/cbs-h264-MR1_BT_A
new file mode 100644
index 0000000000..0532652e6c
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-MR1_BT_A
@@ -0,0 +1 @@
+699d37e66764ddb3b4265c299ca77dcd
diff --git a/tests/ref/fate/cbs-h264-SVA_Base_B b/tests/ref/fate/cbs-h264-SVA_Base_B
new file mode 100644
index 0000000000..a591b811b1
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-SVA_Base_B
@@ -0,0 +1 @@
+443e55dd5f63dccf9a62acbb48451b08
diff --git a/tests/ref/fate/cbs-h264-Sharp_MP_PAFF_1r2 b/tests/ref/fate/cbs-h264-Sharp_MP_PAFF_1r2
new file mode 100644
index 0000000000..cc7d63931c
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-Sharp_MP_PAFF_1r2
@@ -0,0 +1 @@
+fd01840ed6b086c3118b7c53c86d01f5
diff --git a/tests/ref/fate/cbs-h264-sp1_bt_a b/tests/ref/fate/cbs-h264-sp1_bt_a
new file mode 100644
index 0000000000..388c53aa5e
--- /dev/null
+++ b/tests/ref/fate/cbs-h264-sp1_bt_a
@@ -0,0 +1 @@
+8405c5583d31d7015ed401b34b4ec93c
diff --git a/tests/ref/fate/cbs-hevc-CAINIT_E_SHARP_3 b/tests/ref/fate/cbs-hevc-CAINIT_E_SHARP_3
new file mode 100644
index 0000000000..53af86aaa4
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-CAINIT_E_SHARP_3
@@ -0,0 +1 @@
+44d1c0b80828af779d942cc20dde4ea4
diff --git a/tests/ref/fate/cbs-hevc-CAINIT_H_SHARP_3 b/tests/ref/fate/cbs-hevc-CAINIT_H_SHARP_3
new file mode 100644
index 0000000000..5e127d7894
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-CAINIT_H_SHARP_3
@@ -0,0 +1 @@
+ae9311dfcaf65bb8de9c4fcf23ce0871
diff --git a/tests/ref/fate/cbs-hevc-CONFWIN_A_Sony_1 b/tests/ref/fate/cbs-hevc-CONFWIN_A_Sony_1
new file mode 100644
index 0000000000..00445155d0
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-CONFWIN_A_Sony_1
@@ -0,0 +1 @@
+dce8104b2addbdd601eb280a88e18583
diff --git a/tests/ref/fate/cbs-hevc-HRD_A_Fujitsu_2 b/tests/ref/fate/cbs-hevc-HRD_A_Fujitsu_2
new file mode 100644
index 0000000000..b9c90ae3c3
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-HRD_A_Fujitsu_2
@@ -0,0 +1 @@
+716a90051f028c90daeb86b3825af36d
diff --git a/tests/ref/fate/cbs-hevc-LTRPSPS_A_Qualcomm_1 b/tests/ref/fate/cbs-hevc-LTRPSPS_A_Qualcomm_1
new file mode 100644
index 0000000000..21dfa5763a
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-LTRPSPS_A_Qualcomm_1
@@ -0,0 +1 @@
+11b599202a4d25693123bea8bb003e54
diff --git a/tests/ref/fate/cbs-hevc-NUT_A_ericsson_5 b/tests/ref/fate/cbs-hevc-NUT_A_ericsson_5
new file mode 100644
index 0000000000..32e58affe7
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-NUT_A_ericsson_5
@@ -0,0 +1 @@
+25cf94dfa2e0334eeedbfa9a8ed1c4b2
diff --git a/tests/ref/fate/cbs-hevc-PICSIZE_A_Bossen_1 b/tests/ref/fate/cbs-hevc-PICSIZE_A_Bossen_1
new file mode 100644
index 0000000000..cc18004920
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-PICSIZE_A_Bossen_1
@@ -0,0 +1 @@
+e87fbd90c297d401738db928e3e04dd4
diff --git a/tests/ref/fate/cbs-hevc-PICSIZE_B_Bossen_1 b/tests/ref/fate/cbs-hevc-PICSIZE_B_Bossen_1
new file mode 100644
index 0000000000..5495cec6c3
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-PICSIZE_B_Bossen_1
@@ -0,0 +1 @@
+4993d49d6f2f532dfc683a9d26c1e313
diff --git a/tests/ref/fate/cbs-hevc-RPLM_A_qualcomm_4 b/tests/ref/fate/cbs-hevc-RPLM_A_qualcomm_4
new file mode 100644
index 0000000000..c68d615cbf
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-RPLM_A_qualcomm_4
@@ -0,0 +1 @@
+f5d2633eefcd95e189faf4302d270457
diff --git a/tests/ref/fate/cbs-hevc-RPS_A_docomo_4 b/tests/ref/fate/cbs-hevc-RPS_A_docomo_4
new file mode 100644
index 0000000000..772d16a192
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-RPS_A_docomo_4
@@ -0,0 +1 @@
+97bd4fefd8cd95584f586027e244f283
diff --git a/tests/ref/fate/cbs-hevc-RPS_E_qualcomm_5 b/tests/ref/fate/cbs-hevc-RPS_E_qualcomm_5
new file mode 100644
index 0000000000..faef7da0d9
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-RPS_E_qualcomm_5
@@ -0,0 +1 @@
+b2528ef681729176ccb38a77be93a0de
diff --git a/tests/ref/fate/cbs-hevc-SLIST_A_Sony_4 b/tests/ref/fate/cbs-hevc-SLIST_A_Sony_4
new file mode 100644
index 0000000000..23b2e324d1
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-SLIST_A_Sony_4
@@ -0,0 +1 @@
+72cf53bbc967c9679e21a6d3203edb07
diff --git a/tests/ref/fate/cbs-hevc-SLIST_D_Sony_9 b/tests/ref/fate/cbs-hevc-SLIST_D_Sony_9
new file mode 100644
index 0000000000..4cea86dba6
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-SLIST_D_Sony_9
@@ -0,0 +1 @@
+59a22d715e30748492da5e0b9d421909
diff --git a/tests/ref/fate/cbs-hevc-STRUCT_A_Samsung_5 b/tests/ref/fate/cbs-hevc-STRUCT_A_Samsung_5
new file mode 100644
index 0000000000..6a4508b0c5
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-STRUCT_A_Samsung_5
@@ -0,0 +1 @@
+647eb851b935fd3bc6a98ce5ce45dbc7
diff --git a/tests/ref/fate/cbs-hevc-TILES_B_Cisco_1 b/tests/ref/fate/cbs-hevc-TILES_B_Cisco_1
new file mode 100644
index 0000000000..d767e26d68
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-TILES_B_Cisco_1
@@ -0,0 +1 @@
+85a114def19cefbd0fb0daf8370d711c
diff --git a/tests/ref/fate/cbs-hevc-WPP_A_ericsson_MAIN_2 b/tests/ref/fate/cbs-hevc-WPP_A_ericsson_MAIN_2
new file mode 100644
index 0000000000..fe6928fc8b
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-WPP_A_ericsson_MAIN_2
@@ -0,0 +1 @@
+de7d440b556eea827953e6d12aeb4023
diff --git a/tests/ref/fate/cbs-hevc-WPP_F_ericsson_MAIN_2 b/tests/ref/fate/cbs-hevc-WPP_F_ericsson_MAIN_2
new file mode 100644
index 0000000000..08aee566f1
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-WPP_F_ericsson_MAIN_2
@@ -0,0 +1 @@
+f197136f1fb3242c3422a48470dd7d35
diff --git a/tests/ref/fate/cbs-hevc-WP_A_Toshiba_3 b/tests/ref/fate/cbs-hevc-WP_A_Toshiba_3
new file mode 100644
index 0000000000..b868c438f8
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-WP_A_Toshiba_3
@@ -0,0 +1 @@
+158312a1a35ef4b20cb4aeee48549c03
diff --git a/tests/ref/fate/cbs-hevc-ipcm_E_NEC_2 b/tests/ref/fate/cbs-hevc-ipcm_E_NEC_2
new file mode 100644
index 0000000000..cc68b6fb49
--- /dev/null
+++ b/tests/ref/fate/cbs-hevc-ipcm_E_NEC_2
@@ -0,0 +1 @@
+2e1f9c95364cfac2aa6e6ee3a52c43c4
diff --git a/tests/ref/fate/cbs-mpeg2-hhi_burst_422_short b/tests/ref/fate/cbs-mpeg2-hhi_burst_422_short
new file mode 100644
index 0000000000..c319fba7b3
--- /dev/null
+++ b/tests/ref/fate/cbs-mpeg2-hhi_burst_422_short
@@ -0,0 +1 @@
+e0c2fdd9baeba0c5ba5839a8cd7a72d3
diff --git a/tests/ref/fate/cbs-mpeg2-sony-ct3 b/tests/ref/fate/cbs-mpeg2-sony-ct3
new file mode 100644
index 0000000000..b5b4b12f07
--- /dev/null
+++ b/tests/ref/fate/cbs-mpeg2-sony-ct3
@@ -0,0 +1 @@
+b1e15a09cfffbad801810af0928736ab
diff --git a/tests/ref/fate/cbs-mpeg2-tcela-6 b/tests/ref/fate/cbs-mpeg2-tcela-6
new file mode 100644
index 0000000000..530369d672
--- /dev/null
+++ b/tests/ref/fate/cbs-mpeg2-tcela-6
@@ -0,0 +1 @@
+771b6756a63793e05b74e645794908a2
diff --git a/tests/ref/fate/cdgraphics b/tests/ref/fate/cdgraphics
index dccb2b5c36..f079bd4df0 100644
--- a/tests/ref/fate/cdgraphics
+++ b/tests/ref/fate/cdgraphics
@@ -1,301 +1,217 @@
 #tb 0: 1/300
-0,          0,          0,        1,   194400, 0x46ad80da
-0,          1,          1,        1,   194400, 0x46ad80da
-0,          2,          2,        1,   194400, 0x9392c3b9
-0,          3,          3,        1,   194400, 0x9392c3b9
-0,          4,          4,        1,   194400, 0x9392c3b9
-0,          5,          5,        1,   194400, 0x9392c3b9
-0,          6,          6,        1,   194400, 0x9392c3b9
-0,          7,          7,        1,   194400, 0x9392c3b9
-0,          8,          8,        1,   194400, 0x9392c3b9
-0,          9,          9,        1,   194400, 0x9392c3b9
-0,         10,         10,        1,   194400, 0x9392c3b9
-0,         11,         11,        1,   194400, 0x9392c3b9
-0,         12,         12,        1,   194400, 0x9392c3b9
-0,         13,         13,        1,   194400, 0x9392c3b9
-0,         14,         14,        1,   194400, 0x9392c3b9
-0,         15,         15,        1,   194400, 0x9392c3b9
-0,         16,         16,        1,   194400, 0x46ad80da
-0,         17,         17,        1,   194400, 0x46ad80da
-0,         18,         18,        1,   194400, 0x46ad80da
-0,         19,         19,        1,   194400, 0x46ad80da
-0,         20,         20,        1,   194400, 0x46ad80da
-0,         21,         21,        1,   194400, 0x46ad80da
-0,         22,         22,        1,   194400, 0x46ad80da
-0,         23,         23,        1,   194400, 0x46ad80da
-0,         24,         24,        1,   194400, 0x46ad80da
-0,         25,         25,        1,   194400, 0x46ad80da
-0,         26,         26,        1,   194400, 0x46ad80da
-0,         27,         27,        1,   194400, 0x46ad80da
-0,         28,         28,        1,   194400, 0x46ad80da
-0,         29,         29,        1,   194400, 0x46ad80da
-0,         30,         30,        1,   194400, 0x46ad80da
-0,         31,         31,        1,   194400, 0x46ad80da
-0,         32,         32,        1,   194400, 0x9392c3b9
-0,         33,         33,        1,   194400, 0x9ff8cbb1
-0,         34,         34,        1,   194400, 0xd015dba1
-0,         35,         35,        1,   194400, 0x6a39f18b
-0,         36,         36,        1,   194400, 0x7b8cf983
-0,         37,         37,        1,   194400, 0x07a20f7c
-0,         38,         38,        1,   194400, 0xa63e2962
-0,         39,         39,        1,   194400, 0x2dd54447
-0,         40,         40,        1,   194400, 0x90735e2d
-0,         41,         41,        1,   194400, 0x90d98506
-0,         42,         42,        1,   194400, 0xe5b08ffb
-0,         43,         43,        1,   194400, 0x7a0d95f5
-0,         44,         44,        1,   194400, 0xff6bacde
-0,         45,         45,        1,   194400, 0xd998c2c8
-0,         46,         46,        1,   194400, 0x3d1ddfab
-0,         47,         47,        1,   194400, 0x817de4a6
-0,         48,         48,        1,   194400, 0xfa3ef694
-0,         49,         49,        1,   194400, 0x0b5bfb8f
-0,         50,         50,        1,   194400, 0x00f62376
-0,         51,         51,        1,   194400, 0x2f6b2d6c
-0,         52,         52,        1,   194400, 0x40cb4752
-0,         53,         53,        1,   194400, 0xd8456435
-0,         54,         54,        1,   194400, 0x459f6a2f
-0,         55,         55,        1,   194400, 0x9b678910
-0,         56,         56,        1,   194400, 0x8791a1f7
-0,         57,         57,        1,   194400, 0xdb4ac5d3
-0,         58,         58,        1,   194400, 0xb223c8d0
-0,         59,         59,        1,   194400, 0x4a9ce7b1
-0,         60,         60,        1,   194400, 0x187eeaae
-0,         61,         61,        1,   194400, 0xc712f8a0
-0,         62,         62,        1,   194400, 0x549c00a7
-0,         63,         63,        1,   194400, 0x4d991295
-0,         64,         64,        1,   194400, 0xc41b2681
-0,         65,         65,        1,   194400, 0xed5a3077
-0,         66,         66,        1,   194400, 0x85ad4463
-0,         67,         67,        1,   194400, 0xb98f4760
-0,         68,         68,        1,   194400, 0x87ef5e49
-0,         69,         69,        1,   194400, 0x830a6146
-0,         70,         70,        1,   194400, 0xe33a792e
-0,         71,         71,        1,   194400, 0x83517a2d
-0,         72,         72,        1,   194400, 0xa97e9314
-0,         73,         73,        1,   194400, 0x39059611
-0,         74,         74,        1,   194400, 0xbf4eb9ed
-0,         75,         75,        1,   194400, 0xe5afc4e2
-0,         76,         76,        1,   194400, 0x35d4cdd9
-0,         77,         77,        1,   194400, 0xb376e1c5
-0,         78,         78,        1,   194400, 0x6128e3c3
-0,         79,         79,        1,   194400, 0x30b7f7af
-0,         80,         80,        1,   194400, 0xf1effaac
-0,         81,         81,        1,   194400, 0x483914a1
-0,         82,         82,        1,   194400, 0xbd48199c
-0,         83,         83,        1,   194400, 0x382f2d88
-0,         84,         84,        1,   194400, 0x5a573085
-0,         85,         85,        1,   194400, 0x89733580
-0,         86,         86,        1,   194400, 0xd1325a5b
-0,         87,         87,        1,   194400, 0x655b6253
-0,         88,         88,        1,   194400, 0x55146352
-0,         89,         89,        1,   194400, 0xda527c39
-0,         90,         90,        1,   194400, 0xb0cd7e37
-0,         91,         91,        1,   194400, 0x25e7991c
-0,         92,         92,        1,   194400, 0x5c22a411
-0,         93,         93,        1,   194400, 0x1e2abdf7
-0,         94,         94,        1,   194400, 0x8308bff5
-0,         95,         95,        1,   194400, 0xfdbfd6de
-0,         96,         96,        1,   194400, 0xd4d4d9db
-0,         97,         97,        1,   194400, 0xa449fbb9
-0,         98,         98,        1,   194400, 0x3dcafdb7
-0,         99,         99,        1,   194400, 0x6f1f01c2
-0,        100,        100,        1,   194400, 0xf54a1da6
-0,        101,        101,        1,   194400, 0x88d11fa4
-0,        102,        102,        1,   194400, 0x59642d96
-0,        103,        103,        1,   194400, 0x8ba44182
-0,        104,        104,        1,   194400, 0x88f56360
-0,        105,        105,        1,   194400, 0xfb246d56
-0,        106,        106,        1,   194400, 0xad128043
-0,        107,        107,        1,   194400, 0x3a4f8a39
-0,        108,        108,        1,   194400, 0x563d9d26
-0,        109,        109,        1,   194400, 0x6ff8a320
-0,        110,        110,        1,   194400, 0xcdb9b70c
-0,        111,        111,        1,   194400, 0x99c2bd06
-0,        112,        112,        1,   194400, 0x4b47cef4
-0,        113,        113,        1,   194400, 0x10b9dce6
-0,        114,        114,        1,   194400, 0xdd39f1d1
-0,        115,        115,        1,   194400, 0xbcf104cd
-0,        116,        116,        1,   194400, 0x85ec17ba
-0,        117,        117,        1,   194400, 0x069219b8
-0,        118,        118,        1,   194400, 0x84dd3899
-0,        119,        119,        1,   194400, 0xacca4190
-0,        120,        120,        1,   194400, 0xcf5b5d74
-0,        121,        121,        1,   194400, 0x4b8c626f
-0,        122,        122,        1,   194400, 0xf0817958
-0,        123,        123,        1,   194400, 0xc0887e53
-0,        124,        124,        1,   194400, 0x42e6854c
-0,        125,        125,        1,   194400, 0x036c9140
-0,        126,        126,        1,   194400, 0x0f21a62b
-0,        127,        127,        1,   194400, 0xcdaeaa27
-0,        128,        128,        1,   194400, 0xe425bc15
-0,        129,        129,        1,   194400, 0x8e18c20f
-0,        130,        130,        1,   194400, 0x767cd5fb
-0,        131,        131,        1,   194400, 0x554ae6ea
-0,        132,        132,        1,   194400, 0xeac1f9d7
-0,        133,        133,        1,   194400, 0x0b32fed2
-0,        134,        134,        1,   194400, 0xe30c19c6
-0,        135,        135,        1,   194400, 0x6a8a23bc
-0,        136,        136,        1,   194400, 0x26bf36a9
-0,        137,        137,        1,   194400, 0x1e4f3fa0
-0,        138,        138,        1,   194400, 0x231f5986
-0,        139,        139,        1,   194400, 0xf557756a
-0,        140,        140,        1,   194400, 0x6bce805f
-0,        141,        141,        1,   194400, 0xcd80924d
-0,        142,        142,        1,   194400, 0x65dc9f40
-0,        143,        143,        1,   194400, 0x2ab7af30
-0,        144,        144,        1,   194400, 0xd43cb728
-0,        145,        145,        1,   194400, 0x05d9c916
-0,        146,        146,        1,   194400, 0x43cad10e
-0,        147,        147,        1,   194400, 0x06b5e0fe
-0,        148,        148,        1,   194400, 0xa142f0ee
-0,        149,        149,        1,   194400, 0xed7f03ea
-0,        150,        150,        1,   194400, 0xf26019d4
-0,        151,        151,        1,   194400, 0x3b7f29c4
-0,        152,        152,        1,   194400, 0x30282ebf
-0,        153,        153,        1,   194400, 0xaeff4aa3
-0,        154,        154,        1,   194400, 0x1d355697
-0,        155,        155,        1,   194400, 0x2ead6f7e
-0,        156,        156,        1,   194400, 0xf1b67776
-0,        157,        157,        1,   194400, 0x93b38b62
-0,        158,        158,        1,   194400, 0x9469905d
-0,        159,        159,        1,   194400, 0x27bf9756
-0,        160,        160,        1,   194400, 0xd016a548
-0,        161,        161,        1,   194400, 0x6889b835
-0,        162,        162,        1,   194400, 0x6a05be2f
-0,        163,        163,        1,   194400, 0xe0a1ce1f
-0,        164,        164,        1,   194400, 0x8fdbd617
-0,        165,        165,        1,   194400, 0xd68fe805
-0,        166,        166,        1,   194400, 0x0d1dfbf1
-0,        167,        167,        1,   194400, 0x0fe70bf0
-0,        168,        168,        1,   194400, 0x0a8f13e8
-0,        169,        169,        1,   194400, 0x0ca42bd0
-0,        170,        170,        1,   194400, 0x6f3838c3
-0,        171,        171,        1,   194400, 0x045448b3
-0,        172,        172,        1,   194400, 0x764349b2
-0,        173,        173,        1,   194400, 0xed1651aa
-0,        174,        174,        1,   194400, 0xbb376398
-0,        175,        175,        1,   194400, 0xd0d5718a
-0,        176,        176,        1,   194400, 0xcd977e7d
-0,        177,        177,        1,   194400, 0x8cb39665
-0,        178,        178,        1,   194400, 0xb935b04b
-0,        179,        179,        1,   194400, 0x0292be3d
-0,        180,        180,        1,   194400, 0x4f21c833
-0,        181,        181,        1,   194400, 0xa5c7d823
-0,        182,        182,        1,   194400, 0xfb8ee01b
-0,        183,        183,        1,   194400, 0xea53ee0d
-0,        184,        184,        1,   194400, 0x803efcfe
-0,        185,        185,        1,   194400, 0x2c0e0aff
-0,        186,        186,        1,   194400, 0x3df318f1
-0,        187,        187,        1,   194400, 0xc4cb26e3
-0,        188,        188,        1,   194400, 0x92a033d6
-0,        189,        189,        1,   194400, 0x1b2048c1
-0,        190,        190,        1,   194400, 0x236858b1
-0,        191,        191,        1,   194400, 0x482f6d9c
-0,        192,        192,        1,   194400, 0x9ee97891
-0,        193,        193,        1,   194400, 0xe0dc8683
-0,        194,        194,        1,   194400, 0x461b9079
-0,        195,        195,        1,   194400, 0xd346a960
-0,        196,        196,        1,   194400, 0xa384b554
-0,        197,        197,        1,   194400, 0x3246cf3a
-0,        198,        198,        1,   194400, 0xa53fe722
-0,        199,        199,        1,   194400, 0xe620fd0c
-0,        200,        200,        1,   194400, 0xd6370414
-0,        201,        201,        1,   194400, 0xf57f1404
-0,        202,        202,        1,   194400, 0x8c6420f7
-0,        203,        203,        1,   194400, 0xd4be3add
-0,        204,        204,        1,   194400, 0xa8dc4ec9
-0,        205,        205,        1,   194400, 0xda1563b4
-0,        206,        206,        1,   194400, 0xd51873a4
-0,        207,        207,        1,   194400, 0x68588196
-0,        208,        208,        1,   194400, 0x40d18e89
-0,        209,        209,        1,   194400, 0x1b75a275
-0,        210,        210,        1,   194400, 0xedd1a572
-0,        211,        211,        1,   194400, 0x55daad6a
-0,        212,        212,        1,   194400, 0xcb93b067
-0,        213,        213,        1,   194400, 0x5888ba5d
-0,        214,        214,        1,   194400, 0x2c11c84f
-0,        215,        215,        1,   194400, 0x0fbae334
-0,        216,        216,        1,   194400, 0x773fed2a
-0,        217,        217,        1,   194400, 0x2f87fc1b
-0,        218,        218,        1,   194400, 0xe8120521
-0,        219,        219,        1,   194400, 0x64ac0f17
-0,        220,        220,        1,   194400, 0xba531c0a
-0,        221,        221,        1,   194400, 0xf49433f2
-0,        222,        222,        1,   194400, 0x79e234f1
-0,        223,        223,        1,   194400, 0x043937ee
-0,        224,        224,        1,   194400, 0x9e6141e4
-0,        225,        225,        1,   194400, 0x34204fd6
-0,        226,        226,        1,   194400, 0xa1dd60c5
-0,        227,        227,        1,   194400, 0x12b36eb7
-0,        228,        228,        1,   194400, 0x68987aab
-0,        229,        229,        1,   194400, 0x3207889d
-0,        230,        230,        1,   194400, 0x3bb59194
-0,        231,        231,        1,   194400, 0x0a119f86
-0,        232,        232,        1,   194400, 0x472bab7a
-0,        233,        233,        1,   194400, 0x7364c85d
-0,        234,        234,        1,   194400, 0xa812d84d
-0,        235,        235,        1,   194400, 0xf384f530
-0,        236,        236,        1,   194400, 0x1546052f
-0,        237,        237,        1,   194400, 0xeb611a1a
-0,        238,        238,        1,   194400, 0xc39d250f
-0,        239,        239,        1,   194400, 0x7bd73301
-0,        240,        240,        1,   194400, 0x10f73cf7
-0,        241,        241,        1,   194400, 0x95dc55de
-0,        242,        242,        1,   194400, 0x392e61d2
-0,        243,        243,        1,   194400, 0x113c7bb8
-0,        244,        244,        1,   194400, 0x17128fa4
-0,        245,        245,        1,   194400, 0xf95e9b98
-0,        246,        246,        1,   194400, 0xdc47aa89
-0,        247,        247,        1,   194400, 0xea5dc073
-0,        248,        248,        1,   194400, 0x8dfadc57
-0,        249,        249,        1,   194400, 0xe5c3e84b
-0,        250,        250,        1,   194400, 0x8952f43f
-0,        251,        251,        1,   194400, 0xec9e0240
-0,        252,        252,        1,   194400, 0x8f460c36
-0,        253,        253,        1,   194400, 0xd43e182a
-0,        254,        254,        1,   194400, 0xb00b2919
-0,        255,        255,        1,   194400, 0xc9f6350d
-0,        256,        256,        1,   194400, 0x87ca44fd
-0,        257,        257,        1,   194400, 0xa6a250f1
-0,        258,        258,        1,   194400, 0x34fa60e1
-0,        259,        259,        1,   194400, 0xe1a372cf
-0,        260,        260,        1,   194400, 0xc80785bc
-0,        261,        261,        1,   194400, 0x43e297aa
-0,        262,        262,        1,   194400, 0x7e8ea49d
-0,        263,        263,        1,   194400, 0xd009b091
-0,        264,        264,        1,   194400, 0x9126bc85
-0,        265,        265,        1,   194400, 0x175ad36e
-0,        266,        266,        1,   194400, 0xf9dae160
-0,        267,        267,        1,   194400, 0x1b98f948
-0,        268,        268,        1,   194400, 0xa6c5133d
-0,        269,        269,        1,   194400, 0xf5d42729
-0,        270,        270,        1,   194400, 0x8cfe311f
-0,        271,        271,        1,   194400, 0x18733e12
-0,        272,        272,        1,   194400, 0x24ac50ff
-0,        273,        273,        1,   194400, 0x0d1c64eb
-0,        274,        274,        1,   194400, 0xde947cd3
-0,        275,        275,        1,   194400, 0x08268dc2
-0,        276,        276,        1,   194400, 0xfec69fb0
-0,        277,        277,        1,   194400, 0xba83aba4
-0,        278,        278,        1,   194400, 0xfbe2bc93
-0,        279,        279,        1,   194400, 0xe22fcc83
-0,        280,        280,        1,   194400, 0x050fcf80
-0,        281,        281,        1,   194400, 0xee1ed778
-0,        282,        282,        1,   194400, 0xb44cda75
-0,        283,        283,        1,   194400, 0xa29fe46b
-0,        284,        284,        1,   194400, 0xa99bf55a
-0,        285,        285,        1,   194400, 0x4f840d51
-0,        286,        286,        1,   194400, 0x58941945
-0,        287,        287,        1,   194400, 0x62cb2638
-0,        288,        288,        1,   194400, 0x22ee312d
-0,        289,        289,        1,   194400, 0xea8f3925
-0,        290,        290,        1,   194400, 0xed294c12
-0,        291,        291,        1,   194400, 0xafa75e00
-0,        292,        292,        1,   194400, 0x19d45ffe
-0,        293,        293,        1,   194400, 0x7fcf61fc
-0,        294,        294,        1,   194400, 0x2c126df0
-0,        295,        295,        1,   194400, 0x331379e4
-0,        296,        296,        1,   194400, 0x99fe8cd1
-0,        297,        297,        1,   194400, 0xa5ec98c5
-0,        298,        298,        1,   194400, 0xac68a6b7
-0,        299,        299,        1,   194400, 0x28e6b2ab
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 300x216
+#sar 0: 0/1
+0,          0,          0,        1,   259200, 0x29aeb27e
+0,          1,          1,        1,   259200, 0x29aeb27e
+0,          2,          2,        1,   259200, 0x6779f55d
+0,          3,          3,        1,   259200, 0x6779f55d
+0,          4,          4,        1,   259200, 0x6779f55d
+0,          5,          5,        1,   259200, 0x6779f55d
+0,          6,          6,        1,   259200, 0x6779f55d
+0,          7,          7,        1,   259200, 0x6779f55d
+0,          8,          8,        1,   259200, 0x6779f55d
+0,          9,          9,        1,   259200, 0x6779f55d
+0,         10,         10,        1,   259200, 0x6779f55d
+0,         11,         11,        1,   259200, 0x6779f55d
+0,         12,         12,        1,   259200, 0x6779f55d
+0,         13,         13,        1,   259200, 0xf33cc0c4
+0,         14,         14,        1,   259200, 0xf33cc0c4
+0,         15,         15,        1,   259200, 0xf33cc0c4
+0,         16,         16,        1,   259200, 0x098280da
+0,         17,         17,        1,   259200, 0x098280da
+0,         18,         18,        1,   259200, 0x098280da
+0,         19,         19,        1,   259200, 0x098280da
+0,         20,         20,        1,   259200, 0x098280da
+0,         21,         21,        1,   259200, 0x098280da
+0,         22,         22,        1,   259200, 0x098280da
+0,         23,         23,        1,   259200, 0x098280da
+0,         24,         24,        1,   259200, 0x098280da
+0,         25,         25,        1,   259200, 0x098280da
+0,         26,         26,        1,   259200, 0x098280da
+0,         27,         27,        1,   259200, 0x098280da
+0,         28,         28,        1,   259200, 0x098280da
+0,         29,         29,        1,   259200, 0x098280da
+0,         30,         30,        1,   259200, 0x098280da
+0,         31,         31,        1,   259200, 0x098280da
+0,         32,         32,        1,   259200, 0xf33cc0c4
+0,         33,         33,        1,   259200, 0xa389d0b4
+0,         34,         34,        1,   259200, 0xecf1f094
+0,         35,         35,        1,   259200, 0xe7171c77
+0,         37,         37,        1,   259200, 0xf9d72c67
+0,         38,         38,        1,   259200, 0x7932583b
+0,         40,         40,        1,   259200, 0x1c618c07
+0,         41,         41,        1,   259200, 0x7e88c1d1
+0,         43,         43,        1,   259200, 0x2c5df59d
+0,         44,         44,        1,   259200, 0xa78f435e
+0,         46,         46,        1,   259200, 0xb96e5948
+0,         47,         47,        1,   259200, 0x85c1653c
+0,         49,         49,        1,   259200, 0xefdc930e
+0,         50,         50,        1,   259200, 0xea24bee2
+0,         52,         52,        1,   259200, 0x8feef8a8
+0,         53,         53,        1,   259200, 0x8a7b02ad
+0,         55,         55,        1,   259200, 0xe41b2689
+0,         56,         56,        1,   259200, 0x007d307f
+0,         58,         58,        1,   259200, 0xb0c9802f
+0,         59,         59,        1,   259200, 0xb50c941b
+0,         61,         61,        1,   259200, 0xdf7dc7e7
+0,         62,         62,        1,   259200, 0xbaac01bc
+0,         64,         64,        1,   259200, 0x1ef70db0
+0,         65,         65,        1,   259200, 0xeeab4b72
+0,         67,         67,        1,   259200, 0x0eaf7d40
+0,         68,         68,        1,   259200, 0xc7bec4f8
+0,         70,         70,        1,   259200, 0xa506caf2
+0,         71,         71,        1,   259200, 0x268808c3
+0,         73,         73,        1,   259200, 0xebd90ebd
+0,         74,         74,        1,   259200, 0x8d792aa1
+0,         76,         76,        1,   259200, 0x960d3a91
+0,         77,         77,        1,   259200, 0xf0395e6d
+0,         79,         79,        1,   259200, 0x3d0e8645
+0,         80,         80,        1,   259200, 0x88bc9a31
+0,         82,         82,        1,   259200, 0xda37c209
+0,         83,         83,        1,   259200, 0xafa6c803
+0,         85,         85,        1,   259200, 0xdc58f5d5
+0,         86,         86,        1,   259200, 0x1a5ffbcf
+0,         88,         88,        1,   259200, 0xc8872bae
+0,         89,         89,        1,   259200, 0xc5472dac
+0,         91,         91,        1,   259200, 0xd54e5f7a
+0,         92,         92,        1,   259200, 0xf4576574
+0,         94,         94,        1,   259200, 0xdefaad2c
+0,         95,         95,        1,   259200, 0xca44c316
+0,         97,         97,        1,   259200, 0x8102d504
+0,         98,         98,        1,   259200, 0xe0c8fcdc
+0,        100,        100,        1,   259200, 0x53c100e7
+0,        101,        101,        1,   259200, 0x8de628bf
+0,        103,        103,        1,   259200, 0x86f92eb9
+0,        104,        104,        1,   259200, 0x13c66285
+0,        106,        106,        1,   259200, 0xe5766c7b
+0,        107,        107,        1,   259200, 0x3ddb9453
+0,        109,        109,        1,   259200, 0x39559a4d
+0,        110,        110,        1,   259200, 0x507da443
+0,        112,        112,        1,   259200, 0x3b8dedf9
+0,        113,        113,        1,   259200, 0x55c9fde9
+0,        115,        115,        1,   259200, 0x7c43ffe7
+0,        116,        116,        1,   259200, 0xdf2c31c4
+0,        118,        118,        1,   259200, 0x144735c0
+0,        119,        119,        1,   259200, 0x9a716b8a
+0,        121,        121,        1,   259200, 0x5ab08174
+0,        122,        122,        1,   259200, 0x06dcb540
+0,        124,        124,        1,   259200, 0x0d09b93c
+0,        125,        125,        1,   259200, 0x5abce70e
+0,        127,        127,        1,   259200, 0x38a4ed08
+0,        128,        128,        1,   259200, 0x427b30d3
+0,        130,        130,        1,   259200, 0x7f8d34cf
+0,        131,        131,        1,   259200, 0xf5613cc7
+0,        133,        133,        1,   259200, 0x5086748f
+0,        134,        134,        1,   259200, 0x7da8788b
+0,        136,        136,        1,   259200, 0x79c8946f
+0,        137,        137,        1,   259200, 0x65d9bc47
+0,        139,        139,        1,   259200, 0x3f5a0012
+0,        140,        140,        1,   259200, 0x4d9713fe
+0,        142,        142,        1,   259200, 0x917839d8
+0,        143,        143,        1,   259200, 0x92624dc4
+0,        145,        145,        1,   259200, 0x465c739e
+0,        146,        146,        1,   259200, 0x21137f92
+0,        148,        148,        1,   259200, 0xd677a76a
+0,        149,        149,        1,   259200, 0xe1efb35e
+0,        151,        151,        1,   259200, 0xd2d6d73a
+0,        152,        152,        1,   259200, 0x06a8f31e
+0,        154,        154,        1,   259200, 0x8aaf1d03
+0,        155,        155,        1,   259200, 0x9e0a42dd
+0,        157,        157,        1,   259200, 0x1f7268b7
+0,        158,        158,        1,   259200, 0x1a3c6cb3
+0,        160,        160,        1,   259200, 0x5607aa75
+0,        161,        161,        1,   259200, 0xa19ebc63
+0,        163,        163,        1,   259200, 0x9dbaf42b
+0,        164,        164,        1,   259200, 0x2d06fe21
+0,        166,        166,        1,   259200, 0x960e2c02
+0,        167,        167,        1,   259200, 0x04f935f8
+0,        169,        169,        1,   259200, 0x488143ea
+0,        170,        170,        1,   259200, 0xcb515bd2
+0,        172,        172,        1,   259200, 0xa27c85a8
+0,        173,        173,        1,   259200, 0x3bb38da0
+0,        175,        175,        1,   259200, 0x39d9b17c
+0,        176,        176,        1,   259200, 0x3fbcbd70
+0,        178,        178,        1,   259200, 0xbc19e548
+0,        179,        179,        1,   259200, 0x29400735
+0,        181,        181,        1,   259200, 0x21612d0f
+0,        182,        182,        1,   259200, 0x66943705
+0,        184,        184,        1,   259200, 0x9efa6ccf
+0,        185,        185,        1,   259200, 0x3b4180bb
+0,        187,        187,        1,   259200, 0x9a8aa695
+0,        188,        188,        1,   259200, 0x6529b883
+0,        190,        190,        1,   259200, 0x6e1aec4f
+0,        191,        191,        1,   259200, 0x3ebc2426
+0,        193,        193,        1,   259200, 0xff6e3a10
+0,        194,        194,        1,   259200, 0x70f05dec
+0,        196,        196,        1,   259200, 0x853777d2
+0,        197,        197,        1,   259200, 0x05ea97b2
+0,        199,        199,        1,   259200, 0x03f3a7a2
+0,        200,        200,        1,   259200, 0xf4f7cb7e
+0,        202,        202,        1,   259200, 0xd411db6e
+0,        203,        203,        1,   259200, 0xfa3afb4e
+0,        205,        205,        1,   259200, 0x0a451b3d
+0,        206,        206,        1,   259200, 0x94624117
+0,        208,        208,        1,   259200, 0x00996ceb
+0,        209,        209,        1,   259200, 0x8c898ccb
+0,        211,        211,        1,   259200, 0x5d2496c1
+0,        212,        212,        1,   259200, 0x4f5fce89
+0,        214,        214,        1,   259200, 0xf6a0e671
+0,        215,        215,        1,   259200, 0xcf6f184e
+0,        217,        217,        1,   259200, 0x66e2283e
+0,        218,        218,        1,   259200, 0x7cd25016
+0,        220,        220,        1,   259200, 0xc2e05a0c
+0,        221,        221,        1,   259200, 0x33b767fe
+0,        223,        223,        1,   259200, 0x6f5583e2
+0,        224,        224,        1,   259200, 0x19f3a9bc
+0,        226,        226,        1,   259200, 0xb3f3b5b0
+0,        227,        227,        1,   259200, 0x6417d590
+0,        229,        229,        1,   259200, 0x7130e580
+0,        230,        230,        1,   259200, 0x4558096b
+0,        232,        232,        1,   259200, 0x920c3143
+0,        233,        233,        1,   259200, 0xb7e75123
+0,        235,        235,        1,   259200, 0x38e46113
+0,        236,        236,        1,   259200, 0x96ba90e3
+0,        238,        238,        1,   259200, 0xc65faac9
+0,        239,        239,        1,   259200, 0x7260caa9
+0,        241,        241,        1,   259200, 0x4983cca7
+0,        242,        242,        1,   259200, 0xc04ddc97
+0,        244,        244,        1,   259200, 0x52de0082
+0,        245,        245,        1,   259200, 0xb1cb1c66
+0,        247,        247,        1,   259200, 0x273b364c
+0,        248,        248,        1,   259200, 0xd26a661c
+0,        250,        250,        1,   259200, 0x9a9599e8
+0,        251,        251,        1,   259200, 0x2e16b5cc
+0,        253,        253,        1,   259200, 0x2d4ec9b8
+0,        254,        254,        1,   259200, 0x32d8e998
+0,        256,        256,        1,   259200, 0x5182f988
+0,        257,        257,        1,   259200, 0x48d7157b
+0,        259,        259,        1,   259200, 0xa50f335d
+0,        260,        260,        1,   259200, 0x3f274f41
+0,        262,        262,        1,   259200, 0xe9776b25
+0,        263,        263,        1,   259200, 0x76728709
+0,        265,        265,        1,   259200, 0x1960a0ef
+0,        266,        266,        1,   259200, 0x3d3acac5
+0,        268,        268,        1,   259200, 0x1c6aeaa5
+0,        269,        269,        1,   259200, 0x8bc0148a
+0,        271,        271,        1,   259200, 0xa2a72a74
+0,        272,        272,        1,   259200, 0x77db4658
+0,        274,        274,        1,   259200, 0x63705a44
+0,        275,        275,        1,   259200, 0x30db8c12
+0,        277,        277,        1,   259200, 0x32f5a3fa
+0,        278,        278,        1,   259200, 0x0107d7c6
+0,        280,        280,        1,   259200, 0xe14707a5
+0,        281,        281,        1,   259200, 0xed7e3379
+0,        283,        283,        1,   259200, 0x55bc416b
+0,        284,        284,        1,   259200, 0x1cf1614b
+0,        286,        286,        1,   259200, 0x2d507b31
+0,        287,        287,        1,   259200, 0x3fbbaefd
+0,        289,        289,        1,   259200, 0x8608d6d5
+0,        290,        290,        1,   259200, 0x169d00ba
+0,        292,        292,        1,   259200, 0x7d0b209a
+0,        293,        293,        1,   259200, 0xd5943c7e
+0,        295,        295,        1,   259200, 0x94e25664
+0,        296,        296,        1,   259200, 0x97447e3c
+0,        298,        298,        1,   259200, 0x68bc8436
+0,        299,        299,        1,   259200, 0xb7ee9426
diff --git a/tests/ref/fate/cdxl-bitline-ham6 b/tests/ref/fate/cdxl-bitline-ham6
index e4071a9955..37c14596eb 100644
--- a/tests/ref/fate/cdxl-bitline-ham6
+++ b/tests/ref/fate/cdxl-bitline-ham6
@@ -1,11 +1,15 @@
-#tb 0: 1/11025
-0,          0,          0,        0,    63180, 0xcda82c16
-0,        220,        220,        0,    63180, 0xa6097bf9
-0,        440,        440,        0,    63180, 0x4c2fb091
-0,        660,        660,        0,    63180, 0xc597db00
-0,        880,        880,        0,    63180, 0xfa581ccd
-0,       1100,       1100,        0,    63180, 0x3e51498f
-0,       1320,       1320,        0,    63180, 0xe3495396
-0,       1540,       1540,        0,    63180, 0x425f5f02
-0,       1760,       1760,        0,    63180, 0x6077465f
-0,       1980,       1980,        0,    63180, 0x923ba29c
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 162x130
+#sar 0: 0/1
+0,          0,          0,        1,    63180, 0xcda82c16
+0,          1,          1,        1,    63180, 0xa6097bf9
+0,          2,          2,        1,    63180, 0x4c2fb091
+0,          3,          3,        1,    63180, 0xc597db00
+0,          4,          4,        1,    63180, 0xfa581ccd
+0,          5,          5,        1,    63180, 0x3e51498f
+0,          6,          6,        1,    63180, 0xe3495396
+0,          7,          7,        1,    63180, 0x425f5f02
+0,          8,          8,        1,    63180, 0x6077465f
+0,          9,          9,        1,    63180, 0x923ba29c
diff --git a/tests/ref/fate/cdxl-demux b/tests/ref/fate/cdxl-demux
index 7e4c4c82eb..f1334755aa 100644
--- a/tests/ref/fate/cdxl-demux
+++ b/tests/ref/fate/cdxl-demux
@@ -1,5 +1,14 @@
 #tb 0: 1/11025
+#media_type 0: video
+#codec_id 0: cdxl
+#dimensions 0: 176x128
+#sar 0: 0/1
 #tb 1: 1/11025
+#media_type 1: audio
+#codec_id 1: pcm_s8
+#sample_rate 1: 11025
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,     1884,    22688, 0xc954a244
 1,          0,          0,     1884,     1884, 0x06925e3e
 0,       1884,       1884,     1884,    22688, 0x3ee4a304
diff --git a/tests/ref/fate/cdxl-ham6 b/tests/ref/fate/cdxl-ham6
index 25886b2518..1602c8af3e 100644
--- a/tests/ref/fate/cdxl-ham6
+++ b/tests/ref/fate/cdxl-ham6
@@ -1,17 +1,21 @@
-#tb 0: 1/11025
-0,          0,          0,        0,    57600, 0x87887a7b
-0,       1092,       1092,        0,    57600, 0x10c301d2
-0,       2184,       2184,        0,    57600, 0xd1a6f910
-0,       3276,       3276,        0,    57600, 0x20242bb9
-0,       4368,       4368,        0,    57600, 0xae33cb7f
-0,       5460,       5460,        0,    57600, 0x501b82c8
-0,       6552,       6552,        0,    57600, 0x84199043
-0,       7644,       7644,        0,    57600, 0x946a6dbb
-0,       8736,       8736,        0,    57600, 0xeacea671
-0,       9828,       9828,        0,    57600, 0x77b8723f
-0,      10920,      10920,        0,    57600, 0x371cdb09
-0,      12012,      12012,        0,    57600, 0xa16ef5ee
-0,      13104,      13104,        0,    57600, 0xcb6abd9e
-0,      14196,      14196,        0,    57600, 0xb73e800f
-0,      15288,      15288,        0,    57600, 0x368bd93e
-0,      16380,      16380,        0,    57600, 0xcde72dc5
+#tb 0: 52/525
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
+0,          0,          0,        1,    57600, 0x87887a7b
+0,          1,          1,        1,    57600, 0x10c301d2
+0,          2,          2,        1,    57600, 0xd1a6f910
+0,          3,          3,        1,    57600, 0x20242bb9
+0,          4,          4,        1,    57600, 0xae33cb7f
+0,          5,          5,        1,    57600, 0x501b82c8
+0,          6,          6,        1,    57600, 0x84199043
+0,          7,          7,        1,    57600, 0x946a6dbb
+0,          8,          8,        1,    57600, 0xeacea671
+0,          9,          9,        1,    57600, 0x77b8723f
+0,         10,         10,        1,    57600, 0x371cdb09
+0,         11,         11,        1,    57600, 0xa16ef5ee
+0,         12,         12,        1,    57600, 0xcb6abd9e
+0,         13,         13,        1,    57600, 0xb73e800f
+0,         14,         14,        1,    57600, 0x368bd93e
+0,         15,         15,        1,    57600, 0xcde72dc5
diff --git a/tests/ref/fate/cdxl-ham8 b/tests/ref/fate/cdxl-ham8
index 356ad1be19..ab1f76afa8 100644
--- a/tests/ref/fate/cdxl-ham8
+++ b/tests/ref/fate/cdxl-ham8
@@ -1,2 +1,6 @@
-#tb 0: 1/11025
-0,          0,          0,        0,    67584, 0xce0cade5
+#tb 0: 12/281
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x128
+#sar 0: 0/1
+0,          0,          0,        1,    67584, 0xce0cade5
diff --git a/tests/ref/fate/cdxl-pal8 b/tests/ref/fate/cdxl-pal8
index f5c319af58..a242b0ce66 100644
--- a/tests/ref/fate/cdxl-pal8
+++ b/tests/ref/fate/cdxl-pal8
@@ -1,12 +1,16 @@
-#tb 0: 1/11025
-0,          0,          0,        0,    67584, 0x5eae629b
-0,        220,        220,        0,    67584, 0x32591227
-0,        440,        440,        0,    67584, 0x4e4424c7
-0,        660,        660,        0,    67584, 0x70db0134
-0,        880,        880,        0,    67584, 0x3550ed0b
-0,       1100,       1100,        0,    67584, 0x86fe3eef
-0,       1320,       1320,        0,    67584, 0x3414bb33
-0,       1540,       1540,        0,    67584, 0x667bfb91
-0,       1760,       1760,        0,    67584, 0x6e1a4ccb
-0,       1980,       1980,        0,    67584, 0xf723f9ae
-0,       2200,       2200,        0,    67584, 0x88481d5d
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x128
+#sar 0: 0/1
+0,          0,          0,        1,    67584, 0x5eae629b
+0,          1,          1,        1,    67584, 0x32591227
+0,          2,          2,        1,    67584, 0x4e4424c7
+0,          3,          3,        1,    67584, 0x70db0134
+0,          4,          4,        1,    67584, 0x3550ed0b
+0,          5,          5,        1,    67584, 0x86fe3eef
+0,          6,          6,        1,    67584, 0x3414bb33
+0,          7,          7,        1,    67584, 0x667bfb91
+0,          8,          8,        1,    67584, 0x6e1a4ccb
+0,          9,          9,        1,    67584, 0xf723f9ae
+0,         10,         10,        1,    67584, 0x88481d5d
diff --git a/tests/ref/fate/cdxl-pal8-small b/tests/ref/fate/cdxl-pal8-small
index d285e9a190..326eef7763 100644
--- a/tests/ref/fate/cdxl-pal8-small
+++ b/tests/ref/fate/cdxl-pal8-small
@@ -1,47 +1,51 @@
-#tb 0: 1/11025
-0,          0,          0,        0,    30720, 0x0d552cfd
-0,        368,        368,        0,    30720, 0x3cf93291
-0,        736,        736,        0,    30720, 0xe45b2868
-0,       1104,       1104,        0,    30720, 0xb5df289b
-0,       1472,       1472,        0,    30720, 0x2562259e
-0,       1840,       1840,        0,    30720, 0xbf171878
-0,       2208,       2208,        0,    30720, 0x695b1d73
-0,       2576,       2576,        0,    30720, 0x89ef1614
-0,       2944,       2944,        0,    30720, 0xe12a1dd9
-0,       3312,       3312,        0,    30720, 0x49622ffa
-0,       3680,       3680,        0,    30720, 0xd6832703
-0,       4048,       4048,        0,    30720, 0xec1d0cb7
-0,       4416,       4416,        0,    30720, 0x8bee0525
-0,       4784,       4784,        0,    30720, 0x1e0cf0c4
-0,       5152,       5152,        0,    30720, 0xf83fd9db
-0,       5520,       5520,        0,    30720, 0xffb0d6ab
-0,       5888,       5888,        0,    30720, 0xe37fe239
-0,       6256,       6256,        0,    30720, 0x74b0f856
-0,       6624,       6624,        0,    30720, 0x9c88d3e1
-0,       6992,       6992,        0,    30720, 0x714db368
-0,       7360,       7360,        0,    30720, 0x6c8e8860
-0,       7728,       7728,        0,    30720, 0x804968e6
-0,       8096,       8096,        0,    30720, 0x7ac56ae4
-0,       8464,       8464,        0,    30720, 0xffd85cbf
-0,       8832,       8832,        0,    30720, 0x1f8455f9
-0,       9200,       9200,        0,    30720, 0x3ae65296
-0,       9568,       9568,        0,    30720, 0x9e544ecd
-0,       9936,       9936,        0,    30720, 0x35678e5a
-0,      10304,      10304,        0,    30720, 0x04bae866
-0,      10672,      10672,        0,    30720, 0xb126ed94
-0,      11040,      11040,        0,    30720, 0x1720efc5
-0,      11408,      11408,        0,    30720, 0x4c1b01c2
-0,      11776,      11776,        0,    30720, 0xd0a1e866
-0,      12144,      12144,        0,    30720, 0x0d330789
-0,      12512,      12512,        0,    30720, 0xf5ac08bb
-0,      12880,      12880,        0,    30720, 0x9abe0d83
-0,      13248,      13248,        0,    30720, 0xa44c02f4
-0,      13616,      13616,        0,    30720, 0xdc4cc688
-0,      13984,      13984,        0,    30720, 0x22eef3c1
-0,      14352,      14352,        0,    30720, 0xcfbc0d1d
-0,      14720,      14720,        0,    30720, 0x7104ea31
-0,      15088,      15088,        0,    30720, 0x80daecfb
-0,      15456,      15456,        0,    30720, 0xe1bab995
-0,      15824,      15824,        0,    30720, 0x43f4b896
-0,      16192,      16192,        0,    30720, 0xa0d2bf5c
-0,      16560,      16560,        0,    30720, 0x3556a114
+#tb 0: 368/11025
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x80
+#sar 0: 0/1
+0,          0,          0,        1,    30720, 0x0d552cfd
+0,          1,          1,        1,    30720, 0x3cf93291
+0,          2,          2,        1,    30720, 0xe45b2868
+0,          3,          3,        1,    30720, 0xb5df289b
+0,          4,          4,        1,    30720, 0x2562259e
+0,          5,          5,        1,    30720, 0xbf171878
+0,          6,          6,        1,    30720, 0x695b1d73
+0,          7,          7,        1,    30720, 0x89ef1614
+0,          8,          8,        1,    30720, 0xe12a1dd9
+0,          9,          9,        1,    30720, 0x49622ffa
+0,         10,         10,        1,    30720, 0xd6832703
+0,         11,         11,        1,    30720, 0xec1d0cb7
+0,         12,         12,        1,    30720, 0x8bee0525
+0,         13,         13,        1,    30720, 0x1e0cf0c4
+0,         14,         14,        1,    30720, 0xf83fd9db
+0,         15,         15,        1,    30720, 0xffb0d6ab
+0,         16,         16,        1,    30720, 0xe37fe239
+0,         17,         17,        1,    30720, 0x74b0f856
+0,         18,         18,        1,    30720, 0x9c88d3e1
+0,         19,         19,        1,    30720, 0x714db368
+0,         20,         20,        1,    30720, 0x6c8e8860
+0,         21,         21,        1,    30720, 0x804968e6
+0,         22,         22,        1,    30720, 0x7ac56ae4
+0,         23,         23,        1,    30720, 0xffd85cbf
+0,         24,         24,        1,    30720, 0x1f8455f9
+0,         25,         25,        1,    30720, 0x3ae65296
+0,         26,         26,        1,    30720, 0x9e544ecd
+0,         27,         27,        1,    30720, 0x35678e5a
+0,         28,         28,        1,    30720, 0x04bae866
+0,         29,         29,        1,    30720, 0xb126ed94
+0,         30,         30,        1,    30720, 0x1720efc5
+0,         31,         31,        1,    30720, 0x4c1b01c2
+0,         32,         32,        1,    30720, 0xd0a1e866
+0,         33,         33,        1,    30720, 0x0d330789
+0,         34,         34,        1,    30720, 0xf5ac08bb
+0,         35,         35,        1,    30720, 0x9abe0d83
+0,         36,         36,        1,    30720, 0xa44c02f4
+0,         37,         37,        1,    30720, 0xdc4cc688
+0,         38,         38,        1,    30720, 0x22eef3c1
+0,         39,         39,        1,    30720, 0xcfbc0d1d
+0,         40,         40,        1,    30720, 0x7104ea31
+0,         41,         41,        1,    30720, 0x80daecfb
+0,         42,         42,        1,    30720, 0xe1bab995
+0,         43,         43,        1,    30720, 0x43f4b896
+0,         44,         44,        1,    30720, 0xa0d2bf5c
+0,         45,         45,        1,    30720, 0x3556a114
diff --git a/tests/ref/fate/cfhd-1 b/tests/ref/fate/cfhd-1
index cccfc8b860..0280d66df1 100644
--- a/tests/ref/fate/cfhd-1
+++ b/tests/ref/fate/cfhd-1
@@ -1,4 +1,8 @@
 #tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,  1382400, 0xa3e49817
 0,          1,          1,        1,  1382400, 0x544fdfac
 0,          2,          2,        1,  1382400, 0x84964e11
diff --git a/tests/ref/fate/cfhd-2 b/tests/ref/fate/cfhd-2
index 1af92d0668..77db54c265 100644
--- a/tests/ref/fate/cfhd-2
+++ b/tests/ref/fate/cfhd-2
@@ -1,11 +1,15 @@
 #tb 0: 1001/30000
-0,          0,          0,        1,  1382400, 0xe1c2201d
-0,          1,          1,        1,  1382400, 0x13e5bc81
-0,          2,          2,        1,  1382400, 0x3062ca82
-0,          3,          3,        1,  1382400, 0x1c71624f
-0,          4,          4,        1,  1382400, 0xf286c080
-0,          5,          5,        1,  1382400, 0xd517d824
-0,          6,          6,        1,  1382400, 0xe571ffd5
-0,          7,          7,        1,  1382400, 0x94a523ff
-0,          8,          8,        1,  1382400, 0x85c58fca
-0,          9,          9,        1,  1382400, 0x6b3278b0
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
+0,          0,          0,        1,  2073600, 0x53fab433
+0,          1,          1,        1,  2073600, 0x0d2b3f64
+0,          2,          2,        1,  2073600, 0x857d1d48
+0,          3,          3,        1,  2073600, 0xe1a7df32
+0,          4,          4,        1,  2073600, 0x615861c1
+0,          5,          5,        1,  2073600, 0xf6cdb0a9
+0,          6,          6,        1,  2073600, 0x55dd9f16
+0,          7,          7,        1,  2073600, 0x7c126a32
+0,          8,          8,        1,  2073600, 0x53fdd4c5
+0,          9,          9,        1,  2073600, 0x6062a4b3
diff --git a/tests/ref/fate/cfhd-3 b/tests/ref/fate/cfhd-3
index 61698482fd..60e13c64a7 100644
--- a/tests/ref/fate/cfhd-3
+++ b/tests/ref/fate/cfhd-3
@@ -1,11 +1,15 @@
-#tb 0: 1/14587
-0,          0,          0,        0,   478144, 0x6ed01dcd
-0,       1000,       1000,        0,   478144, 0x6ed01dcd
-0,       2000,       2000,        0,   478144, 0x6ed01dcd
-0,       3000,       3000,        0,   478144, 0xb1b4a74b
-0,       4000,       4000,        0,   478144, 0x94c345c3
-0,       5000,       5000,        0,   478144, 0x05e0388d
-0,       6000,       6000,        0,   478144, 0xe747476a
-0,       7000,       7000,        0,   478144, 0x8c1561f1
-0,       8000,       8000,        0,   478144, 0x8c1561f1
-0,       9000,       9000,        0,   478144, 0x8c1561f1
+#tb 0: 1000/14587
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 496x241
+#sar 0: 0/1
+0,          0,          0,        1,   478144, 0x6ed01dcd
+0,          1,          1,        1,   478144, 0x6ed01dcd
+0,          2,          2,        1,   478144, 0x6ed01dcd
+0,          3,          3,        1,   478144, 0xb1b4a74b
+0,          4,          4,        1,   478144, 0x94c345c3
+0,          5,          5,        1,   478144, 0x05e0388d
+0,          6,          6,        1,   478144, 0xe747476a
+0,          7,          7,        1,   478144, 0x8c1561f1
+0,          8,          8,        1,   478144, 0x8c1561f1
+0,          9,          9,        1,   478144, 0x8c1561f1
diff --git a/tests/ref/fate/cine-demux b/tests/ref/fate/cine-demux
new file mode 100644
index 0000000000..bb7ac70d41
--- /dev/null
+++ b/tests/ref/fate/cine-demux
@@ -0,0 +1 @@
+CRC=0x8555ed33
diff --git a/tests/ref/fate/cljr b/tests/ref/fate/cljr
index f73c8c0b34..ad4388d43a 100644
--- a/tests/ref/fate/cljr
+++ b/tests/ref/fate/cljr
@@ -1,37 +1,41 @@
 #tb 0: 3521/100000
-0,          0,          0,        1,    64800, 0x44a1c47c
-0,          1,          1,        1,    64800, 0x649cc3a4
-0,          2,          2,        1,    64800, 0xcab1b88c
-0,          3,          3,        1,    64800, 0xf56cb788
-0,          4,          4,        1,    64800, 0x5336b618
-0,          5,          5,        1,    64800, 0x2704b438
-0,          6,          6,        1,    64800, 0x04c7b8e4
-0,          7,          7,        1,    64800, 0x3185b288
-0,          8,          8,        1,    64800, 0xa537c410
-0,          9,          9,        1,    64800, 0x6495c0f8
-0,         10,         10,        1,    64800, 0x06a1ca14
-0,         11,         11,        1,    64800, 0x69cdd2a0
-0,         12,         12,        1,    64800, 0x4ad2d828
-0,         13,         13,        1,    64800, 0x9604dea4
-0,         14,         14,        1,    64800, 0x1c00e430
-0,         15,         15,        1,    64800, 0x9afeefe0
-0,         16,         16,        1,    64800, 0xc13fdd78
-0,         17,         17,        1,    64800, 0x8438da7c
-0,         18,         18,        1,    64800, 0xa0ead278
-0,         19,         19,        1,    64800, 0xbeced2d8
-0,         20,         20,        1,    64800, 0x85bbd7dc
-0,         21,         21,        1,    64800, 0xbe59ce34
-0,         22,         22,        1,    64800, 0xd76ecccc
-0,         23,         23,        1,    64800, 0xe182b474
-0,         24,         24,        1,    64800, 0x916cc394
-0,         25,         25,        1,    64800, 0x7efebd14
-0,         26,         26,        1,    64800, 0x8d28c9f0
-0,         27,         27,        1,    64800, 0x00a1c960
-0,         28,         28,        1,    64800, 0xc164c400
-0,         29,         29,        1,    64800, 0xfd4dc544
-0,         30,         30,        1,    64800, 0x01bfbe38
-0,         31,         31,        1,    64800, 0xff11b5d0
-0,         32,         32,        1,    64800, 0x4876bb20
-0,         33,         33,        1,    64800, 0x756ecb04
-0,         34,         34,        1,    64800, 0x3b8cd540
-0,         35,         35,        1,    64800, 0x063ed444
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 240x180
+#sar 0: 0/1
+0,          0,          0,        1,    64800, 0x63132a60
+0,          1,          1,        1,    64800, 0xb3c729a3
+0,          2,          2,        1,    64800, 0xa27b1e0e
+0,          3,          3,        1,    64800, 0xb9131d00
+0,          4,          4,        1,    64800, 0xaf9a1bae
+0,          5,          5,        1,    64800, 0x11e319c5
+0,          6,          6,        1,    64800, 0xee6e1e6b
+0,          7,          7,        1,    64800, 0x418417e9
+0,          8,          8,        1,    64800, 0x339d29f4
+0,          9,          9,        1,    64800, 0x198926c4
+0,         10,         10,        1,    64800, 0x439a3044
+0,         11,         11,        1,    64800, 0x0a4e38e1
+0,         12,         12,        1,    64800, 0x6e043e7e
+0,         13,         13,        1,    64800, 0xde434533
+0,         14,         14,        1,    64800, 0xb58a4ad1
+0,         15,         15,        1,    64800, 0xaa105710
+0,         16,         16,        1,    64800, 0x1723440c
+0,         17,         17,        1,    64800, 0x3b064116
+0,         18,         18,        1,    64800, 0x853f38e4
+0,         19,         19,        1,    64800, 0x52f53917
+0,         20,         20,        1,    64800, 0xea363e5a
+0,         21,         21,        1,    64800, 0x4d0a344e
+0,         22,         22,        1,    64800, 0xe49232fc
+0,         23,         23,        1,    64800, 0x747b1a02
+0,         24,         24,        1,    64800, 0xbaa82992
+0,         25,         25,        1,    64800, 0x8e9322db
+0,         26,         26,        1,    64800, 0x029a2fcf
+0,         27,         27,        1,    64800, 0xb9a62f6a
+0,         28,         28,        1,    64800, 0x553329fe
+0,         29,         29,        1,    64800, 0x9a052b5b
+0,         30,         30,        1,    64800, 0xe2ff2404
+0,         31,         31,        1,    64800, 0xaacd1b59
+0,         32,         32,        1,    64800, 0x17d820de
+0,         33,         33,        1,    64800, 0x1c9e312c
+0,         34,         34,        1,    64800, 0x84df3b99
+0,         35,         35,        1,    64800, 0xf7d13aa1
diff --git a/tests/ref/fate/color_utils b/tests/ref/fate/color_utils
new file mode 100644
index 0000000000..10f8055916
--- /dev/null
+++ b/tests/ref/fate/color_utils
@@ -0,0 +1,304 @@
+AVColorTransferCharacteristic=1 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=1 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=1 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=1 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=1 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=1 calling func(0.003162) expected=0.014230
+AVColorTransferCharacteristic=1 calling func(0.005000) expected=0.022500
+AVColorTransferCharacteristic=1 calling func(0.009000) expected=0.040500
+AVColorTransferCharacteristic=1 calling func(0.015000) expected=0.067500
+AVColorTransferCharacteristic=1 calling func(0.100000) expected=0.290748
+AVColorTransferCharacteristic=1 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=1 calling func(52.370000) expected=6.427531
+AVColorTransferCharacteristic=1 calling func(125.098765) expected=9.558517
+AVColorTransferCharacteristic=1 calling func(1999.111230) expected=33.512490
+AVColorTransferCharacteristic=1 calling func(6945.443000) expected=58.768794
+AVColorTransferCharacteristic=1 calling func(15123.456700) expected=83.452916
+AVColorTransferCharacteristic=1 calling func(19845.889230) expected=94.321297
+AVColorTransferCharacteristic=1 calling func(98678.423100) expected=194.219568
+AVColorTransferCharacteristic=1 calling func(99999.899998) expected=195.386306
+AVColorTransferCharacteristic=4 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=4 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=4 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=4 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=4 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=4 calling func(0.003162) expected=0.073053
+AVColorTransferCharacteristic=4 calling func(0.005000) expected=0.089966
+AVColorTransferCharacteristic=4 calling func(0.009000) expected=0.117520
+AVColorTransferCharacteristic=4 calling func(0.015000) expected=0.148235
+AVColorTransferCharacteristic=4 calling func(0.100000) expected=0.351119
+AVColorTransferCharacteristic=4 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=4 calling func(52.370000) expected=6.045068
+AVColorTransferCharacteristic=4 calling func(125.098765) expected=8.980424
+AVColorTransferCharacteristic=4 calling func(1999.111230) expected=31.650490
+AVColorTransferCharacteristic=4 calling func(6945.443000) expected=55.747738
+AVColorTransferCharacteristic=4 calling func(15123.456700) expected=79.403820
+AVColorTransferCharacteristic=4 calling func(19845.889230) expected=89.843491
+AVColorTransferCharacteristic=4 calling func(98678.423100) expected=186.252024
+AVColorTransferCharacteristic=4 calling func(99999.899998) expected=187.381657
+AVColorTransferCharacteristic=5 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=5 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=5 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=5 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=5 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=5 calling func(0.003162) expected=0.127980
+AVColorTransferCharacteristic=5 calling func(0.005000) expected=0.150731
+AVColorTransferCharacteristic=5 calling func(0.009000) expected=0.185940
+AVColorTransferCharacteristic=5 calling func(0.015000) expected=0.223154
+AVColorTransferCharacteristic=5 calling func(0.100000) expected=0.439397
+AVColorTransferCharacteristic=5 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=5 calling func(52.370000) expected=4.111100
+AVColorTransferCharacteristic=5 calling func(125.098765) expected=5.610724
+AVColorTransferCharacteristic=5 calling func(1999.111230) expected=15.096294
+AVColorTransferCharacteristic=5 calling func(6945.443000) expected=23.552429
+AVColorTransferCharacteristic=5 calling func(15123.456700) expected=31.098005
+AVColorTransferCharacteristic=5 calling func(19845.889230) expected=34.267494
+AVColorTransferCharacteristic=5 calling func(98678.423100) expected=60.764620
+AVColorTransferCharacteristic=5 calling func(99999.899998) expected=61.054001
+AVColorTransferCharacteristic=6 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=6 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=6 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=6 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=6 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=6 calling func(0.003162) expected=0.014230
+AVColorTransferCharacteristic=6 calling func(0.005000) expected=0.022500
+AVColorTransferCharacteristic=6 calling func(0.009000) expected=0.040500
+AVColorTransferCharacteristic=6 calling func(0.015000) expected=0.067500
+AVColorTransferCharacteristic=6 calling func(0.100000) expected=0.290748
+AVColorTransferCharacteristic=6 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=6 calling func(52.370000) expected=6.427531
+AVColorTransferCharacteristic=6 calling func(125.098765) expected=9.558517
+AVColorTransferCharacteristic=6 calling func(1999.111230) expected=33.512490
+AVColorTransferCharacteristic=6 calling func(6945.443000) expected=58.768794
+AVColorTransferCharacteristic=6 calling func(15123.456700) expected=83.452916
+AVColorTransferCharacteristic=6 calling func(19845.889230) expected=94.321297
+AVColorTransferCharacteristic=6 calling func(98678.423100) expected=194.219568
+AVColorTransferCharacteristic=6 calling func(99999.899998) expected=195.386306
+AVColorTransferCharacteristic=7 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=7 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=7 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=7 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=7 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=7 calling func(0.003162) expected=0.012649
+AVColorTransferCharacteristic=7 calling func(0.005000) expected=0.020000
+AVColorTransferCharacteristic=7 calling func(0.009000) expected=0.036000
+AVColorTransferCharacteristic=7 calling func(0.015000) expected=0.060000
+AVColorTransferCharacteristic=7 calling func(0.100000) expected=0.282875
+AVColorTransferCharacteristic=7 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=7 calling func(52.370000) expected=6.487781
+AVColorTransferCharacteristic=7 calling func(125.098765) expected=9.653524
+AVColorTransferCharacteristic=7 calling func(1999.111230) expected=33.873408
+AVColorTransferCharacteristic=7 calling func(6945.443000) expected=59.410079
+AVColorTransferCharacteristic=7 calling func(15123.456700) expected=84.368216
+AVColorTransferCharacteristic=7 calling func(19845.889230) expected=95.357247
+AVColorTransferCharacteristic=7 calling func(98678.423100) expected=196.364477
+AVColorTransferCharacteristic=7 calling func(99999.899998) expected=197.544167
+AVColorTransferCharacteristic=8 calling func(-0.100000) expected=-0.100000
+AVColorTransferCharacteristic=8 calling func(-0.018054) expected=-0.018054
+AVColorTransferCharacteristic=8 calling func(-0.010000) expected=-0.010000
+AVColorTransferCharacteristic=8 calling func(-0.004490) expected=-0.004490
+AVColorTransferCharacteristic=8 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=8 calling func(0.003162) expected=0.003162
+AVColorTransferCharacteristic=8 calling func(0.005000) expected=0.005000
+AVColorTransferCharacteristic=8 calling func(0.009000) expected=0.009000
+AVColorTransferCharacteristic=8 calling func(0.015000) expected=0.015000
+AVColorTransferCharacteristic=8 calling func(0.100000) expected=0.100000
+AVColorTransferCharacteristic=8 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=8 calling func(52.370000) expected=52.370000
+AVColorTransferCharacteristic=8 calling func(125.098765) expected=125.098765
+AVColorTransferCharacteristic=8 calling func(1999.111230) expected=1999.111230
+AVColorTransferCharacteristic=8 calling func(6945.443000) expected=6945.443000
+AVColorTransferCharacteristic=8 calling func(15123.456700) expected=15123.456700
+AVColorTransferCharacteristic=8 calling func(19845.889230) expected=19845.889230
+AVColorTransferCharacteristic=8 calling func(98678.423100) expected=98678.423100
+AVColorTransferCharacteristic=8 calling func(99999.899998) expected=99999.899998
+AVColorTransferCharacteristic=9 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=9 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=9 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=9 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=9 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=9 calling func(0.003162) expected=0.000000
+AVColorTransferCharacteristic=9 calling func(0.005000) expected=0.000000
+AVColorTransferCharacteristic=9 calling func(0.009000) expected=0.000000
+AVColorTransferCharacteristic=9 calling func(0.015000) expected=0.088046
+AVColorTransferCharacteristic=9 calling func(0.100000) expected=0.500000
+AVColorTransferCharacteristic=9 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=9 calling func(52.370000) expected=1.859541
+AVColorTransferCharacteristic=9 calling func(125.098765) expected=2.048627
+AVColorTransferCharacteristic=9 calling func(1999.111230) expected=2.650418
+AVColorTransferCharacteristic=9 calling func(6945.443000) expected=2.920850
+AVColorTransferCharacteristic=9 calling func(15123.456700) expected=3.089826
+AVColorTransferCharacteristic=9 calling func(19845.889230) expected=3.148835
+AVColorTransferCharacteristic=9 calling func(98678.423100) expected=3.497111
+AVColorTransferCharacteristic=9 calling func(99999.899998) expected=3.500000
+AVColorTransferCharacteristic=10 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=10 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=10 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=10 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=10 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=10 calling func(0.003162) expected=0.000000
+AVColorTransferCharacteristic=10 calling func(0.005000) expected=0.079588
+AVColorTransferCharacteristic=10 calling func(0.009000) expected=0.181697
+AVColorTransferCharacteristic=10 calling func(0.015000) expected=0.270437
+AVColorTransferCharacteristic=10 calling func(0.100000) expected=0.600000
+AVColorTransferCharacteristic=10 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=10 calling func(52.370000) expected=1.687633
+AVColorTransferCharacteristic=10 calling func(125.098765) expected=1.838901
+AVColorTransferCharacteristic=10 calling func(1999.111230) expected=2.320335
+AVColorTransferCharacteristic=10 calling func(6945.443000) expected=2.536680
+AVColorTransferCharacteristic=10 calling func(15123.456700) expected=2.671860
+AVColorTransferCharacteristic=10 calling func(19845.889230) expected=2.719068
+AVColorTransferCharacteristic=10 calling func(98678.423100) expected=2.997689
+AVColorTransferCharacteristic=10 calling func(99999.899998) expected=3.000000
+AVColorTransferCharacteristic=11 calling func(-0.100000) expected=-0.290748
+AVColorTransferCharacteristic=11 calling func(-0.018054) expected=-0.081243
+AVColorTransferCharacteristic=11 calling func(-0.010000) expected=-0.045000
+AVColorTransferCharacteristic=11 calling func(-0.004490) expected=-0.020205
+AVColorTransferCharacteristic=11 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=11 calling func(0.003162) expected=0.014230
+AVColorTransferCharacteristic=11 calling func(0.005000) expected=0.022500
+AVColorTransferCharacteristic=11 calling func(0.009000) expected=0.040500
+AVColorTransferCharacteristic=11 calling func(0.015000) expected=0.067500
+AVColorTransferCharacteristic=11 calling func(0.100000) expected=0.290748
+AVColorTransferCharacteristic=11 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=11 calling func(52.370000) expected=6.427531
+AVColorTransferCharacteristic=11 calling func(125.098765) expected=9.558517
+AVColorTransferCharacteristic=11 calling func(1999.111230) expected=33.512490
+AVColorTransferCharacteristic=11 calling func(6945.443000) expected=58.768794
+AVColorTransferCharacteristic=11 calling func(15123.456700) expected=83.452916
+AVColorTransferCharacteristic=11 calling func(19845.889230) expected=94.321297
+AVColorTransferCharacteristic=11 calling func(98678.423100) expected=194.219568
+AVColorTransferCharacteristic=11 calling func(99999.899998) expected=195.386306
+AVColorTransferCharacteristic=12 calling func(-0.100000) expected=-0.206787
+AVColorTransferCharacteristic=12 calling func(-0.018054) expected=-0.109049
+AVColorTransferCharacteristic=12 calling func(-0.010000) expected=-0.089387
+AVColorTransferCharacteristic=12 calling func(-0.004490) expected=-0.020205
+AVColorTransferCharacteristic=12 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=12 calling func(0.003162) expected=0.014230
+AVColorTransferCharacteristic=12 calling func(0.005000) expected=0.022500
+AVColorTransferCharacteristic=12 calling func(0.009000) expected=0.040500
+AVColorTransferCharacteristic=12 calling func(0.015000) expected=0.067500
+AVColorTransferCharacteristic=12 calling func(0.100000) expected=0.290748
+AVColorTransferCharacteristic=12 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=12 calling func(52.370000) expected=6.427531
+AVColorTransferCharacteristic=12 calling func(125.098765) expected=9.558517
+AVColorTransferCharacteristic=12 calling func(1999.111230) expected=33.512490
+AVColorTransferCharacteristic=12 calling func(6945.443000) expected=58.768794
+AVColorTransferCharacteristic=12 calling func(15123.456700) expected=83.452916
+AVColorTransferCharacteristic=12 calling func(19845.889230) expected=94.321297
+AVColorTransferCharacteristic=12 calling func(98678.423100) expected=194.219568
+AVColorTransferCharacteristic=12 calling func(99999.899998) expected=195.386306
+AVColorTransferCharacteristic=13 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=13 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=13 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=13 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=13 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=13 calling func(0.003162) expected=0.040849
+AVColorTransferCharacteristic=13 calling func(0.005000) expected=0.061009
+AVColorTransferCharacteristic=13 calling func(0.009000) expected=0.093202
+AVColorTransferCharacteristic=13 calling func(0.015000) expected=0.128354
+AVColorTransferCharacteristic=13 calling func(0.100000) expected=0.349190
+AVColorTransferCharacteristic=13 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=13 calling func(52.370000) expected=5.434552
+AVColorTransferCharacteristic=13 calling func(125.098765) expected=7.835561
+AVColorTransferCharacteristic=13 calling func(1999.111230) expected=24.983090
+AVColorTransferCharacteristic=13 calling func(6945.443000) expected=42.013863
+AVColorTransferCharacteristic=13 calling func(15123.456700) expected=58.125003
+AVColorTransferCharacteristic=13 calling func(19845.889230) expected=65.100117
+AVColorTransferCharacteristic=13 calling func(98678.423100) expected=127.054607
+AVColorTransferCharacteristic=13 calling func(99999.899998) expected=127.761115
+AVColorTransferCharacteristic=14 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=14 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=14 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=14 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=14 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=14 calling func(0.003162) expected=0.014230
+AVColorTransferCharacteristic=14 calling func(0.005000) expected=0.022500
+AVColorTransferCharacteristic=14 calling func(0.009000) expected=0.040500
+AVColorTransferCharacteristic=14 calling func(0.015000) expected=0.067500
+AVColorTransferCharacteristic=14 calling func(0.100000) expected=0.290748
+AVColorTransferCharacteristic=14 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=14 calling func(52.370000) expected=6.427531
+AVColorTransferCharacteristic=14 calling func(125.098765) expected=9.558517
+AVColorTransferCharacteristic=14 calling func(1999.111230) expected=33.512490
+AVColorTransferCharacteristic=14 calling func(6945.443000) expected=58.768794
+AVColorTransferCharacteristic=14 calling func(15123.456700) expected=83.452916
+AVColorTransferCharacteristic=14 calling func(19845.889230) expected=94.321297
+AVColorTransferCharacteristic=14 calling func(98678.423100) expected=194.219568
+AVColorTransferCharacteristic=14 calling func(99999.899998) expected=195.386306
+AVColorTransferCharacteristic=15 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=15 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=15 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=15 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=15 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=15 calling func(0.003162) expected=0.014230
+AVColorTransferCharacteristic=15 calling func(0.005000) expected=0.022500
+AVColorTransferCharacteristic=15 calling func(0.009000) expected=0.040500
+AVColorTransferCharacteristic=15 calling func(0.015000) expected=0.067500
+AVColorTransferCharacteristic=15 calling func(0.100000) expected=0.290748
+AVColorTransferCharacteristic=15 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=15 calling func(52.370000) expected=6.427531
+AVColorTransferCharacteristic=15 calling func(125.098765) expected=9.558517
+AVColorTransferCharacteristic=15 calling func(1999.111230) expected=33.512490
+AVColorTransferCharacteristic=15 calling func(6945.443000) expected=58.768794
+AVColorTransferCharacteristic=15 calling func(15123.456700) expected=83.452916
+AVColorTransferCharacteristic=15 calling func(19845.889230) expected=94.321297
+AVColorTransferCharacteristic=15 calling func(98678.423100) expected=194.219568
+AVColorTransferCharacteristic=15 calling func(99999.899998) expected=195.386306
+AVColorTransferCharacteristic=16 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=16 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=16 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=16 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=16 calling func(0.000000) expected=0.000001
+AVColorTransferCharacteristic=16 calling func(0.003162) expected=0.011839
+AVColorTransferCharacteristic=16 calling func(0.005000) expected=0.015076
+AVColorTransferCharacteristic=16 calling func(0.009000) expected=0.020379
+AVColorTransferCharacteristic=16 calling func(0.015000) expected=0.026255
+AVColorTransferCharacteristic=16 calling func(0.100000) expected=0.062337
+AVColorTransferCharacteristic=16 calling func(1.000000) expected=0.149946
+AVColorTransferCharacteristic=16 calling func(52.370000) expected=0.444693
+AVColorTransferCharacteristic=16 calling func(125.098765) expected=0.530719
+AVColorTransferCharacteristic=16 calling func(1999.111230) expected=0.827376
+AVColorTransferCharacteristic=16 calling func(6945.443000) expected=0.961586
+AVColorTransferCharacteristic=16 calling func(15123.456700) expected=1.042921
+AVColorTransferCharacteristic=16 calling func(19845.889230) expected=1.070677
+AVColorTransferCharacteristic=16 calling func(98678.423100) expected=1.225908
+AVColorTransferCharacteristic=16 calling func(99999.899998) expected=1.227127
+AVColorTransferCharacteristic=17 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=17 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=17 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=17 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=17 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=17 calling func(0.003162) expected=0.105659
+AVColorTransferCharacteristic=17 calling func(0.005000) expected=0.126018
+AVColorTransferCharacteristic=17 calling func(0.009000) expected=0.157985
+AVColorTransferCharacteristic=17 calling func(0.015000) expected=0.192284
+AVColorTransferCharacteristic=17 calling func(0.100000) expected=0.398869
+AVColorTransferCharacteristic=17 calling func(1.000000) expected=0.967043
+AVColorTransferCharacteristic=17 calling func(52.370000) expected=4.432321
+AVColorTransferCharacteristic=17 calling func(125.098765) expected=6.195572
+AVColorTransferCharacteristic=17 calling func(1999.111230) expected=17.988639
+AVColorTransferCharacteristic=17 calling func(6945.443000) expected=29.041734
+AVColorTransferCharacteristic=17 calling func(15123.456700) expected=39.174525
+AVColorTransferCharacteristic=17 calling func(19845.889230) expected=43.490646
+AVColorTransferCharacteristic=17 calling func(98678.423100) expected=80.593559
+AVColorTransferCharacteristic=17 calling func(99999.899998) expected=81.006971
+AVColorTransferCharacteristic=18 calling func(-0.100000) expected=0.000000
+AVColorTransferCharacteristic=18 calling func(-0.018054) expected=0.000000
+AVColorTransferCharacteristic=18 calling func(-0.010000) expected=0.000000
+AVColorTransferCharacteristic=18 calling func(-0.004490) expected=0.000000
+AVColorTransferCharacteristic=18 calling func(0.000000) expected=0.000000
+AVColorTransferCharacteristic=18 calling func(0.003162) expected=0.097400
+AVColorTransferCharacteristic=18 calling func(0.005000) expected=0.122474
+AVColorTransferCharacteristic=18 calling func(0.009000) expected=0.164317
+AVColorTransferCharacteristic=18 calling func(0.015000) expected=0.212132
+AVColorTransferCharacteristic=18 calling func(0.100000) expected=0.544089
+AVColorTransferCharacteristic=18 calling func(1.000000) expected=1.000000
+AVColorTransferCharacteristic=18 calling func(52.370000) expected=1.712092
+AVColorTransferCharacteristic=18 calling func(125.098765) expected=1.867862
+AVColorTransferCharacteristic=18 calling func(1999.111230) expected=2.363502
+AVColorTransferCharacteristic=18 calling func(6945.443000) expected=2.586219
+AVColorTransferCharacteristic=18 calling func(15123.456700) expected=2.725380
+AVColorTransferCharacteristic=18 calling func(19845.889230) expected=2.773978
+AVColorTransferCharacteristic=18 calling func(98678.423100) expected=3.060803
+AVColorTransferCharacteristic=18 calling func(99999.899998) expected=3.063182
diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf b/tests/ref/fate/concat-demuxer-extended-lavf-mxf
new file mode 100644
index 0000000000..c47f14faa1
--- /dev/null
+++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf
@@ -0,0 +1 @@
+7e53f4c5cb0c9afda2771c9f0c697d9c *tests/data/fate/concat-demuxer-extended-lavf-mxf.ffprobe
diff --git a/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10 b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
new file mode 100644
index 0000000000..75d386e3c1
--- /dev/null
+++ b/tests/ref/fate/concat-demuxer-extended-lavf-mxf_d10
@@ -0,0 +1 @@
+44810fc2eeee0072d9d7011b0d2afe59 *tests/data/fate/concat-demuxer-extended-lavf-mxf_d10.ffprobe
diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
new file mode 100644
index 0000000000..1174a1e183
--- /dev/null
+++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf
@@ -0,0 +1,124 @@
+video|0|0|0.000000|-1|-0.040000|1|0.040000|N/A|N/A|24801|6144|K_
+audio|1|0|0.000000|0|0.000000|1920|0.040000|N/A|N/A|3840|31232|K_
+video|0|3|0.120000|0|0.000000|1|0.040000|N/A|N/A|16743|35840|__
+audio|1|1920|0.040000|1920|0.040000|1920|0.040000|N/A|N/A|3840|52736|K_
+video|0|1|0.040000|1|0.040000|1|0.040000|N/A|N/A|13812|57344|__
+audio|1|3840|0.080000|3840|0.080000|1920|0.040000|N/A|N/A|3840|71680|K_
+video|0|2|0.080000|2|0.080000|1|0.040000|N/A|N/A|13607|76288|__
+audio|1|5760|0.120000|5760|0.120000|1920|0.040000|N/A|N/A|3840|90112|K_
+video|0|6|0.240000|3|0.120000|1|0.040000|N/A|N/A|16158|94720|__
+audio|1|7680|0.160000|7680|0.160000|1920|0.040000|N/A|N/A|3840|111104|K_
+video|0|4|0.160000|4|0.160000|1|0.040000|N/A|N/A|13943|115712|__
+audio|1|9600|0.200000|9600|0.200000|1920|0.040000|N/A|N/A|3840|130048|K_
+video|0|5|0.200000|5|0.200000|1|0.040000|N/A|N/A|11223|134656|__
+audio|1|11520|0.240000|11520|0.240000|1920|0.040000|N/A|N/A|3840|145920|K_
+video|0|9|0.360000|6|0.240000|1|0.040000|N/A|N/A|20298|150528|__
+audio|1|13440|0.280000|13440|0.280000|1920|0.040000|N/A|N/A|3840|171008|K_
+video|0|7|0.280000|7|0.280000|1|0.040000|N/A|N/A|13341|175616|__
+audio|1|15360|0.320000|15360|0.320000|1920|0.040000|N/A|N/A|3840|189440|K_
+video|0|8|0.320000|8|0.320000|1|0.040000|N/A|N/A|12362|194048|__
+audio|1|17280|0.360000|17280|0.360000|1920|0.040000|N/A|N/A|3840|206848|K_
+video|0|12|0.480000|9|0.360000|1|0.040000|N/A|N/A|24786|211456|K_
+audio|1|19200|0.400000|19200|0.400000|1920|0.040000|N/A|N/A|3840|236544|K_
+video|0|10|0.400000|10|0.400000|1|0.040000|N/A|N/A|13377|241152|__
+audio|1|21120|0.440000|21120|0.440000|1920|0.040000|N/A|N/A|3840|254976|K_
+video|0|11|0.440000|11|0.440000|1|0.040000|N/A|N/A|15624|259584|__
+audio|1|23040|0.480000|23040|0.480000|1920|0.040000|N/A|N/A|3840|275456|K_
+video|0|15|0.600000|12|0.480000|1|0.040000|N/A|N/A|22597|280064|__
+audio|1|24960|0.520000|24960|0.520000|1920|0.040000|N/A|N/A|3840|303104|K_
+video|0|13|0.520000|13|0.520000|1|0.040000|N/A|N/A|15028|307712|__
+audio|1|26880|0.560000|26880|0.560000|1920|0.040000|N/A|N/A|3840|323072|K_
+video|0|14|0.560000|14|0.560000|1|0.040000|N/A|N/A|14014|327680|__
+audio|1|28800|0.600000|28800|0.600000|1920|0.040000|N/A|N/A|3840|342016|K_
+video|0|18|0.720000|15|0.600000|1|0.040000|N/A|N/A|20731|346624|__
+audio|1|30720|0.640000|30720|0.640000|1920|0.040000|N/A|N/A|3840|367616|K_
+video|0|16|0.640000|16|0.640000|1|0.040000|N/A|N/A|11946|372224|__
+audio|1|32640|0.680000|32640|0.680000|1920|0.040000|N/A|N/A|3840|384512|K_
+video|0|17|0.680000|17|0.680000|1|0.040000|N/A|N/A|14464|389120|__
+audio|1|34560|0.720000|34560|0.720000|1920|0.040000|N/A|N/A|3840|403968|K_
+video|0|21|0.840000|18|0.720000|1|0.040000|N/A|N/A|16189|408576|__
+audio|1|36480|0.760000|36480|0.760000|1920|0.040000|N/A|N/A|3840|424960|K_
+video|0|19|0.760000|19|0.760000|1|0.040000|N/A|N/A|10524|429568|__
+audio|1|38400|0.800000|38400|0.800000|1920|0.040000|N/A|N/A|3840|440320|K_
+video|0|20|0.800000|20|0.800000|1|0.040000|N/A|N/A|10599|444928|__
+audio|1|40320|0.840000|40320|0.840000|1920|0.040000|N/A|N/A|3840|455680|K_
+video|0|24|0.960000|21|0.840000|1|0.040000|N/A|N/A|24711|460288|K_
+audio|1|42240|0.880000|42240|0.880000|1920|0.040000|N/A|N/A|3840|485376|K_
+video|0|22|0.880000|22|0.880000|1|0.040000|N/A|N/A|10840|489984|__
+audio|1|44160|0.920000|44160|0.920000|1920|0.040000|N/A|N/A|3840|501248|K_
+video|0|23|0.920000|23|0.920000|1|0.040000|N/A|N/A|13350|505856|__
+audio|1|46080|0.960000|46080|0.960000|1920|0.040000|N/A|N/A|3840|519680|K_
+video|0|17|0.680000|14|0.560000|1|0.040000|N/A|N/A|24786|211456|K_
+audio|1|28800|0.600000|28800|0.600000|1920|0.040000|N/A|N/A|3840|236544|K_
+video|0|15|0.600000|15|0.600000|1|0.040000|N/A|N/A|13377|241152|__
+audio|1|30720|0.640000|30720|0.640000|1920|0.040000|N/A|N/A|3840|254976|K_
+video|0|16|0.640000|16|0.640000|1|0.040000|N/A|N/A|15624|259584|__
+audio|1|32640|0.680000|32640|0.680000|1920|0.040000|N/A|N/A|3840|275456|K_
+video|0|20|0.800000|17|0.680000|1|0.040000|N/A|N/A|22597|280064|__
+audio|1|34560|0.720000|34560|0.720000|1920|0.040000|N/A|N/A|3840|303104|K_
+video|0|18|0.720000|18|0.720000|1|0.040000|N/A|N/A|15028|307712|__
+audio|1|36480|0.760000|36480|0.760000|1920|0.040000|N/A|N/A|3840|323072|K_
+video|0|19|0.760000|19|0.760000|1|0.040000|N/A|N/A|14014|327680|__
+audio|1|38400|0.800000|38400|0.800000|1920|0.040000|N/A|N/A|3840|342016|K_
+video|0|23|0.920000|20|0.800000|1|0.040000|N/A|N/A|20731|346624|__
+audio|1|40320|0.840000|40320|0.840000|1920|0.040000|N/A|N/A|3840|367616|K_
+video|0|21|0.840000|21|0.840000|1|0.040000|N/A|N/A|11946|372224|__
+audio|1|42240|0.880000|42240|0.880000|1920|0.040000|N/A|N/A|3840|384512|K_
+video|0|22|0.880000|22|0.880000|1|0.040000|N/A|N/A|14464|389120|__
+audio|1|44160|0.920000|44160|0.920000|1920|0.040000|N/A|N/A|3840|403968|K_
+video|0|26|1.040000|23|0.920000|1|0.040000|N/A|N/A|16189|408576|__
+audio|1|46080|0.960000|46080|0.960000|1920|0.040000|N/A|N/A|3840|424960|K_
+video|0|24|0.960000|24|0.960000|1|0.040000|N/A|N/A|10524|429568|__
+audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|3840|440320|K_
+video|0|25|1.000000|25|1.000000|1|0.040000|N/A|N/A|10599|444928|__
+audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|3840|455680|K_
+video|0|29|1.160000|26|1.040000|1|0.040000|N/A|N/A|24711|460288|K_
+audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|3840|485376|K_
+video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|10840|489984|__
+audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|3840|501248|K_
+video|0|28|1.120000|28|1.120000|1|0.040000|N/A|N/A|13350|505856|__
+audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|3840|519680|K_
+video|0|25|1.000000|24|0.960000|1|0.040000|N/A|N/A|24801|6144|K_|1
+Strings Metadata
+audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|3840|31232|K_|1
+Strings Metadata
+video|0|28|1.120000|25|1.000000|1|0.040000|N/A|N/A|16743|35840|__|1
+Strings Metadata
+audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|3840|52736|K_|1
+Strings Metadata
+video|0|26|1.040000|26|1.040000|1|0.040000|N/A|N/A|13812|57344|__|1
+Strings Metadata
+audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|3840|71680|K_|1
+Strings Metadata
+video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|13607|76288|__|1
+Strings Metadata
+audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|3840|90112|K_|1
+Strings Metadata
+video|0|31|1.240000|28|1.120000|1|0.040000|N/A|N/A|16158|94720|__|1
+Strings Metadata
+audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|3840|111104|K_|1
+Strings Metadata
+video|0|29|1.160000|29|1.160000|1|0.040000|N/A|N/A|13943|115712|__|1
+Strings Metadata
+audio|1|57600|1.200000|57600|1.200000|1920|0.040000|N/A|N/A|3840|130048|K_|1
+Strings Metadata
+video|0|30|1.200000|30|1.200000|1|0.040000|N/A|N/A|11223|134656|__|1
+Strings Metadata
+audio|1|59520|1.240000|59520|1.240000|1920|0.040000|N/A|N/A|3840|145920|K_|1
+Strings Metadata
+video|0|34|1.360000|31|1.240000|1|0.040000|N/A|N/A|20298|150528|__|1
+Strings Metadata
+audio|1|61440|1.280000|61440|1.280000|1920|0.040000|N/A|N/A|3840|171008|K_|1
+Strings Metadata
+video|0|32|1.280000|32|1.280000|1|0.040000|N/A|N/A|13341|175616|__|1
+Strings Metadata
+audio|1|63360|1.320000|63360|1.320000|1920|0.040000|N/A|N/A|3840|189440|K_|1
+Strings Metadata
+video|0|33|1.320000|33|1.320000|1|0.040000|N/A|N/A|12362|194048|__|1
+Strings Metadata
+audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|3840|206848|K_|1
+Strings Metadata
+video|0|37|1.480000|34|1.360000|1|0.040000|N/A|N/A|24786|211456|K_|1
+Strings Metadata
+0|mpeg2video|4|video|1/25|[0][0][0][0]|0x0000|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|N/A|1|N/A|25/1|25/1|1/25|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|51|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
+1|pcm_s16le|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|1|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|768000|N/A|N/A|N/A|N/A|50|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
diff --git a/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10 b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10
new file mode 100644
index 0000000000..bd0e5e2a74
--- /dev/null
+++ b/tests/ref/fate/concat-demuxer-simple1-lavf-mxf_d10
@@ -0,0 +1,82 @@
+video|0|0|0.000000|0|0.000000|1|0.040000|N/A|N/A|150000|6144|K_
+audio|1|0|0.000000|0|0.000000|1920|0.040000|N/A|N/A|7680|156672|K_
+video|0|1|0.040000|1|0.040000|1|0.040000|N/A|N/A|150000|219136|K_
+audio|1|1920|0.040000|1920|0.040000|1920|0.040000|N/A|N/A|7680|369664|K_
+video|0|2|0.080000|2|0.080000|1|0.040000|N/A|N/A|150000|432128|K_
+audio|1|3840|0.080000|3840|0.080000|1920|0.040000|N/A|N/A|7680|582656|K_
+video|0|3|0.120000|3|0.120000|1|0.040000|N/A|N/A|150000|645120|K_
+audio|1|5760|0.120000|5760|0.120000|1920|0.040000|N/A|N/A|7680|795648|K_
+video|0|4|0.160000|4|0.160000|1|0.040000|N/A|N/A|150000|858112|K_
+audio|1|7680|0.160000|7680|0.160000|1920|0.040000|N/A|N/A|7680|1008640|K_
+video|0|5|0.200000|5|0.200000|1|0.040000|N/A|N/A|150000|1071104|K_
+audio|1|9600|0.200000|9600|0.200000|1920|0.040000|N/A|N/A|7680|1221632|K_
+video|0|6|0.240000|6|0.240000|1|0.040000|N/A|N/A|150000|1284096|K_
+audio|1|11520|0.240000|11520|0.240000|1920|0.040000|N/A|N/A|7680|1434624|K_
+video|0|7|0.280000|7|0.280000|1|0.040000|N/A|N/A|150000|1497088|K_
+audio|1|13440|0.280000|13440|0.280000|1920|0.040000|N/A|N/A|7680|1647616|K_
+video|0|8|0.320000|8|0.320000|1|0.040000|N/A|N/A|150000|1710080|K_
+audio|1|15360|0.320000|15360|0.320000|1920|0.040000|N/A|N/A|7680|1860608|K_
+video|0|9|0.360000|9|0.360000|1|0.040000|N/A|N/A|150000|1923072|K_
+audio|1|17280|0.360000|17280|0.360000|1920|0.040000|N/A|N/A|7680|2073600|K_
+video|0|10|0.400000|10|0.400000|1|0.040000|N/A|N/A|150000|2136064|K_
+audio|1|19200|0.400000|19200|0.400000|1920|0.040000|N/A|N/A|7680|2286592|K_
+video|0|11|0.440000|11|0.440000|1|0.040000|N/A|N/A|150000|2349056|K_
+audio|1|21120|0.440000|21120|0.440000|1920|0.040000|N/A|N/A|7680|2499584|K_
+video|0|12|0.480000|12|0.480000|1|0.040000|N/A|N/A|150000|2562048|K_
+audio|1|23040|0.480000|23040|0.480000|1920|0.040000|N/A|N/A|7680|2712576|K_
+video|0|13|0.520000|13|0.520000|1|0.040000|N/A|N/A|150000|2775040|K_
+audio|1|24960|0.520000|24960|0.520000|1920|0.040000|N/A|N/A|7680|2925568|K_
+video|0|14|0.560000|14|0.560000|1|0.040000|N/A|N/A|150000|2988032|K_
+audio|1|26880|0.560000|26880|0.560000|1920|0.040000|N/A|N/A|7680|3138560|K_
+video|0|15|0.600000|15|0.600000|1|0.040000|N/A|N/A|150000|3201024|K_
+audio|1|28800|0.600000|28800|0.600000|1920|0.040000|N/A|N/A|7680|3351552|K_
+video|0|16|0.640000|16|0.640000|1|0.040000|N/A|N/A|150000|3414016|K_
+audio|1|30720|0.640000|30720|0.640000|1920|0.040000|N/A|N/A|7680|3564544|K_
+video|0|17|0.680000|17|0.680000|1|0.040000|N/A|N/A|150000|3627008|K_
+audio|1|32640|0.680000|32640|0.680000|1920|0.040000|N/A|N/A|7680|3777536|K_
+video|0|18|0.720000|18|0.720000|1|0.040000|N/A|N/A|150000|3840000|K_
+audio|1|34560|0.720000|34560|0.720000|1920|0.040000|N/A|N/A|7680|3990528|K_
+video|0|19|0.760000|19|0.760000|1|0.040000|N/A|N/A|150000|4052992|K_
+audio|1|36480|0.760000|36480|0.760000|1920|0.040000|N/A|N/A|7680|4203520|K_
+video|0|20|0.800000|20|0.800000|1|0.040000|N/A|N/A|150000|4265984|K_
+audio|1|38400|0.800000|38400|0.800000|1920|0.040000|N/A|N/A|7680|4416512|K_
+video|0|21|0.840000|21|0.840000|1|0.040000|N/A|N/A|150000|4478976|K_
+audio|1|40320|0.840000|40320|0.840000|1920|0.040000|N/A|N/A|7680|4629504|K_
+video|0|22|0.880000|22|0.880000|1|0.040000|N/A|N/A|150000|4691968|K_
+audio|1|42240|0.880000|42240|0.880000|1920|0.040000|N/A|N/A|7680|4842496|K_
+video|0|23|0.920000|23|0.920000|1|0.040000|N/A|N/A|150000|4904960|K_
+audio|1|44160|0.920000|44160|0.920000|1920|0.040000|N/A|N/A|7680|5055488|K_
+video|0|24|0.960000|24|0.960000|1|0.040000|N/A|N/A|150000|5117952|K_
+audio|1|46080|0.960000|46080|0.960000|1920|0.040000|N/A|N/A|7680|5268480|K_
+video|0|25|1.000000|25|1.000000|1|0.040000|N/A|N/A|150000|4265984|K_
+audio|1|48000|1.000000|48000|1.000000|1920|0.040000|N/A|N/A|7680|4416512|K_
+video|0|26|1.040000|26|1.040000|1|0.040000|N/A|N/A|150000|4478976|K_
+audio|1|49920|1.040000|49920|1.040000|1920|0.040000|N/A|N/A|7680|4629504|K_
+video|0|27|1.080000|27|1.080000|1|0.040000|N/A|N/A|150000|4691968|K_
+audio|1|51840|1.080000|51840|1.080000|1920|0.040000|N/A|N/A|7680|4842496|K_
+video|0|28|1.120000|28|1.120000|1|0.040000|N/A|N/A|150000|4904960|K_
+audio|1|53760|1.120000|53760|1.120000|1920|0.040000|N/A|N/A|7680|5055488|K_
+video|0|29|1.160000|29|1.160000|1|0.040000|N/A|N/A|150000|5117952|K_
+audio|1|55680|1.160000|55680|1.160000|1920|0.040000|N/A|N/A|7680|5268480|K_
+video|0|30|1.200000|30|1.200000|1|0.040000|N/A|N/A|150000|1071104|K_|1
+Strings Metadata
+audio|1|57600|1.200000|57600|1.200000|1920|0.040000|N/A|N/A|7680|1221632|K_|1
+Strings Metadata
+video|0|31|1.240000|31|1.240000|1|0.040000|N/A|N/A|150000|1284096|K_|1
+Strings Metadata
+audio|1|59520|1.240000|59520|1.240000|1920|0.040000|N/A|N/A|7680|1434624|K_|1
+Strings Metadata
+video|0|32|1.280000|32|1.280000|1|0.040000|N/A|N/A|150000|1497088|K_|1
+Strings Metadata
+audio|1|61440|1.280000|61440|1.280000|1920|0.040000|N/A|N/A|7680|1647616|K_|1
+Strings Metadata
+video|0|33|1.320000|33|1.320000|1|0.040000|N/A|N/A|150000|1710080|K_|1
+Strings Metadata
+audio|1|63360|1.320000|63360|1.320000|1920|0.040000|N/A|N/A|7680|1860608|K_|1
+Strings Metadata
+video|0|34|1.360000|34|1.360000|1|0.040000|N/A|N/A|150000|1923072|K_|1
+Strings Metadata
+audio|1|65280|1.360000|65280|1.360000|1920|0.040000|N/A|N/A|7680|2073600|K_|1
+Strings Metadata
+0|mpeg2video|0|video|1/25|[0][0][0][0]|0x0000|720|608|0|0|0|1:1|45:38|yuv422p|5|tv|unknown|unknown|unknown|topleft|tt|N/A|1|N/A|25/1|25/1|1/25|0|0.000000|N/A|N/A|30000000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
+1|pcm_s16le|unknown|audio|1/48000|[0][0][0][0]|0x0000|s16|48000|2|unknown|16|N/A|0/0|0/0|1/48000|0|0.000000|N/A|N/A|1536000|N/A|N/A|N/A|N/A|35|0|0|0|0|0|0|0|0|0|0|0|0|0x060A2B340101010501010D001300000000000000000000000000000000000001
diff --git a/tests/ref/fate/concat-demuxer-simple2-lavf-ts b/tests/ref/fate/concat-demuxer-simple2-lavf-ts
new file mode 100644
index 0000000000..e5cf18bbce
--- /dev/null
+++ b/tests/ref/fate/concat-demuxer-simple2-lavf-ts
@@ -0,0 +1,215 @@
+video|1|982|0.010911|-2618|-0.029089|3600|0.040000|N/A|N/A|24801|564|K_MPEGTS Stream ID
+
+video|1|4582|0.050911|982|0.010911|3600|0.040000|N/A|N/A|16429|27072|__MPEGTS Stream ID
+
+video|1|8182|0.090911|4582|0.050911|3600|0.040000|N/A|N/A|14508|44932|__MPEGTS Stream ID
+
+video|1|11782|0.130911|8182|0.090911|3600|0.040000|N/A|N/A|12622|60536|__MPEGTS Stream ID
+
+video|1|15382|0.170911|11782|0.130911|3600|0.040000|N/A|N/A|13393|74260|__MPEGTS Stream ID
+
+video|1|18982|0.210911|15382|0.170911|3600|0.040000|N/A|N/A|13092|88924|__MPEGTS Stream ID
+
+video|1|22582|0.250911|18982|0.210911|3600|0.040000|N/A|N/A|12755|102836|__MPEGTS Stream ID
+
+video|1|26182|0.290911|22582|0.250911|3600|0.040000|N/A|N/A|12023|116748|__MPEGTS Stream ID
+
+audio|0|0|0.000000|0|0.000000|2351|0.026122|N/A|N/A|208|159988|K_MPEGTS Stream ID
+
+audio|0|2351|0.026122|2351|0.026122|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|4702|0.052244|4702|0.052244|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|7053|0.078367|7053|0.078367|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|9404|0.104489|9404|0.104489|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|11755|0.130611|11755|0.130611|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|14106|0.156733|14106|0.156733|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|16457|0.182856|16457|0.182856|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|18808|0.208978|18808|0.208978|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|21159|0.235100|21159|0.235100|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|23510|0.261222|23510|0.261222|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|25861|0.287344|25861|0.287344|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|28212|0.313467|28212|0.313467|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|30563|0.339589|30563|0.339589|2351|0.026122|N/A|N/A|209|N/A|K_
+video|1|29782|0.330911|26182|0.290911|3600|0.040000|N/A|N/A|14098|130096|__MPEGTS Stream ID
+
+video|1|33382|0.370911|29782|0.330911|3600|0.040000|N/A|N/A|13329|145324|__MPEGTS Stream ID
+
+video|1|36982|0.410911|33382|0.370911|3600|0.040000|N/A|N/A|12135|162996|__MPEGTS Stream ID
+
+video|1|40582|0.450911|36982|0.410911|3600|0.040000|N/A|N/A|12282|176344|__MPEGTS Stream ID
+
+video|1|44182|0.490911|40582|0.450911|3600|0.040000|N/A|N/A|24786|189692|K_MPEGTS Stream ID
+
+video|1|47782|0.530911|44182|0.490911|3600|0.040000|N/A|N/A|17440|216388|__MPEGTS Stream ID
+
+video|1|51382|0.570911|47782|0.530911|3600|0.040000|N/A|N/A|15019|235000|__MPEGTS Stream ID
+
+video|1|54982|0.610911|51382|0.570911|3600|0.040000|N/A|N/A|13449|251356|__MPEGTS Stream ID
+
+video|1|58582|0.650911|54982|0.610911|3600|0.040000|N/A|N/A|12398|266020|__MPEGTS Stream ID
+
+video|1|62182|0.690911|58582|0.650911|3600|0.040000|N/A|N/A|13455|279744|__MPEGTS Stream ID
+
+audio|0|32915|0.365722|32915|0.365722|2351|0.026122|N/A|N/A|209|322608|K_MPEGTS Stream ID
+
+audio|0|35266|0.391844|35266|0.391844|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|37617|0.417967|37617|0.417967|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|39968|0.444089|39968|0.444089|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|42319|0.470211|42319|0.470211|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|44670|0.496333|44670|0.496333|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|47021|0.522456|47021|0.522456|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|49372|0.548578|49372|0.548578|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|51723|0.574700|51723|0.574700|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|54074|0.600822|54074|0.600822|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|56425|0.626944|56425|0.626944|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|58776|0.653067|58776|0.653067|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|61127|0.679189|61127|0.679189|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|63478|0.705311|63478|0.705311|2351|0.026122|N/A|N/A|209|N/A|K_
+video|1|65782|0.730911|62182|0.690911|3600|0.040000|N/A|N/A|13836|294408|__MPEGTS Stream ID
+
+video|1|69382|0.770911|65782|0.730911|3600|0.040000|N/A|N/A|12163|309448|__MPEGTS Stream ID
+
+video|1|72982|0.810911|69382|0.770911|3600|0.040000|N/A|N/A|12692|325992|__MPEGTS Stream ID
+
+video|1|76582|0.850911|72982|0.810911|3600|0.040000|N/A|N/A|10824|339528|__MPEGTS Stream ID
+
+video|1|80182|0.890911|76582|0.850911|3600|0.040000|N/A|N/A|11286|351372|__MPEGTS Stream ID
+
+audio|0|65829|0.731433|65829|0.731433|2351|0.026122|N/A|N/A|209|404576|K_MPEGTS Stream ID
+
+audio|0|68180|0.757556|68180|0.757556|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|70531|0.783678|70531|0.783678|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|72882|0.809800|72882|0.809800|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|75233|0.835922|75233|0.835922|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|77584|0.862044|77584|0.862044|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|79935|0.888167|79935|0.888167|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|82286|0.914289|82286|0.914289|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|84637|0.940411|84637|0.940411|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|86988|0.966533|86988|0.966533|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|89339|0.992656|89339|0.992656|2351|0.026122|N/A|N/A|209|N/A|K_
+video|1|83782|0.930911|80182|0.890911|3600|0.040000|N/A|N/A|12678|363592|__MPEGTS Stream ID
+
+video|1|87382|0.970911|83782|0.930911|3600|0.040000|N/A|N/A|24711|377880|K_
+video|1|91964|1.021822|88364|0.981822|3600|0.040000|N/A|N/A|24801|564|K_MPEGTS Stream ID
+
+video|1|95564|1.061822|91964|1.021822|3600|0.040000|N/A|N/A|16429|27072|__MPEGTS Stream ID
+
+video|1|99164|1.101822|95564|1.061822|3600|0.040000|N/A|N/A|14508|44932|__MPEGTS Stream ID
+
+video|1|102764|1.141822|99164|1.101822|3600|0.040000|N/A|N/A|12622|60536|__MPEGTS Stream ID
+
+video|1|106364|1.181822|102764|1.141822|3600|0.040000|N/A|N/A|13393|74260|__MPEGTS Stream ID
+
+video|1|109964|1.221822|106364|1.181822|3600|0.040000|N/A|N/A|13092|88924|__MPEGTS Stream ID
+
+video|1|113564|1.261822|109964|1.221822|3600|0.040000|N/A|N/A|12755|102836|__MPEGTS Stream ID
+
+video|1|117164|1.301822|113564|1.261822|3600|0.040000|N/A|N/A|12023|116748|__MPEGTS Stream ID
+
+audio|0|90982|1.010911|90982|1.010911|2351|0.026122|N/A|N/A|208|159988|K_MPEGTS Stream ID
+
+audio|0|93333|1.037033|93333|1.037033|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|95684|1.063156|95684|1.063156|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|98035|1.089278|98035|1.089278|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|100386|1.115400|100386|1.115400|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|102737|1.141522|102737|1.141522|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|105088|1.167644|105088|1.167644|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|107439|1.193767|107439|1.193767|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|109790|1.219889|109790|1.219889|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|112141|1.246011|112141|1.246011|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|114492|1.272133|114492|1.272133|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|116843|1.298256|116843|1.298256|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|119194|1.324378|119194|1.324378|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|121545|1.350500|121545|1.350500|2351|0.026122|N/A|N/A|209|N/A|K_
+video|1|120764|1.341822|117164|1.301822|3600|0.040000|N/A|N/A|14098|130096|__MPEGTS Stream ID
+
+video|1|124364|1.381822|120764|1.341822|3600|0.040000|N/A|N/A|13329|145324|__MPEGTS Stream ID
+
+video|1|127964|1.421822|124364|1.381822|3600|0.040000|N/A|N/A|12135|162996|__MPEGTS Stream ID
+
+video|1|131564|1.461822|127964|1.421822|3600|0.040000|N/A|N/A|12282|176344|__MPEGTS Stream ID
+
+video|1|135164|1.501822|131564|1.461822|3600|0.040000|N/A|N/A|24786|189692|K_MPEGTS Stream ID
+
+video|1|138764|1.541822|135164|1.501822|3600|0.040000|N/A|N/A|17440|216388|__MPEGTS Stream ID
+
+video|1|142364|1.581822|138764|1.541822|3600|0.040000|N/A|N/A|15019|235000|__MPEGTS Stream ID
+
+video|1|145964|1.621822|142364|1.581822|3600|0.040000|N/A|N/A|13449|251356|__MPEGTS Stream ID
+
+video|1|149564|1.661822|145964|1.621822|3600|0.040000|N/A|N/A|12398|266020|__MPEGTS Stream ID
+
+video|1|153164|1.701822|149564|1.661822|3600|0.040000|N/A|N/A|13455|279744|__MPEGTS Stream ID
+
+audio|0|123897|1.376633|123897|1.376633|2351|0.026122|N/A|N/A|209|322608|K_MPEGTS Stream ID
+
+audio|0|126248|1.402756|126248|1.402756|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|128599|1.428878|128599|1.428878|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|130950|1.455000|130950|1.455000|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|133301|1.481122|133301|1.481122|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|135652|1.507244|135652|1.507244|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|138003|1.533367|138003|1.533367|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|140354|1.559489|140354|1.559489|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|142705|1.585611|142705|1.585611|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|145056|1.611733|145056|1.611733|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|147407|1.637856|147407|1.637856|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|149758|1.663978|149758|1.663978|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|152109|1.690100|152109|1.690100|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|154460|1.716222|154460|1.716222|2351|0.026122|N/A|N/A|209|N/A|K_
+video|1|156764|1.741822|153164|1.701822|3600|0.040000|N/A|N/A|13836|294408|__MPEGTS Stream ID
+
+video|1|160364|1.781822|156764|1.741822|3600|0.040000|N/A|N/A|12163|309448|__MPEGTS Stream ID
+
+video|1|163964|1.821822|160364|1.781822|3600|0.040000|N/A|N/A|12692|325992|__MPEGTS Stream ID
+
+video|1|167564|1.861822|163964|1.821822|3600|0.040000|N/A|N/A|10824|339528|__MPEGTS Stream ID
+
+video|1|171164|1.901822|167564|1.861822|3600|0.040000|N/A|N/A|11286|351372|__MPEGTS Stream ID
+
+audio|0|156811|1.742344|156811|1.742344|2351|0.026122|N/A|N/A|209|404576|K_MPEGTS Stream ID
+
+audio|0|159162|1.768467|159162|1.768467|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|161513|1.794589|161513|1.794589|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|163864|1.820711|163864|1.820711|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|166215|1.846833|166215|1.846833|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|168566|1.872956|168566|1.872956|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|170917|1.899078|170917|1.899078|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|173268|1.925200|173268|1.925200|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|175619|1.951322|175619|1.951322|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|177970|1.977444|177970|1.977444|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|180321|2.003567|180321|2.003567|2351|0.026122|N/A|N/A|209|N/A|K_
+video|1|174764|1.941822|171164|1.901822|3600|0.040000|N/A|N/A|12678|363592|__MPEGTS Stream ID
+
+video|1|178364|1.981822|174764|1.941822|3600|0.040000|N/A|N/A|24711|377880|K_
+video|1|139582|1.550911|135982|1.510911|3600|0.040000|N/A|N/A|12692|325992|__MPEGTS Stream ID
+
+video|1|143182|1.590911|139582|1.550911|3600|0.040000|N/A|N/A|10824|339528|__MPEGTS Stream ID
+
+video|1|146782|1.630911|143182|1.590911|3600|0.040000|N/A|N/A|11286|351372|__MPEGTS Stream ID
+
+audio|0|132429|1.471433|132429|1.471433|2351|0.026122|N/A|N/A|209|404576|K_MPEGTS Stream ID
+
+audio|0|134780|1.497556|134780|1.497556|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|137131|1.523678|137131|1.523678|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|139482|1.549800|139482|1.549800|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|141833|1.575922|141833|1.575922|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|144184|1.602044|144184|1.602044|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|146535|1.628167|146535|1.628167|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|148886|1.654289|148886|1.654289|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|151237|1.680411|151237|1.680411|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|153588|1.706533|153588|1.706533|2351|0.026122|N/A|N/A|209|N/A|K_
+audio|0|155939|1.732656|155939|1.732656|2351|0.026122|N/A|N/A|209|N/A|K_
+video|1|150382|1.670911|146782|1.630911|3600|0.040000|N/A|N/A|12678|363592|__MPEGTS Stream ID
+
+video|1|153982|1.710911|150382|1.670911|3600|0.040000|N/A|N/A|24711|377880|K_
+video|1|161182|1.790911|157582|1.750911|3600|0.040000|N/A|N/A|12135|162996|__MPEGTS Stream ID
+
+video|1|164782|1.830911|161182|1.790911|3600|0.040000|N/A|N/A|12282|176344|__MPEGTS Stream ID
+
+video|1|168382|1.870911|164782|1.830911|3600|0.040000|N/A|N/A|24786|189692|K_MPEGTS Stream ID
+
+video|1|171982|1.910911|168382|1.870911|3600|0.040000|N/A|N/A|17440|216388|__MPEGTS Stream ID
+
+video|1|175582|1.950911|171982|1.910911|3600|0.040000|N/A|N/A|15019|235000|__MPEGTS Stream ID
+
+0|mp2|unknown|audio|1/44100|[3][0][0][0]|0x0003|s16p|44100|1|mono|0|N/A|0/0|0/0|1/90000|0|0.000000|N/A|N/A|64000|N/A|N/A|N/A|N/A|89|0|0|0|0|0|0|0|0|0|0|0|0
+1|mpeg2video|4|video|1/25|[2][0][0][0]|0x0002|352|288|0|0|1|1:1|11:9|yuv420p|8|tv|unknown|unknown|unknown|left|progressive|N/A|1|N/A|25/1|25/1|1/90000|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|N/A|60|0|0|0|0|0|0|0|0|0|0|0|0
diff --git a/tests/ref/fate/copy-psp b/tests/ref/fate/copy-psp
new file mode 100644
index 0000000000..81eb172549
--- /dev/null
+++ b/tests/ref/fate/copy-psp
@@ -0,0 +1,288 @@
+cada61453a2483ef8ba1fb82c8bbff25 *tests/data/fate/copy-psp.psp
+2041433 tests/data/fate/copy-psp.psp
+#extradata 0:       51, 0xaf6d1012
+#extradata 1:        2, 0x00b200a1
+#tb 0: 1/90000
+#media_type 0: video
+#codec_id 0: h264
+#dimensions 0: 1280x720
+#sar 0: 3/4
+#tb 1: 1/48000
+#media_type 1: audio
+#codec_id 1: aac
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,          0,          0,     3003,    37084, 0x021a0d3f
+1,          0,          0,     1024,       10, 0x0e270398
+1,       1024,       1024,     1025,       10, 0x0f4703b8
+0,       3003,       3003,     3003,     6925, 0x011b3822, F=0x0
+1,       2049,       2049,     1023,      334, 0x2675a55f
+1,       3072,       3072,     1024,      230, 0xae3f7159
+0,       6006,       6006,     3003,     7555, 0x1bca7055, F=0x0
+1,       4096,       4096,     1025,      262, 0x76e98657
+0,       9009,       9009,     3003,     8757, 0x3a20f1d9, F=0x0
+1,       5121,       5121,     1023,      233, 0x262577fd
+1,       6144,       6144,     1024,      233, 0x75ab73c7
+0,      12012,      12012,     3003,    13027, 0x40e3644b, F=0x0
+1,       7168,       7168,     1025,      236, 0x701e7571
+0,      15015,      15015,     3003,    12987, 0x41133465, F=0x0
+1,       8193,       8193,     1023,      245, 0x09cd77dd
+1,       9216,       9216,     1024,      231, 0xa9cb7094
+0,      18018,      18018,     3003,    13987, 0x362d60c8, F=0x0
+1,      10240,      10240,     1025,      245, 0xc99d7a23
+0,      21021,      21021,     3003,    13963, 0x9b1124af, F=0x0
+1,      11265,      11265,     1023,      243, 0xbeeb7935
+1,      12288,      12288,     1024,      238, 0xe4bd7cf5
+0,      24024,      24024,     3003,    15351, 0xd21aa7af, F=0x0
+1,      13312,      13312,     1025,      238, 0x7e9b75d8
+1,      14337,      14337,     1023,      246, 0x49147fd8
+0,      27027,      27027,     3003,    21021, 0x9df020ce, F=0x0
+1,      15360,      15360,     1024,      246, 0x5a317584
+0,      30030,      30030,     3003,    14791, 0x8bee8b7d, F=0x0
+1,      16384,      16384,     1025,      231, 0xfcb075e9
+1,      17409,      17409,     1023,      232, 0xf3136bef
+0,      33033,      33033,     3003,    11922, 0x0b362d3d, F=0x0
+1,      18432,      18432,     1024,      237, 0xab837892
+0,      36036,      36036,     3003,    11239, 0x77fddbf0, F=0x0
+1,      19456,      19456,     1025,      232, 0x317c7568
+1,      20481,      20481,     1023,      234, 0x904a79bc
+0,      39039,      39039,     3003,    17621, 0xcb0a52fe, F=0x0
+1,      21504,      21504,     1024,      237, 0x28ec7ac7
+0,      42042,      42042,     3003,    10694, 0xc6b4d5fa, F=0x0
+1,      22528,      22528,     1025,      234, 0x1fd2755e
+1,      23553,      23553,     1023,      229, 0xdcaa78d0
+0,      45045,      45045,     3003,    45249, 0x6f6421ee
+1,      24576,      24576,     1024,      238, 0xfaf673bc
+1,      25600,      25600,     1025,      236, 0x16867d24
+0,      48048,      48048,     3003,    20842, 0x6521c147, F=0x0
+1,      26625,      26625,     1023,      238, 0x6ee87de7
+0,      51051,      51051,     3003,    21423, 0x7a01a052, F=0x0
+1,      27648,      27648,     1024,      234, 0xf4ee6df3
+1,      28672,      28672,     1025,      235, 0xe7b8777f
+0,      54054,      54054,     3003,    15648, 0x6dfd2f29, F=0x0
+1,      29697,      29697,     1023,      236, 0x8c367282
+0,      57057,      57057,     3003,    11961, 0x971439f6, F=0x0
+1,      30720,      30720,     1024,      239, 0x3be87756
+1,      31744,      31744,     1025,      243, 0x1bbb727b
+0,      60060,      60060,     3003,    15398, 0x93edd999, F=0x0
+1,      32769,      32769,     1023,      242, 0xb1c7746f
+0,      63063,      63063,     3003,    14844, 0x83811831, F=0x0
+1,      33792,      33792,     1024,      237, 0xe1c97add
+1,      34816,      34816,     1025,      235, 0xce716f9a
+0,      66066,      66066,     3003,    14585, 0xdd855cb8, F=0x0
+1,      35841,      35841,     1023,      237, 0x15697576
+0,      69069,      69069,     3003,    17576, 0xb7f618bc, F=0x0
+1,      36864,      36864,     1024,      237, 0x177c730f
+1,      37888,      37888,     1025,      236, 0x247b6cb5
+0,      72072,      72072,     3003,    15626, 0x3dcd59a4, F=0x0
+1,      38913,      38913,     1023,      241, 0x04b673d0
+1,      39936,      39936,     1024,      235, 0x8f037097
+0,      75075,      75075,     3003,    13658, 0xdfccadde, F=0x0
+1,      40960,      40960,     1025,      240, 0x2fc37000
+0,      78078,      78078,     3003,    16279, 0x280fb353, F=0x0
+1,      41985,      41985,     1023,      241, 0xd6647dd4
+1,      43008,      43008,     1024,      258, 0xf0d9812d
+0,      81081,      81081,     3003,    13135, 0xa20abdf0, F=0x0
+1,      44032,      44032,     1025,      238, 0x79e776e7
+0,      84084,      84084,     3003,    16185, 0x81148bd3, F=0x0
+1,      45057,      45057,     1023,      237, 0x12837273
+1,      46080,      46080,     1024,      236, 0xe53779a7
+0,      87087,      87087,     3003,    14966, 0xe8e6f6f3, F=0x0
+1,      47104,      47104,     1025,      235, 0xbe2f6f0e
+0,      90090,      90090,     3003,    54254, 0x1a7c2635
+1,      48129,      48129,     1023,      238, 0x61757449
+1,      49152,      49152,     1024,      234, 0x7e006ec2
+0,      93093,      93093,     3003,    11505, 0xb40d54c7, F=0x0
+1,      50176,      50176,     1025,      235, 0xb0f46927
+1,      51201,      51201,     1023,      237, 0x8db2767a
+0,      96096,      96096,     3003,    12070, 0x802756f8, F=0x0
+1,      52224,      52224,     1024,      236, 0x8708775a
+0,      99099,      99099,     3003,    12537, 0x2b4038dc, F=0x0
+1,      53248,      53248,     1025,      238, 0xe3437a1b
+1,      54273,      54273,     1023,      233, 0x6a66725d
+0,     102102,     102102,     3003,    16289, 0xb5428821, F=0x0
+1,      55296,      55296,     1024,      231, 0xb24f7340
+0,     105105,     105105,     3003,    17662, 0x44585aef, F=0x0
+1,      56320,      56320,     1025,      243, 0x8fb17a7f
+1,      57345,      57345,     1023,      240, 0x961f7d8e
+0,     108108,     108108,     3003,    21341, 0xbd485492, F=0x0
+1,      58368,      58368,     1024,      240, 0x57937425
+0,     111111,     111111,     3003,    18554, 0xafb64591, F=0x0
+1,      59392,      59392,     1025,      238, 0x09907666
+1,      60417,      60417,     1023,      239, 0x0bda830f
+0,     114114,     114114,     3003,    14356, 0xdee7d3eb, F=0x0
+1,      61440,      61440,     1024,      237, 0x57c07b31
+0,     117117,     117117,     3003,    15210, 0x0528bb14, F=0x0
+1,      62464,      62464,     1025,      232, 0x6a466fca
+1,      63489,      63489,     1023,      233, 0x8f4b6baa
+0,     120120,     120120,     3003,    18045, 0xdaddf4a5, F=0x0
+1,      64512,      64512,     1024,      227, 0x1b696c9c
+1,      65536,      65536,     1025,      236, 0xe01d7262
+0,     123123,     123123,     3003,    15922, 0xc29b27d0, F=0x0
+1,      66561,      66561,     1023,      240, 0xcd0e782e
+0,     126126,     126126,     3003,    13255, 0xb0b0e093, F=0x0
+1,      67584,      67584,     1024,      236, 0x042e7b88
+1,      68608,      68608,     1025,      238, 0xe2c47768
+0,     129129,     129129,     3003,    13365, 0xad86d6bf, F=0x0
+1,      69633,      69633,     1023,      236, 0x0ed47796
+0,     132132,     132132,     3003,    11754, 0x7d06ede8, F=0x0
+1,      70656,      70656,     1024,      239, 0x7371757e
+1,      71680,      71680,     1025,      234, 0x2096752e
+0,     135135,     135135,     3003,    23955, 0xd21cca3b
+1,      72705,      72705,     1023,      233, 0x59e777fb
+0,     138138,     138138,     3003,    16070, 0x74b2169d, F=0x0
+1,      73728,      73728,     1024,      239, 0x1c6470ba
+1,      74752,      74752,     1025,      236, 0xfe806da3
+0,     141141,     141141,     3003,    16446, 0x3495076e, F=0x0
+1,      75777,      75777,     1023,      240, 0x2ad1718a
+1,      76800,      76800,     1024,      236, 0x04b07e50
+0,     144144,     144144,     3003,    17400, 0x1cc3efdd, F=0x0
+1,      77824,      77824,     1025,      236, 0x77ad6f0e
+0,     147147,     147147,     3003,    22300, 0x32a03fba, F=0x0
+1,      78849,      78849,     1023,      241, 0x94927537
+1,      79872,      79872,     1024,      235, 0x629a6fbd
+0,     150150,     150150,     3003,    22783, 0xef212506, F=0x0
+1,      80896,      80896,     1025,      239, 0x09f679a2
+0,     153153,     153153,     3003,    20595, 0xb2f4b56d, F=0x0
+1,      81921,      81921,     1023,      237, 0xa36474d5
+1,      82944,      82944,     1024,      235, 0xd26a70e7
+0,     156156,     156156,     3003,    19942, 0x0c4ce0b8, F=0x0
+1,      83968,      83968,     1025,      238, 0xd95d71d9
+0,     159159,     159159,     3003,    23838, 0xc50f9426, F=0x0
+1,      84993,      84993,     1023,      237, 0x11ee7f87
+1,      86016,      86016,     1024,      239, 0x40127652
+0,     162162,     162162,     3003,    17974, 0xa878d8d6, F=0x0
+1,      87040,      87040,     1025,      233, 0x58757456
+1,      88065,      88065,     1023,      242, 0xff5f76f7
+0,     165165,     165165,     3003,    16650, 0x122b32c4, F=0x0
+1,      89088,      89088,     1024,      238, 0x15c173c8
+0,     168168,     168168,     3003,    15312, 0x133aae79, F=0x0
+1,      90112,      90112,     1025,      238, 0x140f79ba
+1,      91137,      91137,     1023,      233, 0xde9b769c
+0,     171171,     171171,     3003,    13753, 0xdb58b083, F=0x0
+1,      92160,      92160,     1024,      237, 0x0d9979a0
+0,     174174,     174174,     3003,    15097, 0x63ff384b, F=0x0
+1,      93184,      93184,     1025,      238, 0x87bf77a9
+1,      94209,      94209,     1023,      239, 0x1a197e12
+0,     177177,     177177,     3003,    14641, 0xafe08cb6, F=0x0
+1,      95232,      95232,     1024,      239, 0x22ef7995
+0,     180180,     180180,     3003,    29092, 0x0b42b3b3
+1,      96256,      96256,     1025,      234, 0xd4a9794c
+1,      97281,      97281,     1023,      234, 0x61377aea
+0,     183183,     183183,     3003,    10237, 0x505be360, F=0x0
+1,      98304,      98304,     1024,      230, 0x6c9e7294
+0,     186186,     186186,     3003,     9774, 0xbf14ba2d, F=0x0
+1,      99328,      99328,     1025,      237, 0x6caa7b23
+1,     100353,     100353,     1023,      237, 0x42196ff8
+0,     189189,     189189,     3003,    14459, 0x4dcb0f52, F=0x0
+1,     101376,     101376,     1024,      238, 0xbb96743d
+1,     102400,     102400,     1025,      236, 0x4e5f7b52
+0,     192192,     192192,     3003,    14486, 0xe1151810, F=0x0
+1,     103425,     103425,     1023,      238, 0x2d1878af
+0,     195195,     195195,     3003,    13444, 0x95487183, F=0x0
+1,     104448,     104448,     1024,      237, 0x42077cd4
+1,     105472,     105472,     1025,      238, 0x34d473fe
+0,     198198,     198198,     3003,    13548, 0x98376bda, F=0x0
+1,     106497,     106497,     1023,      237, 0xe3a675fd
+0,     201201,     201201,     3003,    16017, 0xeacb35e1, F=0x0
+1,     107520,     107520,     1024,      237, 0xf23d7e4e
+1,     108544,     108544,     1025,      237, 0xaeb47b4a
+0,     204204,     204204,     3003,    15774, 0x9178a444, F=0x0
+1,     109569,     109569,     1023,      233, 0xd73c7d0b
+0,     207207,     207207,     3003,    14213, 0xfbafb06e, F=0x0
+1,     110592,     110592,     1024,      231, 0x82fb7b39
+1,     111616,     111616,     1025,      237, 0x877d7830
+0,     210210,     210210,     3003,    11484, 0xdcfb4d3e, F=0x0
+1,     112641,     112641,     1023,      238, 0xa6687f78
+1,     113664,     113664,     1024,      235, 0x9d2b704d
+0,     213213,     213213,     3003,    11135, 0x63539825, F=0x0
+1,     114688,     114688,     1025,      230, 0x0c5a710a
+0,     216216,     216216,     3003,    14806, 0xa838e206, F=0x0
+1,     115713,     115713,     1023,      237, 0x728a7284
+1,     116736,     116736,     1024,      234, 0x524b7789
+0,     219219,     219219,     3003,    17308, 0x5e7bfef1, F=0x0
+1,     117760,     117760,     1025,      239, 0x70087c21
+0,     222222,     222222,     3003,    17683, 0x570a6478, F=0x0
+1,     118785,     118785,     1023,      236, 0x1de97b11
+1,     119808,     119808,     1024,      234, 0x8d3f7965
+0,     225225,     225225,     3003,    48630, 0x069ec47f
+1,     120832,     120832,     1025,      242, 0xe5337919
+0,     228228,     228228,     3003,    11899, 0x16270166, F=0x0
+1,     121857,     121857,     1023,      249, 0xed1373a5
+1,     122880,     122880,     1024,      236, 0xca247541
+0,     231231,     231231,     3003,    16519, 0xb620f0ab, F=0x0
+1,     123904,     123904,     1025,      236, 0x289a7798
+0,     234234,     234234,     3003,    13049, 0x051f52ab, F=0x0
+1,     124929,     124929,     1023,      240, 0xf1fe79fc
+1,     125952,     125952,     1024,      248, 0xc5348476
+0,     237237,     237237,     3003,    16160, 0xa21297c9, F=0x0
+1,     126976,     126976,     1025,      235, 0x4f897046
+1,     128001,     128001,     1023,      235, 0x7efc7af0
+0,     240240,     240240,     3003,    12955, 0xbf92f7b3, F=0x0
+1,     129024,     129024,     1024,      235, 0x8d66780b
+0,     243243,     243243,     3003,    17875, 0x61b5a332, F=0x0
+1,     130048,     130048,     1025,      236, 0x88cd7684
+1,     131073,     131073,     1023,      235, 0xdd60709c
+0,     246246,     246246,     3003,    13197, 0xba0da039, F=0x0
+1,     132096,     132096,     1024,      240, 0x140578ee
+0,     249249,     249249,     3003,    25564, 0x2aefc1ea, F=0x0
+1,     133120,     133120,     1025,      235, 0xc24579e0
+1,     134145,     134145,     1023,      233, 0xce1f7302
+0,     252252,     252252,     3003,    14700, 0x0452ebdf, F=0x0
+1,     135168,     135168,     1024,      233, 0x0aab7986
+0,     255255,     255255,     3003,    15489, 0x6b3ad36f, F=0x0
+1,     136192,     136192,     1025,      237, 0xb0c172fe
+1,     137217,     137217,     1023,      232, 0x95847212
+0,     258258,     258258,     3003,    17101, 0x8be63e37, F=0x0
+1,     138240,     138240,     1024,      234, 0x780975bc
+1,     139264,     139264,     1025,      239, 0xf12a7d34
+0,     261261,     261261,     3003,    12213, 0xcef78985, F=0x0
+1,     140289,     140289,     1023,      240, 0x7a6d76ee
+0,     264264,     264264,     3003,    14714, 0x8b5cc097, F=0x0
+1,     141312,     141312,     1024,      233, 0xec837905
+1,     142336,     142336,     1025,      237, 0xc8ed6f24
+0,     267267,     267267,     3003,    14395, 0xba7fe195, F=0x0
+1,     143361,     143361,     1023,      237, 0xbeb87cd3
+0,     270270,     270270,     3003,    37194, 0x1c341a12
+1,     144384,     144384,     1024,      232, 0xc80a741c
+1,     145408,     145408,     1025,      235, 0x94f07b00
+0,     273273,     273273,     3003,    14061, 0xa5c14f7f, F=0x0
+1,     146433,     146433,     1023,      238, 0x24ca7cb4
+0,     276276,     276276,     3003,    19443, 0xa7bbdef4, F=0x0
+1,     147456,     147456,     1024,      236, 0x43387d99
+1,     148480,     148480,     1025,      236, 0x8766772f
+0,     279279,     279279,     3003,    21733, 0xdad44c2b, F=0x0
+1,     149505,     149505,     1023,      235, 0xc4d77369
+1,     150528,     150528,     1024,      234, 0x8f817237
+0,     282282,     282282,     3003,    17971, 0x7deccbe1, F=0x0
+1,     151552,     151552,     1025,      234, 0xc5337464
+0,     285285,     285285,     3003,    14873, 0x617fb3f1, F=0x0
+1,     152577,     152577,     1023,      238, 0x0fdc7b4f
+1,     153600,     153600,     1024,      234, 0x0ca08072
+0,     288288,     288288,     3003,    15613, 0x8a293998, F=0x0
+1,     154624,     154624,     1025,      234, 0xa08f77cc
+0,     291291,     291291,     3003,    12489, 0xbfba1313, F=0x0
+1,     155649,     155649,     1023,      231, 0xab257042
+0,     294294,     294294,     3003,    18231, 0xaaaa9157, F=0x0
+0,     297297,     297297,     3003,    19204, 0x18c54ec1, F=0x0
+0,     300300,     300300,     3003,    19047, 0x6cb3e900, F=0x0
+0,     303303,     303303,     3003,    15667, 0x74e133ea, F=0x0
+0,     306306,     306306,     3003,    16883, 0x39acbcf7, F=0x0
+0,     309309,     309309,     3003,    14690, 0xa8788fe0, F=0x0
+0,     312312,     312312,     3003,    13132, 0xe8958b7b, F=0x0
+0,     315315,     315315,     3003,    29348, 0x54bfe307
+0,     318318,     318318,     3003,    12581, 0x19e56122, F=0x0
+0,     321321,     321321,     3003,    12604, 0xec0d9d05, F=0x0
+0,     324324,     324324,     3003,    16139, 0x3a6c6f69, F=0x0
+0,     327327,     327327,     3003,    15635, 0x1d295c5e, F=0x0
+0,     330330,     330330,     3003,    13092, 0xd95889a5, F=0x0
+0,     333333,     333333,     3003,    10733, 0x24fb12f1, F=0x0
+0,     336336,     336336,     3003,    10358, 0xdbf93784, F=0x0
+0,     339339,     339339,     3003,     9539, 0x5c99853e, F=0x0
+0,     342342,     342342,     3003,    12646, 0xf745ae34, F=0x0
+0,     345345,     345345,     3003,    11203, 0x4385e4c9, F=0x0
+0,     348348,     348348,     3003,    15577, 0x86b16d42, F=0x0
+0,     351351,     351351,     3003,    12077, 0xe31ab9bb, F=0x0
+0,     354354,     354354,     3003,    19177, 0x8e7b6d9b, F=0x0
+0,     357357,     357357,     3003,    13853, 0x274b343a, F=0x0
diff --git a/tests/ref/fate/copy-trac2211-avi b/tests/ref/fate/copy-trac2211-avi
new file mode 100644
index 0000000000..007349e572
--- /dev/null
+++ b/tests/ref/fate/copy-trac2211-avi
@@ -0,0 +1,54 @@
+6f6b211cbc8de9871e8e09e64048e2f9 *tests/data/fate/copy-trac2211-avi.avi
+1777924 tests/data/fate/copy-trac2211-avi.avi
+#tb 0: 1/14
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1440x1080
+#sar 0: 4/3
+0,          5,          5,        1,  2332800, 0xa9dcb2ac
+0,          6,          6,        1,  2332800, 0x9b17af27
+0,          7,          7,        1,  2332800, 0x02da3196
+0,          8,          8,        1,  2332800, 0x9c78ed62
+0,          9,          9,        1,  2332800, 0xa6e926a0
+0,         10,         10,        1,  2332800, 0x324e51d2
+0,         11,         11,        1,  2332800, 0xd8289620
+0,         12,         12,        1,  2332800, 0xfc3619f9
+0,         13,         13,        1,  2332800, 0x6b8d2560
+0,         14,         14,        1,  2332800, 0x5714dca0
+0,         15,         15,        1,  2332800, 0x246e2842
+0,         16,         16,        1,  2332800, 0x59bc0b2e
+0,         17,         17,        1,  2332800, 0x24fe5cfa
+0,         18,         18,        1,  2332800, 0xb9607c3e
+0,         19,         19,        1,  2332800, 0x663669c9
+0,         21,         21,        1,  2332800, 0xd37fd62f
+0,         23,         23,        1,  2332800, 0x2d7db904
+0,         25,         25,        1,  2332800, 0x79a53eba
+0,         27,         27,        1,  2332800, 0x3b0c7e19
+0,         29,         29,        1,  2332800, 0xd12f64c5
+0,         31,         31,        1,  2332800, 0xacdb407f
+0,         33,         33,        1,  2332800, 0x829d7e61
+0,         35,         35,        1,  2332800, 0x7932b82f
+0,         37,         37,        1,  2332800, 0x61f81627
+0,         39,         39,        1,  2332800, 0xa1a2e000
+0,         41,         41,        1,  2332800, 0x93aad5e9
+0,         43,         43,        1,  2332800, 0x9993b5b5
+0,         45,         45,        1,  2332800, 0x6ac48232
+0,         47,         47,        1,  2332800, 0x5738f9c0
+0,         49,         49,        1,  2332800, 0x82a59d01
+0,         51,         51,        1,  2332800, 0xc4664862
+0,         53,         53,        1,  2332800, 0xf0e6222d
+0,         55,         55,        1,  2332800, 0xd29e7100
+0,         57,         57,        1,  2332800, 0xe093ef85
+0,         59,         59,        1,  2332800, 0x28c68a65
+0,         61,         61,        1,  2332800, 0x49a6b21e
+0,         63,         63,        1,  2332800, 0xfb28a097
+0,         65,         65,        1,  2332800, 0xade1e336
+0,         67,         67,        1,  2332800, 0xe5118412
+0,         69,         69,        1,  2332800, 0x58750176
+0,         71,         71,        1,  2332800, 0xacb99939
+0,         73,         73,        1,  2332800, 0x80b968d3
+0,         75,         75,        1,  2332800, 0xa45f4e6f
+0,         77,         77,        1,  2332800, 0xe0fcbade
+0,         78,         78,        1,  2332800, 0x19568f4d
+0,         79,         79,        1,  2332800, 0x33c53f59
+0,         80,         80,        1,  2332800, 0xbdbe8fbf
diff --git a/tests/ref/fate/copy-trac236 b/tests/ref/fate/copy-trac236
new file mode 100644
index 0000000000..c5240ca3d3
--- /dev/null
+++ b/tests/ref/fate/copy-trac236
@@ -0,0 +1,25 @@
+d6e3d97b522ce881ed29c5da74cc7e63 *tests/data/fate/copy-trac236.mov
+630810 tests/data/fate/copy-trac236.mov
+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 10/11
+#tb 1: 1/48000
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,          0,          0,        1,   518400, 0x81ab2140
+1,          0,          0,     1024,     4096, 0x67dc99a3
+1,       1024,       1024,     1024,     4096, 0xf115a681
+0,          1,          1,        1,   518400, 0x81ab2140
+1,       2048,       2048,     1024,     4096, 0xf455b597
+1,       3072,       3072,     1024,     4096, 0x67dc99a3
+0,          2,          2,        1,   518400, 0x81ab2140
+1,       4096,       4096,     1024,     4096, 0xf115a681
+0,          3,          3,        1,   518400, 0x81ab2140
+1,       5120,       5120,     1024,     4096, 0xf455b597
+1,       6144,       6144,      759,     3036, 0xa291a36d
+0,          4,          4,        1,   518400, 0x81ab2140
diff --git a/tests/ref/fate/copy-trac3074 b/tests/ref/fate/copy-trac3074
new file mode 100644
index 0000000000..5ce5694260
--- /dev/null
+++ b/tests/ref/fate/copy-trac3074
@@ -0,0 +1,659 @@
+39aef1afff761d673fd1be07182941d1 *tests/data/fate/copy-trac3074.mp4
+333991 tests/data/fate/copy-trac3074.mp4
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: eac3
+#sample_rate 0: 48000
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1536,      512, 0x2beaf79f, S=1,        4, 0x00000000
+0,       1536,       1536,     1536,      512, 0x29ddf9d6
+0,       3072,       3072,     1536,      512, 0xba0afa79
+0,       4608,       4608,     1536,      512, 0xe019f394
+0,       6144,       6144,     1536,      512, 0xf501f5ab
+0,       7680,       7680,     1536,      512, 0x5ed3f35c
+0,       9216,       9216,     1536,      512, 0xb2a5f67b
+0,      10752,      10752,     1536,      512, 0xdab3f328
+0,      12288,      12288,     1536,      512, 0x490dfa2e
+0,      13824,      13824,     1536,      512, 0x26dffa1d
+0,      15360,      15360,     1536,      512, 0xa8daf5cd
+0,      16896,      16896,     1536,      512, 0x823a01e1
+0,      18432,      18432,     1536,      512, 0xf2feee89
+0,      19968,      19968,     1536,      512, 0x58f5ebe2
+0,      21504,      21504,     1536,      512, 0x8618f679
+0,      23040,      23040,     1536,      512, 0xfbe3f0e9
+0,      24576,      24576,     1536,      512, 0xadc3f479
+0,      26112,      26112,     1536,      512, 0xe85ef861
+0,      27648,      27648,     1536,      512, 0x788cf985
+0,      29184,      29184,     1536,      512, 0x44cf00c1
+0,      30720,      30720,     1536,      512, 0x3398fbf8
+0,      32256,      32256,     1536,      512, 0xfbfafc32
+0,      33792,      33792,     1536,      512, 0x68fdf9db
+0,      35328,      35328,     1536,      512, 0xb848f4fa
+0,      36864,      36864,     1536,      512, 0x245af55e
+0,      38400,      38400,     1536,      512, 0x5027f295
+0,      39936,      39936,     1536,      512, 0x7d74f988
+0,      41472,      41472,     1536,      512, 0x7179f92d
+0,      43008,      43008,     1536,      512, 0xb2eff797
+0,      44544,      44544,     1536,      512, 0x1625f5fa
+0,      46080,      46080,     1536,      512, 0x3682f8b4
+0,      47616,      47616,     1536,      512, 0xc9e3f9a6
+0,      49152,      49152,     1536,      512, 0x1fd50294
+0,      50688,      50688,     1536,      512, 0xacd0f967
+0,      52224,      52224,     1536,      512, 0xfce1f614
+0,      53760,      53760,     1536,      512, 0x8a96f555
+0,      55296,      55296,     1536,      512, 0xeb93e8eb
+0,      56832,      56832,     1536,      512, 0x3d63f049
+0,      58368,      58368,     1536,      512, 0x92ffefa2
+0,      59904,      59904,     1536,      512, 0x634ced64
+0,      61440,      61440,     1536,      512, 0xf372f256
+0,      62976,      62976,     1536,      512, 0xef28ec45
+0,      64512,      64512,     1536,      512, 0x0973f647
+0,      66048,      66048,     1536,      512, 0x11e1f7d9
+0,      67584,      67584,     1536,      512, 0x63ccf4f7
+0,      69120,      69120,     1536,      512, 0xa0e4f3c8
+0,      70656,      70656,     1536,      512, 0x0ab3f11a
+0,      72192,      72192,     1536,      512, 0xcbf8f8a2
+0,      73728,      73728,     1536,      512, 0xb102ff6f
+0,      75264,      75264,     1536,      512, 0xbfa6ff2f
+0,      76800,      76800,     1536,      512, 0xc88301c4
+0,      78336,      78336,     1536,      512, 0xab08f52a
+0,      79872,      79872,     1536,      512, 0x9401f177
+0,      81408,      81408,     1536,      512, 0xd8faf12c
+0,      82944,      82944,     1536,      512, 0x9f19f770
+0,      84480,      84480,     1536,      512, 0x27eaf637
+0,      86016,      86016,     1536,      512, 0xdaa4f256
+0,      87552,      87552,     1536,      512, 0x6170f6ef
+0,      89088,      89088,     1536,      512, 0xeaf8fee4
+0,      90624,      90624,     1536,      512, 0xd438f881
+0,      92160,      92160,     1536,      512, 0x9970f701
+0,      93696,      93696,     1536,      512, 0x9d9af25c
+0,      95232,      95232,     1536,      512, 0xa9ee049e
+0,      96768,      96768,     1536,      512, 0xe87af4a7
+0,      98304,      98304,     1536,      512, 0x5776f68a
+0,      99840,      99840,     1536,      512, 0xce3af291
+0,     101376,     101376,     1536,      512, 0x4994f1e9
+0,     102912,     102912,     1536,      512, 0x97d8f8e4
+0,     104448,     104448,     1536,      512, 0x1b03f2bb
+0,     105984,     105984,     1536,      512, 0xa674ede4
+0,     107520,     107520,     1536,      512, 0x9607eede
+0,     109056,     109056,     1536,      512, 0xf225ed64
+0,     110592,     110592,     1536,      512, 0xa59ff1af
+0,     112128,     112128,     1536,      512, 0xa73cf082
+0,     113664,     113664,     1536,      512, 0xb504f86f
+0,     115200,     115200,     1536,      512, 0x3e7cf849
+0,     116736,     116736,     1536,      512, 0x2625f150
+0,     118272,     118272,     1536,      512, 0x8dc7fa6c
+0,     119808,     119808,     1536,      512, 0x4116f6fb
+0,     121344,     121344,     1536,      512, 0xfb41f025
+0,     122880,     122880,     1536,      512, 0xf2ddf047
+0,     124416,     124416,     1536,      512, 0x3e3af43d
+0,     125952,     125952,     1536,      512, 0xbd12031c
+0,     127488,     127488,     1536,      512, 0x144bfa82
+0,     129024,     129024,     1536,      512, 0x4221f8b4
+0,     130560,     130560,     1536,      512, 0x95e1f375
+0,     132096,     132096,     1536,      512, 0x15a1e638
+0,     133632,     133632,     1536,      512, 0x3945f461
+0,     135168,     135168,     1536,      512, 0xa95ef996
+0,     136704,     136704,     1536,      512, 0x84caee4a
+0,     138240,     138240,     1536,      512, 0x0339f13a
+0,     139776,     139776,     1536,      512, 0x010c01b5
+0,     141312,     141312,     1536,      512, 0xb042eb63
+0,     142848,     142848,     1536,      512, 0x1d30f50b
+0,     144384,     144384,     1536,      512, 0x8ef1f411
+0,     145920,     145920,     1536,      512, 0x1f68f161
+0,     147456,     147456,     1536,      512, 0xc2a002e2
+0,     148992,     148992,     1536,      512, 0x87bef3a3
+0,     150528,     150528,     1536,      512, 0xee24fc34
+0,     152064,     152064,     1536,      512, 0x0de2f86f
+0,     153600,     153600,     1536,      512, 0xda6ef5c5
+0,     155136,     155136,     1536,      512, 0x538ef1b3
+0,     156672,     156672,     1536,      512, 0x059befac
+0,     158208,     158208,     1536,      512, 0x0fedfa87
+0,     159744,     159744,     1536,      512, 0x8f04f38c
+0,     161280,     161280,     1536,      512, 0x4195f4fa
+0,     162816,     162816,     1536,      512, 0x36e5fa8a
+0,     164352,     164352,     1536,      512, 0x27cdf74e
+0,     165888,     165888,     1536,      512, 0x0a7dee39
+0,     167424,     167424,     1536,      512, 0xb143f9fe
+0,     168960,     168960,     1536,      512, 0x57dff4eb
+0,     170496,     170496,     1536,      512, 0xbf56ee82
+0,     172032,     172032,     1536,      512, 0x8752f6a5
+0,     173568,     173568,     1536,      512, 0xa647fd42
+0,     175104,     175104,     1536,      512, 0xe8f9eb59
+0,     176640,     176640,     1536,      512, 0xba0aeb49
+0,     178176,     178176,     1536,      512, 0xaa42f9f6
+0,     179712,     179712,     1536,      512, 0xc664ed11
+0,     181248,     181248,     1536,      512, 0xbcaaf855
+0,     182784,     182784,     1536,      512, 0x2631f9ed
+0,     184320,     184320,     1536,      512, 0xc4f8f251
+0,     185856,     185856,     1536,      512, 0x1fc2f2af
+0,     187392,     187392,     1536,      512, 0xdd2ff3c7
+0,     188928,     188928,     1536,      512, 0xb783f7f9
+0,     190464,     190464,     1536,      512, 0xf6acf1cb
+0,     192000,     192000,     1536,      512, 0x1db2fb58
+0,     193536,     193536,     1536,      512, 0x2241e93d
+0,     195072,     195072,     1536,      512, 0x619bf1bf
+0,     196608,     196608,     1536,      512, 0xe3ddf0ce
+0,     198144,     198144,     1536,      512, 0xd94af1be
+0,     199680,     199680,     1536,      512, 0xc899f2ab
+0,     201216,     201216,     1536,      512, 0xd044f1f7
+0,     202752,     202752,     1536,      512, 0xce7507a7
+0,     204288,     204288,     1536,      512, 0x2421e95b
+0,     205824,     205824,     1536,      512, 0x2c52f48c
+0,     207360,     207360,     1536,      512, 0xda31fc4e
+0,     208896,     208896,     1536,      512, 0xb8dcfdda
+0,     210432,     210432,     1536,      512, 0xccc6f055
+0,     211968,     211968,     1536,      512, 0x8c01f9d9
+0,     213504,     213504,     1536,      512, 0xcf36ec40
+0,     215040,     215040,     1536,      512, 0x5bcafa5c
+0,     216576,     216576,     1536,      512, 0xb756f560
+0,     218112,     218112,     1536,      512, 0x1849f744
+0,     219648,     219648,     1536,      512, 0x9d9bf5ac
+0,     221184,     221184,     1536,      512, 0xaea3f847
+0,     222720,     222720,     1536,      512, 0xfd84f817
+0,     224256,     224256,     1536,      512, 0x5ba0ed29
+0,     225792,     225792,     1536,      512, 0xd3b3f400
+0,     227328,     227328,     1536,      512, 0x6156f6d9
+0,     228864,     228864,     1536,      512, 0xdbc8f4b9
+0,     230400,     230400,     1536,      512, 0x4a48fbe3
+0,     231936,     231936,     1536,      512, 0x7c3cf3ed
+0,     233472,     233472,     1536,      512, 0x078eefa2
+0,     235008,     235008,     1536,      512, 0x6b02ec30
+0,     236544,     236544,     1536,      512, 0xa0daf283
+0,     238080,     238080,     1536,      512, 0x6c33f746
+0,     239616,     239616,     1536,      512, 0x38cff4c4
+0,     241152,     241152,     1536,      512, 0xe84cf3fe
+0,     242688,     242688,     1536,      512, 0x1a4cfda0
+0,     244224,     244224,     1536,      512, 0x5590f98b
+0,     245760,     245760,     1536,      512, 0xbf90f59b
+0,     247296,     247296,     1536,      512, 0x3f14f53c
+0,     248832,     248832,     1536,      512, 0x12c2ef31
+0,     250368,     250368,     1536,      512, 0xd743f1b0
+0,     251904,     251904,     1536,      512, 0x0ee4f04e
+0,     253440,     253440,     1536,      512, 0x0c26f820
+0,     254976,     254976,     1536,      512, 0x4049eb94
+0,     256512,     256512,     1536,      512, 0x89f5f9a2
+0,     258048,     258048,     1536,      512, 0x17d6f6b0
+0,     259584,     259584,     1536,      512, 0x4d2bf5ae
+0,     261120,     261120,     1536,      512, 0x2c20f897
+0,     262656,     262656,     1536,      512, 0xe544f11f
+0,     264192,     264192,     1536,      512, 0xcaa8f65c
+0,     265728,     265728,     1536,      512, 0x1fe6f579
+0,     267264,     267264,     1536,      512, 0x0e85f278
+0,     268800,     268800,     1536,      512, 0x8eddf38c
+0,     270336,     270336,     1536,      512, 0x1ea0f289
+0,     271872,     271872,     1536,      512, 0xd76b0034
+0,     273408,     273408,     1536,      512, 0xbe49f9d1
+0,     274944,     274944,     1536,      512, 0xdc3dfded
+0,     276480,     276480,     1536,      512, 0x8143f179
+0,     278016,     278016,     1536,      512, 0x6af6f624
+0,     279552,     279552,     1536,      512, 0x638cf7c9
+0,     281088,     281088,     1536,      512, 0xe1e7f4f1
+0,     282624,     282624,     1536,      512, 0xcfbdefd2
+0,     284160,     284160,     1536,      512, 0xae49ecfe
+0,     285696,     285696,     1536,      512, 0xdfc8ed5f
+0,     287232,     287232,     1536,      512, 0xedd9f0b0
+0,     288768,     288768,     1536,      512, 0xc192f77b
+0,     290304,     290304,     1536,      512, 0x88330350
+0,     291840,     291840,     1536,      512, 0x589cfdcc
+0,     293376,     293376,     1536,      512, 0x722afae6
+0,     294912,     294912,     1536,      512, 0x5ab9f3cf
+0,     296448,     296448,     1536,      512, 0x2dc20161
+0,     297984,     297984,     1536,      512, 0x5117f4e7
+0,     299520,     299520,     1536,      512, 0xaa010049
+0,     301056,     301056,     1536,      512, 0xb5fcf73e
+0,     302592,     302592,     1536,      512, 0x66afe3ef
+0,     304128,     304128,     1536,      512, 0x3d7bf815
+0,     305664,     305664,     1536,      512, 0x6895ea7c
+0,     307200,     307200,     1536,      512, 0x26bbf14e
+0,     308736,     308736,     1536,      512, 0x5856ed50
+0,     310272,     310272,     1536,      512, 0x86e4eb6d
+0,     311808,     311808,     1536,      512, 0xf68dfbf7
+0,     313344,     313344,     1536,      512, 0x201ff70d
+0,     314880,     314880,     1536,      512, 0xdd15e87a
+0,     316416,     316416,     1536,      512, 0x50e8fa44
+0,     317952,     317952,     1536,      512, 0x1442f398
+0,     319488,     319488,     1536,      512, 0xe2e9f40b
+0,     321024,     321024,     1536,      512, 0xcbfdf354
+0,     322560,     322560,     1536,      512, 0x631100f3
+0,     324096,     324096,     1536,      512, 0x3aa6f9ea
+0,     325632,     325632,     1536,      512, 0xb6c5f5e6
+0,     327168,     327168,     1536,      512, 0xe98df623
+0,     328704,     328704,     1536,      512, 0x449dfb59
+0,     330240,     330240,     1536,      512, 0x4faefbb6
+0,     331776,     331776,     1536,      512, 0xcef1eb38
+0,     333312,     333312,     1536,      512, 0x94fcfcf5
+0,     334848,     334848,     1536,      512, 0x2bcaf97f
+0,     336384,     336384,     1536,      512, 0xba8af49c
+0,     337920,     337920,     1536,      512, 0xad64fc39
+0,     339456,     339456,     1536,      512, 0xb2a2f9fe
+0,     340992,     340992,     1536,      512, 0xc96105a3
+0,     342528,     342528,     1536,      512, 0x20c2f7ca
+0,     344064,     344064,     1536,      512, 0x5ccdfa46
+0,     345600,     345600,     1536,      512, 0x95eef21c
+0,     347136,     347136,     1536,      512, 0xafa9fad1
+0,     348672,     348672,     1536,      512, 0x3134f5cd
+0,     350208,     350208,     1536,      512, 0xbb08f702
+0,     351744,     351744,     1536,      512, 0x2829f1a0
+0,     353280,     353280,     1536,      512, 0x1a16fe88
+0,     354816,     354816,     1536,      512, 0x6d87f5cd
+0,     356352,     356352,     1536,      512, 0x8170f89a
+0,     357888,     357888,     1536,      512, 0xc99df656
+0,     359424,     359424,     1536,      512, 0x2015f2f0
+0,     360960,     360960,     1536,      512, 0x093df67d
+0,     362496,     362496,     1536,      512, 0xaa35ee1a
+0,     364032,     364032,     1536,      512, 0xc6caee7e
+0,     365568,     365568,     1536,      512, 0xc97bf536
+0,     367104,     367104,     1536,      512, 0x7a37f73b
+0,     368640,     368640,     1536,      512, 0xa2cdee4d
+0,     370176,     370176,     1536,      512, 0xefd5016c
+0,     371712,     371712,     1536,      512, 0x562ef6da
+0,     373248,     373248,     1536,      512, 0x4203f1ed
+0,     374784,     374784,     1536,      512, 0x5ec7f7f0
+0,     376320,     376320,     1536,      512, 0x156ff026
+0,     377856,     377856,     1536,      512, 0xcba8fc0a
+0,     379392,     379392,     1536,      512, 0x420b03c3
+0,     380928,     380928,     1536,      512, 0x37f0f2be
+0,     382464,     382464,     1536,      512, 0x35d0fc17
+0,     384000,     384000,     1536,      512, 0x1d30f537
+0,     385536,     385536,     1536,      512, 0x5a84e506
+0,     387072,     387072,     1536,      512, 0x2fd8eba5
+0,     388608,     388608,     1536,      512, 0x3271f624
+0,     390144,     390144,     1536,      512, 0xdcc4ea3b
+0,     391680,     391680,     1536,      512, 0x0d76ee13
+0,     393216,     393216,     1536,      512, 0xba46f2a5
+0,     394752,     394752,     1536,      512, 0xb1540424
+0,     396288,     396288,     1536,      512, 0x0c88fae6
+0,     397824,     397824,     1536,      512, 0xe879f89b
+0,     399360,     399360,     1536,      512, 0xae96f934
+0,     400896,     400896,     1536,      512, 0xc17405ec
+0,     402432,     402432,     1536,      512, 0x95b8f486
+0,     403968,     403968,     1536,      512, 0x03bbf5a9
+0,     405504,     405504,     1536,      512, 0x63eaf8d6
+0,     407040,     407040,     1536,      512, 0x7a6bfa96
+0,     408576,     408576,     1536,      512, 0x2eabee80
+0,     410112,     410112,     1536,      512, 0x8693f3c1
+0,     411648,     411648,     1536,      512, 0xc8b6f42a
+0,     413184,     413184,     1536,      512, 0x9b5bf344
+0,     414720,     414720,     1536,      512, 0xda81f513
+0,     416256,     416256,     1536,      512, 0x4789fa4d
+0,     417792,     417792,     1536,      512, 0xe70aed30
+0,     419328,     419328,     1536,      512, 0x0e51f579
+0,     420864,     420864,     1536,      512, 0x171503c9
+0,     422400,     422400,     1536,      512, 0xc965f98c
+0,     423936,     423936,     1536,      512, 0x816ef627
+0,     425472,     425472,     1536,      512, 0x441ceb6c
+0,     427008,     427008,     1536,      512, 0xedbcf1e5
+0,     428544,     428544,     1536,      512, 0x1168fec7
+0,     430080,     430080,     1536,      512, 0x488afa1e
+0,     431616,     431616,     1536,      512, 0x6d1dec39
+0,     433152,     433152,     1536,      512, 0x54c7f611
+0,     434688,     434688,     1536,      512, 0x0803eae6
+0,     436224,     436224,     1536,      512, 0xcd85eb6d
+0,     437760,     437760,     1536,      512, 0x3f920034
+0,     439296,     439296,     1536,      512, 0x4b55ea47
+0,     440832,     440832,     1536,      512, 0xdfd7f681
+0,     442368,     442368,     1536,      512, 0x20ccef96
+0,     443904,     443904,     1536,      512, 0x122cf656
+0,     445440,     445440,     1536,      512, 0xe38fef19
+0,     446976,     446976,     1536,      512, 0xa11ff565
+0,     448512,     448512,     1536,      512, 0x931cf83e
+0,     450048,     450048,     1536,      512, 0xb854010c
+0,     451584,     451584,     1536,      512, 0xf607f233
+0,     453120,     453120,     1536,      512, 0xfd9de7e9
+0,     454656,     454656,     1536,      512, 0xe401fa53
+0,     456192,     456192,     1536,      512, 0x15aef9f2
+0,     457728,     457728,     1536,      512, 0x0071f50e
+0,     459264,     459264,     1536,      512, 0xa3c7f029
+0,     460800,     460800,     1536,      512, 0x9b73ed64
+0,     462336,     462336,     1536,      512, 0x0087fbea
+0,     463872,     463872,     1536,      512, 0x9871effb
+0,     465408,     465408,     1536,      512, 0x0e36ebe3
+0,     466944,     466944,     1536,      512, 0x982e015e
+0,     468480,     468480,     1536,      512, 0xca67f667
+0,     470016,     470016,     1536,      512, 0xc504fd51
+0,     471552,     471552,     1536,      512, 0xf5c7f167
+0,     473088,     473088,     1536,      512, 0x75aaece8
+0,     474624,     474624,     1536,      512, 0x288effcf
+0,     476160,     476160,     1536,      512, 0xb640f057
+0,     477696,     477696,     1536,      512, 0xbb7cf4a9
+0,     479232,     479232,     1536,      512, 0xccf200d6
+0,     480768,     480768,     1536,      512, 0x1a00f229
+0,     482304,     482304,     1536,      512, 0xa95bf1be
+0,     483840,     483840,     1536,      512, 0x3c1af28d
+0,     485376,     485376,     1536,      512, 0x11d1ef54
+0,     486912,     486912,     1536,      512, 0xf9ae02aa
+0,     488448,     488448,     1536,      512, 0x4476ee68
+0,     489984,     489984,     1536,      512, 0x7f43eb80
+0,     491520,     491520,     1536,      512, 0x245af906
+0,     493056,     493056,     1536,      512, 0xbb06f0a8
+0,     494592,     494592,     1536,      512, 0xe51bf461
+0,     496128,     496128,     1536,      512, 0xd767f7fd
+0,     497664,     497664,     1536,      512, 0xd517f1ca
+0,     499200,     499200,     1536,      512, 0x3311eb45
+0,     500736,     500736,     1536,      512, 0xee0ef61e
+0,     502272,     502272,     1536,      512, 0x9e7cfe9b
+0,     503808,     503808,     1536,      512, 0x353ef03a
+0,     505344,     505344,     1536,      512, 0x92f6fcfa
+0,     506880,     506880,     1536,      512, 0xe458f3d0
+0,     508416,     508416,     1536,      512, 0xebf3f8af
+0,     509952,     509952,     1536,      512, 0xc0f6f981
+0,     511488,     511488,     1536,      512, 0x3e31fb6c
+0,     513024,     513024,     1536,      512, 0xd679031b
+0,     514560,     514560,     1536,      512, 0x6571f361
+0,     516096,     516096,     1536,      512, 0xf410f507
+0,     517632,     517632,     1536,      512, 0x2217f817
+0,     519168,     519168,     1536,      512, 0xaa53f6ee
+0,     520704,     520704,     1536,      512, 0xa574fa14
+0,     522240,     522240,     1536,      512, 0xcd7ff09d
+0,     523776,     523776,     1536,      512, 0xa650f7d6
+0,     525312,     525312,     1536,      512, 0x6b4ff467
+0,     526848,     526848,     1536,      512, 0x9355f3cb
+0,     528384,     528384,     1536,      512, 0x7546eb8b
+0,     529920,     529920,     1536,      512, 0x4ac6f4c8
+0,     531456,     531456,     1536,      512, 0xcf69f62c
+0,     532992,     532992,     1536,      512, 0x93a0e35d
+0,     534528,     534528,     1536,      512, 0x60c5f0f5
+0,     536064,     536064,     1536,      512, 0x75a4fb42
+0,     537600,     537600,     1536,      512, 0x2615ff1f
+0,     539136,     539136,     1536,      512, 0xb95df9a2
+0,     540672,     540672,     1536,      512, 0xb8c5fafb
+0,     542208,     542208,     1536,      512, 0x3465fd2b
+0,     543744,     543744,     1536,      512, 0xa758f489
+0,     545280,     545280,     1536,      512, 0xe4bafd7f
+0,     546816,     546816,     1536,      512, 0xfa45f603
+0,     548352,     548352,     1536,      512, 0x875b04f1
+0,     549888,     549888,     1536,      512, 0x171bf602
+0,     551424,     551424,     1536,      512, 0x557cf2fd
+0,     552960,     552960,     1536,      512, 0x3a4303c0
+0,     554496,     554496,     1536,      512, 0xbd0feef3
+0,     556032,     556032,     1536,      512, 0x3ca3ed7f
+0,     557568,     557568,     1536,      512, 0x4a4bf0b3
+0,     559104,     559104,     1536,      512, 0xdef5f4a3
+0,     560640,     560640,     1536,      512, 0x96a7f939
+0,     562176,     562176,     1536,      512, 0x3dc4f2fb
+0,     563712,     563712,     1536,      512, 0xa323ec80
+0,     565248,     565248,     1536,      512, 0x8b49eebf
+0,     566784,     566784,     1536,      512, 0xb4a3f983
+0,     568320,     568320,     1536,      512, 0x5a61ecf5
+0,     569856,     569856,     1536,      512, 0x10b0dbda
+0,     571392,     571392,     1536,      512, 0x4836f474
+0,     572928,     572928,     1536,      512, 0xe6f1ee87
+0,     574464,     574464,     1536,      512, 0x1e1bf474
+0,     576000,     576000,     1536,      512, 0xe25bf263
+0,     577536,     577536,     1536,      512, 0x29a9f348
+0,     579072,     579072,     1536,      512, 0x8cf6f85d
+0,     580608,     580608,     1536,      512, 0x3690f40a
+0,     582144,     582144,     1536,      512, 0x072dfcb5
+0,     583680,     583680,     1536,      512, 0x9611f8c7
+0,     585216,     585216,     1536,      512, 0x3ee7f622
+0,     586752,     586752,     1536,      512, 0xdb37f787
+0,     588288,     588288,     1536,      512, 0xc09bf2e3
+0,     589824,     589824,     1536,      512, 0xae37f9ea
+0,     591360,     591360,     1536,      512, 0x2764f6b0
+0,     592896,     592896,     1536,      512, 0x871be490
+0,     594432,     594432,     1536,      512, 0x2e7cefca
+0,     595968,     595968,     1536,      512, 0x000dece5
+0,     597504,     597504,     1536,      512, 0xbe9bea16
+0,     599040,     599040,     1536,      512, 0x202cf37c
+0,     600576,     600576,     1536,      512, 0xae02fa29
+0,     602112,     602112,     1536,      512, 0x5eb4efc9
+0,     603648,     603648,     1536,      512, 0x7a82ffce
+0,     605184,     605184,     1536,      512, 0x4c0fefb2
+0,     606720,     606720,     1536,      512, 0x0d55fd52
+0,     608256,     608256,     1536,      512, 0x00c8f568
+0,     609792,     609792,     1536,      512, 0x9d9ef306
+0,     611328,     611328,     1536,      512, 0x53bbf79c
+0,     612864,     612864,     1536,      512, 0xf1fbf3f4
+0,     614400,     614400,     1536,      512, 0x0ae0ed0b
+0,     615936,     615936,     1536,      512, 0x3374ffc1
+0,     617472,     617472,     1536,      512, 0xbba1f546
+0,     619008,     619008,     1536,      512, 0xaffeee35
+0,     620544,     620544,     1536,      512, 0x81dff38d
+0,     622080,     622080,     1536,      512, 0x29edeafb
+0,     623616,     623616,     1536,      512, 0x406fecbe
+0,     625152,     625152,     1536,      512, 0xee28f8dc
+0,     626688,     626688,     1536,      512, 0x4b1af28a
+0,     628224,     628224,     1536,      512, 0x83ab0058
+0,     629760,     629760,     1536,      512, 0x25d0f735
+0,     631296,     631296,     1536,      512, 0xec5ff319
+0,     632832,     632832,     1536,      512, 0x1723f121
+0,     634368,     634368,     1536,      512, 0x266cedd8
+0,     635904,     635904,     1536,      512, 0x15b1031a
+0,     637440,     637440,     1536,      512, 0x4a83f6b6
+0,     638976,     638976,     1536,      512, 0x8cd1fb9f
+0,     640512,     640512,     1536,      512, 0x76f4f696
+0,     642048,     642048,     1536,      512, 0x9c04fa16
+0,     643584,     643584,     1536,      512, 0x5d1600ce
+0,     645120,     645120,     1536,      512, 0x40d9f905
+0,     646656,     646656,     1536,      512, 0xb9eef26c
+0,     648192,     648192,     1536,      512, 0x5557ed03
+0,     649728,     649728,     1536,      512, 0xa3b0f348
+0,     651264,     651264,     1536,      512, 0xac9ffa65
+0,     652800,     652800,     1536,      512, 0xbb49fcf1
+0,     654336,     654336,     1536,      512, 0xc324f4da
+0,     655872,     655872,     1536,      512, 0xe9d2e875
+0,     657408,     657408,     1536,      512, 0x822cef30
+0,     658944,     658944,     1536,      512, 0x56f6f7a8
+0,     660480,     660480,     1536,      512, 0xf82cf718
+0,     662016,     662016,     1536,      512, 0xb75bfaa1
+0,     663552,     663552,     1536,      512, 0xdd4dfed6
+0,     665088,     665088,     1536,      512, 0x4392f531
+0,     666624,     666624,     1536,      512, 0xf50cf9fa
+0,     668160,     668160,     1536,      512, 0x1181ead9
+0,     669696,     669696,     1536,      512, 0x4925fb83
+0,     671232,     671232,     1536,      512, 0x53a7faf8
+0,     672768,     672768,     1536,      512, 0x0042f4f9
+0,     674304,     674304,     1536,      512, 0x0ed8fa2c
+0,     675840,     675840,     1536,      512, 0x9a1ef892
+0,     677376,     677376,     1536,      512, 0x4b35ee26
+0,     678912,     678912,     1536,      512, 0x6596fc07
+0,     680448,     680448,     1536,      512, 0xd3fcf908
+0,     681984,     681984,     1536,      512, 0x4f3ce991
+0,     683520,     683520,     1536,      512, 0xd8f7fc2a
+0,     685056,     685056,     1536,      512, 0x3dd4f26c
+0,     686592,     686592,     1536,      512, 0x4f49fc77
+0,     688128,     688128,     1536,      512, 0x3e08e521
+0,     689664,     689664,     1536,      512, 0xd180f348
+0,     691200,     691200,     1536,      512, 0xebeaf520
+0,     692736,     692736,     1536,      512, 0xed06f763
+0,     694272,     694272,     1536,      512, 0x9766ef09
+0,     695808,     695808,     1536,      512, 0xc4a6fc00
+0,     697344,     697344,     1536,      512, 0x5547f0ae
+0,     698880,     698880,     1536,      512, 0x300cf213
+0,     700416,     700416,     1536,      512, 0x35ba0678
+0,     701952,     701952,     1536,      512, 0xa8baf485
+0,     703488,     703488,     1536,      512, 0xc0cbe8e8
+0,     705024,     705024,     1536,      512, 0x081aeed1
+0,     706560,     706560,     1536,      512, 0x2017ec33
+0,     708096,     708096,     1536,      512, 0x8739f958
+0,     709632,     709632,     1536,      512, 0xb797f52e
+0,     711168,     711168,     1536,      512, 0x818afdf2
+0,     712704,     712704,     1536,      512, 0xbbabf0fe
+0,     714240,     714240,     1536,      512, 0x843600db
+0,     715776,     715776,     1536,      512, 0x610b02c9
+0,     717312,     717312,     1536,      512, 0x0bf8edfe
+0,     718848,     718848,     1536,      512, 0x9310edea
+0,     720384,     720384,     1536,      512, 0x08c2f355
+0,     721920,     721920,     1536,      512, 0x1b23f44c
+0,     723456,     723456,     1536,      512, 0x4be9f384
+0,     724992,     724992,     1536,      512, 0x5fbef21d
+0,     726528,     726528,     1536,      512, 0x7412ef5e
+0,     728064,     728064,     1536,      512, 0x9ae7f608
+0,     729600,     729600,     1536,      512, 0x0f41f270
+0,     731136,     731136,     1536,      512, 0x42c1f982
+0,     732672,     732672,     1536,      512, 0x4538f04b
+0,     734208,     734208,     1536,      512, 0x09baf2e1
+0,     735744,     735744,     1536,      512, 0xed8ff3ba
+0,     737280,     737280,     1536,      512, 0xb110f516
+0,     738816,     738816,     1536,      512, 0x3837f06a
+0,     740352,     740352,     1536,      512, 0x54aef484
+0,     741888,     741888,     1536,      512, 0xb047f61d
+0,     743424,     743424,     1536,      512, 0xdff4fb98
+0,     744960,     744960,     1536,      512, 0x9da60009
+0,     746496,     746496,     1536,      512, 0x7bb6f236
+0,     748032,     748032,     1536,      512, 0x9f96ea0e
+0,     749568,     749568,     1536,      512, 0xc5adf19a
+0,     751104,     751104,     1536,      512, 0x2e9cf6f8
+0,     752640,     752640,     1536,      512, 0xada8fadc
+0,     754176,     754176,     1536,      512, 0x100a07fd
+0,     755712,     755712,     1536,      512, 0xa26af433
+0,     757248,     757248,     1536,      512, 0xc82cf15e
+0,     758784,     758784,     1536,      512, 0x7f88f10d
+0,     760320,     760320,     1536,      512, 0x776df377
+0,     761856,     761856,     1536,      512, 0x30b0f60d
+0,     763392,     763392,     1536,      512, 0xcecbf9a3
+0,     764928,     764928,     1536,      512, 0xffa8f5c2
+0,     766464,     766464,     1536,      512, 0x9052e7cb
+0,     768000,     768000,     1536,      512, 0x0048f2cc
+0,     769536,     769536,     1536,      512, 0xc8fff912
+0,     771072,     771072,     1536,      512, 0xf22debb8
+0,     772608,     772608,     1536,      512, 0x7b4beb82
+0,     774144,     774144,     1536,      512, 0x428ff33e
+0,     775680,     775680,     1536,      512, 0xb3c1f426
+0,     777216,     777216,     1536,      512, 0xb08af561
+0,     778752,     778752,     1536,      512, 0xaf62ee68
+0,     780288,     780288,     1536,      512, 0xdb25f226
+0,     781824,     781824,     1536,      512, 0xa577f9d5
+0,     783360,     783360,     1536,      512, 0xd21af205
+0,     784896,     784896,     1536,      512, 0x8734f052
+0,     786432,     786432,     1536,      512, 0xcb0bf009
+0,     787968,     787968,     1536,      512, 0xde0bf8a7
+0,     789504,     789504,     1536,      512, 0x9fbefd0d
+0,     791040,     791040,     1536,      512, 0xc329ee26
+0,     792576,     792576,     1536,      512, 0xfc6007a0
+0,     794112,     794112,     1536,      512, 0x6782004b
+0,     795648,     795648,     1536,      512, 0x4adbf43c
+0,     797184,     797184,     1536,      512, 0x5b85f198
+0,     798720,     798720,     1536,      512, 0x1576fbfe
+0,     800256,     800256,     1536,      512, 0x62ebf217
+0,     801792,     801792,     1536,      512, 0xd8a9f5fe
+0,     803328,     803328,     1536,      512, 0x3270f500
+0,     804864,     804864,     1536,      512, 0x99e9eca2
+0,     806400,     806400,     1536,      512, 0x0d3c02c9
+0,     807936,     807936,     1536,      512, 0x8769f484
+0,     809472,     809472,     1536,      512, 0xd6cef92a
+0,     811008,     811008,     1536,      512, 0x9150f4b7
+0,     812544,     812544,     1536,      512, 0x760d00ce
+0,     814080,     814080,     1536,      512, 0xc595f17d
+0,     815616,     815616,     1536,      512, 0x3720fd55
+0,     817152,     817152,     1536,      512, 0x28e5f02b
+0,     818688,     818688,     1536,      512, 0x9e87f7bd
+0,     820224,     820224,     1536,      512, 0x4571fe9a
+0,     821760,     821760,     1536,      512, 0xbf06f83f
+0,     823296,     823296,     1536,      512, 0xb6bff67e
+0,     824832,     824832,     1536,      512, 0x582cfa1b
+0,     826368,     826368,     1536,      512, 0x9277f53b
+0,     827904,     827904,     1536,      512, 0xd541fa0e
+0,     829440,     829440,     1536,      512, 0xb9f7f791
+0,     830976,     830976,     1536,      512, 0xb5ccf6d3
+0,     832512,     832512,     1536,      512, 0xb03ef2a1
+0,     834048,     834048,     1536,      512, 0x6970fb11
+0,     835584,     835584,     1536,      512, 0x478df6bd
+0,     837120,     837120,     1536,      512, 0x7ce4eff2
+0,     838656,     838656,     1536,      512, 0x5f8af8bb
+0,     840192,     840192,     1536,      512, 0xa990f10c
+0,     841728,     841728,     1536,      512, 0x0b5e0603
+0,     843264,     843264,     1536,      512, 0x5f5ff667
+0,     844800,     844800,     1536,      512, 0xf3f1f7e5
+0,     846336,     846336,     1536,      512, 0xb7b1f92c
+0,     847872,     847872,     1536,      512, 0x5c5afc2d
+0,     849408,     849408,     1536,      512, 0xc389ecc8
+0,     850944,     850944,     1536,      512, 0x86edf4a8
+0,     852480,     852480,     1536,      512, 0x31cfeba8
+0,     854016,     854016,     1536,      512, 0xea9cf360
+0,     855552,     855552,     1536,      512, 0xbc04f016
+0,     857088,     857088,     1536,      512, 0x6617ed55
+0,     858624,     858624,     1536,      512, 0xe20afad2
+0,     860160,     860160,     1536,      512, 0x4706f61a
+0,     861696,     861696,     1536,      512, 0xa6a8fd93
+0,     863232,     863232,     1536,      512, 0x9655e7ae
+0,     864768,     864768,     1536,      512, 0x0ac2f354
+0,     866304,     866304,     1536,      512, 0x62e2f89a
+0,     867840,     867840,     1536,      512, 0x35baf1cb
+0,     869376,     869376,     1536,      512, 0xc02ff90e
+0,     870912,     870912,     1536,      512, 0xf3f8f24b
+0,     872448,     872448,     1536,      512, 0x10b9ebd6
+0,     873984,     873984,     1536,      512, 0x0482084b
+0,     875520,     875520,     1536,      512, 0xc14cee2e
+0,     877056,     877056,     1536,      512, 0x21ddf5ea
+0,     878592,     878592,     1536,      512, 0x8090f51f
+0,     880128,     880128,     1536,      512, 0x6496ed68
+0,     881664,     881664,     1536,      512, 0x4bb3fa69
+0,     883200,     883200,     1536,      512, 0x1e18e8d7
+0,     884736,     884736,     1536,      512, 0xb758fa60
+0,     886272,     886272,     1536,      512, 0xa5c6f671
+0,     887808,     887808,     1536,      512, 0x6dbcf15e
+0,     889344,     889344,     1536,      512, 0x56c4f227
+0,     890880,     890880,     1536,      512, 0x17280149
+0,     892416,     892416,     1536,      512, 0x8c57f584
+0,     893952,     893952,     1536,      512, 0x518ef2b4
+0,     895488,     895488,     1536,      512, 0x8a69ebe6
+0,     897024,     897024,     1536,      512, 0xf954e97c
+0,     898560,     898560,     1536,      512, 0x62e1f8db
+0,     900096,     900096,     1536,      512, 0x637af9fa
+0,     901632,     901632,     1536,      512, 0xecbcf846
+0,     903168,     903168,     1536,      512, 0x2481ecac
+0,     904704,     904704,     1536,      512, 0x7d3cf940
+0,     906240,     906240,     1536,      512, 0x4823efc4
+0,     907776,     907776,     1536,      512, 0x31d5f1ca
+0,     909312,     909312,     1536,      512, 0x3024f40f
+0,     910848,     910848,     1536,      512, 0xf172f644
+0,     912384,     912384,     1536,      512, 0x2502f1b9
+0,     913920,     913920,     1536,      512, 0x9ee8f50b
+0,     915456,     915456,     1536,      512, 0x0605fcc0
+0,     916992,     916992,     1536,      512, 0xf202f11d
+0,     918528,     918528,     1536,      512, 0x449df7a2
+0,     920064,     920064,     1536,      512, 0x16e8f468
+0,     921600,     921600,     1536,      512, 0xceeafba5
+0,     923136,     923136,     1536,      512, 0xc8410340
+0,     924672,     924672,     1536,      512, 0xc0e5fe5a
+0,     926208,     926208,     1536,      512, 0x60cafeb7
+0,     927744,     927744,     1536,      512, 0x8277fb6a
+0,     929280,     929280,     1536,      512, 0xa77dfac9
+0,     930816,     930816,     1536,      512, 0x7b2bf1d1
+0,     932352,     932352,     1536,      512, 0x63aafabd
+0,     933888,     933888,     1536,      512, 0xf56cf575
+0,     935424,     935424,     1536,      512, 0x2048f966
+0,     936960,     936960,     1536,      512, 0x392b0c6a
+0,     938496,     938496,     1536,      512, 0x7d87f244
+0,     940032,     940032,     1536,      512, 0xecbcfedc
+0,     941568,     941568,     1536,      512, 0x4780f2ef
+0,     943104,     943104,     1536,      512, 0x1a28f8ff
+0,     944640,     944640,     1536,      512, 0xda51fcc5
+0,     946176,     946176,     1536,      512, 0x7009f7ff
+0,     947712,     947712,     1536,      512, 0x1e5af6a2
+0,     949248,     949248,     1536,      512, 0xcb83e8c3
+0,     950784,     950784,     1536,      512, 0x2cbbe8ae
+0,     952320,     952320,     1536,      512, 0x5cc0ebbd
+0,     953856,     953856,     1536,      512, 0x5e13f33b
+0,     955392,     955392,     1536,      512, 0x2ef1ef3d
+0,     956928,     956928,     1536,      512, 0x4aaef05f
+0,     958464,     958464,     1536,      512, 0xf6adf321
+0,     960000,     960000,     1536,      512, 0x0041e985
+0,     961536,     961536,     1536,      512, 0x4539eb83
+0,     963072,     963072,     1536,      512, 0xa642f144
+0,     964608,     964608,     1536,      512, 0xf58dfb44
+0,     966144,     966144,     1536,      512, 0xcdf2f3b2
+0,     967680,     967680,     1536,      512, 0xebd9f1d4
+0,     969216,     969216,     1536,      512, 0xf39afcca
+0,     970752,     970752,     1536,      512, 0x4392fb8e
+0,     972288,     972288,     1536,      512, 0xe23df8bb
+0,     973824,     973824,     1536,      512, 0xdedaf23a
+0,     975360,     975360,     1536,      512, 0x1c46f7bc
+0,     976896,     976896,     1536,      512, 0x47e0f873
+0,     978432,     978432,     1536,      512, 0x5e55eb42
+0,     979968,     979968,     1536,      512, 0x5f08f8a0
+0,     981504,     981504,     1536,      512, 0xf391f9f8
+0,     983040,     983040,     1536,      512, 0x3d4afcd1
+0,     984576,     984576,     1536,      512, 0x07b8f3d4
+0,     986112,     986112,     1536,      512, 0xa7cdfea4
+0,     987648,     987648,     1536,      512, 0x4072ffda
+0,     989184,     989184,     1536,      512, 0xe96df73f
+0,     990720,     990720,     1536,      512, 0x6170f3a3
+0,     992256,     992256,     1536,      512, 0x743cf509
+0,     993792,     993792,     1536,      512, 0x3525fe8e
+0,     995328,     995328,     1536,      512, 0xd345ed02
+0,     996864,     996864,     1536,      512, 0x3c15f37f
+0,     998400,     998400,     1536,      512, 0x9df1facd
diff --git a/tests/ref/fate/copy-trac4914 b/tests/ref/fate/copy-trac4914
new file mode 100644
index 0000000000..e0864a0035
--- /dev/null
+++ b/tests/ref/fate/copy-trac4914
@@ -0,0 +1,49 @@
+d51f6bcc96885a2ce8517ae8c774f610 *tests/data/fate/copy-trac4914.mxf
+560697 tests/data/fate/copy-trac4914.mxf
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 480x270
+#sar 0: 1/1
+#tb 1: 1/48000
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,          0,          0,        1,   259200, 0xf36957da
+1,          0,          0,     1602,     6408, 0x1dd7b37c
+0,          1,          1,        1,   259200, 0x29a1f586
+1,       1602,       1602,     1601,     6404, 0xb6854846
+1,       3203,       3203,     1602,     6408, 0x4d3ea85e
+0,          2,          2,        1,   259200, 0x5578d9c3
+0,          3,          3,        1,   259200, 0x83938b61
+1,       4805,       4805,     1601,     6404, 0x5eb15a6d
+1,       6406,       6406,     1602,     6408, 0x059d21a0
+0,          4,          4,        1,   259200, 0xa6ce7618
+0,          5,          5,        1,   259200, 0x4892a0f5
+1,       8008,       8008,     1602,     6408, 0xd8352572
+0,          6,          6,        1,   259200, 0x921c6051
+1,       9610,       9610,     1601,     6404, 0xf69be875
+1,      11211,      11211,     1602,     6408, 0x41e75601
+0,          7,          7,        1,   259200, 0x618c0026
+0,          8,          8,        1,   259200, 0xdbc3ca4d
+1,      12813,      12813,     1601,     6404, 0x75e3196d
+1,      14414,      14414,     1602,     6408, 0xb46bad29
+0,          9,          9,        1,   259200, 0xf088c731
+0,         10,         10,        1,   259200, 0xce77ddee
+1,      16016,      16016,     1602,     6408, 0x41e6ceac
+0,         11,         11,        1,   259200, 0x798565eb
+1,      17618,      17618,     1601,     6404, 0x2258734e
+1,      19219,      19219,     1602,     6408, 0xc46d9103
+0,         12,         12,        1,   259200, 0x57185dc8
+0,         13,         13,        1,   259200, 0x607a9086
+1,      20821,      20821,     1601,     6404, 0xd7c07892
+1,      22422,      22422,     1602,     6408, 0x2aaad91d
+0,         14,         14,        1,   259200, 0x59bd5c34
+0,         15,         15,        1,   259200, 0xadb1da77
+1,      24024,      24024,     1602,     6408, 0x69bfb643
+0,         16,         16,        1,   259200, 0x1f7d7b14
+1,      25626,      25626,     1601,     6404, 0x0e644904
+1,      27227,      27227,     1602,     6408, 0x06e92ea2
+0,         17,         17,        1,   259200, 0xcdd45467
diff --git a/tests/ref/fate/copy-trac4914-avi b/tests/ref/fate/copy-trac4914-avi
new file mode 100644
index 0000000000..0358ead6b8
--- /dev/null
+++ b/tests/ref/fate/copy-trac4914-avi
@@ -0,0 +1,73 @@
+26e4202638bc384b82d2b5eb4d33a5f0 *tests/data/fate/copy-trac4914-avi.avi
+479494 tests/data/fate/copy-trac4914-avi.avi
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 480x270
+#sar 0: 1/1
+#tb 1: 1/48000
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+1,          0,          0,     1152,     4608, 0xb24f5c9d
+1,       1152,       1152,     1152,     4608, 0xe2da5c32
+1,       2304,       2304,     1152,     4608, 0xd76023d9
+1,       3456,       3456,     1152,     4608, 0xbefd52f1
+1,       4608,       4608,     1152,     4608, 0x50cf0f00
+1,       5760,       5760,     1152,     4608, 0xfcda4f0c
+1,       6912,       6912,     1152,     4608, 0xba131540
+1,       8064,       8064,     1152,     4608, 0x4c7b99c0
+1,       9216,       9216,     1152,     4608, 0xd3798646
+1,      10368,      10368,     1152,     4608, 0x3f65117b
+1,      11520,      11520,     1152,     4608, 0x7390dc17
+1,      12672,      12672,     1152,     4608, 0x0c3f7b9f
+1,      13824,      13824,     1152,     4608, 0x3b16289c
+0,          9,          9,        1,   259200, 0xf36957da
+1,      14976,      14976,     1152,     4608, 0xe09eb256
+0,         10,         10,        1,   259200, 0x29a1f586
+1,      16128,      16128,     1152,     4608, 0x1ab4e8fd
+1,      17280,      17280,     1152,     4608, 0x200660f8
+0,         11,         11,        1,   259200, 0x5578d9c3
+1,      18432,      18432,     1152,     4608, 0xd490d0e4
+0,         12,         12,        1,   259200, 0x83938b61
+1,      19584,      19584,     1152,     4608, 0x9a529aaa
+1,      20736,      20736,     1152,     4608, 0x0f5ebb76
+0,         13,         13,        1,   259200, 0xa6ce7618
+1,      21888,      21888,     1152,     4608, 0xf0c9f255
+1,      23040,      23040,     1152,     4608, 0xf5961288
+0,         15,         15,        1,   259200, 0x4892a0f5
+1,      24192,      24192,     1152,     4608, 0x2b587de2
+1,      25344,      25344,     1152,     4608, 0xbba5cece
+0,         16,         16,        1,   259200, 0x921c6051
+1,      26496,      26496,     1152,     4608, 0xd4faead2
+0,         17,         17,        1,   259200, 0x618c0026
+1,      27648,      27648,     1152,     4608, 0x46d0ac7b
+1,      28800,      28800,     1152,     4608, 0xa02d5881
+0,         18,         18,        1,   259200, 0xdbc3ca4d
+1,      29952,      29952,     1152,     4608, 0xc370577a
+0,         19,         19,        1,   259200, 0xf088c731
+1,      31104,      31104,     1152,     4608, 0xb12a3508
+1,      32256,      32256,     1152,     4608, 0xcc7fae28
+1,      33408,      33408,     1152,     4608, 0x9ae0bd7d
+0,         21,         21,        1,   259200, 0xce77ddee
+1,      34560,      34560,     1152,     4608, 0x46fecad2
+0,         22,         22,        1,   259200, 0x798565eb
+1,      35712,      35712,     1152,     4608, 0x3ee707e5
+0,         23,         23,        1,   259200, 0x57185dc8
+1,      36864,      36864,     1152,     4608, 0xf6d71808
+1,      38016,      38016,     1152,     4608, 0xa83e2440
+0,         24,         24,        1,   259200, 0x607a9086
+1,      39168,      39168,     1152,     4608, 0x6d92e2a8
+0,         25,         25,        1,   259200, 0x59bd5c34
+1,      40320,      40320,     1152,     4608, 0x595272b1
+1,      41472,      41472,     1152,     4608, 0x37fd2e64
+1,      42624,      42624,     1152,     4608, 0x5673aa22
+0,         27,         27,        1,   259200, 0xadb1da77
+1,      43776,      43776,     1152,     4608, 0xa277152c
+0,         28,         28,        1,   259200, 0x1f7d7b14
+1,      44928,      44928,     1152,     4608, 0xa91bf261
+1,      46080,      46080,     1152,     4608, 0x58769420
+0,         29,         29,        1,   259200, 0xcdd45467
+1,      47232,      47232,     1152,     4608, 0x1149e890
diff --git a/tests/ref/fate/corepng b/tests/ref/fate/corepng
index e20071405d..74bb920108 100644
--- a/tests/ref/fate/corepng
+++ b/tests/ref/fate/corepng
@@ -1,5 +1,14 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 #tb 1: 1/11025
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 11025
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   230400, 0x03e25ead
 1,          0,          0,     5513,    11026, 0x27ad637c
 0,          1,          1,        1,   230400, 0x0a520ffd
diff --git a/tests/ref/fate/crc b/tests/ref/fate/crc
index 80bb0eae4d..8aa0dd2448 100644
--- a/tests/ref/fate/crc
+++ b/tests/ref/fate/crc
@@ -1,5 +1,6 @@
 crc EDB88320 = 3D5CDD04
 crc 04C11DB7 = E0BAF5C0
+crc 00864CFB = 326039
 crc 0000A001 = BFD8
 crc 00008005 = BB1F
 crc 00000007 = E3
diff --git a/tests/ref/fate/creatureshock-avs b/tests/ref/fate/creatureshock-avs
index 979baf61bb..c8e08c9ff7 100644
--- a/tests/ref/fate/creatureshock-avs
+++ b/tests/ref/fate/creatureshock-avs
@@ -1,94 +1,103 @@
-#tb 0: 1/90000
+#tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 318x198
+#sar 0: 0/1
 #tb 1: 1/22222
-0,          0,          0,        0,   188892, 0xcb5be3dd
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 22222
+#channel_layout 1: 4
+#channel_layout_name 1: mono
+0,          0,          0,        1,   188892, 0x9f47a5ec
 1,          0,          0,     8186,    16372, 0xfaaab59d
-0,       6000,       6000,        0,   188892, 0x0f313ebc
-0,      12000,      12000,        0,   188892, 0xc0da25cc
-0,      18000,      18000,        0,   188892, 0xad6e1d44
-0,      24000,      24000,        0,   188892, 0xb1103b40
-0,      30000,      30000,        0,   188892, 0xae033450
+0,          1,          1,        1,   188892, 0xdece0269
+0,          2,          2,        1,   188892, 0xd097e86e
+0,          3,          3,        1,   188892, 0x1cf2de83
+0,          4,          4,        1,   188892, 0xb664fd10
+0,          5,          5,        1,   188892, 0xc654f4c1
 1,       8186,       8186,     2014,     4028, 0xc2daed72
-0,      36000,      36000,        0,   188892, 0xb31f03b4
+0,          6,          6,        1,   188892, 0x5adac3ff
 1,      10200,      10200,     2743,     5486, 0xf7fd794d
-0,      42000,      42000,        0,   188892, 0xacb2d3f9
-0,      48000,      48000,        0,   188892, 0x7d77ecbd
+0,          7,          7,        1,   188892, 0x5928954e
+0,          8,          8,        1,   188892, 0x5e4cad6c
 1,      12943,      12943,     2895,     5790, 0xfd5a369f
-0,      54000,      54000,        0,   188892, 0x7faa2f6c
-0,      60000,      60000,        0,   188892, 0x28f4fdf1
+0,          9,          9,        1,   188892, 0xbbb5f11b
+0,         10,         10,        1,   188892, 0xcb6bbdee
 1,      15838,      15838,      534,     1068, 0x0b602cd0
-0,      66000,      66000,        0,   188892, 0x4b53f3b9
+0,         11,         11,        1,   188892, 0xa5b3b316
 1,      16372,      16372,     2454,     4908, 0xfe870aad
-0,      72000,      72000,        0,   188892, 0x1f09bb29
+0,         12,         12,        1,   188892, 0x9bf87b5d
 1,      18826,      18826,     3031,     6062, 0x8a4d6e0f
-0,      78000,      78000,        0,   188892, 0x3afcc11d
-0,      84000,      84000,        0,   188892, 0x6b918e49
+0,         13,         13,        1,   188892, 0xcc3981be
+0,         14,         14,        1,   188892, 0x2eb44dfa
 1,      21857,      21857,     2701,     5402, 0x71fd352f
-0,      90000,      90000,        0,   188892, 0x9630a04d
-0,      96000,      96000,        0,   188892, 0x9381b4c1
+0,         15,         15,        1,   188892, 0x11c861b9
+0,         16,         16,        1,   188892, 0x7c1b767b
 1,      24558,      24558,      272,      544, 0xeb766d34
 1,      24830,      24830,     2953,     5906, 0x47ac7e08
-0,     102000,     102000,        0,   188892, 0xa7dea7e5
-0,     108000,     108000,        0,   188892, 0xd277c41d
+0,         17,         17,        1,   188892, 0x5078694c
+0,         18,         18,        1,   188892, 0xa24485c2
 1,      27783,      27783,     2958,     5916, 0x0d26eb56
-0,     114000,     114000,        0,   188892, 0xafa2a6c9
-0,     120000,     120000,        0,   188892, 0x13a38839
+0,         19,         19,        1,   188892, 0xc8016946
+0,         20,         20,        1,   188892, 0x71e3493b
 1,      30741,      30741,     2003,     4006, 0x9941c71a
-0,     126000,     126000,        0,   188892, 0xcd5e5a6d
-0,     132000,     132000,        0,   188892, 0xe7da71e9
+0,         21,         21,        1,   188892, 0xa9771a0d
+0,         22,         22,        1,   188892, 0x98be33fd
 1,      32744,      32744,     1050,     2100, 0xc9a2ee36
 1,      33794,      33794,     2947,     5894, 0xd2ba4eaa
-0,     138000,     138000,        0,   188892, 0x06928add
-0,     144000,     144000,        0,   188892, 0x4a108eb9
+0,         23,         23,        1,   188892, 0x193e4cda
+0,         24,         24,        1,   188892, 0x3b444fd1
 1,      36741,      36741,     3045,     6090, 0xf43e73d0
-0,     150000,     150000,        0,   188892, 0xea2598f5
-0,     156000,     156000,        0,   188892, 0x17ed6839
+0,         25,         25,        1,   188892, 0x8bfe594c
+0,         26,         26,        1,   188892, 0xaab8267b
 1,      39786,      39786,     1144,     2288, 0x5a8b7aa0
-0,     162000,     162000,        0,   188892, 0x9de6ab65
+0,         27,         27,        1,   188892, 0x03206c55
 1,      40930,      40930,     1925,     3850, 0x7f66eb2c
-0,     168000,     168000,        0,   188892, 0xb4ee326f
+0,         28,         28,        1,   188892, 0x8ed7ea7d
 1,      42855,      42855,     2898,     5796, 0xc5cf3ee8
-0,     174000,     174000,        0,   188892, 0x3f85095b
-0,     180000,     180000,        0,   188892, 0xaab7e331
+0,         29,         29,        1,   188892, 0x2a1bc3e1
+0,         30,         30,        1,   188892, 0xa6a12aa7
 1,      45753,      45753,     3021,     6042, 0xed80136d
-0,     186000,     186000,        0,   188892, 0xc2a079e1
-0,     192000,     192000,        0,   188892, 0x612080c2
+0,         31,         31,        1,   188892, 0xa96ca4fa
+0,         32,         32,        1,   188892, 0x3e3a6d70
 1,      48774,      48774,      342,      684, 0xc42bd137
-0,     198000,     198000,        0,   188892, 0xa7232d47
+0,         33,         33,        1,   188892, 0x47e173dd
 1,      49116,      49116,     2718,     5436, 0xb7f8a6fd
-0,     204000,     204000,        0,   188892, 0xc053297d
+0,         34,         34,        1,   188892, 0xfcf183ba
 1,      51834,      51834,     3049,     6098, 0xee6354a2
-0,     210000,     210000,        0,   188892, 0x1ecc3bfe
-0,     216000,     216000,        0,   188892, 0xcc4ac803
-0,     222000,     222000,        0,   188892, 0x4b90047b
+0,         35,         35,        1,   188892, 0xf051be46
+0,         36,         36,        1,   188892, 0x8aa6b100
+0,         37,         37,        1,   188892, 0x36c86b01
 1,      54883,      54883,     2419,     4838, 0x129e61d0
-0,     228000,     228000,        0,   188892, 0xd863b643
+0,         38,         38,        1,   188892, 0x15ae396e
 1,      57302,      57302,      537,     1074, 0x9da90634
-0,     234000,     234000,        0,   188892, 0x93a25fb1
+0,         39,         39,        1,   188892, 0xc876eabf
 1,      57839,      57839,     3042,     6084, 0x8ffed952
-0,     240000,     240000,        0,   188892, 0xf969e131
-0,     246000,     246000,        0,   188892, 0x73bd2469
+0,         40,         40,        1,   188892, 0xc5c65fae
+0,         41,         41,        1,   188892, 0x4feec932
 1,      60881,      60881,     3019,     6038, 0xa07b4276
-0,     252000,     252000,        0,   188892, 0x265a9ce2
-0,     258000,     258000,        0,   188892, 0xd59ccd39
+0,         42,         42,        1,   188892, 0x21374e88
+0,         43,         43,        1,   188892, 0x52e689f1
 1,      63900,      63900,     1588,     3176, 0xebef63c1
-0,     264000,     264000,        0,   188892, 0xe50fc068
+0,         44,         44,        1,   188892, 0x9e2492e8
 1,      65488,      65488,     1397,     2794, 0xbe1000db
-0,     270000,     270000,        0,   188892, 0x83113a86
+0,         45,         45,        1,   188892, 0xac841247
 1,      66885,      66885,     3010,     6020, 0xd8e34961
-0,     276000,     276000,        0,   188892, 0xa0203504
-0,     282000,     282000,        0,   188892, 0x9e2d518c
+0,         46,         46,        1,   188892, 0x8467aab2
+0,         47,         47,        1,   188892, 0x552b6029
 1,      69895,      69895,     3010,     6020, 0xc07cf461
-0,     288000,     288000,        0,   188892, 0x5f610e66
-0,     294000,     294000,        0,   188892, 0x9b77f900
+0,         48,         48,        1,   188892, 0x836eb46e
+0,         49,         49,        1,   188892, 0x93eb9f1b
 1,      72905,      72905,      769,     1538, 0xc975ae02
 1,      73674,      73674,     2115,     4230, 0x0827111b
-0,     300000,     300000,        0,   188892, 0xaaf279c2
-0,     306000,     306000,        0,   188892, 0x4ac97cc2
+0,         50,         50,        1,   188892, 0xa3661fdd
+0,         51,         51,        1,   188892, 0x433d22dd
 1,      75789,      75789,     3042,     6084, 0x2cf0a407
-0,     312000,     312000,        0,   188892, 0xddd91642
-0,     318000,     318000,        0,   188892, 0x4f32dcd1
+0,         52,         52,        1,   188892, 0xd64dbc4e
+0,         53,         53,        1,   188892, 0x4a2aa0e3
 1,      78831,      78831,     2914,     5828, 0x12750279
-0,     324000,     324000,        0,   188892, 0xdc126b42
-0,     330000,     330000,        0,   188892, 0x00000000
+0,         54,         54,        1,   188892, 0xd98e4d4b
+0,         55,         55,        1,   188892, 0x00000000
 1,      81745,      81745,      115,      230, 0xc9c03f3b
 1,      81860,      81860,      384,      768, 0x6137a04d
diff --git a/tests/ref/fate/cscd b/tests/ref/fate/cscd
index 74fe94ef64..9af7b2fd63 100644
--- a/tests/ref/fate/cscd
+++ b/tests/ref/fate/cscd
@@ -1,4 +1,8 @@
 #tb 0: 1/200
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 300x300
+#sar 0: 0/1
 0,          0,          0,        1,   270000, 0xf90015d8
 0,          9,          9,        1,   270000, 0xf90015d8
 0,         15,         15,        1,   270000, 0xf90015d8
diff --git a/tests/ref/fate/cvid-grayscale b/tests/ref/fate/cvid-grayscale
index 87ca600add..a4f8dde805 100644
--- a/tests/ref/fate/cvid-grayscale
+++ b/tests/ref/fate/cvid-grayscale
@@ -1,153 +1,157 @@
 #tb 0: 99561/500000
-0,          0,          0,        1,    11300, 0x46c78923
-0,          1,          1,        1,    11300, 0x3f2a1175
-0,          2,          2,        1,    11300, 0x722de221
-0,          3,          3,        1,    11300, 0x01746b88
-0,          4,          4,        1,    11300, 0x549587a7
-0,          5,          5,        1,    11300, 0x843ab943
-0,          6,          6,        1,    11300, 0x62fdee48
-0,          7,          7,        1,    11300, 0x74a62867
-0,          8,          8,        1,    11300, 0x35a20e2f
-0,          9,          9,        1,    11300, 0x4e9ef54d
-0,         10,         10,        1,    11300, 0xec7201f5
-0,         11,         11,        1,    11300, 0x363bfe27
-0,         12,         12,        1,    11300, 0x2aaab418
-0,         13,         13,        1,    11300, 0x6a48ab3f
-0,         14,         14,        1,    11300, 0x3fecea34
-0,         15,         15,        1,    11300, 0xa371f55e
-0,         16,         16,        1,    11300, 0xa86b147c
-0,         17,         17,        1,    11300, 0x49e9206e
-0,         18,         18,        1,    11300, 0x6c9a2155
-0,         19,         19,        1,    11300, 0x2c8a4798
-0,         20,         20,        1,    11300, 0x3485676c
-0,         21,         21,        1,    11300, 0xb0b293f2
-0,         22,         22,        1,    11300, 0xe4a9b068
-0,         23,         23,        1,    11300, 0xd68d0556
-0,         24,         24,        1,    11300, 0xc28e5193
-0,         25,         25,        1,    11300, 0xf6948483
-0,         26,         26,        1,    11300, 0xf21fbf57
-0,         27,         27,        1,    11300, 0x8345eb44
-0,         28,         28,        1,    11300, 0x8124f045
-0,         29,         29,        1,    11300, 0x18e31f10
-0,         30,         30,        1,    11300, 0xdb1943fc
-0,         31,         31,        1,    11300, 0x8701699f
-0,         32,         32,        1,    11300, 0xd7b18550
-0,         33,         33,        1,    11300, 0xa56faccc
-0,         34,         34,        1,    11300, 0xf8bcc17c
-0,         35,         35,        1,    11300, 0x446acab9
-0,         36,         36,        1,    11300, 0x755fd295
-0,         37,         37,        1,    11300, 0x92e3d100
-0,         38,         38,        1,    11300, 0x54895bb3
-0,         39,         39,        1,    11300, 0xd18bffda
-0,         40,         40,        1,    11300, 0x480dbe4f
-0,         41,         41,        1,    11300, 0x49ea9dbe
-0,         42,         42,        1,    11300, 0x00d3a003
-0,         43,         43,        1,    11300, 0xda7bbfb2
-0,         44,         44,        1,    11300, 0x9700d9c2
-0,         45,         45,        1,    11300, 0xa0a9e490
-0,         46,         46,        1,    11300, 0x00eb0979
-0,         47,         47,        1,    11300, 0x32b04630
-0,         48,         48,        1,    11300, 0xdfb73e51
-0,         49,         49,        1,    11300, 0x3d8e4f96
-0,         50,         50,        1,    11300, 0x2ca83271
-0,         51,         51,        1,    11300, 0xb5b123c0
-0,         52,         52,        1,    11300, 0x8a570e58
-0,         53,         53,        1,    11300, 0xc6c805bc
-0,         54,         54,        1,    11300, 0x27caf7a5
-0,         55,         55,        1,    11300, 0x5319ecb0
-0,         56,         56,        1,    11300, 0x5471e3fd
-0,         57,         57,        1,    11300, 0x6d68a6f4
-0,         58,         58,        1,    11300, 0x872b7194
-0,         59,         59,        1,    11300, 0x007c36bd
-0,         60,         60,        1,    11300, 0x2714f1b5
-0,         61,         61,        1,    11300, 0x6c8eb50f
-0,         62,         62,        1,    11300, 0xf5d57be8
-0,         63,         63,        1,    11300, 0x981f412b
-0,         64,         64,        1,    11300, 0x1a9804a1
-0,         65,         65,        1,    11300, 0xf0c1d24a
-0,         66,         66,        1,    11300, 0xa70a9d9b
-0,         67,         67,        1,    11300, 0x8c466876
-0,         68,         68,        1,    11300, 0xcf2e32df
-0,         69,         69,        1,    11300, 0xcb8cfebf
-0,         70,         70,        1,    11300, 0xb961ca99
-0,         71,         71,        1,    11300, 0x666d9619
-0,         72,         72,        1,    11300, 0x84bf5b55
-0,         73,         73,        1,    11300, 0xbfa22ccc
-0,         74,         74,        1,    11300, 0xcde41849
-0,         75,         75,        1,    11300, 0x71372dcd
-0,         76,         76,        1,    11300, 0x13402cfd
-0,         77,         77,        1,    11300, 0xdebdd321
-0,         78,         78,        1,    11300, 0xdda66de1
-0,         79,         79,        1,    11300, 0x7f4bb682
-0,         80,         80,        1,    11300, 0xf67fd528
-0,         81,         81,        1,    11300, 0xe739ff8c
-0,         82,         82,        1,    11300, 0x2e131774
-0,         83,         83,        1,    11300, 0xfa942811
-0,         84,         84,        1,    11300, 0x0cd93ac2
-0,         85,         85,        1,    11300, 0xd0445e0e
-0,         86,         86,        1,    11300, 0x3f3497c7
-0,         87,         87,        1,    11300, 0x11b5bd2c
-0,         88,         88,        1,    11300, 0xccd5e62a
-0,         89,         89,        1,    11300, 0xa9d4fcb5
-0,         90,         90,        1,    11300, 0x34aa1a03
-0,         91,         91,        1,    11300, 0x1ce6299e
-0,         92,         92,        1,    11300, 0x661c2745
-0,         93,         93,        1,    11300, 0x27d8a8b3
-0,         94,         94,        1,    11300, 0x9eb07467
-0,         95,         95,        1,    11300, 0x128374d2
-0,         96,         96,        1,    11300, 0x05c36ff5
-0,         97,         97,        1,    11300, 0x8a136bde
-0,         98,         98,        1,    11300, 0x15c47c99
-0,         99,         99,        1,    11300, 0xcc4a93f4
-0,        100,        100,        1,    11300, 0x19529b2b
-0,        101,        101,        1,    11300, 0x9943c076
-0,        102,        102,        1,    11300, 0xf898e583
-0,        103,        103,        1,    11300, 0x40f71f94
-0,        104,        104,        1,    11300, 0x5b604afb
-0,        105,        105,        1,    11300, 0x8c176af4
-0,        106,        106,        1,    11300, 0x0f1a6216
-0,        107,        107,        1,    11300, 0x38bbd13d
-0,        108,        108,        1,    11300, 0x90c8d1fc
-0,        109,        109,        1,    11300, 0x253000d7
-0,        110,        110,        1,    11300, 0xb94b03b1
-0,        111,        111,        1,    11300, 0xbc872268
-0,        112,        112,        1,    11300, 0xe77adb8c
-0,        113,        113,        1,    11300, 0xa38936b7
-0,        114,        114,        1,    11300, 0xd6153632
-0,        115,        115,        1,    11300, 0x1ae633cc
-0,        116,        116,        1,    11300, 0xb90c286e
-0,        117,        117,        1,    11300, 0xbc7e333d
-0,        118,        118,        1,    11300, 0x1b5421f8
-0,        119,        119,        1,    11300, 0xdde6506d
-0,        120,        120,        1,    11300, 0xd3eb757e
-0,        121,        121,        1,    11300, 0x5ad1929c
-0,        122,        122,        1,    11300, 0x4f6aa47d
-0,        123,        123,        1,    11300, 0xab3caf55
-0,        124,        124,        1,    11300, 0x5ff9b39a
-0,        125,        125,        1,    11300, 0x1454e12e
-0,        126,        126,        1,    11300, 0xf18216e8
-0,        127,        127,        1,    11300, 0x62144880
-0,        128,        128,        1,    11300, 0x54284241
-0,        129,        129,        1,    11300, 0x8e8c7228
-0,        130,        130,        1,    11300, 0xb498d06e
-0,        131,        131,        1,    11300, 0x7b1e6be1
-0,        132,        132,        1,    11300, 0x5e5ea1f4
-0,        133,        133,        1,    11300, 0x41eda28e
-0,        134,        134,        1,    11300, 0x7ba6aa92
-0,        135,        135,        1,    11300, 0xa8a8b1c7
-0,        136,        136,        1,    11300, 0x0d30bd08
-0,        137,        137,        1,    11300, 0xc610bf16
-0,        138,        138,        1,    11300, 0xed57c075
-0,        139,        139,        1,    11300, 0xb86dbfea
-0,        140,        140,        1,    11300, 0x0970c03d
-0,        141,        141,        1,    11300, 0x743ac2ac
-0,        142,        142,        1,    11300, 0x0a44c816
-0,        143,        143,        1,    11300, 0xe32acd6b
-0,        144,        144,        1,    11300, 0x209bcdab
-0,        145,        145,        1,    11300, 0x3cd0d105
-0,        146,        146,        1,    11300, 0xc0bcd330
-0,        147,        147,        1,    11300, 0x4785d6dc
-0,        148,        148,        1,    11300, 0xe85f9c90
-0,        149,        149,        1,    11300, 0xd4a72850
-0,        150,        150,        1,    11300, 0x04766e41
-0,        151,        151,        1,    11300, 0x04766e41
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 100x75
+#sar 0: 0/1
+0,          0,          0,        1,    22500, 0x0f8e562e
+0,          1,          1,        1,    22500, 0x507aef06
+0,          2,          2,        1,    22500, 0x059d6137
+0,          3,          3,        1,    22500, 0xfb1bfd4e
+0,          4,          4,        1,    22500, 0xe97a51ba
+0,          5,          5,        1,    22500, 0xfc77e68e
+0,          6,          6,        1,    22500, 0x7f1985ac
+0,          7,          7,        1,    22500, 0xdfb933eb
+0,          8,          8,        1,    22500, 0x6dafe534
+0,          9,          9,        1,    22500, 0xb7b69abb
+0,         10,         10,        1,    22500, 0xc435c086
+0,         11,         11,        1,    22500, 0xf8ddb549
+0,         12,         12,        1,    22500, 0x76c0d70d
+0,         13,         13,        1,    22500, 0x1120bc82
+0,         14,         14,        1,    22500, 0x3f7c7970
+0,         15,         15,        1,    22500, 0xd37c9aee
+0,         16,         16,        1,    22500, 0x7407f81b
+0,         17,         17,        1,    22500, 0xce2f1c00
+0,         18,         18,        1,    22500, 0x70921eb5
+0,         19,         19,        1,    22500, 0x0abc917e
+0,         20,         20,        1,    22500, 0xeff1f0fa
+0,         21,         21,        1,    22500, 0x5e0d769b
+0,         22,         22,        1,    22500, 0xc984cbfd
+0,         23,         23,        1,    22500, 0x73f1caa9
+0,         24,         24,        1,    22500, 0x9108af6f
+0,         25,         25,        1,    22500, 0x4f33484e
+0,         26,         26,        1,    22500, 0x9810f8ca
+0,         27,         27,        1,    22500, 0xa0b97ca0
+0,         28,         28,        1,    22500, 0xd9c28ba3
+0,         29,         29,        1,    22500, 0xc97e17e6
+0,         30,         30,        1,    22500, 0x85cf86aa
+0,         31,         31,        1,    22500, 0xf15ff793
+0,         32,         32,        1,    22500, 0x35c54ab5
+0,         33,         33,        1,    22500, 0xe80ec129
+0,         34,         34,        1,    22500, 0x3d6cff39
+0,         35,         35,        1,    22500, 0x54e41aff
+0,         36,         36,        1,    22500, 0xc1d63293
+0,         37,         37,        1,    22500, 0x362c2dd4
+0,         38,         38,        1,    22500, 0xa1f8cdcf
+0,         39,         39,        1,    22500, 0x5b59ba62
+0,         40,         40,        1,    22500, 0x6d02f5b2
+0,         41,         41,        1,    22500, 0x899293ff
+0,         42,         42,        1,    22500, 0xad0e9ace
+0,         43,         43,        1,    22500, 0x4263f9db
+0,         44,         44,        1,    22500, 0xff1e481a
+0,         45,         45,        1,    22500, 0x70c86884
+0,         46,         46,        1,    22500, 0x203ed712
+0,         47,         47,        1,    22500, 0x2f0e8d46
+0,         48,         48,        1,    22500, 0x215075a9
+0,         49,         49,        1,    22500, 0x9882a978
+0,         50,         50,        1,    22500, 0xc2fd5209
+0,         51,         51,        1,    22500, 0xe1c925f6
+0,         52,         52,        1,    22500, 0x012be5af
+0,         53,         53,        1,    22500, 0xa718cbdb
+0,         54,         54,        1,    22500, 0x2494a1c3
+0,         55,         55,        1,    22500, 0xeb8980e4
+0,         56,         56,        1,    22500, 0x7f2766cb
+0,         57,         57,        1,    22500, 0xdf3cafa1
+0,         58,         58,        1,    22500, 0x9a390f81
+0,         59,         59,        1,    22500, 0xfdad5eed
+0,         60,         60,        1,    22500, 0x94f58ff3
+0,         61,         61,        1,    22500, 0xd7c6d9f2
+0,         62,         62,        1,    22500, 0x48b72e7d
+0,         63,         63,        1,    22500, 0x8a7a7e37
+0,         64,         64,        1,    22500, 0x5413c88a
+0,         65,         65,        1,    22500, 0x3f4531b2
+0,         66,         66,        1,    22500, 0x152d9396
+0,         67,         67,        1,    22500, 0x2ac3f418
+0,         68,         68,        1,    22500, 0x0e1c5353
+0,         69,         69,        1,    22500, 0xe058b711
+0,         70,         70,        1,    22500, 0x262e1a9f
+0,         71,         71,        1,    22500, 0x20057d10
+0,         72,         72,        1,    22500, 0x65c5ccb5
+0,         73,         73,        1,    22500, 0x3e36411a
+0,         74,         74,        1,    22500, 0xd9740391
+0,         75,         75,        1,    22500, 0x53d1441d
+0,         76,         76,        1,    22500, 0x9a3941ad
+0,         77,         77,        1,    22500, 0x61553437
+0,         78,         78,        1,    22500, 0xfe0c0468
+0,         79,         79,        1,    22500, 0xd57bde4b
+0,         80,         80,        1,    22500, 0x4a183a4c
+0,         81,         81,        1,    22500, 0xd618b978
+0,         82,         82,        1,    22500, 0x6b480112
+0,         83,         83,        1,    22500, 0x7a1732e9
+0,         84,         84,        1,    22500, 0x45836afc
+0,         85,         85,        1,    22500, 0x3548d4e0
+0,         86,         86,        1,    22500, 0x476c821a
+0,         87,         87,        1,    22500, 0x6be5f249
+0,         88,         88,        1,    22500, 0xf79b6d52
+0,         89,         89,        1,    22500, 0x2edeb0f3
+0,         90,         90,        1,    22500, 0xbaf808bf
+0,         91,         91,        1,    22500, 0x71013790
+0,         92,         92,        1,    22500, 0xbf4e3085
+0,         93,         93,        1,    22500, 0x15c2b4de
+0,         94,         94,        1,    22500, 0x031d17fa
+0,         95,         95,        1,    22500, 0x3a2c193b
+0,         96,         96,        1,    22500, 0xb0420aa4
+0,         97,         97,        1,    22500, 0xe448fe50
+0,         98,         98,        1,    22500, 0x02173090
+0,         99,         99,        1,    22500, 0x4b2f76a1
+0,        100,        100,        1,    22500, 0xd6458c46
+0,        101,        101,        1,    22500, 0xa698fc27
+0,        102,        102,        1,    22500, 0xaeca6b5d
+0,        103,        103,        1,    22500, 0x4a591972
+0,        104,        104,        1,    22500, 0x19e49ba7
+0,        105,        105,        1,    22500, 0x1d4ffb92
+0,        106,        106,        1,    22500, 0xb1f8e0f8
+0,        107,        107,        1,    22500, 0x32c82e8b
+0,        108,        108,        1,    22500, 0x96e930c8
+0,        109,        109,        1,    22500, 0x0e6ebd2c
+0,        110,        110,        1,    22500, 0x315bc5ba
+0,        111,        111,        1,    22500, 0xb22321ee
+0,        112,        112,        1,    22500, 0xbe464d78
+0,        113,        113,        1,    22500, 0xdb4b5edb
+0,        114,        114,        1,    22500, 0x0ff65d4c
+0,        115,        115,        1,    22500, 0xff68561a
+0,        116,        116,        1,    22500, 0xa0033400
+0,        117,        117,        1,    22500, 0x5414546d
+0,        118,        118,        1,    22500, 0x7e43209e
+0,        119,        119,        1,    22500, 0x0037abfd
+0,        120,        120,        1,    22500, 0x3dd31b3f
+0,        121,        121,        1,    22500, 0xe0777299
+0,        122,        122,        1,    22500, 0x35a2a83c
+0,        123,        123,        1,    22500, 0x5282c8c4
+0,        124,        124,        1,    22500, 0x1ccdd593
+0,        125,        125,        1,    22500, 0x92525e5e
+0,        126,        126,        1,    22500, 0x5fa3ff5f
+0,        127,        127,        1,    22500, 0xd1169436
+0,        128,        128,        1,    22500, 0x07dc8179
+0,        129,        129,        1,    22500, 0x9a83113d
+0,        130,        130,        1,    22500, 0x9c722c1e
+0,        131,        131,        1,    22500, 0xccbcfe59
+0,        132,        132,        1,    22500, 0x8606a0a1
+0,        133,        133,        1,    22500, 0x2210a26f
+0,        134,        134,        1,    22500, 0xfc73ba7b
+0,        135,        135,        1,    22500, 0x731fd01a
+0,        136,        136,        1,    22500, 0x0e21f1dd
+0,        137,        137,        1,    22500, 0xf9c4f807
+0,        138,        138,        1,    22500, 0x2123fc24
+0,        139,        139,        1,    22500, 0xd42cfa83
+0,        140,        140,        1,    22500, 0x5927fb7c
+0,        141,        141,        1,    22500, 0xe32e02d8
+0,        142,        142,        1,    22500, 0xa5c11316
+0,        143,        143,        1,    22500, 0xb9112315
+0,        144,        144,        1,    22500, 0x78f223d5
+0,        145,        145,        1,    22500, 0x93202de3
+0,        146,        146,        1,    22500, 0x7eb03464
+0,        147,        147,        1,    22500, 0x899c3f68
+0,        148,        148,        1,    22500, 0xc2169075
+0,        149,        149,        1,    22500, 0x419f33a6
+0,        150,        150,        1,    22500, 0x3de50588
+0,        151,        151,        1,    22500, 0x3de50588
diff --git a/tests/ref/fate/cvid-palette b/tests/ref/fate/cvid-palette
index 5fcbc5153c..eae41618b5 100644
--- a/tests/ref/fate/cvid-palette
+++ b/tests/ref/fate/cvid-palette
@@ -1,57 +1,61 @@
-#tb 0: 1/14985
-0,          0,          0,        0,    57600, 0x1f5c89b7
-0,       1000,       1000,        0,    57600, 0xd2055aaf
-0,       2000,       2000,        0,    57600, 0x22336052
-0,       3000,       3000,        0,    57600, 0xf7135e2a
-0,       4000,       4000,        0,    57600, 0xd9de126a
-0,       5000,       5000,        0,    57600, 0xe5a9e1de
-0,       6000,       6000,        0,    57600, 0x253f1702
-0,       7000,       7000,        0,    57600, 0xcb8679c9
-0,       8000,       8000,        0,    57600, 0x96cb5fa8
-0,       9000,       9000,        0,    57600, 0xbe03528a
-0,      10000,      10000,        0,    57600, 0x120a097d
-0,      11000,      11000,        0,    57600, 0xaf562041
-0,      12000,      12000,        0,    57600, 0x15b2d8c9
-0,      13000,      13000,        0,    57600, 0x95f60e58
-0,      14000,      14000,        0,    57600, 0x5ace5a6b
-0,      15000,      15000,        0,    57600, 0x2f80b8e3
-0,      16000,      16000,        0,    57600, 0x5c49c915
-0,      17000,      17000,        0,    57600, 0xb91efe60
-0,      18000,      18000,        0,    57600, 0xa80d29e8
-0,      19000,      19000,        0,    57600, 0x6e72d03a
-0,      20000,      20000,        0,    57600, 0x4f716a9e
-0,      21000,      21000,        0,    57600, 0x3a43b9c9
-0,      22000,      22000,        0,    57600, 0x65002db3
-0,      23000,      23000,        0,    57600, 0x70edc765
-0,      24000,      24000,        0,    57600, 0x9dc54abd
-0,      25000,      25000,        0,    57600, 0xd17bda86
-0,      26000,      26000,        0,    57600, 0xc5d2d458
-0,      27000,      27000,        0,    57600, 0x32313c79
-0,      28000,      28000,        0,    57600, 0x2e537e8d
-0,      29000,      29000,        0,    57600, 0xe77d5d9e
-0,      30000,      30000,        0,    57600, 0x9cc2599a
-0,      31000,      31000,        0,    57600, 0x8a9be76e
-0,      32000,      32000,        0,    57600, 0x47447eef
-0,      33000,      33000,        0,    57600, 0xbf5f84fa
-0,      34000,      34000,        0,    57600, 0xacd49c07
-0,      35000,      35000,        0,    57600, 0xdc628975
-0,      36000,      36000,        0,    57600, 0x97d7964e
-0,      37000,      37000,        0,    57600, 0xd0a19b6b
-0,      38000,      38000,        0,    57600, 0x5ea3d78c
-0,      39000,      39000,        0,    57600, 0x39b59be0
-0,      40000,      40000,        0,    57600, 0x6501a2d2
-0,      41000,      41000,        0,    57600, 0x0ee7e36d
-0,      42000,      42000,        0,    57600, 0x354ddd1d
-0,      43000,      43000,        0,    57600, 0x9b8f22d3
-0,      44000,      44000,        0,    57600, 0x0aadfb8c
-0,      45000,      45000,        0,    57600, 0x322e2785
-0,      46000,      46000,        0,    57600, 0x78a6467e
-0,      47000,      47000,        0,    57600, 0x1757f3b1
-0,      48000,      48000,        0,    57600, 0xe874ceb7
-0,      49000,      49000,        0,    57600, 0xc40f9e4d
-0,      50000,      50000,        0,    57600, 0x89f6a735
-0,      51000,      51000,        0,    57600, 0xe3635393
-0,      52000,      52000,        0,    57600, 0xdae585c7
-0,      53000,      53000,        0,    57600, 0xf99baa60
-0,      54000,      54000,        0,    57600, 0x28a8b1ee
-0,      55000,      55000,        0,    57600, 0xcd5587f8
+#tb 0: 200/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
+0,          0,          0,        1,    57600, 0x1f5c89b7
+0,          1,          1,        1,    57600, 0xd2055aaf
+0,          2,          2,        1,    57600, 0x22336052
+0,          3,          3,        1,    57600, 0xf7135e2a
+0,          4,          4,        1,    57600, 0xd9de126a
+0,          5,          5,        1,    57600, 0xe5a9e1de
+0,          6,          6,        1,    57600, 0x253f1702
+0,          7,          7,        1,    57600, 0xcb8679c9
+0,          8,          8,        1,    57600, 0x96cb5fa8
+0,          9,          9,        1,    57600, 0xbe03528a
+0,         10,         10,        1,    57600, 0x120a097d
+0,         11,         11,        1,    57600, 0xaf562041
+0,         12,         12,        1,    57600, 0x15b2d8c9
+0,         13,         13,        1,    57600, 0x95f60e58
+0,         14,         14,        1,    57600, 0x5ace5a6b
+0,         15,         15,        1,    57600, 0x2f80b8e3
+0,         16,         16,        1,    57600, 0x5c49c915
+0,         17,         17,        1,    57600, 0xb91efe60
+0,         18,         18,        1,    57600, 0xa80d29e8
+0,         19,         19,        1,    57600, 0x6e72d03a
+0,         20,         20,        1,    57600, 0x4f716a9e
+0,         21,         21,        1,    57600, 0x3a43b9c9
+0,         22,         22,        1,    57600, 0x65002db3
+0,         23,         23,        1,    57600, 0x70edc765
+0,         24,         24,        1,    57600, 0x9dc54abd
+0,         25,         25,        1,    57600, 0xd17bda86
+0,         26,         26,        1,    57600, 0xc5d2d458
+0,         27,         27,        1,    57600, 0x32313c79
+0,         28,         28,        1,    57600, 0x2e537e8d
+0,         29,         29,        1,    57600, 0xe77d5d9e
+0,         30,         30,        1,    57600, 0x9cc2599a
+0,         31,         31,        1,    57600, 0x8a9be76e
+0,         32,         32,        1,    57600, 0x47447eef
+0,         33,         33,        1,    57600, 0xbf5f84fa
+0,         34,         34,        1,    57600, 0xacd49c07
+0,         35,         35,        1,    57600, 0xdc628975
+0,         36,         36,        1,    57600, 0x97d7964e
+0,         37,         37,        1,    57600, 0xd0a19b6b
+0,         38,         38,        1,    57600, 0x5ea3d78c
+0,         39,         39,        1,    57600, 0x39b59be0
+0,         40,         40,        1,    57600, 0x6501a2d2
+0,         41,         41,        1,    57600, 0x0ee7e36d
+0,         42,         42,        1,    57600, 0x354ddd1d
+0,         43,         43,        1,    57600, 0x9b8f22d3
+0,         44,         44,        1,    57600, 0x0aadfb8c
+0,         45,         45,        1,    57600, 0x322e2785
+0,         46,         46,        1,    57600, 0x78a6467e
+0,         47,         47,        1,    57600, 0x1757f3b1
+0,         48,         48,        1,    57600, 0xe874ceb7
+0,         49,         49,        1,    57600, 0xc40f9e4d
+0,         50,         50,        1,    57600, 0x89f6a735
+0,         51,         51,        1,    57600, 0xe3635393
+0,         52,         52,        1,    57600, 0xdae585c7
+0,         53,         53,        1,    57600, 0xf99baa60
+0,         54,         54,        1,    57600, 0x28a8b1ee
+0,         55,         55,        1,    57600, 0xcd5587f8
diff --git a/tests/ref/fate/cvid-partial b/tests/ref/fate/cvid-partial
index 907ef4a5d2..990939db1c 100644
--- a/tests/ref/fate/cvid-partial
+++ b/tests/ref/fate/cvid-partial
@@ -1,80 +1,84 @@
 #tb 0: 1/12
-0,          0,          0,        1,   112400, 0x829180d8
-0,          1,          1,        1,   112400, 0xdbebac5b
-0,          2,          2,        1,   112400, 0xc5adc0f7
-0,          3,          3,        1,   112400, 0xbe1fc030
-0,          4,          4,        1,   112400, 0xe08ab460
-0,          5,          5,        1,   112400, 0xfde0dbc5
-0,          6,          6,        1,   112400, 0xed9242b0
-0,          7,          7,        1,   112400, 0x1ae3933a
-0,          8,          8,        1,   112400, 0xc82d2f5b
-0,          9,          9,        1,   112400, 0xbae9ddfc
-0,         10,         10,        1,   112400, 0xa350a1f7
-0,         11,         11,        1,   112400, 0x3cf78029
-0,         12,         12,        1,   112400, 0xaa0b82bf
-0,         13,         13,        1,   112400, 0x71aa4794
-0,         14,         14,        1,   112400, 0x2fe57373
-0,         15,         15,        1,   112400, 0x429c6f82
-0,         16,         16,        1,   112400, 0xfb2d917d
-0,         17,         17,        1,   112400, 0xcc84cb9a
-0,         18,         18,        1,   112400, 0xc68f0613
-0,         19,         19,        1,   112400, 0x05f30e6a
-0,         20,         20,        1,   112400, 0x5c5d853d
-0,         21,         21,        1,   112400, 0x01e0aff2
-0,         22,         22,        1,   112400, 0xc3b2cf4a
-0,         23,         23,        1,   112400, 0xc0a3cf19
-0,         24,         24,        1,   112400, 0xc743abda
-0,         25,         25,        1,   112400, 0x54bd17a2
-0,         26,         26,        1,   112400, 0x616ef28d
-0,         27,         27,        1,   112400, 0x04b51f59
-0,         28,         28,        1,   112400, 0x857511a2
-0,         29,         29,        1,   112400, 0x25c62440
-0,         30,         30,        1,   112400, 0x8c78198d
-0,         31,         31,        1,   112400, 0xc046c912
-0,         32,         32,        1,   112400, 0x0d828630
-0,         33,         33,        1,   112400, 0x48999b80
-0,         34,         34,        1,   112400, 0x9a869e77
-0,         35,         35,        1,   112400, 0x16d893df
-0,         36,         36,        1,   112400, 0xf6b86132
-0,         37,         37,        1,   112400, 0xfa564ea4
-0,         38,         38,        1,   112400, 0xdd473f69
-0,         39,         39,        1,   112400, 0xf89625a6
-0,         40,         40,        1,   112400, 0x823a58aa
-0,         41,         41,        1,   112400, 0x25e0fe43
-0,         42,         42,        1,   112400, 0x41034522
-0,         43,         43,        1,   112400, 0xb8da4f00
-0,         44,         44,        1,   112400, 0x9f684fce
-0,         45,         45,        1,   112400, 0xf7188710
-0,         46,         46,        1,   112400, 0x428fbfc6
-0,         47,         47,        1,   112400, 0x535bace0
-0,         48,         48,        1,   112400, 0x23216059
-0,         49,         49,        1,   112400, 0x9b8bbfa6
-0,         50,         50,        1,   112400, 0x932be522
-0,         51,         51,        1,   112400, 0xdbd31409
-0,         52,         52,        1,   112400, 0x0a69bf18
-0,         53,         53,        1,   112400, 0xa15ef128
-0,         54,         54,        1,   112400, 0x49a1fa92
-0,         55,         55,        1,   112400, 0xadeeaf62
-0,         56,         56,        1,   112400, 0xc1ce636e
-0,         57,         57,        1,   112400, 0x5ca544eb
-0,         58,         58,        1,   112400, 0x07230a36
-0,         59,         59,        1,   112400, 0x12ae2b53
-0,         60,         60,        1,   112400, 0x62453ef6
-0,         61,         61,        1,   112400, 0xe0588a98
-0,         62,         62,        1,   112400, 0xacd3927a
-0,         63,         63,        1,   112400, 0x5d3c6b01
-0,         64,         64,        1,   112400, 0xda671808
-0,         65,         65,        1,   112400, 0x61d0b492
-0,         66,         66,        1,   112400, 0x068b1293
-0,         67,         67,        1,   112400, 0x75b99287
-0,         68,         68,        1,   112400, 0xe657e7d6
-0,         69,         69,        1,   112400, 0x17873df6
-0,         70,         70,        1,   112400, 0xa8db5e31
-0,         71,         71,        1,   112400, 0x4f633b8e
-0,         72,         72,        1,   112400, 0x22266252
-0,         73,         73,        1,   112400, 0x308a6282
-0,         74,         74,        1,   112400, 0xfdb356ce
-0,         75,         75,        1,   112400, 0xe4394f1f
-0,         76,         76,        1,   112400, 0x8ca8649f
-0,         77,         77,        1,   112400, 0x804d44eb
-0,         78,         78,        1,   112400, 0x3864488b
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 400x187
+#sar 0: 0/1
+0,          0,          0,        1,   224400, 0xd8f2f310
+0,          1,          1,        1,   224400, 0xe38676c2
+0,          2,          2,        1,   224400, 0x7163b6ad
+0,          3,          3,        1,   224400, 0xa514b0f7
+0,          4,          4,        1,   224400, 0xeed48b96
+0,          5,          5,        1,   224400, 0x5e9f02b2
+0,          6,          6,        1,   224400, 0x70822c53
+0,          7,          7,        1,   224400, 0x93101067
+0,          8,          8,        1,   224400, 0x0710e900
+0,          9,          9,        1,   224400, 0x0e8add6a
+0,         10,         10,        1,   224400, 0x53fb2c5a
+0,         11,         11,        1,   224400, 0xa58cc02f
+0,         12,         12,        1,   224400, 0x0a5cc76b
+0,         13,         13,        1,   224400, 0xfa551631
+0,         14,         14,        1,   224400, 0xde9f99bf
+0,         15,         15,        1,   224400, 0xe66a8690
+0,         16,         16,        1,   224400, 0xd9e6f3d1
+0,         17,         17,        1,   224400, 0xa479a5c6
+0,         18,         18,        1,   224400, 0xdaa3531f
+0,         19,         19,        1,   224400, 0xde3e6843
+0,         20,         20,        1,   224400, 0x181adafd
+0,         21,         21,        1,   224400, 0x784b6429
+0,         22,         22,        1,   224400, 0x91cdc30e
+0,         23,         23,        1,   224400, 0x6e78be49
+0,         24,         24,        1,   224400, 0x7515644c
+0,         25,         25,        1,   224400, 0xcc32a91b
+0,         26,         26,        1,   224400, 0xc63e3831
+0,         27,         27,        1,   224400, 0xfb53b651
+0,         28,         28,        1,   224400, 0x12ec8a01
+0,         29,         29,        1,   224400, 0x136fcb2c
+0,         30,         30,        1,   224400, 0x827fa546
+0,         31,         31,        1,   224400, 0x1773b7f5
+0,         32,         32,        1,   224400, 0x732defc1
+0,         33,         33,        1,   224400, 0x84292372
+0,         34,         34,        1,   224400, 0x20f22365
+0,         35,         35,        1,   224400, 0xb39a0700
+0,         36,         36,        1,   224400, 0xf245706c
+0,         37,         37,        1,   224400, 0xdb702ae7
+0,         38,         38,        1,   224400, 0xadfefe5b
+0,         39,         39,        1,   224400, 0xa667adcb
+0,         40,         40,        1,   224400, 0x4d645191
+0,         41,         41,        1,   224400, 0x33802f58
+0,         42,         42,        1,   224400, 0x24eff4b8
+0,         43,         43,        1,   224400, 0x4dc817a6
+0,         44,         44,        1,   224400, 0x9a891d35
+0,         45,         45,        1,   224400, 0x2d0bb83b
+0,         46,         46,        1,   224400, 0xd13469c1
+0,         47,         47,        1,   224400, 0xd2e6302a
+0,         48,         48,        1,   224400, 0xc7594ee1
+0,         49,         49,        1,   224400, 0xc6da714c
+0,         50,         50,        1,   224400, 0xf675e838
+0,         51,         51,        1,   224400, 0xdc047c76
+0,         52,         52,        1,   224400, 0xe5727de5
+0,         53,         53,        1,   224400, 0x153b0f62
+0,         54,         54,        1,   224400, 0x65922f68
+0,         55,         55,        1,   224400, 0x04e04bfb
+0,         56,         56,        1,   224400, 0x1dde6c88
+0,         57,         57,        1,   224400, 0xed3905f2
+0,         58,         58,        1,   224400, 0x211a5996
+0,         59,         59,        1,   224400, 0xd010baaf
+0,         60,         60,        1,   224400, 0xcbc9f272
+0,         61,         61,        1,   224400, 0x7380d6f0
+0,         62,         62,        1,   224400, 0xfd0bf084
+0,         63,         63,        1,   224400, 0xc4d671d9
+0,         64,         64,        1,   224400, 0x84236aa5
+0,         65,         65,        1,   224400, 0x9c584ede
+0,         66,         66,        1,   224400, 0xdb0c6029
+0,         67,         67,        1,   224400, 0x775ae560
+0,         68,         68,        1,   224400, 0xe3800916
+0,         69,         69,        1,   224400, 0x9313a8e8
+0,         70,         70,        1,   224400, 0x3a5d07cc
+0,         71,         71,        1,   224400, 0x4651a10b
+0,         72,         72,        1,   224400, 0xc2d72183
+0,         73,         73,        1,   224400, 0xcd971625
+0,         74,         74,        1,   224400, 0x9fb0f3c2
+0,         75,         75,        1,   224400, 0x920ee561
+0,         76,         76,        1,   224400, 0x8a2c1bbf
+0,         77,         77,        1,   224400, 0x6150c072
+0,         78,         78,        1,   224400, 0x499dc869
diff --git a/tests/ref/fate/cyberia-c93 b/tests/ref/fate/cyberia-c93
index f02435c090..e7a5b5a08d 100644
--- a/tests/ref/fate/cyberia-c93
+++ b/tests/ref/fate/cyberia-c93
@@ -1,5 +1,14 @@
 #tb 0: 2/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x192
+#sar 0: 5/6
 #tb 1: 1/16129
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 16129
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   184320, 0x8433f0f8
 1,          0,          0,    14184,    28368, 0xaacc96a5
 0,          1,          1,        1,   184320, 0xd0d480f7
diff --git a/tests/ref/fate/cyuv b/tests/ref/fate/cyuv
index 37bdd2ff9b..18caeb879c 100644
--- a/tests/ref/fate/cyuv
+++ b/tests/ref/fate/cyuv
@@ -1,4 +1,8 @@
 #tb 0: 33333/1000000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x501e6abe
 0,          1,          1,        1,    38016, 0x84976f13
 0,          2,          2,        1,    38016, 0x8c487acb
diff --git a/tests/ref/fate/d-cinema-demux b/tests/ref/fate/d-cinema-demux
index f663040c17..74d00f7bb2 100644
--- a/tests/ref/fate/d-cinema-demux
+++ b/tests/ref/fate/d-cinema-demux
@@ -1,5 +1,10 @@
 #tb 0: 1/90000
+#media_type 0: audio
+#codec_id 0: pcm_s24daud
+#sample_rate 0: 96000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
 0,          0,          0,     1875,    36000, 0xd592781d
 0,       1875,       1875,     1875,    36000, 0xd592781d
 0,       3750,       3750,     1875,    36000, 0xd592781d
-0,       5625,       5625,     1200,    23056, 0xde81f0d6
+0,       5625,       5625,     1200,    23056, 0xde81f0d6, F=0x3
diff --git a/tests/ref/fate/d-eavp6-demux b/tests/ref/fate/d-eavp6-demux
new file mode 100644
index 0000000000..7cc13cf82a
--- /dev/null
+++ b/tests/ref/fate/d-eavp6-demux
@@ -0,0 +1,106 @@
+#tb 0: 32767/982027
+#media_type 0: video
+#codec_id 0: vp6
+#dimensions 0: 64x64
+#sar 0: 0/1
+#tb 1: 32767/982027
+#media_type 1: video
+#codec_id 1: vp6
+#dimensions 1: 64x64
+#sar 1: 0/1
+0,          0,          0,        1,     1860, 0xbd548c4c
+1,          0,          0,        1,     1748, 0x96046284
+0,          1,          1,        1,     1044, 0x814efc86, F=0x0
+1,          1,          1,        1,      204, 0x0ea1573a, F=0x0
+0,          2,          2,        1,     1036, 0xf672f905, F=0x0
+1,          2,          2,        1,      240, 0x634e7448, F=0x0
+0,          3,          3,        1,     1048, 0xe0f80ee7, F=0x0
+1,          3,          3,        1,      260, 0xc35b8521, F=0x0
+0,          4,          4,        1,     1072, 0x980918e9, F=0x0
+1,          4,          4,        1,      376, 0x6e5cb85e, F=0x0
+0,          5,          5,        1,     1052, 0x73e6fd33, F=0x0
+1,          5,          5,        1,      344, 0xaacdad6b, F=0x0
+0,          6,          6,        1,     1056, 0x5242fb20, F=0x0
+1,          6,          6,        1,      404, 0x7498be1f, F=0x0
+0,          7,          7,        1,     1092, 0x8b7111c2, F=0x0
+1,          7,          7,        1,      368, 0xe2b8afd2, F=0x0
+0,          8,          8,        1,     1144, 0xc1003410, F=0x0
+1,          8,          8,        1,      412, 0x3615c893, F=0x0
+0,          9,          9,        1,     1152, 0x6b9234f9, F=0x0
+1,          9,          9,        1,      424, 0x04a5cdb7, F=0x0
+0,         10,         10,        1,     1132, 0x7d45384b, F=0x0
+1,         10,         10,        1,      356, 0x4ad5a9d5, F=0x0
+0,         11,         11,        1,     1164, 0x47d637a1, F=0x0
+1,         11,         11,        1,      448, 0x2811d959, F=0x0
+0,         12,         12,        1,     1152, 0xede932ad, F=0x0
+1,         12,         12,        1,      316, 0x911a9c11, F=0x0
+0,         13,         13,        1,     1112, 0x49f31a9e, F=0x0
+1,         13,         13,        1,      312, 0x1bb08de2, F=0x0
+0,         14,         14,        1,     1112, 0x7f022bc7, F=0x0
+1,         14,         14,        1,      308, 0x2c3698bb, F=0x0
+0,         15,         15,        1,     1128, 0x2a7a4381, F=0x0
+1,         15,         15,        1,      424, 0xec77c694, F=0x0
+0,         16,         16,        1,     1012, 0x22a3f64b, F=0x0
+1,         16,         16,        1,      220, 0x7506677f, F=0x0
+0,         17,         17,        1,     1012, 0x0ea3f03b, F=0x0
+1,         17,         17,        1,      204, 0xbf3f607e, F=0x0
+0,         18,         18,        1,     1072, 0xdf860cc2, F=0x0
+1,         18,         18,        1,      416, 0x5f08ca69, F=0x0
+0,         19,         19,        1,     1052, 0x29a9116a, F=0x0
+1,         19,         19,        1,      244, 0x8d1a7c05, F=0x0
+0,         20,         20,        1,     1048, 0xfeb1107d, F=0x0
+1,         20,         20,        1,      260, 0xd0b27b40, F=0x0
+0,         21,         21,        1,     1084, 0xeed50a32, F=0x0
+1,         21,         21,        1,      304, 0x5e5e8f10, F=0x0
+0,         22,         22,        1,      992, 0xabd4e695, F=0x0
+1,         22,         22,        1,      304, 0x2c839490, F=0x0
+0,         23,         23,        1,     1016, 0x7396e5a4, F=0x0
+1,         23,         23,        1,      264, 0x5bac855a, F=0x0
+0,         24,         24,        1,     1000, 0x1d91ef45, F=0x0
+1,         24,         24,        1,      220, 0xcda465a8, F=0x0
+0,         25,         25,        1,      960, 0x1c99da31, F=0x0
+1,         25,         25,        1,      280, 0xc1d08783, F=0x0
+0,         26,         26,        1,      948, 0x48a4c938, F=0x0
+1,         26,         26,        1,      440, 0xe2ebd578, F=0x0
+0,         27,         27,        1,      952, 0xea12d081, F=0x0
+1,         27,         27,        1,      188, 0xe7b15222, F=0x0
+0,         28,         28,        1,      944, 0x9a83dce3, F=0x0
+1,         28,         28,        1,      208, 0xc3f05b2a, F=0x0
+0,         29,         29,        1,      916, 0xacdaba99, F=0x0
+1,         29,         29,        1,      248, 0x95f47262, F=0x0
+0,         30,         30,        1,     1408, 0x8b86c584
+1,         30,         30,        1,      452, 0x2444db2a
+0,         31,         31,        1,      848, 0xdaed99bd, F=0x0
+1,         31,         31,        1,      224, 0x1edf679b, F=0x0
+0,         32,         32,        1,      836, 0x2b0ba278, F=0x0
+1,         32,         32,        1,      256, 0x9fc079ff, F=0x0
+0,         33,         33,        1,      804, 0xa9268780, F=0x0
+1,         33,         33,        1,      240, 0x1ef76c13, F=0x0
+0,         34,         34,        1,      744, 0xb48f68fc, F=0x0
+1,         34,         34,        1,      216, 0x51e56846, F=0x0
+0,         35,         35,        1,      608, 0x538734c4, F=0x0
+1,         35,         35,        1,      220, 0x09b26d72, F=0x0
+0,         36,         36,        1,      604, 0x003520de, F=0x0
+1,         36,         36,        1,      212, 0xa124688a, F=0x0
+0,         37,         37,        1,      756, 0xc375752e, F=0x0
+1,         37,         37,        1,      288, 0x76bb8cec, F=0x0
+0,         38,         38,        1,      820, 0xd9529ca1, F=0x0
+1,         38,         38,        1,      336, 0xc15ca7a3, F=0x0
+0,         39,         39,        1,      900, 0xe447be51, F=0x0
+1,         39,         39,        1,      308, 0x1b92950e, F=0x0
+0,         40,         40,        1,      936, 0x17dcc60d, F=0x0
+1,         40,         40,        1,      300, 0x0f608f70, F=0x0
+0,         41,         41,        1,      952, 0xd5d8e11d, F=0x0
+1,         41,         41,        1,      424, 0x2fb3c6a6, F=0x0
+0,         42,         42,        1,      988, 0x4596e71c, F=0x0
+1,         42,         42,        1,      488, 0x3cb2ead4, F=0x0
+0,         43,         43,        1,     1040, 0x46300cfa, F=0x0
+1,         43,         43,        1,      452, 0x431dd5b1, F=0x0
+0,         44,         44,        1,     1040, 0xc8ad0ac0, F=0x0
+1,         44,         44,        1,      428, 0x8162c607, F=0x0
+0,         45,         45,        1,     1116, 0x9b4319da, F=0x0
+1,         45,         45,        1,      428, 0xe430de88, F=0x0
+0,         46,         46,        1,     1184, 0x016d38b6, F=0x0
+1,         46,         46,        1,      424, 0x6baecd21, F=0x0
+0,         47,         47,        1,     1188, 0xe885478b, F=0x0
+1,         47,         47,        1,      392, 0xc001c8e9, F=0x0
diff --git a/tests/ref/fate/dca-xll b/tests/ref/fate/dca-xll
new file mode 100644
index 0000000000..75b5453a87
--- /dev/null
+++ b/tests/ref/fate/dca-xll
@@ -0,0 +1 @@
+5eb9a95ddaf3c803e74443a49a691686
diff --git a/tests/ref/fate/dca-xll_51_16_192_768_0 b/tests/ref/fate/dca-xll_51_16_192_768_0
new file mode 100644
index 0000000000..6e62c616e2
--- /dev/null
+++ b/tests/ref/fate/dca-xll_51_16_192_768_0
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/192000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 192000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
+0,       2048,       2048,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
+0,       4096,       4096,     2048,    24576, 97e888b4de888608d08d193aecd2bd6b
+0,       6144,       6144,     2048,    24576, 96d20b0b657183ee88a5ec7d919d5313
+0,       8192,       8192,     2048,    24576, d6a98e7cea8e9b397e89f178aa719b19
+0,      10240,      10240,     2048,    24576, fb3432fe46696579220baa1c49e7dcd5
diff --git a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2 b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2
new file mode 100644
index 0000000000..6e62c616e2
--- /dev/null
+++ b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_2
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/192000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 192000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
+0,       2048,       2048,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
+0,       4096,       4096,     2048,    24576, 97e888b4de888608d08d193aecd2bd6b
+0,       6144,       6144,     2048,    24576, 96d20b0b657183ee88a5ec7d919d5313
+0,       8192,       8192,     2048,    24576, d6a98e7cea8e9b397e89f178aa719b19
+0,      10240,      10240,     2048,    24576, fb3432fe46696579220baa1c49e7dcd5
diff --git a/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6 b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6
new file mode 100644
index 0000000000..6e62c616e2
--- /dev/null
+++ b/tests/ref/fate/dca-xll_51_16_192_768_0-dmix_6
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/192000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 192000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
+0,       2048,       2048,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
+0,       4096,       4096,     2048,    24576, 97e888b4de888608d08d193aecd2bd6b
+0,       6144,       6144,     2048,    24576, 96d20b0b657183ee88a5ec7d919d5313
+0,       8192,       8192,     2048,    24576, d6a98e7cea8e9b397e89f178aa719b19
+0,      10240,      10240,     2048,    24576, fb3432fe46696579220baa1c49e7dcd5
diff --git a/tests/ref/fate/dca-xll_51_16_192_768_1 b/tests/ref/fate/dca-xll_51_16_192_768_1
new file mode 100644
index 0000000000..6e62c616e2
--- /dev/null
+++ b/tests/ref/fate/dca-xll_51_16_192_768_1
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/192000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 192000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
+0,       2048,       2048,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
+0,       4096,       4096,     2048,    24576, 97e888b4de888608d08d193aecd2bd6b
+0,       6144,       6144,     2048,    24576, 96d20b0b657183ee88a5ec7d919d5313
+0,       8192,       8192,     2048,    24576, d6a98e7cea8e9b397e89f178aa719b19
+0,      10240,      10240,     2048,    24576, fb3432fe46696579220baa1c49e7dcd5
diff --git a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2 b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2
new file mode 100644
index 0000000000..17896a7cca
--- /dev/null
+++ b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_2
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/192000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 192000
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     2048,     8192, 0829f71740aab1ab98b33eae21dee122
+0,       2048,       2048,     2048,     8192, c8ca1cff44674809d464ec39cf1bd1e9
+0,       4096,       4096,     2048,     8192, d67d26915ca86554568aac685c9a6dc3
+0,       6144,       6144,     2048,     8192, 8fdf69fdac9985ac4f9470a7b8e8529d
+0,       8192,       8192,     2048,     8192, dc8a9ca39b38c98147f2308f985ff648
+0,      10240,      10240,     2048,     8192, ea13b97373762ab16d0f664013fdc962
diff --git a/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6 b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6
new file mode 100644
index 0000000000..6e62c616e2
--- /dev/null
+++ b/tests/ref/fate/dca-xll_51_16_192_768_1-dmix_6
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/192000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 192000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
+0,       2048,       2048,     2048,    24576, 91ff0dac5df86e798bfef5e573536b08
+0,       4096,       4096,     2048,    24576, 97e888b4de888608d08d193aecd2bd6b
+0,       6144,       6144,     2048,    24576, 96d20b0b657183ee88a5ec7d919d5313
+0,       8192,       8192,     2048,    24576, d6a98e7cea8e9b397e89f178aa719b19
+0,      10240,      10240,     2048,    24576, fb3432fe46696579220baa1c49e7dcd5
diff --git a/tests/ref/fate/dca-xll_51_24_48_768 b/tests/ref/fate/dca-xll_51_24_48_768
new file mode 100644
index 0000000000..2d10583b49
--- /dev/null
+++ b/tests/ref/fate/dca-xll_51_24_48_768
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
+0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
+0,       1024,       1024,      512,     9216, 96ca6b6987c99d2f23bcd4754b257e8a
+0,       1536,       1536,      512,     9216, 67cf8fd7f6bead8a8225758e33068963
+0,       2048,       2048,      512,     9216, 8760d8a994cf173c1d6d818da419ea1d
+0,       2560,       2560,      512,     9216, 981ef3eef27d72d6c6425c7e6ad78da0
diff --git a/tests/ref/fate/dca-xll_51_24_48_768-dmix_2 b/tests/ref/fate/dca-xll_51_24_48_768-dmix_2
new file mode 100644
index 0000000000..be22d7d98e
--- /dev/null
+++ b/tests/ref/fate/dca-xll_51_24_48_768-dmix_2
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      512,     3072, d2a70550489de356a2cd6bfc40711204
+0,        512,        512,      512,     3072, d2a70550489de356a2cd6bfc40711204
+0,       1024,       1024,      512,     3072, 0ff2c55663b5113c2edf6ee9cc6b82b7
+0,       1536,       1536,      512,     3072, ceb660aaf1632ac2bd11a6d86f1dd54d
+0,       2048,       2048,      512,     3072, 4b136de05d39ed227e7ce566c12d1258
+0,       2560,       2560,      512,     3072, 9cd674b794c426e6db221bae008a1cf0
diff --git a/tests/ref/fate/dca-xll_51_24_48_768-dmix_6 b/tests/ref/fate/dca-xll_51_24_48_768-dmix_6
new file mode 100644
index 0000000000..2d10583b49
--- /dev/null
+++ b/tests/ref/fate/dca-xll_51_24_48_768-dmix_6
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
+0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
+0,       1024,       1024,      512,     9216, 96ca6b6987c99d2f23bcd4754b257e8a
+0,       1536,       1536,      512,     9216, 67cf8fd7f6bead8a8225758e33068963
+0,       2048,       2048,      512,     9216, 8760d8a994cf173c1d6d818da419ea1d
+0,       2560,       2560,      512,     9216, 981ef3eef27d72d6c6425c7e6ad78da0
diff --git a/tests/ref/fate/dca-xll_51_24_48_none b/tests/ref/fate/dca-xll_51_24_48_none
new file mode 100644
index 0000000000..17cfd0edb2
--- /dev/null
+++ b/tests/ref/fate/dca-xll_51_24_48_none
@@ -0,0 +1,13 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
+0,       1024,       1024,     1024,    18432, 6707daa7724fdc552869e522a7936f26
+0,       2048,       2048,     1024,    18432, be4cc5d54a49870a83edba83f21a7fb5
diff --git a/tests/ref/fate/dca-xll_51_24_48_none-dmix_2 b/tests/ref/fate/dca-xll_51_24_48_none-dmix_2
new file mode 100644
index 0000000000..17cfd0edb2
--- /dev/null
+++ b/tests/ref/fate/dca-xll_51_24_48_none-dmix_2
@@ -0,0 +1,13 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
+0,       1024,       1024,     1024,    18432, 6707daa7724fdc552869e522a7936f26
+0,       2048,       2048,     1024,    18432, be4cc5d54a49870a83edba83f21a7fb5
diff --git a/tests/ref/fate/dca-xll_51_24_48_none-dmix_6 b/tests/ref/fate/dca-xll_51_24_48_none-dmix_6
new file mode 100644
index 0000000000..17cfd0edb2
--- /dev/null
+++ b/tests/ref/fate/dca-xll_51_24_48_none-dmix_6
@@ -0,0 +1,13 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
+0,       1024,       1024,     1024,    18432, 6707daa7724fdc552869e522a7936f26
+0,       2048,       2048,     1024,    18432, be4cc5d54a49870a83edba83f21a7fb5
diff --git a/tests/ref/fate/dca-xll_71_24_48_768_0 b/tests/ref/fate/dca-xll_71_24_48_768_0
new file mode 100644
index 0000000000..a295d41a92
--- /dev/null
+++ b/tests/ref/fate/dca-xll_71_24_48_768_0
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 63f
+#channel_layout_name 0: 7.1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      512,    12288, ca9f8c8eb1b9b311cb79999fa376c7f0
+0,        512,        512,      512,    12288, 4072783b8efb99a9e5817067d68f61c6
+0,       1024,       1024,      512,    12288, b37a89420643e09e4c92a6a8b68efb73
+0,       1536,       1536,      512,    12288, 40d58b703681c7b673da1198e9555280
+0,       2048,       2048,      512,    12288, 3f0e22e71e7419256487ef9392abb102
+0,       2560,       2560,      512,    12288, 6a48d9a5e0c74d93cf678e6140a196f7
diff --git a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2 b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2
new file mode 100644
index 0000000000..f9b7b655a5
--- /dev/null
+++ b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_2
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      512,     9216, a2b724b146069938f0e2cb82490dea54
+0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
+0,       1024,       1024,      512,     9216, f38ce0585a816744ecb2120503347c11
+0,       1536,       1536,      512,     9216, 4d535bed6e022a780ecbe90f303985cf
+0,       2048,       2048,      512,     9216, 438f3a2fd98d1037e1ffbe696900d85c
+0,       2560,       2560,      512,     9216, 3ed1193e013d8ef43f502c7d4037a3f9
diff --git a/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6 b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6
new file mode 100644
index 0000000000..f9b7b655a5
--- /dev/null
+++ b/tests/ref/fate/dca-xll_71_24_48_768_0-dmix_6
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      512,     9216, a2b724b146069938f0e2cb82490dea54
+0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
+0,       1024,       1024,      512,     9216, f38ce0585a816744ecb2120503347c11
+0,       1536,       1536,      512,     9216, 4d535bed6e022a780ecbe90f303985cf
+0,       2048,       2048,      512,     9216, 438f3a2fd98d1037e1ffbe696900d85c
+0,       2560,       2560,      512,     9216, 3ed1193e013d8ef43f502c7d4037a3f9
diff --git a/tests/ref/fate/dca-xll_71_24_48_768_1 b/tests/ref/fate/dca-xll_71_24_48_768_1
new file mode 100644
index 0000000000..a295d41a92
--- /dev/null
+++ b/tests/ref/fate/dca-xll_71_24_48_768_1
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 63f
+#channel_layout_name 0: 7.1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      512,    12288, ca9f8c8eb1b9b311cb79999fa376c7f0
+0,        512,        512,      512,    12288, 4072783b8efb99a9e5817067d68f61c6
+0,       1024,       1024,      512,    12288, b37a89420643e09e4c92a6a8b68efb73
+0,       1536,       1536,      512,    12288, 40d58b703681c7b673da1198e9555280
+0,       2048,       2048,      512,    12288, 3f0e22e71e7419256487ef9392abb102
+0,       2560,       2560,      512,    12288, 6a48d9a5e0c74d93cf678e6140a196f7
diff --git a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2 b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2
new file mode 100644
index 0000000000..5b01746258
--- /dev/null
+++ b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_2
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      512,     3072, d2a70550489de356a2cd6bfc40711204
+0,        512,        512,      512,     3072, d2a70550489de356a2cd6bfc40711204
+0,       1024,       1024,      512,     3072, 4961cb5a954b57d157f075e051032389
+0,       1536,       1536,      512,     3072, b2ac42e29deb0bb6095550ec59a1da84
+0,       2048,       2048,      512,     3072, d30bd752b75ead1b8f62202fe8b1d692
+0,       2560,       2560,      512,     3072, ff7562359eca2706580050d849ca2de4
diff --git a/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6 b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6
new file mode 100644
index 0000000000..246b5e0133
--- /dev/null
+++ b/tests/ref/fate/dca-xll_71_24_48_768_1-dmix_6
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      512,     9216, a2b724b146069938f0e2cb82490dea54
+0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
+0,       1024,       1024,      512,     9216, 13ee6aa61ed484c3d64c9d6546e296bb
+0,       1536,       1536,      512,     9216, 4db0762920d0bb3ecd765168e2acd296
+0,       2048,       2048,      512,     9216, 6253047a99cbc0e6b1d484b7828466b6
+0,       2560,       2560,      512,     9216, 2977e1080514c6d2150ed2fde267e714
diff --git a/tests/ref/fate/dca-xll_71_24_96_768 b/tests/ref/fate/dca-xll_71_24_96_768
new file mode 100644
index 0000000000..418b4b136d
--- /dev/null
+++ b/tests/ref/fate/dca-xll_71_24_96_768
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/96000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 96000
+#channel_layout 0: 63f
+#channel_layout_name 0: 7.1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     1024,    24576, 0b24a527d66f2b0cab97f37e4cd79987
+0,       1024,       1024,     1024,    24576, 91ff0dac5df86e798bfef5e573536b08
+0,       2048,       2048,     1024,    24576, c2b5e663fa260abc9c737d16110052a8
+0,       3072,       3072,     1024,    24576, 81f474e17d875f7c5a2cbaadef4f7c0a
+0,       4096,       4096,     1024,    24576, 959200e06f2f8489b9e36c74b073edae
+0,       5120,       5120,     1024,    24576, ef1ed14d39cce6ba1ab9736831aa1b30
diff --git a/tests/ref/fate/dca-xll_71_24_96_768-dmix_2 b/tests/ref/fate/dca-xll_71_24_96_768-dmix_2
new file mode 100644
index 0000000000..9bd0256c31
--- /dev/null
+++ b/tests/ref/fate/dca-xll_71_24_96_768-dmix_2
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/96000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 96000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     1024,    18432, 0a675f172b0e1a171c46dfaa4f1d0f00
+0,       1024,       1024,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
+0,       2048,       2048,     1024,    18432, 0a6efad6cc824656594d5d7abce1e547
+0,       3072,       3072,     1024,    18432, a1beb9f5afcf72b99671a7cef8c35505
+0,       4096,       4096,     1024,    18432, e73de9b6688ec463178f694540f71d61
+0,       5120,       5120,     1024,    18432, e2e326c2f61d28ad11cea665ea638ae4
diff --git a/tests/ref/fate/dca-xll_71_24_96_768-dmix_6 b/tests/ref/fate/dca-xll_71_24_96_768-dmix_6
new file mode 100644
index 0000000000..9bd0256c31
--- /dev/null
+++ b/tests/ref/fate/dca-xll_71_24_96_768-dmix_6
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/96000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 96000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     1024,    18432, 0a675f172b0e1a171c46dfaa4f1d0f00
+0,       1024,       1024,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
+0,       2048,       2048,     1024,    18432, 0a6efad6cc824656594d5d7abce1e547
+0,       3072,       3072,     1024,    18432, a1beb9f5afcf72b99671a7cef8c35505
+0,       4096,       4096,     1024,    18432, e73de9b6688ec463178f694540f71d61
+0,       5120,       5120,     1024,    18432, e2e326c2f61d28ad11cea665ea638ae4
diff --git a/tests/ref/fate/dca-xll_x96_51_24_96_1509 b/tests/ref/fate/dca-xll_x96_51_24_96_1509
new file mode 100644
index 0000000000..bc83f793a0
--- /dev/null
+++ b/tests/ref/fate/dca-xll_x96_51_24_96_1509
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/96000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 96000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
+0,       1024,       1024,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
+0,       2048,       2048,     1024,    18432, f68686e3f6dec5aa00fc8ef495c3a3fa
+0,       3072,       3072,     1024,    18432, 03adab4e2a4a5e9917d29de09e0afb22
+0,       4096,       4096,     1024,    18432, d7d1ab1efd7f2ff45f7374b41abaec51
+0,       5120,       5120,     1024,    18432, fe2aa09319ac1d7017e29fdab6207f27
diff --git a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2 b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2
new file mode 100644
index 0000000000..bc83f793a0
--- /dev/null
+++ b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_2
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/96000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 96000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
+0,       1024,       1024,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
+0,       2048,       2048,     1024,    18432, f68686e3f6dec5aa00fc8ef495c3a3fa
+0,       3072,       3072,     1024,    18432, 03adab4e2a4a5e9917d29de09e0afb22
+0,       4096,       4096,     1024,    18432, d7d1ab1efd7f2ff45f7374b41abaec51
+0,       5120,       5120,     1024,    18432, fe2aa09319ac1d7017e29fdab6207f27
diff --git a/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6 b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6
new file mode 100644
index 0000000000..bc83f793a0
--- /dev/null
+++ b/tests/ref/fate/dca-xll_x96_51_24_96_1509-dmix_6
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/96000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 96000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
+0,       1024,       1024,     1024,    18432, f9debe3f07be68533bf0295e3d2ba68a
+0,       2048,       2048,     1024,    18432, f68686e3f6dec5aa00fc8ef495c3a3fa
+0,       3072,       3072,     1024,    18432, 03adab4e2a4a5e9917d29de09e0afb22
+0,       4096,       4096,     1024,    18432, d7d1ab1efd7f2ff45f7374b41abaec51
+0,       5120,       5120,     1024,    18432, fe2aa09319ac1d7017e29fdab6207f27
diff --git a/tests/ref/fate/dca-xll_xch_61_24_48_768 b/tests/ref/fate/dca-xll_xch_61_24_48_768
new file mode 100644
index 0000000000..19816d93d3
--- /dev/null
+++ b/tests/ref/fate/dca-xll_xch_61_24_48_768
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 70f
+#channel_layout_name 0: 6.1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      512,    10752, c3c5b236c266a9090378def1ad497a21
+0,        512,        512,      512,    10752, 36eb6749f8d9ce9f94860dcc447253ac
+0,       1024,       1024,      512,    10752, 586dbf42917c8353a3d3a65d4a510aa5
+0,       1536,       1536,      512,    10752, 08aa4874b4e092982cef8bd9623ebcaf
+0,       2048,       2048,      512,    10752, 809775c772fd730bbbb516cadc71406b
+0,       2560,       2560,      512,    10752, 81ef75c310c242b38787cd18203aa8c6
diff --git a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2 b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2
new file mode 100644
index 0000000000..1f6989fbe4
--- /dev/null
+++ b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_2
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      512,     9216, 652c4e61f9abe9fba9de792242e2d31d
+0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
+0,       1024,       1024,      512,     9216, bc9a102c0d879d25b5b362e20eaf277e
+0,       1536,       1536,      512,     9216, 06c77edb9dbd3aa927ffec3e5cf78266
+0,       2048,       2048,      512,     9216, f4010c574400a0876aa29a71f1bf1af3
+0,       2560,       2560,      512,     9216, b6d34a134c79bf105d88ecc4ac148f92
diff --git a/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6 b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6
new file mode 100644
index 0000000000..1f6989fbe4
--- /dev/null
+++ b/tests/ref/fate/dca-xll_xch_61_24_48_768-dmix_6
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s24le
+#sample_rate 0: 48000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      512,     9216, 652c4e61f9abe9fba9de792242e2d31d
+0,        512,        512,      512,     9216, 13a95890b5f0947d6f058ca9c30a3e01
+0,       1024,       1024,      512,     9216, bc9a102c0d879d25b5b362e20eaf277e
+0,       1536,       1536,      512,     9216, 06c77edb9dbd3aa927ffec3e5cf78266
+0,       2048,       2048,      512,     9216, f4010c574400a0876aa29a71f1bf1af3
+0,       2560,       2560,      512,     9216, b6d34a134c79bf105d88ecc4ac148f92
diff --git a/tests/ref/fate/dcinema-encode b/tests/ref/fate/dcinema-encode
index 8aeb21526c..03e6e6ef6c 100644
--- a/tests/ref/fate/dcinema-encode
+++ b/tests/ref/fate/dcinema-encode
@@ -1 +1,30 @@
-MD5=2d7c6897c315493647db159f4bfd6edc
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/96000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 96000
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      341,     4092, 697cddfcd0e21f24782af0705b7048f3
+0,        341,        341,      341,     4092, a057b18cd493923fed33c18578f61e0b
+0,        682,        682,      341,     4092, f4eacfd888566040067b8e5ce7d276c6
+0,       1023,       1023,      341,     4092, 4de78d332ce2047014880a110c160dc2
+0,       1364,       1364,      341,     4092, 138ee3fc206538feca6de3d6d62d08eb
+0,       1705,       1705,      341,     4092, 187a2f2998aa1c0ba0130c57dd1d6c86
+0,       2046,       2046,      341,     4092, 54e6c3db8a5f8c09b47f025659a36b17
+0,       2387,       2387,      341,     4092, 8abfdf44a24c158429c71e01cee31e20
+0,       2728,       2728,      341,     4092, bd08f5018edc5dc4520739e913ed89a3
+0,       3069,       3069,      341,     4092, 9f60ba4275646344e4a9b3c647efffe9
+0,       3410,       3410,      341,     4092, 00cefc1f27230cdd06ecd43132e16327
+0,       3751,       3751,      341,     4092, d4d13047cd639ed722a4ae1bc1f06991
+0,       4092,       4092,      341,     4092, 16b227e4f968c11cba279506f00d5172
+0,       4433,       4433,      341,     4092, 70f4046f709fdd4d80e2f2ffc862f21a
+0,       4774,       4774,      341,     4092, adbef4b4ef728f0c2a31b4b0baba50a0
+0,       5115,       5115,      341,     4092, fe009b6cc96b9d1098dcc5fba0e6b3fa
+0,       5456,       5456,      341,     4092, 4462b2f1654c9b31fdd7ab04ffb84192
+0,       5797,       5797,      341,     4092, 2e96ba3bd13de03f9cfdc2b8c3ea0620
+0,       6138,       6138,      341,     4092, 395c920f10cce6670029a98095eba027
+0,       6479,       6479,      341,     4092, 28d4c2f6364f31cb61f4aa144badc734
diff --git a/tests/ref/fate/dds-alpha8 b/tests/ref/fate/dds-alpha8
index fbda288092..73586841e8 100644
--- a/tests/ref/fate/dds-alpha8
+++ b/tests/ref/fate/dds-alpha8
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 122x122
+#sar 0: 0/1
 0,          0,          0,        1,    14884, 0xf81c47f5
diff --git a/tests/ref/fate/dds-argb b/tests/ref/fate/dds-argb
index fbde4242e4..f230133f71 100644
--- a/tests/ref/fate/dds-argb
+++ b/tests/ref/fate/dds-argb
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 220x64
+#sar 0: 0/1
 0,          0,          0,        1,    56320, 0xfcaa920b
diff --git a/tests/ref/fate/dds-argb-aexp b/tests/ref/fate/dds-argb-aexp
index f52410f98e..0e2b9af009 100644
--- a/tests/ref/fate/dds-argb-aexp
+++ b/tests/ref/fate/dds-argb-aexp
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xfdd37c43
diff --git a/tests/ref/fate/dds-dx10-bc1 b/tests/ref/fate/dds-dx10-bc1
index 84efd9f5ce..e99bf00eb5 100644
--- a/tests/ref/fate/dds-dx10-bc1
+++ b/tests/ref/fate/dds-dx10-bc1
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xed2f850f
diff --git a/tests/ref/fate/dds-dx10-bc1a b/tests/ref/fate/dds-dx10-bc1a
index 8cb4589e9b..53a2256fe9 100644
--- a/tests/ref/fate/dds-dx10-bc1a
+++ b/tests/ref/fate/dds-dx10-bc1a
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x473b484b
diff --git a/tests/ref/fate/dds-dx10-bc2 b/tests/ref/fate/dds-dx10-bc2
index a25180de24..5c31b38a6b 100644
--- a/tests/ref/fate/dds-dx10-bc2
+++ b/tests/ref/fate/dds-dx10-bc2
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x2bce3baa
diff --git a/tests/ref/fate/dds-dx10-bc3 b/tests/ref/fate/dds-dx10-bc3
index 296c94523d..4bc4ef43d9 100644
--- a/tests/ref/fate/dds-dx10-bc3
+++ b/tests/ref/fate/dds-dx10-bc3
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xb91d3c62
diff --git a/tests/ref/fate/dds-dx10-bc4 b/tests/ref/fate/dds-dx10-bc4
index 4583d258c1..8d57cfa993 100644
--- a/tests/ref/fate/dds-dx10-bc4
+++ b/tests/ref/fate/dds-dx10-bc4
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xfdfd1751
diff --git a/tests/ref/fate/dds-dx10-bc5 b/tests/ref/fate/dds-dx10-bc5
index bf595eb4e2..d8e473422c 100644
--- a/tests/ref/fate/dds-dx10-bc5
+++ b/tests/ref/fate/dds-dx10-bc5
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x79bd207e
diff --git a/tests/ref/fate/dds-dxt1 b/tests/ref/fate/dds-dxt1
index 24774069db..f1c6c9ce13 100644
--- a/tests/ref/fate/dds-dxt1
+++ b/tests/ref/fate/dds-dxt1
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x64
+#sar 0: 0/1
 0,          0,          0,        1,    32768, 0xf52adc80
diff --git a/tests/ref/fate/dds-dxt1-normalmap b/tests/ref/fate/dds-dxt1-normalmap
index 3f77547c05..15d63b1101 100644
--- a/tests/ref/fate/dds-dxt1-normalmap
+++ b/tests/ref/fate/dds-dxt1-normalmap
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x2b411855
diff --git a/tests/ref/fate/dds-dxt1a b/tests/ref/fate/dds-dxt1a
index 05be314bb9..1786b49dbd 100644
--- a/tests/ref/fate/dds-dxt1a
+++ b/tests/ref/fate/dds-dxt1a
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xcabb50ea
diff --git a/tests/ref/fate/dds-dxt2 b/tests/ref/fate/dds-dxt2
index 40bcf6ebab..b5bdfbadc3 100644
--- a/tests/ref/fate/dds-dxt2
+++ b/tests/ref/fate/dds-dxt2
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x11cebeb0
diff --git a/tests/ref/fate/dds-dxt3 b/tests/ref/fate/dds-dxt3
index 41401daeb2..d93e35c43d 100644
--- a/tests/ref/fate/dds-dxt3
+++ b/tests/ref/fate/dds-dxt3
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x729b74ba
diff --git a/tests/ref/fate/dds-dxt4 b/tests/ref/fate/dds-dxt4
index dc5d73f540..136dfd8006 100644
--- a/tests/ref/fate/dds-dxt4
+++ b/tests/ref/fate/dds-dxt4
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x31aaacd6
diff --git a/tests/ref/fate/dds-dxt5 b/tests/ref/fate/dds-dxt5
index 399d6d954d..696e0389e4 100644
--- a/tests/ref/fate/dds-dxt5
+++ b/tests/ref/fate/dds-dxt5
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xfd3166aa
diff --git a/tests/ref/fate/dds-dxt5-aexp b/tests/ref/fate/dds-dxt5-aexp
index ff91afde53..334dcc1ccb 100644
--- a/tests/ref/fate/dds-dxt5-aexp
+++ b/tests/ref/fate/dds-dxt5-aexp
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x3c987914
diff --git a/tests/ref/fate/dds-dxt5-normalmap b/tests/ref/fate/dds-dxt5-normalmap
index 680d1b7ff2..b562b1914a 100644
--- a/tests/ref/fate/dds-dxt5-normalmap
+++ b/tests/ref/fate/dds-dxt5-normalmap
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xd29b1ea1
diff --git a/tests/ref/fate/dds-dxt5-normalmap-ati b/tests/ref/fate/dds-dxt5-normalmap-ati
index 7f088f7584..b1fb53d9ff 100644
--- a/tests/ref/fate/dds-dxt5-normalmap-ati
+++ b/tests/ref/fate/dds-dxt5-normalmap-ati
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x54cb212f
diff --git a/tests/ref/fate/dds-dxt5-rbxg b/tests/ref/fate/dds-dxt5-rbxg
index 7dbecf4235..01779464c5 100644
--- a/tests/ref/fate/dds-dxt5-rbxg
+++ b/tests/ref/fate/dds-dxt5-rbxg
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x37588d12
diff --git a/tests/ref/fate/dds-dxt5-rgxb b/tests/ref/fate/dds-dxt5-rgxb
index 137913d83b..522679cb97 100644
--- a/tests/ref/fate/dds-dxt5-rgxb
+++ b/tests/ref/fate/dds-dxt5-rgxb
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xfb6b91cf
diff --git a/tests/ref/fate/dds-dxt5-rxbg b/tests/ref/fate/dds-dxt5-rxbg
index b6e12d3d71..cc6a23992b 100644
--- a/tests/ref/fate/dds-dxt5-rxbg
+++ b/tests/ref/fate/dds-dxt5-rxbg
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xc6cb8cbe
diff --git a/tests/ref/fate/dds-dxt5-rxgb b/tests/ref/fate/dds-dxt5-rxgb
index a4190d5493..9d70af87c0 100644
--- a/tests/ref/fate/dds-dxt5-rxgb
+++ b/tests/ref/fate/dds-dxt5-rxgb
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xb67d936a
diff --git a/tests/ref/fate/dds-dxt5-xgbr b/tests/ref/fate/dds-dxt5-xgbr
index 95404f2297..2f82cdc020 100644
--- a/tests/ref/fate/dds-dxt5-xgbr
+++ b/tests/ref/fate/dds-dxt5-xgbr
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xb0e69293
diff --git a/tests/ref/fate/dds-dxt5-xgxr b/tests/ref/fate/dds-dxt5-xgxr
index 3ed73c395f..3555449919 100644
--- a/tests/ref/fate/dds-dxt5-xgxr
+++ b/tests/ref/fate/dds-dxt5-xgxr
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xa93de1ad
diff --git a/tests/ref/fate/dds-dxt5-xrbg b/tests/ref/fate/dds-dxt5-xrbg
index f6479554c4..e6228f7c66 100644
--- a/tests/ref/fate/dds-dxt5-xrbg
+++ b/tests/ref/fate/dds-dxt5-xrbg
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xf20d8b69
diff --git a/tests/ref/fate/dds-dxt5-ycocg b/tests/ref/fate/dds-dxt5-ycocg
index 1dd8bef855..7f98652ef6 100644
--- a/tests/ref/fate/dds-dxt5-ycocg
+++ b/tests/ref/fate/dds-dxt5-ycocg
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x0d0c8d20
diff --git a/tests/ref/fate/dds-dxt5-ycocg-scaled b/tests/ref/fate/dds-dxt5-ycocg-scaled
index 5a70b490f8..2e74a8419b 100644
--- a/tests/ref/fate/dds-dxt5-ycocg-scaled
+++ b/tests/ref/fate/dds-dxt5-ycocg-scaled
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x5a089973
diff --git a/tests/ref/fate/dds-monob b/tests/ref/fate/dds-monob
index 370a4317e4..629b417035 100644
--- a/tests/ref/fate/dds-monob
+++ b/tests/ref/fate/dds-monob
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 122x122
+#sar 0: 0/1
 0,          0,          0,        1,     1952, 0x716498a1
diff --git a/tests/ref/fate/dds-pal b/tests/ref/fate/dds-pal
index 575a4bd51b..08c14a2bf1 100644
--- a/tests/ref/fate/dds-pal
+++ b/tests/ref/fate/dds-pal
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    65536, 0x4287e5cd
diff --git a/tests/ref/fate/dds-pal-ati b/tests/ref/fate/dds-pal-ati
index 6de8adb445..3303f7614f 100644
--- a/tests/ref/fate/dds-pal-ati
+++ b/tests/ref/fate/dds-pal-ati
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x6ac18060
diff --git a/tests/ref/fate/dds-rgb1555 b/tests/ref/fate/dds-rgb1555
index a23d0e51f3..95e701ff71 100644
--- a/tests/ref/fate/dds-rgb1555
+++ b/tests/ref/fate/dds-rgb1555
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 122x122
+#sar 0: 0/1
 0,          0,          0,        1,    29768, 0xbdc099db
diff --git a/tests/ref/fate/dds-rgb16 b/tests/ref/fate/dds-rgb16
index 40a9938f34..7865070c06 100644
--- a/tests/ref/fate/dds-rgb16
+++ b/tests/ref/fate/dds-rgb16
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xc8910265
diff --git a/tests/ref/fate/dds-rgb24 b/tests/ref/fate/dds-rgb24
index 3eeb1eb04c..2d4e7ed7a4 100644
--- a/tests/ref/fate/dds-rgb24
+++ b/tests/ref/fate/dds-rgb24
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x64
+#sar 0: 0/1
 0,          0,          0,        1,    24576, 0xef0f9653
diff --git a/tests/ref/fate/dds-rgb555 b/tests/ref/fate/dds-rgb555
index 65ac1192cd..70c320e334 100644
--- a/tests/ref/fate/dds-rgb555
+++ b/tests/ref/fate/dds-rgb555
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 122x122
+#sar 0: 0/1
 0,          0,          0,        1,    29768, 0x277d8628
diff --git a/tests/ref/fate/dds-rgba b/tests/ref/fate/dds-rgba
index 803b40a70a..7a14673c62 100644
--- a/tests/ref/fate/dds-rgba
+++ b/tests/ref/fate/dds-rgba
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 80x80
+#sar 0: 0/1
 0,          0,          0,        1,    25600, 0xa2a47b2f
diff --git a/tests/ref/fate/dds-rgtc1s b/tests/ref/fate/dds-rgtc1s
index 5085962e55..f0e271b52c 100644
--- a/tests/ref/fate/dds-rgtc1s
+++ b/tests/ref/fate/dds-rgtc1s
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xcda652a4
diff --git a/tests/ref/fate/dds-rgtc1u b/tests/ref/fate/dds-rgtc1u
index b7cff66eb3..5ef5c0540b 100644
--- a/tests/ref/fate/dds-rgtc1u
+++ b/tests/ref/fate/dds-rgtc1u
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x629a1b44
diff --git a/tests/ref/fate/dds-rgtc2s b/tests/ref/fate/dds-rgtc2s
index 722760205d..9e8653b141 100644
--- a/tests/ref/fate/dds-rgtc2s
+++ b/tests/ref/fate/dds-rgtc2s
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0xa0135ca8
diff --git a/tests/ref/fate/dds-rgtc2u b/tests/ref/fate/dds-rgtc2u
index 0b6678bbfa..9d3683f77e 100644
--- a/tests/ref/fate/dds-rgtc2u
+++ b/tests/ref/fate/dds-rgtc2u
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x38cb221a
diff --git a/tests/ref/fate/dds-rgtc2u-xy b/tests/ref/fate/dds-rgtc2u-xy
index bf595eb4e2..d8e473422c 100644
--- a/tests/ref/fate/dds-rgtc2u-xy
+++ b/tests/ref/fate/dds-rgtc2u-xy
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x79bd207e
diff --git a/tests/ref/fate/dds-uyvy b/tests/ref/fate/dds-uyvy
index 2bcbaa0455..b6fa221486 100644
--- a/tests/ref/fate/dds-uyvy
+++ b/tests/ref/fate/dds-uyvy
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,     8192, 0x3c658750
diff --git a/tests/ref/fate/dds-xbgr b/tests/ref/fate/dds-xbgr
index eb7a0246db..d4f4d98517 100644
--- a/tests/ref/fate/dds-xbgr
+++ b/tests/ref/fate/dds-xbgr
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x70336a28
diff --git a/tests/ref/fate/dds-xrgb b/tests/ref/fate/dds-xrgb
index 63e5225f89..23d466721d 100644
--- a/tests/ref/fate/dds-xrgb
+++ b/tests/ref/fate/dds-xrgb
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x702f6a28
diff --git a/tests/ref/fate/dds-y b/tests/ref/fate/dds-y
index ae62091b65..9a8f01dd96 100644
--- a/tests/ref/fate/dds-y
+++ b/tests/ref/fate/dds-y
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x64
+#sar 0: 0/1
 0,          0,          0,        1,     8192, 0x56eca90f
diff --git a/tests/ref/fate/dds-ya b/tests/ref/fate/dds-ya
index 01f78945ba..a0f12b5634 100644
--- a/tests/ref/fate/dds-ya
+++ b/tests/ref/fate/dds-ya
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 220x64
+#sar 0: 0/1
 0,          0,          0,        1,    28160, 0x5aa41fcb
diff --git a/tests/ref/fate/dds-ycocg b/tests/ref/fate/dds-ycocg
index f3dd727cbe..6d22842a6f 100644
--- a/tests/ref/fate/dds-ycocg
+++ b/tests/ref/fate/dds-ycocg
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x4cb08d0a
diff --git a/tests/ref/fate/dds-yuyv b/tests/ref/fate/dds-yuyv
index e65c9507da..07efd876ac 100644
--- a/tests/ref/fate/dds-yuyv
+++ b/tests/ref/fate/dds-yuyv
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,     8192, 0xc1108750
diff --git a/tests/ref/fate/delphine-cin-audio b/tests/ref/fate/delphine-cin-audio
index 1a94a6be0a..6fdc8048e4 100644
--- a/tests/ref/fate/delphine-cin-audio
+++ b/tests/ref/fate/delphine-cin-audio
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,    88224,   176448, 0x541ddc55
 0,      88224,      88224,     1838,     3676, 0xaf455081
 0,      90062,      90062,     1838,     3676, 0x27ef4e91
diff --git a/tests/ref/fate/delphine-cin-video b/tests/ref/fate/delphine-cin-video
index feaea26d44..6d25164a94 100644
--- a/tests/ref/fate/delphine-cin-video
+++ b/tests/ref/fate/delphine-cin-video
@@ -1,4 +1,8 @@
 #tb 0: 1/12
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x160
+#sar 0: 0/1
 0,          0,          0,        1,   153600, 0x00000000
 0,          1,          1,        1,   153600, 0x9c77862c
 0,          2,          2,        1,   153600, 0xd487c33c
diff --git a/tests/ref/fate/deluxepaint-anm b/tests/ref/fate/deluxepaint-anm
index e69b95e125..e466f25330 100644
--- a/tests/ref/fate/deluxepaint-anm
+++ b/tests/ref/fate/deluxepaint-anm
@@ -1,4 +1,8 @@
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
 0,          0,          0,        1,   192000, 0x82a79641
 0,          1,          1,        1,   192000, 0x43079971
 0,          2,          2,        1,   192000, 0x6311f1e5
diff --git a/tests/ref/fate/dfa1 b/tests/ref/fate/dfa1
index 92a7ccecea..3764391c35 100644
--- a/tests/ref/fate/dfa1
+++ b/tests/ref/fate/dfa1
@@ -1,26 +1,30 @@
 #tb 0: 16/125
-0,          0,          0,        1,   921600, 0x2e2b3ca4
-0,          1,          1,        1,   921600, 0x0ff7a368
-0,          2,          2,        1,   921600, 0xf5f0dc50
-0,          3,          3,        1,   921600, 0x56cb0c9d
-0,          4,          4,        1,   921600, 0xb253228f
-0,          5,          5,        1,   921600, 0xefd3419e
-0,          6,          6,        1,   921600, 0x708c0ce7
-0,          7,          7,        1,   921600, 0x0b3a7f6d
-0,          8,          8,        1,   921600, 0x72db4eac
-0,          9,          9,        1,   921600, 0x94328111
-0,         10,         10,        1,   921600, 0x95f7b2f0
-0,         11,         11,        1,   921600, 0xdc3c9655
-0,         12,         12,        1,   921600, 0xfe03dec6
-0,         13,         13,        1,   921600, 0x2551dffb
-0,         14,         14,        1,   921600, 0xe8b37d9e
-0,         15,         15,        1,   921600, 0xad93508b
-0,         16,         16,        1,   921600, 0x5a1c4890
-0,         17,         17,        1,   921600, 0x6f972fb4
-0,         18,         18,        1,   921600, 0xa1d5ff95
-0,         19,         19,        1,   921600, 0x7bc5d07c
-0,         20,         20,        1,   921600, 0xc0311e4e
-0,         21,         21,        1,   921600, 0x5b02cc48
-0,         22,         22,        1,   921600, 0x8db4d5fa
-0,         23,         23,        1,   921600, 0x31aae769
-0,         24,         24,        1,   921600, 0xab62b9a7
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+0,          0,          0,        1,   921600, 0xb69faa34
+0,          1,          1,        1,   921600, 0x38680829
+0,          2,          2,        1,   921600, 0xa7263c5a
+0,          3,          3,        1,   921600, 0xa784626a
+0,          4,          4,        1,   921600, 0xb4c47212
+0,          5,          5,        1,   921600, 0xd17285ea
+0,          6,          6,        1,   921600, 0xe9b33902
+0,          7,          7,        1,   921600, 0x215ea693
+0,          8,          8,        1,   921600, 0xe2ab6c7a
+0,          9,          9,        1,   921600, 0xf2867624
+0,         10,         10,        1,   921600, 0x607d78c1
+0,         11,         11,        1,   921600, 0x6e743bb7
+0,         12,         12,        1,   921600, 0x1fbf8f5a
+0,         13,         13,        1,   921600, 0xac6c912e
+0,         14,         14,        1,   921600, 0x556933bc
+0,         15,         15,        1,   921600, 0xda4c242b
+0,         16,         16,        1,   921600, 0xa6b32f83
+0,         17,         17,        1,   921600, 0x1ecc2996
+0,         18,         18,        1,   921600, 0xf1c3fc0f
+0,         19,         19,        1,   921600, 0x3f1db909
+0,         20,         20,        1,   921600, 0x7582fb93
+0,         21,         21,        1,   921600, 0x102ba261
+0,         22,         22,        1,   921600, 0xfbcf9de0
+0,         23,         23,        1,   921600, 0xe9ecb4d9
+0,         24,         24,        1,   921600, 0x7ee36a42
diff --git a/tests/ref/fate/dfa10 b/tests/ref/fate/dfa10
index a140e5c391..8e0e3c9ec1 100644
--- a/tests/ref/fate/dfa10
+++ b/tests/ref/fate/dfa10
@@ -1,9 +1,13 @@
 #tb 0: 71/1000
-0,          0,          0,        1,   192000, 0xbabcbd55
-0,          1,          1,        1,   192000, 0xf00a5683
-0,          2,          2,        1,   192000, 0xcce90589
-0,          3,          3,        1,   192000, 0x8545631f
-0,          4,          4,        1,   192000, 0xd3ab654c
-0,          5,          5,        1,   192000, 0x5e0dda12
-0,          6,          6,        1,   192000, 0x7e94b053
-0,          7,          7,        1,   192000, 0x8027e68b
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
+0,          0,          0,        1,   192000, 0x7384f9b2
+0,          1,          1,        1,   192000, 0xd1f61c71
+0,          2,          2,        1,   192000, 0x0c6937d1
+0,          3,          3,        1,   192000, 0x56459a3a
+0,          4,          4,        1,   192000, 0x6d011790
+0,          5,          5,        1,   192000, 0xb5347ce8
+0,          6,          6,        1,   192000, 0xcd422568
+0,          7,          7,        1,   192000, 0xde4fef2d
diff --git a/tests/ref/fate/dfa11 b/tests/ref/fate/dfa11
index 3990d24cfc..22571b594e 100644
--- a/tests/ref/fate/dfa11
+++ b/tests/ref/fate/dfa11
@@ -1,10 +1,14 @@
 #tb 0: 71/1000
-0,          0,          0,        1,   192000, 0x8b8bd8de
-0,          1,          1,        1,   192000, 0xdac26ec2
-0,          2,          2,        1,   192000, 0x0fc01c28
-0,          3,          3,        1,   192000, 0x1251eef7
-0,          4,          4,        1,   192000, 0x89eced0e
-0,          5,          5,        1,   192000, 0x4943d821
-0,          6,          6,        1,   192000, 0x49258ec9
-0,          7,          7,        1,   192000, 0x9afd5881
-0,          8,          8,        1,   192000, 0xb322b901
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
+0,          0,          0,        1,   192000, 0x4269d703
+0,          1,          1,        1,   192000, 0xdf8667e7
+0,          2,          2,        1,   192000, 0x450026ad
+0,          3,          3,        1,   192000, 0x2528ea52
+0,          4,          4,        1,   192000, 0x83bcd1ec
+0,          5,          5,        1,   192000, 0x88d5ba27
+0,          6,          6,        1,   192000, 0x44424577
+0,          7,          7,        1,   192000, 0xd93f12a3
+0,          8,          8,        1,   192000, 0xcd625f3e
diff --git a/tests/ref/fate/dfa2 b/tests/ref/fate/dfa2
index a050c97d44..0fd55b738b 100644
--- a/tests/ref/fate/dfa2
+++ b/tests/ref/fate/dfa2
@@ -1,18 +1,22 @@
 #tb 0: 71/1000
-0,          0,          0,        1,   921600, 0x713f2da1
-0,          1,          1,        1,   921600, 0x9e772ec9
-0,          2,          2,        1,   921600, 0x9420310f
-0,          3,          3,        1,   921600, 0xd68f294f
-0,          4,          4,        1,   921600, 0xe25a1bcf
-0,          5,          5,        1,   921600, 0x32f903ec
-0,          6,          6,        1,   921600, 0xdb290b1c
-0,          7,          7,        1,   921600, 0x0b0d1b0f
-0,          8,          8,        1,   921600, 0x58430921
-0,          9,          9,        1,   921600, 0xe65dd39e
-0,         10,         10,        1,   921600, 0x146b3068
-0,         11,         11,        1,   921600, 0x6e1e7f78
-0,         12,         12,        1,   921600, 0x0166e01c
-0,         13,         13,        1,   921600, 0x83b86b56
-0,         14,         14,        1,   921600, 0xd52a1697
-0,         15,         15,        1,   921600, 0x5b38adc8
-0,         16,         16,        1,   921600, 0x457f6cea
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+0,          0,          0,        1,   921600, 0x8a5d15df
+0,          1,          1,        1,   921600, 0x92c01362
+0,          2,          2,        1,   921600, 0xe1a31643
+0,          3,          3,        1,   921600, 0x37a90fe2
+0,          4,          4,        1,   921600, 0x74410783
+0,          5,          5,        1,   921600, 0xecf4ef1a
+0,          6,          6,        1,   921600, 0x4d7ff3d4
+0,          7,          7,        1,   921600, 0xac820317
+0,          8,          8,        1,   921600, 0xbe5ff56e
+0,          9,          9,        1,   921600, 0x8e59c329
+0,         10,         10,        1,   921600, 0x73bf23f3
+0,         11,         11,        1,   921600, 0xb90c780f
+0,         12,         12,        1,   921600, 0xfbd9dc32
+0,         13,         13,        1,   921600, 0x30586821
+0,         14,         14,        1,   921600, 0x6695195b
+0,         15,         15,        1,   921600, 0xc449aa85
+0,         16,         16,        1,   921600, 0xca6a391c
diff --git a/tests/ref/fate/dfa3 b/tests/ref/fate/dfa3
index 8c91faaa4b..417250cb18 100644
--- a/tests/ref/fate/dfa3
+++ b/tests/ref/fate/dfa3
@@ -1,11 +1,15 @@
 #tb 0: 1/10
-0,          0,          0,        1,   192000, 0x10380cf0
-0,          1,          1,        1,   192000, 0x1d74af4c
-0,          2,          2,        1,   192000, 0xd665492d
-0,          3,          3,        1,   192000, 0xbf544565
-0,          4,          4,        1,   192000, 0xf8a33b00
-0,          5,          5,        1,   192000, 0x7d08bbad
-0,          6,          6,        1,   192000, 0x10685a90
-0,          7,          7,        1,   192000, 0x0a1a9ef6
-0,          8,          8,        1,   192000, 0x3e967980
-0,          9,          9,        1,   192000, 0x9849f751
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
+0,          0,          0,        1,   192000, 0x236a1b54
+0,          1,          1,        1,   192000, 0xfb438b68
+0,          2,          2,        1,   192000, 0xde504563
+0,          3,          3,        1,   192000, 0xfaf88e05
+0,          4,          4,        1,   192000, 0xe15de5af
+0,          5,          5,        1,   192000, 0x641fcca4
+0,          6,          6,        1,   192000, 0x74899cb6
+0,          7,          7,        1,   192000, 0x93fdb1b4
+0,          8,          8,        1,   192000, 0x58d83456
+0,          9,          9,        1,   192000, 0x7d3012ac
diff --git a/tests/ref/fate/dfa4 b/tests/ref/fate/dfa4
index 67b5722b2a..76a4edecb7 100644
--- a/tests/ref/fate/dfa4
+++ b/tests/ref/fate/dfa4
@@ -1,14 +1,19 @@
 #tb 0: 71/500
-0,          1,          1,        1,   921600, 0xe6309638
-0,          2,          2,        1,   921600, 0xa99a7665
-0,          3,          3,        1,   921600, 0x172ccfbb
-0,          4,          4,        1,   921600, 0xcf676571
-0,          5,          5,        1,   921600, 0x6a5077f2
-0,          6,          6,        1,   921600, 0x6a5077f2
-0,          7,          7,        1,   921600, 0x6a5077f2
-0,          8,          8,        1,   921600, 0x6a5077f2
-0,          9,          9,        1,   921600, 0x6a5077f2
-0,         10,         10,        1,   921600, 0x6a5077f2
-0,         11,         11,        1,   921600, 0xb83db404
-0,         12,         12,        1,   921600, 0x997ceb90
-0,         13,         13,        1,   921600, 0xd707157c
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+0,          0,          0,        1,   921600, 0x00000000
+0,          1,          1,        1,   921600, 0xd9e060e3
+0,          2,          2,        1,   921600, 0x15e28dc7
+0,          3,          3,        1,   921600, 0x78e8bfbc
+0,          4,          4,        1,   921600, 0xe9407075
+0,          5,          5,        1,   921600, 0xab818b8a
+0,          6,          6,        1,   921600, 0xab818b8a
+0,          7,          7,        1,   921600, 0xab818b8a
+0,          8,          8,        1,   921600, 0xab818b8a
+0,          9,          9,        1,   921600, 0xab818b8a
+0,         10,         10,        1,   921600, 0xab818b8a
+0,         11,         11,        1,   921600, 0xad5ad11c
+0,         12,         12,        1,   921600, 0xe6e50f8c
+0,         13,         13,        1,   921600, 0x9f127099
diff --git a/tests/ref/fate/dfa5 b/tests/ref/fate/dfa5
index b9f7727e58..c836bf7202 100644
--- a/tests/ref/fate/dfa5
+++ b/tests/ref/fate/dfa5
@@ -1,16 +1,20 @@
 #tb 0: 1/10
-0,          0,          0,        1,   192000, 0xc0941c10
-0,          1,          1,        1,   192000, 0xe2fe3ae5
-0,          2,          2,        1,   192000, 0x4a352d98
-0,          3,          3,        1,   192000, 0x7b78e0bb
-0,          4,          4,        1,   192000, 0x855c6675
-0,          5,          5,        1,   192000, 0xf443dad6
-0,          6,          6,        1,   192000, 0xe7e2a2e1
-0,          7,          7,        1,   192000, 0xa9009c58
-0,          8,          8,        1,   192000, 0x551855ab
-0,          9,          9,        1,   192000, 0x253908c7
-0,         10,         10,        1,   192000, 0x616213c4
-0,         11,         11,        1,   192000, 0xa381c3b1
-0,         12,         12,        1,   192000, 0xa2d64152
-0,         13,         13,        1,   192000, 0x34ed0f72
-0,         14,         14,        1,   192000, 0x05be63b4
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
+0,          0,          0,        1,   192000, 0x9754890f
+0,          1,          1,        1,   192000, 0x01668965
+0,          2,          2,        1,   192000, 0xbd1b5e12
+0,          3,          3,        1,   192000, 0x2e97fb9f
+0,          4,          4,        1,   192000, 0xf8b452e2
+0,          5,          5,        1,   192000, 0xc6859449
+0,          6,          6,        1,   192000, 0x910844f7
+0,          7,          7,        1,   192000, 0x99443581
+0,          8,          8,        1,   192000, 0xec52d1e5
+0,          9,          9,        1,   192000, 0x2fc66c35
+0,         10,         10,        1,   192000, 0xd9af7379
+0,         11,         11,        1,   192000, 0x947a26ef
+0,         12,         12,        1,   192000, 0x7b77ab28
+0,         13,         13,        1,   192000, 0x2507637e
+0,         14,         14,        1,   192000, 0x6ce8c0ea
diff --git a/tests/ref/fate/dfa6 b/tests/ref/fate/dfa6
index 92ed259369..83b1998369 100644
--- a/tests/ref/fate/dfa6
+++ b/tests/ref/fate/dfa6
@@ -1,13 +1,17 @@
 #tb 0: 71/1000
-0,          0,          0,        1,   192000, 0x69f6a5f6
-0,          1,          1,        1,   192000, 0xc741d0a6
-0,          2,          2,        1,   192000, 0xba31e7a4
-0,          3,          3,        1,   192000, 0x7dc45080
-0,          4,          4,        1,   192000, 0x1c91dad5
-0,          5,          5,        1,   192000, 0x564b69b1
-0,          6,          6,        1,   192000, 0xdd9d9ae8
-0,          7,          7,        1,   192000, 0x605c05e1
-0,          8,          8,        1,   192000, 0xa5341ddb
-0,          9,          9,        1,   192000, 0x1ebff8ba
-0,         10,         10,        1,   192000, 0x240df237
-0,         11,         11,        1,   192000, 0xac641867
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
+0,          0,          0,        1,   192000, 0xb718dc63
+0,          1,          1,        1,   192000, 0x2efb7b89
+0,          2,          2,        1,   192000, 0x70827047
+0,          3,          3,        1,   192000, 0x61e1fd2f
+0,          4,          4,        1,   192000, 0x06f8bccd
+0,          5,          5,        1,   192000, 0xf0362404
+0,          6,          6,        1,   192000, 0xc00fc1b8
+0,          7,          7,        1,   192000, 0x94265476
+0,          8,          8,        1,   192000, 0x4b50ad23
+0,          9,          9,        1,   192000, 0x4d578b60
+0,         10,         10,        1,   192000, 0xfb14b875
+0,         11,         11,        1,   192000, 0x81682338
diff --git a/tests/ref/fate/dfa7 b/tests/ref/fate/dfa7
index 7dd40f2bc0..6a62f727fe 100644
--- a/tests/ref/fate/dfa7
+++ b/tests/ref/fate/dfa7
@@ -1,13 +1,17 @@
 #tb 0: 71/1000
-0,          0,          0,        1,     7866, 0xa0056fdb
-0,          1,          1,        1,     7866, 0xed906c7a
-0,          2,          2,        1,     7866, 0x1c6e6f7d
-0,          3,          3,        1,     7866, 0xa2c460f7
-0,          4,          4,        1,     7866, 0xcf2166d4
-0,          5,          5,        1,     7866, 0xea545432
-0,          6,          6,        1,     7866, 0x604a5a9e
-0,          7,          7,        1,     7866, 0xbbc95c89
-0,          8,          8,        1,     7866, 0x80b16b5b
-0,          9,          9,        1,     7866, 0x9a1660ae
-0,         10,         10,        1,     7866, 0x6f886b10
-0,         11,         11,        1,     7866, 0xad8b5c99
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 46x57
+#sar 0: 0/1
+0,          0,          0,        1,     7866, 0xab73dae7
+0,          1,          1,        1,     7866, 0x100adec8
+0,          2,          2,        1,     7866, 0x1a20ddfa
+0,          3,          3,        1,     7866, 0xc358cd16
+0,          4,          4,        1,     7866, 0xee0bd20e
+0,          5,          5,        1,     7866, 0xef26bef9
+0,          6,          6,        1,     7866, 0xa9d0c755
+0,          7,          7,        1,     7866, 0x6c11cc7c
+0,          8,          8,        1,     7866, 0x4d6ed988
+0,          9,          9,        1,     7866, 0x9965cf24
+0,         10,         10,        1,     7866, 0x9a12db24
+0,         11,         11,        1,     7866, 0x2e85cfeb
diff --git a/tests/ref/fate/dfa8 b/tests/ref/fate/dfa8
index 39dde05465..7b83f3e23b 100644
--- a/tests/ref/fate/dfa8
+++ b/tests/ref/fate/dfa8
@@ -1,37 +1,41 @@
 #tb 0: 71/1000
-0,          0,          0,        1,   134724, 0x2ab217de
-0,          1,          1,        1,   134724, 0xbf240f9a
-0,          2,          2,        1,   134724, 0x020a6010
-0,          3,          3,        1,   134724, 0x9a5f9374
-0,          4,          4,        1,   134724, 0x1e93a7e9
-0,          5,          5,        1,   134724, 0x9e4a4c55
-0,          6,          6,        1,   134724, 0x8f9d1bab
-0,          7,          7,        1,   134724, 0xb26ac45b
-0,          8,          8,        1,   134724, 0xc08706d2
-0,          9,          9,        1,   134724, 0x0806b031
-0,         10,         10,        1,   134724, 0x234dbb33
-0,         11,         11,        1,   134724, 0xe4cbfb2f
-0,         12,         12,        1,   134724, 0xf603f3fd
-0,         13,         13,        1,   134724, 0x205669d1
-0,         14,         14,        1,   134724, 0x7ddbb5e3
-0,         15,         15,        1,   134724, 0x8dfbb45a
-0,         16,         16,        1,   134724, 0x9632f681
-0,         17,         17,        1,   134724, 0x259e462c
-0,         18,         18,        1,   134724, 0x14f2bac1
-0,         19,         19,        1,   134724, 0xac3de7ed
-0,         20,         20,        1,   134724, 0x6b8af396
-0,         21,         21,        1,   134724, 0xd1e4bc1c
-0,         22,         22,        1,   134724, 0x716d1c73
-0,         23,         23,        1,   134724, 0x610956c8
-0,         24,         24,        1,   134724, 0x89ff8e86
-0,         25,         25,        1,   134724, 0xc3ea6b6f
-0,         26,         26,        1,   134724, 0x886688ef
-0,         27,         27,        1,   134724, 0xe60fc8c1
-0,         28,         28,        1,   134724, 0x22bd3131
-0,         29,         29,        1,   134724, 0xb1d74561
-0,         30,         30,        1,   134724, 0x61b069bc
-0,         31,         31,        1,   134724, 0x50b665c1
-0,         32,         32,        1,   134724, 0x027e5144
-0,         33,         33,        1,   134724, 0xfe0c31b4
-0,         34,         34,        1,   134724, 0x1e7a1f2d
-0,         35,         35,        1,   134724, 0x48bff03d
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 218x206
+#sar 0: 0/1
+0,          0,          0,        1,   134724, 0x53784ca9
+0,          1,          1,        1,   134724, 0x14c345b7
+0,          2,          2,        1,   134724, 0xe0d0dd51
+0,          3,          3,        1,   134724, 0xd53b5610
+0,          4,          4,        1,   134724, 0x7cbb8d47
+0,          5,          5,        1,   134724, 0x875d67c4
+0,          6,          6,        1,   134724, 0x9811c085
+0,          7,          7,        1,   134724, 0x25f6d228
+0,          8,          8,        1,   134724, 0x349495a0
+0,          9,          9,        1,   134724, 0xd0d75311
+0,         10,         10,        1,   134724, 0xb49cdfbb
+0,         11,         11,        1,   134724, 0x9fa69518
+0,         12,         12,        1,   134724, 0x28a1f58c
+0,         13,         13,        1,   134724, 0xb8dab657
+0,         14,         14,        1,   134724, 0x8c7e3b3b
+0,         15,         15,        1,   134724, 0x37268acf
+0,         16,         16,        1,   134724, 0xcce8ca02
+0,         17,         17,        1,   134724, 0xe0fd0c28
+0,         18,         18,        1,   134724, 0x5bdac906
+0,         19,         19,        1,   134724, 0xdd850bf0
+0,         20,         20,        1,   134724, 0x2002a228
+0,         21,         21,        1,   134724, 0x633617ea
+0,         22,         22,        1,   134724, 0x2a3ef337
+0,         23,         23,        1,   134724, 0x507886c3
+0,         24,         24,        1,   134724, 0x51c0f07b
+0,         25,         25,        1,   134724, 0x5e73dce1
+0,         26,         26,        1,   134724, 0x26acc6f0
+0,         27,         27,        1,   134724, 0x360c4349
+0,         28,         28,        1,   134724, 0xc7dbabd4
+0,         29,         29,        1,   134724, 0x671bbf66
+0,         30,         30,        1,   134724, 0x4d44df79
+0,         31,         31,        1,   134724, 0x69eade5b
+0,         32,         32,        1,   134724, 0x2b1bca82
+0,         33,         33,        1,   134724, 0x8b16af47
+0,         34,         34,        1,   134724, 0xb59fa1bd
+0,         35,         35,        1,   134724, 0x2ec17c24
diff --git a/tests/ref/fate/dfa9 b/tests/ref/fate/dfa9
index cf24e3e212..74b596fd65 100644
--- a/tests/ref/fate/dfa9
+++ b/tests/ref/fate/dfa9
@@ -1,7 +1,11 @@
 #tb 0: 71/1000
-0,          0,          0,        1,   228150, 0x188c6d9b
-0,          1,          1,        1,   228150, 0x658dbf2f
-0,          2,          2,        1,   228150, 0xc09a4b2e
-0,          3,          3,        1,   228150, 0x8777bc7d
-0,          4,          4,        1,   228150, 0xa388f0ce
-0,          5,          5,        1,   228150, 0x4e06666e
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 338x225
+#sar 0: 0/1
+0,          0,          0,        1,   228150, 0xde68df49
+0,          1,          1,        1,   228150, 0x8e12bcaf
+0,          2,          2,        1,   228150, 0x851b04f7
+0,          3,          3,        1,   228150, 0x7e5e0950
+0,          4,          4,        1,   228150, 0x1d92219f
+0,          5,          5,        1,   228150, 0x93caa693
diff --git a/tests/ref/fate/dict b/tests/ref/fate/dict
new file mode 100644
index 0000000000..7205e4c845
--- /dev/null
+++ b/tests/ref/fate/dict
@@ -0,0 +1,50 @@
+Testing av_dict_get_string() and av_dict_parse_string()
+
+aaa aaa   b,b bbb   c=c ccc   ddd d,d   eee e=e   f,f f=f   g=g g,g
+aaa=aaa,b\,b=bbb,c\=c=ccc,ddd=d\,d,eee=e\=e,f\,f=f\=f,g\=g=g\,g
+ret 0
+aaa aaa   b,b bbb   c=c ccc   ddd d,d   eee e=e   f,f f=f   g=g g,g
+aaa aaa   bbb bbb   ccc ccc   \,='" \,='"
+aaa=aaa"bbb=bbb"ccc=ccc"\\,\=\'\"=\\,\=\'\"
+ret 0
+aaa aaa   bbb bbb   ccc ccc   \,='" \,='"
+aaa aaa   bbb bbb   ccc ccc   \,='" \,='"
+aaa=aaa'bbb=bbb'ccc=ccc'\\,\=\'"=\\,\=\'"
+ret 0
+aaa aaa   bbb bbb   ccc ccc   \,='" \,='"
+aaa aaa   bbb bbb   ccc ccc   \,='" \,='"
+aaa"aaa,bbb"bbb,ccc"ccc,\\\,=\'\""\\\,=\'\"
+ret 0
+aaa aaa   bbb bbb   ccc ccc   \,='" \,='"
+aaa aaa   bbb bbb   ccc ccc   \,='" \,='"
+aaa'aaa,bbb'bbb,ccc'ccc,\\\,=\'"'\\\,=\'"
+ret 0
+aaa aaa   bbb bbb   ccc ccc   \,='" \,='"
+aaa aaa   bbb bbb   ccc ccc   \,='" \,='"
+aaa"aaa'bbb"bbb'ccc"ccc'\\,=\'\""\\,=\'\"
+ret 0
+aaa aaa   bbb bbb   ccc ccc   \,='" \,='"
+aaa aaa   bbb bbb   ccc ccc   \,='" \,='"
+aaa'aaa"bbb'bbb"ccc'ccc"\\,=\'\"'\\,=\'\"
+ret 0
+aaa aaa   bbb bbb   ccc ccc   \,='" \,='"
+
+Testing av_dict_set()
+a a
+b b
+c c
+d d
+e e
+ff ff
+
+Testing av_dict_set_int()
+1 1
+2 2
+3 3
+4 4
+5 5
+12 12
+
+Testing av_dict_set() with existing AVDictionaryEntry.key as key
+new val OK
+new val OK
diff --git a/tests/ref/fate/dirac b/tests/ref/fate/dirac
new file mode 100644
index 0000000000..f3f3dafb19
--- /dev/null
+++ b/tests/ref/fate/dirac
@@ -0,0 +1,7 @@
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   115200, 0xf73819e8
+0,          1,          1,        1,   115200, 0x082e3788
diff --git a/tests/ref/fate/dirac-low-delay b/tests/ref/fate/dirac-low-delay
new file mode 100644
index 0000000000..13bf8e8517
--- /dev/null
+++ b/tests/ref/fate/dirac-low-delay
@@ -0,0 +1,7 @@
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   115200, 0x2599a172
+0,          1,          1,        1,   115200, 0x08a8c08d
diff --git a/tests/ref/fate/display b/tests/ref/fate/display
new file mode 100644
index 0000000000..251e7e0cdf
--- /dev/null
+++ b/tests/ref/fate/display
@@ -0,0 +1,16 @@
+0 65536 0
+-65536 0 0
+0 0 1073741824
+degrees: -90.000000
+46340 -46340 0
+46340 46340 0
+0 0 1073741824
+degrees: 45.000000
+-46340 -46340 0
+-46340 46340 0
+0 0 1073741824
+degrees: 135.000000
+-46340 46340 0
+-46340 -46340 0
+0 0 1073741824
+degrees: -135.000000
diff --git a/tests/ref/fate/dnxhd-mbaff b/tests/ref/fate/dnxhd-mbaff
new file mode 100644
index 0000000000..8e95227bd7
--- /dev/null
+++ b/tests/ref/fate/dnxhd-mbaff
@@ -0,0 +1,6 @@
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1440x1080
+#sar 0: 1/1
+0,          0,          0,        1,  6220800, 0xe78198c0
diff --git a/tests/ref/fate/dnxhr-12bit b/tests/ref/fate/dnxhr-12bit
new file mode 100644
index 0000000000..eb5716780c
--- /dev/null
+++ b/tests/ref/fate/dnxhr-12bit
@@ -0,0 +1,6 @@
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
+0,          0,          0,        1,  8294400, 0x31bfa8f1
diff --git a/tests/ref/fate/dnxhr-444 b/tests/ref/fate/dnxhr-444
new file mode 100644
index 0000000000..25f42194ee
--- /dev/null
+++ b/tests/ref/fate/dnxhr-444
@@ -0,0 +1,6 @@
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x839
+#sar 0: 0/1
+0,          0,          0,        1,  9665280, 0x19ef4057
diff --git a/tests/ref/fate/dnxhr-parse b/tests/ref/fate/dnxhr-parse
new file mode 100644
index 0000000000..2fc5a47f58
--- /dev/null
+++ b/tests/ref/fate/dnxhr-parse
@@ -0,0 +1,9 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 3840x2160
+#sar 0: 0/1
+0,          0,          0,        1, 16588800, 0x67ebfdb1
+0,          1,          1,        1, 16588800, 0x7fa687e6
+0,          2,          2,        1, 16588800, 0x4e13f5eb
+0,          3,          3,        1, 16588800, 0x054a642d
diff --git a/tests/ref/fate/dnxhr-prefix1 b/tests/ref/fate/dnxhr-prefix1
new file mode 100644
index 0000000000..bbad26ea14
--- /dev/null
+++ b/tests/ref/fate/dnxhr-prefix1
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x1536
+#sar 0: 0/1
+0,          0,          0,        1,   786432, 0x5a07f1fe
+0,          1,          1,        1,   786432, 0x5b5acaed
+0,          2,          2,        1,   786432, 0x1a9aacb5
+0,          3,          3,        1,   786432, 0x12ddf22d
+0,          4,          4,        1,   786432, 0xde2515f8
diff --git a/tests/ref/fate/dnxhr-prefix2 b/tests/ref/fate/dnxhr-prefix2
new file mode 100644
index 0000000000..cb062b55ae
--- /dev/null
+++ b/tests/ref/fate/dnxhr-prefix2
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x1716
+#sar 0: 0/1
+0,          0,          0,        1,   878592, 0x9a99e1db
+0,          1,          1,        1,   878592, 0x9317b608
+0,          2,          2,        1,   878592, 0x2d6c9b2f
+0,          3,          3,        1,   878592, 0xa7f0e3fe
+0,          4,          4,        1,   878592, 0x98330125
diff --git a/tests/ref/fate/dnxhr-prefix3 b/tests/ref/fate/dnxhr-prefix3
new file mode 100644
index 0000000000..e6a729f6f5
--- /dev/null
+++ b/tests/ref/fate/dnxhr-prefix3
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x2048
+#sar 0: 0/1
+0,          0,          0,        1,  1048576, 0xa2eb0c23
+0,          1,          1,        1,  1048576, 0x2149e4f9
+0,          2,          2,        1,  1048576, 0xbdfacc9b
+0,          3,          3,        1,  1048576, 0x64040c52
+0,          4,          4,        1,  1048576, 0x9fec31b4
diff --git a/tests/ref/fate/dnxhr-prefix4 b/tests/ref/fate/dnxhr-prefix4
new file mode 100644
index 0000000000..15ed9a3c54
--- /dev/null
+++ b/tests/ref/fate/dnxhr-prefix4
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x2160
+#sar 0: 0/1
+0,          0,          0,        1,  1105920, 0xcc1cc322
+0,          1,          1,        1,  1105920, 0xd3038a1d
+0,          2,          2,        1,  1105920, 0xc0717a5a
+0,          3,          3,        1,  1105920, 0xed6fc31f
+0,          4,          4,        1,  1105920, 0xdcb8d6c4
diff --git a/tests/ref/fate/dnxhr-prefix5 b/tests/ref/fate/dnxhr-prefix5
new file mode 100644
index 0000000000..d88bdd2b82
--- /dev/null
+++ b/tests/ref/fate/dnxhr-prefix5
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x3212
+#sar 0: 0/1
+0,          0,          0,        1,  1644544, 0xcea2b72d
+0,          1,          1,        1,  1644544, 0xcd80819d
+0,          2,          2,        1,  1644544, 0x4a27745e
+0,          3,          3,        1,  1644544, 0xdf82b72c
+0,          4,          4,        1,  1644544, 0xdf87cb6e
diff --git a/tests/ref/fate/dpcm-idroq b/tests/ref/fate/dpcm-idroq
index 85e8efb098..fb45ace2c6 100644
--- a/tests/ref/fate/dpcm-idroq
+++ b/tests/ref/fate/dpcm-idroq
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     7456,    29824, 0x77e265b7
 0,       7456,       7456,      736,     2944, 0x8dcdf50b
 0,       8192,       8192,      736,     2944, 0xb135cd2a
diff --git a/tests/ref/fate/dpcm-interplay b/tests/ref/fate/dpcm-interplay
index bda8a8f8d9..720a98f389 100644
--- a/tests/ref/fate/dpcm-interplay
+++ b/tests/ref/fate/dpcm-interplay
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1462,     5848, 0xea04292b
 0,       1462,       1462,     1472,     5888, 0x0e59e942
 0,       2934,       2934,     1472,     5888, 0x56d480f6
diff --git a/tests/ref/fate/dpx b/tests/ref/fate/dpx
index fdb85ca9bc..d5f0ecbcb2 100644
--- a/tests/ref/fate/dpx
+++ b/tests/ref/fate/dpx
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 768x512
+#sar 0: 0/1
 0,          0,          0,        1,  2359296, 0x30d4d24f
diff --git a/tests/ref/fate/dpxparser b/tests/ref/fate/dpxparser
index 025c87d30d..c21ad74396 100644
--- a/tests/ref/fate/dpxparser
+++ b/tests/ref/fate/dpxparser
@@ -1,5 +1,9 @@
 #tb 0: 1/25
-0,          0,          0,        1,   203280, 0xa7d03ff5
-0,          1,          1,        1,   203280, 0xb908d8d4
-0,          2,          2,        1,   203280, 0xf7900408
-0,          3,          3,        1,   203280, 0xb74ed6a8
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 130x130
+#sar 0: 0/1
+0,          0,          0,        1,    50700, 0xe7153545
+0,          1,          1,        1,    50700, 0x2bc92ece
+0,          2,          2,        1,    50700, 0x83c731bb
+0,          3,          3,        1,    50700, 0x92f52f19
diff --git a/tests/ref/fate/dss-lp b/tests/ref/fate/dss-lp
index b5bee182f9..ab1d5344b5 100644
--- a/tests/ref/fate/dss-lp
+++ b/tests/ref/fate/dss-lp
@@ -1,4 +1,9 @@
 #tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0xf1107658
 0,        240,        240,      240,      480, 0x50dee179
 0,        480,        480,      240,      480, 0x40090802
diff --git a/tests/ref/fate/dss-sp b/tests/ref/fate/dss-sp
index 111c621bb8..f407ce7da0 100644
--- a/tests/ref/fate/dss-sp
+++ b/tests/ref/fate/dss-sp
@@ -1,4 +1,9 @@
 #tb 0: 1/11025
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 11025
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      264,      528, 0xa2579e96
 0,        264,        264,      264,      528, 0xf9b23172
 0,        528,        528,      264,      528, 0x5571a0fe
diff --git a/tests/ref/fate/dxa-feeble b/tests/ref/fate/dxa-feeble
index 74b43dcf22..5fa4175a0c 100644
--- a/tests/ref/fate/dxa-feeble
+++ b/tests/ref/fate/dxa-feeble
@@ -1,4 +1,8 @@
 #tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   921600, 0x0d03844f
 0,          1,          1,        1,   921600, 0x0d03844f
 0,          2,          2,        1,   921600, 0x649cdcea
diff --git a/tests/ref/fate/dxa-scummvm b/tests/ref/fate/dxa-scummvm
index 308a8964f2..e8817cb2f1 100644
--- a/tests/ref/fate/dxa-scummvm
+++ b/tests/ref/fate/dxa-scummvm
@@ -1,4 +1,8 @@
 #tb 0: 8333/100000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x200
+#sar 0: 0/1
 0,          0,          0,        1,   384000, 0xef37f34b
 0,          1,          1,        1,   384000, 0xef37f34b
 0,          2,          2,        1,   384000, 0xfca3cd8b
diff --git a/tests/ref/fate/dxtory b/tests/ref/fate/dxtory
index 8cee5efaca..4ebcaf6f82 100644
--- a/tests/ref/fate/dxtory
+++ b/tests/ref/fate/dxtory
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  1382400, 0x44373645
diff --git a/tests/ref/fate/dxv-dxt1 b/tests/ref/fate/dxv-dxt1
index 9b493807ca..d9f5ece1fb 100644
--- a/tests/ref/fate/dxv-dxt1
+++ b/tests/ref/fate/dxv-dxt1
@@ -1,2 +1,6 @@
-#tb 0: 1/30000
-0,          0,          0,        0,  8294400, 0x0797cd53
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0x0797cd53
diff --git a/tests/ref/fate/dxv-dxt5 b/tests/ref/fate/dxv-dxt5
index 9b493807ca..d9f5ece1fb 100644
--- a/tests/ref/fate/dxv-dxt5
+++ b/tests/ref/fate/dxv-dxt5
@@ -1,2 +1,6 @@
-#tb 0: 1/30000
-0,          0,          0,        0,  8294400, 0x0797cd53
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0x0797cd53
diff --git a/tests/ref/fate/dxv3-dxt1 b/tests/ref/fate/dxv3-dxt1
index c65ead9124..96ce66909b 100644
--- a/tests/ref/fate/dxv3-dxt1
+++ b/tests/ref/fate/dxv3-dxt1
@@ -1,2 +1,6 @@
-#tb 0: 1/30000
-0,          0,          0,        0,  8294400, 0x98bbcc85
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0x98bbcc85
diff --git a/tests/ref/fate/dxv3-dxt5 b/tests/ref/fate/dxv3-dxt5
index 9b493807ca..d9f5ece1fb 100644
--- a/tests/ref/fate/dxv3-dxt5
+++ b/tests/ref/fate/dxv3-dxt5
@@ -1,2 +1,6 @@
-#tb 0: 1/30000
-0,          0,          0,        0,  8294400, 0x0797cd53
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0x0797cd53
diff --git a/tests/ref/fate/ea-cmv b/tests/ref/fate/ea-cmv
index 18f2b3ae15..793cb8496f 100644
--- a/tests/ref/fate/ea-cmv
+++ b/tests/ref/fate/ea-cmv
@@ -1,195 +1,199 @@
 #tb 0: 1/10
-0,          1,          1,        1,   120000, 0x34ac91d2
-0,          2,          2,        1,   120000, 0x17150729
-0,          3,          3,        1,   120000, 0xc3f510bb
-0,          4,          4,        1,   120000, 0xb3b14a3b
-0,          5,          5,        1,   120000, 0x26a7f3d1
-0,          6,          6,        1,   120000, 0xd161af6f
-0,          7,          7,        1,   120000, 0x459fc92d
-0,          8,          8,        1,   120000, 0x05c3fa94
-0,          9,          9,        1,   120000, 0x6630cd8c
-0,         10,         10,        1,   120000, 0x60cd39d4
-0,         11,         11,        1,   120000, 0xc8854d1c
-0,         12,         12,        1,   120000, 0xe55e8e6d
-0,         13,         13,        1,   120000, 0xbeab201f
-0,         14,         14,        1,   120000, 0x70744b0b
-0,         15,         15,        1,   120000, 0x80dea5d0
-0,         16,         16,        1,   120000, 0x769bfa1c
-0,         17,         17,        1,   120000, 0x04e25bbe
-0,         18,         18,        1,   120000, 0x48abc5a5
-0,         19,         19,        1,   120000, 0xda5c4e2a
-0,         20,         20,        1,   120000, 0x8de96d38
-0,         21,         21,        1,   120000, 0xe96418b0
-0,         22,         22,        1,   120000, 0x1c2f272b
-0,         23,         23,        1,   120000, 0x4b755804
-0,         24,         24,        1,   120000, 0xc92f96fd
-0,         25,         25,        1,   120000, 0x69e90ebb
-0,         26,         26,        1,   120000, 0x78d4bd1a
-0,         27,         27,        1,   120000, 0xaf2edf55
-0,         28,         28,        1,   120000, 0x94161c78
-0,         29,         29,        1,   120000, 0x1109094d
-0,         30,         30,        1,   120000, 0xc61b0392
-0,         31,         31,        1,   120000, 0xc157d003
-0,         32,         32,        1,   120000, 0xf2747e7b
-0,         33,         33,        1,   120000, 0xa36299c2
-0,         34,         34,        1,   120000, 0x49bc788c
-0,         35,         35,        1,   120000, 0x3bee336e
-0,         36,         36,        1,   120000, 0xa316b9d1
-0,         37,         37,        1,   120000, 0x5cc32e9c
-0,         38,         38,        1,   120000, 0x9f7eca16
-0,         39,         39,        1,   120000, 0x958e2988
-0,         40,         40,        1,   120000, 0xebcba2f1
-0,         41,         41,        1,   120000, 0x281f1e60
-0,         42,         42,        1,   120000, 0x82256c4d
-0,         43,         43,        1,   120000, 0xddc8be56
-0,         44,         44,        1,   120000, 0x64ff2ed0
-0,         45,         45,        1,   120000, 0x3e63ab02
-0,         46,         46,        1,   120000, 0x43f78b37
-0,         47,         47,        1,   120000, 0xb7cc62d4
-0,         48,         48,        1,   120000, 0x694f1764
-0,         49,         49,        1,   120000, 0x2264c483
-0,         51,         51,        1,   120000, 0xb6680b4a
-0,         52,         52,        1,   120000, 0x2a92626a
-0,         53,         53,        1,   120000, 0x8da02509
-0,         54,         54,        1,   120000, 0xa976c382
-0,         55,         55,        1,   120000, 0x749e822b
-0,         56,         56,        1,   120000, 0xe9e7fc8c
-0,         57,         57,        1,   120000, 0xfdc05a0c
-0,         58,         58,        1,   120000, 0x7d5a856d
-0,         59,         59,        1,   120000, 0xcc344937
-0,         60,         60,        1,   120000, 0x9d90bc67
-0,         61,         61,        1,   120000, 0x3f527712
-0,         62,         62,        1,   120000, 0xf0f57f97
-0,         63,         63,        1,   120000, 0xc29535cd
-0,         64,         64,        1,   120000, 0x9a64598b
-0,         65,         65,        1,   120000, 0x0d1ddf7c
-0,         66,         66,        1,   120000, 0xb580ec24
-0,         67,         67,        1,   120000, 0xf0db5bbc
-0,         68,         68,        1,   120000, 0x6b980b61
-0,         69,         69,        1,   120000, 0xc29f30b5
-0,         70,         70,        1,   120000, 0xaf2c4bcd
-0,         71,         71,        1,   120000, 0x1e725645
-0,         72,         72,        1,   120000, 0x295c4c96
-0,         73,         73,        1,   120000, 0x7ea121a2
-0,         74,         74,        1,   120000, 0xdb9e9cec
-0,         75,         75,        1,   120000, 0x1da47c80
-0,         76,         76,        1,   120000, 0x9d0c1345
-0,         77,         77,        1,   120000, 0x88058527
-0,         78,         78,        1,   120000, 0x46766aed
-0,         79,         79,        1,   120000, 0xba520bd3
-0,         80,         80,        1,   120000, 0x7fb6373c
-0,         81,         81,        1,   120000, 0x05a86f4d
-0,         82,         82,        1,   120000, 0x7fb47cbd
-0,         83,         83,        1,   120000, 0x6814d8ca
-0,         84,         84,        1,   120000, 0x9c13acb8
-0,         85,         85,        1,   120000, 0xad0edbfe
-0,         86,         86,        1,   120000, 0x352fde81
-0,         87,         87,        1,   120000, 0xa654b386
-0,         88,         88,        1,   120000, 0xd3b3dc72
-0,         89,         89,        1,   120000, 0x01572668
-0,         90,         90,        1,   120000, 0x30189e03
-0,         91,         91,        1,   120000, 0x26126d30
-0,         92,         92,        1,   120000, 0x4f376c7d
-0,         93,         93,        1,   120000, 0xd3667bcf
-0,         94,         94,        1,   120000, 0x0b46b3d5
-0,         95,         95,        1,   120000, 0x893415ef
-0,         96,         96,        1,   120000, 0x99a78749
-0,         97,         97,        1,   120000, 0x6da0d8e9
-0,         98,         98,        1,   120000, 0x22d8ceb6
-0,         99,         99,        1,   120000, 0x67ef9be8
-0,        100,        100,        1,   120000, 0xb696fb53
-0,        101,        101,        1,   120000, 0x70339dab
-0,        102,        102,        1,   120000, 0xc1876efa
-0,        103,        103,        1,   120000, 0x80e78c92
-0,        104,        104,        1,   120000, 0x18d2f2ac
-0,        105,        105,        1,   120000, 0x28be9ae4
-0,        106,        106,        1,   120000, 0xc3c2c190
-0,        107,        107,        1,   120000, 0xd6a859d8
-0,        108,        108,        1,   120000, 0x40b9046d
-0,        109,        109,        1,   120000, 0x7f8d5999
-0,        110,        110,        1,   120000, 0x89724027
-0,        111,        111,        1,   120000, 0x4c15c988
-0,        112,        112,        1,   120000, 0x812ebe08
-0,        113,        113,        1,   120000, 0x273ef8e2
-0,        114,        114,        1,   120000, 0xe029de06
-0,        115,        115,        1,   120000, 0x5846127c
-0,        116,        116,        1,   120000, 0x6c5df8e3
-0,        117,        117,        1,   120000, 0x7424919f
-0,        118,        118,        1,   120000, 0xa8313015
-0,        119,        119,        1,   120000, 0x28878ab4
-0,        120,        120,        1,   120000, 0x126d0746
-0,        121,        121,        1,   120000, 0xee3f7138
-0,        122,        122,        1,   120000, 0xd4b2e0a1
-0,        123,        123,        1,   120000, 0x8d60bfff
-0,        124,        124,        1,   120000, 0x701c23d0
-0,        125,        125,        1,   120000, 0x1cbb5654
-0,        126,        126,        1,   120000, 0x0f5853e9
-0,        127,        127,        1,   120000, 0x2a5c3339
-0,        128,        128,        1,   120000, 0x86b00350
-0,        129,        129,        1,   120000, 0xe8cc6931
-0,        130,        130,        1,   120000, 0xf1cad983
-0,        131,        131,        1,   120000, 0xabcd8704
-0,        132,        132,        1,   120000, 0x89592f94
-0,        133,        133,        1,   120000, 0x100486d9
-0,        134,        134,        1,   120000, 0x60ef9e2d
-0,        135,        135,        1,   120000, 0x2485176a
-0,        136,        136,        1,   120000, 0x6b8c360d
-0,        137,        137,        1,   120000, 0xe2e1bf4f
-0,        138,        138,        1,   120000, 0xe17b65c3
-0,        139,        139,        1,   120000, 0x2a42821a
-0,        140,        140,        1,   120000, 0xbe9ddba7
-0,        141,        141,        1,   120000, 0x19f937fe
-0,        142,        142,        1,   120000, 0xb7e0c600
-0,        143,        143,        1,   120000, 0xfbf8c5f6
-0,        144,        144,        1,   120000, 0x93b62f93
-0,        145,        145,        1,   120000, 0xb6ddec93
-0,        146,        146,        1,   120000, 0xa04d031b
-0,        147,        147,        1,   120000, 0x61c986c0
-0,        148,        148,        1,   120000, 0x3516e54a
-0,        149,        149,        1,   120000, 0x3489eb2c
-0,        150,        150,        1,   120000, 0xb75a4827
-0,        151,        151,        1,   120000, 0x76031a80
-0,        152,        152,        1,   120000, 0x867c3969
-0,        153,        153,        1,   120000, 0x9b63a093
-0,        154,        154,        1,   120000, 0xcb253d8a
-0,        155,        155,        1,   120000, 0x354ba3b2
-0,        156,        156,        1,   120000, 0x4d5ead8c
-0,        157,        157,        1,   120000, 0x7b7029ae
-0,        158,        158,        1,   120000, 0x4765ab9d
-0,        159,        159,        1,   120000, 0x747cdee9
-0,        160,        160,        1,   120000, 0x20989b08
-0,        161,        161,        1,   120000, 0x3a957085
-0,        162,        162,        1,   120000, 0xdd49e8ad
-0,        163,        163,        1,   120000, 0x00e89719
-0,        164,        164,        1,   120000, 0x2822aa76
-0,        165,        165,        1,   120000, 0x492388f3
-0,        166,        166,        1,   120000, 0x4dffa6ee
-0,        167,        167,        1,   120000, 0xc382bb83
-0,        168,        168,        1,   120000, 0xb59aaa74
-0,        169,        169,        1,   120000, 0x7c7885d3
-0,        170,        170,        1,   120000, 0xc05ee219
-0,        171,        171,        1,   120000, 0xc3df6b73
-0,        172,        172,        1,   120000, 0x8ae31170
-0,        173,        173,        1,   120000, 0xb979fdce
-0,        174,        174,        1,   120000, 0xb8f9e407
-0,        175,        175,        1,   120000, 0x56675b80
-0,        176,        176,        1,   120000, 0x1aad1ce2
-0,        177,        177,        1,   120000, 0xa050a52b
-0,        178,        178,        1,   120000, 0x49f8c32f
-0,        179,        179,        1,   120000, 0x8e7f4d2c
-0,        180,        180,        1,   120000, 0x5c07f751
-0,        181,        181,        1,   120000, 0x67fa5523
-0,        182,        182,        1,   120000, 0xf38b933a
-0,        183,        183,        1,   120000, 0xb113e202
-0,        184,        184,        1,   120000, 0xb8d99ff4
-0,        185,        185,        1,   120000, 0x15ab6cc6
-0,        186,        186,        1,   120000, 0xd64a51c9
-0,        187,        187,        1,   120000, 0x2088b53c
-0,        188,        188,        1,   120000, 0xdd78d40a
-0,        189,        189,        1,   120000, 0x2fb58848
-0,        190,        190,        1,   120000, 0xf775d36a
-0,        191,        191,        1,   120000, 0xa03987e9
-0,        192,        192,        1,   120000, 0x457322ad
-0,        193,        193,        1,   120000, 0x0f6c3d1c
-0,        194,        194,        1,   120000, 0xbdf2f1a5
-0,        195,        195,        1,   120000, 0x5828ee1d
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x200
+#sar 0: 0/1
+0,          0,          0,        1,   120000, 0x34ac91d2
+0,          1,          1,        1,   120000, 0x17150729
+0,          2,          2,        1,   120000, 0xc3f510bb
+0,          3,          3,        1,   120000, 0xb3b14a3b
+0,          4,          4,        1,   120000, 0x26a7f3d1
+0,          5,          5,        1,   120000, 0xd161af6f
+0,          6,          6,        1,   120000, 0x459fc92d
+0,          7,          7,        1,   120000, 0x05c3fa94
+0,          8,          8,        1,   120000, 0x6630cd8c
+0,          9,          9,        1,   120000, 0x60cd39d4
+0,         10,         10,        1,   120000, 0xc8854d1c
+0,         11,         11,        1,   120000, 0xe55e8e6d
+0,         12,         12,        1,   120000, 0xbeab201f
+0,         13,         13,        1,   120000, 0x70744b0b
+0,         14,         14,        1,   120000, 0x80dea5d0
+0,         15,         15,        1,   120000, 0x769bfa1c
+0,         16,         16,        1,   120000, 0x04e25bbe
+0,         17,         17,        1,   120000, 0x48abc5a5
+0,         18,         18,        1,   120000, 0xda5c4e2a
+0,         19,         19,        1,   120000, 0x8de96d38
+0,         20,         20,        1,   120000, 0xe96418b0
+0,         21,         21,        1,   120000, 0x1c2f272b
+0,         22,         22,        1,   120000, 0x4b755804
+0,         23,         23,        1,   120000, 0xc92f96fd
+0,         24,         24,        1,   120000, 0x69e90ebb
+0,         25,         25,        1,   120000, 0x78d4bd1a
+0,         26,         26,        1,   120000, 0xaf2edf55
+0,         27,         27,        1,   120000, 0x94161c78
+0,         28,         28,        1,   120000, 0x1109094d
+0,         29,         29,        1,   120000, 0xc61b0392
+0,         30,         30,        1,   120000, 0xc157d003
+0,         31,         31,        1,   120000, 0xf2747e7b
+0,         32,         32,        1,   120000, 0xa36299c2
+0,         33,         33,        1,   120000, 0x49bc788c
+0,         34,         34,        1,   120000, 0x3bee336e
+0,         35,         35,        1,   120000, 0xa316b9d1
+0,         36,         36,        1,   120000, 0x5cc32e9c
+0,         37,         37,        1,   120000, 0x9f7eca16
+0,         38,         38,        1,   120000, 0x958e2988
+0,         39,         39,        1,   120000, 0xebcba2f1
+0,         40,         40,        1,   120000, 0x281f1e60
+0,         41,         41,        1,   120000, 0x82256c4d
+0,         42,         42,        1,   120000, 0xddc8be56
+0,         43,         43,        1,   120000, 0x64ff2ed0
+0,         44,         44,        1,   120000, 0x3e63ab02
+0,         45,         45,        1,   120000, 0x43f78b37
+0,         46,         46,        1,   120000, 0xb7cc62d4
+0,         47,         47,        1,   120000, 0x694f1764
+0,         48,         48,        1,   120000, 0x2264c483
+0,         49,         49,        1,   120000, 0xb6680b4a
+0,         50,         50,        1,   120000, 0x2a92626a
+0,         51,         51,        1,   120000, 0x8da02509
+0,         52,         52,        1,   120000, 0xa976c382
+0,         53,         53,        1,   120000, 0x749e822b
+0,         54,         54,        1,   120000, 0xe9e7fc8c
+0,         55,         55,        1,   120000, 0xfdc05a0c
+0,         56,         56,        1,   120000, 0x7d5a856d
+0,         57,         57,        1,   120000, 0xcc344937
+0,         58,         58,        1,   120000, 0x9d90bc67
+0,         59,         59,        1,   120000, 0x3f527712
+0,         60,         60,        1,   120000, 0xf0f57f97
+0,         61,         61,        1,   120000, 0xc29535cd
+0,         62,         62,        1,   120000, 0x9a64598b
+0,         63,         63,        1,   120000, 0x0d1ddf7c
+0,         64,         64,        1,   120000, 0xb580ec24
+0,         65,         65,        1,   120000, 0xf0db5bbc
+0,         66,         66,        1,   120000, 0x6b980b61
+0,         67,         67,        1,   120000, 0xc29f30b5
+0,         68,         68,        1,   120000, 0xaf2c4bcd
+0,         69,         69,        1,   120000, 0x1e725645
+0,         70,         70,        1,   120000, 0x295c4c96
+0,         71,         71,        1,   120000, 0x7ea121a2
+0,         72,         72,        1,   120000, 0xdb9e9cec
+0,         73,         73,        1,   120000, 0x1da47c80
+0,         74,         74,        1,   120000, 0x9d0c1345
+0,         75,         75,        1,   120000, 0x88058527
+0,         76,         76,        1,   120000, 0x46766aed
+0,         77,         77,        1,   120000, 0xba520bd3
+0,         78,         78,        1,   120000, 0x7fb6373c
+0,         79,         79,        1,   120000, 0x05a86f4d
+0,         80,         80,        1,   120000, 0x7fb47cbd
+0,         81,         81,        1,   120000, 0x6814d8ca
+0,         82,         82,        1,   120000, 0x9c13acb8
+0,         83,         83,        1,   120000, 0xad0edbfe
+0,         84,         84,        1,   120000, 0x352fde81
+0,         85,         85,        1,   120000, 0xa654b386
+0,         86,         86,        1,   120000, 0xd3b3dc72
+0,         87,         87,        1,   120000, 0x01572668
+0,         88,         88,        1,   120000, 0x30189e03
+0,         89,         89,        1,   120000, 0x26126d30
+0,         90,         90,        1,   120000, 0x4f376c7d
+0,         91,         91,        1,   120000, 0xd3667bcf
+0,         92,         92,        1,   120000, 0x0b46b3d5
+0,         93,         93,        1,   120000, 0x893415ef
+0,         94,         94,        1,   120000, 0x99a78749
+0,         95,         95,        1,   120000, 0x6da0d8e9
+0,         96,         96,        1,   120000, 0x22d8ceb6
+0,         97,         97,        1,   120000, 0x67ef9be8
+0,         98,         98,        1,   120000, 0xb696fb53
+0,         99,         99,        1,   120000, 0x70339dab
+0,        100,        100,        1,   120000, 0xc1876efa
+0,        101,        101,        1,   120000, 0x80e78c92
+0,        102,        102,        1,   120000, 0x18d2f2ac
+0,        103,        103,        1,   120000, 0x28be9ae4
+0,        104,        104,        1,   120000, 0xc3c2c190
+0,        105,        105,        1,   120000, 0xd6a859d8
+0,        106,        106,        1,   120000, 0x40b9046d
+0,        107,        107,        1,   120000, 0x7f8d5999
+0,        108,        108,        1,   120000, 0x89724027
+0,        109,        109,        1,   120000, 0x4c15c988
+0,        110,        110,        1,   120000, 0x812ebe08
+0,        111,        111,        1,   120000, 0x273ef8e2
+0,        112,        112,        1,   120000, 0xe029de06
+0,        113,        113,        1,   120000, 0x5846127c
+0,        114,        114,        1,   120000, 0x6c5df8e3
+0,        115,        115,        1,   120000, 0x7424919f
+0,        116,        116,        1,   120000, 0xa8313015
+0,        117,        117,        1,   120000, 0x28878ab4
+0,        118,        118,        1,   120000, 0x126d0746
+0,        119,        119,        1,   120000, 0xee3f7138
+0,        120,        120,        1,   120000, 0xd4b2e0a1
+0,        121,        121,        1,   120000, 0x8d60bfff
+0,        122,        122,        1,   120000, 0x701c23d0
+0,        123,        123,        1,   120000, 0x1cbb5654
+0,        124,        124,        1,   120000, 0x0f5853e9
+0,        125,        125,        1,   120000, 0x2a5c3339
+0,        126,        126,        1,   120000, 0x86b00350
+0,        127,        127,        1,   120000, 0xe8cc6931
+0,        128,        128,        1,   120000, 0xf1cad983
+0,        129,        129,        1,   120000, 0xabcd8704
+0,        130,        130,        1,   120000, 0x89592f94
+0,        131,        131,        1,   120000, 0x100486d9
+0,        132,        132,        1,   120000, 0x60ef9e2d
+0,        133,        133,        1,   120000, 0x2485176a
+0,        134,        134,        1,   120000, 0x6b8c360d
+0,        135,        135,        1,   120000, 0xe2e1bf4f
+0,        136,        136,        1,   120000, 0xe17b65c3
+0,        137,        137,        1,   120000, 0x2a42821a
+0,        138,        138,        1,   120000, 0xbe9ddba7
+0,        139,        139,        1,   120000, 0x19f937fe
+0,        140,        140,        1,   120000, 0xb7e0c600
+0,        141,        141,        1,   120000, 0xfbf8c5f6
+0,        142,        142,        1,   120000, 0x93b62f93
+0,        143,        143,        1,   120000, 0xb6ddec93
+0,        144,        144,        1,   120000, 0xa04d031b
+0,        145,        145,        1,   120000, 0x61c986c0
+0,        146,        146,        1,   120000, 0x3516e54a
+0,        147,        147,        1,   120000, 0x3489eb2c
+0,        148,        148,        1,   120000, 0xb75a4827
+0,        149,        149,        1,   120000, 0x76031a80
+0,        150,        150,        1,   120000, 0x867c3969
+0,        151,        151,        1,   120000, 0x9b63a093
+0,        152,        152,        1,   120000, 0xcb253d8a
+0,        153,        153,        1,   120000, 0x354ba3b2
+0,        154,        154,        1,   120000, 0x4d5ead8c
+0,        155,        155,        1,   120000, 0x7b7029ae
+0,        156,        156,        1,   120000, 0x4765ab9d
+0,        157,        157,        1,   120000, 0x747cdee9
+0,        158,        158,        1,   120000, 0x20989b08
+0,        159,        159,        1,   120000, 0x3a957085
+0,        160,        160,        1,   120000, 0xdd49e8ad
+0,        161,        161,        1,   120000, 0x00e89719
+0,        162,        162,        1,   120000, 0x2822aa76
+0,        163,        163,        1,   120000, 0x492388f3
+0,        164,        164,        1,   120000, 0x4dffa6ee
+0,        165,        165,        1,   120000, 0xc382bb83
+0,        166,        166,        1,   120000, 0xb59aaa74
+0,        167,        167,        1,   120000, 0x7c7885d3
+0,        168,        168,        1,   120000, 0xc05ee219
+0,        169,        169,        1,   120000, 0xc3df6b73
+0,        170,        170,        1,   120000, 0x8ae31170
+0,        171,        171,        1,   120000, 0xb979fdce
+0,        172,        172,        1,   120000, 0xb8f9e407
+0,        173,        173,        1,   120000, 0x56675b80
+0,        174,        174,        1,   120000, 0x1aad1ce2
+0,        175,        175,        1,   120000, 0xa050a52b
+0,        176,        176,        1,   120000, 0x49f8c32f
+0,        177,        177,        1,   120000, 0x8e7f4d2c
+0,        178,        178,        1,   120000, 0x5c07f751
+0,        179,        179,        1,   120000, 0x67fa5523
+0,        180,        180,        1,   120000, 0xf38b933a
+0,        181,        181,        1,   120000, 0xb113e202
+0,        182,        182,        1,   120000, 0xb8d99ff4
+0,        183,        183,        1,   120000, 0x15ab6cc6
+0,        184,        184,        1,   120000, 0xd64a51c9
+0,        185,        185,        1,   120000, 0x2088b53c
+0,        186,        186,        1,   120000, 0xdd78d40a
+0,        187,        187,        1,   120000, 0x2fb58848
+0,        188,        188,        1,   120000, 0xf775d36a
+0,        189,        189,        1,   120000, 0xa03987e9
+0,        190,        190,        1,   120000, 0x457322ad
+0,        191,        191,        1,   120000, 0x0f6c3d1c
+0,        192,        192,        1,   120000, 0xbdf2f1a5
+0,        193,        193,        1,   120000, 0x5828ee1d
diff --git a/tests/ref/fate/ea-mad b/tests/ref/fate/ea-mad
index 1ea92fda42..ea92fe18f8 100644
--- a/tests/ref/fate/ea-mad
+++ b/tests/ref/fate/ea-mad
@@ -1,4 +1,8 @@
 #tb 0: 33/1000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x496
+#sar 0: 0/1
 0,          0,          0,        1,   535680, 0x889c32cf
 0,          1,          1,        1,   535680, 0x0b1ef044
 0,          2,          2,        1,   535680, 0xa7d0818b
diff --git a/tests/ref/fate/ea-tgq b/tests/ref/fate/ea-tgq
index 5c0648dbaf..2f38e71d25 100644
--- a/tests/ref/fate/ea-tgq
+++ b/tests/ref/fate/ea-tgq
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x112
+#sar 0: 0/1
 0,          0,          0,        1,    34944, 0xe33671a4
 0,          1,          1,        1,    34944, 0xe33671a4
 0,          2,          2,        1,    34944, 0xe33671a4
diff --git a/tests/ref/fate/ea-tgv-1 b/tests/ref/fate/ea-tgv-1
index fc9218164b..7533af001e 100644
--- a/tests/ref/fate/ea-tgv-1
+++ b/tests/ref/fate/ea-tgv-1
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   230400, 0xfbf2581e
 0,          1,          1,        1,   230400, 0xfbf2581e
 0,          2,          2,        1,   230400, 0xfbf2581e
diff --git a/tests/ref/fate/ea-tgv-2 b/tests/ref/fate/ea-tgv-2
index 5e9de02149..cfa100fdc4 100644
--- a/tests/ref/fate/ea-tgv-2
+++ b/tests/ref/fate/ea-tgv-2
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
 0,          0,          0,        1,   192000, 0xdfc2f225
 0,          1,          1,        1,   192000, 0x059b57bd
 0,          2,          2,        1,   192000, 0x766cb086
diff --git a/tests/ref/fate/ea-tqi b/tests/ref/fate/ea-tqi
index 72afb81ede..926ab6d5ab 100644
--- a/tests/ref/fate/ea-tqi
+++ b/tests/ref/fate/ea-tqi
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 400x192
+#sar 0: 0/1
 0,          0,          0,        1,   115200, 0x375ec573
 0,          1,          1,        1,   115200, 0x375ec573
 0,          2,          2,        1,   115200, 0x375ec573
diff --git a/tests/ref/fate/eval b/tests/ref/fate/eval
index b01e5a5718..5b4d93f427 100644
--- a/tests/ref/fate/eval
+++ b/tests/ref/fate/eval
@@ -1,6 +1,7 @@
 Evaluating ''
 '' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating '1;2'
 '1;2' -> 2.000000
 
@@ -28,45 +29,58 @@ Evaluating '1Gi'
 Evaluating '1gi'
 '1gi' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating '1GiFoo'
 '1GiFoo' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating '1k+1k'
 '1k+1k' -> 2000.000000
 
 Evaluating '1Gi*3foo'
 '1Gi*3foo' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'foo'
 'foo' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'foo('
 'foo(' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'foo()'
 'foo()' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'foo)'
 'foo)' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'sin'
 'sin' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'sin('
 'sin(' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'sin()'
 'sin()' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'sin)'
 'sin)' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'sin 10'
 'sin 10' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'sin(1,2,3)'
 'sin(1,2,3)' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'sin(1 )'
 'sin(1 )' -> 0.841471
 
@@ -76,15 +90,19 @@ Evaluating '1'
 Evaluating '1foo'
 '1foo' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'bar + PI + E + 100f*2 + foo'
 'bar + PI + E + 100f*2 + foo' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating '13k + 12f - foo(1, 2)'
 '13k + 12f - foo(1, 2)' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating '1gi'
 '1gi' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating '1Gi'
 '1Gi' -> 1073741824.000000
 
@@ -127,6 +145,7 @@ Evaluating 'st(1, 1); st(2, 2); st(0, 1); while(lte(ld(0),10), st(3, ld(1)+ld(2)
 Evaluating 'while(0, 10)'
 'while(0, 10)' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'st(0, 1); while(lte(ld(0),100), st(1, ld(1)+ld(0)); st(0, ld(0)+1))'
 'st(0, 1); while(lte(ld(0),100), st(1, ld(1)+ld(0)); st(0, ld(0)+1))' -> 101.000000
 
@@ -151,6 +170,7 @@ Evaluating 'isinf(INF)'
 Evaluating 'floor(NAN)'
 'floor(NAN)' -> nan
 
+av_expr_parse_and_eval failed
 Evaluating 'floor(123.123)'
 'floor(123.123)' -> 123.000000
 
@@ -190,5 +210,98 @@ Evaluating '6.0206dB'
 Evaluating '-3.0103dB'
 '-3.0103dB' -> 0.707107
 
+Evaluating 'pow(0,1.23)'
+'pow(0,1.23)' -> 0.000000
+
+Evaluating 'pow(PI,1.23)'
+'pow(PI,1.23)' -> 4.087844
+
+Evaluating 'PI^1.23'
+'PI^1.23' -> 4.087844
+
+Evaluating 'pow(-1,1.23)'
+'pow(-1,1.23)' -> nan
+
+av_expr_parse_and_eval failed
+Evaluating 'if(1, 2)'
+'if(1, 2)' -> 2.000000
+
+Evaluating 'if(1, 1, 2)'
+'if(1, 1, 2)' -> 1.000000
+
+Evaluating 'if(0, 1, 2)'
+'if(0, 1, 2)' -> 2.000000
+
+Evaluating 'ifnot(0, 23)'
+'ifnot(0, 23)' -> 23.000000
+
+Evaluating 'ifnot(1, NaN) + if(0, 1)'
+'ifnot(1, NaN) + if(0, 1)' -> 0.000000
+
+Evaluating 'ifnot(1, 1, 2)'
+'ifnot(1, 1, 2)' -> 2.000000
+
+Evaluating 'ifnot(0, 1, 2)'
+'ifnot(0, 1, 2)' -> 1.000000
+
+Evaluating 'taylor(1, 1)'
+'taylor(1, 1)' -> 2.718282
+
+Evaluating 'taylor(eq(mod(ld(1),4),1)-eq(mod(ld(1),4),3), PI/2, 1)'
+'taylor(eq(mod(ld(1),4),1)-eq(mod(ld(1),4),3), PI/2, 1)' -> 1.000000
+
+Evaluating 'root(sin(ld(0))-1, 2)'
+'root(sin(ld(0))-1, 2)' -> 1.570796
+
+Evaluating 'root(sin(ld(0))+6+sin(ld(0)/12)-log(ld(0)), 100)'
+'root(sin(ld(0))+6+sin(ld(0)/12)-log(ld(0)), 100)' -> 60.965601
+
+Evaluating '7000000B*random(0)'
+'7000000B*random(0)' -> 0.003078
+
+Evaluating 'squish(2)'
+'squish(2)' -> 0.000335
+
+Evaluating 'gauss(0.1)'
+'gauss(0.1)' -> 0.396953
+
+Evaluating 'hypot(4,3)'
+'hypot(4,3)' -> 5.000000
+
+Evaluating 'gcd(30,55)*print(min(9,1))'
+'gcd(30,55)*print(min(9,1))' -> 5.000000
+
+Evaluating 'bitor(42, 12)'
+'bitor(42, 12)' -> 46.000000
+
+Evaluating 'bitand(42, 12)'
+'bitand(42, 12)' -> 8.000000
+
+Evaluating 'bitand(NAN, 1)'
+'bitand(NAN, 1)' -> nan
+
+av_expr_parse_and_eval failed
+Evaluating 'between(10, -3, 10)'
+'between(10, -3, 10)' -> 1.000000
+
+Evaluating 'between(-4, -2, -1)'
+'between(-4, -2, -1)' -> 0.000000
+
+Evaluating 'between(1,2)'
+'between(1,2)' -> nan
+
+av_expr_parse_and_eval failed
+Evaluating 'clip(0, 2, 1)'
+'clip(0, 2, 1)' -> nan
+
+av_expr_parse_and_eval failed
+Evaluating 'clip(0/0, 1, 2)'
+'clip(0/0, 1, 2)' -> nan
+
+av_expr_parse_and_eval failed
+Evaluating 'clip(0, 0/0, 1)'
+'clip(0, 0/0, 1)' -> nan
+
+av_expr_parse_and_eval failed
 12.700000 == 12.7
 0.931323 == 0.931322575
diff --git a/tests/ref/fate/exif-image-embedded b/tests/ref/fate/exif-image-embedded
new file mode 100644
index 0000000000..306ae0854b
--- /dev/null
+++ b/tests/ref/fate/exif-image-embedded
@@ -0,0 +1,431 @@
+[FRAME]
+media_type=video
+stream_index=1
+key_frame=1
+pkt_pts=N/A
+pkt_pts_time=N/A
+pkt_dts=N/A
+pkt_dts_time=N/A
+best_effort_timestamp=N/A
+best_effort_timestamp_time=N/A
+pkt_duration=N/A
+pkt_duration_time=N/A
+pkt_pos=N/A
+pkt_size=15760
+width=263
+height=263
+pix_fmt=yuvj420p
+sample_aspect_ratio=1:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=pc
+color_space=bt470bg
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=center
+TAG:UserComment=AppleMark
+
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=353600
+pkt_pts_time=0.025057
+pkt_dts=353600
+pkt_dts_time=0.025057
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
+pkt_duration=15040
+pkt_duration_time=0.001066
+pkt_pos=16292
+pkt_size=417
+sample_fmt=s16p
+nb_samples=47
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=368640
+pkt_pts_time=0.026122
+pkt_dts=368640
+pkt_dts_time=0.026122
+best_effort_timestamp=368640
+best_effort_timestamp_time=0.026122
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=16709
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=737280
+pkt_pts_time=0.052245
+pkt_dts=737280
+pkt_dts_time=0.052245
+best_effort_timestamp=737280
+best_effort_timestamp_time=0.052245
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=17127
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=1105920
+pkt_pts_time=0.078367
+pkt_dts=1105920
+pkt_dts_time=0.078367
+best_effort_timestamp=1105920
+best_effort_timestamp_time=0.078367
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=17545
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=1474560
+pkt_pts_time=0.104490
+pkt_dts=1474560
+pkt_dts_time=0.104490
+best_effort_timestamp=1474560
+best_effort_timestamp_time=0.104490
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=17963
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=1843200
+pkt_pts_time=0.130612
+pkt_dts=1843200
+pkt_dts_time=0.130612
+best_effort_timestamp=1843200
+best_effort_timestamp_time=0.130612
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=18381
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=2211840
+pkt_pts_time=0.156735
+pkt_dts=2211840
+pkt_dts_time=0.156735
+best_effort_timestamp=2211840
+best_effort_timestamp_time=0.156735
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=18799
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=2580480
+pkt_pts_time=0.182857
+pkt_dts=2580480
+pkt_dts_time=0.182857
+best_effort_timestamp=2580480
+best_effort_timestamp_time=0.182857
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=19217
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=2949120
+pkt_pts_time=0.208980
+pkt_dts=2949120
+pkt_dts_time=0.208980
+best_effort_timestamp=2949120
+best_effort_timestamp_time=0.208980
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=19635
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=3317760
+pkt_pts_time=0.235102
+pkt_dts=3317760
+pkt_dts_time=0.235102
+best_effort_timestamp=3317760
+best_effort_timestamp_time=0.235102
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=20053
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=3686400
+pkt_pts_time=0.261224
+pkt_dts=3686400
+pkt_dts_time=0.261224
+best_effort_timestamp=3686400
+best_effort_timestamp_time=0.261224
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=20471
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=4055040
+pkt_pts_time=0.287347
+pkt_dts=4055040
+pkt_dts_time=0.287347
+best_effort_timestamp=4055040
+best_effort_timestamp_time=0.287347
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=20889
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=4423680
+pkt_pts_time=0.313469
+pkt_dts=4423680
+pkt_dts_time=0.313469
+best_effort_timestamp=4423680
+best_effort_timestamp_time=0.313469
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=21307
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=4792320
+pkt_pts_time=0.339592
+pkt_dts=4792320
+pkt_dts_time=0.339592
+best_effort_timestamp=4792320
+best_effort_timestamp_time=0.339592
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=21725
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=5160960
+pkt_pts_time=0.365714
+pkt_dts=5160960
+pkt_dts_time=0.365714
+best_effort_timestamp=5160960
+best_effort_timestamp_time=0.365714
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=22143
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=5529600
+pkt_pts_time=0.391837
+pkt_dts=5529600
+pkt_dts_time=0.391837
+best_effort_timestamp=5529600
+best_effort_timestamp_time=0.391837
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=22561
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=5898240
+pkt_pts_time=0.417959
+pkt_dts=5898240
+pkt_dts_time=0.417959
+best_effort_timestamp=5898240
+best_effort_timestamp_time=0.417959
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=22979
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=6266880
+pkt_pts_time=0.444082
+pkt_dts=6266880
+pkt_dts_time=0.444082
+best_effort_timestamp=6266880
+best_effort_timestamp_time=0.444082
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=23397
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=6635520
+pkt_pts_time=0.470204
+pkt_dts=6635520
+pkt_dts_time=0.470204
+best_effort_timestamp=6635520
+best_effort_timestamp_time=0.470204
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=23815
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=7004160
+pkt_pts_time=0.496327
+pkt_dts=7004160
+pkt_dts_time=0.496327
+best_effort_timestamp=7004160
+best_effort_timestamp_time=0.496327
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=24233
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=7372800
+pkt_pts_time=0.522449
+pkt_dts=7372800
+pkt_dts_time=0.522449
+best_effort_timestamp=7372800
+best_effort_timestamp_time=0.522449
+pkt_duration=368640
+pkt_duration_time=0.026122
+pkt_pos=24651
+pkt_size=418
+sample_fmt=s16p
+nb_samples=1152
+channels=2
+channel_layout=stereo
+[/FRAME]
diff --git a/tests/ref/fate/exif-image-jpg b/tests/ref/fate/exif-image-jpg
new file mode 100644
index 0000000000..b266501191
--- /dev/null
+++ b/tests/ref/fate/exif-image-jpg
@@ -0,0 +1,232 @@
+[FRAME]
+media_type=video
+stream_index=0
+key_frame=1
+pkt_pts=0
+pkt_pts_time=0.000000
+pkt_dts=0
+pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
+pkt_duration=1
+pkt_duration_time=0.040000
+pkt_pos=N/A
+pkt_size=46095
+width=400
+height=225
+pix_fmt=yuvj422p
+sample_aspect_ratio=1:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=pc
+color_space=bt470bg
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=center
+TAG:ImageDescription=
+TAG:Make=Canon
+TAG:Model=Canon PowerShot SX200 IS
+TAG:Orientation=    1
+TAG:XResolution=    180:1
+TAG:YResolution=    180:1
+TAG:ResolutionUnit=    2
+TAG:DateTime=2013:07:18 13:12:03
+TAG:YCbCrPositioning=    2
+TAG:ExposureTime=      1:1250
+TAG:FNumber=     40:10
+TAG:ISOSpeedRatings=  160
+TAG:ExifVersion= 48,  50,  50,  49
+TAG:DateTimeOriginal=2013:07:18 13:12:03
+TAG:DateTimeDigitized=2013:07:18 13:12:03
+TAG:ComponentsConfiguration=  1,   2,   3,   0
+TAG:CompressedBitsPerPixel=      3:1
+TAG:ShutterSpeedValue=    329:32
+TAG:ApertureValue=    128:32
+TAG:ExposureBiasValue=      0:3
+TAG:MaxApertureValue=    113:32
+TAG:MeteringMode=    5
+TAG:Flash=   16
+TAG:FocalLength=   5000:1000
+TAG:MakerNote=
+ 25,   0,   1,   0,   3,   0,  48,   0,   0,   0,  28,   4,   0,   0,   2,   0
+  3,   0,   4,   0,   0,   0, 124,   4,   0,   0,   3,   0,   3,   0,   4,   0
+  0,   0, 132,   4,   0,   0,   4,   0,   3,   0,  34,   0,   0,   0, 140,   4
+  0,   0,   0,   0,   3,   0,   6,   0,   0,   0, 208,   4,   0,   0,   6,   0
+  2,   0,  28,   0,   0,   0, 220,   4,   0,   0,   7,   0,   2,   0,  22,   0
+  0,   0, 252,   4,   0,   0,   8,   0,   4,   0,   1,   0,   0,   0,  17, 166
+ 15,   0,   9,   0,   2,   0,  32,   0,   0,   0,  20,   5,   0,   0,  13,   0
+  4,   0, 167,   0,   0,   0,  52,   5,   0,   0,  16,   0,   4,   0,   1,   0
+  0,   0,   0,   0,  96,   2,  38,   0,   3,   0,  48,   0,   0,   0, 208,   7
+  0,   0,  19,   0,   3,   0,   4,   0,   0,   0,  48,   8,   0,   0,  24,   0
+  1,   0,   0,   1,   0,   0,  56,   8,   0,   0,  25,   0,   3,   0,   1,   0
+  0,   0,   1,   0,   0,   0,  28,   0,   3,   0,   1,   0,   0,   0,   0,   0
+  0,   0,  29,   0,   3,   0,  16,   0,   0,   0,  56,   9,   0,   0,  30,   0
+  4,   0,   1,   0,   0,   0,   0,   4,   0,   1,  31,   0,   3,   0,  69,   0
+  0,   0,  88,   9,   0,   0,  34,   0,   3,   0, 208,   0,   0,   0, 226,   9
+  0,   0,  35,   0,   4,   0,   2,   0,   0,   0, 130,  11,   0,   0,  39,   0
+  3,   0,   5,   0,   0,   0, 138,  11,   0,   0,  40,   0,   1,   0,  16,   0
+  0,   0, 148,  11,   0,   0, 208,   0,   4,   0,   1,   0,   0,   0,   0,   0
+  0,   0,  45,   0,   4,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  96,   0
+  2,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   4,   0, 255, 255
+  1,   0,   9,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  15,   0
+  3,   0,   1,   0,   6,  64,   0,   0, 255, 127, 255, 255,  96, 234, 136,  19
+232,   3, 113,   0, 221,   0, 255, 255,   0,   0,   0,   0,   0,   0,   1,   0
+  0,   0,   1,   0,   0,   0, 160,  15, 160,  15,   0,   0,   0,   0, 255, 255
+  0,   0, 255, 127, 255, 127,   0,   0,   0,   0, 255, 255,  90,   0,   2,   0
+136,  19, 250,   0, 187,   0,   0,   0,   0,   0,   0,   0,   0,   0,  68,   0
+ 18,   0, 160,   0,  68,   1, 128,   0,  73,   1,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   1,   0, 119,   0,   0,   0, 128,   0,  73,   1,   0,   0,   0,   0
+ 23,   0, 250,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  73,  77
+ 71,  58,  80, 111, 119, 101, 114,  83, 104, 111, 116,  32,  83,  88,  50,  48
+ 48,  32,  73,  83,  32,  74,  80,  69,  71,   0,   0,   0,   0,   0,  70, 105
+114, 109, 119,  97, 114, 101,  32,  86, 101, 114, 115, 105, 111, 110,  32,  49
+ 46,  48,  48,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   5,   0,   0,   0, 211,   1,   0,   0, 155,   1
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 128,   1
+  0,   0, 221,   3,   0,   0,  56,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  64,   2,   0,   0, 123,   3
+  0,   0, 165, 255, 255, 255,   0,   0,   0,   0,   0,   0,   0,   0,   7,   0
+  0,   0,  66,   0,   0,   0,  10,   0,   0,   0,  17,   0,   0,   0,  70,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  81,   0,   0,   0,   0,   0
+  0,   0, 204,   3,   0,   0, 138,   3,   0,   0, 138,   3,   0,   0, 128,   1
+  0,   0,  66,   4,   0,   0, 165, 255, 255, 255,   0,   0,   0,   0,   0,   0
+  0,   0, 138,   3,   0,   0, 138,   3,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   5,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,  35,   0,   0,   0, 120,   0,   0,   0, 120,   0,   0,   0, 102, 255
+255, 255, 208,   0,   0,   0, 114, 255, 255, 255, 208,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0, 114, 255, 255, 255, 208,   0,   0,   0,  12,   0
+  0,   0, 204,   0,   0,   0, 239, 255, 255, 255, 201,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   4,   0,   0,   0,   4
+  0,   0,   0,   5,   0,   0,   8,   0,   0,   0, 239, 255, 255, 255, 201,   0
+  0,   0,  24,   0,   0,   0, 143,   3,   0,   0, 125,   6,   0,   0,  97,   6
+  0,   0, 143,   3,   0,   0, 100,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   1,   0,   0,   0,  91,   1,   0,   0, 113,   4,   0,   0, 204,   3
+  0,   0, 147,   2,   0,   0, 165, 255, 255, 255,  10,   0,   0,   0, 128,   0
+  0,   0, 251,   1,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,  74,   2
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  97,   2,   0,   0, 150,   2
+  0,   0, 204,   2,   0,   0, 241,   2,   0,   0,   0,   0,   0,   0, 128,   0
+  0,   0,   0,   0,   0,   0,   8, 162, 255, 255,  70,   2,   0,   0,  69,   2
+  0,   0,  69,   2,   0,   0,  65,   2,   0,   0,  66,   2,   0,   0,  68,   2
+  0,   0,  66,   2,   0,   0,  67,   2,   0,   0,  67,   2,   0,   0,  68,   2
+  0,   0,  18,   6,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,  56,   5,   0,   0, 250,   0,   0,   0,  53,   1,   0,   0,  58,   0
+  0,   0,   5,   4,   0,   0, 193,   0,   0,   0, 240,   0,   0,   0,  45,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   3,   0
+  0,   0,   8,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 107,   0
+  0,   0,   6, 255, 255, 255,   0,   0,   0,   0, 255, 255,   0,   0,   0,   0
+  0,   0,   0, 244, 255, 255, 133,   0,   0,   0, 102,   2,   0,   0, 243,   1
+  0,   0,   0,   0,   0,   0,  99,   2,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0, 192,   0,   0,   0,   4,   1,   0,   0,   0,   1,   0,   0,   4,   1
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  96,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,  33,   0,   0,   0,  13,   0,   0,   0, 237, 157
+ 54,  41,  96,   0,   4,   0,   9,   0,   9,   0, 160,  15, 200,   8, 100,   0
+100,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0
+ 18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0
+ 18,   0,  18,   0,  18,   0, 238, 255,   0,   0,  18,   0, 238, 255,   0,   0
+ 18,   0, 238, 255,   0,   0,  18,   0, 238, 255, 238, 255, 238, 255,   0,   0
+  0,   0,   0,   0,  18,   0,  18,   0,  18,   0,   1,   0,   0,   0,   0,   0
+  0,   0,   0,   0, 159,   0,  15,   0, 104,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  32,   0,   1,   0,   0,   0
+  2,   0,   2,   0,   2,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 138,   0,   1,   0,   0,   0
+  4,   0,   8,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0, 160,   1,   0,   0,   0,   0,  16,   0,   8,   0,   1,   0
+  1,   0, 128,   2, 224,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  8,   0, 128,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   8,   0,   0,   0,   0,   0,   0,   0,  10,   0,   0,   0
+255, 255,   0,   0,   0,   0, 239, 154, 237, 228, 191, 235,  20, 171,  30,   6
+  2, 129,  88, 251,  56,  49,  73,  73,  42,   0, 222,   2,   0,   0
+TAG:UserComment=
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0
+TAG:FlashpixVersion= 48,  49,  48,  48
+TAG:ColorSpace=    1
+TAG:PixelXDimension= 4000
+TAG:PixelYDimension= 2248
+TAG:GPSLatitudeRef=R98
+TAG:GPSLatitude= 48,  49,  48,  48
+TAG:0x1001= 4000
+TAG:0x1002= 2248
+TAG:FocalPlaneXResolution=4000000:244
+TAG:FocalPlaneYResolution=2248000:183
+TAG:FocalPlaneResolutionUnit=    2
+TAG:SensingMethod=    2
+TAG:FileSource=  3
+TAG:CustomRendered=    0
+TAG:ExposureMode=    0
+TAG:WhiteBalance=    0
+TAG:DigitalZoomRatio=   4000:4000
+TAG:SceneCaptureType=    0
+[/FRAME]
diff --git a/tests/ref/fate/exif-image-tiff b/tests/ref/fate/exif-image-tiff
new file mode 100644
index 0000000000..51580601e1
--- /dev/null
+++ b/tests/ref/fate/exif-image-tiff
@@ -0,0 +1,33 @@
+[FRAME]
+media_type=video
+stream_index=0
+key_frame=1
+pkt_pts=0
+pkt_pts_time=0.000000
+pkt_dts=0
+pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
+pkt_duration=1
+pkt_duration_time=0.040000
+pkt_pos=0
+pkt_size=67604
+width=200
+height=112
+pix_fmt=rgb24
+sample_aspect_ratio=1:1
+pict_type=?
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+TAG:document_name=image_small.tiff
+TAG:page_number=    0 /     1
+TAG:software=ImageMagick 6.5.8-0 2010-02-09 Q16 http://www.imagemagick.org
+[/FRAME]
diff --git a/tests/ref/fate/exif-image-webp b/tests/ref/fate/exif-image-webp
new file mode 100644
index 0000000000..d520ecd0db
--- /dev/null
+++ b/tests/ref/fate/exif-image-webp
@@ -0,0 +1,232 @@
+[FRAME]
+media_type=video
+stream_index=0
+key_frame=1
+pkt_pts=0
+pkt_pts_time=0.000000
+pkt_dts=0
+pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
+pkt_duration=1
+pkt_duration_time=0.040000
+pkt_pos=0
+pkt_size=39276
+width=400
+height=225
+pix_fmt=yuv420p
+sample_aspect_ratio=N/A
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=tv
+color_space=bt470bg
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+TAG:ImageDescription=
+TAG:Make=Canon
+TAG:Model=Canon PowerShot SX200 IS
+TAG:Orientation=    1
+TAG:XResolution=    180:1
+TAG:YResolution=    180:1
+TAG:ResolutionUnit=    2
+TAG:DateTime=2013:07:18 13:12:03
+TAG:YCbCrPositioning=    2
+TAG:ExposureTime=      1:1250
+TAG:FNumber=     40:10
+TAG:ISOSpeedRatings=  160
+TAG:ExifVersion= 48,  50,  50,  49
+TAG:DateTimeOriginal=2013:07:18 13:12:03
+TAG:DateTimeDigitized=2013:07:18 13:12:03
+TAG:ComponentsConfiguration=  1,   2,   3,   0
+TAG:CompressedBitsPerPixel=      3:1
+TAG:ShutterSpeedValue=    329:32
+TAG:ApertureValue=    128:32
+TAG:ExposureBiasValue=      0:3
+TAG:MaxApertureValue=    113:32
+TAG:MeteringMode=    5
+TAG:Flash=   16
+TAG:FocalLength=   5000:1000
+TAG:MakerNote=
+ 25,   0,   1,   0,   3,   0,  48,   0,   0,   0,  28,   4,   0,   0,   2,   0
+  3,   0,   4,   0,   0,   0, 124,   4,   0,   0,   3,   0,   3,   0,   4,   0
+  0,   0, 132,   4,   0,   0,   4,   0,   3,   0,  34,   0,   0,   0, 140,   4
+  0,   0,   0,   0,   3,   0,   6,   0,   0,   0, 208,   4,   0,   0,   6,   0
+  2,   0,  28,   0,   0,   0, 220,   4,   0,   0,   7,   0,   2,   0,  22,   0
+  0,   0, 252,   4,   0,   0,   8,   0,   4,   0,   1,   0,   0,   0,  17, 166
+ 15,   0,   9,   0,   2,   0,  32,   0,   0,   0,  20,   5,   0,   0,  13,   0
+  4,   0, 167,   0,   0,   0,  52,   5,   0,   0,  16,   0,   4,   0,   1,   0
+  0,   0,   0,   0,  96,   2,  38,   0,   3,   0,  48,   0,   0,   0, 208,   7
+  0,   0,  19,   0,   3,   0,   4,   0,   0,   0,  48,   8,   0,   0,  24,   0
+  1,   0,   0,   1,   0,   0,  56,   8,   0,   0,  25,   0,   3,   0,   1,   0
+  0,   0,   1,   0,   0,   0,  28,   0,   3,   0,   1,   0,   0,   0,   0,   0
+  0,   0,  29,   0,   3,   0,  16,   0,   0,   0,  56,   9,   0,   0,  30,   0
+  4,   0,   1,   0,   0,   0,   0,   4,   0,   1,  31,   0,   3,   0,  69,   0
+  0,   0,  88,   9,   0,   0,  34,   0,   3,   0, 208,   0,   0,   0, 226,   9
+  0,   0,  35,   0,   4,   0,   2,   0,   0,   0, 130,  11,   0,   0,  39,   0
+  3,   0,   5,   0,   0,   0, 138,  11,   0,   0,  40,   0,   1,   0,  16,   0
+  0,   0, 148,  11,   0,   0, 208,   0,   4,   0,   1,   0,   0,   0,   0,   0
+  0,   0,  45,   0,   4,   0,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  96,   0
+  2,   0,   0,   0,   3,   0,   0,   0,   0,   0,   0,   0,   4,   0, 255, 255
+  1,   0,   9,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  15,   0
+  3,   0,   1,   0,   6,  64,   0,   0, 255, 127, 255, 255,  96, 234, 136,  19
+232,   3, 113,   0, 221,   0, 255, 255,   0,   0,   0,   0,   0,   0,   1,   0
+  0,   0,   1,   0,   0,   0, 160,  15, 160,  15,   0,   0,   0,   0, 255, 255
+  0,   0, 255, 127, 255, 127,   0,   0,   0,   0, 255, 255,  90,   0,   2,   0
+136,  19, 250,   0, 187,   0,   0,   0,   0,   0,   0,   0,   0,   0,  68,   0
+ 18,   0, 160,   0,  68,   1, 128,   0,  73,   1,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   1,   0, 119,   0,   0,   0, 128,   0,  73,   1,   0,   0,   0,   0
+ 23,   0, 250,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  73,  77
+ 71,  58,  80, 111, 119, 101, 114,  83, 104, 111, 116,  32,  83,  88,  50,  48
+ 48,  32,  73,  83,  32,  74,  80,  69,  71,   0,   0,   0,   0,   0,  70, 105
+114, 109, 119,  97, 114, 101,  32,  86, 101, 114, 115, 105, 111, 110,  32,  49
+ 46,  48,  48,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   5,   0,   0,   0, 211,   1,   0,   0, 155,   1
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 128,   1
+  0,   0, 221,   3,   0,   0,  56,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  64,   2,   0,   0, 123,   3
+  0,   0, 165, 255, 255, 255,   0,   0,   0,   0,   0,   0,   0,   0,   7,   0
+  0,   0,  66,   0,   0,   0,  10,   0,   0,   0,  17,   0,   0,   0,  70,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  81,   0,   0,   0,   0,   0
+  0,   0, 204,   3,   0,   0, 138,   3,   0,   0, 138,   3,   0,   0, 128,   1
+  0,   0,  66,   4,   0,   0, 165, 255, 255, 255,   0,   0,   0,   0,   0,   0
+  0,   0, 138,   3,   0,   0, 138,   3,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   1,   0,   0,   0,   0,   0,   0,   0,   5,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,  35,   0,   0,   0, 120,   0,   0,   0, 120,   0,   0,   0, 102, 255
+255, 255, 208,   0,   0,   0, 114, 255, 255, 255, 208,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0, 114, 255, 255, 255, 208,   0,   0,   0,  12,   0
+  0,   0, 204,   0,   0,   0, 239, 255, 255, 255, 201,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   4,   0,   0,   0,   4,   0,   0,   0,   4
+  0,   0,   0,   5,   0,   0,   8,   0,   0,   0, 239, 255, 255, 255, 201,   0
+  0,   0,  24,   0,   0,   0, 143,   3,   0,   0, 125,   6,   0,   0,  97,   6
+  0,   0, 143,   3,   0,   0, 100,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   1,   0,   0,   0,  91,   1,   0,   0, 113,   4,   0,   0, 204,   3
+  0,   0, 147,   2,   0,   0, 165, 255, 255, 255,  10,   0,   0,   0, 128,   0
+  0,   0, 251,   1,   0,   0,   4,   0,   0,   0,   0,   0,   0,   0,  74,   2
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  97,   2,   0,   0, 150,   2
+  0,   0, 204,   2,   0,   0, 241,   2,   0,   0,   0,   0,   0,   0, 128,   0
+  0,   0,   0,   0,   0,   0,   8, 162, 255, 255,  70,   2,   0,   0,  69,   2
+  0,   0,  69,   2,   0,   0,  65,   2,   0,   0,  66,   2,   0,   0,  68,   2
+  0,   0,  66,   2,   0,   0,  67,   2,   0,   0,  67,   2,   0,   0,  68,   2
+  0,   0,  18,   6,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,  56,   5,   0,   0, 250,   0,   0,   0,  53,   1,   0,   0,  58,   0
+  0,   0,   5,   4,   0,   0, 193,   0,   0,   0, 240,   0,   0,   0,  45,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   3,   0,   0,   0,   3,   0
+  0,   0,   8,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 107,   0
+  0,   0,   6, 255, 255, 255,   0,   0,   0,   0, 255, 255,   0,   0,   0,   0
+  0,   0,   0, 244, 255, 255, 133,   0,   0,   0, 102,   2,   0,   0, 243,   1
+  0,   0,   0,   0,   0,   0,  99,   2,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0, 192,   0,   0,   0,   4,   1,   0,   0,   0,   1,   0,   0,   4,   1
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  96,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,  33,   0,   0,   0,  13,   0,   0,   0, 237, 157
+ 54,  41,  96,   0,   4,   0,   9,   0,   9,   0, 160,  15, 200,   8, 100,   0
+100,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0
+ 18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0,  18,   0
+ 18,   0,  18,   0,  18,   0, 238, 255,   0,   0,  18,   0, 238, 255,   0,   0
+ 18,   0, 238, 255,   0,   0,  18,   0, 238, 255, 238, 255, 238, 255,   0,   0
+  0,   0,   0,   0,  18,   0,  18,   0,  18,   0,   1,   0,   0,   0,   0,   0
+  0,   0,   0,   0, 159,   0,  15,   0, 104,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  32,   0,   1,   0,   0,   0
+  2,   0,   2,   0,   2,   0,   2,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 138,   0,   1,   0,   0,   0
+  4,   0,   8,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0, 160,   1,   0,   0,   0,   0,  16,   0,   8,   0,   1,   0
+  1,   0, 128,   2, 224,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  8,   0, 128,   1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   8,   0,   0,   0,   0,   0,   0,   0,  10,   0,   0,   0
+255, 255,   0,   0,   0,   0, 239, 154, 237, 228, 191, 235,  20, 171,  30,   6
+  2, 129,  88, 251,  56,  49,  73,  73,  42,   0, 222,   2,   0,   0
+TAG:UserComment=
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0
+  0,   0,   0,   0,   0,   0,   0,   0
+TAG:FlashpixVersion= 48,  49,  48,  48
+TAG:ColorSpace=    1
+TAG:PixelXDimension= 4000
+TAG:PixelYDimension= 2248
+TAG:GPSLatitudeRef=R98
+TAG:GPSLatitude= 48,  49,  48,  48
+TAG:0x1001= 4000
+TAG:0x1002= 2248
+TAG:FocalPlaneXResolution=4000000:244
+TAG:FocalPlaneYResolution=2248000:183
+TAG:FocalPlaneResolutionUnit=    2
+TAG:SensingMethod=    2
+TAG:FileSource=  3
+TAG:CustomRendered=    0
+TAG:ExposureMode=    0
+TAG:WhiteBalance=    0
+TAG:DigitalZoomRatio=   4000:4000
+TAG:SceneCaptureType=    0
+[/FRAME]
diff --git a/tests/ref/fate/exr-rgb-b44a-half-negative-4x4 b/tests/ref/fate/exr-rgb-b44a-half-negative-4x4
new file mode 100644
index 0000000000..2ff4e9742b
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-b44a-half-negative-4x4
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 4x4
+#sar 0: 1/1
+0,          0,          0,        1,       96, 0x70600260
diff --git a/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l1 b/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l1
new file mode 100644
index 0000000000..a19b500c90
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0xa1a70fac
diff --git a/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l2 b/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l2
new file mode 100644
index 0000000000..444fb566d2
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-b44-half-float-12x8-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0x22f77b1c
diff --git a/tests/ref/fate/exr-rgb-scanline-b44-uint32 b/tests/ref/fate/exr-rgb-scanline-b44-uint32
new file mode 100644
index 0000000000..abe41b8a7a
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-b44-uint32
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x6b950ce3
diff --git a/tests/ref/fate/exr-rgb-scanline-float-b44 b/tests/ref/fate/exr-rgb-scanline-float-b44
new file mode 100644
index 0000000000..91b0e1fba1
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-float-b44
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x39c8e03e
diff --git a/tests/ref/fate/exr-rgb-scanline-float-piz-48x32 b/tests/ref/fate/exr-rgb-scanline-float-piz-48x32
new file mode 100644
index 0000000000..d1a5d90ee2
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-float-piz-48x32
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 48x32
+#sar 0: 1/1
+0,          0,          0,        1,     9216, 0x5b3f7a8e
diff --git a/tests/ref/fate/exr-rgb-scanline-half-b44-12x8 b/tests/ref/fate/exr-rgb-scanline-half-b44-12x8
new file mode 100644
index 0000000000..8464203e7a
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-half-b44-12x8
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x506469f9
diff --git a/tests/ref/fate/exr-rgb-scanline-half-b44-13x9 b/tests/ref/fate/exr-rgb-scanline-half-b44-13x9
new file mode 100644
index 0000000000..675d2f0949
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-half-b44-13x9
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 13x9
+#sar 0: 1/1
+0,          0,          0,        1,      702, 0x6914838a
diff --git a/tests/ref/fate/exr-rgb-scanline-half-piz-bw b/tests/ref/fate/exr-rgb-scanline-half-piz-bw
new file mode 100644
index 0000000000..6e08d528eb
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-half-piz-bw
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 34x27
+#sar 0: 1/1
+0,          0,          0,        1,     5508, 0x36d15e2e
diff --git a/tests/ref/fate/exr-rgb-scanline-half-piz-color b/tests/ref/fate/exr-rgb-scanline-half-piz-color
new file mode 100644
index 0000000000..21510792ff
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-half-piz-color
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 34x40
+#sar 0: 1/1
+0,          0,          0,        1,     8160, 0x9dd67b7d
diff --git a/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t01 b/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t01
new file mode 100644
index 0000000000..e135aed3ba
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t01
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 400x300
+#sar 0: 1/1
+0,          0,          0,        1,   720000, 0xe50fc9f8
diff --git a/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t08 b/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t08
new file mode 100644
index 0000000000..a443c98d9d
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-half-piz-dw-t08
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 501x401
+#sar 0: 1/1
+0,          0,          0,        1,  1205406, 0xc45cc9f8
diff --git a/tests/ref/fate/exr-rgb-scanline-none-negative-red b/tests/ref/fate/exr-rgb-scanline-none-negative-red
new file mode 100644
index 0000000000..8c399b2f5e
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-none-negative-red
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 4x4
+#sar 0: 1/1
+0,          0,          0,        1,       96, 0x27bc131b
diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-float-12x8 b/tests/ref/fate/exr-rgb-scanline-pxr24-float-12x8
new file mode 100644
index 0000000000..13946d8e03
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-float-12x8
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x7120e072
diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l1 b/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l1
new file mode 100644
index 0000000000..1f97a2fcb1
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0xbd350af8
diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l2 b/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l2
new file mode 100644
index 0000000000..e57f026f64
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-float-half-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0xadb27043
diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l1 b/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l1
new file mode 100644
index 0000000000..af042043e7
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x5ede004c
diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l2 b/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l2
new file mode 100644
index 0000000000..048e30d4d5
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-half-float-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0x78317b56
diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-half-uint32-13x9 b/tests/ref/fate/exr-rgb-scanline-pxr24-half-uint32-13x9
new file mode 100644
index 0000000000..50b85c8d1c
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-half-uint32-13x9
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 13x9
+#sar 0: 9/10
+0,          0,          0,        1,      702, 0xf0212f1d
diff --git a/tests/ref/fate/exr-rgb-scanline-pxr24-uint32 b/tests/ref/fate/exr-rgb-scanline-pxr24-uint32
new file mode 100644
index 0000000000..abe41b8a7a
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-pxr24-uint32
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x6b950ce3
diff --git a/tests/ref/fate/exr-rgb-scanline-raw-half-float-l1 b/tests/ref/fate/exr-rgb-scanline-raw-half-float-l1
new file mode 100644
index 0000000000..af042043e7
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-raw-half-float-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x5ede004c
diff --git a/tests/ref/fate/exr-rgb-scanline-raw-half-float-l2 b/tests/ref/fate/exr-rgb-scanline-raw-half-float-l2
new file mode 100644
index 0000000000..444fb566d2
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-raw-half-float-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0x22f77b1c
diff --git a/tests/ref/fate/exr-rgb-scanline-rle-half-float-l1 b/tests/ref/fate/exr-rgb-scanline-rle-half-float-l1
new file mode 100644
index 0000000000..af042043e7
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-rle-half-float-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x5ede004c
diff --git a/tests/ref/fate/exr-rgb-scanline-rle-half-float-l2 b/tests/ref/fate/exr-rgb-scanline-rle-half-float-l2
new file mode 100644
index 0000000000..444fb566d2
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-rle-half-float-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0x22f77b1c
diff --git a/tests/ref/fate/exr-rgb-scanline-zip-half-float-l1 b/tests/ref/fate/exr-rgb-scanline-zip-half-float-l1
new file mode 100644
index 0000000000..af042043e7
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-zip-half-float-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x5ede004c
diff --git a/tests/ref/fate/exr-rgb-scanline-zip-half-float-l2 b/tests/ref/fate/exr-rgb-scanline-zip-half-float-l2
new file mode 100644
index 0000000000..444fb566d2
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-zip-half-float-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0x22f77b1c
diff --git a/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1 b/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1
new file mode 100644
index 0000000000..af042043e7
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x5ede004c
diff --git a/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1-zero-offsets b/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1-zero-offsets
new file mode 100644
index 0000000000..af042043e7
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l1-zero-offsets
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x5ede004c
diff --git a/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l2 b/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l2
new file mode 100644
index 0000000000..444fb566d2
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-scanline-zip1-half-float-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0x22f77b1c
diff --git a/tests/ref/fate/exr-rgb-tile-float-raw-12x8 b/tests/ref/fate/exr-rgb-tile-float-raw-12x8
new file mode 100644
index 0000000000..abe41b8a7a
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-float-raw-12x8
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x6b950ce3
diff --git a/tests/ref/fate/exr-rgb-tile-float-raw-150x130 b/tests/ref/fate/exr-rgb-tile-float-raw-150x130
new file mode 100644
index 0000000000..3ac5c28df1
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-float-raw-150x130
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 150x130
+#sar 0: 1/1
+0,          0,          0,        1,   117000, 0xabc5eab2
diff --git a/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l1 b/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l1
new file mode 100644
index 0000000000..a19b500c90
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0xa1a70fac
diff --git a/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l2 b/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l2
new file mode 100644
index 0000000000..444fb566d2
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-half-float-b44-12x8-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0x22f77b1c
diff --git a/tests/ref/fate/exr-rgb-tile-half-raw-12x8 b/tests/ref/fate/exr-rgb-tile-half-raw-12x8
new file mode 100644
index 0000000000..f59e248d69
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-half-raw-12x8
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x667903f5
diff --git a/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l1 b/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l1
new file mode 100644
index 0000000000..1f97a2fcb1
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0xbd350af8
diff --git a/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l2 b/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l2
new file mode 100644
index 0000000000..e57f026f64
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-pxr24-float-half-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0xadb27043
diff --git a/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l1 b/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l1
new file mode 100644
index 0000000000..af042043e7
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x5ede004c
diff --git a/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l2 b/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l2
new file mode 100644
index 0000000000..048e30d4d5
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-pxr24-half-float-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0x78317b56
diff --git a/tests/ref/fate/exr-rgb-tile-raw-half-float-l1 b/tests/ref/fate/exr-rgb-tile-raw-half-float-l1
new file mode 100644
index 0000000000..af042043e7
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-raw-half-float-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x5ede004c
diff --git a/tests/ref/fate/exr-rgb-tile-raw-half-float-l2 b/tests/ref/fate/exr-rgb-tile-raw-half-float-l2
new file mode 100644
index 0000000000..444fb566d2
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-raw-half-float-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0x22f77b1c
diff --git a/tests/ref/fate/exr-rgb-tile-rle-half-float-l1 b/tests/ref/fate/exr-rgb-tile-rle-half-float-l1
new file mode 100644
index 0000000000..af042043e7
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-rle-half-float-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x5ede004c
diff --git a/tests/ref/fate/exr-rgb-tile-rle-half-float-l2 b/tests/ref/fate/exr-rgb-tile-rle-half-float-l2
new file mode 100644
index 0000000000..444fb566d2
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-rle-half-float-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0x22f77b1c
diff --git a/tests/ref/fate/exr-rgb-tile-zip-half-float-l1 b/tests/ref/fate/exr-rgb-tile-zip-half-float-l1
new file mode 100644
index 0000000000..af042043e7
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-zip-half-float-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x5ede004c
diff --git a/tests/ref/fate/exr-rgb-tile-zip-half-float-l2 b/tests/ref/fate/exr-rgb-tile-zip-half-float-l2
new file mode 100644
index 0000000000..444fb566d2
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-zip-half-float-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0x22f77b1c
diff --git a/tests/ref/fate/exr-rgb-tile-zip1-half-float-l1 b/tests/ref/fate/exr-rgb-tile-zip1-half-float-l1
new file mode 100644
index 0000000000..af042043e7
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-zip1-half-float-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      576, 0x5ede004c
diff --git a/tests/ref/fate/exr-rgb-tile-zip1-half-float-l2 b/tests/ref/fate/exr-rgb-tile-zip1-half-float-l2
new file mode 100644
index 0000000000..444fb566d2
--- /dev/null
+++ b/tests/ref/fate/exr-rgb-tile-zip1-half-float-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      768, 0x22f77b1c
diff --git a/tests/ref/fate/exr-rgba-multiscanline-half-b44 b/tests/ref/fate/exr-rgba-multiscanline-half-b44
new file mode 100644
index 0000000000..4b9a88ba52
--- /dev/null
+++ b/tests/ref/fate/exr-rgba-multiscanline-half-b44
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 935x251
+#sar 0: 1/1
+0,          0,          0,        1,  1877480, 0x6f28b860
diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l1 b/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l1
new file mode 100644
index 0000000000..cd25f618f4
--- /dev/null
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 9/10
+0,          0,          0,        1,      768, 0x1de5c7f1
diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l2 b/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l2
new file mode 100644
index 0000000000..ecfba85e83
--- /dev/null
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44-12x8-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 9/10
+0,          0,          0,        1,      768, 0xe08ca6d3
diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l1 b/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l1
new file mode 100644
index 0000000000..3e82e2aaa4
--- /dev/null
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 13x9
+#sar 0: 9/10
+0,          0,          0,        1,      936, 0xdcb42186
diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l2 b/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l2
new file mode 100644
index 0000000000..f237d17d3f
--- /dev/null
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44-13x9-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 13x9
+#sar 0: 9/10
+0,          0,          0,        1,      936, 0x7f710bf5
diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l1 b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l1
new file mode 100644
index 0000000000..43313e3712
--- /dev/null
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 9/10
+0,          0,          0,        1,      768, 0xe200c160
diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l2 b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l2
new file mode 100644
index 0000000000..ecfba85e83
--- /dev/null
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-12x8-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 9/10
+0,          0,          0,        1,      768, 0xe08ca6d3
diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l1 b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l1
new file mode 100644
index 0000000000..e43c31ebd5
--- /dev/null
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l1
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 13x9
+#sar 0: 9/10
+0,          0,          0,        1,      936, 0x911718ac
diff --git a/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l2 b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l2
new file mode 100644
index 0000000000..f237d17d3f
--- /dev/null
+++ b/tests/ref/fate/exr-rgba-scanline-float-half-b44a-13x9-l2
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 13x9
+#sar 0: 9/10
+0,          0,          0,        1,      936, 0x7f710bf5
diff --git a/tests/ref/fate/exr-slice-pxr24 b/tests/ref/fate/exr-slice-pxr24
index c46e897b13..99fbc05074 100644
--- a/tests/ref/fate/exr-slice-pxr24
+++ b/tests/ref/fate/exr-slice-pxr24
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 800x800
+#sar 0: 1/1
 0,          0,          0,        1,  3840000, 0xdcfb341d
diff --git a/tests/ref/fate/exr-slice-raw b/tests/ref/fate/exr-slice-raw
index a8b4b27331..cbe124b3e1 100644
--- a/tests/ref/fate/exr-slice-raw
+++ b/tests/ref/fate/exr-slice-raw
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 587x675
+#sar 0: 1/1
 0,          0,          0,        1,  3169800, 0x6a356d0d
diff --git a/tests/ref/fate/exr-slice-rle b/tests/ref/fate/exr-slice-rle
index a8b4b27331..cbe124b3e1 100644
--- a/tests/ref/fate/exr-slice-rle
+++ b/tests/ref/fate/exr-slice-rle
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 587x675
+#sar 0: 1/1
 0,          0,          0,        1,  3169800, 0x6a356d0d
diff --git a/tests/ref/fate/exr-slice-zip1 b/tests/ref/fate/exr-slice-zip1
index a8b4b27331..cbe124b3e1 100644
--- a/tests/ref/fate/exr-slice-zip1
+++ b/tests/ref/fate/exr-slice-zip1
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 587x675
+#sar 0: 1/1
 0,          0,          0,        1,  3169800, 0x6a356d0d
diff --git a/tests/ref/fate/exr-slice-zip16 b/tests/ref/fate/exr-slice-zip16
index a8b4b27331..cbe124b3e1 100644
--- a/tests/ref/fate/exr-slice-zip16
+++ b/tests/ref/fate/exr-slice-zip16
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 587x675
+#sar 0: 1/1
 0,          0,          0,        1,  3169800, 0x6a356d0d
diff --git a/tests/ref/fate/exr-y-scanline-zip-half-12x8 b/tests/ref/fate/exr-y-scanline-zip-half-12x8
new file mode 100644
index 0000000000..2a62164256
--- /dev/null
+++ b/tests/ref/fate/exr-y-scanline-zip-half-12x8
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      192, 0xdd5759b5
diff --git a/tests/ref/fate/exr-y-tile-zip-half-12x8 b/tests/ref/fate/exr-y-tile-zip-half-12x8
new file mode 100644
index 0000000000..2a62164256
--- /dev/null
+++ b/tests/ref/fate/exr-y-tile-zip-half-12x8
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 1/1
+0,          0,          0,        1,      192, 0xdd5759b5
diff --git a/tests/ref/fate/ffmpeg-attached_pics b/tests/ref/fate/ffmpeg-attached_pics
new file mode 100644
index 0000000000..3a0f151819
--- /dev/null
+++ b/tests/ref/fate/ffmpeg-attached_pics
@@ -0,0 +1,141 @@
+#extradata 1:       36, 0x45f80468
+#tb 0: 1/90000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x200
+#sar 0: 2834/2834
+#tb 1: 1/44100
+#media_type 1: audio
+#codec_id 1: alac
+#sample_rate 1: 44100
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,          0,          0,        0,   120000, 0x748cc771
+1,          0,          0,     4096,       32, 0x204b0676
+1,       4096,       4096,     4096,     5826, 0x56583236
+1,       8192,       8192,     4096,     5532, 0x5f047492
+1,      12288,      12288,     4096,     5245, 0xaa3f1897
+1,      16384,      16384,     4096,     4782, 0x392f3ac3
+1,      20480,      20480,     4096,     4602, 0x9bd6ffad
+1,      24576,      24576,     4096,     4357, 0x5df6530b
+1,      28672,      28672,     4096,     7443, 0x38ce542b
+1,      32768,      32768,     4096,     5803, 0x196ae519
+1,      36864,      36864,     4096,     5619, 0xd436cd94
+1,      40960,      40960,     4096,     4896, 0x42df7109
+1,      45056,      45056,     4096,     4755, 0xfbfdfd5f
+1,      49152,      49152,     4096,     4597, 0x93f3ce66
+1,      53248,      53248,     4096,     7777, 0x56ffe620
+1,      57344,      57344,     4096,     5498, 0xa0865dc8
+1,      61440,      61440,     4096,     5343, 0x42134619
+1,      65536,      65536,     4096,     6261, 0xd60d1379
+1,      69632,      69632,     4096,     4496, 0x0eb49c68
+1,      73728,      73728,     4096,     4336, 0x21d541bd
+1,      77824,      77824,     4096,     8395, 0x02030a38
+1,      81920,      81920,     4096,     8174, 0x47bdb71d
+1,      86016,      86016,     4096,     7434, 0x2304318e
+1,      90112,      90112,     4096,     7619, 0x80e6a037
+1,      94208,      94208,     4096,     6086, 0xd3438d2f
+1,      98304,      98304,     4096,     6075, 0xd6019fbf
+1,     102400,     102400,     4096,     9597, 0x28f46a38
+1,     106496,     106496,     4096,    10287, 0x9dbf0938
+1,     110592,     110592,     4096,    10537, 0xc417fb81
+1,     114688,     114688,     4096,    10360, 0xc580caa3
+1,     118784,     118784,     4096,     9778, 0xb9c2d3e5
+1,     122880,     122880,     4096,    10307, 0x05b1b271
+1,     126976,     126976,     4096,    11289, 0x97f07c63
+1,     131072,     131072,     4096,    11561, 0x8a45194a
+1,     135168,     135168,     4096,    11327, 0x86587829
+1,     139264,     139264,     4096,    11347, 0x15659d6e
+1,     143360,     143360,     4096,    11006, 0x9a002c7f
+1,     147456,     147456,     4096,    11147, 0x853955e0
+1,     151552,     151552,     4096,    11025, 0x7bdafbda
+1,     155648,     155648,     4096,    11561, 0x2ec43d86
+1,     159744,     159744,     4096,    11329, 0x6eaba39a
+1,     163840,     163840,     4096,    10886, 0x5c31b777
+1,     167936,     167936,     4096,    11505, 0xcd7f2b9a
+1,     172032,     172032,     4096,    11243, 0xa1cb6c83
+1,     176128,     176128,     4096,    11718, 0x5b0d6e74
+1,     180224,     180224,     4096,    11898, 0xa649ca9a
+1,     184320,     184320,     4096,    11358, 0x037bc2f4
+1,     188416,     188416,     4096,    10864, 0x9239d22f
+1,     192512,     192512,     4096,    12181, 0xd5c24fba
+1,     196608,     196608,     4096,    11551, 0xa0d8c8d1
+1,     200704,     200704,     4096,    10858, 0x330fcbd8
+1,     204800,     204800,     4096,     9918, 0xd64a0ae4
+1,     208896,     208896,     4096,     9944, 0x0627d87a
+1,     212992,     212992,     4096,     9490, 0xa8cc1e93
+1,     217088,     217088,     4096,     9427, 0xb2b6db53
+1,     221184,     221184,     4096,     9799, 0x23ef915a
+1,     225280,     225280,     4096,     9544, 0x79fb4344
+1,     229376,     229376,     4096,    12091, 0xdc2e58e4
+1,     233472,     233472,     4096,    11079, 0xe23d2e0e
+1,     237568,     237568,     4096,    10772, 0xec04a623
+1,     241664,     241664,     4096,    11608, 0x9ab81556
+1,     245760,     245760,     4096,    10744, 0x538c70fa
+1,     249856,     249856,     4096,    10316, 0xfc26a3bf
+1,     253952,     253952,     4096,    11768, 0x20a1590f
+1,     258048,     258048,     4096,    11283, 0xd6cb802d
+1,     262144,     262144,     4096,    10112, 0xf1de16a2
+1,     266240,     266240,     4096,    12051, 0x881feda5
+1,     270336,     270336,     4096,    11348, 0xede7baab
+1,     274432,     274432,     4096,    10816, 0x816c90c7
+1,     278528,     278528,     4096,    12319, 0x1750b376
+1,     282624,     282624,     4096,    11228, 0x8db96bea
+1,     286720,     286720,     4096,    10217, 0x7503aeb2
+1,     290816,     290816,     4096,    12084, 0x36dde3c4
+1,     294912,     294912,     4096,    11697, 0xa16f51f7
+1,     299008,     299008,     4096,    10977, 0xf5b026e4
+1,     303104,     303104,     4096,    10459, 0xcab7f410
+1,     307200,     307200,     4096,    10287, 0x910baac6
+1,     311296,     311296,     4096,    10313, 0x5c0ca807
+1,     315392,     315392,     4096,    10018, 0x366a00da
+1,     319488,     319488,     4096,    10250, 0x69459be7
+1,     323584,     323584,     4096,     9947, 0x5d8efc8e
+1,     327680,     327680,     4096,    11550, 0xb90d385c
+1,     331776,     331776,     4096,    11249, 0xb93f8093
+1,     335872,     335872,     4096,    11168, 0xe8fb345a
+1,     339968,     339968,     4096,    11389, 0xa0eebbe6
+1,     344064,     344064,     4096,    10632, 0xc4646a98
+1,     348160,     348160,     4096,    11055, 0x5b2c3bb5
+1,     352256,     352256,     4096,    11551, 0xc6951ab2
+1,     356352,     356352,     4096,    11495, 0xde18135a
+1,     360448,     360448,     4096,    11141, 0x98a92ed5
+1,     364544,     364544,     4096,    11272, 0x99837e81
+1,     368640,     368640,     4096,    10973, 0xfc8b1294
+1,     372736,     372736,     4096,    10754, 0x562f8fcc
+1,     376832,     376832,     4096,    11784, 0x8a114dde
+1,     380928,     380928,     4096,    11358, 0x8405af06
+1,     385024,     385024,     4096,    11194, 0x164570f6
+1,     389120,     389120,     4096,    11512, 0x8358d96f
+1,     393216,     393216,     4096,    12245, 0x206d6330
+1,     397312,     397312,     4096,    11556, 0x2412fc6c
+1,     401408,     401408,     4096,    10997, 0x8e31e829
+1,     405504,     405504,     4096,     9927, 0x7eb2f59a
+1,     409600,     409600,     4096,     9797, 0x51089850
+1,     413696,     413696,     4096,     9648, 0xf29a7d52
+1,     417792,     417792,     4096,     9077, 0xddc149ad
+1,     421888,     421888,     4096,     9759, 0x38d0b78d
+1,     425984,     425984,     4096,    10347, 0x3073bad7
+1,     430080,     430080,     4096,    11585, 0x114310ec
+1,     434176,     434176,     4096,    11137, 0x6f420692
+1,     438272,     438272,     4096,    11099, 0xf9810272
+1,     442368,     442368,     4096,    11682, 0xe68452b7
+1,     446464,     446464,     4096,    11186, 0x899175ec
+1,     450560,     450560,     4096,     9933, 0xac27d52f
+1,     454656,     454656,     4096,    11609, 0xb6e31541
+1,     458752,     458752,     4096,    11632, 0x4898412b
+1,     462848,     462848,     4096,    11132, 0x6a3d6295
+1,     466944,     466944,     4096,    11960, 0xcc76d187
+1,     471040,     471040,     4096,    11196, 0x384f57ef
+1,     475136,     475136,     4096,    10619, 0x0e6d2961
+1,     479232,     479232,     4096,    11867, 0x7fe3b947
+1,     483328,     483328,     4096,    11190, 0x28785152
+1,     487424,     487424,     4096,    10375, 0xc67a06dc
+1,     491520,     491520,     4096,    11959, 0xcc9a0e02
+1,     495616,     495616,     4096,    11400, 0x67e6d6e7
+1,     499712,     499712,     4096,     9897, 0x5db7d50f
+1,     503808,     503808,     4096,    11460, 0x753cc6b9
+1,     507904,     507904,     4096,    11375, 0x76e9d803
+1,     512000,     512000,     4096,    11105, 0x22f71d1c
+1,     516096,     516096,     4096,    10949, 0x7951202a
+1,     520192,     520192,     4085,    11292, 0x8fc9ca01
diff --git a/tests/ref/fate/ffmpeg-bsf-remove-e b/tests/ref/fate/ffmpeg-bsf-remove-e
new file mode 100644
index 0000000000..4cf04f769f
--- /dev/null
+++ b/tests/ref/fate/ffmpeg-bsf-remove-e
@@ -0,0 +1,32 @@
+d6c688432b88ca62ea8abb885272af52 *tests/data/fate/ffmpeg-bsf-remove-e.avi
+129982 tests/data/fate/ffmpeg-bsf-remove-e.avi
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: mpeg4
+#dimensions 0: 716x236
+#sar 0: 1/1
+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
diff --git a/tests/ref/fate/ffmpeg-bsf-remove-k b/tests/ref/fate/ffmpeg-bsf-remove-k
new file mode 100644
index 0000000000..9c1f54eb90
--- /dev/null
+++ b/tests/ref/fate/ffmpeg-bsf-remove-k
@@ -0,0 +1,33 @@
+6196f1d6b59d16c045de627221d8685f *tests/data/fate/ffmpeg-bsf-remove-k.avi
+130072 tests/data/fate/ffmpeg-bsf-remove-k.avi
+#extradata 0:       30, 0x4a4d065a
+#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
diff --git a/tests/ref/fate/ffmpeg-bsf-remove-r b/tests/ref/fate/ffmpeg-bsf-remove-r
new file mode 100644
index 0000000000..c533aaa9be
--- /dev/null
+++ b/tests/ref/fate/ffmpeg-bsf-remove-r
@@ -0,0 +1,32 @@
+d6c688432b88ca62ea8abb885272af52 *tests/data/fate/ffmpeg-bsf-remove-r.avi
+129982 tests/data/fate/ffmpeg-bsf-remove-r.avi
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: mpeg4
+#dimensions 0: 716x236
+#sar 0: 1/1
+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
diff --git a/tests/ref/fate/ffmpeg-filter_colorkey b/tests/ref/fate/ffmpeg-filter_colorkey
new file mode 100644
index 0000000000..effc13b12f
--- /dev/null
+++ b/tests/ref/fate/ffmpeg-filter_colorkey
@@ -0,0 +1,15 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 0/1
+0,          0,          0,        1,   622080, 0x4e30accb
+0,          1,          1,        1,   622080, 0x7d941c14
+0,          2,          2,        1,   622080, 0xf7451c5b
+0,          3,          3,        1,   622080, 0xb2c74319
+0,          4,          4,        1,   622080, 0xc9b80b79
+0,          5,          5,        1,   622080, 0x92ce1194
+0,          6,          6,        1,   622080, 0x43ae99ac
+0,          7,          7,        1,   622080, 0x4ec3a554
+0,          8,          8,        1,   622080, 0x3200250c
+0,          9,          9,        1,   622080, 0x94ebb3f3
diff --git a/tests/ref/fate/ffmpeg-filter_complex b/tests/ref/fate/ffmpeg-filter_complex
new file mode 100644
index 0000000000..d85a4aa52f
--- /dev/null
+++ b/tests/ref/fate/ffmpeg-filter_complex
@@ -0,0 +1,10 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   115200, 0x375ec573
+0,          1,          1,        1,   115200, 0x375ec573
+0,          2,          2,        1,   115200, 0x375ec573
+0,          3,          3,        1,   115200, 0x375ec573
+0,          4,          4,        1,   115200, 0x375ec573
diff --git a/tests/ref/fate/ffmpeg-filter_complex_audio b/tests/ref/fate/ffmpeg-filter_complex_audio
new file mode 100644
index 0000000000..c424675061
--- /dev/null
+++ b/tests/ref/fate/ffmpeg-filter_complex_audio
@@ -0,0 +1,10 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: ac3
+#sample_rate 0: 44100
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+0,       -256,       -256,     1536,      416, 0x3001fb2d
+0,       1280,       1280,     1536,      418, 0xba72fc16
+0,       2816,       2816,     1536,      418, 0xba72fc16
+0,       4352,       4352,     1536,      418, 0xba72fc16
diff --git a/tests/ref/fate/ffmpeg-lavfi b/tests/ref/fate/ffmpeg-lavfi
new file mode 100644
index 0000000000..d85a4aa52f
--- /dev/null
+++ b/tests/ref/fate/ffmpeg-lavfi
@@ -0,0 +1,10 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   115200, 0x375ec573
+0,          1,          1,        1,   115200, 0x375ec573
+0,          2,          2,        1,   115200, 0x375ec573
+0,          3,          3,        1,   115200, 0x375ec573
+0,          4,          4,        1,   115200, 0x375ec573
diff --git a/tests/ref/fate/ffprobe_compact b/tests/ref/fate/ffprobe_compact
new file mode 100644
index 0000000000..4a0f4ee776
--- /dev/null
+++ b/tests/ref/fate/ffprobe_compact
@@ -0,0 +1,32 @@
+packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=647|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=647|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
+packet|codec_type=video|stream_index=1|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=2722|flags=K_
+frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=2722|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified
+packet|codec_type=video|stream_index=2|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=233143|flags=K_
+frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=233143|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified
+packet|codec_type=audio|stream_index=0|pts=1024|pts_time=0.023220|dts=1024|dts_time=0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=263148|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=1024|pkt_pts_time=0.023220|pkt_dts=1024|pkt_dts_time=0.023220|best_effort_timestamp=1024|best_effort_timestamp_time=0.023220|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=263148|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
+packet|codec_type=video|stream_index=1|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=265226|flags=K_
+frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=265226|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified
+packet|codec_type=video|stream_index=2|pts=2048|pts_time=0.040000|dts=2048|dts_time=0.040000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=495650|flags=K_
+frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=2048|pkt_pts_time=0.040000|pkt_dts=2048|pkt_dts_time=0.040000|best_effort_timestamp=2048|best_effort_timestamp_time=0.040000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=495650|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified
+packet|codec_type=audio|stream_index=0|pts=2048|pts_time=0.046440|dts=2048|dts_time=0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=525655|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=2048|pkt_pts_time=0.046440|pkt_dts=2048|pkt_dts_time=0.046440|best_effort_timestamp=2048|best_effort_timestamp_time=0.046440|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=525655|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=3072|pts_time=0.069660|dts=3072|dts_time=0.069660|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=527726|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=3072|pkt_pts_time=0.069660|pkt_dts=3072|pkt_dts_time=0.069660|best_effort_timestamp=3072|best_effort_timestamp_time=0.069660|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=527726|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
+packet|codec_type=video|stream_index=1|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=529804|flags=K_
+frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=529804|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified
+packet|codec_type=video|stream_index=2|pts=4096|pts_time=0.080000|dts=4096|dts_time=0.080000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=760228|flags=K_
+frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=4096|pkt_pts_time=0.080000|pkt_dts=4096|pkt_dts_time=0.080000|best_effort_timestamp=4096|best_effort_timestamp_time=0.080000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=760228|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified
+packet|codec_type=audio|stream_index=0|pts=4096|pts_time=0.092880|dts=4096|dts_time=0.092880|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=2048|pos=790233|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=4096|pkt_pts_time=0.092880|pkt_dts=4096|pkt_dts_time=0.092880|best_effort_timestamp=4096|best_effort_timestamp_time=0.092880|pkt_duration=1024|pkt_duration_time=0.023220|pkt_pos=790233|pkt_size=2048|sample_fmt=s16|nb_samples=1024|channels=1|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=5120|pts_time=0.116100|dts=5120|dts_time=0.116100|duration=393|duration_time=0.008912|convergence_duration=N/A|convergence_duration_time=N/A|size=786|pos=792304|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=5120|pkt_pts_time=0.116100|pkt_dts=5120|pkt_dts_time=0.116100|best_effort_timestamp=5120|best_effort_timestamp_time=0.116100|pkt_duration=393|pkt_duration_time=0.008912|pkt_pos=792304|pkt_size=786|sample_fmt=s16|nb_samples=393|channels=1|channel_layout=unknown
+packet|codec_type=video|stream_index=1|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=230400|pos=793120|flags=K_
+frame|media_type=video|stream_index=1|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=793120|pkt_size=230400|width=320|height=240|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified
+packet|codec_type=video|stream_index=2|pts=6144|pts_time=0.120000|dts=6144|dts_time=0.120000|duration=2048|duration_time=0.040000|convergence_duration=N/A|convergence_duration_time=N/A|size=30000|pos=1023544|flags=K_
+frame|media_type=video|stream_index=2|key_frame=1|pkt_pts=6144|pkt_pts_time=0.120000|pkt_dts=6144|pkt_dts_time=0.120000|best_effort_timestamp=6144|best_effort_timestamp_time=0.120000|pkt_duration=2048|pkt_duration_time=0.040000|pkt_pos=1023544|pkt_size=30000|width=100|height=100|pix_fmt=rgb24|sample_aspect_ratio=1:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=unknown|color_space=unknown|color_primaries=unknown|color_transfer=unknown|chroma_location=unspecified
+stream|index=0|codec_name=pcm_s16le|profile=unknown|codec_type=audio|codec_time_base=1/44100|codec_tag_string=PSD[16]|codec_tag=0x10445350|sample_fmt=s16|sample_rate=44100|channels=1|channel_layout=unknown|bits_per_sample=16|id=N/A|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/44100|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=705600|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=6|nb_read_packets=6|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:E=mc²|tag:encoder=Lavc pcm_s16le
+stream|index=1|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=320|height=240|coded_width=320|coded_height=240|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=4:3|pix_fmt=rgb24|level=-99|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:title=foobar|tag:duration_ts=field-and-tags-conflict-attempt|tag:encoder=Lavc rawvideo
+stream|index=2|codec_name=rawvideo|profile=unknown|codec_type=video|codec_time_base=1/25|codec_tag_string=RGB[24]|codec_tag=0x18424752|width=100|height=100|coded_width=100|coded_height=100|has_b_frames=0|sample_aspect_ratio=1:1|display_aspect_ratio=1:1|pix_fmt=rgb24|level=-99|color_range=unknown|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=unspecified|field_order=unknown|timecode=N/A|refs=1|id=N/A|r_frame_rate=25/1|avg_frame_rate=25/1|time_base=1/51200|start_pts=0|start_time=0.000000|duration_ts=N/A|duration=N/A|bit_rate=N/A|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=4|nb_read_packets=4|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:encoder=Lavc rawvideo
+format|filename=tests/data/ffprobe-test.nut|nb_streams=3|nb_programs=0|format_name=nut|start_time=0.000000|duration=0.120000|size=1053624|bit_rate=70241600|probe_score=100|tag:title=ffprobe test file|tag:comment='A comment with CSV, XML & JSON special chars': <tag value="x">|tag:comment2=I ♥ Üñîçød€
diff --git a/tests/ref/fate/ffprobe_csv b/tests/ref/fate/ffprobe_csv
new file mode 100644
index 0000000000..dfbeb40e20
--- /dev/null
+++ b/tests/ref/fate/ffprobe_csv
@@ -0,0 +1,32 @@
+packet,audio,0,0,0.000000,0,0.000000,1024,0.023220,N/A,N/A,2048,647,K_
+frame,audio,0,1,0,0.000000,0,0.000000,0,0.000000,1024,0.023220,647,2048,s16,1024,1,unknown
+packet,video,1,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,230400,2722,K_
+frame,video,1,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,2722,230400,320,240,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified
+packet,video,2,0,0.000000,0,0.000000,2048,0.040000,N/A,N/A,30000,233143,K_
+frame,video,2,1,0,0.000000,0,0.000000,0,0.000000,2048,0.040000,233143,30000,100,100,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified
+packet,audio,0,1024,0.023220,1024,0.023220,1024,0.023220,N/A,N/A,2048,263148,K_
+frame,audio,0,1,1024,0.023220,1024,0.023220,1024,0.023220,1024,0.023220,263148,2048,s16,1024,1,unknown
+packet,video,1,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,230400,265226,K_
+frame,video,1,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,265226,230400,320,240,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified
+packet,video,2,2048,0.040000,2048,0.040000,2048,0.040000,N/A,N/A,30000,495650,K_
+frame,video,2,1,2048,0.040000,2048,0.040000,2048,0.040000,2048,0.040000,495650,30000,100,100,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified
+packet,audio,0,2048,0.046440,2048,0.046440,1024,0.023220,N/A,N/A,2048,525655,K_
+frame,audio,0,1,2048,0.046440,2048,0.046440,2048,0.046440,1024,0.023220,525655,2048,s16,1024,1,unknown
+packet,audio,0,3072,0.069660,3072,0.069660,1024,0.023220,N/A,N/A,2048,527726,K_
+frame,audio,0,1,3072,0.069660,3072,0.069660,3072,0.069660,1024,0.023220,527726,2048,s16,1024,1,unknown
+packet,video,1,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,230400,529804,K_
+frame,video,1,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,529804,230400,320,240,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified
+packet,video,2,4096,0.080000,4096,0.080000,2048,0.040000,N/A,N/A,30000,760228,K_
+frame,video,2,1,4096,0.080000,4096,0.080000,4096,0.080000,2048,0.040000,760228,30000,100,100,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified
+packet,audio,0,4096,0.092880,4096,0.092880,1024,0.023220,N/A,N/A,2048,790233,K_
+frame,audio,0,1,4096,0.092880,4096,0.092880,4096,0.092880,1024,0.023220,790233,2048,s16,1024,1,unknown
+packet,audio,0,5120,0.116100,5120,0.116100,393,0.008912,N/A,N/A,786,792304,K_
+frame,audio,0,1,5120,0.116100,5120,0.116100,5120,0.116100,393,0.008912,792304,786,s16,393,1,unknown
+packet,video,1,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,230400,793120,K_
+frame,video,1,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,793120,230400,320,240,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified
+packet,video,2,6144,0.120000,6144,0.120000,2048,0.040000,N/A,N/A,30000,1023544,K_
+frame,video,2,1,6144,0.120000,6144,0.120000,6144,0.120000,2048,0.040000,1023544,30000,100,100,rgb24,1:1,I,0,0,0,0,0,unknown,unknown,unknown,unknown,unspecified
+stream,0,pcm_s16le,unknown,audio,1/44100,PSD[16],0x10445350,s16,44100,1,unknown,16,N/A,0/0,0/0,1/44100,0,0.000000,N/A,N/A,705600,N/A,N/A,N/A,6,6,0,0,0,0,0,0,0,0,0,0,0,0,mc²,Lavc pcm_s16le
+stream,1,rawvideo,unknown,video,1/25,RGB[24],0x18424752,320,240,320,240,0,1:1,4:3,rgb24,-99,unknown,unknown,unknown,unknown,unspecified,unknown,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,0,foobar,field-and-tags-conflict-attempt,Lavc rawvideo
+stream,2,rawvideo,unknown,video,1/25,RGB[24],0x18424752,100,100,100,100,0,1:1,1:1,rgb24,-99,unknown,unknown,unknown,unknown,unspecified,unknown,N/A,1,N/A,25/1,25/1,1/51200,0,0.000000,N/A,N/A,N/A,N/A,N/A,N/A,4,4,0,0,0,0,0,0,0,0,0,0,0,0,Lavc rawvideo
+format,tests/data/ffprobe-test.nut,3,0,nut,0.000000,0.120000,1053624,70241600,100,ffprobe test file,"'A comment with CSV, XML & JSON special chars': <tag value=""x"">",I ♥ Üñîçød€
diff --git a/tests/ref/fate/ffprobe_default b/tests/ref/fate/ffprobe_default
new file mode 100644
index 0000000000..7562867e19
--- /dev/null
+++ b/tests/ref/fate/ffprobe_default
@@ -0,0 +1,728 @@
+[PACKET]
+codec_type=audio
+stream_index=0
+pts=0
+pts_time=0.000000
+dts=0
+dts_time=0.000000
+duration=1024
+duration_time=0.023220
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=2048
+pos=647
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=0
+pkt_pts_time=0.000000
+pkt_dts=0
+pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
+pkt_duration=1024
+pkt_duration_time=0.023220
+pkt_pos=647
+pkt_size=2048
+sample_fmt=s16
+nb_samples=1024
+channels=1
+channel_layout=unknown
+[/FRAME]
+[PACKET]
+codec_type=video
+stream_index=1
+pts=0
+pts_time=0.000000
+dts=0
+dts_time=0.000000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=230400
+pos=2722
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=video
+stream_index=1
+key_frame=1
+pkt_pts=0
+pkt_pts_time=0.000000
+pkt_dts=0
+pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=2722
+pkt_size=230400
+width=320
+height=240
+pix_fmt=rgb24
+sample_aspect_ratio=1:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+[/FRAME]
+[PACKET]
+codec_type=video
+stream_index=2
+pts=0
+pts_time=0.000000
+dts=0
+dts_time=0.000000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=30000
+pos=233143
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=video
+stream_index=2
+key_frame=1
+pkt_pts=0
+pkt_pts_time=0.000000
+pkt_dts=0
+pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=233143
+pkt_size=30000
+width=100
+height=100
+pix_fmt=rgb24
+sample_aspect_ratio=1:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+[/FRAME]
+[PACKET]
+codec_type=audio
+stream_index=0
+pts=1024
+pts_time=0.023220
+dts=1024
+dts_time=0.023220
+duration=1024
+duration_time=0.023220
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=2048
+pos=263148
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=1024
+pkt_pts_time=0.023220
+pkt_dts=1024
+pkt_dts_time=0.023220
+best_effort_timestamp=1024
+best_effort_timestamp_time=0.023220
+pkt_duration=1024
+pkt_duration_time=0.023220
+pkt_pos=263148
+pkt_size=2048
+sample_fmt=s16
+nb_samples=1024
+channels=1
+channel_layout=unknown
+[/FRAME]
+[PACKET]
+codec_type=video
+stream_index=1
+pts=2048
+pts_time=0.040000
+dts=2048
+dts_time=0.040000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=230400
+pos=265226
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=video
+stream_index=1
+key_frame=1
+pkt_pts=2048
+pkt_pts_time=0.040000
+pkt_dts=2048
+pkt_dts_time=0.040000
+best_effort_timestamp=2048
+best_effort_timestamp_time=0.040000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=265226
+pkt_size=230400
+width=320
+height=240
+pix_fmt=rgb24
+sample_aspect_ratio=1:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+[/FRAME]
+[PACKET]
+codec_type=video
+stream_index=2
+pts=2048
+pts_time=0.040000
+dts=2048
+dts_time=0.040000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=30000
+pos=495650
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=video
+stream_index=2
+key_frame=1
+pkt_pts=2048
+pkt_pts_time=0.040000
+pkt_dts=2048
+pkt_dts_time=0.040000
+best_effort_timestamp=2048
+best_effort_timestamp_time=0.040000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=495650
+pkt_size=30000
+width=100
+height=100
+pix_fmt=rgb24
+sample_aspect_ratio=1:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+[/FRAME]
+[PACKET]
+codec_type=audio
+stream_index=0
+pts=2048
+pts_time=0.046440
+dts=2048
+dts_time=0.046440
+duration=1024
+duration_time=0.023220
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=2048
+pos=525655
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=2048
+pkt_pts_time=0.046440
+pkt_dts=2048
+pkt_dts_time=0.046440
+best_effort_timestamp=2048
+best_effort_timestamp_time=0.046440
+pkt_duration=1024
+pkt_duration_time=0.023220
+pkt_pos=525655
+pkt_size=2048
+sample_fmt=s16
+nb_samples=1024
+channels=1
+channel_layout=unknown
+[/FRAME]
+[PACKET]
+codec_type=audio
+stream_index=0
+pts=3072
+pts_time=0.069660
+dts=3072
+dts_time=0.069660
+duration=1024
+duration_time=0.023220
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=2048
+pos=527726
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=3072
+pkt_pts_time=0.069660
+pkt_dts=3072
+pkt_dts_time=0.069660
+best_effort_timestamp=3072
+best_effort_timestamp_time=0.069660
+pkt_duration=1024
+pkt_duration_time=0.023220
+pkt_pos=527726
+pkt_size=2048
+sample_fmt=s16
+nb_samples=1024
+channels=1
+channel_layout=unknown
+[/FRAME]
+[PACKET]
+codec_type=video
+stream_index=1
+pts=4096
+pts_time=0.080000
+dts=4096
+dts_time=0.080000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=230400
+pos=529804
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=video
+stream_index=1
+key_frame=1
+pkt_pts=4096
+pkt_pts_time=0.080000
+pkt_dts=4096
+pkt_dts_time=0.080000
+best_effort_timestamp=4096
+best_effort_timestamp_time=0.080000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=529804
+pkt_size=230400
+width=320
+height=240
+pix_fmt=rgb24
+sample_aspect_ratio=1:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+[/FRAME]
+[PACKET]
+codec_type=video
+stream_index=2
+pts=4096
+pts_time=0.080000
+dts=4096
+dts_time=0.080000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=30000
+pos=760228
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=video
+stream_index=2
+key_frame=1
+pkt_pts=4096
+pkt_pts_time=0.080000
+pkt_dts=4096
+pkt_dts_time=0.080000
+best_effort_timestamp=4096
+best_effort_timestamp_time=0.080000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=760228
+pkt_size=30000
+width=100
+height=100
+pix_fmt=rgb24
+sample_aspect_ratio=1:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+[/FRAME]
+[PACKET]
+codec_type=audio
+stream_index=0
+pts=4096
+pts_time=0.092880
+dts=4096
+dts_time=0.092880
+duration=1024
+duration_time=0.023220
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=2048
+pos=790233
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=4096
+pkt_pts_time=0.092880
+pkt_dts=4096
+pkt_dts_time=0.092880
+best_effort_timestamp=4096
+best_effort_timestamp_time=0.092880
+pkt_duration=1024
+pkt_duration_time=0.023220
+pkt_pos=790233
+pkt_size=2048
+sample_fmt=s16
+nb_samples=1024
+channels=1
+channel_layout=unknown
+[/FRAME]
+[PACKET]
+codec_type=audio
+stream_index=0
+pts=5120
+pts_time=0.116100
+dts=5120
+dts_time=0.116100
+duration=393
+duration_time=0.008912
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=786
+pos=792304
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=5120
+pkt_pts_time=0.116100
+pkt_dts=5120
+pkt_dts_time=0.116100
+best_effort_timestamp=5120
+best_effort_timestamp_time=0.116100
+pkt_duration=393
+pkt_duration_time=0.008912
+pkt_pos=792304
+pkt_size=786
+sample_fmt=s16
+nb_samples=393
+channels=1
+channel_layout=unknown
+[/FRAME]
+[PACKET]
+codec_type=video
+stream_index=1
+pts=6144
+pts_time=0.120000
+dts=6144
+dts_time=0.120000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=230400
+pos=793120
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=video
+stream_index=1
+key_frame=1
+pkt_pts=6144
+pkt_pts_time=0.120000
+pkt_dts=6144
+pkt_dts_time=0.120000
+best_effort_timestamp=6144
+best_effort_timestamp_time=0.120000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=793120
+pkt_size=230400
+width=320
+height=240
+pix_fmt=rgb24
+sample_aspect_ratio=1:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+[/FRAME]
+[PACKET]
+codec_type=video
+stream_index=2
+pts=6144
+pts_time=0.120000
+dts=6144
+dts_time=0.120000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=30000
+pos=1023544
+flags=K_
+[/PACKET]
+[FRAME]
+media_type=video
+stream_index=2
+key_frame=1
+pkt_pts=6144
+pkt_pts_time=0.120000
+pkt_dts=6144
+pkt_dts_time=0.120000
+best_effort_timestamp=6144
+best_effort_timestamp_time=0.120000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=1023544
+pkt_size=30000
+width=100
+height=100
+pix_fmt=rgb24
+sample_aspect_ratio=1:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+[/FRAME]
+[STREAM]
+index=0
+codec_name=pcm_s16le
+profile=unknown
+codec_type=audio
+codec_time_base=1/44100
+codec_tag_string=PSD[16]
+codec_tag=0x10445350
+sample_fmt=s16
+sample_rate=44100
+channels=1
+channel_layout=unknown
+bits_per_sample=16
+id=N/A
+r_frame_rate=0/0
+avg_frame_rate=0/0
+time_base=1/44100
+start_pts=0
+start_time=0.000000
+duration_ts=N/A
+duration=N/A
+bit_rate=705600
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=6
+nb_read_packets=6
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+DISPOSITION:comment=0
+DISPOSITION:lyrics=0
+DISPOSITION:karaoke=0
+DISPOSITION:forced=0
+DISPOSITION:hearing_impaired=0
+DISPOSITION:visual_impaired=0
+DISPOSITION:clean_effects=0
+DISPOSITION:attached_pic=0
+DISPOSITION:timed_thumbnails=0
+TAG:E=mc²
+TAG:encoder=Lavc pcm_s16le
+[/STREAM]
+[STREAM]
+index=1
+codec_name=rawvideo
+profile=unknown
+codec_type=video
+codec_time_base=1/25
+codec_tag_string=RGB[24]
+codec_tag=0x18424752
+width=320
+height=240
+coded_width=320
+coded_height=240
+has_b_frames=0
+sample_aspect_ratio=1:1
+display_aspect_ratio=4:3
+pix_fmt=rgb24
+level=-99
+color_range=unknown
+color_space=unknown
+color_transfer=unknown
+color_primaries=unknown
+chroma_location=unspecified
+field_order=unknown
+timecode=N/A
+refs=1
+id=N/A
+r_frame_rate=25/1
+avg_frame_rate=25/1
+time_base=1/51200
+start_pts=0
+start_time=0.000000
+duration_ts=N/A
+duration=N/A
+bit_rate=N/A
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=4
+nb_read_packets=4
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+DISPOSITION:comment=0
+DISPOSITION:lyrics=0
+DISPOSITION:karaoke=0
+DISPOSITION:forced=0
+DISPOSITION:hearing_impaired=0
+DISPOSITION:visual_impaired=0
+DISPOSITION:clean_effects=0
+DISPOSITION:attached_pic=0
+DISPOSITION:timed_thumbnails=0
+TAG:title=foobar
+TAG:duration_ts=field-and-tags-conflict-attempt
+TAG:encoder=Lavc rawvideo
+[/STREAM]
+[STREAM]
+index=2
+codec_name=rawvideo
+profile=unknown
+codec_type=video
+codec_time_base=1/25
+codec_tag_string=RGB[24]
+codec_tag=0x18424752
+width=100
+height=100
+coded_width=100
+coded_height=100
+has_b_frames=0
+sample_aspect_ratio=1:1
+display_aspect_ratio=1:1
+pix_fmt=rgb24
+level=-99
+color_range=unknown
+color_space=unknown
+color_transfer=unknown
+color_primaries=unknown
+chroma_location=unspecified
+field_order=unknown
+timecode=N/A
+refs=1
+id=N/A
+r_frame_rate=25/1
+avg_frame_rate=25/1
+time_base=1/51200
+start_pts=0
+start_time=0.000000
+duration_ts=N/A
+duration=N/A
+bit_rate=N/A
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=4
+nb_read_packets=4
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+DISPOSITION:comment=0
+DISPOSITION:lyrics=0
+DISPOSITION:karaoke=0
+DISPOSITION:forced=0
+DISPOSITION:hearing_impaired=0
+DISPOSITION:visual_impaired=0
+DISPOSITION:clean_effects=0
+DISPOSITION:attached_pic=0
+DISPOSITION:timed_thumbnails=0
+TAG:encoder=Lavc rawvideo
+[/STREAM]
+[FORMAT]
+filename=tests/data/ffprobe-test.nut
+nb_streams=3
+nb_programs=0
+format_name=nut
+start_time=0.000000
+duration=0.120000
+size=1053624
+bit_rate=70241600
+probe_score=100
+TAG:title=ffprobe test file
+TAG:comment='A comment with CSV, XML & JSON special chars': <tag value="x">
+TAG:comment2=I ♥ Üñîçød€
+[/FORMAT]
diff --git a/tests/ref/fate/ffprobe_flat b/tests/ref/fate/ffprobe_flat
new file mode 100644
index 0000000000..fc82ee925d
--- /dev/null
+++ b/tests/ref/fate/ffprobe_flat
@@ -0,0 +1,664 @@
+packets_and_frames.packet.0.codec_type="audio"
+packets_and_frames.packet.0.stream_index=0
+packets_and_frames.packet.0.pts=0
+packets_and_frames.packet.0.pts_time="0.000000"
+packets_and_frames.packet.0.dts=0
+packets_and_frames.packet.0.dts_time="0.000000"
+packets_and_frames.packet.0.duration=1024
+packets_and_frames.packet.0.duration_time="0.023220"
+packets_and_frames.packet.0.convergence_duration="N/A"
+packets_and_frames.packet.0.convergence_duration_time="N/A"
+packets_and_frames.packet.0.size="2048"
+packets_and_frames.packet.0.pos="647"
+packets_and_frames.packet.0.flags="K_"
+packets_and_frames.frame.0.media_type="audio"
+packets_and_frames.frame.0.stream_index=0
+packets_and_frames.frame.0.key_frame=1
+packets_and_frames.frame.0.pkt_pts=0
+packets_and_frames.frame.0.pkt_pts_time="0.000000"
+packets_and_frames.frame.0.pkt_dts=0
+packets_and_frames.frame.0.pkt_dts_time="0.000000"
+packets_and_frames.frame.0.best_effort_timestamp=0
+packets_and_frames.frame.0.best_effort_timestamp_time="0.000000"
+packets_and_frames.frame.0.pkt_duration=1024
+packets_and_frames.frame.0.pkt_duration_time="0.023220"
+packets_and_frames.frame.0.pkt_pos="647"
+packets_and_frames.frame.0.pkt_size="2048"
+packets_and_frames.frame.0.sample_fmt="s16"
+packets_and_frames.frame.0.nb_samples=1024
+packets_and_frames.frame.0.channels=1
+packets_and_frames.frame.0.channel_layout="unknown"
+packets_and_frames.packet.1.codec_type="video"
+packets_and_frames.packet.1.stream_index=1
+packets_and_frames.packet.1.pts=0
+packets_and_frames.packet.1.pts_time="0.000000"
+packets_and_frames.packet.1.dts=0
+packets_and_frames.packet.1.dts_time="0.000000"
+packets_and_frames.packet.1.duration=2048
+packets_and_frames.packet.1.duration_time="0.040000"
+packets_and_frames.packet.1.convergence_duration="N/A"
+packets_and_frames.packet.1.convergence_duration_time="N/A"
+packets_and_frames.packet.1.size="230400"
+packets_and_frames.packet.1.pos="2722"
+packets_and_frames.packet.1.flags="K_"
+packets_and_frames.frame.1.media_type="video"
+packets_and_frames.frame.1.stream_index=1
+packets_and_frames.frame.1.key_frame=1
+packets_and_frames.frame.1.pkt_pts=0
+packets_and_frames.frame.1.pkt_pts_time="0.000000"
+packets_and_frames.frame.1.pkt_dts=0
+packets_and_frames.frame.1.pkt_dts_time="0.000000"
+packets_and_frames.frame.1.best_effort_timestamp=0
+packets_and_frames.frame.1.best_effort_timestamp_time="0.000000"
+packets_and_frames.frame.1.pkt_duration=2048
+packets_and_frames.frame.1.pkt_duration_time="0.040000"
+packets_and_frames.frame.1.pkt_pos="2722"
+packets_and_frames.frame.1.pkt_size="230400"
+packets_and_frames.frame.1.width=320
+packets_and_frames.frame.1.height=240
+packets_and_frames.frame.1.pix_fmt="rgb24"
+packets_and_frames.frame.1.sample_aspect_ratio="1:1"
+packets_and_frames.frame.1.pict_type="I"
+packets_and_frames.frame.1.coded_picture_number=0
+packets_and_frames.frame.1.display_picture_number=0
+packets_and_frames.frame.1.interlaced_frame=0
+packets_and_frames.frame.1.top_field_first=0
+packets_and_frames.frame.1.repeat_pict=0
+packets_and_frames.frame.1.color_range="unknown"
+packets_and_frames.frame.1.color_space="unknown"
+packets_and_frames.frame.1.color_primaries="unknown"
+packets_and_frames.frame.1.color_transfer="unknown"
+packets_and_frames.frame.1.chroma_location="unspecified"
+packets_and_frames.packet.2.codec_type="video"
+packets_and_frames.packet.2.stream_index=2
+packets_and_frames.packet.2.pts=0
+packets_and_frames.packet.2.pts_time="0.000000"
+packets_and_frames.packet.2.dts=0
+packets_and_frames.packet.2.dts_time="0.000000"
+packets_and_frames.packet.2.duration=2048
+packets_and_frames.packet.2.duration_time="0.040000"
+packets_and_frames.packet.2.convergence_duration="N/A"
+packets_and_frames.packet.2.convergence_duration_time="N/A"
+packets_and_frames.packet.2.size="30000"
+packets_and_frames.packet.2.pos="233143"
+packets_and_frames.packet.2.flags="K_"
+packets_and_frames.frame.2.media_type="video"
+packets_and_frames.frame.2.stream_index=2
+packets_and_frames.frame.2.key_frame=1
+packets_and_frames.frame.2.pkt_pts=0
+packets_and_frames.frame.2.pkt_pts_time="0.000000"
+packets_and_frames.frame.2.pkt_dts=0
+packets_and_frames.frame.2.pkt_dts_time="0.000000"
+packets_and_frames.frame.2.best_effort_timestamp=0
+packets_and_frames.frame.2.best_effort_timestamp_time="0.000000"
+packets_and_frames.frame.2.pkt_duration=2048
+packets_and_frames.frame.2.pkt_duration_time="0.040000"
+packets_and_frames.frame.2.pkt_pos="233143"
+packets_and_frames.frame.2.pkt_size="30000"
+packets_and_frames.frame.2.width=100
+packets_and_frames.frame.2.height=100
+packets_and_frames.frame.2.pix_fmt="rgb24"
+packets_and_frames.frame.2.sample_aspect_ratio="1:1"
+packets_and_frames.frame.2.pict_type="I"
+packets_and_frames.frame.2.coded_picture_number=0
+packets_and_frames.frame.2.display_picture_number=0
+packets_and_frames.frame.2.interlaced_frame=0
+packets_and_frames.frame.2.top_field_first=0
+packets_and_frames.frame.2.repeat_pict=0
+packets_and_frames.frame.2.color_range="unknown"
+packets_and_frames.frame.2.color_space="unknown"
+packets_and_frames.frame.2.color_primaries="unknown"
+packets_and_frames.frame.2.color_transfer="unknown"
+packets_and_frames.frame.2.chroma_location="unspecified"
+packets_and_frames.packet.3.codec_type="audio"
+packets_and_frames.packet.3.stream_index=0
+packets_and_frames.packet.3.pts=1024
+packets_and_frames.packet.3.pts_time="0.023220"
+packets_and_frames.packet.3.dts=1024
+packets_and_frames.packet.3.dts_time="0.023220"
+packets_and_frames.packet.3.duration=1024
+packets_and_frames.packet.3.duration_time="0.023220"
+packets_and_frames.packet.3.convergence_duration="N/A"
+packets_and_frames.packet.3.convergence_duration_time="N/A"
+packets_and_frames.packet.3.size="2048"
+packets_and_frames.packet.3.pos="263148"
+packets_and_frames.packet.3.flags="K_"
+packets_and_frames.frame.3.media_type="audio"
+packets_and_frames.frame.3.stream_index=0
+packets_and_frames.frame.3.key_frame=1
+packets_and_frames.frame.3.pkt_pts=1024
+packets_and_frames.frame.3.pkt_pts_time="0.023220"
+packets_and_frames.frame.3.pkt_dts=1024
+packets_and_frames.frame.3.pkt_dts_time="0.023220"
+packets_and_frames.frame.3.best_effort_timestamp=1024
+packets_and_frames.frame.3.best_effort_timestamp_time="0.023220"
+packets_and_frames.frame.3.pkt_duration=1024
+packets_and_frames.frame.3.pkt_duration_time="0.023220"
+packets_and_frames.frame.3.pkt_pos="263148"
+packets_and_frames.frame.3.pkt_size="2048"
+packets_and_frames.frame.3.sample_fmt="s16"
+packets_and_frames.frame.3.nb_samples=1024
+packets_and_frames.frame.3.channels=1
+packets_and_frames.frame.3.channel_layout="unknown"
+packets_and_frames.packet.4.codec_type="video"
+packets_and_frames.packet.4.stream_index=1
+packets_and_frames.packet.4.pts=2048
+packets_and_frames.packet.4.pts_time="0.040000"
+packets_and_frames.packet.4.dts=2048
+packets_and_frames.packet.4.dts_time="0.040000"
+packets_and_frames.packet.4.duration=2048
+packets_and_frames.packet.4.duration_time="0.040000"
+packets_and_frames.packet.4.convergence_duration="N/A"
+packets_and_frames.packet.4.convergence_duration_time="N/A"
+packets_and_frames.packet.4.size="230400"
+packets_and_frames.packet.4.pos="265226"
+packets_and_frames.packet.4.flags="K_"
+packets_and_frames.frame.4.media_type="video"
+packets_and_frames.frame.4.stream_index=1
+packets_and_frames.frame.4.key_frame=1
+packets_and_frames.frame.4.pkt_pts=2048
+packets_and_frames.frame.4.pkt_pts_time="0.040000"
+packets_and_frames.frame.4.pkt_dts=2048
+packets_and_frames.frame.4.pkt_dts_time="0.040000"
+packets_and_frames.frame.4.best_effort_timestamp=2048
+packets_and_frames.frame.4.best_effort_timestamp_time="0.040000"
+packets_and_frames.frame.4.pkt_duration=2048
+packets_and_frames.frame.4.pkt_duration_time="0.040000"
+packets_and_frames.frame.4.pkt_pos="265226"
+packets_and_frames.frame.4.pkt_size="230400"
+packets_and_frames.frame.4.width=320
+packets_and_frames.frame.4.height=240
+packets_and_frames.frame.4.pix_fmt="rgb24"
+packets_and_frames.frame.4.sample_aspect_ratio="1:1"
+packets_and_frames.frame.4.pict_type="I"
+packets_and_frames.frame.4.coded_picture_number=0
+packets_and_frames.frame.4.display_picture_number=0
+packets_and_frames.frame.4.interlaced_frame=0
+packets_and_frames.frame.4.top_field_first=0
+packets_and_frames.frame.4.repeat_pict=0
+packets_and_frames.frame.4.color_range="unknown"
+packets_and_frames.frame.4.color_space="unknown"
+packets_and_frames.frame.4.color_primaries="unknown"
+packets_and_frames.frame.4.color_transfer="unknown"
+packets_and_frames.frame.4.chroma_location="unspecified"
+packets_and_frames.packet.5.codec_type="video"
+packets_and_frames.packet.5.stream_index=2
+packets_and_frames.packet.5.pts=2048
+packets_and_frames.packet.5.pts_time="0.040000"
+packets_and_frames.packet.5.dts=2048
+packets_and_frames.packet.5.dts_time="0.040000"
+packets_and_frames.packet.5.duration=2048
+packets_and_frames.packet.5.duration_time="0.040000"
+packets_and_frames.packet.5.convergence_duration="N/A"
+packets_and_frames.packet.5.convergence_duration_time="N/A"
+packets_and_frames.packet.5.size="30000"
+packets_and_frames.packet.5.pos="495650"
+packets_and_frames.packet.5.flags="K_"
+packets_and_frames.frame.5.media_type="video"
+packets_and_frames.frame.5.stream_index=2
+packets_and_frames.frame.5.key_frame=1
+packets_and_frames.frame.5.pkt_pts=2048
+packets_and_frames.frame.5.pkt_pts_time="0.040000"
+packets_and_frames.frame.5.pkt_dts=2048
+packets_and_frames.frame.5.pkt_dts_time="0.040000"
+packets_and_frames.frame.5.best_effort_timestamp=2048
+packets_and_frames.frame.5.best_effort_timestamp_time="0.040000"
+packets_and_frames.frame.5.pkt_duration=2048
+packets_and_frames.frame.5.pkt_duration_time="0.040000"
+packets_and_frames.frame.5.pkt_pos="495650"
+packets_and_frames.frame.5.pkt_size="30000"
+packets_and_frames.frame.5.width=100
+packets_and_frames.frame.5.height=100
+packets_and_frames.frame.5.pix_fmt="rgb24"
+packets_and_frames.frame.5.sample_aspect_ratio="1:1"
+packets_and_frames.frame.5.pict_type="I"
+packets_and_frames.frame.5.coded_picture_number=0
+packets_and_frames.frame.5.display_picture_number=0
+packets_and_frames.frame.5.interlaced_frame=0
+packets_and_frames.frame.5.top_field_first=0
+packets_and_frames.frame.5.repeat_pict=0
+packets_and_frames.frame.5.color_range="unknown"
+packets_and_frames.frame.5.color_space="unknown"
+packets_and_frames.frame.5.color_primaries="unknown"
+packets_and_frames.frame.5.color_transfer="unknown"
+packets_and_frames.frame.5.chroma_location="unspecified"
+packets_and_frames.packet.6.codec_type="audio"
+packets_and_frames.packet.6.stream_index=0
+packets_and_frames.packet.6.pts=2048
+packets_and_frames.packet.6.pts_time="0.046440"
+packets_and_frames.packet.6.dts=2048
+packets_and_frames.packet.6.dts_time="0.046440"
+packets_and_frames.packet.6.duration=1024
+packets_and_frames.packet.6.duration_time="0.023220"
+packets_and_frames.packet.6.convergence_duration="N/A"
+packets_and_frames.packet.6.convergence_duration_time="N/A"
+packets_and_frames.packet.6.size="2048"
+packets_and_frames.packet.6.pos="525655"
+packets_and_frames.packet.6.flags="K_"
+packets_and_frames.frame.6.media_type="audio"
+packets_and_frames.frame.6.stream_index=0
+packets_and_frames.frame.6.key_frame=1
+packets_and_frames.frame.6.pkt_pts=2048
+packets_and_frames.frame.6.pkt_pts_time="0.046440"
+packets_and_frames.frame.6.pkt_dts=2048
+packets_and_frames.frame.6.pkt_dts_time="0.046440"
+packets_and_frames.frame.6.best_effort_timestamp=2048
+packets_and_frames.frame.6.best_effort_timestamp_time="0.046440"
+packets_and_frames.frame.6.pkt_duration=1024
+packets_and_frames.frame.6.pkt_duration_time="0.023220"
+packets_and_frames.frame.6.pkt_pos="525655"
+packets_and_frames.frame.6.pkt_size="2048"
+packets_and_frames.frame.6.sample_fmt="s16"
+packets_and_frames.frame.6.nb_samples=1024
+packets_and_frames.frame.6.channels=1
+packets_and_frames.frame.6.channel_layout="unknown"
+packets_and_frames.packet.7.codec_type="audio"
+packets_and_frames.packet.7.stream_index=0
+packets_and_frames.packet.7.pts=3072
+packets_and_frames.packet.7.pts_time="0.069660"
+packets_and_frames.packet.7.dts=3072
+packets_and_frames.packet.7.dts_time="0.069660"
+packets_and_frames.packet.7.duration=1024
+packets_and_frames.packet.7.duration_time="0.023220"
+packets_and_frames.packet.7.convergence_duration="N/A"
+packets_and_frames.packet.7.convergence_duration_time="N/A"
+packets_and_frames.packet.7.size="2048"
+packets_and_frames.packet.7.pos="527726"
+packets_and_frames.packet.7.flags="K_"
+packets_and_frames.frame.7.media_type="audio"
+packets_and_frames.frame.7.stream_index=0
+packets_and_frames.frame.7.key_frame=1
+packets_and_frames.frame.7.pkt_pts=3072
+packets_and_frames.frame.7.pkt_pts_time="0.069660"
+packets_and_frames.frame.7.pkt_dts=3072
+packets_and_frames.frame.7.pkt_dts_time="0.069660"
+packets_and_frames.frame.7.best_effort_timestamp=3072
+packets_and_frames.frame.7.best_effort_timestamp_time="0.069660"
+packets_and_frames.frame.7.pkt_duration=1024
+packets_and_frames.frame.7.pkt_duration_time="0.023220"
+packets_and_frames.frame.7.pkt_pos="527726"
+packets_and_frames.frame.7.pkt_size="2048"
+packets_and_frames.frame.7.sample_fmt="s16"
+packets_and_frames.frame.7.nb_samples=1024
+packets_and_frames.frame.7.channels=1
+packets_and_frames.frame.7.channel_layout="unknown"
+packets_and_frames.packet.8.codec_type="video"
+packets_and_frames.packet.8.stream_index=1
+packets_and_frames.packet.8.pts=4096
+packets_and_frames.packet.8.pts_time="0.080000"
+packets_and_frames.packet.8.dts=4096
+packets_and_frames.packet.8.dts_time="0.080000"
+packets_and_frames.packet.8.duration=2048
+packets_and_frames.packet.8.duration_time="0.040000"
+packets_and_frames.packet.8.convergence_duration="N/A"
+packets_and_frames.packet.8.convergence_duration_time="N/A"
+packets_and_frames.packet.8.size="230400"
+packets_and_frames.packet.8.pos="529804"
+packets_and_frames.packet.8.flags="K_"
+packets_and_frames.frame.8.media_type="video"
+packets_and_frames.frame.8.stream_index=1
+packets_and_frames.frame.8.key_frame=1
+packets_and_frames.frame.8.pkt_pts=4096
+packets_and_frames.frame.8.pkt_pts_time="0.080000"
+packets_and_frames.frame.8.pkt_dts=4096
+packets_and_frames.frame.8.pkt_dts_time="0.080000"
+packets_and_frames.frame.8.best_effort_timestamp=4096
+packets_and_frames.frame.8.best_effort_timestamp_time="0.080000"
+packets_and_frames.frame.8.pkt_duration=2048
+packets_and_frames.frame.8.pkt_duration_time="0.040000"
+packets_and_frames.frame.8.pkt_pos="529804"
+packets_and_frames.frame.8.pkt_size="230400"
+packets_and_frames.frame.8.width=320
+packets_and_frames.frame.8.height=240
+packets_and_frames.frame.8.pix_fmt="rgb24"
+packets_and_frames.frame.8.sample_aspect_ratio="1:1"
+packets_and_frames.frame.8.pict_type="I"
+packets_and_frames.frame.8.coded_picture_number=0
+packets_and_frames.frame.8.display_picture_number=0
+packets_and_frames.frame.8.interlaced_frame=0
+packets_and_frames.frame.8.top_field_first=0
+packets_and_frames.frame.8.repeat_pict=0
+packets_and_frames.frame.8.color_range="unknown"
+packets_and_frames.frame.8.color_space="unknown"
+packets_and_frames.frame.8.color_primaries="unknown"
+packets_and_frames.frame.8.color_transfer="unknown"
+packets_and_frames.frame.8.chroma_location="unspecified"
+packets_and_frames.packet.9.codec_type="video"
+packets_and_frames.packet.9.stream_index=2
+packets_and_frames.packet.9.pts=4096
+packets_and_frames.packet.9.pts_time="0.080000"
+packets_and_frames.packet.9.dts=4096
+packets_and_frames.packet.9.dts_time="0.080000"
+packets_and_frames.packet.9.duration=2048
+packets_and_frames.packet.9.duration_time="0.040000"
+packets_and_frames.packet.9.convergence_duration="N/A"
+packets_and_frames.packet.9.convergence_duration_time="N/A"
+packets_and_frames.packet.9.size="30000"
+packets_and_frames.packet.9.pos="760228"
+packets_and_frames.packet.9.flags="K_"
+packets_and_frames.frame.9.media_type="video"
+packets_and_frames.frame.9.stream_index=2
+packets_and_frames.frame.9.key_frame=1
+packets_and_frames.frame.9.pkt_pts=4096
+packets_and_frames.frame.9.pkt_pts_time="0.080000"
+packets_and_frames.frame.9.pkt_dts=4096
+packets_and_frames.frame.9.pkt_dts_time="0.080000"
+packets_and_frames.frame.9.best_effort_timestamp=4096
+packets_and_frames.frame.9.best_effort_timestamp_time="0.080000"
+packets_and_frames.frame.9.pkt_duration=2048
+packets_and_frames.frame.9.pkt_duration_time="0.040000"
+packets_and_frames.frame.9.pkt_pos="760228"
+packets_and_frames.frame.9.pkt_size="30000"
+packets_and_frames.frame.9.width=100
+packets_and_frames.frame.9.height=100
+packets_and_frames.frame.9.pix_fmt="rgb24"
+packets_and_frames.frame.9.sample_aspect_ratio="1:1"
+packets_and_frames.frame.9.pict_type="I"
+packets_and_frames.frame.9.coded_picture_number=0
+packets_and_frames.frame.9.display_picture_number=0
+packets_and_frames.frame.9.interlaced_frame=0
+packets_and_frames.frame.9.top_field_first=0
+packets_and_frames.frame.9.repeat_pict=0
+packets_and_frames.frame.9.color_range="unknown"
+packets_and_frames.frame.9.color_space="unknown"
+packets_and_frames.frame.9.color_primaries="unknown"
+packets_and_frames.frame.9.color_transfer="unknown"
+packets_and_frames.frame.9.chroma_location="unspecified"
+packets_and_frames.packet.10.codec_type="audio"
+packets_and_frames.packet.10.stream_index=0
+packets_and_frames.packet.10.pts=4096
+packets_and_frames.packet.10.pts_time="0.092880"
+packets_and_frames.packet.10.dts=4096
+packets_and_frames.packet.10.dts_time="0.092880"
+packets_and_frames.packet.10.duration=1024
+packets_and_frames.packet.10.duration_time="0.023220"
+packets_and_frames.packet.10.convergence_duration="N/A"
+packets_and_frames.packet.10.convergence_duration_time="N/A"
+packets_and_frames.packet.10.size="2048"
+packets_and_frames.packet.10.pos="790233"
+packets_and_frames.packet.10.flags="K_"
+packets_and_frames.frame.10.media_type="audio"
+packets_and_frames.frame.10.stream_index=0
+packets_and_frames.frame.10.key_frame=1
+packets_and_frames.frame.10.pkt_pts=4096
+packets_and_frames.frame.10.pkt_pts_time="0.092880"
+packets_and_frames.frame.10.pkt_dts=4096
+packets_and_frames.frame.10.pkt_dts_time="0.092880"
+packets_and_frames.frame.10.best_effort_timestamp=4096
+packets_and_frames.frame.10.best_effort_timestamp_time="0.092880"
+packets_and_frames.frame.10.pkt_duration=1024
+packets_and_frames.frame.10.pkt_duration_time="0.023220"
+packets_and_frames.frame.10.pkt_pos="790233"
+packets_and_frames.frame.10.pkt_size="2048"
+packets_and_frames.frame.10.sample_fmt="s16"
+packets_and_frames.frame.10.nb_samples=1024
+packets_and_frames.frame.10.channels=1
+packets_and_frames.frame.10.channel_layout="unknown"
+packets_and_frames.packet.11.codec_type="audio"
+packets_and_frames.packet.11.stream_index=0
+packets_and_frames.packet.11.pts=5120
+packets_and_frames.packet.11.pts_time="0.116100"
+packets_and_frames.packet.11.dts=5120
+packets_and_frames.packet.11.dts_time="0.116100"
+packets_and_frames.packet.11.duration=393
+packets_and_frames.packet.11.duration_time="0.008912"
+packets_and_frames.packet.11.convergence_duration="N/A"
+packets_and_frames.packet.11.convergence_duration_time="N/A"
+packets_and_frames.packet.11.size="786"
+packets_and_frames.packet.11.pos="792304"
+packets_and_frames.packet.11.flags="K_"
+packets_and_frames.frame.11.media_type="audio"
+packets_and_frames.frame.11.stream_index=0
+packets_and_frames.frame.11.key_frame=1
+packets_and_frames.frame.11.pkt_pts=5120
+packets_and_frames.frame.11.pkt_pts_time="0.116100"
+packets_and_frames.frame.11.pkt_dts=5120
+packets_and_frames.frame.11.pkt_dts_time="0.116100"
+packets_and_frames.frame.11.best_effort_timestamp=5120
+packets_and_frames.frame.11.best_effort_timestamp_time="0.116100"
+packets_and_frames.frame.11.pkt_duration=393
+packets_and_frames.frame.11.pkt_duration_time="0.008912"
+packets_and_frames.frame.11.pkt_pos="792304"
+packets_and_frames.frame.11.pkt_size="786"
+packets_and_frames.frame.11.sample_fmt="s16"
+packets_and_frames.frame.11.nb_samples=393
+packets_and_frames.frame.11.channels=1
+packets_and_frames.frame.11.channel_layout="unknown"
+packets_and_frames.packet.12.codec_type="video"
+packets_and_frames.packet.12.stream_index=1
+packets_and_frames.packet.12.pts=6144
+packets_and_frames.packet.12.pts_time="0.120000"
+packets_and_frames.packet.12.dts=6144
+packets_and_frames.packet.12.dts_time="0.120000"
+packets_and_frames.packet.12.duration=2048
+packets_and_frames.packet.12.duration_time="0.040000"
+packets_and_frames.packet.12.convergence_duration="N/A"
+packets_and_frames.packet.12.convergence_duration_time="N/A"
+packets_and_frames.packet.12.size="230400"
+packets_and_frames.packet.12.pos="793120"
+packets_and_frames.packet.12.flags="K_"
+packets_and_frames.frame.12.media_type="video"
+packets_and_frames.frame.12.stream_index=1
+packets_and_frames.frame.12.key_frame=1
+packets_and_frames.frame.12.pkt_pts=6144
+packets_and_frames.frame.12.pkt_pts_time="0.120000"
+packets_and_frames.frame.12.pkt_dts=6144
+packets_and_frames.frame.12.pkt_dts_time="0.120000"
+packets_and_frames.frame.12.best_effort_timestamp=6144
+packets_and_frames.frame.12.best_effort_timestamp_time="0.120000"
+packets_and_frames.frame.12.pkt_duration=2048
+packets_and_frames.frame.12.pkt_duration_time="0.040000"
+packets_and_frames.frame.12.pkt_pos="793120"
+packets_and_frames.frame.12.pkt_size="230400"
+packets_and_frames.frame.12.width=320
+packets_and_frames.frame.12.height=240
+packets_and_frames.frame.12.pix_fmt="rgb24"
+packets_and_frames.frame.12.sample_aspect_ratio="1:1"
+packets_and_frames.frame.12.pict_type="I"
+packets_and_frames.frame.12.coded_picture_number=0
+packets_and_frames.frame.12.display_picture_number=0
+packets_and_frames.frame.12.interlaced_frame=0
+packets_and_frames.frame.12.top_field_first=0
+packets_and_frames.frame.12.repeat_pict=0
+packets_and_frames.frame.12.color_range="unknown"
+packets_and_frames.frame.12.color_space="unknown"
+packets_and_frames.frame.12.color_primaries="unknown"
+packets_and_frames.frame.12.color_transfer="unknown"
+packets_and_frames.frame.12.chroma_location="unspecified"
+packets_and_frames.packet.13.codec_type="video"
+packets_and_frames.packet.13.stream_index=2
+packets_and_frames.packet.13.pts=6144
+packets_and_frames.packet.13.pts_time="0.120000"
+packets_and_frames.packet.13.dts=6144
+packets_and_frames.packet.13.dts_time="0.120000"
+packets_and_frames.packet.13.duration=2048
+packets_and_frames.packet.13.duration_time="0.040000"
+packets_and_frames.packet.13.convergence_duration="N/A"
+packets_and_frames.packet.13.convergence_duration_time="N/A"
+packets_and_frames.packet.13.size="30000"
+packets_and_frames.packet.13.pos="1023544"
+packets_and_frames.packet.13.flags="K_"
+packets_and_frames.frame.13.media_type="video"
+packets_and_frames.frame.13.stream_index=2
+packets_and_frames.frame.13.key_frame=1
+packets_and_frames.frame.13.pkt_pts=6144
+packets_and_frames.frame.13.pkt_pts_time="0.120000"
+packets_and_frames.frame.13.pkt_dts=6144
+packets_and_frames.frame.13.pkt_dts_time="0.120000"
+packets_and_frames.frame.13.best_effort_timestamp=6144
+packets_and_frames.frame.13.best_effort_timestamp_time="0.120000"
+packets_and_frames.frame.13.pkt_duration=2048
+packets_and_frames.frame.13.pkt_duration_time="0.040000"
+packets_and_frames.frame.13.pkt_pos="1023544"
+packets_and_frames.frame.13.pkt_size="30000"
+packets_and_frames.frame.13.width=100
+packets_and_frames.frame.13.height=100
+packets_and_frames.frame.13.pix_fmt="rgb24"
+packets_and_frames.frame.13.sample_aspect_ratio="1:1"
+packets_and_frames.frame.13.pict_type="I"
+packets_and_frames.frame.13.coded_picture_number=0
+packets_and_frames.frame.13.display_picture_number=0
+packets_and_frames.frame.13.interlaced_frame=0
+packets_and_frames.frame.13.top_field_first=0
+packets_and_frames.frame.13.repeat_pict=0
+packets_and_frames.frame.13.color_range="unknown"
+packets_and_frames.frame.13.color_space="unknown"
+packets_and_frames.frame.13.color_primaries="unknown"
+packets_and_frames.frame.13.color_transfer="unknown"
+packets_and_frames.frame.13.chroma_location="unspecified"
+streams.stream.0.index=0
+streams.stream.0.codec_name="pcm_s16le"
+streams.stream.0.profile="unknown"
+streams.stream.0.codec_type="audio"
+streams.stream.0.codec_time_base="1/44100"
+streams.stream.0.codec_tag_string="PSD[16]"
+streams.stream.0.codec_tag="0x10445350"
+streams.stream.0.sample_fmt="s16"
+streams.stream.0.sample_rate="44100"
+streams.stream.0.channels=1
+streams.stream.0.channel_layout="unknown"
+streams.stream.0.bits_per_sample=16
+streams.stream.0.id="N/A"
+streams.stream.0.r_frame_rate="0/0"
+streams.stream.0.avg_frame_rate="0/0"
+streams.stream.0.time_base="1/44100"
+streams.stream.0.start_pts=0
+streams.stream.0.start_time="0.000000"
+streams.stream.0.duration_ts="N/A"
+streams.stream.0.duration="N/A"
+streams.stream.0.bit_rate="705600"
+streams.stream.0.max_bit_rate="N/A"
+streams.stream.0.bits_per_raw_sample="N/A"
+streams.stream.0.nb_frames="N/A"
+streams.stream.0.nb_read_frames="6"
+streams.stream.0.nb_read_packets="6"
+streams.stream.0.disposition.default=0
+streams.stream.0.disposition.dub=0
+streams.stream.0.disposition.original=0
+streams.stream.0.disposition.comment=0
+streams.stream.0.disposition.lyrics=0
+streams.stream.0.disposition.karaoke=0
+streams.stream.0.disposition.forced=0
+streams.stream.0.disposition.hearing_impaired=0
+streams.stream.0.disposition.visual_impaired=0
+streams.stream.0.disposition.clean_effects=0
+streams.stream.0.disposition.attached_pic=0
+streams.stream.0.disposition.timed_thumbnails=0
+streams.stream.0.tags.E="mc²"
+streams.stream.0.tags.encoder="Lavc pcm_s16le"
+streams.stream.1.index=1
+streams.stream.1.codec_name="rawvideo"
+streams.stream.1.profile="unknown"
+streams.stream.1.codec_type="video"
+streams.stream.1.codec_time_base="1/25"
+streams.stream.1.codec_tag_string="RGB[24]"
+streams.stream.1.codec_tag="0x18424752"
+streams.stream.1.width=320
+streams.stream.1.height=240
+streams.stream.1.coded_width=320
+streams.stream.1.coded_height=240
+streams.stream.1.has_b_frames=0
+streams.stream.1.sample_aspect_ratio="1:1"
+streams.stream.1.display_aspect_ratio="4:3"
+streams.stream.1.pix_fmt="rgb24"
+streams.stream.1.level=-99
+streams.stream.1.color_range="unknown"
+streams.stream.1.color_space="unknown"
+streams.stream.1.color_transfer="unknown"
+streams.stream.1.color_primaries="unknown"
+streams.stream.1.chroma_location="unspecified"
+streams.stream.1.field_order="unknown"
+streams.stream.1.timecode="N/A"
+streams.stream.1.refs=1
+streams.stream.1.id="N/A"
+streams.stream.1.r_frame_rate="25/1"
+streams.stream.1.avg_frame_rate="25/1"
+streams.stream.1.time_base="1/51200"
+streams.stream.1.start_pts=0
+streams.stream.1.start_time="0.000000"
+streams.stream.1.duration_ts="N/A"
+streams.stream.1.duration="N/A"
+streams.stream.1.bit_rate="N/A"
+streams.stream.1.max_bit_rate="N/A"
+streams.stream.1.bits_per_raw_sample="N/A"
+streams.stream.1.nb_frames="N/A"
+streams.stream.1.nb_read_frames="4"
+streams.stream.1.nb_read_packets="4"
+streams.stream.1.disposition.default=0
+streams.stream.1.disposition.dub=0
+streams.stream.1.disposition.original=0
+streams.stream.1.disposition.comment=0
+streams.stream.1.disposition.lyrics=0
+streams.stream.1.disposition.karaoke=0
+streams.stream.1.disposition.forced=0
+streams.stream.1.disposition.hearing_impaired=0
+streams.stream.1.disposition.visual_impaired=0
+streams.stream.1.disposition.clean_effects=0
+streams.stream.1.disposition.attached_pic=0
+streams.stream.1.disposition.timed_thumbnails=0
+streams.stream.1.tags.title="foobar"
+streams.stream.1.tags.duration_ts="field-and-tags-conflict-attempt"
+streams.stream.1.tags.encoder="Lavc rawvideo"
+streams.stream.2.index=2
+streams.stream.2.codec_name="rawvideo"
+streams.stream.2.profile="unknown"
+streams.stream.2.codec_type="video"
+streams.stream.2.codec_time_base="1/25"
+streams.stream.2.codec_tag_string="RGB[24]"
+streams.stream.2.codec_tag="0x18424752"
+streams.stream.2.width=100
+streams.stream.2.height=100
+streams.stream.2.coded_width=100
+streams.stream.2.coded_height=100
+streams.stream.2.has_b_frames=0
+streams.stream.2.sample_aspect_ratio="1:1"
+streams.stream.2.display_aspect_ratio="1:1"
+streams.stream.2.pix_fmt="rgb24"
+streams.stream.2.level=-99
+streams.stream.2.color_range="unknown"
+streams.stream.2.color_space="unknown"
+streams.stream.2.color_transfer="unknown"
+streams.stream.2.color_primaries="unknown"
+streams.stream.2.chroma_location="unspecified"
+streams.stream.2.field_order="unknown"
+streams.stream.2.timecode="N/A"
+streams.stream.2.refs=1
+streams.stream.2.id="N/A"
+streams.stream.2.r_frame_rate="25/1"
+streams.stream.2.avg_frame_rate="25/1"
+streams.stream.2.time_base="1/51200"
+streams.stream.2.start_pts=0
+streams.stream.2.start_time="0.000000"
+streams.stream.2.duration_ts="N/A"
+streams.stream.2.duration="N/A"
+streams.stream.2.bit_rate="N/A"
+streams.stream.2.max_bit_rate="N/A"
+streams.stream.2.bits_per_raw_sample="N/A"
+streams.stream.2.nb_frames="N/A"
+streams.stream.2.nb_read_frames="4"
+streams.stream.2.nb_read_packets="4"
+streams.stream.2.disposition.default=0
+streams.stream.2.disposition.dub=0
+streams.stream.2.disposition.original=0
+streams.stream.2.disposition.comment=0
+streams.stream.2.disposition.lyrics=0
+streams.stream.2.disposition.karaoke=0
+streams.stream.2.disposition.forced=0
+streams.stream.2.disposition.hearing_impaired=0
+streams.stream.2.disposition.visual_impaired=0
+streams.stream.2.disposition.clean_effects=0
+streams.stream.2.disposition.attached_pic=0
+streams.stream.2.disposition.timed_thumbnails=0
+streams.stream.2.tags.encoder="Lavc rawvideo"
+format.filename="tests/data/ffprobe-test.nut"
+format.nb_streams=3
+format.nb_programs=0
+format.format_name="nut"
+format.start_time="0.000000"
+format.duration="0.120000"
+format.size="1053624"
+format.bit_rate="70241600"
+format.probe_score=100
+format.tags.title="ffprobe test file"
+format.tags.comment="'A comment with CSV, XML & JSON special chars': <tag value=\"x\">"
+format.tags.comment2="I ♥ Üñîçød€"
diff --git a/tests/ref/fate/ffprobe_ini b/tests/ref/fate/ffprobe_ini
new file mode 100644
index 0000000000..a78690cc29
--- /dev/null
+++ b/tests/ref/fate/ffprobe_ini
@@ -0,0 +1,743 @@
+# ffprobe output
+
+[packets_and_frames.packet.0]
+codec_type=audio
+stream_index=0
+pts=0
+pts_time=0.000000
+dts=0
+dts_time=0.000000
+duration=1024
+duration_time=0.023220
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=2048
+pos=647
+flags=K_
+
+[packets_and_frames.frame.0]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=0
+pkt_pts_time=0.000000
+pkt_dts=0
+pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
+pkt_duration=1024
+pkt_duration_time=0.023220
+pkt_pos=647
+pkt_size=2048
+sample_fmt=s16
+nb_samples=1024
+channels=1
+channel_layout=unknown
+
+[packets_and_frames.packet.1]
+codec_type=video
+stream_index=1
+pts=0
+pts_time=0.000000
+dts=0
+dts_time=0.000000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=230400
+pos=2722
+flags=K_
+
+[packets_and_frames.frame.1]
+media_type=video
+stream_index=1
+key_frame=1
+pkt_pts=0
+pkt_pts_time=0.000000
+pkt_dts=0
+pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=2722
+pkt_size=230400
+width=320
+height=240
+pix_fmt=rgb24
+sample_aspect_ratio=1\:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+
+[packets_and_frames.packet.2]
+codec_type=video
+stream_index=2
+pts=0
+pts_time=0.000000
+dts=0
+dts_time=0.000000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=30000
+pos=233143
+flags=K_
+
+[packets_and_frames.frame.2]
+media_type=video
+stream_index=2
+key_frame=1
+pkt_pts=0
+pkt_pts_time=0.000000
+pkt_dts=0
+pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=233143
+pkt_size=30000
+width=100
+height=100
+pix_fmt=rgb24
+sample_aspect_ratio=1\:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+
+[packets_and_frames.packet.3]
+codec_type=audio
+stream_index=0
+pts=1024
+pts_time=0.023220
+dts=1024
+dts_time=0.023220
+duration=1024
+duration_time=0.023220
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=2048
+pos=263148
+flags=K_
+
+[packets_and_frames.frame.3]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=1024
+pkt_pts_time=0.023220
+pkt_dts=1024
+pkt_dts_time=0.023220
+best_effort_timestamp=1024
+best_effort_timestamp_time=0.023220
+pkt_duration=1024
+pkt_duration_time=0.023220
+pkt_pos=263148
+pkt_size=2048
+sample_fmt=s16
+nb_samples=1024
+channels=1
+channel_layout=unknown
+
+[packets_and_frames.packet.4]
+codec_type=video
+stream_index=1
+pts=2048
+pts_time=0.040000
+dts=2048
+dts_time=0.040000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=230400
+pos=265226
+flags=K_
+
+[packets_and_frames.frame.4]
+media_type=video
+stream_index=1
+key_frame=1
+pkt_pts=2048
+pkt_pts_time=0.040000
+pkt_dts=2048
+pkt_dts_time=0.040000
+best_effort_timestamp=2048
+best_effort_timestamp_time=0.040000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=265226
+pkt_size=230400
+width=320
+height=240
+pix_fmt=rgb24
+sample_aspect_ratio=1\:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+
+[packets_and_frames.packet.5]
+codec_type=video
+stream_index=2
+pts=2048
+pts_time=0.040000
+dts=2048
+dts_time=0.040000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=30000
+pos=495650
+flags=K_
+
+[packets_and_frames.frame.5]
+media_type=video
+stream_index=2
+key_frame=1
+pkt_pts=2048
+pkt_pts_time=0.040000
+pkt_dts=2048
+pkt_dts_time=0.040000
+best_effort_timestamp=2048
+best_effort_timestamp_time=0.040000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=495650
+pkt_size=30000
+width=100
+height=100
+pix_fmt=rgb24
+sample_aspect_ratio=1\:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+
+[packets_and_frames.packet.6]
+codec_type=audio
+stream_index=0
+pts=2048
+pts_time=0.046440
+dts=2048
+dts_time=0.046440
+duration=1024
+duration_time=0.023220
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=2048
+pos=525655
+flags=K_
+
+[packets_and_frames.frame.6]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=2048
+pkt_pts_time=0.046440
+pkt_dts=2048
+pkt_dts_time=0.046440
+best_effort_timestamp=2048
+best_effort_timestamp_time=0.046440
+pkt_duration=1024
+pkt_duration_time=0.023220
+pkt_pos=525655
+pkt_size=2048
+sample_fmt=s16
+nb_samples=1024
+channels=1
+channel_layout=unknown
+
+[packets_and_frames.packet.7]
+codec_type=audio
+stream_index=0
+pts=3072
+pts_time=0.069660
+dts=3072
+dts_time=0.069660
+duration=1024
+duration_time=0.023220
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=2048
+pos=527726
+flags=K_
+
+[packets_and_frames.frame.7]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=3072
+pkt_pts_time=0.069660
+pkt_dts=3072
+pkt_dts_time=0.069660
+best_effort_timestamp=3072
+best_effort_timestamp_time=0.069660
+pkt_duration=1024
+pkt_duration_time=0.023220
+pkt_pos=527726
+pkt_size=2048
+sample_fmt=s16
+nb_samples=1024
+channels=1
+channel_layout=unknown
+
+[packets_and_frames.packet.8]
+codec_type=video
+stream_index=1
+pts=4096
+pts_time=0.080000
+dts=4096
+dts_time=0.080000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=230400
+pos=529804
+flags=K_
+
+[packets_and_frames.frame.8]
+media_type=video
+stream_index=1
+key_frame=1
+pkt_pts=4096
+pkt_pts_time=0.080000
+pkt_dts=4096
+pkt_dts_time=0.080000
+best_effort_timestamp=4096
+best_effort_timestamp_time=0.080000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=529804
+pkt_size=230400
+width=320
+height=240
+pix_fmt=rgb24
+sample_aspect_ratio=1\:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+
+[packets_and_frames.packet.9]
+codec_type=video
+stream_index=2
+pts=4096
+pts_time=0.080000
+dts=4096
+dts_time=0.080000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=30000
+pos=760228
+flags=K_
+
+[packets_and_frames.frame.9]
+media_type=video
+stream_index=2
+key_frame=1
+pkt_pts=4096
+pkt_pts_time=0.080000
+pkt_dts=4096
+pkt_dts_time=0.080000
+best_effort_timestamp=4096
+best_effort_timestamp_time=0.080000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=760228
+pkt_size=30000
+width=100
+height=100
+pix_fmt=rgb24
+sample_aspect_ratio=1\:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+
+[packets_and_frames.packet.10]
+codec_type=audio
+stream_index=0
+pts=4096
+pts_time=0.092880
+dts=4096
+dts_time=0.092880
+duration=1024
+duration_time=0.023220
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=2048
+pos=790233
+flags=K_
+
+[packets_and_frames.frame.10]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=4096
+pkt_pts_time=0.092880
+pkt_dts=4096
+pkt_dts_time=0.092880
+best_effort_timestamp=4096
+best_effort_timestamp_time=0.092880
+pkt_duration=1024
+pkt_duration_time=0.023220
+pkt_pos=790233
+pkt_size=2048
+sample_fmt=s16
+nb_samples=1024
+channels=1
+channel_layout=unknown
+
+[packets_and_frames.packet.11]
+codec_type=audio
+stream_index=0
+pts=5120
+pts_time=0.116100
+dts=5120
+dts_time=0.116100
+duration=393
+duration_time=0.008912
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=786
+pos=792304
+flags=K_
+
+[packets_and_frames.frame.11]
+media_type=audio
+stream_index=0
+key_frame=1
+pkt_pts=5120
+pkt_pts_time=0.116100
+pkt_dts=5120
+pkt_dts_time=0.116100
+best_effort_timestamp=5120
+best_effort_timestamp_time=0.116100
+pkt_duration=393
+pkt_duration_time=0.008912
+pkt_pos=792304
+pkt_size=786
+sample_fmt=s16
+nb_samples=393
+channels=1
+channel_layout=unknown
+
+[packets_and_frames.packet.12]
+codec_type=video
+stream_index=1
+pts=6144
+pts_time=0.120000
+dts=6144
+dts_time=0.120000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=230400
+pos=793120
+flags=K_
+
+[packets_and_frames.frame.12]
+media_type=video
+stream_index=1
+key_frame=1
+pkt_pts=6144
+pkt_pts_time=0.120000
+pkt_dts=6144
+pkt_dts_time=0.120000
+best_effort_timestamp=6144
+best_effort_timestamp_time=0.120000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=793120
+pkt_size=230400
+width=320
+height=240
+pix_fmt=rgb24
+sample_aspect_ratio=1\:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+
+[packets_and_frames.packet.13]
+codec_type=video
+stream_index=2
+pts=6144
+pts_time=0.120000
+dts=6144
+dts_time=0.120000
+duration=2048
+duration_time=0.040000
+convergence_duration=N/A
+convergence_duration_time=N/A
+size=30000
+pos=1023544
+flags=K_
+
+[packets_and_frames.frame.13]
+media_type=video
+stream_index=2
+key_frame=1
+pkt_pts=6144
+pkt_pts_time=0.120000
+pkt_dts=6144
+pkt_dts_time=0.120000
+best_effort_timestamp=6144
+best_effort_timestamp_time=0.120000
+pkt_duration=2048
+pkt_duration_time=0.040000
+pkt_pos=1023544
+pkt_size=30000
+width=100
+height=100
+pix_fmt=rgb24
+sample_aspect_ratio=1\:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=unspecified
+
+[streams.stream.0]
+index=0
+codec_name=pcm_s16le
+profile=unknown
+codec_type=audio
+codec_time_base=1/44100
+codec_tag_string=PSD[16]
+codec_tag=0x10445350
+sample_fmt=s16
+sample_rate=44100
+channels=1
+channel_layout=unknown
+bits_per_sample=16
+id=N/A
+r_frame_rate=0/0
+avg_frame_rate=0/0
+time_base=1/44100
+start_pts=0
+start_time=0.000000
+duration_ts=N/A
+duration=N/A
+bit_rate=705600
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=6
+nb_read_packets=6
+
+[streams.stream.0.disposition]
+default=0
+dub=0
+original=0
+comment=0
+lyrics=0
+karaoke=0
+forced=0
+hearing_impaired=0
+visual_impaired=0
+clean_effects=0
+attached_pic=0
+timed_thumbnails=0
+
+[streams.stream.0.tags]
+E=mc²
+encoder=Lavc pcm_s16le
+
+[streams.stream.1]
+index=1
+codec_name=rawvideo
+profile=unknown
+codec_type=video
+codec_time_base=1/25
+codec_tag_string=RGB[24]
+codec_tag=0x18424752
+width=320
+height=240
+coded_width=320
+coded_height=240
+has_b_frames=0
+sample_aspect_ratio=1\:1
+display_aspect_ratio=4\:3
+pix_fmt=rgb24
+level=-99
+color_range=unknown
+color_space=unknown
+color_transfer=unknown
+color_primaries=unknown
+chroma_location=unspecified
+field_order=unknown
+timecode=N/A
+refs=1
+id=N/A
+r_frame_rate=25/1
+avg_frame_rate=25/1
+time_base=1/51200
+start_pts=0
+start_time=0.000000
+duration_ts=N/A
+duration=N/A
+bit_rate=N/A
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=4
+nb_read_packets=4
+
+[streams.stream.1.disposition]
+default=0
+dub=0
+original=0
+comment=0
+lyrics=0
+karaoke=0
+forced=0
+hearing_impaired=0
+visual_impaired=0
+clean_effects=0
+attached_pic=0
+timed_thumbnails=0
+
+[streams.stream.1.tags]
+title=foobar
+duration_ts=field-and-tags-conflict-attempt
+encoder=Lavc rawvideo
+
+[streams.stream.2]
+index=2
+codec_name=rawvideo
+profile=unknown
+codec_type=video
+codec_time_base=1/25
+codec_tag_string=RGB[24]
+codec_tag=0x18424752
+width=100
+height=100
+coded_width=100
+coded_height=100
+has_b_frames=0
+sample_aspect_ratio=1\:1
+display_aspect_ratio=1\:1
+pix_fmt=rgb24
+level=-99
+color_range=unknown
+color_space=unknown
+color_transfer=unknown
+color_primaries=unknown
+chroma_location=unspecified
+field_order=unknown
+timecode=N/A
+refs=1
+id=N/A
+r_frame_rate=25/1
+avg_frame_rate=25/1
+time_base=1/51200
+start_pts=0
+start_time=0.000000
+duration_ts=N/A
+duration=N/A
+bit_rate=N/A
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=4
+nb_read_packets=4
+
+[streams.stream.2.disposition]
+default=0
+dub=0
+original=0
+comment=0
+lyrics=0
+karaoke=0
+forced=0
+hearing_impaired=0
+visual_impaired=0
+clean_effects=0
+attached_pic=0
+timed_thumbnails=0
+
+[streams.stream.2.tags]
+encoder=Lavc rawvideo
+
+[format]
+filename=tests/data/ffprobe-test.nut
+nb_streams=3
+nb_programs=0
+format_name=nut
+start_time=0.000000
+duration=0.120000
+size=1053624
+bit_rate=70241600
+probe_score=100
+
+[format.tags]
+title=ffprobe test file
+comment='A comment with CSV, XML & JSON special chars'\: <tag value\="x">
+comment2=I ♥ Üñîçød€
diff --git a/tests/ref/fate/ffprobe_json b/tests/ref/fate/ffprobe_json
new file mode 100644
index 0000000000..4bb93d07e1
--- /dev/null
+++ b/tests/ref/fate/ffprobe_json
@@ -0,0 +1,664 @@
+{
+    "packets_and_frames": [
+        {
+            "type": "packet",
+            "codec_type": "audio",
+            "stream_index": 0,
+            "pts": 0,
+            "pts_time": "0.000000",
+            "dts": 0,
+            "dts_time": "0.000000",
+            "duration": 1024,
+            "duration_time": "0.023220",
+            "size": "2048",
+            "pos": "647",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "audio",
+            "stream_index": 0,
+            "key_frame": 1,
+            "pkt_pts": 0,
+            "pkt_pts_time": "0.000000",
+            "pkt_dts": 0,
+            "pkt_dts_time": "0.000000",
+            "best_effort_timestamp": 0,
+            "best_effort_timestamp_time": "0.000000",
+            "pkt_duration": 1024,
+            "pkt_duration_time": "0.023220",
+            "pkt_pos": "647",
+            "pkt_size": "2048",
+            "sample_fmt": "s16",
+            "nb_samples": 1024,
+            "channels": 1
+        },
+        {
+            "type": "packet",
+            "codec_type": "video",
+            "stream_index": 1,
+            "pts": 0,
+            "pts_time": "0.000000",
+            "dts": 0,
+            "dts_time": "0.000000",
+            "duration": 2048,
+            "duration_time": "0.040000",
+            "size": "230400",
+            "pos": "2722",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "video",
+            "stream_index": 1,
+            "key_frame": 1,
+            "pkt_pts": 0,
+            "pkt_pts_time": "0.000000",
+            "pkt_dts": 0,
+            "pkt_dts_time": "0.000000",
+            "best_effort_timestamp": 0,
+            "best_effort_timestamp_time": "0.000000",
+            "pkt_duration": 2048,
+            "pkt_duration_time": "0.040000",
+            "pkt_pos": "2722",
+            "pkt_size": "230400",
+            "width": 320,
+            "height": 240,
+            "pix_fmt": "rgb24",
+            "sample_aspect_ratio": "1:1",
+            "pict_type": "I",
+            "coded_picture_number": 0,
+            "display_picture_number": 0,
+            "interlaced_frame": 0,
+            "top_field_first": 0,
+            "repeat_pict": 0
+        },
+        {
+            "type": "packet",
+            "codec_type": "video",
+            "stream_index": 2,
+            "pts": 0,
+            "pts_time": "0.000000",
+            "dts": 0,
+            "dts_time": "0.000000",
+            "duration": 2048,
+            "duration_time": "0.040000",
+            "size": "30000",
+            "pos": "233143",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "video",
+            "stream_index": 2,
+            "key_frame": 1,
+            "pkt_pts": 0,
+            "pkt_pts_time": "0.000000",
+            "pkt_dts": 0,
+            "pkt_dts_time": "0.000000",
+            "best_effort_timestamp": 0,
+            "best_effort_timestamp_time": "0.000000",
+            "pkt_duration": 2048,
+            "pkt_duration_time": "0.040000",
+            "pkt_pos": "233143",
+            "pkt_size": "30000",
+            "width": 100,
+            "height": 100,
+            "pix_fmt": "rgb24",
+            "sample_aspect_ratio": "1:1",
+            "pict_type": "I",
+            "coded_picture_number": 0,
+            "display_picture_number": 0,
+            "interlaced_frame": 0,
+            "top_field_first": 0,
+            "repeat_pict": 0
+        },
+        {
+            "type": "packet",
+            "codec_type": "audio",
+            "stream_index": 0,
+            "pts": 1024,
+            "pts_time": "0.023220",
+            "dts": 1024,
+            "dts_time": "0.023220",
+            "duration": 1024,
+            "duration_time": "0.023220",
+            "size": "2048",
+            "pos": "263148",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "audio",
+            "stream_index": 0,
+            "key_frame": 1,
+            "pkt_pts": 1024,
+            "pkt_pts_time": "0.023220",
+            "pkt_dts": 1024,
+            "pkt_dts_time": "0.023220",
+            "best_effort_timestamp": 1024,
+            "best_effort_timestamp_time": "0.023220",
+            "pkt_duration": 1024,
+            "pkt_duration_time": "0.023220",
+            "pkt_pos": "263148",
+            "pkt_size": "2048",
+            "sample_fmt": "s16",
+            "nb_samples": 1024,
+            "channels": 1
+        },
+        {
+            "type": "packet",
+            "codec_type": "video",
+            "stream_index": 1,
+            "pts": 2048,
+            "pts_time": "0.040000",
+            "dts": 2048,
+            "dts_time": "0.040000",
+            "duration": 2048,
+            "duration_time": "0.040000",
+            "size": "230400",
+            "pos": "265226",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "video",
+            "stream_index": 1,
+            "key_frame": 1,
+            "pkt_pts": 2048,
+            "pkt_pts_time": "0.040000",
+            "pkt_dts": 2048,
+            "pkt_dts_time": "0.040000",
+            "best_effort_timestamp": 2048,
+            "best_effort_timestamp_time": "0.040000",
+            "pkt_duration": 2048,
+            "pkt_duration_time": "0.040000",
+            "pkt_pos": "265226",
+            "pkt_size": "230400",
+            "width": 320,
+            "height": 240,
+            "pix_fmt": "rgb24",
+            "sample_aspect_ratio": "1:1",
+            "pict_type": "I",
+            "coded_picture_number": 0,
+            "display_picture_number": 0,
+            "interlaced_frame": 0,
+            "top_field_first": 0,
+            "repeat_pict": 0
+        },
+        {
+            "type": "packet",
+            "codec_type": "video",
+            "stream_index": 2,
+            "pts": 2048,
+            "pts_time": "0.040000",
+            "dts": 2048,
+            "dts_time": "0.040000",
+            "duration": 2048,
+            "duration_time": "0.040000",
+            "size": "30000",
+            "pos": "495650",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "video",
+            "stream_index": 2,
+            "key_frame": 1,
+            "pkt_pts": 2048,
+            "pkt_pts_time": "0.040000",
+            "pkt_dts": 2048,
+            "pkt_dts_time": "0.040000",
+            "best_effort_timestamp": 2048,
+            "best_effort_timestamp_time": "0.040000",
+            "pkt_duration": 2048,
+            "pkt_duration_time": "0.040000",
+            "pkt_pos": "495650",
+            "pkt_size": "30000",
+            "width": 100,
+            "height": 100,
+            "pix_fmt": "rgb24",
+            "sample_aspect_ratio": "1:1",
+            "pict_type": "I",
+            "coded_picture_number": 0,
+            "display_picture_number": 0,
+            "interlaced_frame": 0,
+            "top_field_first": 0,
+            "repeat_pict": 0
+        },
+        {
+            "type": "packet",
+            "codec_type": "audio",
+            "stream_index": 0,
+            "pts": 2048,
+            "pts_time": "0.046440",
+            "dts": 2048,
+            "dts_time": "0.046440",
+            "duration": 1024,
+            "duration_time": "0.023220",
+            "size": "2048",
+            "pos": "525655",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "audio",
+            "stream_index": 0,
+            "key_frame": 1,
+            "pkt_pts": 2048,
+            "pkt_pts_time": "0.046440",
+            "pkt_dts": 2048,
+            "pkt_dts_time": "0.046440",
+            "best_effort_timestamp": 2048,
+            "best_effort_timestamp_time": "0.046440",
+            "pkt_duration": 1024,
+            "pkt_duration_time": "0.023220",
+            "pkt_pos": "525655",
+            "pkt_size": "2048",
+            "sample_fmt": "s16",
+            "nb_samples": 1024,
+            "channels": 1
+        },
+        {
+            "type": "packet",
+            "codec_type": "audio",
+            "stream_index": 0,
+            "pts": 3072,
+            "pts_time": "0.069660",
+            "dts": 3072,
+            "dts_time": "0.069660",
+            "duration": 1024,
+            "duration_time": "0.023220",
+            "size": "2048",
+            "pos": "527726",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "audio",
+            "stream_index": 0,
+            "key_frame": 1,
+            "pkt_pts": 3072,
+            "pkt_pts_time": "0.069660",
+            "pkt_dts": 3072,
+            "pkt_dts_time": "0.069660",
+            "best_effort_timestamp": 3072,
+            "best_effort_timestamp_time": "0.069660",
+            "pkt_duration": 1024,
+            "pkt_duration_time": "0.023220",
+            "pkt_pos": "527726",
+            "pkt_size": "2048",
+            "sample_fmt": "s16",
+            "nb_samples": 1024,
+            "channels": 1
+        },
+        {
+            "type": "packet",
+            "codec_type": "video",
+            "stream_index": 1,
+            "pts": 4096,
+            "pts_time": "0.080000",
+            "dts": 4096,
+            "dts_time": "0.080000",
+            "duration": 2048,
+            "duration_time": "0.040000",
+            "size": "230400",
+            "pos": "529804",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "video",
+            "stream_index": 1,
+            "key_frame": 1,
+            "pkt_pts": 4096,
+            "pkt_pts_time": "0.080000",
+            "pkt_dts": 4096,
+            "pkt_dts_time": "0.080000",
+            "best_effort_timestamp": 4096,
+            "best_effort_timestamp_time": "0.080000",
+            "pkt_duration": 2048,
+            "pkt_duration_time": "0.040000",
+            "pkt_pos": "529804",
+            "pkt_size": "230400",
+            "width": 320,
+            "height": 240,
+            "pix_fmt": "rgb24",
+            "sample_aspect_ratio": "1:1",
+            "pict_type": "I",
+            "coded_picture_number": 0,
+            "display_picture_number": 0,
+            "interlaced_frame": 0,
+            "top_field_first": 0,
+            "repeat_pict": 0
+        },
+        {
+            "type": "packet",
+            "codec_type": "video",
+            "stream_index": 2,
+            "pts": 4096,
+            "pts_time": "0.080000",
+            "dts": 4096,
+            "dts_time": "0.080000",
+            "duration": 2048,
+            "duration_time": "0.040000",
+            "size": "30000",
+            "pos": "760228",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "video",
+            "stream_index": 2,
+            "key_frame": 1,
+            "pkt_pts": 4096,
+            "pkt_pts_time": "0.080000",
+            "pkt_dts": 4096,
+            "pkt_dts_time": "0.080000",
+            "best_effort_timestamp": 4096,
+            "best_effort_timestamp_time": "0.080000",
+            "pkt_duration": 2048,
+            "pkt_duration_time": "0.040000",
+            "pkt_pos": "760228",
+            "pkt_size": "30000",
+            "width": 100,
+            "height": 100,
+            "pix_fmt": "rgb24",
+            "sample_aspect_ratio": "1:1",
+            "pict_type": "I",
+            "coded_picture_number": 0,
+            "display_picture_number": 0,
+            "interlaced_frame": 0,
+            "top_field_first": 0,
+            "repeat_pict": 0
+        },
+        {
+            "type": "packet",
+            "codec_type": "audio",
+            "stream_index": 0,
+            "pts": 4096,
+            "pts_time": "0.092880",
+            "dts": 4096,
+            "dts_time": "0.092880",
+            "duration": 1024,
+            "duration_time": "0.023220",
+            "size": "2048",
+            "pos": "790233",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "audio",
+            "stream_index": 0,
+            "key_frame": 1,
+            "pkt_pts": 4096,
+            "pkt_pts_time": "0.092880",
+            "pkt_dts": 4096,
+            "pkt_dts_time": "0.092880",
+            "best_effort_timestamp": 4096,
+            "best_effort_timestamp_time": "0.092880",
+            "pkt_duration": 1024,
+            "pkt_duration_time": "0.023220",
+            "pkt_pos": "790233",
+            "pkt_size": "2048",
+            "sample_fmt": "s16",
+            "nb_samples": 1024,
+            "channels": 1
+        },
+        {
+            "type": "packet",
+            "codec_type": "audio",
+            "stream_index": 0,
+            "pts": 5120,
+            "pts_time": "0.116100",
+            "dts": 5120,
+            "dts_time": "0.116100",
+            "duration": 393,
+            "duration_time": "0.008912",
+            "size": "786",
+            "pos": "792304",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "audio",
+            "stream_index": 0,
+            "key_frame": 1,
+            "pkt_pts": 5120,
+            "pkt_pts_time": "0.116100",
+            "pkt_dts": 5120,
+            "pkt_dts_time": "0.116100",
+            "best_effort_timestamp": 5120,
+            "best_effort_timestamp_time": "0.116100",
+            "pkt_duration": 393,
+            "pkt_duration_time": "0.008912",
+            "pkt_pos": "792304",
+            "pkt_size": "786",
+            "sample_fmt": "s16",
+            "nb_samples": 393,
+            "channels": 1
+        },
+        {
+            "type": "packet",
+            "codec_type": "video",
+            "stream_index": 1,
+            "pts": 6144,
+            "pts_time": "0.120000",
+            "dts": 6144,
+            "dts_time": "0.120000",
+            "duration": 2048,
+            "duration_time": "0.040000",
+            "size": "230400",
+            "pos": "793120",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "video",
+            "stream_index": 1,
+            "key_frame": 1,
+            "pkt_pts": 6144,
+            "pkt_pts_time": "0.120000",
+            "pkt_dts": 6144,
+            "pkt_dts_time": "0.120000",
+            "best_effort_timestamp": 6144,
+            "best_effort_timestamp_time": "0.120000",
+            "pkt_duration": 2048,
+            "pkt_duration_time": "0.040000",
+            "pkt_pos": "793120",
+            "pkt_size": "230400",
+            "width": 320,
+            "height": 240,
+            "pix_fmt": "rgb24",
+            "sample_aspect_ratio": "1:1",
+            "pict_type": "I",
+            "coded_picture_number": 0,
+            "display_picture_number": 0,
+            "interlaced_frame": 0,
+            "top_field_first": 0,
+            "repeat_pict": 0
+        },
+        {
+            "type": "packet",
+            "codec_type": "video",
+            "stream_index": 2,
+            "pts": 6144,
+            "pts_time": "0.120000",
+            "dts": 6144,
+            "dts_time": "0.120000",
+            "duration": 2048,
+            "duration_time": "0.040000",
+            "size": "30000",
+            "pos": "1023544",
+            "flags": "K_"
+        },
+        {
+            "type": "frame",
+            "media_type": "video",
+            "stream_index": 2,
+            "key_frame": 1,
+            "pkt_pts": 6144,
+            "pkt_pts_time": "0.120000",
+            "pkt_dts": 6144,
+            "pkt_dts_time": "0.120000",
+            "best_effort_timestamp": 6144,
+            "best_effort_timestamp_time": "0.120000",
+            "pkt_duration": 2048,
+            "pkt_duration_time": "0.040000",
+            "pkt_pos": "1023544",
+            "pkt_size": "30000",
+            "width": 100,
+            "height": 100,
+            "pix_fmt": "rgb24",
+            "sample_aspect_ratio": "1:1",
+            "pict_type": "I",
+            "coded_picture_number": 0,
+            "display_picture_number": 0,
+            "interlaced_frame": 0,
+            "top_field_first": 0,
+            "repeat_pict": 0
+        }
+    ],
+    "streams": [
+        {
+            "index": 0,
+            "codec_name": "pcm_s16le",
+            "codec_type": "audio",
+            "codec_time_base": "1/44100",
+            "codec_tag_string": "PSD[16]",
+            "codec_tag": "0x10445350",
+            "sample_fmt": "s16",
+            "sample_rate": "44100",
+            "channels": 1,
+            "bits_per_sample": 16,
+            "r_frame_rate": "0/0",
+            "avg_frame_rate": "0/0",
+            "time_base": "1/44100",
+            "start_pts": 0,
+            "start_time": "0.000000",
+            "bit_rate": "705600",
+            "nb_read_frames": "6",
+            "nb_read_packets": "6",
+            "disposition": {
+                "default": 0,
+                "dub": 0,
+                "original": 0,
+                "comment": 0,
+                "lyrics": 0,
+                "karaoke": 0,
+                "forced": 0,
+                "hearing_impaired": 0,
+                "visual_impaired": 0,
+                "clean_effects": 0,
+                "attached_pic": 0,
+                "timed_thumbnails": 0
+            },
+            "tags": {
+                "E": "mc²",
+                "encoder": "Lavc pcm_s16le"
+            }
+        },
+        {
+            "index": 1,
+            "codec_name": "rawvideo",
+            "codec_type": "video",
+            "codec_time_base": "1/25",
+            "codec_tag_string": "RGB[24]",
+            "codec_tag": "0x18424752",
+            "width": 320,
+            "height": 240,
+            "coded_width": 320,
+            "coded_height": 240,
+            "has_b_frames": 0,
+            "sample_aspect_ratio": "1:1",
+            "display_aspect_ratio": "4:3",
+            "pix_fmt": "rgb24",
+            "level": -99,
+            "refs": 1,
+            "r_frame_rate": "25/1",
+            "avg_frame_rate": "25/1",
+            "time_base": "1/51200",
+            "start_pts": 0,
+            "start_time": "0.000000",
+            "nb_read_frames": "4",
+            "nb_read_packets": "4",
+            "disposition": {
+                "default": 0,
+                "dub": 0,
+                "original": 0,
+                "comment": 0,
+                "lyrics": 0,
+                "karaoke": 0,
+                "forced": 0,
+                "hearing_impaired": 0,
+                "visual_impaired": 0,
+                "clean_effects": 0,
+                "attached_pic": 0,
+                "timed_thumbnails": 0
+            },
+            "tags": {
+                "title": "foobar",
+                "duration_ts": "field-and-tags-conflict-attempt",
+                "encoder": "Lavc rawvideo"
+            }
+        },
+        {
+            "index": 2,
+            "codec_name": "rawvideo",
+            "codec_type": "video",
+            "codec_time_base": "1/25",
+            "codec_tag_string": "RGB[24]",
+            "codec_tag": "0x18424752",
+            "width": 100,
+            "height": 100,
+            "coded_width": 100,
+            "coded_height": 100,
+            "has_b_frames": 0,
+            "sample_aspect_ratio": "1:1",
+            "display_aspect_ratio": "1:1",
+            "pix_fmt": "rgb24",
+            "level": -99,
+            "refs": 1,
+            "r_frame_rate": "25/1",
+            "avg_frame_rate": "25/1",
+            "time_base": "1/51200",
+            "start_pts": 0,
+            "start_time": "0.000000",
+            "nb_read_frames": "4",
+            "nb_read_packets": "4",
+            "disposition": {
+                "default": 0,
+                "dub": 0,
+                "original": 0,
+                "comment": 0,
+                "lyrics": 0,
+                "karaoke": 0,
+                "forced": 0,
+                "hearing_impaired": 0,
+                "visual_impaired": 0,
+                "clean_effects": 0,
+                "attached_pic": 0,
+                "timed_thumbnails": 0
+            },
+            "tags": {
+                "encoder": "Lavc rawvideo"
+            }
+        }
+    ],
+    "format": {
+        "filename": "tests/data/ffprobe-test.nut",
+        "nb_streams": 3,
+        "nb_programs": 0,
+        "format_name": "nut",
+        "start_time": "0.000000",
+        "duration": "0.120000",
+        "size": "1053624",
+        "bit_rate": "70241600",
+        "probe_score": 100,
+        "tags": {
+            "title": "ffprobe test file",
+            "comment": "'A comment with CSV, XML & JSON special chars': <tag value=\"x\">",
+            "comment2": "I ♥ Üñîçød€"
+        }
+    }
+}
diff --git a/tests/ref/fate/ffprobe_xml b/tests/ref/fate/ffprobe_xml
new file mode 100644
index 0000000000..d2c5ecdf73
--- /dev/null
+++ b/tests/ref/fate/ffprobe_xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ffprobe>
+    <packets_and_frames>
+        <packet codec_type="audio" stream_index="0" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="1024" duration_time="0.023220" size="2048" pos="647" flags="K_"/>
+        <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="647" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+        <packet codec_type="video" stream_index="1" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="230400" pos="2722" flags="K_"/>
+        <frame media_type="video" stream_index="1" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="2722" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <packet codec_type="video" stream_index="2" pts="0" pts_time="0.000000" dts="0" dts_time="0.000000" duration="2048" duration_time="0.040000" size="30000" pos="233143" flags="K_"/>
+        <frame media_type="video" stream_index="2" key_frame="1" pkt_pts="0" pkt_pts_time="0.000000" pkt_dts="0" pkt_dts_time="0.000000" best_effort_timestamp="0" best_effort_timestamp_time="0.000000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="233143" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <packet codec_type="audio" stream_index="0" pts="1024" pts_time="0.023220" dts="1024" dts_time="0.023220" duration="1024" duration_time="0.023220" size="2048" pos="263148" flags="K_"/>
+        <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="1024" pkt_pts_time="0.023220" pkt_dts="1024" pkt_dts_time="0.023220" best_effort_timestamp="1024" best_effort_timestamp_time="0.023220" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="263148" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+        <packet codec_type="video" stream_index="1" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="230400" pos="265226" flags="K_"/>
+        <frame media_type="video" stream_index="1" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" best_effort_timestamp="2048" best_effort_timestamp_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="265226" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <packet codec_type="video" stream_index="2" pts="2048" pts_time="0.040000" dts="2048" dts_time="0.040000" duration="2048" duration_time="0.040000" size="30000" pos="495650" flags="K_"/>
+        <frame media_type="video" stream_index="2" key_frame="1" pkt_pts="2048" pkt_pts_time="0.040000" pkt_dts="2048" pkt_dts_time="0.040000" best_effort_timestamp="2048" best_effort_timestamp_time="0.040000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="495650" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <packet codec_type="audio" stream_index="0" pts="2048" pts_time="0.046440" dts="2048" dts_time="0.046440" duration="1024" duration_time="0.023220" size="2048" pos="525655" flags="K_"/>
+        <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="2048" pkt_pts_time="0.046440" pkt_dts="2048" pkt_dts_time="0.046440" best_effort_timestamp="2048" best_effort_timestamp_time="0.046440" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="525655" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+        <packet codec_type="audio" stream_index="0" pts="3072" pts_time="0.069660" dts="3072" dts_time="0.069660" duration="1024" duration_time="0.023220" size="2048" pos="527726" flags="K_"/>
+        <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="3072" pkt_pts_time="0.069660" pkt_dts="3072" pkt_dts_time="0.069660" best_effort_timestamp="3072" best_effort_timestamp_time="0.069660" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="527726" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+        <packet codec_type="video" stream_index="1" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="230400" pos="529804" flags="K_"/>
+        <frame media_type="video" stream_index="1" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" best_effort_timestamp="4096" best_effort_timestamp_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="529804" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <packet codec_type="video" stream_index="2" pts="4096" pts_time="0.080000" dts="4096" dts_time="0.080000" duration="2048" duration_time="0.040000" size="30000" pos="760228" flags="K_"/>
+        <frame media_type="video" stream_index="2" key_frame="1" pkt_pts="4096" pkt_pts_time="0.080000" pkt_dts="4096" pkt_dts_time="0.080000" best_effort_timestamp="4096" best_effort_timestamp_time="0.080000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="760228" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <packet codec_type="audio" stream_index="0" pts="4096" pts_time="0.092880" dts="4096" dts_time="0.092880" duration="1024" duration_time="0.023220" size="2048" pos="790233" flags="K_"/>
+        <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="4096" pkt_pts_time="0.092880" pkt_dts="4096" pkt_dts_time="0.092880" best_effort_timestamp="4096" best_effort_timestamp_time="0.092880" pkt_duration="1024" pkt_duration_time="0.023220" pkt_pos="790233" pkt_size="2048" sample_fmt="s16" nb_samples="1024" channels="1"/>
+        <packet codec_type="audio" stream_index="0" pts="5120" pts_time="0.116100" dts="5120" dts_time="0.116100" duration="393" duration_time="0.008912" size="786" pos="792304" flags="K_"/>
+        <frame media_type="audio" stream_index="0" key_frame="1" pkt_pts="5120" pkt_pts_time="0.116100" pkt_dts="5120" pkt_dts_time="0.116100" best_effort_timestamp="5120" best_effort_timestamp_time="0.116100" pkt_duration="393" pkt_duration_time="0.008912" pkt_pos="792304" pkt_size="786" sample_fmt="s16" nb_samples="393" channels="1"/>
+        <packet codec_type="video" stream_index="1" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="230400" pos="793120" flags="K_"/>
+        <frame media_type="video" stream_index="1" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" best_effort_timestamp="6144" best_effort_timestamp_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="793120" pkt_size="230400" width="320" height="240" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+        <packet codec_type="video" stream_index="2" pts="6144" pts_time="0.120000" dts="6144" dts_time="0.120000" duration="2048" duration_time="0.040000" size="30000" pos="1023544" flags="K_"/>
+        <frame media_type="video" stream_index="2" key_frame="1" pkt_pts="6144" pkt_pts_time="0.120000" pkt_dts="6144" pkt_dts_time="0.120000" best_effort_timestamp="6144" best_effort_timestamp_time="0.120000" pkt_duration="2048" pkt_duration_time="0.040000" pkt_pos="1023544" pkt_size="30000" width="100" height="100" pix_fmt="rgb24" sample_aspect_ratio="1:1" pict_type="I" coded_picture_number="0" display_picture_number="0" interlaced_frame="0" top_field_first="0" repeat_pict="0"/>
+    </packets_and_frames>
+
+    <streams>
+        <stream index="0" codec_name="pcm_s16le" codec_type="audio" codec_time_base="1/44100" codec_tag_string="PSD[16]" codec_tag="0x10445350" sample_fmt="s16" sample_rate="44100" channels="1" bits_per_sample="16" r_frame_rate="0/0" avg_frame_rate="0/0" time_base="1/44100" start_pts="0" start_time="0.000000" bit_rate="705600" nb_read_frames="6" nb_read_packets="6">
+            <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0" timed_thumbnails="0"/>
+            <tag key="E" value="mc²"/>
+            <tag key="encoder" value="Lavc pcm_s16le"/>
+        </stream>
+        <stream index="1" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="320" height="240" coded_width="320" coded_height="240" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="4:3" pix_fmt="rgb24" level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4">
+            <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0" timed_thumbnails="0"/>
+            <tag key="title" value="foobar"/>
+            <tag key="duration_ts" value="field-and-tags-conflict-attempt"/>
+            <tag key="encoder" value="Lavc rawvideo"/>
+        </stream>
+        <stream index="2" codec_name="rawvideo" codec_type="video" codec_time_base="1/25" codec_tag_string="RGB[24]" codec_tag="0x18424752" width="100" height="100" coded_width="100" coded_height="100" has_b_frames="0" sample_aspect_ratio="1:1" display_aspect_ratio="1:1" pix_fmt="rgb24" level="-99" refs="1" r_frame_rate="25/1" avg_frame_rate="25/1" time_base="1/51200" start_pts="0" start_time="0.000000" nb_read_frames="4" nb_read_packets="4">
+            <disposition default="0" dub="0" original="0" comment="0" lyrics="0" karaoke="0" forced="0" hearing_impaired="0" visual_impaired="0" clean_effects="0" attached_pic="0" timed_thumbnails="0"/>
+            <tag key="encoder" value="Lavc rawvideo"/>
+        </stream>
+    </streams>
+
+    <format filename="tests/data/ffprobe-test.nut" nb_streams="3" nb_programs="0" format_name="nut" start_time="0.000000" duration="0.120000" size="1053624" bit_rate="70241600" probe_score="100">
+        <tag key="title" value="ffprobe test file"/>
+        <tag key="comment" value="&apos;A comment with CSV, XML &amp; JSON special chars&apos;: &lt;tag value=&quot;x&quot;&gt;"/>
+        <tag key="comment2" value="I ♥ Üñîçød€"/>
+    </format>
+</ffprobe>
diff --git a/tests/ref/fate/fic-avi b/tests/ref/fate/fic-avi
index cc4ea5dfc9..df55789d54 100644
--- a/tests/ref/fate/fic-avi
+++ b/tests/ref/fate/fic-avi
@@ -1,4 +1,8 @@
 #tb 0: 1/60
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1360x768
+#sar 0: 0/1
 0,          0,          0,        1,  1566720, 0x7dae32e0
 0,          1,          1,        1,  1566720, 0x7dae32e0
 0,          2,          2,        1,  1566720, 0x6d1a9dc8
diff --git a/tests/ref/fate/fifo b/tests/ref/fate/fifo
index 18a5691fee..2b18ed5ffc 100644
--- a/tests/ref/fate/fifo
+++ b/tests/ref/fate/fifo
@@ -24,4 +24,74 @@
 11: 11
 12: 12
 
+0: 0
+1: 1
+2: 2
+3: 3
+4: 4
+5: 5
+6: 6
+7: 7
+8: 8
+9: 9
+10: 10
+11: 11
+12: 12
+
+0: 0
+1: 1
+2: 2
+3: 3
+4: 4
+5: 5
+6: 6
+7: 7
+8: 8
+9: 9
+10: 10
+11: 11
+12: 12
+
 0 1 2 3 4 5 6 7 8 9 10 11 12
+0: 0
+1: 1
+2: 2
+3: 3
+4: 4
+5: 5
+6: 6
+7: 7
+8: 8
+9: 9
+10: 10
+11: 11
+12: 12
+
+0: 0
+1: 1
+2: 2
+3: 3
+4: 4
+5: 5
+6: 6
+7: 7
+8: 8
+9: 9
+10: 10
+11: 11
+12: 12
+13: 13
+14: 14
+15: 15
+16: 16
+17: 17
+18: 18
+19: 19
+20: 20
+21: 21
+22: 22
+23: 23
+24: 24
+25: 25
+26: 26
+27: 27
diff --git a/tests/ref/fate/fifo-muxer-tst b/tests/ref/fate/fifo-muxer-tst
new file mode 100644
index 0000000000..ca7e294860
--- /dev/null
+++ b/tests/ref/fate/fifo-muxer-tst
@@ -0,0 +1,11 @@
+flush count: 1
+pts seen nr: 15
+pts seen: 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14
+nonfail test: ok
+write header error test: ok
+recovery test: ok
+flush count: 1
+pts seen nr: 15
+pts seen: 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14
+overflow without packet dropping: ok
+overflow with packet dropping: ok
diff --git a/tests/ref/fate/film-cvid b/tests/ref/fate/film-cvid
index 12b1f1cdcb..24540bf131 100644
--- a/tests/ref/fate/film-cvid
+++ b/tests/ref/fate/film-cvid
@@ -1,111 +1,115 @@
 #tb 0: 1/30
-0,          0,          0,        1,   107520, 0xa6c9fdd2
-0,          2,          2,        1,   107520, 0x61eb28c1
-0,          4,          4,        1,   107520, 0x45e20af7
-0,          6,          6,        1,   107520, 0x366970fc
-0,          8,          8,        1,   107520, 0xa392bcb3
-0,         10,         10,        1,   107520, 0xcf7bac98
-0,         12,         12,        1,   107520, 0x222eba53
-0,         14,         14,        1,   107520, 0x74e255a1
-0,         16,         16,        1,   107520, 0xc19eec6f
-0,         18,         18,        1,   107520, 0xa3880681
-0,         20,         20,        1,   107520, 0x957878db
-0,         22,         22,        1,   107520, 0x18340692
-0,         24,         24,        1,   107520, 0x9970f24d
-0,         26,         26,        1,   107520, 0xf08618aa
-0,         28,         28,        1,   107520, 0xee7324f0
-0,         30,         30,        1,   107520, 0xe15025b3
-0,         32,         32,        1,   107520, 0x8afa312e
-0,         34,         34,        1,   107520, 0x717a7d0f
-0,         36,         36,        1,   107520, 0x355c6e23
-0,         38,         38,        1,   107520, 0x7015a50f
-0,         40,         40,        1,   107520, 0xcdfc1a16
-0,         42,         42,        1,   107520, 0x38d929e7
-0,         44,         44,        1,   107520, 0x52913423
-0,         46,         46,        1,   107520, 0xe2c91c10
-0,         48,         48,        1,   107520, 0x85516e9c
-0,         50,         50,        1,   107520, 0xd1626030
-0,         52,         52,        1,   107520, 0xea7b16de
-0,         54,         54,        1,   107520, 0xa33eaa0d
-0,         56,         56,        1,   107520, 0x8e3be6a6
-0,         58,         58,        1,   107520, 0x14147bd6
-0,         60,         60,        1,   107520, 0x07d54bec
-0,         62,         62,        1,   107520, 0xe287a0a7
-0,         64,         64,        1,   107520, 0xc023a14d
-0,         66,         66,        1,   107520, 0x2437085d
-0,         68,         68,        1,   107520, 0x63823918
-0,         70,         70,        1,   107520, 0xbc17e198
-0,         72,         72,        1,   107520, 0x9d99bc81
-0,         74,         74,        1,   107520, 0x7e4ec71e
-0,         76,         76,        1,   107520, 0x55b98376
-0,         78,         78,        1,   107520, 0x356d8e9e
-0,         80,         80,        1,   107520, 0xf77e8a61
-0,         82,         82,        1,   107520, 0x5ae7c8c7
-0,         84,         84,        1,   107520, 0x8acf9322
-0,         86,         86,        1,   107520, 0x40a9177e
-0,         88,         88,        1,   107520, 0x3e0e4d8d
-0,         90,         90,        1,   107520, 0xd268865b
-0,         92,         92,        1,   107520, 0x89a4efeb
-0,         94,         94,        1,   107520, 0x70ca2478
-0,         96,         96,        1,   107520, 0xcc9ec981
-0,         98,         98,        1,   107520, 0xf0648459
-0,        100,        100,        1,   107520, 0x7e4a4cca
-0,        102,        102,        1,   107520, 0xb315dc65
-0,        104,        104,        1,   107520, 0x2aecc7b4
-0,        106,        106,        1,   107520, 0x81742f51
-0,        108,        108,        1,   107520, 0x3a1d7571
-0,        110,        110,        1,   107520, 0x3a1d7571
-0,        112,        112,        1,   107520, 0x3a1d7571
-0,        114,        114,        1,   107520, 0x3a1d7571
-0,        116,        116,        1,   107520, 0x3a1d7571
-0,        118,        118,        1,   107520, 0x3a1d7571
-0,        120,        120,        1,   107520, 0x3a1d7571
-0,        122,        122,        1,   107520, 0xe974733e
-0,        124,        124,        1,   107520, 0x999c6fbf
-0,        126,        126,        1,   107520, 0x26b56b6e
-0,        128,        128,        1,   107520, 0xc9f9647b
-0,        130,        130,        1,   107520, 0x6d025d00
-0,        132,        132,        1,   107520, 0xf9c056c1
-0,        134,        134,        1,   107520, 0xa5cc4d0b
-0,        136,        136,        1,   107520, 0x1a4c4236
-0,        138,        138,        1,   107520, 0xa9d538b6
-0,        140,        140,        1,   107520, 0x14682d00
-0,        142,        142,        1,   107520, 0x6236204f
-0,        144,        144,        1,   107520, 0x303e14aa
-0,        146,        146,        1,   107520, 0x943b0837
-0,        148,        148,        1,   107520, 0xfce5fd07
-0,        150,        150,        1,   107520, 0xd993f193
-0,        152,        152,        1,   107520, 0x4d48e7b4
-0,        154,        154,        1,   107520, 0x61ccdf83
-0,        156,        156,        1,   107520, 0xfb4fd608
-0,        158,        158,        1,   107520, 0x5efdcdb3
-0,        160,        160,        1,   107520, 0xb03ec886
-0,        162,        162,        1,   107520, 0xf464c343
-0,        164,        164,        1,   107520, 0xf464c343
-0,        166,        166,        1,   107520, 0xf464c343
-0,        168,        168,        1,   107520, 0xf464c343
-0,        170,        170,        1,   107520, 0xf464c343
-0,        172,        172,        1,   107520, 0xf464c343
-0,        174,        174,        1,   107520, 0xf464c343
-0,        176,        176,        1,   107520, 0xf464c343
-0,        178,        178,        1,   107520, 0xf464c343
-0,        180,        180,        1,   107520, 0xf464c343
-0,        182,        182,        1,   107520, 0xf464c343
-0,        184,        184,        1,   107520, 0xf2b2c712
-0,        186,        186,        1,   107520, 0xf2b2c712
-0,        188,        188,        1,   107520, 0xf2b2c712
-0,        190,        190,        1,   107520, 0xf2b2c712
-0,        192,        192,        1,   107520, 0xb95e6bc8
-0,        194,        194,        1,   107520, 0x33feee37
-0,        196,        196,        1,   107520, 0x36ee3cd5
-0,        198,        198,        1,   107520, 0x59096471
-0,        200,        200,        1,   107520, 0x53b470c6
-0,        202,        202,        1,   107520, 0xdb7c64ff
-0,        204,        204,        1,   107520, 0xe5a1596a
-0,        206,        206,        1,   107520, 0x8c8942eb
-0,        208,        208,        1,   107520, 0x5ecc379e
-0,        210,        210,        1,   107520, 0xea09432a
-0,        212,        212,        1,   107520, 0xe01e6b73
-0,        214,        214,        1,   107520, 0x1d13bba8
-0,        216,        216,        1,   107520, 0x3a993a6c
-0,        218,        218,        1,   107520, 0x2ede041a
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x224
+#sar 0: 0/1
+0,          0,          0,        1,   215040, 0x067c5362
+0,          2,          2,        1,   215040, 0xd9eacb98
+0,          4,          4,        1,   215040, 0x3c8a4cbd
+0,          6,          6,        1,   215040, 0xbdf996e1
+0,          8,          8,        1,   215040, 0x1b7fa123
+0,         10,         10,        1,   215040, 0x834b4a8d
+0,         12,         12,        1,   215040, 0xf4b1bebe
+0,         14,         14,        1,   215040, 0x088c3802
+0,         16,         16,        1,   215040, 0xf6ddedb9
+0,         18,         18,        1,   215040, 0x2791d538
+0,         20,         20,        1,   215040, 0x81fe4688
+0,         22,         22,        1,   215040, 0xad864fbd
+0,         24,         24,        1,   215040, 0xa637a97a
+0,         26,         26,        1,   215040, 0x2287e378
+0,         28,         28,        1,   215040, 0x13a017d7
+0,         30,         30,        1,   215040, 0x89a4acee
+0,         32,         32,        1,   215040, 0x97888ffc
+0,         34,         34,        1,   215040, 0x7c2c3b58
+0,         36,         36,        1,   215040, 0x2e3ab808
+0,         38,         38,        1,   215040, 0x2d553af2
+0,         40,         40,        1,   215040, 0x929c420e
+0,         42,         42,        1,   215040, 0x4841bd6d
+0,         44,         44,        1,   215040, 0xb350fbcd
+0,         46,         46,        1,   215040, 0x0d70b918
+0,         48,         48,        1,   215040, 0xf98b0f47
+0,         50,         50,        1,   215040, 0x748b8ff2
+0,         52,         52,        1,   215040, 0x62017c38
+0,         54,         54,        1,   215040, 0x46042bb4
+0,         56,         56,        1,   215040, 0xe7a74806
+0,         58,         58,        1,   215040, 0xb4c856e6
+0,         60,         60,        1,   215040, 0xb21a28dd
+0,         62,         62,        1,   215040, 0x2a6e0834
+0,         64,         64,        1,   215040, 0x7044d6ca
+0,         66,         66,        1,   215040, 0x17780335
+0,         68,         68,        1,   215040, 0x94f51e7a
+0,         70,         70,        1,   215040, 0x5beb5f5f
+0,         72,         72,        1,   215040, 0xc7d59527
+0,         74,         74,        1,   215040, 0x40f69049
+0,         76,         76,        1,   215040, 0x1f78740e
+0,         78,         78,        1,   215040, 0x49f7265d
+0,         80,         80,        1,   215040, 0x057ac5c9
+0,         82,         82,        1,   215040, 0x649bd476
+0,         84,         84,        1,   215040, 0x1c75aa43
+0,         86,         86,        1,   215040, 0xc4bd1e29
+0,         88,         88,        1,   215040, 0x5033fa74
+0,         90,         90,        1,   215040, 0xba5c949e
+0,         92,         92,        1,   215040, 0x2fa78a0e
+0,         94,         94,        1,   215040, 0x9d363dce
+0,         96,         96,        1,   215040, 0xd1dc82b0
+0,         98,         98,        1,   215040, 0xd25be322
+0,        100,        100,        1,   215040, 0xf1374ef9
+0,        102,        102,        1,   215040, 0x33467b42
+0,        104,        104,        1,   215040, 0x7ec7dfad
+0,        106,        106,        1,   215040, 0x706ed416
+0,        108,        108,        1,   215040, 0x6576b3eb
+0,        110,        110,        1,   215040, 0x6576b3eb
+0,        112,        112,        1,   215040, 0x6576b3eb
+0,        114,        114,        1,   215040, 0x6576b3eb
+0,        116,        116,        1,   215040, 0x6576b3eb
+0,        118,        118,        1,   215040, 0x6576b3eb
+0,        120,        120,        1,   215040, 0x6576b3eb
+0,        122,        122,        1,   215040, 0x6873993d
+0,        124,        124,        1,   215040, 0x8c2a84d8
+0,        126,        126,        1,   215040, 0xdd456bd5
+0,        128,        128,        1,   215040, 0x50fa4f3d
+0,        130,        130,        1,   215040, 0x00c4369c
+0,        132,        132,        1,   215040, 0xe4c220d2
+0,        134,        134,        1,   215040, 0xe43a033b
+0,        136,        136,        1,   215040, 0x72f6e32c
+0,        138,        138,        1,   215040, 0xb738c69c
+0,        140,        140,        1,   215040, 0x56bda3fe
+0,        142,        142,        1,   215040, 0xaa2f7da3
+0,        144,        144,        1,   215040, 0xf21f5c24
+0,        146,        146,        1,   215040, 0xd33e3579
+0,        148,        148,        1,   215040, 0x6a601495
+0,        150,        150,        1,   215040, 0xdfcff1e0
+0,        152,        152,        1,   215040, 0xa774d327
+0,        154,        154,        1,   215040, 0x8e9db8c9
+0,        156,        156,        1,   215040, 0xb4fd9689
+0,        158,        158,        1,   215040, 0xa80b77ff
+0,        160,        160,        1,   215040, 0x1d9c6568
+0,        162,        162,        1,   215040, 0x388c515a
+0,        164,        164,        1,   215040, 0x388c515a
+0,        166,        166,        1,   215040, 0x388c515a
+0,        168,        168,        1,   215040, 0x388c515a
+0,        170,        170,        1,   215040, 0x388c515a
+0,        172,        172,        1,   215040, 0x388c515a
+0,        174,        174,        1,   215040, 0x388c515a
+0,        176,        176,        1,   215040, 0x388c515a
+0,        178,        178,        1,   215040, 0x388c515a
+0,        180,        180,        1,   215040, 0x388c515a
+0,        182,        182,        1,   215040, 0x388c515a
+0,        184,        184,        1,   215040, 0x3aef5fee
+0,        186,        186,        1,   215040, 0x3aef5fee
+0,        188,        188,        1,   215040, 0x3aef5fee
+0,        190,        190,        1,   215040, 0x3aef5fee
+0,        192,        192,        1,   215040, 0x7f8e4b62
+0,        194,        194,        1,   215040, 0xbf9fcae8
+0,        196,        196,        1,   215040, 0x02f9a66c
+0,        198,        198,        1,   215040, 0x00ef062f
+0,        200,        200,        1,   215040, 0xe83b132c
+0,        202,        202,        1,   215040, 0x2701d21b
+0,        204,        204,        1,   215040, 0xbea79188
+0,        206,        206,        1,   215040, 0x6f6d3109
+0,        208,        208,        1,   215040, 0x4173f1e8
+0,        210,        210,        1,   215040, 0xd7adfce1
+0,        212,        212,        1,   215040, 0xa3825ffd
+0,        214,        214,        1,   215040, 0x41e63fe4
+0,        216,        216,        1,   215040, 0xb525b9c5
+0,        218,        218,        1,   215040, 0x00000000
diff --git a/tests/ref/fate/filter-2xbr b/tests/ref/fate/filter-2xbr
new file mode 100644
index 0000000000..1114c31f06
--- /dev/null
+++ b/tests/ref/fate/filter-2xbr
@@ -0,0 +1,7 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 382x574
+#sar 0: 1/1
+0,          0,          0,        1,   877072, 0x5142c6cd
+0,          1,          1,        1,   877072, 0xa01a3f47
diff --git a/tests/ref/fate/filter-3xbr b/tests/ref/fate/filter-3xbr
new file mode 100644
index 0000000000..0ed00281e6
--- /dev/null
+++ b/tests/ref/fate/filter-3xbr
@@ -0,0 +1,7 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 573x861
+#sar 0: 1/1
+0,          0,          0,        1,  1973412, 0xd4cf257b
+0,          1,          1,        1,  1973412, 0x63fcd614
diff --git a/tests/ref/fate/filter-4xbr b/tests/ref/fate/filter-4xbr
new file mode 100644
index 0000000000..a6567373f0
--- /dev/null
+++ b/tests/ref/fate/filter-4xbr
@@ -0,0 +1,7 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 764x1148
+#sar 0: 1/1
+0,          0,          0,        1,  3508288, 0xc7b1d170
+0,          1,          1,        1,  3508288, 0x3fd0c3fb
diff --git a/tests/ref/fate/filter-acrossfade b/tests/ref/fate/filter-acrossfade
new file mode 100644
index 0000000000..0567b022e8
--- /dev/null
+++ b/tests/ref/fate/filter-acrossfade
@@ -0,0 +1,503 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,      888,     3552, 0x592ce6cc
+0,        888,        888,     1024,     4096, 0x20f6f6a9
+0,       1912,       1912,     1024,     4096, 0x3f840122
+0,       2936,       2936,     1024,     4096, 0xa905f9d1
+0,       3960,       3960,     1024,     4096, 0x1547eb1b
+0,       4984,       4984,     1024,     4096, 0xab54067e
+0,       6008,       6008,     1024,     4096, 0x06c6f5ef
+0,       7032,       7032,     1024,     4096, 0xc5c1f5bb
+0,       8056,       8056,     1024,     4096, 0x6a89fd31
+0,       9080,       9080,     1024,     4096, 0xb9d3ffa1
+0,      10104,      10104,     1024,     4096, 0x4262e2ff
+0,      11128,      11128,     1024,     4096, 0x7afffe9d
+0,      12152,      12152,     1024,     4096, 0xdc1d0274
+0,      13176,      13176,     1024,     4096, 0xad97f96f
+0,      14200,      14200,     1024,     4096, 0xb26ee1cb
+0,      15224,      15224,     1024,     4096, 0xbe90fb3d
+0,      16248,      16248,     1024,     4096, 0xf1d30268
+0,      17272,      17272,     1024,     4096, 0x697ffa2d
+0,      18296,      18296,     1024,     4096, 0x5531efc3
+0,      19320,      19320,     1024,     4096, 0xf857f707
+0,      20344,      20344,     1024,     4096, 0x63b005c8
+0,      21368,      21368,     1024,     4096, 0xec82ea67
+0,      22392,      22392,     1024,     4096, 0x9f6dfae9
+0,      23416,      23416,     1024,     4096, 0xdebbfb1d
+0,      24440,      24440,     1024,     4096, 0xd454efab
+0,      25464,      25464,     1024,     4096, 0xd093f135
+0,      26488,      26488,     1024,     4096, 0x52530de6
+0,      27512,      27512,     1024,     4096, 0x23f6f239
+0,      28536,      28536,     1024,     4096, 0xb179ee71
+0,      29560,      29560,     1024,     4096, 0xea3ff767
+0,      30584,      30584,     1024,     4096, 0xf40e0f1c
+0,      31608,      31608,     1024,     4096, 0xc960f597
+0,      32632,      32632,     1024,     4096, 0x9c1bee7d
+0,      33656,      33656,     1024,     4096, 0x20f6f6a9
+0,      34680,      34680,     1024,     4096, 0x3f840122
+0,      35704,      35704,     1024,     4096, 0xa905f9d1
+0,      36728,      36728,     1024,     4096, 0x1547eb1b
+0,      37752,      37752,     1024,     4096, 0xab54067e
+0,      38776,      38776,     1024,     4096, 0x06c6f5ef
+0,      39800,      39800,     1024,     4096, 0xc5c1f5bb
+0,      40824,      40824,     1024,     4096, 0x6a89fd31
+0,      41848,      41848,     1024,     4096, 0xb9d3ffa1
+0,      42872,      42872,     1024,     4096, 0x4262e2ff
+0,      43896,      43896,     1024,     4096, 0x78b0e7fb
+0,      44920,      44920,     1024,     4096, 0x498cf37b
+0,      45944,      45944,     1024,     4096, 0xdedfdf2b
+0,      46968,      46968,     1024,     4096, 0x430efa55
+0,      47992,      47992,     1024,     4096, 0xa487044e
+0,      49016,      49016,     1024,     4096, 0x0dfff373
+0,      50040,      50040,     1024,     4096, 0xf922f9e1
+0,      51064,      51064,     1024,     4096, 0xc577f857
+0,      52088,      52088,     1024,     4096, 0x33b5ee21
+0,      53112,      53112,     1024,     4096, 0x3e5ff725
+0,      54136,      54136,     1024,     4096, 0x909f0630
+0,      55160,      55160,     1024,     4096, 0xe087f33f
+0,      56184,      56184,     1024,     4096, 0x8162efc1
+0,      57208,      57208,     1024,     4096, 0x6c953c36
+0,      58232,      58232,     1024,     4096, 0x413d0d22
+0,      59256,      59256,     1024,     4096, 0xeed90a6c
+0,      60280,      60280,     1024,     4096, 0x15c6f533
+0,      61304,      61304,     1024,     4096, 0xb7a1eb5f
+0,      62328,      62328,     1024,     4096, 0x9a83e815
+0,      63352,      63352,     1024,     4096, 0x3370056e
+0,      64376,      64376,     1024,     4096, 0xea3ee86b
+0,      65400,      65400,     1024,     4096, 0xc05be2c5
+0,      66424,      66424,     1024,     4096, 0x4b41001a
+0,      67448,      67448,     1024,     4096, 0x8aa1fd37
+0,      68472,      68472,     1024,     4096, 0x940df3d9
+0,      69496,      69496,     1024,     4096, 0x6d8f0206
+0,      70520,      70520,     1024,     4096, 0xbfd9dea3
+0,      71544,      71544,     1024,     4096, 0x1e8309a0
+0,      72568,      72568,     1024,     4096, 0xf188fe8d
+0,      73592,      73592,     1024,     4096, 0x498ffb27
+0,      74616,      74616,     1024,     4096, 0x64fc009a
+0,      75640,      75640,     1024,     4096, 0x196df42b
+0,      76664,      76664,     1024,     4096, 0x4863297a
+0,      77688,      77688,     1024,     4096, 0xbaac05c2
+0,      78712,      78712,     1024,     4096, 0xf47e0996
+0,      79736,      79736,     1024,     4096, 0xafa4e80b
+0,      80760,      80760,     1024,     4096, 0x0240f325
+0,      81784,      81784,     1024,     4096, 0x5c1d0962
+0,      82808,      82808,     1024,     4096, 0x5bfa50e2
+0,      83832,      83832,     1024,     4096, 0x666becf9
+0,      84856,      84856,     1024,     4096, 0x96060590
+0,      85880,      85880,     1024,     4096, 0x05060204
+0,      86904,      86904,     1024,     4096, 0x05cf0c16
+0,      87928,      87928,     1024,     4096, 0xb348e18d
+0,      88952,      88952,     1024,     4096, 0xfc88d47b
+0,      89976,      89976,     1024,     4096, 0xd445b2b9
+0,      91000,      91000,     1024,     4096, 0x5d83bd97
+0,      92024,      92024,     1024,     4096, 0x43fa9721
+0,      93048,      93048,     1024,     4096, 0x25219dbd
+0,      94072,      94072,     1024,     4096, 0x1759bc3f
+0,      95096,      95096,     1024,     4096, 0x4925b38d
+0,      96120,      96120,     1024,     4096, 0xa8a7c7e7
+0,      97144,      97144,     1024,     4096, 0x9dbbfe19
+0,      98168,      98168,     1024,     4096, 0x8b2182a9
+0,      99192,      99192,     1024,     4096, 0x3601b417
+0,     100216,     100216,     1024,     4096, 0xdedaed89
+0,     101240,     101240,     1024,     4096, 0xffacd8db
+0,     102264,     102264,     1024,     4096, 0x7df9d58d
+0,     103288,     103288,     1024,     4096, 0x9cecae51
+0,     104312,     104312,     1024,     4096, 0xc163cc3f
+0,     105336,     105336,     1024,     4096, 0x3d25b799
+0,     106360,     106360,     1024,     4096, 0x815192fb
+0,     107384,     107384,     1024,     4096, 0xaeb1ad99
+0,     108408,     108408,     1024,     4096, 0x9f05ed2b
+0,     109432,     109432,     1024,     4096, 0xf3bacd99
+0,     110456,     110456,     1024,     4096, 0x56e4f28b
+0,     111480,     111480,     1024,     4096, 0xe733e81d
+0,     112504,     112504,     1024,     4096, 0x9e54195e
+0,     113528,     113528,     1024,     4096, 0x4e61fa9f
+0,     114552,     114552,     1024,     4096, 0x5425ed95
+0,     115576,     115576,     1024,     4096, 0x0ba4ed4d
+0,     116600,     116600,     1024,     4096, 0x1027fc33
+0,     117624,     117624,     1024,     4096, 0x1622c7e5
+0,     118648,     118648,     1024,     4096, 0x0471ff05
+0,     119672,     119672,     1024,     4096, 0x69a40e10
+0,     120696,     120696,     1024,     4096, 0x22e413ba
+0,     121720,     121720,     1024,     4096, 0x78fafea9
+0,     122744,     122744,     1024,     4096, 0x30f1f61d
+0,     123768,     123768,     1024,     4096, 0x5e24f561
+0,     124792,     124792,     1024,     4096, 0xab19ceb5
+0,     125816,     125816,     1024,     4096, 0x0c16c3dd
+0,     126840,     126840,     1024,     4096, 0xe13afd1b
+0,     127864,     127864,     1024,     4096, 0xb3a0f46d
+0,     128888,     128888,     1024,     4096, 0xe1f4f585
+0,     129912,     129912,     1024,     4096, 0x51cd28e2
+0,     130936,     130936,     1024,     4096, 0x34c1047e
+0,     131960,     131960,     1024,     4096, 0x5c04f360
+0,     132984,     132984,     1024,     4096, 0x17bfe876
+0,     134008,     134008,     1024,     4096, 0x4d7fea40
+0,     135032,     135032,     1024,     4096, 0x8d23f2da
+0,     136056,     136056,     1024,     4096, 0xfc140395
+0,     137080,     137080,     1024,     4096, 0x891f0008
+0,     138104,     138104,     1024,     4096, 0x28d0188a
+0,     139128,     139128,     1024,     4096, 0xbf0df63e
+0,     140152,     140152,     1024,     4096, 0x1751e8f0
+0,     141176,     141176,     1024,     4096, 0xe1beee48
+0,     142200,     142200,     1024,     4096, 0x27adfc7c
+0,     143224,     143224,     1024,     4096, 0x2314d632
+0,     144248,     144248,     1024,     4096, 0xf39aff11
+0,     145272,     145272,     1024,     4096, 0xd1fb0d61
+0,     146296,     146296,     1024,     4096, 0xf51b0083
+0,     147320,     147320,     1024,     4096, 0x9822f530
+0,     148344,     148344,     1024,     4096, 0x6dc8df31
+0,     149368,     149368,     1024,     4096, 0x6f2e0184
+0,     150392,     150392,     1024,     4096, 0x7a9afdb9
+0,     151416,     151416,     1024,     4096, 0x2f85001a
+0,     152440,     152440,     1024,     4096, 0x3a6cf053
+0,     153464,     153464,     1024,     4096, 0x030a131d
+0,     154488,     154488,     1024,     4096, 0xfc050025
+0,     155512,     155512,     1024,     4096, 0xd1a9d654
+0,     156536,     156536,     1024,     4096, 0x199ff4fe
+0,     157560,     157560,     1024,     4096, 0xa84bee80
+0,     158584,     158584,     1024,     4096, 0xda96e946
+0,     159608,     159608,     1024,     4096, 0xc026e284
+0,     160632,     160632,     1024,     4096, 0x1400185d
+0,     161656,     161656,     1024,     4096, 0xd9a2f887
+0,     162680,     162680,     1024,     4096, 0xaa8bfdfe
+0,     163704,     163704,     1024,     4096, 0x49a9e7df
+0,     164728,     164728,     1024,     4096, 0x159e0717
+0,     165752,     165752,     1024,     4096, 0x9a3eff6b
+0,     166776,     166776,     1024,     4096, 0xaa5ef364
+0,     167800,     167800,     1024,     4096, 0x32c20b32
+0,     168824,     168824,     1024,     4096, 0x67f0f55b
+0,     169848,     169848,     1024,     4096, 0x1002eff5
+0,     170872,     170872,     1024,     4096, 0x7fa0ea71
+0,     171896,     171896,     1024,     4096, 0x0c61e8ea
+0,     172920,     172920,     1024,     4096, 0xd68fe4bf
+0,     173944,     173944,     1024,     4096, 0x2aa00648
+0,     174968,     174968,     1024,     4096, 0x74ffeeae
+0,     175992,     175992,      408,     1632, 0x28353dae
+0,     176400,     176400,    88200,   352800, 0x4fb492af
+0,     264600,     264600,     1912,     7648, 0xf0c93a5a
+0,     266512,     266512,     1024,     4096, 0x35b6d595
+0,     267536,     267536,     1024,     4096, 0xc4481118
+0,     268560,     268560,     1024,     4096, 0x5dc0b58d
+0,     269584,     269584,     1024,     4096, 0x4a53a7f1
+0,     270608,     270608,     1024,     4096, 0xc38e9bec
+0,     271632,     271632,     1024,     4096, 0xc9443282
+0,     272656,     272656,     1024,     4096, 0x8018d290
+0,     273680,     273680,     1024,     4096, 0xf32d9a70
+0,     274704,     274704,     1024,     4096, 0xc63ae76a
+0,     275728,     275728,     1024,     4096, 0xcd5d1222
+0,     276752,     276752,     1024,     4096, 0x8226c5de
+0,     277776,     277776,     1024,     4096, 0xf2fb1f27
+0,     278800,     278800,     1024,     4096, 0x9fb0ba34
+0,     279824,     279824,     1024,     4096, 0xf178e325
+0,     280848,     280848,     1024,     4096, 0x9c2b2db4
+0,     281872,     281872,     1024,     4096, 0x1336d63c
+0,     282896,     282896,     1024,     4096, 0x0688ef16
+0,     283920,     283920,     1024,     4096, 0xd833f93f
+0,     284944,     284944,     1024,     4096, 0xab7fad69
+0,     285968,     285968,     1024,     4096, 0x5c3c09fb
+0,     286992,     286992,     1024,     4096, 0x41c9e4ed
+0,     288016,     288016,     1024,     4096, 0xb670a66c
+0,     289040,     289040,     1024,     4096, 0x86a0af26
+0,     290064,     290064,     1024,     4096, 0x55afec1f
+0,     291088,     291088,     1024,     4096, 0x36d51c13
+0,     292112,     292112,     1024,     4096, 0x54a15642
+0,     293136,     293136,     1024,     4096, 0x0e3edeaf
+0,     294160,     294160,     1024,     4096, 0x63d74a2d
+0,     295184,     295184,     1024,     4096, 0x2a60f9ee
+0,     296208,     296208,     1024,     4096, 0xa562fd0b
+0,     297232,     297232,     1024,     4096, 0xf382907c
+0,     298256,     298256,     1024,     4096, 0x32aafa99
+0,     299280,     299280,     1024,     4096, 0xb1da3640
+0,     300304,     300304,     1024,     4096, 0x3da8d51a
+0,     301328,     301328,     1024,     4096, 0x3afe27bc
+0,     302352,     302352,     1024,     4096, 0x05d30d0f
+0,     303376,     303376,     1024,     4096, 0x86214868
+0,     304400,     304400,     1024,     4096, 0x6283507f
+0,     305424,     305424,     1024,     4096, 0x3fb53fe7
+0,     306448,     306448,     1024,     4096, 0x5d907ea8
+0,     307472,     307472,     1024,     4096, 0xa7c389de
+0,     308496,     308496,     1024,     4096, 0xe28ba1f2
+0,     309520,     309520,     1024,     4096, 0x9932afac
+0,     310544,     310544,     1024,     4096, 0x82f1e0c2
+0,     311568,     311568,     1024,     4096, 0x5c80bb5f
+0,     312592,     312592,     1024,     4096, 0x6b73c24f
+0,     313616,     313616,     1024,     4096, 0x22b3ae86
+0,     314640,     314640,     1024,     4096, 0x9ea7b6ec
+0,     315664,     315664,     1024,     4096, 0x5c5813a2
+0,     316688,     316688,     1024,     4096, 0x0058fcee
+0,     317712,     317712,     1024,     4096, 0xc0717d58
+0,     318736,     318736,     1024,     4096, 0xc891c3df
+0,     319760,     319760,     1024,     4096, 0xe4e3ac85
+0,     320784,     320784,     1024,     4096, 0x3bdd40c6
+0,     321808,     321808,     1024,     4096, 0xd57e116c
+0,     322832,     322832,     1024,     4096, 0x494c72ab
+0,     323856,     323856,     1024,     4096, 0xcb661c13
+0,     324880,     324880,     1024,     4096, 0xb55811f9
+0,     325904,     325904,     1024,     4096, 0xbff22c30
+0,     326928,     326928,     1024,     4096, 0x9332e605
+0,     327952,     327952,     1024,     4096, 0x90bb6299
+0,     328976,     328976,     1024,     4096, 0xebdd4500
+0,     330000,     330000,     1024,     4096, 0x3d940413
+0,     331024,     331024,     1024,     4096, 0x3445f60f
+0,     332048,     332048,     1024,     4096, 0x613e016c
+0,     333072,     333072,     1024,     4096, 0xd565de1c
+0,     334096,     334096,     1024,     4096, 0xba771399
+0,     335120,     335120,     1024,     4096, 0x730b7c1e
+0,     336144,     336144,     1024,     4096, 0xc2f003a3
+0,     337168,     337168,     1024,     4096, 0x9186ff8e
+0,     338192,     338192,     1024,     4096, 0x7356b98c
+0,     339216,     339216,     1024,     4096, 0xbc02af51
+0,     340240,     340240,     1024,     4096, 0xac922f72
+0,     341264,     341264,     1024,     4096, 0x53d1060e
+0,     342288,     342288,     1024,     4096, 0xe598611b
+0,     343312,     343312,     1024,     4096, 0xd7ac93df
+0,     344336,     344336,     1024,     4096, 0x59b77247
+0,     345360,     345360,     1024,     4096, 0x206418c9
+0,     346384,     346384,     1024,     4096, 0xd360c906
+0,     347408,     347408,     1024,     4096, 0x7b92c2c0
+0,     348432,     348432,     1024,     4096, 0x021dcb06
+0,     349456,     349456,     1024,     4096, 0xc9b9a3ee
+0,     350480,     350480,     1024,     4096, 0xa6e01534
+0,     351504,     351504,     1024,     4096, 0xb0d74c80
+0,     352528,     352528,     1024,     4096, 0x63f1a8c4
+0,     353552,     353552,     1024,     4096, 0xe45a00df
+0,     354576,     354576,     1024,     4096, 0xd75032fc
+0,     355600,     355600,     1024,     4096, 0x553459cf
+0,     356624,     356624,     1024,     4096, 0x1b33a1bc
+0,     357648,     357648,     1024,     4096, 0x624d9fa5
+0,     358672,     358672,     1024,     4096, 0x69ef01c2
+0,     359696,     359696,     1024,     4096, 0x2abae91b
+0,     360720,     360720,     1024,     4096, 0x677619c8
+0,     361744,     361744,     1024,     4096, 0xdc47f672
+0,     362768,     362768,     1024,     4096, 0x3ca75283
+0,     363792,     363792,     1024,     4096, 0x8edec474
+0,     364816,     364816,     1024,     4096, 0x323d1977
+0,     365840,     365840,     1024,     4096, 0x70d8200e
+0,     366864,     366864,     1024,     4096, 0xf0fc692d
+0,     367888,     367888,     1024,     4096, 0x9d7e9451
+0,     368912,     368912,     1024,     4096, 0x56110ed6
+0,     369936,     369936,     1024,     4096, 0x8308d382
+0,     370960,     370960,     1024,     4096, 0xc12e8455
+0,     371984,     371984,     1024,     4096, 0xbab70fc3
+0,     373008,     373008,     1024,     4096, 0x3974c794
+0,     374032,     374032,     1024,     4096, 0x92268867
+0,     375056,     375056,     1024,     4096, 0x07bc5db6
+0,     376080,     376080,     1024,     4096, 0x3a69a60c
+0,     377104,     377104,     1024,     4096, 0x213b8da2
+0,     378128,     378128,     1024,     4096, 0x39ddbcb5
+0,     379152,     379152,     1024,     4096, 0x6b107851
+0,     380176,     380176,     1024,     4096, 0xaa735be6
+0,     381200,     381200,     1024,     4096, 0x3becca60
+0,     382224,     382224,     1024,     4096, 0x1383217b
+0,     383248,     383248,     1024,     4096, 0x2a93fb25
+0,     384272,     384272,     1024,     4096, 0x057e076d
+0,     385296,     385296,     1024,     4096, 0xf306219b
+0,     386320,     386320,     1024,     4096, 0x3d1f238b
+0,     387344,     387344,     1024,     4096, 0x4bdaeb13
+0,     388368,     388368,     1024,     4096, 0xbe12e587
+0,     389392,     389392,     1024,     4096, 0xf428fc99
+0,     390416,     390416,     1024,     4096, 0x25131fac
+0,     391440,     391440,     1024,     4096, 0xaaddd43a
+0,     392464,     392464,     1024,     4096, 0x082d1b1f
+0,     393488,     393488,     1024,     4096, 0xec8d6067
+0,     394512,     394512,     1024,     4096, 0x69880a4a
+0,     395536,     395536,     1024,     4096, 0x98892785
+0,     396560,     396560,     1024,     4096, 0x90d48fe5
+0,     397584,     397584,     1024,     4096, 0xf2c77de0
+0,     398608,     398608,     1024,     4096, 0xbf883f1e
+0,     399632,     399632,     1024,     4096, 0x2366eed3
+0,     400656,     400656,     1024,     4096, 0x99a61a4b
+0,     401680,     401680,     1024,     4096, 0x6496ff68
+0,     402704,     402704,     1024,     4096, 0x43d4ae23
+0,     403728,     403728,     1024,     4096, 0xfcbbdd39
+0,     404752,     404752,     1024,     4096, 0x8e8491d2
+0,     405776,     405776,     1024,     4096, 0x166bdaa7
+0,     406800,     406800,     1024,     4096, 0x5936e4de
+0,     407824,     407824,     1024,     4096, 0x5da0f74c
+0,     408848,     408848,     1024,     4096, 0x284c1816
+0,     409872,     409872,     1024,     4096, 0x9ae2fb10
+0,     410896,     410896,     1024,     4096, 0xef4f09f9
+0,     411920,     411920,     1024,     4096, 0x7d7146b2
+0,     412944,     412944,     1024,     4096, 0x3543f90c
+0,     413968,     413968,     1024,     4096, 0x9f350dea
+0,     414992,     414992,     1024,     4096, 0x89a761f8
+0,     416016,     416016,     1024,     4096, 0x7ed69125
+0,     417040,     417040,     1024,     4096, 0x75ddbd7b
+0,     418064,     418064,     1024,     4096, 0xb59ff6ba
+0,     419088,     419088,     1024,     4096, 0xbe8e35d8
+0,     420112,     420112,     1024,     4096, 0x9c3acb27
+0,     421136,     421136,     1024,     4096, 0x8bdefcc4
+0,     422160,     422160,     1024,     4096, 0xd9796b89
+0,     423184,     423184,     1024,     4096, 0x09ef18e5
+0,     424208,     424208,     1024,     4096, 0xa34eec05
+0,     425232,     425232,     1024,     4096, 0x59a4e5fe
+0,     426256,     426256,     1024,     4096, 0x7cf68f50
+0,     427280,     427280,     1024,     4096, 0x5635a169
+0,     428304,     428304,     1024,     4096, 0x9c8ba2ee
+0,     429328,     429328,     1024,     4096, 0x31bda22b
+0,     430352,     430352,     1024,     4096, 0xd33732d9
+0,     431376,     431376,     1024,     4096, 0x6041e3bf
+0,     432400,     432400,     1024,     4096, 0x7661d8e4
+0,     433424,     433424,     1024,     4096, 0x8744e56f
+0,     434448,     434448,     1024,     4096, 0x0d90222c
+0,     435472,     435472,     1024,     4096, 0xb749b6ee
+0,     436496,     436496,     1024,     4096, 0xc501e611
+0,     437520,     437520,     1024,     4096, 0x54bc9dae
+0,     438544,     438544,     1024,     4096, 0x7ebd8901
+0,     439568,     439568,     1024,     4096, 0xd48f55ab
+0,     440592,     440592,     1024,     4096, 0xf1f0979b
+0,     441616,     441616,     1024,     4096, 0x0532a2d2
+0,     442640,     442640,     1024,     4096, 0x1000e7a2
+0,     443664,     443664,     1024,     4096, 0x461d9b08
+0,     444688,     444688,     1024,     4096, 0xb119bcf8
+0,     445712,     445712,     1024,     4096, 0x03f2eb83
+0,     446736,     446736,     1024,     4096, 0xeba9f3b4
+0,     447760,     447760,     1024,     4096, 0x9a6ffc8e
+0,     448784,     448784,     1024,     4096, 0x52f54bc2
+0,     449808,     449808,     1024,     4096, 0xd17ec7d6
+0,     450832,     450832,     1024,     4096, 0x18b01fba
+0,     451856,     451856,     1024,     4096, 0x5d5af13e
+0,     452880,     452880,     1024,     4096, 0xe04a2919
+0,     453904,     453904,     1024,     4096, 0xc68c00b2
+0,     454928,     454928,     1024,     4096, 0x83a17a70
+0,     455952,     455952,     1024,     4096, 0x9de07f7f
+0,     456976,     456976,     1024,     4096, 0x2ef91463
+0,     458000,     458000,     1024,     4096, 0x9eaee29e
+0,     459024,     459024,     1024,     4096, 0xdfe3010b
+0,     460048,     460048,     1024,     4096, 0x0b0828b4
+0,     461072,     461072,     1024,     4096, 0x3ba8cee9
+0,     462096,     462096,     1024,     4096, 0x4b8bfe1f
+0,     463120,     463120,     1024,     4096, 0xc9da5ee4
+0,     464144,     464144,     1024,     4096, 0x951f70f3
+0,     465168,     465168,     1024,     4096, 0xba34e5a5
+0,     466192,     466192,     1024,     4096, 0x433716a1
+0,     467216,     467216,     1024,     4096, 0x39b24efb
+0,     468240,     468240,     1024,     4096, 0xe4a4b039
+0,     469264,     469264,     1024,     4096, 0x7906f2e6
+0,     470288,     470288,     1024,     4096, 0x40c8c726
+0,     471312,     471312,     1024,     4096, 0x6554cc46
+0,     472336,     472336,     1024,     4096, 0xf5b5d919
+0,     473360,     473360,     1024,     4096, 0x4437d4b0
+0,     474384,     474384,     1024,     4096, 0xa291f38f
+0,     475408,     475408,     1024,     4096, 0x0f81ad0b
+0,     476432,     476432,     1024,     4096, 0x4fb2c3e0
+0,     477456,     477456,     1024,     4096, 0xa2be4072
+0,     478480,     478480,     1024,     4096, 0x0674126f
+0,     479504,     479504,     1024,     4096, 0x3ab7e86c
+0,     480528,     480528,     1024,     4096, 0x736e87ae
+0,     481552,     481552,     1024,     4096, 0x1a050d8d
+0,     482576,     482576,     1024,     4096, 0xe92a59df
+0,     483600,     483600,     1024,     4096, 0xed8cb3bf
+0,     484624,     484624,     1024,     4096, 0xb5520d14
+0,     485648,     485648,     1024,     4096, 0x437d4e88
+0,     486672,     486672,     1024,     4096, 0xc67a4422
+0,     487696,     487696,     1024,     4096, 0x1f7f912d
+0,     488720,     488720,     1024,     4096, 0x67429495
+0,     489744,     489744,     1024,     4096, 0xd7ffb252
+0,     490768,     490768,     1024,     4096, 0x517ade18
+0,     491792,     491792,     1024,     4096, 0x527a31d7
+0,     492816,     492816,     1024,     4096, 0xdbc0a560
+0,     493840,     493840,     1024,     4096, 0x029048da
+0,     494864,     494864,     1024,     4096, 0x85df6c55
+0,     495888,     495888,     1024,     4096, 0xc68983a2
+0,     496912,     496912,     1024,     4096, 0x951a140b
+0,     497936,     497936,     1024,     4096, 0xc1560b9b
+0,     498960,     498960,     1024,     4096, 0xb27302c3
+0,     499984,     499984,     1024,     4096, 0x50ad5360
+0,     501008,     501008,     1024,     4096, 0x1ccbf240
+0,     502032,     502032,     1024,     4096, 0x85b2a928
+0,     503056,     503056,     1024,     4096, 0xd3f8d0b8
+0,     504080,     504080,     1024,     4096, 0xe7833196
+0,     505104,     505104,     1024,     4096, 0xd6ac1184
+0,     506128,     506128,     1024,     4096, 0x27466545
+0,     507152,     507152,     1024,     4096, 0x11119fb9
+0,     508176,     508176,     1024,     4096, 0x6b383b60
+0,     509200,     509200,     1024,     4096, 0x14f78f30
+0,     510224,     510224,     1024,     4096, 0xda4c3aca
+0,     511248,     511248,     1024,     4096, 0xdd24bf6e
+0,     512272,     512272,     1024,     4096, 0x165d0a06
+0,     513296,     513296,     1024,     4096, 0x42e5407b
+0,     514320,     514320,     1024,     4096, 0x8e5d3def
+0,     515344,     515344,     1024,     4096, 0x367c9896
+0,     516368,     516368,     1024,     4096, 0xe27455a0
+0,     517392,     517392,     1024,     4096, 0xb331cb8c
+0,     518416,     518416,     1024,     4096, 0x8cf7fa69
+0,     519440,     519440,     1024,     4096, 0x713f08f7
+0,     520464,     520464,     1024,     4096, 0x9308e552
+0,     521488,     521488,     1024,     4096, 0xb14cf9bd
+0,     522512,     522512,     1024,     4096, 0xf408d356
+0,     523536,     523536,     1024,     4096, 0xe4adda2e
+0,     524560,     524560,     1024,     4096, 0x62ca992c
+0,     525584,     525584,     1024,     4096, 0xedcb7048
+0,     526608,     526608,     1024,     4096, 0xfafd3ac3
+0,     527632,     527632,     1024,     4096, 0x4018aec3
+0,     528656,     528656,     1024,     4096, 0x7e0a0e23
+0,     529680,     529680,     1024,     4096, 0xb58992db
+0,     530704,     530704,     1024,     4096, 0xe39b3301
+0,     531728,     531728,     1024,     4096, 0x2c9a85bb
+0,     532752,     532752,     1024,     4096, 0x0aae1d68
+0,     533776,     533776,     1024,     4096, 0x36f8b423
+0,     534800,     534800,     1024,     4096, 0x44c10fec
+0,     535824,     535824,     1024,     4096, 0xc0b5e715
+0,     536848,     536848,     1024,     4096, 0xa09ff7ec
+0,     537872,     537872,     1024,     4096, 0x53d42436
+0,     538896,     538896,     1024,     4096, 0x1d630a0a
+0,     539920,     539920,     1024,     4096, 0x71a1f91c
+0,     540944,     540944,     1024,     4096, 0x65331b70
+0,     541968,     541968,     1024,     4096, 0x8cd33518
+0,     542992,     542992,     1024,     4096, 0x067de410
+0,     544016,     544016,     1024,     4096, 0x8d4a4618
+0,     545040,     545040,     1024,     4096, 0x3632d993
+0,     546064,     546064,     1024,     4096, 0x6259b193
+0,     547088,     547088,     1024,     4096, 0xbdb7bcbf
+0,     548112,     548112,     1024,     4096, 0x8625af9b
+0,     549136,     549136,     1024,     4096, 0x4d3e7b07
+0,     550160,     550160,     1024,     4096, 0x76d6cf52
+0,     551184,     551184,     1024,     4096, 0x54f07eb8
+0,     552208,     552208,     1024,     4096, 0x93cb65a1
+0,     553232,     553232,     1024,     4096, 0x5f9b3df7
+0,     554256,     554256,     1024,     4096, 0x5fa8e05e
+0,     555280,     555280,     1024,     4096, 0xeaebf0ab
+0,     556304,     556304,     1024,     4096, 0xd317ed69
+0,     557328,     557328,     1024,     4096, 0x66fd1a32
+0,     558352,     558352,     1024,     4096, 0x9608a614
+0,     559376,     559376,     1024,     4096, 0xa1c661c6
+0,     560400,     560400,     1024,     4096, 0xaa21d89e
+0,     561424,     561424,     1024,     4096, 0xca8820c0
+0,     562448,     562448,     1024,     4096, 0x25c4a979
+0,     563472,     563472,     1024,     4096, 0xfc1ae730
+0,     564496,     564496,     1024,     4096, 0xd681f6cb
+0,     565520,     565520,     1024,     4096, 0x4f8497ca
+0,     566544,     566544,     1024,     4096, 0xc1a033d6
+0,     567568,     567568,     1024,     4096, 0xada5f805
+0,     568592,     568592,     1024,     4096, 0x75ee4703
+0,     569616,     569616,     1024,     4096, 0x722521ff
+0,     570640,     570640,     1024,     4096, 0xd26c503f
+0,     571664,     571664,     1024,     4096, 0x9f62715e
+0,     572688,     572688,     1024,     4096, 0x32ff9d07
+0,     573712,     573712,     1024,     4096, 0x333646aa
+0,     574736,     574736,     1024,     4096, 0x9c590e90
+0,     575760,     575760,     1024,     4096, 0x5ed119e1
+0,     576784,     576784,     1024,     4096, 0xde2a8d38
+0,     577808,     577808,     1024,     4096, 0xdad9fca7
+0,     578832,     578832,     1024,     4096, 0x51f5e65d
+0,     579856,     579856,     1024,     4096, 0x61910e01
+0,     580880,     580880,     1024,     4096, 0xb4d10d4f
+0,     581904,     581904,     1024,     4096, 0x892a5875
+0,     582928,     582928,     1024,     4096, 0x64c828e5
+0,     583952,     583952,     1024,     4096, 0x6db0da46
+0,     584976,     584976,     1024,     4096, 0x9c10dc3f
+0,     586000,     586000,     1024,     4096, 0x96c02ce6
+0,     587024,     587024,     1024,     4096, 0x3bec5ed2
+0,     588048,     588048,     1024,     4096, 0x40f263f0
+0,     589072,     589072,     1024,     4096, 0x7750137d
+0,     590096,     590096,     1024,     4096, 0x044dc19b
+0,     591120,     591120,     1024,     4096, 0x58a8dda4
+0,     592144,     592144,     1024,     4096, 0xe02ec285
+0,     593168,     593168,     1024,     4096, 0x722a2f2a
+0,     594192,     594192,     1024,     4096, 0xca5e4d42
+0,     595216,     595216,      134,      536, 0x45fd3d3d
diff --git a/tests/ref/fate/filter-adelay b/tests/ref/fate/filter-adelay
new file mode 100644
index 0000000000..e3ff763602
--- /dev/null
+++ b/tests/ref/fate/filter-adelay
@@ -0,0 +1,266 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x9d7bf760
+0,       1024,       1024,     1024,     4096, 0xdf42c46b
+0,       2048,       2048,     1024,     4096, 0x2214fd20
+0,       3072,       3072,     1024,     4096, 0x811bfcf0
+0,       4096,       4096,     1024,     4096, 0x671ee9af
+0,       5120,       5120,     1024,     4096, 0x5e60fb90
+0,       6144,       6144,     1024,     4096, 0x857bfa49
+0,       7168,       7168,     1024,     4096, 0x100e028d
+0,       8192,       8192,     1024,     4096, 0xa351ed1e
+0,       9216,       9216,     1024,     4096, 0xa79cf58c
+0,      10240,      10240,     1024,     4096, 0x63c1f86a
+0,      11264,      11264,     1024,     4096, 0x325a055f
+0,      12288,      12288,     1024,     4096, 0x8457f621
+0,      13312,      13312,     1024,     4096, 0xa158f43e
+0,      14336,      14336,     1024,     4096, 0x69b6ef60
+0,      15360,      15360,     1024,     4096, 0x3bf1fb3c
+0,      16384,      16384,     1024,     4096, 0x942f00cc
+0,      17408,      17408,     1024,     4096, 0x16c2f0ab
+0,      18432,      18432,     1024,     4096, 0x6b9ff3b6
+0,      19456,      19456,     1024,     4096, 0x1616f3e7
+0,      20480,      20480,     1024,     4096, 0x1ec90735
+0,      21504,      21504,     1024,     4096, 0x3fd3f547
+0,      22528,      22528,     1024,     4096, 0x062af68d
+0,      23552,      23552,     1024,     4096, 0x9179ee59
+0,      24576,      24576,     1024,     4096, 0x172d01cb
+0,      25600,      25600,     1024,     4096, 0xd9bff94c
+0,      26624,      26624,     1024,     4096, 0x3db6f86e
+0,      27648,      27648,     1024,     4096, 0x617deb86
+0,      28672,      28672,     1024,     4096, 0x0e06fab5
+0,      29696,      29696,     1024,     4096, 0xf660fc98
+0,      30720,      30720,     1024,     4096, 0x31a30186
+0,      31744,      31744,     1024,     4096, 0x5312f599
+0,      32768,      32768,     1024,     4096, 0x0592f01a
+0,      33792,      33792,     1024,     4096, 0x6e770039
+0,      34816,      34816,     1024,     4096, 0x2214fd20
+0,      35840,      35840,     1024,     4096, 0x811bfcf0
+0,      36864,      36864,     1024,     4096, 0x671ee9af
+0,      37888,      37888,     1024,     4096, 0x5e60fb90
+0,      38912,      38912,     1024,     4096, 0x857bfa49
+0,      39936,      39936,     1024,     4096, 0x100e028d
+0,      40960,      40960,     1024,     4096, 0xa351ed1e
+0,      41984,      41984,     1024,     4096, 0xa79cf58c
+0,      43008,      43008,     1024,     4096, 0x63c1f86a
+0,      44032,      44032,     1024,     4096, 0x96ebeed8
+0,      45056,      45056,     1024,     4096, 0xdfa8cc5b
+0,      46080,      46080,     1024,     4096, 0x50660dab
+0,      47104,      47104,     1024,     4096, 0x58f1f11c
+0,      48128,      48128,     1024,     4096, 0x5a7ceb7d
+0,      49152,      49152,     1024,     4096, 0x27fe02db
+0,      50176,      50176,     1024,     4096, 0x6d83f8ed
+0,      51200,      51200,     1024,     4096, 0x3cc1f309
+0,      52224,      52224,     1024,     4096, 0x2bc5fea4
+0,      53248,      53248,     1024,     4096, 0x0a4ef2ca
+0,      54272,      54272,     1024,     4096, 0xd580ed7f
+0,      55296,      55296,     1024,     4096, 0x67c210b1
+0,      56320,      56320,     1024,     4096, 0x45d1e8a4
+0,      57344,      57344,     1024,     4096, 0xd9a820a6
+0,      58368,      58368,     1024,     4096, 0x27f405da
+0,      59392,      59392,     1024,     4096, 0x863a1b65
+0,      60416,      60416,     1024,     4096, 0xf7770535
+0,      61440,      61440,     1024,     4096, 0x069cee20
+0,      62464,      62464,     1024,     4096, 0x6564f3bb
+0,      63488,      63488,     1024,     4096, 0xd953e9dd
+0,      64512,      64512,     1024,     4096, 0x6a23f296
+0,      65536,      65536,     1024,     4096, 0x8051f8ed
+0,      66560,      66560,     1024,     4096, 0x226af522
+0,      67584,      67584,     1024,     4096, 0x526bf350
+0,      68608,      68608,     1024,     4096, 0x5b8cf6e5
+0,      69632,      69632,     1024,     4096, 0xd155fd1e
+0,      70656,      70656,     1024,     4096, 0x0fd2ed83
+0,      71680,      71680,     1024,     4096, 0x0df7f50c
+0,      72704,      72704,     1024,     4096, 0x96aa05fc
+0,      73728,      73728,     1024,     4096, 0x763ef755
+0,      74752,      74752,     1024,     4096, 0x2022fbb2
+0,      75776,      75776,     1024,     4096, 0x33f0fd78
+0,      76800,      76800,     1024,     4096, 0x91701636
+0,      77824,      77824,     1024,     4096, 0xb43106b7
+0,      78848,      78848,     1024,     4096, 0x3ec312cd
+0,      79872,      79872,     1024,     4096, 0x2f97ecb0
+0,      80896,      80896,     1024,     4096, 0x2872f93d
+0,      81920,      81920,     1024,     4096, 0xb9fc0bb6
+0,      82944,      82944,     1024,     4096, 0xdba41993
+0,      83968,      83968,     1024,     4096, 0x13f42827
+0,      84992,      84992,     1024,     4096, 0x19c0fc72
+0,      86016,      86016,     1024,     4096, 0x0c760320
+0,      87040,      87040,     1024,     4096, 0x739803c6
+0,      88064,      88064,     1024,     4096, 0x8101e8e8
+0,      89088,      89088,     1024,     4096, 0x521ef51e
+0,      90112,      90112,     1024,     4096, 0x5796c18e
+0,      91136,      91136,     1024,     4096, 0xae15b81c
+0,      92160,      92160,     1024,     4096, 0xa14da4f6
+0,      93184,      93184,     1024,     4096, 0x0df4a2c5
+0,      94208,      94208,     1024,     4096, 0xe6d6b7db
+0,      95232,      95232,     1024,     4096, 0x4d83aec1
+0,      96256,      96256,     1024,     4096, 0x1c8dbffb
+0,      97280,      97280,     1024,     4096, 0xff62da79
+0,      98304,      98304,     1024,     4096, 0xf41ca375
+0,      99328,      99328,     1024,     4096, 0x32a6dc8a
+0,     100352,     100352,     1024,     4096, 0x2d77bdfb
+0,     101376,     101376,     1024,     4096, 0x91fec716
+0,     102400,     102400,     1024,     4096, 0x599bdb67
+0,     103424,     103424,     1024,     4096, 0xeeb0c5e7
+0,     104448,     104448,     1024,     4096, 0x1c79cae2
+0,     105472,     105472,     1024,     4096, 0x3b5cbe5e
+0,     106496,     106496,     1024,     4096, 0x1168a813
+0,     107520,     107520,     1024,     4096, 0x13e8b7f7
+0,     108544,     108544,     1024,     4096, 0x9cebb015
+0,     109568,     109568,     1024,     4096, 0xcaf5da54
+0,     110592,     110592,     1024,     4096, 0xc555e4d2
+0,     111616,     111616,     1024,     4096, 0x67c2de67
+0,     112640,     112640,     1024,     4096, 0xd642f9ea
+0,     113664,     113664,     1024,     4096, 0xa4320e7f
+0,     114688,     114688,     1024,     4096, 0xf1b0f37b
+0,     115712,     115712,     1024,     4096, 0x4e33f2f2
+0,     116736,     116736,     1024,     4096, 0x17d5edfd
+0,     117760,     117760,     1024,     4096, 0x9849e28e
+0,     118784,     118784,     1024,     4096, 0x1af9f3a2
+0,     119808,     119808,     1024,     4096, 0x37730916
+0,     120832,     120832,     1024,     4096, 0xe737fd3c
+0,     121856,     121856,     1024,     4096, 0x8a590d88
+0,     122880,     122880,     1024,     4096, 0xe6d401e5
+0,     123904,     123904,     1024,     4096, 0xc8e2ec17
+0,     124928,     124928,     1024,     4096, 0x4019cf7d
+0,     125952,     125952,     1024,     4096, 0x1f93dd9c
+0,     126976,     126976,     1024,     4096, 0x2f9ff3f1
+0,     128000,     128000,     1024,     4096, 0x1530e129
+0,     129024,     129024,     1024,     4096, 0xcd79066a
+0,     130048,     130048,     1024,     4096, 0x6b9cfba7
+0,     131072,     131072,     1024,     4096, 0x43170f0b
+0,     132096,     132096,     1024,     4096, 0xf183fecf
+0,     133120,     133120,     1024,     4096, 0xf1e3f9ca
+0,     134144,     134144,     1024,     4096, 0x7d3fef31
+0,     135168,     135168,     1024,     4096, 0x4ea3f680
+0,     136192,     136192,     1024,     4096, 0x80e8ff67
+0,     137216,     137216,     1024,     4096, 0xba58f3b6
+0,     138240,     138240,     1024,     4096, 0xf18d0602
+0,     139264,     139264,     1024,     4096, 0xf7b2f8dc
+0,     140288,     140288,     1024,     4096, 0x7ab5fdab
+0,     141312,     141312,     1024,     4096, 0x0b04ef46
+0,     142336,     142336,     1024,     4096, 0xb23bf464
+0,     143360,     143360,     1024,     4096, 0xba08edbe
+0,     144384,     144384,     1024,     4096, 0x7e1af596
+0,     145408,     145408,     1024,     4096, 0xf23ff63c
+0,     146432,     146432,     1024,     4096, 0x7a55efca
+0,     147456,     147456,     1024,     4096, 0x427515b0
+0,     148480,     148480,     1024,     4096, 0x653de823
+0,     149504,     149504,     1024,     4096, 0x93a70335
+0,     150528,     150528,     1024,     4096, 0x60eaed4c
+0,     151552,     151552,     1024,     4096, 0xe9f30f02
+0,     152576,     152576,     1024,     4096, 0x1e9ff096
+0,     153600,     153600,     1024,     4096, 0xcc7d00a0
+0,     154624,     154624,     1024,     4096, 0xf994fa05
+0,     155648,     155648,     1024,     4096, 0x4577fc19
+0,     156672,     156672,     1024,     4096, 0xa312ed95
+0,     157696,     157696,     1024,     4096, 0xdbe0df34
+0,     158720,     158720,     1024,     4096, 0x4080f766
+0,     159744,     159744,     1024,     4096, 0x2751ec59
+0,     160768,     160768,     1024,     4096, 0xcd14f684
+0,     161792,     161792,     1024,     4096, 0xd42aeee0
+0,     162816,     162816,     1024,     4096, 0x21d3f3f6
+0,     163840,     163840,     1024,     4096, 0x32a6f850
+0,     164864,     164864,     1024,     4096, 0xc4c01074
+0,     165888,     165888,     1024,     4096, 0x27fef9bd
+0,     166912,     166912,     1024,     4096, 0x8f29fc33
+0,     167936,     167936,     1024,     4096, 0x0e360352
+0,     168960,     168960,     1024,     4096, 0xc992ecaf
+0,     169984,     169984,     1024,     4096, 0x05eff12c
+0,     171008,     171008,     1024,     4096, 0x700def8b
+0,     172032,     172032,     1024,     4096, 0xfbc3ef85
+0,     173056,     173056,     1024,     4096, 0x6908f67c
+0,     174080,     174080,     1024,     4096, 0xf6c305d6
+0,     175104,     175104,     1024,     4096, 0xbfdfe430
+0,     176128,     176128,     1024,     4096, 0xef7902ec
+0,     177152,     177152,     1024,     4096, 0x62adeb88
+0,     178176,     178176,     1024,     4096, 0x1fea0128
+0,     179200,     179200,     1024,     4096, 0xfeb0f860
+0,     180224,     180224,     1024,     4096, 0xa9e7e63b
+0,     181248,     181248,     1024,     4096, 0x62ffe62f
+0,     182272,     182272,     1024,     4096, 0xf743fbed
+0,     183296,     183296,     1024,     4096, 0x3953f3f3
+0,     184320,     184320,     1024,     4096, 0x17a6fc18
+0,     185344,     185344,     1024,     4096, 0x1531dc96
+0,     186368,     186368,     1024,     4096, 0x2560950a
+0,     187392,     187392,     1024,     4096, 0xa87704d0
+0,     188416,     188416,     1024,     4096, 0x89540f7f
+0,     189440,     189440,     1024,     4096, 0xa22ff108
+0,     190464,     190464,     1024,     4096, 0xd3e5fed6
+0,     191488,     191488,     1024,     4096, 0x10eafd99
+0,     192512,     192512,     1024,     4096, 0x7f6beeea
+0,     193536,     193536,     1024,     4096, 0x4fe101f7
+0,     194560,     194560,     1024,     4096, 0x5f94ef98
+0,     195584,     195584,     1024,     4096, 0x9cb4f877
+0,     196608,     196608,     1024,     4096, 0x03960aac
+0,     197632,     197632,     1024,     4096, 0x3fec0ab8
+0,     198656,     198656,     1024,     4096, 0x8225f4e7
+0,     199680,     199680,     1024,     4096, 0x5ffafce4
+0,     200704,     200704,     1024,     4096, 0x15caf2c1
+0,     201728,     201728,     1024,     4096, 0x7d54144f
+0,     202752,     202752,     1024,     4096, 0xa2139295
+0,     203776,     203776,     1024,     4096, 0xf2c1ec16
+0,     204800,     204800,     1024,     4096, 0x0c61e166
+0,     205824,     205824,     1024,     4096, 0xfdb7ffce
+0,     206848,     206848,     1024,     4096, 0xb783f1ff
+0,     207872,     207872,     1024,     4096, 0x8c07f340
+0,     208896,     208896,     1024,     4096, 0x8a03e20d
+0,     209920,     209920,     1024,     4096, 0x389eeeec
+0,     210944,     210944,     1024,     4096, 0x2f6b014c
+0,     211968,     211968,     1024,     4096, 0xfeb0f860
+0,     212992,     212992,     1024,     4096, 0xa9e7e63b
+0,     214016,     214016,     1024,     4096, 0x62ffe62f
+0,     215040,     215040,     1024,     4096, 0xf743fbed
+0,     216064,     216064,     1024,     4096, 0x3953f3f3
+0,     217088,     217088,     1024,     4096, 0x17a6fc18
+0,     218112,     218112,     1024,     4096, 0x1531dc96
+0,     219136,     219136,     1024,     4096, 0x2560950a
+0,     220160,     220160,     1024,     4096, 0xa87704d0
+0,     221184,     221184,     1024,     4096, 0x89540f7f
+0,     222208,     222208,     1024,     4096, 0xa22ff108
+0,     223232,     223232,     1024,     4096, 0xd3e5fed6
+0,     224256,     224256,     1024,     4096, 0x10eafd99
+0,     225280,     225280,     1024,     4096, 0x7f6beeea
+0,     226304,     226304,     1024,     4096, 0x4fe101f7
+0,     227328,     227328,     1024,     4096, 0x5f94ef98
+0,     228352,     228352,     1024,     4096, 0x9cb4f877
+0,     229376,     229376,     1024,     4096, 0x03960aac
+0,     230400,     230400,     1024,     4096, 0x3fec0ab8
+0,     231424,     231424,     1024,     4096, 0x8225f4e7
+0,     232448,     232448,     1024,     4096, 0x5ffafce4
+0,     233472,     233472,     1024,     4096, 0x15caf2c1
+0,     234496,     234496,     1024,     4096, 0x7d54144f
+0,     235520,     235520,     1024,     4096, 0xa2139295
+0,     236544,     236544,     1024,     4096, 0xf2c1ec16
+0,     237568,     237568,     1024,     4096, 0x0c61e166
+0,     238592,     238592,     1024,     4096, 0xfdb7ffce
+0,     239616,     239616,     1024,     4096, 0xb783f1ff
+0,     240640,     240640,     1024,     4096, 0x8c07f340
+0,     241664,     241664,     1024,     4096, 0x8a03e20d
+0,     242688,     242688,     1024,     4096, 0x389eeeec
+0,     243712,     243712,     1024,     4096, 0x2f6b014c
+0,     244736,     244736,     1024,     4096, 0xfeb0f860
+0,     245760,     245760,     1024,     4096, 0xa9e7e63b
+0,     246784,     246784,     1024,     4096, 0x62ffe62f
+0,     247808,     247808,     1024,     4096, 0xf743fbed
+0,     248832,     248832,     1024,     4096, 0x3953f3f3
+0,     249856,     249856,     1024,     4096, 0x17a6fc18
+0,     250880,     250880,     1024,     4096, 0x1531dc96
+0,     251904,     251904,     1024,     4096, 0x2560950a
+0,     252928,     252928,     1024,     4096, 0xa87704d0
+0,     253952,     253952,     1024,     4096, 0x89540f7f
+0,     254976,     254976,     1024,     4096, 0xa22ff108
+0,     256000,     256000,     1024,     4096, 0xd3e5fed6
+0,     257024,     257024,     1024,     4096, 0x10eafd99
+0,     258048,     258048,     1024,     4096, 0x7f6beeea
+0,     259072,     259072,     1024,     4096, 0x4fe101f7
+0,     260096,     260096,     1024,     4096, 0x5f94ef98
+0,     261120,     261120,     1024,     4096, 0x9cb4f877
+0,     262144,     262144,     1024,     4096, 0x03960aac
+0,     263168,     263168,     1024,     4096, 0x3fec0ab8
+0,     264192,     264192,      408,     1632, 0x23933452
+0,     264600,     264600,     1852,     7408, 0x77074171
diff --git a/tests/ref/fate/filter-aecho b/tests/ref/fate/filter-aecho
new file mode 100644
index 0000000000..2c88c37fbc
--- /dev/null
+++ b/tests/ref/fate/filter-aecho
@@ -0,0 +1,266 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x3019edd5
+0,       1024,       1024,     1024,     4096, 0x2df2fe2f
+0,       2048,       2048,     1024,     4096, 0xde37ff37
+0,       3072,       3072,     1024,     4096, 0xe933f6a5
+0,       4096,       4096,     1024,     4096, 0xd5acf1f3
+0,       5120,       5120,     1024,     4096, 0x82a6f903
+0,       6144,       6144,     1024,     4096, 0x1792f923
+0,       7168,       7168,     1024,     4096, 0x01500504
+0,       8192,       8192,     1024,     4096, 0xe306efc3
+0,       9216,       9216,     1024,     4096, 0x3abcecaf
+0,      10240,      10240,     1024,     4096, 0x5059f861
+0,      11264,      11264,     1024,     4096, 0xc172ff61
+0,      12288,      12288,     1024,     4096, 0x857dfc1b
+0,      13312,      13312,     1024,     4096, 0x5899ed35
+0,      14336,      14336,     1024,     4096, 0x9ae9f709
+0,      15360,      15360,     1024,     4096, 0xd5620036
+0,      16384,      16384,     1024,     4096, 0xc5ba0940
+0,      17408,      17408,     1024,     4096, 0x0c3af2ff
+0,      18432,      18432,     1024,     4096, 0x5eddf1b1
+0,      19456,      19456,     1024,     4096, 0x9ec8f84d
+0,      20480,      20480,     1024,     4096, 0x8a4f00ee
+0,      21504,      21504,     1024,     4096, 0x0cd3fbe7
+0,      22528,      22528,     1024,     4096, 0x2ce0f199
+0,      23552,      23552,     1024,     4096, 0x9086e9bb
+0,      24576,      24576,     1024,     4096, 0x0d6efb0b
+0,      25600,      25600,     1024,     4096, 0x9dee020c
+0,      26624,      26624,     1024,     4096, 0x96aff453
+0,      27648,      27648,     1024,     4096, 0xe1e9f177
+0,      28672,      28672,     1024,     4096, 0x13b8f893
+0,      29696,      29696,     1024,     4096, 0x4f3a01c8
+0,      30720,      30720,     1024,     4096, 0xa498fa25
+0,      31744,      31744,     1024,     4096, 0x0cd3f293
+0,      32768,      32768,     1024,     4096, 0x6de2eb8f
+0,      33792,      33792,     1024,     4096, 0x0a0d01dc
+0,      34816,      34816,     1024,     4096, 0xde37ff37
+0,      35840,      35840,     1024,     4096, 0xe933f6a5
+0,      36864,      36864,     1024,     4096, 0xd5acf1f3
+0,      37888,      37888,     1024,     4096, 0x82a6f903
+0,      38912,      38912,     1024,     4096, 0x1792f923
+0,      39936,      39936,     1024,     4096, 0x01500504
+0,      40960,      40960,     1024,     4096, 0xe306efc3
+0,      41984,      41984,     1024,     4096, 0x3abcecaf
+0,      43008,      43008,     1024,     4096, 0x5059f861
+0,      44032,      44032,     1024,     4096, 0x9128d187
+0,      45056,      45056,     1024,     4096, 0x61471c76
+0,      46080,      46080,     1024,     4096, 0xd4057d4f
+0,      47104,      47104,     1024,     4096, 0xe5fed87f
+0,      48128,      48128,     1024,     4096, 0x5b0d059a
+0,      49152,      49152,     1024,     4096, 0xfba4c1ad
+0,      50176,      50176,     1024,     4096, 0x4c83f489
+0,      51200,      51200,     1024,     4096, 0xdbebe473
+0,      52224,      52224,     1024,     4096, 0x86efd467
+0,      53248,      53248,     1024,     4096, 0x1919f2f1
+0,      54272,      54272,     1024,     4096, 0x745b12d8
+0,      55296,      55296,     1024,     4096, 0xca86ff49
+0,      56320,      56320,     1024,     4096, 0x2914fdf3
+0,      57344,      57344,     1024,     4096, 0xf949f24f
+0,      58368,      58368,     1024,     4096, 0x6436f791
+0,      59392,      59392,     1024,     4096, 0x693eebaf
+0,      60416,      60416,     1024,     4096, 0xd0740bf0
+0,      61440,      61440,     1024,     4096, 0x08690478
+0,      62464,      62464,     1024,     4096, 0x23a8e259
+0,      63488,      63488,     1024,     4096, 0xba2d0152
+0,      64512,      64512,     1024,     4096, 0xbe65117e
+0,      65536,      65536,     1024,     4096, 0xc8710c58
+0,      66560,      66560,     1024,     4096, 0x25db1d60
+0,      67584,      67584,     1024,     4096, 0xf960016e
+0,      68608,      68608,     1024,     4096, 0x4db0f367
+0,      69632,      69632,     1024,     4096, 0x4154e591
+0,      70656,      70656,     1024,     4096, 0x8c95162c
+0,      71680,      71680,     1024,     4096, 0x2502ffa9
+0,      72704,      72704,     1024,     4096, 0xe66a0792
+0,      73728,      73728,     1024,     4096, 0x6837e7fd
+0,      74752,      74752,     1024,     4096, 0x9613e317
+0,      75776,      75776,     1024,     4096, 0xe087ea1f
+0,      76800,      76800,     1024,     4096, 0x625ae70f
+0,      77824,      77824,     1024,     4096, 0xd9b7fbbb
+0,      78848,      78848,     1024,     4096, 0xb2f800e0
+0,      79872,      79872,     1024,     4096, 0x4fb0134c
+0,      80896,      80896,     1024,     4096, 0xf90ed3ab
+0,      81920,      81920,     1024,     4096, 0x8c13fd53
+0,      82944,      82944,     1024,     4096, 0xdf26d95b
+0,      83968,      83968,     1024,     4096, 0x45e707fc
+0,      84992,      84992,     1024,     4096, 0xd576fe23
+0,      86016,      86016,     1024,     4096, 0x168405f4
+0,      87040,      87040,     1024,     4096, 0x4a78db97
+0,      88064,      88064,     1024,     4096, 0x6d87f713
+0,      89088,      89088,     1024,     4096, 0x30750408
+0,      90112,      90112,     1024,     4096, 0xb011e7b5
+0,      91136,      91136,     1024,     4096, 0x19090af4
+0,      92160,      92160,     1024,     4096, 0x3122f1a7
+0,      93184,      93184,     1024,     4096, 0x3dc4b113
+0,      94208,      94208,     1024,     4096, 0x23c4ec7b
+0,      95232,      95232,     1024,     4096, 0x3340159a
+0,      96256,      96256,     1024,     4096, 0xb06cda91
+0,      97280,      97280,     1024,     4096, 0xd17445ec
+0,      98304,      98304,     1024,     4096, 0xd222d3a1
+0,      99328,      99328,     1024,     4096, 0xd855e61d
+0,     100352,     100352,     1024,     4096, 0x444eebc5
+0,     101376,     101376,     1024,     4096, 0xad3607c0
+0,     102400,     102400,     1024,     4096, 0x549b1aca
+0,     103424,     103424,     1024,     4096, 0x7c6a0a1a
+0,     104448,     104448,     1024,     4096, 0x04d2b3e9
+0,     105472,     105472,     1024,     4096, 0xf15d0216
+0,     106496,     106496,     1024,     4096, 0x5d15f709
+0,     107520,     107520,     1024,     4096, 0x47a7178e
+0,     108544,     108544,     1024,     4096, 0x2aa5e665
+0,     109568,     109568,     1024,     4096, 0x2a9f1a08
+0,     110592,     110592,     1024,     4096, 0xeaa6e103
+0,     111616,     111616,     1024,     4096, 0x8ae100d6
+0,     112640,     112640,     1024,     4096, 0x9585251c
+0,     113664,     113664,     1024,     4096, 0x5eb2289a
+0,     114688,     114688,     1024,     4096, 0x0d0c0cfc
+0,     115712,     115712,     1024,     4096, 0x7e5cd58f
+0,     116736,     116736,     1024,     4096, 0xca3fc9c7
+0,     117760,     117760,     1024,     4096, 0xdda3ebe7
+0,     118784,     118784,     1024,     4096, 0x084dcb41
+0,     119808,     119808,     1024,     4096, 0x0adc2a9c
+0,     120832,     120832,     1024,     4096, 0x64b0fa0f
+0,     121856,     121856,     1024,     4096, 0x225ffadd
+0,     122880,     122880,     1024,     4096, 0x40b0a487
+0,     123904,     123904,     1024,     4096, 0xc2edf0f3
+0,     124928,     124928,     1024,     4096, 0x5078d595
+0,     125952,     125952,     1024,     4096, 0x4ac9bb29
+0,     126976,     126976,     1024,     4096, 0x8a50ad77
+0,     128000,     128000,     1024,     4096, 0xf6bbebc7
+0,     129024,     129024,     1024,     4096, 0x9d33ca29
+0,     130048,     130048,     1024,     4096, 0x863b9ba7
+0,     131072,     131072,     1024,     4096, 0x41cbf17f
+0,     132096,     132096,     1024,     4096, 0x519df567
+0,     133120,     133120,     1024,     4096, 0x59b50359
+0,     134144,     134144,     1024,     4096, 0x5640f0fc
+0,     135168,     135168,     1024,     4096, 0x547df2b8
+0,     136192,     136192,     1024,     4096, 0xae6af2a8
+0,     137216,     137216,     1024,     4096, 0xb370f9ee
+0,     138240,     138240,     1024,     4096, 0x0d691a7f
+0,     139264,     139264,     1024,     4096, 0x8b2cf30d
+0,     140288,     140288,     1024,     4096, 0x8868efce
+0,     141312,     141312,     1024,     4096, 0x6602eb88
+0,     142336,     142336,     1024,     4096, 0x5fbbefd4
+0,     143360,     143360,     1024,     4096, 0xdf81e435
+0,     144384,     144384,     1024,     4096, 0x06b4e637
+0,     145408,     145408,     1024,     4096, 0x741803fb
+0,     146432,     146432,     1024,     4096, 0xf2a7dff9
+0,     147456,     147456,     1024,     4096, 0xbd2ffe0b
+0,     148480,     148480,     1024,     4096, 0xed19f9eb
+0,     149504,     149504,     1024,     4096, 0xa3c4f4a4
+0,     150528,     150528,     1024,     4096, 0xfac20796
+0,     151552,     151552,     1024,     4096, 0x315cf81e
+0,     152576,     152576,     1024,     4096, 0xaf0df76e
+0,     153600,     153600,     1024,     4096, 0x6f92e4ca
+0,     154624,     154624,     1024,     4096, 0xad32079c
+0,     155648,     155648,     1024,     4096, 0xcd03e6e7
+0,     156672,     156672,     1024,     4096, 0xff01f923
+0,     157696,     157696,     1024,     4096, 0xee4d1713
+0,     158720,     158720,     1024,     4096, 0x8db9e3f4
+0,     159744,     159744,     1024,     4096, 0xeef9f20a
+0,     160768,     160768,     1024,     4096, 0xa329d900
+0,     161792,     161792,     1024,     4096, 0xf9d0003b
+0,     162816,     162816,     1024,     4096, 0x9e42f62c
+0,     163840,     163840,     1024,     4096, 0x31f2ee64
+0,     164864,     164864,     1024,     4096, 0x8d340bb6
+0,     165888,     165888,     1024,     4096, 0xd7cbf004
+0,     166912,     166912,     1024,     4096, 0x262105c9
+0,     167936,     167936,     1024,     4096, 0xf3d30dc7
+0,     168960,     168960,     1024,     4096, 0x09adf291
+0,     169984,     169984,     1024,     4096, 0xf2b207e3
+0,     171008,     171008,     1024,     4096, 0x58df0639
+0,     172032,     172032,     1024,     4096, 0x373ad9cd
+0,     173056,     173056,     1024,     4096, 0xb0b2fc8b
+0,     174080,     174080,     1024,     4096, 0xb72af6b8
+0,     175104,     175104,     1024,     4096, 0xcee1f544
+0,     176128,     176128,     1024,     4096, 0xe88dded4
+0,     177152,     177152,     1024,     4096, 0xc606e4d4
+0,     178176,     178176,     1024,     4096, 0x6220006d
+0,     179200,     179200,     1024,     4096, 0xde870592
+0,     180224,     180224,     1024,     4096, 0xb5a6eaaf
+0,     181248,     181248,     1024,     4096, 0xe4eaf266
+0,     182272,     182272,     1024,     4096, 0xdb55f225
+0,     183296,     183296,     1024,     4096, 0x40550828
+0,     184320,     184320,     1024,     4096, 0x3f80fabd
+0,     185344,     185344,     1024,     4096, 0xe9c8eb8d
+0,     186368,     186368,     1024,     4096, 0xd25fe663
+0,     187392,     187392,     1024,     4096, 0x41720adb
+0,     188416,     188416,     1024,     4096, 0x5fd1fc96
+0,     189440,     189440,     1024,     4096, 0x007cf9ec
+0,     190464,     190464,     1024,     4096, 0xeab3efe0
+0,     191488,     191488,     1024,     4096, 0xcb75ee4c
+0,     192512,     192512,     1024,     4096, 0xd866f6c1
+0,     193536,     193536,     1024,     4096, 0xe0c4f911
+0,     194560,     194560,     1024,     4096, 0x7268e790
+0,     195584,     195584,     1024,     4096, 0x6258ee4a
+0,     196608,     196608,     1024,     4096, 0x880b003a
+0,     197632,     197632,     1024,     4096, 0x117bfd71
+0,     198656,     198656,     1024,     4096, 0x1b7900c7
+0,     199680,     199680,     1024,     4096, 0xcf3fe8b5
+0,     200704,     200704,     1024,     4096, 0x9de2f010
+0,     201728,     201728,     1024,     4096, 0xe6b4ff4a
+0,     202752,     202752,     1024,     4096, 0x37420c72
+0,     203776,     203776,     1024,     4096, 0x0560e821
+0,     204800,     204800,     1024,     4096, 0xd676f037
+0,     205824,     205824,     1024,     4096, 0xe141f3e1
+0,     206848,     206848,     1024,     4096, 0x8af10210
+0,     207872,     207872,     1024,     4096, 0x30c5fb99
+0,     208896,     208896,     1024,     4096, 0x39cdf501
+0,     209920,     209920,     1024,     4096, 0x8e37f69d
+0,     210944,     210944,     1024,     4096, 0x6220006d
+0,     211968,     211968,     1024,     4096, 0xde870592
+0,     212992,     212992,     1024,     4096, 0xb5a6eaaf
+0,     214016,     214016,     1024,     4096, 0xe4eaf266
+0,     215040,     215040,     1024,     4096, 0xdb55f225
+0,     216064,     216064,     1024,     4096, 0x40550828
+0,     217088,     217088,     1024,     4096, 0x3f80fabd
+0,     218112,     218112,     1024,     4096, 0xe9c8eb8d
+0,     219136,     219136,     1024,     4096, 0xd25fe663
+0,     220160,     220160,     1024,     4096, 0x41720adb
+0,     221184,     221184,     1024,     4096, 0x5fd1fc96
+0,     222208,     222208,     1024,     4096, 0x007cf9ec
+0,     223232,     223232,     1024,     4096, 0xeab3efe0
+0,     224256,     224256,     1024,     4096, 0xcb75ee4c
+0,     225280,     225280,     1024,     4096, 0xd866f6c1
+0,     226304,     226304,     1024,     4096, 0xe0c4f911
+0,     227328,     227328,     1024,     4096, 0x7268e790
+0,     228352,     228352,     1024,     4096, 0x6258ee4a
+0,     229376,     229376,     1024,     4096, 0x880b003a
+0,     230400,     230400,     1024,     4096, 0x117bfd71
+0,     231424,     231424,     1024,     4096, 0x1b7900c7
+0,     232448,     232448,     1024,     4096, 0xcf3fe8b5
+0,     233472,     233472,     1024,     4096, 0x9de2f010
+0,     234496,     234496,     1024,     4096, 0xe6b4ff4a
+0,     235520,     235520,     1024,     4096, 0x37420c72
+0,     236544,     236544,     1024,     4096, 0x0560e821
+0,     237568,     237568,     1024,     4096, 0xd676f037
+0,     238592,     238592,     1024,     4096, 0xe141f3e1
+0,     239616,     239616,     1024,     4096, 0x8af10210
+0,     240640,     240640,     1024,     4096, 0x30c5fb99
+0,     241664,     241664,     1024,     4096, 0x39cdf501
+0,     242688,     242688,     1024,     4096, 0x8e37f69d
+0,     243712,     243712,     1024,     4096, 0x6220006d
+0,     244736,     244736,     1024,     4096, 0xde870592
+0,     245760,     245760,     1024,     4096, 0xb5a6eaaf
+0,     246784,     246784,     1024,     4096, 0xe4eaf266
+0,     247808,     247808,     1024,     4096, 0xdb55f225
+0,     248832,     248832,     1024,     4096, 0x40550828
+0,     249856,     249856,     1024,     4096, 0x3f80fabd
+0,     250880,     250880,     1024,     4096, 0xe9c8eb8d
+0,     251904,     251904,     1024,     4096, 0xd25fe663
+0,     252928,     252928,     1024,     4096, 0x41720adb
+0,     253952,     253952,     1024,     4096, 0x5fd1fc96
+0,     254976,     254976,     1024,     4096, 0x007cf9ec
+0,     256000,     256000,     1024,     4096, 0xeab3efe0
+0,     257024,     257024,     1024,     4096, 0xcb75ee4c
+0,     258048,     258048,     1024,     4096, 0xd866f6c1
+0,     259072,     259072,     1024,     4096, 0xe0c4f911
+0,     260096,     260096,     1024,     4096, 0x7268e790
+0,     261120,     261120,     1024,     4096, 0x6258ee4a
+0,     262144,     262144,     1024,     4096, 0x880b003a
+0,     263168,     263168,     1024,     4096, 0x117bfd71
+0,     264192,     264192,      408,     1632, 0x495d360a
+0,     264600,     264600,     1411,     5644, 0x34920173
diff --git a/tests/ref/fate/filter-aemphasis b/tests/ref/fate/filter-aemphasis
new file mode 100644
index 0000000000..9509e4319a
--- /dev/null
+++ b/tests/ref/fate/filter-aemphasis
@@ -0,0 +1,528 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+0,          0,          0,     1024,     4096, 0xb9c5fefd
+0,       1024,       1024,     1024,     4096, 0xb2ae0a90
+0,       2048,       2048,     1024,     4096, 0x97e6e9f3
+0,       3072,       3072,     1024,     4096, 0x5837f26f
+0,       4096,       4096,     1024,     4096, 0x71500376
+0,       5120,       5120,     1024,     4096, 0xb4650378
+0,       6144,       6144,     1024,     4096, 0xd261f5b1
+0,       7168,       7168,     1024,     4096, 0x3038f3fd
+0,       8192,       8192,     1024,     4096, 0x8e1908c6
+0,       9216,       9216,     1024,     4096, 0x1d6bfd33
+0,      10240,      10240,     1024,     4096, 0x7036f23f
+0,      11264,      11264,     1024,     4096, 0xaf73e9a1
+0,      12288,      12288,     1024,     4096, 0x0ba70404
+0,      13312,      13312,     1024,     4096, 0xd34bf249
+0,      14336,      14336,     1024,     4096, 0x0c88fc2b
+0,      15360,      15360,     1024,     4096, 0x55ebf9cf
+0,      16384,      16384,     1024,     4096, 0xc16df0bd
+0,      17408,      17408,     1024,     4096, 0xa635eac5
+0,      18432,      18432,     1024,     4096, 0xb41d059e
+0,      19456,      19456,     1024,     4096, 0xa905f4d3
+0,      20480,      20480,     1024,     4096, 0x2736f1fb
+0,      21504,      21504,     1024,     4096, 0x1a89f007
+0,      22528,      22528,     1024,     4096, 0x81d1fdab
+0,      23552,      23552,     1024,     4096, 0x6156f97d
+0,      24576,      24576,     1024,     4096, 0x1971ec89
+0,      25600,      25600,     1024,     4096, 0xdca1ec4f
+0,      26624,      26624,     1024,     4096, 0x116ffcf5
+0,      27648,      27648,     1024,     4096, 0xc391fdc9
+0,      28672,      28672,     1024,     4096, 0x85e0ef45
+0,      29696,      29696,     1024,     4096, 0x81d3012c
+0,      30720,      30720,     1024,     4096, 0x403ef11b
+0,      31744,      31744,     1024,     4096, 0x3ca6f16d
+0,      32768,      32768,     1024,     4096, 0x6775feb1
+0,      33792,      33792,     1024,     4096, 0xb2ae0a90
+0,      34816,      34816,     1024,     4096, 0x97e6e9f3
+0,      35840,      35840,     1024,     4096, 0x5837f26f
+0,      36864,      36864,     1024,     4096, 0x71500376
+0,      37888,      37888,     1024,     4096, 0xb4650378
+0,      38912,      38912,     1024,     4096, 0xd261f5b1
+0,      39936,      39936,     1024,     4096, 0x3038f3fd
+0,      40960,      40960,     1024,     4096, 0x8e1908c6
+0,      41984,      41984,     1024,     4096, 0x1d6bfd33
+0,      43008,      43008,     1024,     4096, 0x7036f23f
+0,      44032,      44032,     1024,     4096, 0xabb8fbdb
+0,      45056,      45056,     1024,     4096, 0x8980f03f
+0,      46080,      46080,     1024,     4096, 0xc5a0f4ed
+0,      47104,      47104,     1024,     4096, 0x04ac0314
+0,      48128,      48128,     1024,     4096, 0xfdd0dca7
+0,      49152,      49152,     1024,     4096, 0x799bf1fd
+0,      50176,      50176,     1024,     4096, 0xbaa9fdfd
+0,      51200,      51200,     1024,     4096, 0xeb7cf571
+0,      52224,      52224,     1024,     4096, 0xe33b0e5a
+0,      53248,      53248,     1024,     4096, 0x8017f117
+0,      54272,      54272,     1024,     4096, 0x5fccf35b
+0,      55296,      55296,     1024,     4096, 0xbd69f9cb
+0,      56320,      56320,     1024,     4096, 0x4d09f905
+0,      57344,      57344,     1024,     4096, 0xfa53f185
+0,      58368,      58368,     1024,     4096, 0x35b907e4
+0,      59392,      59392,     1024,     4096, 0xf639fedb
+0,      60416,      60416,     1024,     4096, 0x1e58f771
+0,      61440,      61440,     1024,     4096, 0xb13d18d4
+0,      62464,      62464,     1024,     4096, 0xc7930842
+0,      63488,      63488,     1024,     4096, 0x1b4702d4
+0,      64512,      64512,     1024,     4096, 0xad75dd27
+0,      65536,      65536,     1024,     4096, 0x9a1ceb7b
+0,      66560,      66560,     1024,     4096, 0xead809ac
+0,      67584,      67584,     1024,     4096, 0xbdaf1b5a
+0,      68608,      68608,     1024,     4096, 0xa90a00a6
+0,      69632,      69632,     1024,     4096, 0xb39f0d0a
+0,      70656,      70656,     1024,     4096, 0xbaf60950
+0,      71680,      71680,     1024,     4096, 0x57d3eb53
+0,      72704,      72704,     1024,     4096, 0x8a77f7ff
+0,      73728,      73728,     1024,     4096, 0xd2bfe3b9
+0,      74752,      74752,     1024,     4096, 0xd4c5e287
+0,      75776,      75776,     1024,     4096, 0x8b940480
+0,      76800,      76800,     1024,     4096, 0x63a9134e
+0,      77824,      77824,     1024,     4096, 0x2215ee4d
+0,      78848,      78848,     1024,     4096, 0x8777f743
+0,      79872,      79872,     1024,     4096, 0x633e05ac
+0,      80896,      80896,     1024,     4096, 0x3b1ee685
+0,      81920,      81920,     1024,     4096, 0x57d30238
+0,      82944,      82944,     1024,     4096, 0xfb241180
+0,      83968,      83968,     1024,     4096, 0x733aea25
+0,      84992,      84992,     1024,     4096, 0x1677ea57
+0,      86016,      86016,     1024,     4096, 0xdf5fd6d7
+0,      87040,      87040,     1024,     4096, 0x36520bca
+0,      88064,      88064,     1024,     4096, 0x1e860a06
+0,      89088,      89088,     1024,     4096, 0x3305428c
+0,      90112,      90112,     1024,     4096, 0xe1a8008c
+0,      91136,      91136,     1024,     4096, 0xd81ff15f
+0,      92160,      92160,     1024,     4096, 0x0ccad2e7
+0,      93184,      93184,     1024,     4096, 0xc613bf29
+0,      94208,      94208,     1024,     4096, 0x5411ef73
+0,      95232,      95232,     1024,     4096, 0x51f7e01b
+0,      96256,      96256,     1024,     4096, 0x23d1ee5b
+0,      97280,      97280,     1024,     4096, 0xbc9721e2
+0,      98304,      98304,     1024,     4096, 0x0d49c94b
+0,      99328,      99328,     1024,     4096, 0xa102d963
+0,     100352,     100352,     1024,     4096, 0x5fd8fe95
+0,     101376,     101376,     1024,     4096, 0xd8c738e0
+0,     102400,     102400,     1024,     4096, 0xa9882686
+0,     103424,     103424,     1024,     4096, 0xfa30c4b1
+0,     104448,     104448,     1024,     4096, 0x76ecdb31
+0,     105472,     105472,     1024,     4096, 0x540ccff9
+0,     106496,     106496,     1024,     4096, 0xb365cf5f
+0,     107520,     107520,     1024,     4096, 0x3ab51dcc
+0,     108544,     108544,     1024,     4096, 0x266fd553
+0,     109568,     109568,     1024,     4096, 0xdac42f58
+0,     110592,     110592,     1024,     4096, 0x3ab23628
+0,     111616,     111616,     1024,     4096, 0x94c9a8bf
+0,     112640,     112640,     1024,     4096, 0x7ba5ff41
+0,     113664,     113664,     1024,     4096, 0xc6bfd5db
+0,     114688,     114688,     1024,     4096, 0x6b9ef98f
+0,     115712,     115712,     1024,     4096, 0xe5621a02
+0,     116736,     116736,     1024,     4096, 0xeedd28ec
+0,     117760,     117760,     1024,     4096, 0xddf5e045
+0,     118784,     118784,     1024,     4096, 0x49f0e0a9
+0,     119808,     119808,     1024,     4096, 0xd18f0ca0
+0,     120832,     120832,     1024,     4096, 0xa0fa00c6
+0,     121856,     121856,     1024,     4096, 0x9e406e6c
+0,     122880,     122880,     1024,     4096, 0x1a3f23bc
+0,     123904,     123904,     1024,     4096, 0xcbf409d0
+0,     124928,     124928,     1024,     4096, 0x499b3ac8
+0,     125952,     125952,     1024,     4096, 0x2ef93980
+0,     126976,     126976,     1024,     4096, 0x83092bfa
+0,     128000,     128000,     1024,     4096, 0x4838093a
+0,     129024,     129024,     1024,     4096, 0xd1bff209
+0,     130048,     130048,     1024,     4096, 0xdef04f12
+0,     131072,     131072,     1024,     4096, 0x130dd787
+0,     132096,     132096,     1024,     4096, 0xc8621030
+0,     133120,     133120,     1024,     4096, 0x1b2bf867
+0,     134144,     134144,     1024,     4096, 0x01220341
+0,     135168,     135168,     1024,     4096, 0x7c8dfdb1
+0,     136192,     136192,     1024,     4096, 0xe81df813
+0,     137216,     137216,     1024,     4096, 0xf820fe8d
+0,     138240,     138240,     1024,     4096, 0x1f9dfe49
+0,     139264,     139264,     1024,     4096, 0x2f84f144
+0,     140288,     140288,     1024,     4096, 0xab9deec8
+0,     141312,     141312,     1024,     4096, 0x7d7bf5b9
+0,     142336,     142336,     1024,     4096, 0xbecff5ea
+0,     143360,     143360,     1024,     4096, 0x2872e5c0
+0,     144384,     144384,     1024,     4096, 0x6e2ff713
+0,     145408,     145408,     1024,     4096, 0x0b2df757
+0,     146432,     146432,     1024,     4096, 0x5030fa0a
+0,     147456,     147456,     1024,     4096, 0xb5b5f3da
+0,     148480,     148480,     1024,     4096, 0xce4cf9a6
+0,     149504,     149504,     1024,     4096, 0x9eacf61f
+0,     150528,     150528,     1024,     4096, 0x3bfff549
+0,     151552,     151552,     1024,     4096, 0x4eeae60a
+0,     152576,     152576,     1024,     4096, 0x188ef258
+0,     153600,     153600,     1024,     4096, 0xb546f30d
+0,     154624,     154624,     1024,     4096, 0x0a84e6f8
+0,     155648,     155648,     1024,     4096, 0xe7b0ee27
+0,     156672,     156672,     1024,     4096, 0x04d0f6ee
+0,     157696,     157696,     1024,     4096, 0x09fa042a
+0,     158720,     158720,     1024,     4096, 0x5a3cf418
+0,     159744,     159744,     1024,     4096, 0x89d8017f
+0,     160768,     160768,     1024,     4096, 0x64eb0320
+0,     161792,     161792,     1024,     4096, 0xe40df279
+0,     162816,     162816,     1024,     4096, 0x4dc4fd25
+0,     163840,     163840,     1024,     4096, 0x466af97c
+0,     164864,     164864,     1024,     4096, 0x7306f4e2
+0,     165888,     165888,     1024,     4096, 0x9782eda4
+0,     166912,     166912,     1024,     4096, 0x3635fad8
+0,     167936,     167936,     1024,     4096, 0x3344eabe
+0,     168960,     168960,     1024,     4096, 0x9143fda0
+0,     169984,     169984,     1024,     4096, 0x33e7eb7f
+0,     171008,     171008,     1024,     4096, 0x4ca0e947
+0,     172032,     172032,     1024,     4096, 0x5b1bf80d
+0,     173056,     173056,     1024,     4096, 0xbb15eab7
+0,     174080,     174080,     1024,     4096, 0xd800f7cb
+0,     175104,     175104,     1024,     4096, 0xd3d4e960
+0,     176128,     176128,     1024,     4096, 0x2fc30f2f
+0,     177152,     177152,     1024,     4096, 0xb410f092
+0,     178176,     178176,     1024,     4096, 0x4350fddf
+0,     179200,     179200,     1024,     4096, 0x477a07c6
+0,     180224,     180224,     1024,     4096, 0x9d48ed59
+0,     181248,     181248,     1024,     4096, 0xd6ae02a8
+0,     182272,     182272,     1024,     4096, 0x206be433
+0,     183296,     183296,     1024,     4096, 0xf465fc54
+0,     184320,     184320,     1024,     4096, 0x745dacb9
+0,     185344,     185344,     1024,     4096, 0x3783e765
+0,     186368,     186368,     1024,     4096, 0x479feb48
+0,     187392,     187392,     1024,     4096, 0x34f2050f
+0,     188416,     188416,     1024,     4096, 0x9df1f441
+0,     189440,     189440,     1024,     4096, 0x1864f225
+0,     190464,     190464,     1024,     4096, 0xebacf084
+0,     191488,     191488,     1024,     4096, 0xaa14f082
+0,     192512,     192512,     1024,     4096, 0xbac10f8b
+0,     193536,     193536,     1024,     4096, 0xa4520210
+0,     194560,     194560,     1024,     4096, 0xfee4f8c3
+0,     195584,     195584,     1024,     4096, 0xadf5e4c2
+0,     196608,     196608,     1024,     4096, 0x7bf20584
+0,     197632,     197632,     1024,     4096, 0x541debf5
+0,     198656,     198656,     1024,     4096, 0x9a350796
+0,     199680,     199680,     1024,     4096, 0x1388fa83
+0,     200704,     200704,     1024,     4096, 0x9839b0c2
+0,     201728,     201728,     1024,     4096, 0xfc9afff0
+0,     202752,     202752,     1024,     4096, 0x73100a7c
+0,     203776,     203776,     1024,     4096, 0xb56df070
+0,     204800,     204800,     1024,     4096, 0x71d8efa7
+0,     205824,     205824,     1024,     4096, 0xde800412
+0,     206848,     206848,     1024,     4096, 0x7bf7f840
+0,     207872,     207872,     1024,     4096, 0x1480044d
+0,     208896,     208896,     1024,     4096, 0x60201217
+0,     209920,     209920,     1024,     4096, 0xb410f092
+0,     210944,     210944,     1024,     4096, 0x4350fddf
+0,     211968,     211968,     1024,     4096, 0x477a07c6
+0,     212992,     212992,     1024,     4096, 0x9d48ed59
+0,     214016,     214016,     1024,     4096, 0xd6ae02a8
+0,     215040,     215040,     1024,     4096, 0x206be433
+0,     216064,     216064,     1024,     4096, 0xf465fc54
+0,     217088,     217088,     1024,     4096, 0x745dacb9
+0,     218112,     218112,     1024,     4096, 0x3783e765
+0,     219136,     219136,     1024,     4096, 0x479feb48
+0,     220160,     220160,     1024,     4096, 0x34f2050f
+0,     221184,     221184,     1024,     4096, 0x9df1f441
+0,     222208,     222208,     1024,     4096, 0x1864f225
+0,     223232,     223232,     1024,     4096, 0xebacf084
+0,     224256,     224256,     1024,     4096, 0xaa14f082
+0,     225280,     225280,     1024,     4096, 0xbac10f8b
+0,     226304,     226304,     1024,     4096, 0xa4520210
+0,     227328,     227328,     1024,     4096, 0xfee4f8c3
+0,     228352,     228352,     1024,     4096, 0xadf5e4c2
+0,     229376,     229376,     1024,     4096, 0x7bf20584
+0,     230400,     230400,     1024,     4096, 0x541debf5
+0,     231424,     231424,     1024,     4096, 0x9a350796
+0,     232448,     232448,     1024,     4096, 0x1388fa83
+0,     233472,     233472,     1024,     4096, 0x9839b0c2
+0,     234496,     234496,     1024,     4096, 0xfc9afff0
+0,     235520,     235520,     1024,     4096, 0x73100a7c
+0,     236544,     236544,     1024,     4096, 0xb56df070
+0,     237568,     237568,     1024,     4096, 0x71d8efa7
+0,     238592,     238592,     1024,     4096, 0xde800412
+0,     239616,     239616,     1024,     4096, 0x7bf7f840
+0,     240640,     240640,     1024,     4096, 0x1480044d
+0,     241664,     241664,     1024,     4096, 0x60201217
+0,     242688,     242688,     1024,     4096, 0xb410f092
+0,     243712,     243712,     1024,     4096, 0x4350fddf
+0,     244736,     244736,     1024,     4096, 0x477a07c6
+0,     245760,     245760,     1024,     4096, 0x9d48ed59
+0,     246784,     246784,     1024,     4096, 0xd6ae02a8
+0,     247808,     247808,     1024,     4096, 0x206be433
+0,     248832,     248832,     1024,     4096, 0xf465fc54
+0,     249856,     249856,     1024,     4096, 0x745dacb9
+0,     250880,     250880,     1024,     4096, 0x3783e765
+0,     251904,     251904,     1024,     4096, 0x479feb48
+0,     252928,     252928,     1024,     4096, 0x34f2050f
+0,     253952,     253952,     1024,     4096, 0x9df1f441
+0,     254976,     254976,     1024,     4096, 0x1864f225
+0,     256000,     256000,     1024,     4096, 0xebacf084
+0,     257024,     257024,     1024,     4096, 0xaa14f082
+0,     258048,     258048,     1024,     4096, 0xbac10f8b
+0,     259072,     259072,     1024,     4096, 0xa4520210
+0,     260096,     260096,     1024,     4096, 0xfee4f8c3
+0,     261120,     261120,     1024,     4096, 0xadf5e4c2
+0,     262144,     262144,     1024,     4096, 0x7bf20584
+0,     263168,     263168,     1024,     4096, 0x541debf5
+0,     264192,     264192,      408,     1632, 0xadd02d39
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+0,          0,          0,     1024,     4096, 0xfd510c8e
+0,       1024,       1024,     1024,     4096, 0x09dcf895
+0,       2048,       2048,     1024,     4096, 0xd8cbe29f
+0,       3072,       3072,     1024,     4096, 0xefcffb51
+0,       4096,       4096,     1024,     4096, 0xa3840ebe
+0,       5120,       5120,     1024,     4096, 0xfcf0f60f
+0,       6144,       6144,     1024,     4096, 0x3d82f4ad
+0,       7168,       7168,     1024,     4096, 0x17960344
+0,       8192,       8192,     1024,     4096, 0xdecbf6f9
+0,       9216,       9216,     1024,     4096, 0x783d000e
+0,      10240,      10240,     1024,     4096, 0xea4607fe
+0,      11264,      11264,     1024,     4096, 0xabc7f8ad
+0,      12288,      12288,     1024,     4096, 0xda22f07d
+0,      13312,      13312,     1024,     4096, 0xbcebfc6b
+0,      14336,      14336,     1024,     4096, 0xc7020a20
+0,      15360,      15360,     1024,     4096, 0xfa28f94b
+0,      16384,      16384,     1024,     4096, 0x926ee3b5
+0,      17408,      17408,     1024,     4096, 0x161cf985
+0,      18432,      18432,     1024,     4096, 0x40e909ce
+0,      19456,      19456,     1024,     4096, 0x1bf8f2ef
+0,      20480,      20480,     1024,     4096, 0x322fe983
+0,      21504,      21504,     1024,     4096, 0xead2fe3f
+0,      22528,      22528,     1024,     4096, 0xcb51fb99
+0,      23552,      23552,     1024,     4096, 0xd430e117
+0,      24576,      24576,     1024,     4096, 0x3d72f74f
+0,      25600,      25600,     1024,     4096, 0x12b1f269
+0,      26624,      26624,     1024,     4096, 0x0469e035
+0,      27648,      27648,     1024,     4096, 0xd164f5bf
+0,      28672,      28672,     1024,     4096, 0xa6f803aa
+0,      29696,      29696,     1024,     4096, 0x3569f3e9
+0,      30720,      30720,     1024,     4096, 0x8662ec45
+0,      31744,      31744,     1024,     4096, 0x92fdfeb7
+0,      32768,      32768,     1024,     4096, 0x915f12ce
+0,      33792,      33792,     1024,     4096, 0x09dcf895
+0,      34816,      34816,     1024,     4096, 0xd8cbe29f
+0,      35840,      35840,     1024,     4096, 0xefcffb51
+0,      36864,      36864,     1024,     4096, 0xa3840ebe
+0,      37888,      37888,     1024,     4096, 0xfcf0f60f
+0,      38912,      38912,     1024,     4096, 0x3d82f4ad
+0,      39936,      39936,     1024,     4096, 0x17960344
+0,      40960,      40960,     1024,     4096, 0xdecbf6f9
+0,      41984,      41984,     1024,     4096, 0x783d000e
+0,      43008,      43008,     1024,     4096, 0xea4607fe
+0,      44032,      44032,     1024,     4096, 0x3e840b8a
+0,      45056,      45056,     1024,     4096, 0x45d30e80
+0,      46080,      46080,     1024,     4096, 0xc31bef4f
+0,      47104,      47104,     1024,     4096, 0x8b1302e4
+0,      48128,      48128,     1024,     4096, 0x0b21144e
+0,      49152,      49152,     1024,     4096, 0xb873e7b1
+0,      50176,      50176,     1024,     4096, 0x914e07ee
+0,      51200,      51200,     1024,     4096, 0x7e9dfc37
+0,      52224,      52224,     1024,     4096, 0x8255f9b7
+0,      53248,      53248,     1024,     4096, 0x98a7ebeb
+0,      54272,      54272,     1024,     4096, 0xf438eeb1
+0,      55296,      55296,     1024,     4096, 0x31f40542
+0,      56320,      56320,     1024,     4096, 0x5fb7eb35
+0,      57344,      57344,     1024,     4096, 0xe9220582
+0,      58368,      58368,     1024,     4096, 0xf1a80e3a
+0,      59392,      59392,     1024,     4096, 0xe8ff0f14
+0,      60416,      60416,     1024,     4096, 0x48980ac2
+0,      61440,      61440,     1024,     4096, 0x98d9ffdd
+0,      62464,      62464,     1024,     4096, 0x6db8f2f5
+0,      63488,      63488,     1024,     4096, 0x892f06fa
+0,      64512,      64512,     1024,     4096, 0xa8defbcb
+0,      65536,      65536,     1024,     4096, 0xd39d0f38
+0,      66560,      66560,     1024,     4096, 0xe9bef09b
+0,      67584,      67584,     1024,     4096, 0xa930fd67
+0,      68608,      68608,     1024,     4096, 0x78cc1e42
+0,      69632,      69632,     1024,     4096, 0x7a2eeeeb
+0,      70656,      70656,     1024,     4096, 0xdf660c6a
+0,      71680,      71680,     1024,     4096, 0x00ff0240
+0,      72704,      72704,     1024,     4096, 0x421dd4a5
+0,      73728,      73728,     1024,     4096, 0x7abdd0a3
+0,      74752,      74752,     1024,     4096, 0x172e2578
+0,      75776,      75776,     1024,     4096, 0x24b5e26d
+0,      76800,      76800,     1024,     4096, 0xaf3e136c
+0,      77824,      77824,     1024,     4096, 0xb1ccf1dd
+0,      78848,      78848,     1024,     4096, 0xd08ef9f9
+0,      79872,      79872,     1024,     4096, 0x76c415f8
+0,      80896,      80896,     1024,     4096, 0x0269f63f
+0,      81920,      81920,     1024,     4096, 0xe65f07fe
+0,      82944,      82944,     1024,     4096, 0xc9831ccc
+0,      83968,      83968,     1024,     4096, 0x6907f72b
+0,      84992,      84992,     1024,     4096, 0x9cfae861
+0,      86016,      86016,     1024,     4096, 0x2ed7fbbf
+0,      87040,      87040,     1024,     4096, 0x3b1718f0
+0,      88064,      88064,     1024,     4096, 0xe066fe41
+0,      89088,      89088,     1024,     4096, 0xf4fee887
+0,      90112,      90112,     1024,     4096, 0xc0220baa
+0,      91136,      91136,     1024,     4096, 0x32abcc4b
+0,      92160,      92160,     1024,     4096, 0x96dbc677
+0,      93184,      93184,     1024,     4096, 0x1b72dd23
+0,      94208,      94208,     1024,     4096, 0x2ae0eaef
+0,      95232,      95232,     1024,     4096, 0x3218fc25
+0,      96256,      96256,     1024,     4096, 0x5ed8f2a7
+0,      97280,      97280,     1024,     4096, 0x4df02c50
+0,      98304,      98304,     1024,     4096, 0x50e3a51d
+0,      99328,      99328,     1024,     4096, 0xaf52dc95
+0,     100352,     100352,     1024,     4096, 0x60a101a8
+0,     101376,     101376,     1024,     4096, 0x01c20386
+0,     102400,     102400,     1024,     4096, 0xb017e893
+0,     103424,     103424,     1024,     4096, 0x5a39f907
+0,     104448,     104448,     1024,     4096, 0xbf05e505
+0,     105472,     105472,     1024,     4096, 0x1797d237
+0,     106496,     106496,     1024,     4096, 0xb06bc281
+0,     107520,     107520,     1024,     4096, 0xb49f0402
+0,     108544,     108544,     1024,     4096, 0x4bfdb3a3
+0,     109568,     109568,     1024,     4096, 0x601302ae
+0,     110592,     110592,     1024,     4096, 0x2dad13ac
+0,     111616,     111616,     1024,     4096, 0xe95ed0a3
+0,     112640,     112640,     1024,     4096, 0x8df2dfe3
+0,     113664,     113664,     1024,     4096, 0x4183e52f
+0,     114688,     114688,     1024,     4096, 0x23f1ecad
+0,     115712,     115712,     1024,     4096, 0xb40c20e0
+0,     116736,     116736,     1024,     4096, 0x11bf2d2c
+0,     117760,     117760,     1024,     4096, 0x85f8f2cb
+0,     118784,     118784,     1024,     4096, 0x7961e007
+0,     119808,     119808,     1024,     4096, 0x63a9207a
+0,     120832,     120832,     1024,     4096, 0x7383e583
+0,     121856,     121856,     1024,     4096, 0xa3e36e6a
+0,     122880,     122880,     1024,     4096, 0xd2803f22
+0,     123904,     123904,     1024,     4096, 0x11a70252
+0,     124928,     124928,     1024,     4096, 0x4cfe20f6
+0,     125952,     125952,     1024,     4096, 0x2e66307e
+0,     126976,     126976,     1024,     4096, 0x87c9229c
+0,     128000,     128000,     1024,     4096, 0x8ecdfddb
+0,     129024,     129024,     1024,     4096, 0x7e41e4b7
+0,     130048,     130048,     1024,     4096, 0x568d46fc
+0,     131072,     131072,     1024,     4096, 0x3c97b403
+0,     132096,     132096,     1024,     4096, 0xe04105c2
+0,     133120,     133120,     1024,     4096, 0xe8d6f531
+0,     134144,     134144,     1024,     4096, 0x9a410079
+0,     135168,     135168,     1024,     4096, 0x12631511
+0,     136192,     136192,     1024,     4096, 0x530ff27c
+0,     137216,     137216,     1024,     4096, 0x41f0f3ab
+0,     138240,     138240,     1024,     4096, 0x6985f567
+0,     139264,     139264,     1024,     4096, 0xffc80074
+0,     140288,     140288,     1024,     4096, 0xc6c21def
+0,     141312,     141312,     1024,     4096, 0xf5ddf852
+0,     142336,     142336,     1024,     4096, 0xf61af464
+0,     143360,     143360,     1024,     4096, 0xccabfbd1
+0,     144384,     144384,     1024,     4096, 0x466e062c
+0,     145408,     145408,     1024,     4096, 0xec68ee08
+0,     146432,     146432,     1024,     4096, 0xead4f61a
+0,     147456,     147456,     1024,     4096, 0xb3feef14
+0,     148480,     148480,     1024,     4096, 0x8f03e128
+0,     149504,     149504,     1024,     4096, 0x0c54fd08
+0,     150528,     150528,     1024,     4096, 0x1ae6f4cf
+0,     151552,     151552,     1024,     4096, 0x34bae7d5
+0,     152576,     152576,     1024,     4096, 0xeefc1293
+0,     153600,     153600,     1024,     4096, 0x0c2bfd50
+0,     154624,     154624,     1024,     4096, 0x432ef6f5
+0,     155648,     155648,     1024,     4096, 0xd0f0e4a6
+0,     156672,     156672,     1024,     4096, 0xdeb4fe78
+0,     157696,     157696,     1024,     4096, 0xa6eeef90
+0,     158720,     158720,     1024,     4096, 0xad6701b6
+0,     159744,     159744,     1024,     4096, 0x9865f521
+0,     160768,     160768,     1024,     4096, 0xd7c301a0
+0,     161792,     161792,     1024,     4096, 0x3e82f05d
+0,     162816,     162816,     1024,     4096, 0x09d1fe12
+0,     163840,     163840,     1024,     4096, 0x5b3eeab5
+0,     164864,     164864,     1024,     4096, 0xa8f8e69d
+0,     165888,     165888,     1024,     4096, 0x7b1efe94
+0,     166912,     166912,     1024,     4096, 0xb65dfae6
+0,     167936,     167936,     1024,     4096, 0xf90ffa31
+0,     168960,     168960,     1024,     4096, 0x62e805fe
+0,     169984,     169984,     1024,     4096, 0xe20cfa8e
+0,     171008,     171008,     1024,     4096, 0x1cbdf820
+0,     172032,     172032,     1024,     4096, 0x79e8e729
+0,     173056,     173056,     1024,     4096, 0xfa8bf6ac
+0,     174080,     174080,     1024,     4096, 0xe294f8a6
+0,     175104,     175104,     1024,     4096, 0xa4800572
+0,     176128,     176128,     1024,     4096, 0x8a0e1b32
+0,     177152,     177152,     1024,     4096, 0x00bcf36c
+0,     178176,     178176,     1024,     4096, 0xb3a4eec2
+0,     179200,     179200,     1024,     4096, 0x137a03bd
+0,     180224,     180224,     1024,     4096, 0xb8770bf1
+0,     181248,     181248,     1024,     4096, 0xcc66f90a
+0,     182272,     182272,     1024,     4096, 0x66be04d4
+0,     183296,     183296,     1024,     4096, 0x80a40461
+0,     184320,     184320,     1024,     4096, 0xe4a2b95d
+0,     185344,     185344,     1024,     4096, 0x2537edf0
+0,     186368,     186368,     1024,     4096, 0xc3e8e74f
+0,     187392,     187392,     1024,     4096, 0xd2a40021
+0,     188416,     188416,     1024,     4096, 0xb366f18a
+0,     189440,     189440,     1024,     4096, 0x1d3a0b8a
+0,     190464,     190464,     1024,     4096, 0xac40f416
+0,     191488,     191488,     1024,     4096, 0xc90bf16c
+0,     192512,     192512,     1024,     4096, 0xd6931f86
+0,     193536,     193536,     1024,     4096, 0xf9170265
+0,     194560,     194560,     1024,     4096, 0xb024f8dc
+0,     195584,     195584,     1024,     4096, 0x31cdf143
+0,     196608,     196608,     1024,     4096, 0x1fe1e5e0
+0,     197632,     197632,     1024,     4096, 0x0f1ef3af
+0,     198656,     198656,     1024,     4096, 0x3c86ee15
+0,     199680,     199680,     1024,     4096, 0xf151ecf2
+0,     200704,     200704,     1024,     4096, 0x81fbb354
+0,     201728,     201728,     1024,     4096, 0x88c903e8
+0,     202752,     202752,     1024,     4096, 0x1f480608
+0,     203776,     203776,     1024,     4096, 0x15f4f3cf
+0,     204800,     204800,     1024,     4096, 0xb1ed0d3d
+0,     205824,     205824,     1024,     4096, 0xa074ecfe
+0,     206848,     206848,     1024,     4096, 0xc38100c8
+0,     207872,     207872,     1024,     4096, 0xd43000d8
+0,     208896,     208896,     1024,     4096, 0x59e61b3b
+0,     209920,     209920,     1024,     4096, 0x00bcf36c
+0,     210944,     210944,     1024,     4096, 0xb3a4eec2
+0,     211968,     211968,     1024,     4096, 0x137a03bd
+0,     212992,     212992,     1024,     4096, 0xb8770bf1
+0,     214016,     214016,     1024,     4096, 0xcc66f90a
+0,     215040,     215040,     1024,     4096, 0x66be04d4
+0,     216064,     216064,     1024,     4096, 0x80a40461
+0,     217088,     217088,     1024,     4096, 0xe4a2b95d
+0,     218112,     218112,     1024,     4096, 0x2537edf0
+0,     219136,     219136,     1024,     4096, 0xc3e8e74f
+0,     220160,     220160,     1024,     4096, 0xd2a40021
+0,     221184,     221184,     1024,     4096, 0xb366f18a
+0,     222208,     222208,     1024,     4096, 0x1d3a0b8a
+0,     223232,     223232,     1024,     4096, 0xac40f416
+0,     224256,     224256,     1024,     4096, 0xc90bf16c
+0,     225280,     225280,     1024,     4096, 0xd6931f86
+0,     226304,     226304,     1024,     4096, 0xf9170265
+0,     227328,     227328,     1024,     4096, 0xb024f8dc
+0,     228352,     228352,     1024,     4096, 0x31cdf143
+0,     229376,     229376,     1024,     4096, 0x1fe1e5e0
+0,     230400,     230400,     1024,     4096, 0x0f1ef3af
+0,     231424,     231424,     1024,     4096, 0x3c86ee15
+0,     232448,     232448,     1024,     4096, 0xf151ecf2
+0,     233472,     233472,     1024,     4096, 0x81fbb354
+0,     234496,     234496,     1024,     4096, 0x88c903e8
+0,     235520,     235520,     1024,     4096, 0x1f480608
+0,     236544,     236544,     1024,     4096, 0x15f4f3cf
+0,     237568,     237568,     1024,     4096, 0xb1ed0d3d
+0,     238592,     238592,     1024,     4096, 0xa074ecfe
+0,     239616,     239616,     1024,     4096, 0xc38100c8
+0,     240640,     240640,     1024,     4096, 0xd43000d8
+0,     241664,     241664,     1024,     4096, 0x59e61b3b
+0,     242688,     242688,     1024,     4096, 0x00bcf36c
+0,     243712,     243712,     1024,     4096, 0xb3a4eec2
+0,     244736,     244736,     1024,     4096, 0x137a03bd
+0,     245760,     245760,     1024,     4096, 0xb8770bf1
+0,     246784,     246784,     1024,     4096, 0xcc66f90a
+0,     247808,     247808,     1024,     4096, 0x66be04d4
+0,     248832,     248832,     1024,     4096, 0x80a40461
+0,     249856,     249856,     1024,     4096, 0xe4a2b95d
+0,     250880,     250880,     1024,     4096, 0x2537edf0
+0,     251904,     251904,     1024,     4096, 0xc3e8e74f
+0,     252928,     252928,     1024,     4096, 0xd2a40021
+0,     253952,     253952,     1024,     4096, 0xb366f18a
+0,     254976,     254976,     1024,     4096, 0x1d3a0b8a
+0,     256000,     256000,     1024,     4096, 0xac40f416
+0,     257024,     257024,     1024,     4096, 0xc90bf16c
+0,     258048,     258048,     1024,     4096, 0xd6931f86
+0,     259072,     259072,     1024,     4096, 0xf9170265
+0,     260096,     260096,     1024,     4096, 0xb024f8dc
+0,     261120,     261120,     1024,     4096, 0x31cdf143
+0,     262144,     262144,     1024,     4096, 0x1fe1e5e0
+0,     263168,     263168,     1024,     4096, 0x0f1ef3af
+0,     264192,     264192,      408,     1632, 0x70682eea
diff --git a/tests/ref/fate/filter-aemphasis-50fm b/tests/ref/fate/filter-aemphasis-50fm
new file mode 100644
index 0000000000..649cd449be
--- /dev/null
+++ b/tests/ref/fate/filter-aemphasis-50fm
@@ -0,0 +1,265 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0xb9c5fefd
+0,       1024,       1024,     1024,     4096, 0xb2ae0a90
+0,       2048,       2048,     1024,     4096, 0x97e6e9f3
+0,       3072,       3072,     1024,     4096, 0x5837f26f
+0,       4096,       4096,     1024,     4096, 0x71500376
+0,       5120,       5120,     1024,     4096, 0xb4650378
+0,       6144,       6144,     1024,     4096, 0xd261f5b1
+0,       7168,       7168,     1024,     4096, 0x3038f3fd
+0,       8192,       8192,     1024,     4096, 0x8e1908c6
+0,       9216,       9216,     1024,     4096, 0x1d6bfd33
+0,      10240,      10240,     1024,     4096, 0x7036f23f
+0,      11264,      11264,     1024,     4096, 0xaf73e9a1
+0,      12288,      12288,     1024,     4096, 0x0ba70404
+0,      13312,      13312,     1024,     4096, 0xd34bf249
+0,      14336,      14336,     1024,     4096, 0x0c88fc2b
+0,      15360,      15360,     1024,     4096, 0x55ebf9cf
+0,      16384,      16384,     1024,     4096, 0xc16df0bd
+0,      17408,      17408,     1024,     4096, 0xa635eac5
+0,      18432,      18432,     1024,     4096, 0xb41d059e
+0,      19456,      19456,     1024,     4096, 0xa905f4d3
+0,      20480,      20480,     1024,     4096, 0x2736f1fb
+0,      21504,      21504,     1024,     4096, 0x1a89f007
+0,      22528,      22528,     1024,     4096, 0x81d1fdab
+0,      23552,      23552,     1024,     4096, 0x6156f97d
+0,      24576,      24576,     1024,     4096, 0x1971ec89
+0,      25600,      25600,     1024,     4096, 0xdca1ec4f
+0,      26624,      26624,     1024,     4096, 0x116ffcf5
+0,      27648,      27648,     1024,     4096, 0xc391fdc9
+0,      28672,      28672,     1024,     4096, 0x85e0ef45
+0,      29696,      29696,     1024,     4096, 0x81d3012c
+0,      30720,      30720,     1024,     4096, 0x403ef11b
+0,      31744,      31744,     1024,     4096, 0x3ca6f16d
+0,      32768,      32768,     1024,     4096, 0x6775feb1
+0,      33792,      33792,     1024,     4096, 0xb2ae0a90
+0,      34816,      34816,     1024,     4096, 0x97e6e9f3
+0,      35840,      35840,     1024,     4096, 0x5837f26f
+0,      36864,      36864,     1024,     4096, 0x71500376
+0,      37888,      37888,     1024,     4096, 0xb4650378
+0,      38912,      38912,     1024,     4096, 0xd261f5b1
+0,      39936,      39936,     1024,     4096, 0x3038f3fd
+0,      40960,      40960,     1024,     4096, 0x8e1908c6
+0,      41984,      41984,     1024,     4096, 0x1d6bfd33
+0,      43008,      43008,     1024,     4096, 0x7036f23f
+0,      44032,      44032,     1024,     4096, 0xabb8fbdb
+0,      45056,      45056,     1024,     4096, 0x8980f03f
+0,      46080,      46080,     1024,     4096, 0xc5a0f4ed
+0,      47104,      47104,     1024,     4096, 0x04ac0314
+0,      48128,      48128,     1024,     4096, 0xfdd0dca7
+0,      49152,      49152,     1024,     4096, 0x799bf1fd
+0,      50176,      50176,     1024,     4096, 0xbaa9fdfd
+0,      51200,      51200,     1024,     4096, 0xeb7cf571
+0,      52224,      52224,     1024,     4096, 0xe33b0e5a
+0,      53248,      53248,     1024,     4096, 0x8017f117
+0,      54272,      54272,     1024,     4096, 0x5fccf35b
+0,      55296,      55296,     1024,     4096, 0xbd69f9cb
+0,      56320,      56320,     1024,     4096, 0x4d09f905
+0,      57344,      57344,     1024,     4096, 0xfa53f185
+0,      58368,      58368,     1024,     4096, 0x35b907e4
+0,      59392,      59392,     1024,     4096, 0xf639fedb
+0,      60416,      60416,     1024,     4096, 0x1e58f771
+0,      61440,      61440,     1024,     4096, 0xb13d18d4
+0,      62464,      62464,     1024,     4096, 0xc7930842
+0,      63488,      63488,     1024,     4096, 0x1b4702d4
+0,      64512,      64512,     1024,     4096, 0xad75dd27
+0,      65536,      65536,     1024,     4096, 0x9a1ceb7b
+0,      66560,      66560,     1024,     4096, 0xead809ac
+0,      67584,      67584,     1024,     4096, 0xbdaf1b5a
+0,      68608,      68608,     1024,     4096, 0xa90a00a6
+0,      69632,      69632,     1024,     4096, 0xb39f0d0a
+0,      70656,      70656,     1024,     4096, 0xbaf60950
+0,      71680,      71680,     1024,     4096, 0x57d3eb53
+0,      72704,      72704,     1024,     4096, 0x8a77f7ff
+0,      73728,      73728,     1024,     4096, 0xd2bfe3b9
+0,      74752,      74752,     1024,     4096, 0xd4c5e287
+0,      75776,      75776,     1024,     4096, 0x8b940480
+0,      76800,      76800,     1024,     4096, 0x63a9134e
+0,      77824,      77824,     1024,     4096, 0x2215ee4d
+0,      78848,      78848,     1024,     4096, 0x8777f743
+0,      79872,      79872,     1024,     4096, 0x633e05ac
+0,      80896,      80896,     1024,     4096, 0x3b1ee685
+0,      81920,      81920,     1024,     4096, 0x57d30238
+0,      82944,      82944,     1024,     4096, 0xfb241180
+0,      83968,      83968,     1024,     4096, 0x733aea25
+0,      84992,      84992,     1024,     4096, 0x1677ea57
+0,      86016,      86016,     1024,     4096, 0xdf5fd6d7
+0,      87040,      87040,     1024,     4096, 0x36520bca
+0,      88064,      88064,     1024,     4096, 0x1e860a06
+0,      89088,      89088,     1024,     4096, 0x3305428c
+0,      90112,      90112,     1024,     4096, 0xe1a8008c
+0,      91136,      91136,     1024,     4096, 0xd81ff15f
+0,      92160,      92160,     1024,     4096, 0x0ccad2e7
+0,      93184,      93184,     1024,     4096, 0xc613bf29
+0,      94208,      94208,     1024,     4096, 0x5411ef73
+0,      95232,      95232,     1024,     4096, 0x51f7e01b
+0,      96256,      96256,     1024,     4096, 0x23d1ee5b
+0,      97280,      97280,     1024,     4096, 0xbc9721e2
+0,      98304,      98304,     1024,     4096, 0x0d49c94b
+0,      99328,      99328,     1024,     4096, 0xa102d963
+0,     100352,     100352,     1024,     4096, 0x5fd8fe95
+0,     101376,     101376,     1024,     4096, 0xd8c738e0
+0,     102400,     102400,     1024,     4096, 0xa9882686
+0,     103424,     103424,     1024,     4096, 0xfa30c4b1
+0,     104448,     104448,     1024,     4096, 0x76ecdb31
+0,     105472,     105472,     1024,     4096, 0x540ccff9
+0,     106496,     106496,     1024,     4096, 0xb365cf5f
+0,     107520,     107520,     1024,     4096, 0x3ab51dcc
+0,     108544,     108544,     1024,     4096, 0x266fd553
+0,     109568,     109568,     1024,     4096, 0xdac42f58
+0,     110592,     110592,     1024,     4096, 0x3ab23628
+0,     111616,     111616,     1024,     4096, 0x94c9a8bf
+0,     112640,     112640,     1024,     4096, 0x7ba5ff41
+0,     113664,     113664,     1024,     4096, 0xc6bfd5db
+0,     114688,     114688,     1024,     4096, 0x6b9ef98f
+0,     115712,     115712,     1024,     4096, 0xe5621a02
+0,     116736,     116736,     1024,     4096, 0xeedd28ec
+0,     117760,     117760,     1024,     4096, 0xddf5e045
+0,     118784,     118784,     1024,     4096, 0x49f0e0a9
+0,     119808,     119808,     1024,     4096, 0xd18f0ca0
+0,     120832,     120832,     1024,     4096, 0xa0fa00c6
+0,     121856,     121856,     1024,     4096, 0x9e406e6c
+0,     122880,     122880,     1024,     4096, 0x1a3f23bc
+0,     123904,     123904,     1024,     4096, 0xcbf409d0
+0,     124928,     124928,     1024,     4096, 0x499b3ac8
+0,     125952,     125952,     1024,     4096, 0x2ef93980
+0,     126976,     126976,     1024,     4096, 0x83092bfa
+0,     128000,     128000,     1024,     4096, 0x4838093a
+0,     129024,     129024,     1024,     4096, 0xd1bff209
+0,     130048,     130048,     1024,     4096, 0xdef04f12
+0,     131072,     131072,     1024,     4096, 0x130dd787
+0,     132096,     132096,     1024,     4096, 0xc8621030
+0,     133120,     133120,     1024,     4096, 0x1b2bf867
+0,     134144,     134144,     1024,     4096, 0x01220341
+0,     135168,     135168,     1024,     4096, 0x7c8dfdb1
+0,     136192,     136192,     1024,     4096, 0xe81df813
+0,     137216,     137216,     1024,     4096, 0xf820fe8d
+0,     138240,     138240,     1024,     4096, 0x1f9dfe49
+0,     139264,     139264,     1024,     4096, 0x2f84f144
+0,     140288,     140288,     1024,     4096, 0xab9deec8
+0,     141312,     141312,     1024,     4096, 0x7d7bf5b9
+0,     142336,     142336,     1024,     4096, 0xbecff5ea
+0,     143360,     143360,     1024,     4096, 0x2872e5c0
+0,     144384,     144384,     1024,     4096, 0x6e2ff713
+0,     145408,     145408,     1024,     4096, 0x0b2df757
+0,     146432,     146432,     1024,     4096, 0x5030fa0a
+0,     147456,     147456,     1024,     4096, 0xb5b5f3da
+0,     148480,     148480,     1024,     4096, 0xce4cf9a6
+0,     149504,     149504,     1024,     4096, 0x9eacf61f
+0,     150528,     150528,     1024,     4096, 0x3bfff549
+0,     151552,     151552,     1024,     4096, 0x4eeae60a
+0,     152576,     152576,     1024,     4096, 0x188ef258
+0,     153600,     153600,     1024,     4096, 0xb546f30d
+0,     154624,     154624,     1024,     4096, 0x0a84e6f8
+0,     155648,     155648,     1024,     4096, 0xe7b0ee27
+0,     156672,     156672,     1024,     4096, 0x04d0f6ee
+0,     157696,     157696,     1024,     4096, 0x09fa042a
+0,     158720,     158720,     1024,     4096, 0x5a3cf418
+0,     159744,     159744,     1024,     4096, 0x89d8017f
+0,     160768,     160768,     1024,     4096, 0x64eb0320
+0,     161792,     161792,     1024,     4096, 0xe40df279
+0,     162816,     162816,     1024,     4096, 0x4dc4fd25
+0,     163840,     163840,     1024,     4096, 0x466af97c
+0,     164864,     164864,     1024,     4096, 0x7306f4e2
+0,     165888,     165888,     1024,     4096, 0x9782eda4
+0,     166912,     166912,     1024,     4096, 0x3635fad8
+0,     167936,     167936,     1024,     4096, 0x3344eabe
+0,     168960,     168960,     1024,     4096, 0x9143fda0
+0,     169984,     169984,     1024,     4096, 0x33e7eb7f
+0,     171008,     171008,     1024,     4096, 0x4ca0e947
+0,     172032,     172032,     1024,     4096, 0x5b1bf80d
+0,     173056,     173056,     1024,     4096, 0xbb15eab7
+0,     174080,     174080,     1024,     4096, 0xd800f7cb
+0,     175104,     175104,     1024,     4096, 0xd3d4e960
+0,     176128,     176128,     1024,     4096, 0x2fc30f2f
+0,     177152,     177152,     1024,     4096, 0xb410f092
+0,     178176,     178176,     1024,     4096, 0x4350fddf
+0,     179200,     179200,     1024,     4096, 0x477a07c6
+0,     180224,     180224,     1024,     4096, 0x9d48ed59
+0,     181248,     181248,     1024,     4096, 0xd6ae02a8
+0,     182272,     182272,     1024,     4096, 0x206be433
+0,     183296,     183296,     1024,     4096, 0xf465fc54
+0,     184320,     184320,     1024,     4096, 0x745dacb9
+0,     185344,     185344,     1024,     4096, 0x3783e765
+0,     186368,     186368,     1024,     4096, 0x479feb48
+0,     187392,     187392,     1024,     4096, 0x34f2050f
+0,     188416,     188416,     1024,     4096, 0x9df1f441
+0,     189440,     189440,     1024,     4096, 0x1864f225
+0,     190464,     190464,     1024,     4096, 0xebacf084
+0,     191488,     191488,     1024,     4096, 0xaa14f082
+0,     192512,     192512,     1024,     4096, 0xbac10f8b
+0,     193536,     193536,     1024,     4096, 0xa4520210
+0,     194560,     194560,     1024,     4096, 0xfee4f8c3
+0,     195584,     195584,     1024,     4096, 0xadf5e4c2
+0,     196608,     196608,     1024,     4096, 0x7bf20584
+0,     197632,     197632,     1024,     4096, 0x541debf5
+0,     198656,     198656,     1024,     4096, 0x9a350796
+0,     199680,     199680,     1024,     4096, 0x1388fa83
+0,     200704,     200704,     1024,     4096, 0x9839b0c2
+0,     201728,     201728,     1024,     4096, 0xfc9afff0
+0,     202752,     202752,     1024,     4096, 0x73100a7c
+0,     203776,     203776,     1024,     4096, 0xb56df070
+0,     204800,     204800,     1024,     4096, 0x71d8efa7
+0,     205824,     205824,     1024,     4096, 0xde800412
+0,     206848,     206848,     1024,     4096, 0x7bf7f840
+0,     207872,     207872,     1024,     4096, 0x1480044d
+0,     208896,     208896,     1024,     4096, 0x60201217
+0,     209920,     209920,     1024,     4096, 0xb410f092
+0,     210944,     210944,     1024,     4096, 0x4350fddf
+0,     211968,     211968,     1024,     4096, 0x477a07c6
+0,     212992,     212992,     1024,     4096, 0x9d48ed59
+0,     214016,     214016,     1024,     4096, 0xd6ae02a8
+0,     215040,     215040,     1024,     4096, 0x206be433
+0,     216064,     216064,     1024,     4096, 0xf465fc54
+0,     217088,     217088,     1024,     4096, 0x745dacb9
+0,     218112,     218112,     1024,     4096, 0x3783e765
+0,     219136,     219136,     1024,     4096, 0x479feb48
+0,     220160,     220160,     1024,     4096, 0x34f2050f
+0,     221184,     221184,     1024,     4096, 0x9df1f441
+0,     222208,     222208,     1024,     4096, 0x1864f225
+0,     223232,     223232,     1024,     4096, 0xebacf084
+0,     224256,     224256,     1024,     4096, 0xaa14f082
+0,     225280,     225280,     1024,     4096, 0xbac10f8b
+0,     226304,     226304,     1024,     4096, 0xa4520210
+0,     227328,     227328,     1024,     4096, 0xfee4f8c3
+0,     228352,     228352,     1024,     4096, 0xadf5e4c2
+0,     229376,     229376,     1024,     4096, 0x7bf20584
+0,     230400,     230400,     1024,     4096, 0x541debf5
+0,     231424,     231424,     1024,     4096, 0x9a350796
+0,     232448,     232448,     1024,     4096, 0x1388fa83
+0,     233472,     233472,     1024,     4096, 0x9839b0c2
+0,     234496,     234496,     1024,     4096, 0xfc9afff0
+0,     235520,     235520,     1024,     4096, 0x73100a7c
+0,     236544,     236544,     1024,     4096, 0xb56df070
+0,     237568,     237568,     1024,     4096, 0x71d8efa7
+0,     238592,     238592,     1024,     4096, 0xde800412
+0,     239616,     239616,     1024,     4096, 0x7bf7f840
+0,     240640,     240640,     1024,     4096, 0x1480044d
+0,     241664,     241664,     1024,     4096, 0x60201217
+0,     242688,     242688,     1024,     4096, 0xb410f092
+0,     243712,     243712,     1024,     4096, 0x4350fddf
+0,     244736,     244736,     1024,     4096, 0x477a07c6
+0,     245760,     245760,     1024,     4096, 0x9d48ed59
+0,     246784,     246784,     1024,     4096, 0xd6ae02a8
+0,     247808,     247808,     1024,     4096, 0x206be433
+0,     248832,     248832,     1024,     4096, 0xf465fc54
+0,     249856,     249856,     1024,     4096, 0x745dacb9
+0,     250880,     250880,     1024,     4096, 0x3783e765
+0,     251904,     251904,     1024,     4096, 0x479feb48
+0,     252928,     252928,     1024,     4096, 0x34f2050f
+0,     253952,     253952,     1024,     4096, 0x9df1f441
+0,     254976,     254976,     1024,     4096, 0x1864f225
+0,     256000,     256000,     1024,     4096, 0xebacf084
+0,     257024,     257024,     1024,     4096, 0xaa14f082
+0,     258048,     258048,     1024,     4096, 0xbac10f8b
+0,     259072,     259072,     1024,     4096, 0xa4520210
+0,     260096,     260096,     1024,     4096, 0xfee4f8c3
+0,     261120,     261120,     1024,     4096, 0xadf5e4c2
+0,     262144,     262144,     1024,     4096, 0x7bf20584
+0,     263168,     263168,     1024,     4096, 0x541debf5
+0,     264192,     264192,      408,     1632, 0xadd02d39
diff --git a/tests/ref/fate/filter-aemphasis-75kf b/tests/ref/fate/filter-aemphasis-75kf
new file mode 100644
index 0000000000..5705e98338
--- /dev/null
+++ b/tests/ref/fate/filter-aemphasis-75kf
@@ -0,0 +1,265 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x7b2101ec
+0,       1024,       1024,     1024,     4096, 0x5c16fc93
+0,       2048,       2048,     1024,     4096, 0x62bdee5d
+0,       3072,       3072,     1024,     4096, 0x0299ee41
+0,       4096,       4096,     1024,     4096, 0xdd2efe95
+0,       5120,       5120,     1024,     4096, 0xe9380628
+0,       6144,       6144,     1024,     4096, 0x5d84f1f3
+0,       7168,       7168,     1024,     4096, 0x598beeb3
+0,       8192,       8192,     1024,     4096, 0x21fefb25
+0,       9216,       9216,     1024,     4096, 0x053afefb
+0,      10240,      10240,     1024,     4096, 0xb993fd2b
+0,      11264,      11264,     1024,     4096, 0xa05aeae1
+0,      12288,      12288,     1024,     4096, 0x3e1ff497
+0,      13312,      13312,     1024,     4096, 0x7f5a086c
+0,      14336,      14336,     1024,     4096, 0xad580300
+0,      15360,      15360,     1024,     4096, 0xbcaff05d
+0,      16384,      16384,     1024,     4096, 0xfd8def91
+0,      17408,      17408,     1024,     4096, 0x5cfdfa7b
+0,      18432,      18432,     1024,     4096, 0xd67dff11
+0,      19456,      19456,     1024,     4096, 0x01b2ff0f
+0,      20480,      20480,     1024,     4096, 0x7138ec9d
+0,      21504,      21504,     1024,     4096, 0xb09ef761
+0,      22528,      22528,     1024,     4096, 0x92f3f97b
+0,      23552,      23552,     1024,     4096, 0x2ee8fe7d
+0,      24576,      24576,     1024,     4096, 0x290ef437
+0,      25600,      25600,     1024,     4096, 0x37daee71
+0,      26624,      26624,     1024,     4096, 0x63e9f5e1
+0,      27648,      27648,     1024,     4096, 0x643008d0
+0,      28672,      28672,     1024,     4096, 0xa427fc59
+0,      29696,      29696,     1024,     4096, 0xf196ed25
+0,      30720,      30720,     1024,     4096, 0xc1edeab9
+0,      31744,      31744,     1024,     4096, 0xaf9a0280
+0,      32768,      32768,     1024,     4096, 0x86cf0026
+0,      33792,      33792,     1024,     4096, 0x5c16fc93
+0,      34816,      34816,     1024,     4096, 0x62bdee5d
+0,      35840,      35840,     1024,     4096, 0x0299ee41
+0,      36864,      36864,     1024,     4096, 0xdd2efe95
+0,      37888,      37888,     1024,     4096, 0xe9380628
+0,      38912,      38912,     1024,     4096, 0x5d84f1f3
+0,      39936,      39936,     1024,     4096, 0x598beeb3
+0,      40960,      40960,     1024,     4096, 0x21fefb25
+0,      41984,      41984,     1024,     4096, 0x053afefb
+0,      43008,      43008,     1024,     4096, 0xb993fd2b
+0,      44032,      44032,     1024,     4096, 0xeccc08c6
+0,      45056,      45056,     1024,     4096, 0xceb5f1af
+0,      46080,      46080,     1024,     4096, 0xfee9e279
+0,      47104,      47104,     1024,     4096, 0x4b2a02cc
+0,      48128,      48128,     1024,     4096, 0xdc22ff19
+0,      49152,      49152,     1024,     4096, 0x557cf4e9
+0,      50176,      50176,     1024,     4096, 0x7fe2042c
+0,      51200,      51200,     1024,     4096, 0x0793eb0b
+0,      52224,      52224,     1024,     4096, 0x8bba058e
+0,      53248,      53248,     1024,     4096, 0x3336f807
+0,      54272,      54272,     1024,     4096, 0x86cef823
+0,      55296,      55296,     1024,     4096, 0x07cbefb1
+0,      56320,      56320,     1024,     4096, 0x01c3fab1
+0,      57344,      57344,     1024,     4096, 0xb9a60534
+0,      58368,      58368,     1024,     4096, 0xf8cf0e82
+0,      59392,      59392,     1024,     4096, 0x5caef379
+0,      60416,      60416,     1024,     4096, 0xe2a9dbbd
+0,      61440,      61440,     1024,     4096, 0xe31c09a6
+0,      62464,      62464,     1024,     4096, 0x0524f37d
+0,      63488,      63488,     1024,     4096, 0x92101602
+0,      64512,      64512,     1024,     4096, 0xed00d97b
+0,      65536,      65536,     1024,     4096, 0x2058f609
+0,      66560,      66560,     1024,     4096, 0x30d20634
+0,      67584,      67584,     1024,     4096, 0xa0ddf055
+0,      68608,      68608,     1024,     4096, 0xe23e1946
+0,      69632,      69632,     1024,     4096, 0x2c1af97f
+0,      70656,      70656,     1024,     4096, 0x77f6f2a9
+0,      71680,      71680,     1024,     4096, 0x2b67ff03
+0,      72704,      72704,     1024,     4096, 0x3e26f14b
+0,      73728,      73728,     1024,     4096, 0x0439e425
+0,      74752,      74752,     1024,     4096, 0xb08ef9d1
+0,      75776,      75776,     1024,     4096, 0xac9fede5
+0,      76800,      76800,     1024,     4096, 0xa637f3e7
+0,      77824,      77824,     1024,     4096, 0xbf7307b0
+0,      78848,      78848,     1024,     4096, 0xce41f5b3
+0,      79872,      79872,     1024,     4096, 0xd6b8f619
+0,      80896,      80896,     1024,     4096, 0x5837097e
+0,      81920,      81920,     1024,     4096, 0xc6affc23
+0,      82944,      82944,     1024,     4096, 0x630e070c
+0,      83968,      83968,     1024,     4096, 0x570ffcd5
+0,      84992,      84992,     1024,     4096, 0x71ede781
+0,      86016,      86016,     1024,     4096, 0x703afda5
+0,      87040,      87040,     1024,     4096, 0x71390f4c
+0,      88064,      88064,     1024,     4096, 0x3961f293
+0,      89088,      89088,     1024,     4096, 0xd288b2b9
+0,      90112,      90112,     1024,     4096, 0xbf4c2946
+0,      91136,      91136,     1024,     4096, 0x71deea79
+0,      92160,      92160,     1024,     4096, 0xbb37625e
+0,      93184,      93184,     1024,     4096, 0xd84df25b
+0,      94208,      94208,     1024,     4096, 0xfde1fc9f
+0,      95232,      95232,     1024,     4096, 0x1a49de0f
+0,      96256,      96256,     1024,     4096, 0x1b11eb13
+0,      97280,      97280,     1024,     4096, 0x4ae88343
+0,      98304,      98304,     1024,     4096, 0x299c361a
+0,      99328,      99328,     1024,     4096, 0x14b7d5cd
+0,     100352,     100352,     1024,     4096, 0x40a318fc
+0,     101376,     101376,     1024,     4096, 0x7fb1d8c7
+0,     102400,     102400,     1024,     4096, 0xfe57c82d
+0,     103424,     103424,     1024,     4096, 0xf9a605fc
+0,     104448,     104448,     1024,     4096, 0x29c912f2
+0,     105472,     105472,     1024,     4096, 0x9886da01
+0,     106496,     106496,     1024,     4096, 0x0398f57f
+0,     107520,     107520,     1024,     4096, 0xed1901c8
+0,     108544,     108544,     1024,     4096, 0xa439ef27
+0,     109568,     109568,     1024,     4096, 0xf1a0ca51
+0,     110592,     110592,     1024,     4096, 0xea605b14
+0,     111616,     111616,     1024,     4096, 0xf014a837
+0,     112640,     112640,     1024,     4096, 0x363e3b90
+0,     113664,     113664,     1024,     4096, 0x24a10ca4
+0,     114688,     114688,     1024,     4096, 0x5b562146
+0,     115712,     115712,     1024,     4096, 0xb1291324
+0,     116736,     116736,     1024,     4096, 0xd4797cbe
+0,     117760,     117760,     1024,     4096, 0x526813b4
+0,     118784,     118784,     1024,     4096, 0x634bc887
+0,     119808,     119808,     1024,     4096, 0x6523e6c3
+0,     120832,     120832,     1024,     4096, 0xa244da0d
+0,     121856,     121856,     1024,     4096, 0xec5ba956
+0,     122880,     122880,     1024,     4096, 0xf31b57a6
+0,     123904,     123904,     1024,     4096, 0xf5262d84
+0,     124928,     124928,     1024,     4096, 0x50c37f34
+0,     125952,     125952,     1024,     4096, 0x81286432
+0,     126976,     126976,     1024,     4096, 0x4d2340a2
+0,     128000,     128000,     1024,     4096, 0x37be060a
+0,     129024,     129024,     1024,     4096, 0xdad60e30
+0,     130048,     130048,     1024,     4096, 0x376c38f6
+0,     131072,     131072,     1024,     4096, 0xe44fe77d
+0,     132096,     132096,     1024,     4096, 0xe7a4f806
+0,     133120,     133120,     1024,     4096, 0xc652fc4c
+0,     134144,     134144,     1024,     4096, 0xb8e8fbb6
+0,     135168,     135168,     1024,     4096, 0x95480279
+0,     136192,     136192,     1024,     4096, 0x095b0036
+0,     137216,     137216,     1024,     4096, 0x5397fc40
+0,     138240,     138240,     1024,     4096, 0xb836f79b
+0,     139264,     139264,     1024,     4096, 0x370ef64f
+0,     140288,     140288,     1024,     4096, 0xd6aefae9
+0,     141312,     141312,     1024,     4096, 0xbe08f80a
+0,     142336,     142336,     1024,     4096, 0x5b41ff1c
+0,     143360,     143360,     1024,     4096, 0x5b86faee
+0,     144384,     144384,     1024,     4096, 0x3a0ff0b5
+0,     145408,     145408,     1024,     4096, 0x6157fa3f
+0,     146432,     146432,     1024,     4096, 0x60a9f906
+0,     147456,     147456,     1024,     4096, 0x8ecdfc26
+0,     148480,     148480,     1024,     4096, 0x0146f112
+0,     149504,     149504,     1024,     4096, 0xc163fe87
+0,     150528,     150528,     1024,     4096, 0x2e78f5c4
+0,     151552,     151552,     1024,     4096, 0x3e9bed7d
+0,     152576,     152576,     1024,     4096, 0xb776009c
+0,     153600,     153600,     1024,     4096, 0xea1efaba
+0,     154624,     154624,     1024,     4096, 0x45f2ea57
+0,     155648,     155648,     1024,     4096, 0x5456f53f
+0,     156672,     156672,     1024,     4096, 0x7e3bf2b9
+0,     157696,     157696,     1024,     4096, 0x0952fd4b
+0,     158720,     158720,     1024,     4096, 0xb8e6f10c
+0,     159744,     159744,     1024,     4096, 0xa07ff79c
+0,     160768,     160768,     1024,     4096, 0x55bafbfd
+0,     161792,     161792,     1024,     4096, 0xab81ed83
+0,     162816,     162816,     1024,     4096, 0x5a610066
+0,     163840,     163840,     1024,     4096, 0x0ac90160
+0,     164864,     164864,     1024,     4096, 0x5745f93f
+0,     165888,     165888,     1024,     4096, 0x9cf2f284
+0,     166912,     166912,     1024,     4096, 0xd350ef0b
+0,     167936,     167936,     1024,     4096, 0x3f47f217
+0,     168960,     168960,     1024,     4096, 0xf178fbae
+0,     169984,     169984,     1024,     4096, 0xf74a056a
+0,     171008,     171008,     1024,     4096, 0xc345ede5
+0,     172032,     172032,     1024,     4096, 0xa672f2be
+0,     173056,     173056,     1024,     4096, 0xd5bcf917
+0,     174080,     174080,     1024,     4096, 0x8126f699
+0,     175104,     175104,     1024,     4096, 0xa0d3ebfd
+0,     176128,     176128,     1024,     4096, 0x577f1d75
+0,     177152,     177152,     1024,     4096, 0x6047ffe4
+0,     178176,     178176,     1024,     4096, 0xe89df7c9
+0,     179200,     179200,     1024,     4096, 0x2ea3f621
+0,     180224,     180224,     1024,     4096, 0xda4f05ef
+0,     181248,     181248,     1024,     4096, 0x5d7c07ba
+0,     182272,     182272,     1024,     4096, 0x461be644
+0,     183296,     183296,     1024,     4096, 0xce47f434
+0,     184320,     184320,     1024,     4096, 0xb30bacee
+0,     185344,     185344,     1024,     4096, 0x1c85f71d
+0,     186368,     186368,     1024,     4096, 0xc9a0f1cd
+0,     187392,     187392,     1024,     4096, 0xd939edde
+0,     188416,     188416,     1024,     4096, 0xa8e0e086
+0,     189440,     189440,     1024,     4096, 0xc0b6ff00
+0,     190464,     190464,     1024,     4096, 0xdd84005e
+0,     191488,     191488,     1024,     4096, 0x97d103bf
+0,     192512,     192512,     1024,     4096, 0xa0241ffc
+0,     193536,     193536,     1024,     4096, 0x91a4f35a
+0,     194560,     194560,     1024,     4096, 0x61abf0b0
+0,     195584,     195584,     1024,     4096, 0xa5d10111
+0,     196608,     196608,     1024,     4096, 0x0e71f5ce
+0,     197632,     197632,     1024,     4096, 0x4796f9fa
+0,     198656,     198656,     1024,     4096, 0x561bf893
+0,     199680,     199680,     1024,     4096, 0x70ddfb78
+0,     200704,     200704,     1024,     4096, 0xe4f4c2b6
+0,     201728,     201728,     1024,     4096, 0x5452f356
+0,     202752,     202752,     1024,     4096, 0x84e2fd14
+0,     203776,     203776,     1024,     4096, 0xd04b00a5
+0,     204800,     204800,     1024,     4096, 0x01ca0f7c
+0,     205824,     205824,     1024,     4096, 0x1685ef21
+0,     206848,     206848,     1024,     4096, 0x50effa4f
+0,     207872,     207872,     1024,     4096, 0xb5a9e82f
+0,     208896,     208896,     1024,     4096, 0xa7343704
+0,     209920,     209920,     1024,     4096, 0x6047ffe4
+0,     210944,     210944,     1024,     4096, 0xe89df7c9
+0,     211968,     211968,     1024,     4096, 0x2ea3f621
+0,     212992,     212992,     1024,     4096, 0xda4f05ef
+0,     214016,     214016,     1024,     4096, 0x5d7c07ba
+0,     215040,     215040,     1024,     4096, 0x461be644
+0,     216064,     216064,     1024,     4096, 0xce47f434
+0,     217088,     217088,     1024,     4096, 0xb30bacee
+0,     218112,     218112,     1024,     4096, 0x1c85f71d
+0,     219136,     219136,     1024,     4096, 0xc9a0f1cd
+0,     220160,     220160,     1024,     4096, 0xd939edde
+0,     221184,     221184,     1024,     4096, 0xa8e0e086
+0,     222208,     222208,     1024,     4096, 0xc0b6ff00
+0,     223232,     223232,     1024,     4096, 0xdd84005e
+0,     224256,     224256,     1024,     4096, 0x97d103bf
+0,     225280,     225280,     1024,     4096, 0xa0241ffc
+0,     226304,     226304,     1024,     4096, 0x91a4f35a
+0,     227328,     227328,     1024,     4096, 0x61abf0b0
+0,     228352,     228352,     1024,     4096, 0xa5d10111
+0,     229376,     229376,     1024,     4096, 0x0e71f5ce
+0,     230400,     230400,     1024,     4096, 0x4796f9fa
+0,     231424,     231424,     1024,     4096, 0x561bf893
+0,     232448,     232448,     1024,     4096, 0x70ddfb78
+0,     233472,     233472,     1024,     4096, 0xe4f4c2b6
+0,     234496,     234496,     1024,     4096, 0x5452f356
+0,     235520,     235520,     1024,     4096, 0x84e2fd14
+0,     236544,     236544,     1024,     4096, 0xd04b00a5
+0,     237568,     237568,     1024,     4096, 0x01ca0f7c
+0,     238592,     238592,     1024,     4096, 0x1685ef21
+0,     239616,     239616,     1024,     4096, 0x50effa4f
+0,     240640,     240640,     1024,     4096, 0xb5a9e82f
+0,     241664,     241664,     1024,     4096, 0xa7343704
+0,     242688,     242688,     1024,     4096, 0x6047ffe4
+0,     243712,     243712,     1024,     4096, 0xe89df7c9
+0,     244736,     244736,     1024,     4096, 0x2ea3f621
+0,     245760,     245760,     1024,     4096, 0xda4f05ef
+0,     246784,     246784,     1024,     4096, 0x5d7c07ba
+0,     247808,     247808,     1024,     4096, 0x461be644
+0,     248832,     248832,     1024,     4096, 0xce47f434
+0,     249856,     249856,     1024,     4096, 0xb30bacee
+0,     250880,     250880,     1024,     4096, 0x1c85f71d
+0,     251904,     251904,     1024,     4096, 0xc9a0f1cd
+0,     252928,     252928,     1024,     4096, 0xd939edde
+0,     253952,     253952,     1024,     4096, 0xa8e0e086
+0,     254976,     254976,     1024,     4096, 0xc0b6ff00
+0,     256000,     256000,     1024,     4096, 0xdd84005e
+0,     257024,     257024,     1024,     4096, 0x97d103bf
+0,     258048,     258048,     1024,     4096, 0xa0241ffc
+0,     259072,     259072,     1024,     4096, 0x91a4f35a
+0,     260096,     260096,     1024,     4096, 0x61abf0b0
+0,     261120,     261120,     1024,     4096, 0xa5d10111
+0,     262144,     262144,     1024,     4096, 0x0e71f5ce
+0,     263168,     263168,     1024,     4096, 0x4796f9fa
+0,     264192,     264192,      408,     1632, 0x31842eec
diff --git a/tests/ref/fate/filter-afade-esin b/tests/ref/fate/filter-afade-esin
new file mode 100644
index 0000000000..f9b910c693
--- /dev/null
+++ b/tests/ref/fate/filter-afade-esin
@@ -0,0 +1,265 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x06e0d68a
+0,       1024,       1024,     1024,     4096, 0xb325d915
+0,       2048,       2048,     1024,     4096, 0xc0a5f1f1
+0,       3072,       3072,     1024,     4096, 0x47dbf54d
+0,       4096,       4096,     1024,     4096, 0x9f76e869
+0,       5120,       5120,     1024,     4096, 0xfbcaeb51
+0,       6144,       6144,     1024,     4096, 0xa16309a6
+0,       7168,       7168,     1024,     4096, 0x2890fe67
+0,       8192,       8192,     1024,     4096, 0x1cefee6b
+0,       9216,       9216,     1024,     4096, 0x0ad7ea27
+0,      10240,      10240,     1024,     4096, 0x8df7f895
+0,      11264,      11264,     1024,     4096, 0x19c0fa19
+0,      12288,      12288,     1024,     4096, 0x5cb4fdc5
+0,      13312,      13312,     1024,     4096, 0xcfc2f1ef
+0,      14336,      14336,     1024,     4096, 0x24b8f073
+0,      15360,      15360,     1024,     4096, 0x2ff6fa85
+0,      16384,      16384,     1024,     4096, 0x6fcffd03
+0,      17408,      17408,     1024,     4096, 0xe576e477
+0,      18432,      18432,     1024,     4096, 0xe0f6f54f
+0,      19456,      19456,     1024,     4096, 0xc225f5f7
+0,      20480,      20480,     1024,     4096, 0xe6d9fe57
+0,      21504,      21504,     1024,     4096, 0x8bc60f78
+0,      22528,      22528,     1024,     4096, 0xc907eeb1
+0,      23552,      23552,     1024,     4096, 0xd691f071
+0,      24576,      24576,     1024,     4096, 0x939402ee
+0,      25600,      25600,     1024,     4096, 0x19270cc4
+0,      26624,      26624,     1024,     4096, 0x25c5ed9b
+0,      27648,      27648,     1024,     4096, 0x0dbce7eb
+0,      28672,      28672,     1024,     4096, 0x035fff0f
+0,      29696,      29696,     1024,     4096, 0x514a0802
+0,      30720,      30720,     1024,     4096, 0x0de0043e
+0,      31744,      31744,     1024,     4096, 0xb576e1ab
+0,      32768,      32768,     1024,     4096, 0xcf30ee2f
+0,      33792,      33792,     1024,     4096, 0xae49f86d
+0,      34816,      34816,     1024,     4096, 0x42a202ac
+0,      35840,      35840,     1024,     4096, 0x762af249
+0,      36864,      36864,     1024,     4096, 0xb966eba5
+0,      37888,      37888,     1024,     4096, 0xeefeec79
+0,      38912,      38912,     1024,     4096, 0x62b00688
+0,      39936,      39936,     1024,     4096, 0x206efe91
+0,      40960,      40960,     1024,     4096, 0x2f69ef73
+0,      41984,      41984,     1024,     4096, 0x375cf043
+0,      43008,      43008,     1024,     4096, 0x096affd3
+0,      44032,      44032,     1024,     4096, 0x076ef11f
+0,      45056,      45056,     1024,     4096, 0x2e3201a0
+0,      46080,      46080,     1024,     4096, 0xb53f1ba4
+0,      47104,      47104,     1024,     4096, 0x5b13e019
+0,      48128,      48128,     1024,     4096, 0x22640338
+0,      49152,      49152,     1024,     4096, 0xb502f22d
+0,      50176,      50176,     1024,     4096, 0x53dfd61f
+0,      51200,      51200,     1024,     4096, 0x2044f1f1
+0,      52224,      52224,     1024,     4096, 0x94ccf2c7
+0,      53248,      53248,     1024,     4096, 0xbddee399
+0,      54272,      54272,     1024,     4096, 0xf305ec59
+0,      55296,      55296,     1024,     4096, 0x49acfc6f
+0,      56320,      56320,     1024,     4096, 0xc855d77d
+0,      57344,      57344,     1024,     4096, 0x1ca1faf5
+0,      58368,      58368,     1024,     4096, 0x9bd41038
+0,      59392,      59392,     1024,     4096, 0x4b83f6b7
+0,      60416,      60416,     1024,     4096, 0xe9b2ff4b
+0,      61440,      61440,     1024,     4096, 0xd7afe26b
+0,      62464,      62464,     1024,     4096, 0x4282057a
+0,      63488,      63488,     1024,     4096, 0xbea2ebd1
+0,      64512,      64512,     1024,     4096, 0x434ef413
+0,      65536,      65536,     1024,     4096, 0x8cd70e28
+0,      66560,      66560,     1024,     4096, 0xcef91d96
+0,      67584,      67584,     1024,     4096, 0xd9abfa75
+0,      68608,      68608,     1024,     4096, 0x9793f0c7
+0,      69632,      69632,     1024,     4096, 0x734b090c
+0,      70656,      70656,     1024,     4096, 0xdcf0f981
+0,      71680,      71680,     1024,     4096, 0x05af1302
+0,      72704,      72704,     1024,     4096, 0x9d80f677
+0,      73728,      73728,     1024,     4096, 0xc4e10628
+0,      74752,      74752,     1024,     4096, 0xfa8ef6a9
+0,      75776,      75776,     1024,     4096, 0xf8c1f72f
+0,      76800,      76800,     1024,     4096, 0xcf9b028a
+0,      77824,      77824,     1024,     4096, 0x80c7f3cb
+0,      78848,      78848,     1024,     4096, 0x97e2e6e5
+0,      79872,      79872,     1024,     4096, 0x9301dc81
+0,      80896,      80896,     1024,     4096, 0x1a8aeaed
+0,      81920,      81920,     1024,     4096, 0xfd751e70
+0,      82944,      82944,     1024,     4096, 0xe7643dc0
+0,      83968,      83968,     1024,     4096, 0xe08f0788
+0,      84992,      84992,     1024,     4096, 0x4f1105cc
+0,      86016,      86016,     1024,     4096, 0xb25806c6
+0,      87040,      87040,     1024,     4096, 0xd66d282a
+0,      88064,      88064,     1024,     4096, 0x457ddf0d
+0,      89088,      89088,     1024,     4096, 0xe68dda8f
+0,      90112,      90112,     1024,     4096, 0xe457b505
+0,      91136,      91136,     1024,     4096, 0xda25a409
+0,      92160,      92160,     1024,     4096, 0x5b5d9d3b
+0,      93184,      93184,     1024,     4096, 0xa61eb13d
+0,      94208,      94208,     1024,     4096, 0xac93b66f
+0,      95232,      95232,     1024,     4096, 0xc7aeb33f
+0,      96256,      96256,     1024,     4096, 0x52cccfb5
+0,      97280,      97280,     1024,     4096, 0x4e4cf487
+0,      98304,      98304,     1024,     4096, 0x19c07f35
+0,      99328,      99328,     1024,     4096, 0x63ecd34f
+0,     100352,     100352,     1024,     4096, 0x122aec53
+0,     101376,     101376,     1024,     4096, 0x6581c0ad
+0,     102400,     102400,     1024,     4096, 0x640edb15
+0,     103424,     103424,     1024,     4096, 0x5d66c66f
+0,     104448,     104448,     1024,     4096, 0x069e9d35
+0,     105472,     105472,     1024,     4096, 0x5c9fd0e9
+0,     106496,     106496,     1024,     4096, 0x72468667
+0,     107520,     107520,     1024,     4096, 0x6e6dd02b
+0,     108544,     108544,     1024,     4096, 0x93edce33
+0,     109568,     109568,     1024,     4096, 0xcdfbd519
+0,     110592,     110592,     1024,     4096, 0x8463f2bb
+0,     111616,     111616,     1024,     4096, 0x5ca6f869
+0,     112640,     112640,     1024,     4096, 0x099a0398
+0,     113664,     113664,     1024,     4096, 0xa7fa10f0
+0,     114688,     114688,     1024,     4096, 0x28caddd3
+0,     115712,     115712,     1024,     4096, 0x4852ef8b
+0,     116736,     116736,     1024,     4096, 0x0250ee7b
+0,     117760,     117760,     1024,     4096, 0x9583da21
+0,     118784,     118784,     1024,     4096, 0x7365fb33
+0,     119808,     119808,     1024,     4096, 0x28c82066
+0,     120832,     120832,     1024,     4096, 0x94650be4
+0,     121856,     121856,     1024,     4096, 0xeb21f8eb
+0,     122880,     122880,     1024,     4096, 0xcd88f455
+0,     123904,     123904,     1024,     4096, 0x66a9efaf
+0,     124928,     124928,     1024,     4096, 0x5500c6ed
+0,     125952,     125952,     1024,     4096, 0x0ee0c62d
+0,     126976,     126976,     1024,     4096, 0x34d30762
+0,     128000,     128000,     1024,     4096, 0x8c0dec9f
+0,     129024,     129024,     1024,     4096, 0x790011d8
+0,     130048,     130048,     1024,     4096, 0xb76a1136
+0,     131072,     131072,     1024,     4096, 0x7dddfea7
+0,     132096,     132096,     1024,     4096, 0xdfa3ed49
+0,     133120,     133120,     1024,     4096, 0xc129f54e
+0,     134144,     134144,     1024,     4096, 0x9a86f077
+0,     135168,     135168,     1024,     4096, 0xc9eef209
+0,     136192,     136192,     1024,     4096, 0x72d4029b
+0,     137216,     137216,     1024,     4096, 0x8ec20590
+0,     138240,     138240,     1024,     4096, 0xd48f18ed
+0,     139264,     139264,     1024,     4096, 0xd807eadc
+0,     140288,     140288,     1024,     4096, 0x1e2bea09
+0,     141312,     141312,     1024,     4096, 0x937af12e
+0,     142336,     142336,     1024,     4096, 0xdedbf303
+0,     143360,     143360,     1024,     4096, 0xdc75df88
+0,     144384,     144384,     1024,     4096, 0x1845ffd6
+0,     145408,     145408,     1024,     4096, 0x20e8150c
+0,     146432,     146432,     1024,     4096, 0x5ea7eeef
+0,     147456,     147456,     1024,     4096, 0x4c7efa21
+0,     148480,     148480,     1024,     4096, 0x8b97e30e
+0,     149504,     149504,     1024,     4096, 0xe5040228
+0,     150528,     150528,     1024,     4096, 0x6283f78c
+0,     151552,     151552,     1024,     4096, 0xe7100140
+0,     152576,     152576,     1024,     4096, 0x9ea6f9b2
+0,     153600,     153600,     1024,     4096, 0x5f0e1563
+0,     154624,     154624,     1024,     4096, 0x510bf18e
+0,     155648,     155648,     1024,     4096, 0x5f4fe425
+0,     156672,     156672,     1024,     4096, 0x507af3c0
+0,     157696,     157696,     1024,     4096, 0xbf14ddc6
+0,     158720,     158720,     1024,     4096, 0x1871ed69
+0,     159744,     159744,     1024,     4096, 0xc349ef9f
+0,     160768,     160768,     1024,     4096, 0x4e2c1834
+0,     161792,     161792,     1024,     4096, 0x2383fe04
+0,     162816,     162816,     1024,     4096, 0x6626f415
+0,     163840,     163840,     1024,     4096, 0x283be379
+0,     164864,     164864,     1024,     4096, 0xc76c0ceb
+0,     165888,     165888,     1024,     4096, 0xa0b8040f
+0,     166912,     166912,     1024,     4096, 0x2535eb6d
+0,     167936,     167936,     1024,     4096, 0xeb180bb5
+0,     168960,     168960,     1024,     4096, 0xbc5cf059
+0,     169984,     169984,     1024,     4096, 0x1862f1ac
+0,     171008,     171008,     1024,     4096, 0x9cc2ea2b
+0,     172032,     172032,     1024,     4096, 0xbb9ae754
+0,     173056,     173056,     1024,     4096, 0x716debb5
+0,     174080,     174080,     1024,     4096, 0xff3aff2a
+0,     175104,     175104,     1024,     4096, 0x755dfa5c
+0,     176128,     176128,     1024,     4096, 0x3b830605
+0,     177152,     177152,     1024,     4096, 0x0030dc9e
+0,     178176,     178176,     1024,     4096, 0xb017fd54
+0,     179200,     179200,     1024,     4096, 0x5c7dfa2e
+0,     180224,     180224,     1024,     4096, 0x7887e599
+0,     181248,     181248,     1024,     4096, 0xb730e72f
+0,     182272,     182272,     1024,     4096, 0x6bb3fae4
+0,     183296,     183296,     1024,     4096, 0xcc08fc36
+0,     184320,     184320,     1024,     4096, 0x5afd9ec2
+0,     185344,     185344,     1024,     4096, 0xa1d3e83d
+0,     186368,     186368,     1024,     4096, 0x7f96013c
+0,     187392,     187392,     1024,     4096, 0x7a0afe31
+0,     188416,     188416,     1024,     4096, 0xa37d1701
+0,     189440,     189440,     1024,     4096, 0x4615ebc2
+0,     190464,     190464,     1024,     4096, 0x217005c1
+0,     191488,     191488,     1024,     4096, 0x1755f789
+0,     192512,     192512,     1024,     4096, 0x83e6db65
+0,     193536,     193536,     1024,     4096, 0x92ab1447
+0,     194560,     194560,     1024,     4096, 0xedbdf383
+0,     195584,     195584,     1024,     4096, 0x4316f6a9
+0,     196608,     196608,     1024,     4096, 0x1a6a0b4c
+0,     197632,     197632,     1024,     4096, 0xdfd809b7
+0,     198656,     198656,     1024,     4096, 0x1d2cf5f1
+0,     199680,     199680,     1024,     4096, 0xd366f4a1
+0,     200704,     200704,     1024,     4096, 0x6a2f86e0
+0,     201728,     201728,     1024,     4096, 0xf51f08a9
+0,     202752,     202752,     1024,     4096, 0x05edefa8
+0,     203776,     203776,     1024,     4096, 0x255df2a6
+0,     204800,     204800,     1024,     4096, 0xe881d9e4
+0,     205824,     205824,     1024,     4096, 0x50380523
+0,     206848,     206848,     1024,     4096, 0x8b93eb26
+0,     207872,     207872,     1024,     4096, 0x759cf94c
+0,     208896,     208896,     1024,     4096, 0x8474f591
+0,     209920,     209920,     1024,     4096, 0x0030dc9e
+0,     210944,     210944,     1024,     4096, 0xb017fd54
+0,     211968,     211968,     1024,     4096, 0x5c7dfa2e
+0,     212992,     212992,     1024,     4096, 0x7887e599
+0,     214016,     214016,     1024,     4096, 0xb730e72f
+0,     215040,     215040,     1024,     4096, 0x6bb3fae4
+0,     216064,     216064,     1024,     4096, 0xcc08fc36
+0,     217088,     217088,     1024,     4096, 0x5afd9ec2
+0,     218112,     218112,     1024,     4096, 0xa1d3e83d
+0,     219136,     219136,     1024,     4096, 0x7f96013c
+0,     220160,     220160,     1024,     4096, 0x7a0afe31
+0,     221184,     221184,     1024,     4096, 0xa37d1701
+0,     222208,     222208,     1024,     4096, 0x4615ebc2
+0,     223232,     223232,     1024,     4096, 0x217005c1
+0,     224256,     224256,     1024,     4096, 0x1755f789
+0,     225280,     225280,     1024,     4096, 0x83e6db65
+0,     226304,     226304,     1024,     4096, 0x92ab1447
+0,     227328,     227328,     1024,     4096, 0xedbdf383
+0,     228352,     228352,     1024,     4096, 0x4316f6a9
+0,     229376,     229376,     1024,     4096, 0x1a6a0b4c
+0,     230400,     230400,     1024,     4096, 0xdfd809b7
+0,     231424,     231424,     1024,     4096, 0x1d2cf5f1
+0,     232448,     232448,     1024,     4096, 0xd366f4a1
+0,     233472,     233472,     1024,     4096, 0x6a2f86e0
+0,     234496,     234496,     1024,     4096, 0xf51f08a9
+0,     235520,     235520,     1024,     4096, 0x05edefa8
+0,     236544,     236544,     1024,     4096, 0x255df2a6
+0,     237568,     237568,     1024,     4096, 0xe881d9e4
+0,     238592,     238592,     1024,     4096, 0x50380523
+0,     239616,     239616,     1024,     4096, 0x8b93eb26
+0,     240640,     240640,     1024,     4096, 0x759cf94c
+0,     241664,     241664,     1024,     4096, 0x8474f591
+0,     242688,     242688,     1024,     4096, 0x0030dc9e
+0,     243712,     243712,     1024,     4096, 0xb017fd54
+0,     244736,     244736,     1024,     4096, 0x5c7dfa2e
+0,     245760,     245760,     1024,     4096, 0x7887e599
+0,     246784,     246784,     1024,     4096, 0xb730e72f
+0,     247808,     247808,     1024,     4096, 0x6bb3fae4
+0,     248832,     248832,     1024,     4096, 0xcc08fc36
+0,     249856,     249856,     1024,     4096, 0x5afd9ec2
+0,     250880,     250880,     1024,     4096, 0xa1d3e83d
+0,     251904,     251904,     1024,     4096, 0x7f96013c
+0,     252928,     252928,     1024,     4096, 0x7a0afe31
+0,     253952,     253952,     1024,     4096, 0xa37d1701
+0,     254976,     254976,     1024,     4096, 0x4615ebc2
+0,     256000,     256000,     1024,     4096, 0x217005c1
+0,     257024,     257024,     1024,     4096, 0x1755f789
+0,     258048,     258048,     1024,     4096, 0x83e6db65
+0,     259072,     259072,     1024,     4096, 0x92ab1447
+0,     260096,     260096,     1024,     4096, 0xedbdf383
+0,     261120,     261120,     1024,     4096, 0x4316f6a9
+0,     262144,     262144,     1024,     4096, 0x1a6a0b4c
+0,     263168,     263168,     1024,     4096, 0xdfd809b7
+0,     264192,     264192,      408,     1632, 0xf412313e
diff --git a/tests/ref/fate/filter-afade-exp b/tests/ref/fate/filter-afade-exp
new file mode 100644
index 0000000000..a0c519cd8b
--- /dev/null
+++ b/tests/ref/fate/filter-afade-exp
@@ -0,0 +1,265 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x00000000
+0,       1024,       1024,     1024,     4096, 0x00000000
+0,       2048,       2048,     1024,     4096, 0x00000000
+0,       3072,       3072,     1024,     4096, 0x00000000
+0,       4096,       4096,     1024,     4096, 0x00000000
+0,       5120,       5120,     1024,     4096, 0x00000000
+0,       6144,       6144,     1024,     4096, 0x00000000
+0,       7168,       7168,     1024,     4096, 0x00000000
+0,       8192,       8192,     1024,     4096, 0x00000000
+0,       9216,       9216,     1024,     4096, 0x00000000
+0,      10240,      10240,     1024,     4096, 0x00000000
+0,      11264,      11264,     1024,     4096, 0x00000000
+0,      12288,      12288,     1024,     4096, 0x00000000
+0,      13312,      13312,     1024,     4096, 0x00000000
+0,      14336,      14336,     1024,     4096, 0x00000000
+0,      15360,      15360,     1024,     4096, 0x00000000
+0,      16384,      16384,     1024,     4096, 0x00000000
+0,      17408,      17408,     1024,     4096, 0xfc60376d
+0,      18432,      18432,     1024,     4096, 0xfbe8d6c0
+0,      19456,      19456,     1024,     4096, 0x3b98ba4f
+0,      20480,      20480,     1024,     4096, 0x127b81e8
+0,      21504,      21504,     1024,     4096, 0xeeadf5b8
+0,      22528,      22528,     1024,     4096, 0xef824db7
+0,      23552,      23552,     1024,     4096, 0x48f6a58f
+0,      24576,      24576,     1024,     4096, 0x6c5c0d42
+0,      25600,      25600,     1024,     4096, 0x22e15d00
+0,      26624,      26624,     1024,     4096, 0x64ac7524
+0,      27648,      27648,     1024,     4096, 0x2726994c
+0,      28672,      28672,     1024,     4096, 0x755bd4fa
+0,      29696,      29696,     1024,     4096, 0x9acb1493
+0,      30720,      30720,     1024,     4096, 0xc4172c91
+0,      31744,      31744,     1024,     4096, 0xcd69291d
+0,      32768,      32768,     1024,     4096, 0xd3d64131
+0,      33792,      33792,     1024,     4096, 0xb3656c7f
+0,      34816,      34816,     1024,     4096, 0x763c93f3
+0,      35840,      35840,     1024,     4096, 0x994c84a5
+0,      36864,      36864,     1024,     4096, 0xcc9f8d75
+0,      37888,      37888,     1024,     4096, 0x2e259d03
+0,      38912,      38912,     1024,     4096, 0xcbdfcb9b
+0,      39936,      39936,     1024,     4096, 0xb01dcb79
+0,      40960,      40960,     1024,     4096, 0x4857b15f
+0,      41984,      41984,     1024,     4096, 0x04d9be25
+0,      43008,      43008,     1024,     4096, 0xc199cc25
+0,      44032,      44032,     1024,     4096, 0x068ec625
+0,      45056,      45056,     1024,     4096, 0xa659e141
+0,      46080,      46080,     1024,     4096, 0xebaaf33b
+0,      47104,      47104,     1024,     4096, 0x7142c21d
+0,      48128,      48128,     1024,     4096, 0x7859ec77
+0,      49152,      49152,     1024,     4096, 0x2944ec67
+0,      50176,      50176,     1024,     4096, 0x5b39e887
+0,      51200,      51200,     1024,     4096, 0x21c4e84d
+0,      52224,      52224,     1024,     4096, 0xd803fd77
+0,      53248,      53248,     1024,     4096, 0xae9ae32b
+0,      54272,      54272,     1024,     4096, 0x31b3e87f
+0,      55296,      55296,     1024,     4096, 0x287201ec
+0,      56320,      56320,     1024,     4096, 0xfa79e70d
+0,      57344,      57344,     1024,     4096, 0x7867fc9b
+0,      58368,      58368,     1024,     4096, 0xa5ec116c
+0,      59392,      59392,     1024,     4096, 0xe948f5d7
+0,      60416,      60416,     1024,     4096, 0xdcbbf6a3
+0,      61440,      61440,     1024,     4096, 0xc1fcdeeb
+0,      62464,      62464,     1024,     4096, 0x17b6f4a1
+0,      63488,      63488,     1024,     4096, 0x7f6e0294
+0,      64512,      64512,     1024,     4096, 0x3c8ce06b
+0,      65536,      65536,     1024,     4096, 0x0901140a
+0,      66560,      66560,     1024,     4096, 0x6162e9a7
+0,      67584,      67584,     1024,     4096, 0x22efe78f
+0,      68608,      68608,     1024,     4096, 0x329afcd7
+0,      69632,      69632,     1024,     4096, 0x747908ca
+0,      70656,      70656,     1024,     4096, 0x5cd9f1db
+0,      71680,      71680,     1024,     4096, 0x113a3a4a
+0,      72704,      72704,     1024,     4096, 0x89bedd25
+0,      73728,      73728,     1024,     4096, 0x3baac187
+0,      74752,      74752,     1024,     4096, 0xd569d461
+0,      75776,      75776,     1024,     4096, 0x7d9b1c42
+0,      76800,      76800,     1024,     4096, 0xfbf0e679
+0,      77824,      77824,     1024,     4096, 0x9ece0f62
+0,      78848,      78848,     1024,     4096, 0xeb72f071
+0,      79872,      79872,     1024,     4096, 0xad5bdf6d
+0,      80896,      80896,     1024,     4096, 0xa6af0554
+0,      81920,      81920,     1024,     4096, 0xe0902960
+0,      82944,      82944,     1024,     4096, 0x077cfdf3
+0,      83968,      83968,     1024,     4096, 0xa48b059a
+0,      84992,      84992,     1024,     4096, 0x4e7df3db
+0,      86016,      86016,     1024,     4096, 0x0550e899
+0,      87040,      87040,     1024,     4096, 0xa63ff5a9
+0,      88064,      88064,     1024,     4096, 0x9c15bfa7
+0,      89088,      89088,     1024,     4096, 0xe68dda8f
+0,      90112,      90112,     1024,     4096, 0xe457b505
+0,      91136,      91136,     1024,     4096, 0xda25a409
+0,      92160,      92160,     1024,     4096, 0x5b5d9d3b
+0,      93184,      93184,     1024,     4096, 0xa61eb13d
+0,      94208,      94208,     1024,     4096, 0xac93b66f
+0,      95232,      95232,     1024,     4096, 0xc7aeb33f
+0,      96256,      96256,     1024,     4096, 0x52cccfb5
+0,      97280,      97280,     1024,     4096, 0x4e4cf487
+0,      98304,      98304,     1024,     4096, 0x19c07f35
+0,      99328,      99328,     1024,     4096, 0x63ecd34f
+0,     100352,     100352,     1024,     4096, 0x122aec53
+0,     101376,     101376,     1024,     4096, 0x6581c0ad
+0,     102400,     102400,     1024,     4096, 0x640edb15
+0,     103424,     103424,     1024,     4096, 0x5d66c66f
+0,     104448,     104448,     1024,     4096, 0x069e9d35
+0,     105472,     105472,     1024,     4096, 0x5c9fd0e9
+0,     106496,     106496,     1024,     4096, 0x72468667
+0,     107520,     107520,     1024,     4096, 0x6e6dd02b
+0,     108544,     108544,     1024,     4096, 0x93edce33
+0,     109568,     109568,     1024,     4096, 0xcdfbd519
+0,     110592,     110592,     1024,     4096, 0x8463f2bb
+0,     111616,     111616,     1024,     4096, 0x5ca6f869
+0,     112640,     112640,     1024,     4096, 0x099a0398
+0,     113664,     113664,     1024,     4096, 0xa7fa10f0
+0,     114688,     114688,     1024,     4096, 0x28caddd3
+0,     115712,     115712,     1024,     4096, 0x4852ef8b
+0,     116736,     116736,     1024,     4096, 0x0250ee7b
+0,     117760,     117760,     1024,     4096, 0x9583da21
+0,     118784,     118784,     1024,     4096, 0x7365fb33
+0,     119808,     119808,     1024,     4096, 0x28c82066
+0,     120832,     120832,     1024,     4096, 0x94650be4
+0,     121856,     121856,     1024,     4096, 0xeb21f8eb
+0,     122880,     122880,     1024,     4096, 0xcd88f455
+0,     123904,     123904,     1024,     4096, 0x66a9efaf
+0,     124928,     124928,     1024,     4096, 0x5500c6ed
+0,     125952,     125952,     1024,     4096, 0x0ee0c62d
+0,     126976,     126976,     1024,     4096, 0x34d30762
+0,     128000,     128000,     1024,     4096, 0x8c0dec9f
+0,     129024,     129024,     1024,     4096, 0x790011d8
+0,     130048,     130048,     1024,     4096, 0xb76a1136
+0,     131072,     131072,     1024,     4096, 0x7dddfea7
+0,     132096,     132096,     1024,     4096, 0xdfa3ed49
+0,     133120,     133120,     1024,     4096, 0xc129f54e
+0,     134144,     134144,     1024,     4096, 0x9a86f077
+0,     135168,     135168,     1024,     4096, 0xc9eef209
+0,     136192,     136192,     1024,     4096, 0x72d4029b
+0,     137216,     137216,     1024,     4096, 0x8ec20590
+0,     138240,     138240,     1024,     4096, 0xd48f18ed
+0,     139264,     139264,     1024,     4096, 0xd807eadc
+0,     140288,     140288,     1024,     4096, 0x1e2bea09
+0,     141312,     141312,     1024,     4096, 0x937af12e
+0,     142336,     142336,     1024,     4096, 0xdedbf303
+0,     143360,     143360,     1024,     4096, 0xdc75df88
+0,     144384,     144384,     1024,     4096, 0x1845ffd6
+0,     145408,     145408,     1024,     4096, 0x20e8150c
+0,     146432,     146432,     1024,     4096, 0x5ea7eeef
+0,     147456,     147456,     1024,     4096, 0x4c7efa21
+0,     148480,     148480,     1024,     4096, 0x8b97e30e
+0,     149504,     149504,     1024,     4096, 0xe5040228
+0,     150528,     150528,     1024,     4096, 0x6283f78c
+0,     151552,     151552,     1024,     4096, 0xe7100140
+0,     152576,     152576,     1024,     4096, 0x9ea6f9b2
+0,     153600,     153600,     1024,     4096, 0x5f0e1563
+0,     154624,     154624,     1024,     4096, 0x510bf18e
+0,     155648,     155648,     1024,     4096, 0x5f4fe425
+0,     156672,     156672,     1024,     4096, 0x507af3c0
+0,     157696,     157696,     1024,     4096, 0xbf14ddc6
+0,     158720,     158720,     1024,     4096, 0x1871ed69
+0,     159744,     159744,     1024,     4096, 0xc349ef9f
+0,     160768,     160768,     1024,     4096, 0x4e2c1834
+0,     161792,     161792,     1024,     4096, 0x2383fe04
+0,     162816,     162816,     1024,     4096, 0x6626f415
+0,     163840,     163840,     1024,     4096, 0x283be379
+0,     164864,     164864,     1024,     4096, 0xc76c0ceb
+0,     165888,     165888,     1024,     4096, 0xa0b8040f
+0,     166912,     166912,     1024,     4096, 0x2535eb6d
+0,     167936,     167936,     1024,     4096, 0xeb180bb5
+0,     168960,     168960,     1024,     4096, 0xbc5cf059
+0,     169984,     169984,     1024,     4096, 0x1862f1ac
+0,     171008,     171008,     1024,     4096, 0x9cc2ea2b
+0,     172032,     172032,     1024,     4096, 0xbb9ae754
+0,     173056,     173056,     1024,     4096, 0x716debb5
+0,     174080,     174080,     1024,     4096, 0xff3aff2a
+0,     175104,     175104,     1024,     4096, 0x755dfa5c
+0,     176128,     176128,     1024,     4096, 0x3b830605
+0,     177152,     177152,     1024,     4096, 0x0030dc9e
+0,     178176,     178176,     1024,     4096, 0xb017fd54
+0,     179200,     179200,     1024,     4096, 0x5c7dfa2e
+0,     180224,     180224,     1024,     4096, 0x7887e599
+0,     181248,     181248,     1024,     4096, 0xb730e72f
+0,     182272,     182272,     1024,     4096, 0x6bb3fae4
+0,     183296,     183296,     1024,     4096, 0xcc08fc36
+0,     184320,     184320,     1024,     4096, 0x5afd9ec2
+0,     185344,     185344,     1024,     4096, 0xa1d3e83d
+0,     186368,     186368,     1024,     4096, 0x7f96013c
+0,     187392,     187392,     1024,     4096, 0x7a0afe31
+0,     188416,     188416,     1024,     4096, 0xa37d1701
+0,     189440,     189440,     1024,     4096, 0x4615ebc2
+0,     190464,     190464,     1024,     4096, 0x217005c1
+0,     191488,     191488,     1024,     4096, 0x1755f789
+0,     192512,     192512,     1024,     4096, 0x83e6db65
+0,     193536,     193536,     1024,     4096, 0x92ab1447
+0,     194560,     194560,     1024,     4096, 0xedbdf383
+0,     195584,     195584,     1024,     4096, 0x4316f6a9
+0,     196608,     196608,     1024,     4096, 0x1a6a0b4c
+0,     197632,     197632,     1024,     4096, 0xdfd809b7
+0,     198656,     198656,     1024,     4096, 0x1d2cf5f1
+0,     199680,     199680,     1024,     4096, 0xd366f4a1
+0,     200704,     200704,     1024,     4096, 0x6a2f86e0
+0,     201728,     201728,     1024,     4096, 0xf51f08a9
+0,     202752,     202752,     1024,     4096, 0x05edefa8
+0,     203776,     203776,     1024,     4096, 0x255df2a6
+0,     204800,     204800,     1024,     4096, 0xe881d9e4
+0,     205824,     205824,     1024,     4096, 0x50380523
+0,     206848,     206848,     1024,     4096, 0x8b93eb26
+0,     207872,     207872,     1024,     4096, 0x759cf94c
+0,     208896,     208896,     1024,     4096, 0x8474f591
+0,     209920,     209920,     1024,     4096, 0x0030dc9e
+0,     210944,     210944,     1024,     4096, 0xb017fd54
+0,     211968,     211968,     1024,     4096, 0x5c7dfa2e
+0,     212992,     212992,     1024,     4096, 0x7887e599
+0,     214016,     214016,     1024,     4096, 0xb730e72f
+0,     215040,     215040,     1024,     4096, 0x6bb3fae4
+0,     216064,     216064,     1024,     4096, 0xcc08fc36
+0,     217088,     217088,     1024,     4096, 0x5afd9ec2
+0,     218112,     218112,     1024,     4096, 0xa1d3e83d
+0,     219136,     219136,     1024,     4096, 0x7f96013c
+0,     220160,     220160,     1024,     4096, 0x7a0afe31
+0,     221184,     221184,     1024,     4096, 0xa37d1701
+0,     222208,     222208,     1024,     4096, 0x4615ebc2
+0,     223232,     223232,     1024,     4096, 0x217005c1
+0,     224256,     224256,     1024,     4096, 0x1755f789
+0,     225280,     225280,     1024,     4096, 0x83e6db65
+0,     226304,     226304,     1024,     4096, 0x92ab1447
+0,     227328,     227328,     1024,     4096, 0xedbdf383
+0,     228352,     228352,     1024,     4096, 0x4316f6a9
+0,     229376,     229376,     1024,     4096, 0x1a6a0b4c
+0,     230400,     230400,     1024,     4096, 0xdfd809b7
+0,     231424,     231424,     1024,     4096, 0x1d2cf5f1
+0,     232448,     232448,     1024,     4096, 0xd366f4a1
+0,     233472,     233472,     1024,     4096, 0x6a2f86e0
+0,     234496,     234496,     1024,     4096, 0xf51f08a9
+0,     235520,     235520,     1024,     4096, 0x05edefa8
+0,     236544,     236544,     1024,     4096, 0x255df2a6
+0,     237568,     237568,     1024,     4096, 0xe881d9e4
+0,     238592,     238592,     1024,     4096, 0x50380523
+0,     239616,     239616,     1024,     4096, 0x8b93eb26
+0,     240640,     240640,     1024,     4096, 0x759cf94c
+0,     241664,     241664,     1024,     4096, 0x8474f591
+0,     242688,     242688,     1024,     4096, 0x0030dc9e
+0,     243712,     243712,     1024,     4096, 0xb017fd54
+0,     244736,     244736,     1024,     4096, 0x5c7dfa2e
+0,     245760,     245760,     1024,     4096, 0x7887e599
+0,     246784,     246784,     1024,     4096, 0xb730e72f
+0,     247808,     247808,     1024,     4096, 0x6bb3fae4
+0,     248832,     248832,     1024,     4096, 0xcc08fc36
+0,     249856,     249856,     1024,     4096, 0x5afd9ec2
+0,     250880,     250880,     1024,     4096, 0xa1d3e83d
+0,     251904,     251904,     1024,     4096, 0x7f96013c
+0,     252928,     252928,     1024,     4096, 0x7a0afe31
+0,     253952,     253952,     1024,     4096, 0xa37d1701
+0,     254976,     254976,     1024,     4096, 0x4615ebc2
+0,     256000,     256000,     1024,     4096, 0x217005c1
+0,     257024,     257024,     1024,     4096, 0x1755f789
+0,     258048,     258048,     1024,     4096, 0x83e6db65
+0,     259072,     259072,     1024,     4096, 0x92ab1447
+0,     260096,     260096,     1024,     4096, 0xedbdf383
+0,     261120,     261120,     1024,     4096, 0x4316f6a9
+0,     262144,     262144,     1024,     4096, 0x1a6a0b4c
+0,     263168,     263168,     1024,     4096, 0xdfd809b7
+0,     264192,     264192,      408,     1632, 0xf412313e
diff --git a/tests/ref/fate/filter-afade-hsin b/tests/ref/fate/filter-afade-hsin
new file mode 100644
index 0000000000..2c6a0e3a1e
--- /dev/null
+++ b/tests/ref/fate/filter-afade-hsin
@@ -0,0 +1,265 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x2042232e
+0,       1024,       1024,     1024,     4096, 0x2c073cf7
+0,       2048,       2048,     1024,     4096, 0x92fecae5
+0,       3072,       3072,     1024,     4096, 0xfd68df81
+0,       4096,       4096,     1024,     4096, 0xd7e0dcdd
+0,       5120,       5120,     1024,     4096, 0xfb12e849
+0,       6144,       6144,     1024,     4096, 0xdaa8fd25
+0,       7168,       7168,     1024,     4096, 0x28b101d6
+0,       8192,       8192,     1024,     4096, 0x4418e817
+0,       9216,       9216,     1024,     4096, 0x65d6e44d
+0,      10240,      10240,     1024,     4096, 0xc575f781
+0,      11264,      11264,     1024,     4096, 0xdf0bfdcd
+0,      12288,      12288,     1024,     4096, 0xd517faed
+0,      13312,      13312,     1024,     4096, 0x369de9b5
+0,      14336,      14336,     1024,     4096, 0x2245f4d9
+0,      15360,      15360,     1024,     4096, 0xf979fd8b
+0,      16384,      16384,     1024,     4096, 0xafcbfb8d
+0,      17408,      17408,     1024,     4096, 0xee6bf9e3
+0,      18432,      18432,     1024,     4096, 0x3bf1edfb
+0,      19456,      19456,     1024,     4096, 0x26b7faa1
+0,      20480,      20480,     1024,     4096, 0x559bf2db
+0,      21504,      21504,     1024,     4096, 0xe488fe45
+0,      22528,      22528,     1024,     4096, 0x8928e8fd
+0,      23552,      23552,     1024,     4096, 0xfc82f6cd
+0,      24576,      24576,     1024,     4096, 0xe8b6ed4b
+0,      25600,      25600,     1024,     4096, 0x73340aba
+0,      26624,      26624,     1024,     4096, 0xb934ecbf
+0,      27648,      27648,     1024,     4096, 0x0581f125
+0,      28672,      28672,     1024,     4096, 0x4e2cf113
+0,      29696,      29696,     1024,     4096, 0x716b0062
+0,      30720,      30720,     1024,     4096, 0x4de513aa
+0,      31744,      31744,     1024,     4096, 0x6a17ea33
+0,      32768,      32768,     1024,     4096, 0x6c28f127
+0,      33792,      33792,     1024,     4096, 0xdd81f81b
+0,      34816,      34816,     1024,     4096, 0x63f2fd47
+0,      35840,      35840,     1024,     4096, 0x9ab2ee63
+0,      36864,      36864,     1024,     4096, 0xf310f265
+0,      37888,      37888,     1024,     4096, 0xdb2eed95
+0,      38912,      38912,     1024,     4096, 0x3cf3fa13
+0,      39936,      39936,     1024,     4096, 0x632107da
+0,      40960,      40960,     1024,     4096, 0xb3030964
+0,      41984,      41984,     1024,     4096, 0x4001ec91
+0,      43008,      43008,     1024,     4096, 0xacd8ee23
+0,      44032,      44032,     1024,     4096, 0x49adf5b3
+0,      45056,      45056,     1024,     4096, 0x8a7a0b54
+0,      46080,      46080,     1024,     4096, 0xfe4e284c
+0,      47104,      47104,     1024,     4096, 0x9d7dfc1b
+0,      48128,      48128,     1024,     4096, 0x3fbafc3d
+0,      49152,      49152,     1024,     4096, 0x7846190e
+0,      50176,      50176,     1024,     4096, 0x81c706e8
+0,      51200,      51200,     1024,     4096, 0x0449edef
+0,      52224,      52224,     1024,     4096, 0xe4c9044c
+0,      53248,      53248,     1024,     4096, 0x11bcf517
+0,      54272,      54272,     1024,     4096, 0x7693fc23
+0,      55296,      55296,     1024,     4096, 0xfaa3ec59
+0,      56320,      56320,     1024,     4096, 0x1bbbffd1
+0,      57344,      57344,     1024,     4096, 0x750e0b66
+0,      58368,      58368,     1024,     4096, 0xff79fe49
+0,      59392,      59392,     1024,     4096, 0x9c2e2414
+0,      60416,      60416,     1024,     4096, 0xf5a8e3b1
+0,      61440,      61440,     1024,     4096, 0x4171eabd
+0,      62464,      62464,     1024,     4096, 0xe5dfd0b9
+0,      63488,      63488,     1024,     4096, 0x88d6e751
+0,      64512,      64512,     1024,     4096, 0x1aceeebb
+0,      65536,      65536,     1024,     4096, 0xfddde939
+0,      66560,      66560,     1024,     4096, 0x635d14d6
+0,      67584,      67584,     1024,     4096, 0x1216f111
+0,      68608,      68608,     1024,     4096, 0x76d1f751
+0,      69632,      69632,     1024,     4096, 0x2cfbe33d
+0,      70656,      70656,     1024,     4096, 0xaa5bf83d
+0,      71680,      71680,     1024,     4096, 0xc6dc2846
+0,      72704,      72704,     1024,     4096, 0x0f811cf6
+0,      73728,      73728,     1024,     4096, 0x699bf871
+0,      74752,      74752,     1024,     4096, 0x066be26f
+0,      75776,      75776,     1024,     4096, 0xfadff369
+0,      76800,      76800,     1024,     4096, 0x1581ff61
+0,      77824,      77824,     1024,     4096, 0xe3fc05fa
+0,      78848,      78848,     1024,     4096, 0x2333fcaf
+0,      79872,      79872,     1024,     4096, 0x5c0d2a24
+0,      80896,      80896,     1024,     4096, 0x0955ef21
+0,      81920,      81920,     1024,     4096, 0xe798fbc9
+0,      82944,      82944,     1024,     4096, 0x5cdf138c
+0,      83968,      83968,     1024,     4096, 0x3ffee37d
+0,      84992,      84992,     1024,     4096, 0x4bcff517
+0,      86016,      86016,     1024,     4096, 0x9b7f0722
+0,      87040,      87040,     1024,     4096, 0xb6fa1982
+0,      88064,      88064,     1024,     4096, 0x1b1ac8b7
+0,      89088,      89088,     1024,     4096, 0xe68dda8f
+0,      90112,      90112,     1024,     4096, 0xe457b505
+0,      91136,      91136,     1024,     4096, 0xda25a409
+0,      92160,      92160,     1024,     4096, 0x5b5d9d3b
+0,      93184,      93184,     1024,     4096, 0xa61eb13d
+0,      94208,      94208,     1024,     4096, 0xac93b66f
+0,      95232,      95232,     1024,     4096, 0xc7aeb33f
+0,      96256,      96256,     1024,     4096, 0x52cccfb5
+0,      97280,      97280,     1024,     4096, 0x4e4cf487
+0,      98304,      98304,     1024,     4096, 0x19c07f35
+0,      99328,      99328,     1024,     4096, 0x63ecd34f
+0,     100352,     100352,     1024,     4096, 0x122aec53
+0,     101376,     101376,     1024,     4096, 0x6581c0ad
+0,     102400,     102400,     1024,     4096, 0x640edb15
+0,     103424,     103424,     1024,     4096, 0x5d66c66f
+0,     104448,     104448,     1024,     4096, 0x069e9d35
+0,     105472,     105472,     1024,     4096, 0x5c9fd0e9
+0,     106496,     106496,     1024,     4096, 0x72468667
+0,     107520,     107520,     1024,     4096, 0x6e6dd02b
+0,     108544,     108544,     1024,     4096, 0x93edce33
+0,     109568,     109568,     1024,     4096, 0xcdfbd519
+0,     110592,     110592,     1024,     4096, 0x8463f2bb
+0,     111616,     111616,     1024,     4096, 0x5ca6f869
+0,     112640,     112640,     1024,     4096, 0x099a0398
+0,     113664,     113664,     1024,     4096, 0xa7fa10f0
+0,     114688,     114688,     1024,     4096, 0x28caddd3
+0,     115712,     115712,     1024,     4096, 0x4852ef8b
+0,     116736,     116736,     1024,     4096, 0x0250ee7b
+0,     117760,     117760,     1024,     4096, 0x9583da21
+0,     118784,     118784,     1024,     4096, 0x7365fb33
+0,     119808,     119808,     1024,     4096, 0x28c82066
+0,     120832,     120832,     1024,     4096, 0x94650be4
+0,     121856,     121856,     1024,     4096, 0xeb21f8eb
+0,     122880,     122880,     1024,     4096, 0xcd88f455
+0,     123904,     123904,     1024,     4096, 0x66a9efaf
+0,     124928,     124928,     1024,     4096, 0x5500c6ed
+0,     125952,     125952,     1024,     4096, 0x0ee0c62d
+0,     126976,     126976,     1024,     4096, 0x34d30762
+0,     128000,     128000,     1024,     4096, 0x8c0dec9f
+0,     129024,     129024,     1024,     4096, 0x790011d8
+0,     130048,     130048,     1024,     4096, 0xb76a1136
+0,     131072,     131072,     1024,     4096, 0x7dddfea7
+0,     132096,     132096,     1024,     4096, 0xdfa3ed49
+0,     133120,     133120,     1024,     4096, 0xc129f54e
+0,     134144,     134144,     1024,     4096, 0x9a86f077
+0,     135168,     135168,     1024,     4096, 0xc9eef209
+0,     136192,     136192,     1024,     4096, 0x72d4029b
+0,     137216,     137216,     1024,     4096, 0x8ec20590
+0,     138240,     138240,     1024,     4096, 0xd48f18ed
+0,     139264,     139264,     1024,     4096, 0xd807eadc
+0,     140288,     140288,     1024,     4096, 0x1e2bea09
+0,     141312,     141312,     1024,     4096, 0x937af12e
+0,     142336,     142336,     1024,     4096, 0xdedbf303
+0,     143360,     143360,     1024,     4096, 0xdc75df88
+0,     144384,     144384,     1024,     4096, 0x1845ffd6
+0,     145408,     145408,     1024,     4096, 0x20e8150c
+0,     146432,     146432,     1024,     4096, 0x5ea7eeef
+0,     147456,     147456,     1024,     4096, 0x4c7efa21
+0,     148480,     148480,     1024,     4096, 0x8b97e30e
+0,     149504,     149504,     1024,     4096, 0xe5040228
+0,     150528,     150528,     1024,     4096, 0x6283f78c
+0,     151552,     151552,     1024,     4096, 0xe7100140
+0,     152576,     152576,     1024,     4096, 0x9ea6f9b2
+0,     153600,     153600,     1024,     4096, 0x5f0e1563
+0,     154624,     154624,     1024,     4096, 0x510bf18e
+0,     155648,     155648,     1024,     4096, 0x5f4fe425
+0,     156672,     156672,     1024,     4096, 0x507af3c0
+0,     157696,     157696,     1024,     4096, 0xbf14ddc6
+0,     158720,     158720,     1024,     4096, 0x1871ed69
+0,     159744,     159744,     1024,     4096, 0xc349ef9f
+0,     160768,     160768,     1024,     4096, 0x4e2c1834
+0,     161792,     161792,     1024,     4096, 0x2383fe04
+0,     162816,     162816,     1024,     4096, 0x6626f415
+0,     163840,     163840,     1024,     4096, 0x283be379
+0,     164864,     164864,     1024,     4096, 0xc76c0ceb
+0,     165888,     165888,     1024,     4096, 0xa0b8040f
+0,     166912,     166912,     1024,     4096, 0x2535eb6d
+0,     167936,     167936,     1024,     4096, 0xeb180bb5
+0,     168960,     168960,     1024,     4096, 0xbc5cf059
+0,     169984,     169984,     1024,     4096, 0x1862f1ac
+0,     171008,     171008,     1024,     4096, 0x9cc2ea2b
+0,     172032,     172032,     1024,     4096, 0xbb9ae754
+0,     173056,     173056,     1024,     4096, 0x716debb5
+0,     174080,     174080,     1024,     4096, 0xff3aff2a
+0,     175104,     175104,     1024,     4096, 0x755dfa5c
+0,     176128,     176128,     1024,     4096, 0x3b830605
+0,     177152,     177152,     1024,     4096, 0x0030dc9e
+0,     178176,     178176,     1024,     4096, 0xb017fd54
+0,     179200,     179200,     1024,     4096, 0x5c7dfa2e
+0,     180224,     180224,     1024,     4096, 0x7887e599
+0,     181248,     181248,     1024,     4096, 0xb730e72f
+0,     182272,     182272,     1024,     4096, 0x6bb3fae4
+0,     183296,     183296,     1024,     4096, 0xcc08fc36
+0,     184320,     184320,     1024,     4096, 0x5afd9ec2
+0,     185344,     185344,     1024,     4096, 0xa1d3e83d
+0,     186368,     186368,     1024,     4096, 0x7f96013c
+0,     187392,     187392,     1024,     4096, 0x7a0afe31
+0,     188416,     188416,     1024,     4096, 0xa37d1701
+0,     189440,     189440,     1024,     4096, 0x4615ebc2
+0,     190464,     190464,     1024,     4096, 0x217005c1
+0,     191488,     191488,     1024,     4096, 0x1755f789
+0,     192512,     192512,     1024,     4096, 0x83e6db65
+0,     193536,     193536,     1024,     4096, 0x92ab1447
+0,     194560,     194560,     1024,     4096, 0xedbdf383
+0,     195584,     195584,     1024,     4096, 0x4316f6a9
+0,     196608,     196608,     1024,     4096, 0x1a6a0b4c
+0,     197632,     197632,     1024,     4096, 0xdfd809b7
+0,     198656,     198656,     1024,     4096, 0x1d2cf5f1
+0,     199680,     199680,     1024,     4096, 0xd366f4a1
+0,     200704,     200704,     1024,     4096, 0x6a2f86e0
+0,     201728,     201728,     1024,     4096, 0xf51f08a9
+0,     202752,     202752,     1024,     4096, 0x05edefa8
+0,     203776,     203776,     1024,     4096, 0x255df2a6
+0,     204800,     204800,     1024,     4096, 0xe881d9e4
+0,     205824,     205824,     1024,     4096, 0x50380523
+0,     206848,     206848,     1024,     4096, 0x8b93eb26
+0,     207872,     207872,     1024,     4096, 0x759cf94c
+0,     208896,     208896,     1024,     4096, 0x8474f591
+0,     209920,     209920,     1024,     4096, 0x0030dc9e
+0,     210944,     210944,     1024,     4096, 0xb017fd54
+0,     211968,     211968,     1024,     4096, 0x5c7dfa2e
+0,     212992,     212992,     1024,     4096, 0x7887e599
+0,     214016,     214016,     1024,     4096, 0xb730e72f
+0,     215040,     215040,     1024,     4096, 0x6bb3fae4
+0,     216064,     216064,     1024,     4096, 0xcc08fc36
+0,     217088,     217088,     1024,     4096, 0x5afd9ec2
+0,     218112,     218112,     1024,     4096, 0xa1d3e83d
+0,     219136,     219136,     1024,     4096, 0x7f96013c
+0,     220160,     220160,     1024,     4096, 0x7a0afe31
+0,     221184,     221184,     1024,     4096, 0xa37d1701
+0,     222208,     222208,     1024,     4096, 0x4615ebc2
+0,     223232,     223232,     1024,     4096, 0x217005c1
+0,     224256,     224256,     1024,     4096, 0x1755f789
+0,     225280,     225280,     1024,     4096, 0x83e6db65
+0,     226304,     226304,     1024,     4096, 0x92ab1447
+0,     227328,     227328,     1024,     4096, 0xedbdf383
+0,     228352,     228352,     1024,     4096, 0x4316f6a9
+0,     229376,     229376,     1024,     4096, 0x1a6a0b4c
+0,     230400,     230400,     1024,     4096, 0xdfd809b7
+0,     231424,     231424,     1024,     4096, 0x1d2cf5f1
+0,     232448,     232448,     1024,     4096, 0xd366f4a1
+0,     233472,     233472,     1024,     4096, 0x6a2f86e0
+0,     234496,     234496,     1024,     4096, 0xf51f08a9
+0,     235520,     235520,     1024,     4096, 0x05edefa8
+0,     236544,     236544,     1024,     4096, 0x255df2a6
+0,     237568,     237568,     1024,     4096, 0xe881d9e4
+0,     238592,     238592,     1024,     4096, 0x50380523
+0,     239616,     239616,     1024,     4096, 0x8b93eb26
+0,     240640,     240640,     1024,     4096, 0x759cf94c
+0,     241664,     241664,     1024,     4096, 0x8474f591
+0,     242688,     242688,     1024,     4096, 0x0030dc9e
+0,     243712,     243712,     1024,     4096, 0xb017fd54
+0,     244736,     244736,     1024,     4096, 0x5c7dfa2e
+0,     245760,     245760,     1024,     4096, 0x7887e599
+0,     246784,     246784,     1024,     4096, 0xb730e72f
+0,     247808,     247808,     1024,     4096, 0x6bb3fae4
+0,     248832,     248832,     1024,     4096, 0xcc08fc36
+0,     249856,     249856,     1024,     4096, 0x5afd9ec2
+0,     250880,     250880,     1024,     4096, 0xa1d3e83d
+0,     251904,     251904,     1024,     4096, 0x7f96013c
+0,     252928,     252928,     1024,     4096, 0x7a0afe31
+0,     253952,     253952,     1024,     4096, 0xa37d1701
+0,     254976,     254976,     1024,     4096, 0x4615ebc2
+0,     256000,     256000,     1024,     4096, 0x217005c1
+0,     257024,     257024,     1024,     4096, 0x1755f789
+0,     258048,     258048,     1024,     4096, 0x83e6db65
+0,     259072,     259072,     1024,     4096, 0x92ab1447
+0,     260096,     260096,     1024,     4096, 0xedbdf383
+0,     261120,     261120,     1024,     4096, 0x4316f6a9
+0,     262144,     262144,     1024,     4096, 0x1a6a0b4c
+0,     263168,     263168,     1024,     4096, 0xdfd809b7
+0,     264192,     264192,      408,     1632, 0xf412313e
diff --git a/tests/ref/fate/filter-afade-iqsin b/tests/ref/fate/filter-afade-iqsin
new file mode 100644
index 0000000000..fc22baf913
--- /dev/null
+++ b/tests/ref/fate/filter-afade-iqsin
@@ -0,0 +1,265 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x220e908d
+0,       1024,       1024,     1024,     4096, 0xdd65002e
+0,       2048,       2048,     1024,     4096, 0x8072fb25
+0,       3072,       3072,     1024,     4096, 0xe82efbb5
+0,       4096,       4096,     1024,     4096, 0xf0aceaad
+0,       5120,       5120,     1024,     4096, 0x0702f14d
+0,       6144,       6144,     1024,     4096, 0xde010588
+0,       7168,       7168,     1024,     4096, 0x65d0ff3d
+0,       8192,       8192,     1024,     4096, 0xfcd3eceb
+0,       9216,       9216,     1024,     4096, 0x0046ee27
+0,      10240,      10240,     1024,     4096, 0x9811fd1f
+0,      11264,      11264,     1024,     4096, 0x2486026e
+0,      12288,      12288,     1024,     4096, 0x5f15fa05
+0,      13312,      13312,     1024,     4096, 0xf481f255
+0,      14336,      14336,     1024,     4096, 0x473df0cf
+0,      15360,      15360,     1024,     4096, 0x65b3ffe5
+0,      16384,      16384,     1024,     4096, 0x46c10642
+0,      17408,      17408,     1024,     4096, 0x6647f01f
+0,      18432,      18432,     1024,     4096, 0x8682f66f
+0,      19456,      19456,     1024,     4096, 0x2fe1f87d
+0,      20480,      20480,     1024,     4096, 0x33ddfadb
+0,      21504,      21504,     1024,     4096, 0x8e1cfeaf
+0,      22528,      22528,     1024,     4096, 0x8f87eb79
+0,      23552,      23552,     1024,     4096, 0x79ddf2b7
+0,      24576,      24576,     1024,     4096, 0x74b6ee5d
+0,      25600,      25600,     1024,     4096, 0xd4240c2a
+0,      26624,      26624,     1024,     4096, 0x7e75e153
+0,      27648,      27648,     1024,     4096, 0xe46fee4f
+0,      28672,      28672,     1024,     4096, 0x7bddec1d
+0,      29696,      29696,     1024,     4096, 0xb1590b70
+0,      30720,      30720,     1024,     4096, 0x66fb00fa
+0,      31744,      31744,     1024,     4096, 0xf19dea17
+0,      32768,      32768,     1024,     4096, 0x831efdb7
+0,      33792,      33792,     1024,     4096, 0x1ef4f41d
+0,      34816,      34816,     1024,     4096, 0x0fa603ea
+0,      35840,      35840,     1024,     4096, 0x7fa6f915
+0,      36864,      36864,     1024,     4096, 0x3ed1f89f
+0,      37888,      37888,     1024,     4096, 0x4ac6e845
+0,      38912,      38912,     1024,     4096, 0xda9f108c
+0,      39936,      39936,     1024,     4096, 0xa88506fa
+0,      40960,      40960,     1024,     4096, 0xdcbee81d
+0,      41984,      41984,     1024,     4096, 0x2441ece7
+0,      43008,      43008,     1024,     4096, 0x7784fbbd
+0,      44032,      44032,     1024,     4096, 0xec83fbf3
+0,      45056,      45056,     1024,     4096, 0xe18704ca
+0,      46080,      46080,     1024,     4096, 0x4d7d2026
+0,      47104,      47104,     1024,     4096, 0x8d1fedeb
+0,      48128,      48128,     1024,     4096, 0xffb8f301
+0,      49152,      49152,     1024,     4096, 0x4c8dd537
+0,      50176,      50176,     1024,     4096, 0xaa9cf755
+0,      51200,      51200,     1024,     4096, 0x15aee753
+0,      52224,      52224,     1024,     4096, 0xe71e19c4
+0,      53248,      53248,     1024,     4096, 0x5e6cd725
+0,      54272,      54272,     1024,     4096, 0x02ebfde7
+0,      55296,      55296,     1024,     4096, 0xa565f353
+0,      56320,      56320,     1024,     4096, 0x24badf45
+0,      57344,      57344,     1024,     4096, 0x8d9af215
+0,      58368,      58368,     1024,     4096, 0xfb20045e
+0,      59392,      59392,     1024,     4096, 0x01adff9b
+0,      60416,      60416,     1024,     4096, 0xd686e6d3
+0,      61440,      61440,     1024,     4096, 0xe25bf975
+0,      62464,      62464,     1024,     4096, 0xd54c0ad6
+0,      63488,      63488,     1024,     4096, 0xb48eea55
+0,      64512,      64512,     1024,     4096, 0xe4d5fbeb
+0,      65536,      65536,     1024,     4096, 0x169dfe7b
+0,      66560,      66560,     1024,     4096, 0x5eebf921
+0,      67584,      67584,     1024,     4096, 0xc2a5de3f
+0,      68608,      68608,     1024,     4096, 0xa7b9db85
+0,      69632,      69632,     1024,     4096, 0xa52ee4b7
+0,      70656,      70656,     1024,     4096, 0x5ac1104a
+0,      71680,      71680,     1024,     4096, 0x3ed334b6
+0,      72704,      72704,     1024,     4096, 0x94d30f06
+0,      73728,      73728,     1024,     4096, 0x0721e755
+0,      74752,      74752,     1024,     4096, 0x4503043c
+0,      75776,      75776,     1024,     4096, 0xed11e7b9
+0,      76800,      76800,     1024,     4096, 0xf4f807d0
+0,      77824,      77824,     1024,     4096, 0x0f2bf579
+0,      78848,      78848,     1024,     4096, 0x9facf6b1
+0,      79872,      79872,     1024,     4096, 0x244206a2
+0,      80896,      80896,     1024,     4096, 0xfd4ff779
+0,      81920,      81920,     1024,     4096, 0x342010c0
+0,      82944,      82944,     1024,     4096, 0xa93a1c46
+0,      83968,      83968,     1024,     4096, 0x88f5263e
+0,      84992,      84992,     1024,     4096, 0x67b4fa25
+0,      86016,      86016,     1024,     4096, 0x1276e9b5
+0,      87040,      87040,     1024,     4096, 0x55d70f0c
+0,      88064,      88064,     1024,     4096, 0x281bc8af
+0,      89088,      89088,     1024,     4096, 0xe68dda8f
+0,      90112,      90112,     1024,     4096, 0xe457b505
+0,      91136,      91136,     1024,     4096, 0xda25a409
+0,      92160,      92160,     1024,     4096, 0x5b5d9d3b
+0,      93184,      93184,     1024,     4096, 0xa61eb13d
+0,      94208,      94208,     1024,     4096, 0xac93b66f
+0,      95232,      95232,     1024,     4096, 0xc7aeb33f
+0,      96256,      96256,     1024,     4096, 0x52cccfb5
+0,      97280,      97280,     1024,     4096, 0x4e4cf487
+0,      98304,      98304,     1024,     4096, 0x19c07f35
+0,      99328,      99328,     1024,     4096, 0x63ecd34f
+0,     100352,     100352,     1024,     4096, 0x122aec53
+0,     101376,     101376,     1024,     4096, 0x6581c0ad
+0,     102400,     102400,     1024,     4096, 0x640edb15
+0,     103424,     103424,     1024,     4096, 0x5d66c66f
+0,     104448,     104448,     1024,     4096, 0x069e9d35
+0,     105472,     105472,     1024,     4096, 0x5c9fd0e9
+0,     106496,     106496,     1024,     4096, 0x72468667
+0,     107520,     107520,     1024,     4096, 0x6e6dd02b
+0,     108544,     108544,     1024,     4096, 0x93edce33
+0,     109568,     109568,     1024,     4096, 0xcdfbd519
+0,     110592,     110592,     1024,     4096, 0x8463f2bb
+0,     111616,     111616,     1024,     4096, 0x5ca6f869
+0,     112640,     112640,     1024,     4096, 0x099a0398
+0,     113664,     113664,     1024,     4096, 0xa7fa10f0
+0,     114688,     114688,     1024,     4096, 0x28caddd3
+0,     115712,     115712,     1024,     4096, 0x4852ef8b
+0,     116736,     116736,     1024,     4096, 0x0250ee7b
+0,     117760,     117760,     1024,     4096, 0x9583da21
+0,     118784,     118784,     1024,     4096, 0x7365fb33
+0,     119808,     119808,     1024,     4096, 0x28c82066
+0,     120832,     120832,     1024,     4096, 0x94650be4
+0,     121856,     121856,     1024,     4096, 0xeb21f8eb
+0,     122880,     122880,     1024,     4096, 0xcd88f455
+0,     123904,     123904,     1024,     4096, 0x66a9efaf
+0,     124928,     124928,     1024,     4096, 0x5500c6ed
+0,     125952,     125952,     1024,     4096, 0x0ee0c62d
+0,     126976,     126976,     1024,     4096, 0x34d30762
+0,     128000,     128000,     1024,     4096, 0x8c0dec9f
+0,     129024,     129024,     1024,     4096, 0x790011d8
+0,     130048,     130048,     1024,     4096, 0xb76a1136
+0,     131072,     131072,     1024,     4096, 0x7dddfea7
+0,     132096,     132096,     1024,     4096, 0xdfa3ed49
+0,     133120,     133120,     1024,     4096, 0xc129f54e
+0,     134144,     134144,     1024,     4096, 0x9a86f077
+0,     135168,     135168,     1024,     4096, 0xc9eef209
+0,     136192,     136192,     1024,     4096, 0x72d4029b
+0,     137216,     137216,     1024,     4096, 0x8ec20590
+0,     138240,     138240,     1024,     4096, 0xd48f18ed
+0,     139264,     139264,     1024,     4096, 0xd807eadc
+0,     140288,     140288,     1024,     4096, 0x1e2bea09
+0,     141312,     141312,     1024,     4096, 0x937af12e
+0,     142336,     142336,     1024,     4096, 0xdedbf303
+0,     143360,     143360,     1024,     4096, 0xdc75df88
+0,     144384,     144384,     1024,     4096, 0x1845ffd6
+0,     145408,     145408,     1024,     4096, 0x20e8150c
+0,     146432,     146432,     1024,     4096, 0x5ea7eeef
+0,     147456,     147456,     1024,     4096, 0x4c7efa21
+0,     148480,     148480,     1024,     4096, 0x8b97e30e
+0,     149504,     149504,     1024,     4096, 0xe5040228
+0,     150528,     150528,     1024,     4096, 0x6283f78c
+0,     151552,     151552,     1024,     4096, 0xe7100140
+0,     152576,     152576,     1024,     4096, 0x9ea6f9b2
+0,     153600,     153600,     1024,     4096, 0x5f0e1563
+0,     154624,     154624,     1024,     4096, 0x510bf18e
+0,     155648,     155648,     1024,     4096, 0x5f4fe425
+0,     156672,     156672,     1024,     4096, 0x507af3c0
+0,     157696,     157696,     1024,     4096, 0xbf14ddc6
+0,     158720,     158720,     1024,     4096, 0x1871ed69
+0,     159744,     159744,     1024,     4096, 0xc349ef9f
+0,     160768,     160768,     1024,     4096, 0x4e2c1834
+0,     161792,     161792,     1024,     4096, 0x2383fe04
+0,     162816,     162816,     1024,     4096, 0x6626f415
+0,     163840,     163840,     1024,     4096, 0x283be379
+0,     164864,     164864,     1024,     4096, 0xc76c0ceb
+0,     165888,     165888,     1024,     4096, 0xa0b8040f
+0,     166912,     166912,     1024,     4096, 0x2535eb6d
+0,     167936,     167936,     1024,     4096, 0xeb180bb5
+0,     168960,     168960,     1024,     4096, 0xbc5cf059
+0,     169984,     169984,     1024,     4096, 0x1862f1ac
+0,     171008,     171008,     1024,     4096, 0x9cc2ea2b
+0,     172032,     172032,     1024,     4096, 0xbb9ae754
+0,     173056,     173056,     1024,     4096, 0x716debb5
+0,     174080,     174080,     1024,     4096, 0xff3aff2a
+0,     175104,     175104,     1024,     4096, 0x755dfa5c
+0,     176128,     176128,     1024,     4096, 0x3b830605
+0,     177152,     177152,     1024,     4096, 0x0030dc9e
+0,     178176,     178176,     1024,     4096, 0xb017fd54
+0,     179200,     179200,     1024,     4096, 0x5c7dfa2e
+0,     180224,     180224,     1024,     4096, 0x7887e599
+0,     181248,     181248,     1024,     4096, 0xb730e72f
+0,     182272,     182272,     1024,     4096, 0x6bb3fae4
+0,     183296,     183296,     1024,     4096, 0xcc08fc36
+0,     184320,     184320,     1024,     4096, 0x5afd9ec2
+0,     185344,     185344,     1024,     4096, 0xa1d3e83d
+0,     186368,     186368,     1024,     4096, 0x7f96013c
+0,     187392,     187392,     1024,     4096, 0x7a0afe31
+0,     188416,     188416,     1024,     4096, 0xa37d1701
+0,     189440,     189440,     1024,     4096, 0x4615ebc2
+0,     190464,     190464,     1024,     4096, 0x217005c1
+0,     191488,     191488,     1024,     4096, 0x1755f789
+0,     192512,     192512,     1024,     4096, 0x83e6db65
+0,     193536,     193536,     1024,     4096, 0x92ab1447
+0,     194560,     194560,     1024,     4096, 0xedbdf383
+0,     195584,     195584,     1024,     4096, 0x4316f6a9
+0,     196608,     196608,     1024,     4096, 0x1a6a0b4c
+0,     197632,     197632,     1024,     4096, 0xdfd809b7
+0,     198656,     198656,     1024,     4096, 0x1d2cf5f1
+0,     199680,     199680,     1024,     4096, 0xd366f4a1
+0,     200704,     200704,     1024,     4096, 0x6a2f86e0
+0,     201728,     201728,     1024,     4096, 0xf51f08a9
+0,     202752,     202752,     1024,     4096, 0x05edefa8
+0,     203776,     203776,     1024,     4096, 0x255df2a6
+0,     204800,     204800,     1024,     4096, 0xe881d9e4
+0,     205824,     205824,     1024,     4096, 0x50380523
+0,     206848,     206848,     1024,     4096, 0x8b93eb26
+0,     207872,     207872,     1024,     4096, 0x759cf94c
+0,     208896,     208896,     1024,     4096, 0x8474f591
+0,     209920,     209920,     1024,     4096, 0x0030dc9e
+0,     210944,     210944,     1024,     4096, 0xb017fd54
+0,     211968,     211968,     1024,     4096, 0x5c7dfa2e
+0,     212992,     212992,     1024,     4096, 0x7887e599
+0,     214016,     214016,     1024,     4096, 0xb730e72f
+0,     215040,     215040,     1024,     4096, 0x6bb3fae4
+0,     216064,     216064,     1024,     4096, 0xcc08fc36
+0,     217088,     217088,     1024,     4096, 0x5afd9ec2
+0,     218112,     218112,     1024,     4096, 0xa1d3e83d
+0,     219136,     219136,     1024,     4096, 0x7f96013c
+0,     220160,     220160,     1024,     4096, 0x7a0afe31
+0,     221184,     221184,     1024,     4096, 0xa37d1701
+0,     222208,     222208,     1024,     4096, 0x4615ebc2
+0,     223232,     223232,     1024,     4096, 0x217005c1
+0,     224256,     224256,     1024,     4096, 0x1755f789
+0,     225280,     225280,     1024,     4096, 0x83e6db65
+0,     226304,     226304,     1024,     4096, 0x92ab1447
+0,     227328,     227328,     1024,     4096, 0xedbdf383
+0,     228352,     228352,     1024,     4096, 0x4316f6a9
+0,     229376,     229376,     1024,     4096, 0x1a6a0b4c
+0,     230400,     230400,     1024,     4096, 0xdfd809b7
+0,     231424,     231424,     1024,     4096, 0x1d2cf5f1
+0,     232448,     232448,     1024,     4096, 0xd366f4a1
+0,     233472,     233472,     1024,     4096, 0x6a2f86e0
+0,     234496,     234496,     1024,     4096, 0xf51f08a9
+0,     235520,     235520,     1024,     4096, 0x05edefa8
+0,     236544,     236544,     1024,     4096, 0x255df2a6
+0,     237568,     237568,     1024,     4096, 0xe881d9e4
+0,     238592,     238592,     1024,     4096, 0x50380523
+0,     239616,     239616,     1024,     4096, 0x8b93eb26
+0,     240640,     240640,     1024,     4096, 0x759cf94c
+0,     241664,     241664,     1024,     4096, 0x8474f591
+0,     242688,     242688,     1024,     4096, 0x0030dc9e
+0,     243712,     243712,     1024,     4096, 0xb017fd54
+0,     244736,     244736,     1024,     4096, 0x5c7dfa2e
+0,     245760,     245760,     1024,     4096, 0x7887e599
+0,     246784,     246784,     1024,     4096, 0xb730e72f
+0,     247808,     247808,     1024,     4096, 0x6bb3fae4
+0,     248832,     248832,     1024,     4096, 0xcc08fc36
+0,     249856,     249856,     1024,     4096, 0x5afd9ec2
+0,     250880,     250880,     1024,     4096, 0xa1d3e83d
+0,     251904,     251904,     1024,     4096, 0x7f96013c
+0,     252928,     252928,     1024,     4096, 0x7a0afe31
+0,     253952,     253952,     1024,     4096, 0xa37d1701
+0,     254976,     254976,     1024,     4096, 0x4615ebc2
+0,     256000,     256000,     1024,     4096, 0x217005c1
+0,     257024,     257024,     1024,     4096, 0x1755f789
+0,     258048,     258048,     1024,     4096, 0x83e6db65
+0,     259072,     259072,     1024,     4096, 0x92ab1447
+0,     260096,     260096,     1024,     4096, 0xedbdf383
+0,     261120,     261120,     1024,     4096, 0x4316f6a9
+0,     262144,     262144,     1024,     4096, 0x1a6a0b4c
+0,     263168,     263168,     1024,     4096, 0xdfd809b7
+0,     264192,     264192,      408,     1632, 0xf412313e
diff --git a/tests/ref/fate/filter-afade-log b/tests/ref/fate/filter-afade-log
new file mode 100644
index 0000000000..99ac0b36d8
--- /dev/null
+++ b/tests/ref/fate/filter-afade-log
@@ -0,0 +1,265 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0xf01adbd3
+0,       1024,       1024,     1024,     4096, 0xbbe10f8e
+0,       2048,       2048,     1024,     4096, 0xbf04fccf
+0,       3072,       3072,     1024,     4096, 0x70e5fc39
+0,       4096,       4096,     1024,     4096, 0x93a2ecdf
+0,       5120,       5120,     1024,     4096, 0x1680e311
+0,       6144,       6144,     1024,     4096, 0xb73ef96d
+0,       7168,       7168,     1024,     4096, 0x3dbcfe5f
+0,       8192,       8192,     1024,     4096, 0xfdbd029c
+0,       9216,       9216,     1024,     4096, 0x4f8fea8f
+0,      10240,      10240,     1024,     4096, 0x54580154
+0,      11264,      11264,     1024,     4096, 0x471d1012
+0,      12288,      12288,     1024,     4096, 0xf6cefe57
+0,      13312,      13312,     1024,     4096, 0x6a550156
+0,      14336,      14336,     1024,     4096, 0xba5c06ca
+0,      15360,      15360,     1024,     4096, 0xa280fd09
+0,      16384,      16384,     1024,     4096, 0x06b30e68
+0,      17408,      17408,     1024,     4096, 0xd3f1f92d
+0,      18432,      18432,     1024,     4096, 0xf75de519
+0,      19456,      19456,     1024,     4096, 0x411cf0e5
+0,      20480,      20480,     1024,     4096, 0xeeb80566
+0,      21504,      21504,     1024,     4096, 0xa57c064c
+0,      22528,      22528,     1024,     4096, 0x6476f72f
+0,      23552,      23552,     1024,     4096, 0x6e1bef53
+0,      24576,      24576,     1024,     4096, 0x911ff843
+0,      25600,      25600,     1024,     4096, 0x4e3713c4
+0,      26624,      26624,     1024,     4096, 0x3434fb71
+0,      27648,      27648,     1024,     4096, 0xd3c1eaed
+0,      28672,      28672,     1024,     4096, 0x8804e87d
+0,      29696,      29696,     1024,     4096, 0xd1fa03e2
+0,      30720,      30720,     1024,     4096, 0x9d56fc21
+0,      31744,      31744,     1024,     4096, 0x63d6f2fb
+0,      32768,      32768,     1024,     4096, 0xa1ddfa6d
+0,      33792,      33792,     1024,     4096, 0x998309ee
+0,      34816,      34816,     1024,     4096, 0xcebc0632
+0,      35840,      35840,     1024,     4096, 0x9860e503
+0,      36864,      36864,     1024,     4096, 0xa3e910d8
+0,      37888,      37888,     1024,     4096, 0x2449caed
+0,      38912,      38912,     1024,     4096, 0x1faf0e9a
+0,      39936,      39936,     1024,     4096, 0xe18fdb59
+0,      40960,      40960,     1024,     4096, 0xaa0b057e
+0,      41984,      41984,     1024,     4096, 0x2b18cae1
+0,      43008,      43008,     1024,     4096, 0x6f0a1338
+0,      44032,      44032,     1024,     4096, 0x59af03b2
+0,      45056,      45056,     1024,     4096, 0xd204f533
+0,      46080,      46080,     1024,     4096, 0xae5b0ed2
+0,      47104,      47104,     1024,     4096, 0xfebfc253
+0,      48128,      48128,     1024,     4096, 0x268bd8d9
+0,      49152,      49152,     1024,     4096, 0x5c78024a
+0,      50176,      50176,     1024,     4096, 0x5a36f343
+0,      51200,      51200,     1024,     4096, 0x1899cc19
+0,      52224,      52224,     1024,     4096, 0x8b27dea9
+0,      53248,      53248,     1024,     4096, 0x1ed7cbbf
+0,      54272,      54272,     1024,     4096, 0x0c8e15c4
+0,      55296,      55296,     1024,     4096, 0xb864004c
+0,      56320,      56320,     1024,     4096, 0x327effbf
+0,      57344,      57344,     1024,     4096, 0x5c3e2056
+0,      58368,      58368,     1024,     4096, 0xb704086a
+0,      59392,      59392,     1024,     4096, 0x0efdff09
+0,      60416,      60416,     1024,     4096, 0x979406e0
+0,      61440,      61440,     1024,     4096, 0x1115e93d
+0,      62464,      62464,     1024,     4096, 0x3d62f097
+0,      63488,      63488,     1024,     4096, 0xe6f8e051
+0,      64512,      64512,     1024,     4096, 0x30d40464
+0,      65536,      65536,     1024,     4096, 0x5c2f1726
+0,      66560,      66560,     1024,     4096, 0x2ac3cdd5
+0,      67584,      67584,     1024,     4096, 0x92c20b12
+0,      68608,      68608,     1024,     4096, 0xae10cd6f
+0,      69632,      69632,     1024,     4096, 0x4c8fd6fb
+0,      70656,      70656,     1024,     4096, 0xfbffeb71
+0,      71680,      71680,     1024,     4096, 0xed641b28
+0,      72704,      72704,     1024,     4096, 0x35eef925
+0,      73728,      73728,     1024,     4096, 0xe098d85d
+0,      74752,      74752,     1024,     4096, 0x8d03f22b
+0,      75776,      75776,     1024,     4096, 0x00d7f5ed
+0,      76800,      76800,     1024,     4096, 0xb80917ce
+0,      77824,      77824,     1024,     4096, 0xc255fb89
+0,      78848,      78848,     1024,     4096, 0xfef9063c
+0,      79872,      79872,     1024,     4096, 0x7286f151
+0,      80896,      80896,     1024,     4096, 0x24c8ee71
+0,      81920,      81920,     1024,     4096, 0xcf5f169a
+0,      82944,      82944,     1024,     4096, 0xb2fa1b5c
+0,      83968,      83968,     1024,     4096, 0xddfaf895
+0,      84992,      84992,     1024,     4096, 0xfe170e94
+0,      86016,      86016,     1024,     4096, 0x27d21960
+0,      87040,      87040,     1024,     4096, 0x8edd09c6
+0,      88064,      88064,     1024,     4096, 0x7c2f0074
+0,      89088,      89088,     1024,     4096, 0xaa9dfa4b
+0,      90112,      90112,     1024,     4096, 0xd543db09
+0,      91136,      91136,     1024,     4096, 0x25c0c7a9
+0,      92160,      92160,     1024,     4096, 0xccf5ac8f
+0,      93184,      93184,     1024,     4096, 0x131fdf1b
+0,      94208,      94208,     1024,     4096, 0xeb3ff7eb
+0,      95232,      95232,     1024,     4096, 0xf6d50958
+0,      96256,      96256,     1024,     4096, 0xdd3bfea5
+0,      97280,      97280,     1024,     4096, 0x6ad02eba
+0,      98304,      98304,     1024,     4096, 0x30c3de97
+0,      99328,      99328,     1024,     4096, 0xc78b1b02
+0,     100352,     100352,     1024,     4096, 0x017014e8
+0,     101376,     101376,     1024,     4096, 0x2c90ff59
+0,     102400,     102400,     1024,     4096, 0x88f71eb2
+0,     103424,     103424,     1024,     4096, 0xeed806e0
+0,     104448,     104448,     1024,     4096, 0x478df91b
+0,     105472,     105472,     1024,     4096, 0xc278f18b
+0,     106496,     106496,     1024,     4096, 0xc457cb7f
+0,     107520,     107520,     1024,     4096, 0x87a6081a
+0,     108544,     108544,     1024,     4096, 0xef15075c
+0,     109568,     109568,     1024,     4096, 0x5f4f076e
+0,     110592,     110592,     1024,     4096, 0x8463f2bb
+0,     111616,     111616,     1024,     4096, 0x5ca6f869
+0,     112640,     112640,     1024,     4096, 0x099a0398
+0,     113664,     113664,     1024,     4096, 0xa7fa10f0
+0,     114688,     114688,     1024,     4096, 0x28caddd3
+0,     115712,     115712,     1024,     4096, 0x4852ef8b
+0,     116736,     116736,     1024,     4096, 0x0250ee7b
+0,     117760,     117760,     1024,     4096, 0x9583da21
+0,     118784,     118784,     1024,     4096, 0x7365fb33
+0,     119808,     119808,     1024,     4096, 0x28c82066
+0,     120832,     120832,     1024,     4096, 0x94650be4
+0,     121856,     121856,     1024,     4096, 0xeb21f8eb
+0,     122880,     122880,     1024,     4096, 0xcd88f455
+0,     123904,     123904,     1024,     4096, 0x66a9efaf
+0,     124928,     124928,     1024,     4096, 0x5500c6ed
+0,     125952,     125952,     1024,     4096, 0x0ee0c62d
+0,     126976,     126976,     1024,     4096, 0x34d30762
+0,     128000,     128000,     1024,     4096, 0x8c0dec9f
+0,     129024,     129024,     1024,     4096, 0x790011d8
+0,     130048,     130048,     1024,     4096, 0xb76a1136
+0,     131072,     131072,     1024,     4096, 0x7dddfea7
+0,     132096,     132096,     1024,     4096, 0xdfa3ed49
+0,     133120,     133120,     1024,     4096, 0xc129f54e
+0,     134144,     134144,     1024,     4096, 0x9a86f077
+0,     135168,     135168,     1024,     4096, 0xc9eef209
+0,     136192,     136192,     1024,     4096, 0x72d4029b
+0,     137216,     137216,     1024,     4096, 0x8ec20590
+0,     138240,     138240,     1024,     4096, 0xd48f18ed
+0,     139264,     139264,     1024,     4096, 0xd807eadc
+0,     140288,     140288,     1024,     4096, 0x1e2bea09
+0,     141312,     141312,     1024,     4096, 0x937af12e
+0,     142336,     142336,     1024,     4096, 0xdedbf303
+0,     143360,     143360,     1024,     4096, 0xdc75df88
+0,     144384,     144384,     1024,     4096, 0x1845ffd6
+0,     145408,     145408,     1024,     4096, 0x20e8150c
+0,     146432,     146432,     1024,     4096, 0x5ea7eeef
+0,     147456,     147456,     1024,     4096, 0x4c7efa21
+0,     148480,     148480,     1024,     4096, 0x8b97e30e
+0,     149504,     149504,     1024,     4096, 0xe5040228
+0,     150528,     150528,     1024,     4096, 0x6283f78c
+0,     151552,     151552,     1024,     4096, 0xe7100140
+0,     152576,     152576,     1024,     4096, 0x9ea6f9b2
+0,     153600,     153600,     1024,     4096, 0x5f0e1563
+0,     154624,     154624,     1024,     4096, 0x510bf18e
+0,     155648,     155648,     1024,     4096, 0x5f4fe425
+0,     156672,     156672,     1024,     4096, 0x507af3c0
+0,     157696,     157696,     1024,     4096, 0xbf14ddc6
+0,     158720,     158720,     1024,     4096, 0x1871ed69
+0,     159744,     159744,     1024,     4096, 0xc349ef9f
+0,     160768,     160768,     1024,     4096, 0x4e2c1834
+0,     161792,     161792,     1024,     4096, 0x2383fe04
+0,     162816,     162816,     1024,     4096, 0x6626f415
+0,     163840,     163840,     1024,     4096, 0x283be379
+0,     164864,     164864,     1024,     4096, 0xc76c0ceb
+0,     165888,     165888,     1024,     4096, 0xa0b8040f
+0,     166912,     166912,     1024,     4096, 0x2535eb6d
+0,     167936,     167936,     1024,     4096, 0xeb180bb5
+0,     168960,     168960,     1024,     4096, 0xbc5cf059
+0,     169984,     169984,     1024,     4096, 0x1862f1ac
+0,     171008,     171008,     1024,     4096, 0x9cc2ea2b
+0,     172032,     172032,     1024,     4096, 0xbb9ae754
+0,     173056,     173056,     1024,     4096, 0x716debb5
+0,     174080,     174080,     1024,     4096, 0xff3aff2a
+0,     175104,     175104,     1024,     4096, 0x755dfa5c
+0,     176128,     176128,     1024,     4096, 0x3b830605
+0,     177152,     177152,     1024,     4096, 0x0030dc9e
+0,     178176,     178176,     1024,     4096, 0xb017fd54
+0,     179200,     179200,     1024,     4096, 0x5c7dfa2e
+0,     180224,     180224,     1024,     4096, 0x7887e599
+0,     181248,     181248,     1024,     4096, 0xb730e72f
+0,     182272,     182272,     1024,     4096, 0x6bb3fae4
+0,     183296,     183296,     1024,     4096, 0xcc08fc36
+0,     184320,     184320,     1024,     4096, 0x5afd9ec2
+0,     185344,     185344,     1024,     4096, 0xa1d3e83d
+0,     186368,     186368,     1024,     4096, 0x7f96013c
+0,     187392,     187392,     1024,     4096, 0x7a0afe31
+0,     188416,     188416,     1024,     4096, 0xa37d1701
+0,     189440,     189440,     1024,     4096, 0x4615ebc2
+0,     190464,     190464,     1024,     4096, 0x217005c1
+0,     191488,     191488,     1024,     4096, 0x1755f789
+0,     192512,     192512,     1024,     4096, 0x83e6db65
+0,     193536,     193536,     1024,     4096, 0x92ab1447
+0,     194560,     194560,     1024,     4096, 0xedbdf383
+0,     195584,     195584,     1024,     4096, 0x4316f6a9
+0,     196608,     196608,     1024,     4096, 0x1a6a0b4c
+0,     197632,     197632,     1024,     4096, 0xdfd809b7
+0,     198656,     198656,     1024,     4096, 0x1d2cf5f1
+0,     199680,     199680,     1024,     4096, 0xd366f4a1
+0,     200704,     200704,     1024,     4096, 0x6a2f86e0
+0,     201728,     201728,     1024,     4096, 0xf51f08a9
+0,     202752,     202752,     1024,     4096, 0x05edefa8
+0,     203776,     203776,     1024,     4096, 0x255df2a6
+0,     204800,     204800,     1024,     4096, 0xe881d9e4
+0,     205824,     205824,     1024,     4096, 0x50380523
+0,     206848,     206848,     1024,     4096, 0x8b93eb26
+0,     207872,     207872,     1024,     4096, 0x759cf94c
+0,     208896,     208896,     1024,     4096, 0x8474f591
+0,     209920,     209920,     1024,     4096, 0x0030dc9e
+0,     210944,     210944,     1024,     4096, 0xb017fd54
+0,     211968,     211968,     1024,     4096, 0x5c7dfa2e
+0,     212992,     212992,     1024,     4096, 0x7887e599
+0,     214016,     214016,     1024,     4096, 0xb730e72f
+0,     215040,     215040,     1024,     4096, 0x6bb3fae4
+0,     216064,     216064,     1024,     4096, 0xcc08fc36
+0,     217088,     217088,     1024,     4096, 0x5afd9ec2
+0,     218112,     218112,     1024,     4096, 0xa1d3e83d
+0,     219136,     219136,     1024,     4096, 0x7f96013c
+0,     220160,     220160,     1024,     4096, 0x7a0afe31
+0,     221184,     221184,     1024,     4096, 0xa37d1701
+0,     222208,     222208,     1024,     4096, 0x4615ebc2
+0,     223232,     223232,     1024,     4096, 0x217005c1
+0,     224256,     224256,     1024,     4096, 0x1755f789
+0,     225280,     225280,     1024,     4096, 0x83e6db65
+0,     226304,     226304,     1024,     4096, 0x92ab1447
+0,     227328,     227328,     1024,     4096, 0xedbdf383
+0,     228352,     228352,     1024,     4096, 0x4316f6a9
+0,     229376,     229376,     1024,     4096, 0x1a6a0b4c
+0,     230400,     230400,     1024,     4096, 0xdfd809b7
+0,     231424,     231424,     1024,     4096, 0x1d2cf5f1
+0,     232448,     232448,     1024,     4096, 0xd366f4a1
+0,     233472,     233472,     1024,     4096, 0x6a2f86e0
+0,     234496,     234496,     1024,     4096, 0xf51f08a9
+0,     235520,     235520,     1024,     4096, 0x05edefa8
+0,     236544,     236544,     1024,     4096, 0x255df2a6
+0,     237568,     237568,     1024,     4096, 0xe881d9e4
+0,     238592,     238592,     1024,     4096, 0x50380523
+0,     239616,     239616,     1024,     4096, 0x8b93eb26
+0,     240640,     240640,     1024,     4096, 0x759cf94c
+0,     241664,     241664,     1024,     4096, 0x8474f591
+0,     242688,     242688,     1024,     4096, 0x0030dc9e
+0,     243712,     243712,     1024,     4096, 0xb017fd54
+0,     244736,     244736,     1024,     4096, 0x5c7dfa2e
+0,     245760,     245760,     1024,     4096, 0x7887e599
+0,     246784,     246784,     1024,     4096, 0xb730e72f
+0,     247808,     247808,     1024,     4096, 0x6bb3fae4
+0,     248832,     248832,     1024,     4096, 0xcc08fc36
+0,     249856,     249856,     1024,     4096, 0x5afd9ec2
+0,     250880,     250880,     1024,     4096, 0xa1d3e83d
+0,     251904,     251904,     1024,     4096, 0x7f96013c
+0,     252928,     252928,     1024,     4096, 0x7a0afe31
+0,     253952,     253952,     1024,     4096, 0xa37d1701
+0,     254976,     254976,     1024,     4096, 0x4615ebc2
+0,     256000,     256000,     1024,     4096, 0x217005c1
+0,     257024,     257024,     1024,     4096, 0x1755f789
+0,     258048,     258048,     1024,     4096, 0x83e6db65
+0,     259072,     259072,     1024,     4096, 0x92ab1447
+0,     260096,     260096,     1024,     4096, 0xedbdf383
+0,     261120,     261120,     1024,     4096, 0x4316f6a9
+0,     262144,     262144,     1024,     4096, 0x1a6a0b4c
+0,     263168,     263168,     1024,     4096, 0xdfd809b7
+0,     264192,     264192,      408,     1632, 0xf412313e
diff --git a/tests/ref/fate/filter-afade-qsin b/tests/ref/fate/filter-afade-qsin
new file mode 100644
index 0000000000..026fbbcc44
--- /dev/null
+++ b/tests/ref/fate/filter-afade-qsin
@@ -0,0 +1,265 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0xd977ce0f
+0,       1024,       1024,     1024,     4096, 0x9333f5b1
+0,       2048,       2048,     1024,     4096, 0xf1a30794
+0,       3072,       3072,     1024,     4096, 0xbfb1f7af
+0,       4096,       4096,     1024,     4096, 0x9c0be73f
+0,       5120,       5120,     1024,     4096, 0xe77af231
+0,       6144,       6144,     1024,     4096, 0x60ae0600
+0,       7168,       7168,     1024,     4096, 0x7ecff8d1
+0,       8192,       8192,     1024,     4096, 0xa1a1ec0f
+0,       9216,       9216,     1024,     4096, 0x26f2e4eb
+0,      10240,      10240,     1024,     4096, 0x875d01bc
+0,      11264,      11264,     1024,     4096, 0x56a5edef
+0,      12288,      12288,     1024,     4096, 0xdadeff81
+0,      13312,      13312,     1024,     4096, 0x2198efe7
+0,      14336,      14336,     1024,     4096, 0x6666f8e3
+0,      15360,      15360,     1024,     4096, 0xbc1702e4
+0,      16384,      16384,     1024,     4096, 0x3e32fa1f
+0,      17408,      17408,     1024,     4096, 0x36eff5c7
+0,      18432,      18432,     1024,     4096, 0xda75ec39
+0,      19456,      19456,     1024,     4096, 0x3aeef987
+0,      20480,      20480,     1024,     4096, 0x311f0090
+0,      21504,      21504,     1024,     4096, 0xf40002ae
+0,      22528,      22528,     1024,     4096, 0x390ef101
+0,      23552,      23552,     1024,     4096, 0x1599ff6b
+0,      24576,      24576,     1024,     4096, 0xcd54edef
+0,      25600,      25600,     1024,     4096, 0x0c991178
+0,      26624,      26624,     1024,     4096, 0x7e69f3db
+0,      27648,      27648,     1024,     4096, 0x1c72f871
+0,      28672,      28672,     1024,     4096, 0xb51af385
+0,      29696,      29696,     1024,     4096, 0xc8cb0038
+0,      30720,      30720,     1024,     4096, 0xc3760a10
+0,      31744,      31744,     1024,     4096, 0x77baef51
+0,      32768,      32768,     1024,     4096, 0x0f9cec85
+0,      33792,      33792,     1024,     4096, 0xf78ff8a3
+0,      34816,      34816,     1024,     4096, 0x5a550f7c
+0,      35840,      35840,     1024,     4096, 0x522eef61
+0,      36864,      36864,     1024,     4096, 0x8738e879
+0,      37888,      37888,     1024,     4096, 0x6accf54f
+0,      38912,      38912,     1024,     4096, 0x1ceef2d3
+0,      39936,      39936,     1024,     4096, 0xacd3e885
+0,      40960,      40960,     1024,     4096, 0xed18e503
+0,      41984,      41984,     1024,     4096, 0xa5c5f85d
+0,      43008,      43008,     1024,     4096, 0x4f75049e
+0,      44032,      44032,     1024,     4096, 0xe017e021
+0,      45056,      45056,     1024,     4096, 0xe52e0580
+0,      46080,      46080,     1024,     4096, 0x101613ba
+0,      47104,      47104,     1024,     4096, 0x131eebef
+0,      48128,      48128,     1024,     4096, 0x97f3e1ef
+0,      49152,      49152,     1024,     4096, 0xb6d0ed0b
+0,      50176,      50176,     1024,     4096, 0x524b0300
+0,      51200,      51200,     1024,     4096, 0xdd39c011
+0,      52224,      52224,     1024,     4096, 0xd7ff1126
+0,      53248,      53248,     1024,     4096, 0x6019ed21
+0,      54272,      54272,     1024,     4096, 0x771f1a84
+0,      55296,      55296,     1024,     4096, 0x1a5ef595
+0,      56320,      56320,     1024,     4096, 0x9c53eb6b
+0,      57344,      57344,     1024,     4096, 0x0a95f2e5
+0,      58368,      58368,     1024,     4096, 0x6c631296
+0,      59392,      59392,     1024,     4096, 0xb6a0fbeb
+0,      60416,      60416,     1024,     4096, 0x34bbf835
+0,      61440,      61440,     1024,     4096, 0x7536f37f
+0,      62464,      62464,     1024,     4096, 0xaeac02a0
+0,      63488,      63488,     1024,     4096, 0xfc5cd7c5
+0,      64512,      64512,     1024,     4096, 0x0427ea85
+0,      65536,      65536,     1024,     4096, 0x207003a6
+0,      66560,      66560,     1024,     4096, 0x339ef8c7
+0,      67584,      67584,     1024,     4096, 0x6839f2a9
+0,      68608,      68608,     1024,     4096, 0xc7630330
+0,      69632,      69632,     1024,     4096, 0xd2570b4e
+0,      70656,      70656,     1024,     4096, 0xa2a5e381
+0,      71680,      71680,     1024,     4096, 0xbe941104
+0,      72704,      72704,     1024,     4096, 0x5feef0eb
+0,      73728,      73728,     1024,     4096, 0x9513ead5
+0,      74752,      74752,     1024,     4096, 0x045aeb69
+0,      75776,      75776,     1024,     4096, 0xed6f1042
+0,      76800,      76800,     1024,     4096, 0xd79604a2
+0,      77824,      77824,     1024,     4096, 0xb37dedb3
+0,      78848,      78848,     1024,     4096, 0x666bfa95
+0,      79872,      79872,     1024,     4096, 0x53b10308
+0,      80896,      80896,     1024,     4096, 0xae09fbb7
+0,      81920,      81920,     1024,     4096, 0xba852b80
+0,      82944,      82944,     1024,     4096, 0x76fe2bb2
+0,      83968,      83968,     1024,     4096, 0x2d5fff49
+0,      84992,      84992,     1024,     4096, 0x40dc0136
+0,      86016,      86016,     1024,     4096, 0x483e0522
+0,      87040,      87040,     1024,     4096, 0x756e1596
+0,      88064,      88064,     1024,     4096, 0x1b1ac8b7
+0,      89088,      89088,     1024,     4096, 0xe68dda8f
+0,      90112,      90112,     1024,     4096, 0xe457b505
+0,      91136,      91136,     1024,     4096, 0xda25a409
+0,      92160,      92160,     1024,     4096, 0x5b5d9d3b
+0,      93184,      93184,     1024,     4096, 0xa61eb13d
+0,      94208,      94208,     1024,     4096, 0xac93b66f
+0,      95232,      95232,     1024,     4096, 0xc7aeb33f
+0,      96256,      96256,     1024,     4096, 0x52cccfb5
+0,      97280,      97280,     1024,     4096, 0x4e4cf487
+0,      98304,      98304,     1024,     4096, 0x19c07f35
+0,      99328,      99328,     1024,     4096, 0x63ecd34f
+0,     100352,     100352,     1024,     4096, 0x122aec53
+0,     101376,     101376,     1024,     4096, 0x6581c0ad
+0,     102400,     102400,     1024,     4096, 0x640edb15
+0,     103424,     103424,     1024,     4096, 0x5d66c66f
+0,     104448,     104448,     1024,     4096, 0x069e9d35
+0,     105472,     105472,     1024,     4096, 0x5c9fd0e9
+0,     106496,     106496,     1024,     4096, 0x72468667
+0,     107520,     107520,     1024,     4096, 0x6e6dd02b
+0,     108544,     108544,     1024,     4096, 0x93edce33
+0,     109568,     109568,     1024,     4096, 0xcdfbd519
+0,     110592,     110592,     1024,     4096, 0x8463f2bb
+0,     111616,     111616,     1024,     4096, 0x5ca6f869
+0,     112640,     112640,     1024,     4096, 0x099a0398
+0,     113664,     113664,     1024,     4096, 0xa7fa10f0
+0,     114688,     114688,     1024,     4096, 0x28caddd3
+0,     115712,     115712,     1024,     4096, 0x4852ef8b
+0,     116736,     116736,     1024,     4096, 0x0250ee7b
+0,     117760,     117760,     1024,     4096, 0x9583da21
+0,     118784,     118784,     1024,     4096, 0x7365fb33
+0,     119808,     119808,     1024,     4096, 0x28c82066
+0,     120832,     120832,     1024,     4096, 0x94650be4
+0,     121856,     121856,     1024,     4096, 0xeb21f8eb
+0,     122880,     122880,     1024,     4096, 0xcd88f455
+0,     123904,     123904,     1024,     4096, 0x66a9efaf
+0,     124928,     124928,     1024,     4096, 0x5500c6ed
+0,     125952,     125952,     1024,     4096, 0x0ee0c62d
+0,     126976,     126976,     1024,     4096, 0x34d30762
+0,     128000,     128000,     1024,     4096, 0x8c0dec9f
+0,     129024,     129024,     1024,     4096, 0x790011d8
+0,     130048,     130048,     1024,     4096, 0xb76a1136
+0,     131072,     131072,     1024,     4096, 0x7dddfea7
+0,     132096,     132096,     1024,     4096, 0xdfa3ed49
+0,     133120,     133120,     1024,     4096, 0xc129f54e
+0,     134144,     134144,     1024,     4096, 0x9a86f077
+0,     135168,     135168,     1024,     4096, 0xc9eef209
+0,     136192,     136192,     1024,     4096, 0x72d4029b
+0,     137216,     137216,     1024,     4096, 0x8ec20590
+0,     138240,     138240,     1024,     4096, 0xd48f18ed
+0,     139264,     139264,     1024,     4096, 0xd807eadc
+0,     140288,     140288,     1024,     4096, 0x1e2bea09
+0,     141312,     141312,     1024,     4096, 0x937af12e
+0,     142336,     142336,     1024,     4096, 0xdedbf303
+0,     143360,     143360,     1024,     4096, 0xdc75df88
+0,     144384,     144384,     1024,     4096, 0x1845ffd6
+0,     145408,     145408,     1024,     4096, 0x20e8150c
+0,     146432,     146432,     1024,     4096, 0x5ea7eeef
+0,     147456,     147456,     1024,     4096, 0x4c7efa21
+0,     148480,     148480,     1024,     4096, 0x8b97e30e
+0,     149504,     149504,     1024,     4096, 0xe5040228
+0,     150528,     150528,     1024,     4096, 0x6283f78c
+0,     151552,     151552,     1024,     4096, 0xe7100140
+0,     152576,     152576,     1024,     4096, 0x9ea6f9b2
+0,     153600,     153600,     1024,     4096, 0x5f0e1563
+0,     154624,     154624,     1024,     4096, 0x510bf18e
+0,     155648,     155648,     1024,     4096, 0x5f4fe425
+0,     156672,     156672,     1024,     4096, 0x507af3c0
+0,     157696,     157696,     1024,     4096, 0xbf14ddc6
+0,     158720,     158720,     1024,     4096, 0x1871ed69
+0,     159744,     159744,     1024,     4096, 0xc349ef9f
+0,     160768,     160768,     1024,     4096, 0x4e2c1834
+0,     161792,     161792,     1024,     4096, 0x2383fe04
+0,     162816,     162816,     1024,     4096, 0x6626f415
+0,     163840,     163840,     1024,     4096, 0x283be379
+0,     164864,     164864,     1024,     4096, 0xc76c0ceb
+0,     165888,     165888,     1024,     4096, 0xa0b8040f
+0,     166912,     166912,     1024,     4096, 0x2535eb6d
+0,     167936,     167936,     1024,     4096, 0xeb180bb5
+0,     168960,     168960,     1024,     4096, 0xbc5cf059
+0,     169984,     169984,     1024,     4096, 0x1862f1ac
+0,     171008,     171008,     1024,     4096, 0x9cc2ea2b
+0,     172032,     172032,     1024,     4096, 0xbb9ae754
+0,     173056,     173056,     1024,     4096, 0x716debb5
+0,     174080,     174080,     1024,     4096, 0xff3aff2a
+0,     175104,     175104,     1024,     4096, 0x755dfa5c
+0,     176128,     176128,     1024,     4096, 0x3b830605
+0,     177152,     177152,     1024,     4096, 0x0030dc9e
+0,     178176,     178176,     1024,     4096, 0xb017fd54
+0,     179200,     179200,     1024,     4096, 0x5c7dfa2e
+0,     180224,     180224,     1024,     4096, 0x7887e599
+0,     181248,     181248,     1024,     4096, 0xb730e72f
+0,     182272,     182272,     1024,     4096, 0x6bb3fae4
+0,     183296,     183296,     1024,     4096, 0xcc08fc36
+0,     184320,     184320,     1024,     4096, 0x5afd9ec2
+0,     185344,     185344,     1024,     4096, 0xa1d3e83d
+0,     186368,     186368,     1024,     4096, 0x7f96013c
+0,     187392,     187392,     1024,     4096, 0x7a0afe31
+0,     188416,     188416,     1024,     4096, 0xa37d1701
+0,     189440,     189440,     1024,     4096, 0x4615ebc2
+0,     190464,     190464,     1024,     4096, 0x217005c1
+0,     191488,     191488,     1024,     4096, 0x1755f789
+0,     192512,     192512,     1024,     4096, 0x83e6db65
+0,     193536,     193536,     1024,     4096, 0x92ab1447
+0,     194560,     194560,     1024,     4096, 0xedbdf383
+0,     195584,     195584,     1024,     4096, 0x4316f6a9
+0,     196608,     196608,     1024,     4096, 0x1a6a0b4c
+0,     197632,     197632,     1024,     4096, 0xdfd809b7
+0,     198656,     198656,     1024,     4096, 0x1d2cf5f1
+0,     199680,     199680,     1024,     4096, 0xd366f4a1
+0,     200704,     200704,     1024,     4096, 0x6a2f86e0
+0,     201728,     201728,     1024,     4096, 0xf51f08a9
+0,     202752,     202752,     1024,     4096, 0x05edefa8
+0,     203776,     203776,     1024,     4096, 0x255df2a6
+0,     204800,     204800,     1024,     4096, 0xe881d9e4
+0,     205824,     205824,     1024,     4096, 0x50380523
+0,     206848,     206848,     1024,     4096, 0x8b93eb26
+0,     207872,     207872,     1024,     4096, 0x759cf94c
+0,     208896,     208896,     1024,     4096, 0x8474f591
+0,     209920,     209920,     1024,     4096, 0x0030dc9e
+0,     210944,     210944,     1024,     4096, 0xb017fd54
+0,     211968,     211968,     1024,     4096, 0x5c7dfa2e
+0,     212992,     212992,     1024,     4096, 0x7887e599
+0,     214016,     214016,     1024,     4096, 0xb730e72f
+0,     215040,     215040,     1024,     4096, 0x6bb3fae4
+0,     216064,     216064,     1024,     4096, 0xcc08fc36
+0,     217088,     217088,     1024,     4096, 0x5afd9ec2
+0,     218112,     218112,     1024,     4096, 0xa1d3e83d
+0,     219136,     219136,     1024,     4096, 0x7f96013c
+0,     220160,     220160,     1024,     4096, 0x7a0afe31
+0,     221184,     221184,     1024,     4096, 0xa37d1701
+0,     222208,     222208,     1024,     4096, 0x4615ebc2
+0,     223232,     223232,     1024,     4096, 0x217005c1
+0,     224256,     224256,     1024,     4096, 0x1755f789
+0,     225280,     225280,     1024,     4096, 0x83e6db65
+0,     226304,     226304,     1024,     4096, 0x92ab1447
+0,     227328,     227328,     1024,     4096, 0xedbdf383
+0,     228352,     228352,     1024,     4096, 0x4316f6a9
+0,     229376,     229376,     1024,     4096, 0x1a6a0b4c
+0,     230400,     230400,     1024,     4096, 0xdfd809b7
+0,     231424,     231424,     1024,     4096, 0x1d2cf5f1
+0,     232448,     232448,     1024,     4096, 0xd366f4a1
+0,     233472,     233472,     1024,     4096, 0x6a2f86e0
+0,     234496,     234496,     1024,     4096, 0xf51f08a9
+0,     235520,     235520,     1024,     4096, 0x05edefa8
+0,     236544,     236544,     1024,     4096, 0x255df2a6
+0,     237568,     237568,     1024,     4096, 0xe881d9e4
+0,     238592,     238592,     1024,     4096, 0x50380523
+0,     239616,     239616,     1024,     4096, 0x8b93eb26
+0,     240640,     240640,     1024,     4096, 0x759cf94c
+0,     241664,     241664,     1024,     4096, 0x8474f591
+0,     242688,     242688,     1024,     4096, 0x0030dc9e
+0,     243712,     243712,     1024,     4096, 0xb017fd54
+0,     244736,     244736,     1024,     4096, 0x5c7dfa2e
+0,     245760,     245760,     1024,     4096, 0x7887e599
+0,     246784,     246784,     1024,     4096, 0xb730e72f
+0,     247808,     247808,     1024,     4096, 0x6bb3fae4
+0,     248832,     248832,     1024,     4096, 0xcc08fc36
+0,     249856,     249856,     1024,     4096, 0x5afd9ec2
+0,     250880,     250880,     1024,     4096, 0xa1d3e83d
+0,     251904,     251904,     1024,     4096, 0x7f96013c
+0,     252928,     252928,     1024,     4096, 0x7a0afe31
+0,     253952,     253952,     1024,     4096, 0xa37d1701
+0,     254976,     254976,     1024,     4096, 0x4615ebc2
+0,     256000,     256000,     1024,     4096, 0x217005c1
+0,     257024,     257024,     1024,     4096, 0x1755f789
+0,     258048,     258048,     1024,     4096, 0x83e6db65
+0,     259072,     259072,     1024,     4096, 0x92ab1447
+0,     260096,     260096,     1024,     4096, 0xedbdf383
+0,     261120,     261120,     1024,     4096, 0x4316f6a9
+0,     262144,     262144,     1024,     4096, 0x1a6a0b4c
+0,     263168,     263168,     1024,     4096, 0xdfd809b7
+0,     264192,     264192,      408,     1632, 0xf412313e
diff --git a/tests/ref/fate/filter-agate b/tests/ref/fate/filter-agate
new file mode 100644
index 0000000000..b6e732a86e
--- /dev/null
+++ b/tests/ref/fate/filter-agate
@@ -0,0 +1,265 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x1af20090
+0,       1024,       1024,     1024,     4096, 0x0b05ef2d
+0,       2048,       2048,     1024,     4096, 0x574bf11d
+0,       3072,       3072,     1024,     4096, 0x774af5d3
+0,       4096,       4096,     1024,     4096, 0x7b51ff33
+0,       5120,       5120,     1024,     4096, 0xf610f9bf
+0,       6144,       6144,     1024,     4096, 0x3c20ef79
+0,       7168,       7168,     1024,     4096, 0x427bef59
+0,       8192,       8192,     1024,     4096, 0x8773fa99
+0,       9216,       9216,     1024,     4096, 0xbf1dfe89
+0,      10240,      10240,     1024,     4096, 0x462df4dd
+0,      11264,      11264,     1024,     4096, 0x1170f169
+0,      12288,      12288,     1024,     4096, 0xcb9cf633
+0,      13312,      13312,     1024,     4096, 0x7e8c01da
+0,      14336,      14336,     1024,     4096, 0x93c202d0
+0,      15360,      15360,     1024,     4096, 0xd882ec6d
+0,      16384,      16384,     1024,     4096, 0x03fbec6d
+0,      17408,      17408,     1024,     4096, 0x73f400d4
+0,      18432,      18432,     1024,     4096, 0xea8c01da
+0,      19456,      19456,     1024,     4096, 0x23cbf82f
+0,      20480,      20480,     1024,     4096, 0x85cdf169
+0,      21504,      21504,     1024,     4096, 0x8e27f2e1
+0,      22528,      22528,     1024,     4096, 0x91bffe89
+0,      23552,      23552,     1024,     4096, 0xc31afd95
+0,      24576,      24576,     1024,     4096, 0x5c23ee59
+0,      25600,      25600,     1024,     4096, 0x58d0ef79
+0,      26624,      26624,     1024,     4096, 0xfccff7c3
+0,      27648,      27648,     1024,     4096, 0x7084ff33
+0,      28672,      28672,     1024,     4096, 0x7f1bf7cf
+0,      29696,      29696,     1024,     4096, 0x8037f11d
+0,      30720,      30720,     1024,     4096, 0xd106ed31
+0,      31744,      31744,     1024,     4096, 0xaf820090
+0,      32768,      32768,     1024,     4096, 0x1af20090
+0,      33792,      33792,     1024,     4096, 0x0b05ef2d
+0,      34816,      34816,     1024,     4096, 0x574bf11d
+0,      35840,      35840,     1024,     4096, 0x774af5d3
+0,      36864,      36864,     1024,     4096, 0x7b51ff33
+0,      37888,      37888,     1024,     4096, 0xf610f9bf
+0,      38912,      38912,     1024,     4096, 0x3c20ef79
+0,      39936,      39936,     1024,     4096, 0x427bef59
+0,      40960,      40960,     1024,     4096, 0x8773fa99
+0,      41984,      41984,     1024,     4096, 0xbf1dfe89
+0,      43008,      43008,     1024,     4096, 0x462df4dd
+0,      44032,      44032,     1024,     4096, 0x41650472
+0,      45056,      45056,     1024,     4096, 0x1081f133
+0,      46080,      46080,     1024,     4096, 0x9da3e58b
+0,      47104,      47104,     1024,     4096, 0x752614ac
+0,      48128,      48128,     1024,     4096, 0x0f23034c
+0,      49152,      49152,     1024,     4096, 0x768fe8a1
+0,      50176,      50176,     1024,     4096, 0xf0f9079e
+0,      51200,      51200,     1024,     4096, 0x8543ed93
+0,      52224,      52224,     1024,     4096, 0x9f96fe9d
+0,      53248,      53248,     1024,     4096, 0x94f3facf
+0,      54272,      54272,     1024,     4096, 0xc0defe4d
+0,      55296,      55296,     1024,     4096, 0x4e22f5ff
+0,      56320,      56320,     1024,     4096, 0xb604ed7d
+0,      57344,      57344,     1024,     4096, 0xb6400124
+0,      58368,      58368,     1024,     4096, 0xadadf519
+0,      59392,      59392,     1024,     4096, 0x2520fb85
+0,      60416,      60416,     1024,     4096, 0x1ffbf4a9
+0,      61440,      61440,     1024,     4096, 0x380e05cc
+0,      62464,      62464,     1024,     4096, 0x366af6cf
+0,      63488,      63488,     1024,     4096, 0x4f64f355
+0,      64512,      64512,     1024,     4096, 0x7aa0e89f
+0,      65536,      65536,     1024,     4096, 0x1f160524
+0,      66560,      66560,     1024,     4096, 0x6bba0292
+0,      67584,      67584,     1024,     4096, 0x5243ed4d
+0,      68608,      68608,     1024,     4096, 0x304ffcb1
+0,      69632,      69632,     1024,     4096, 0xfb1bfc9b
+0,      70656,      70656,     1024,     4096, 0x0259e9d3
+0,      71680,      71680,     1024,     4096, 0x90fee749
+0,      72704,      72704,     1024,     4096, 0x8626eff9
+0,      73728,      73728,     1024,     4096, 0x29a4fe41
+0,      74752,      74752,     1024,     4096, 0x0dacf2bb
+0,      75776,      75776,     1024,     4096, 0x875b0046
+0,      76800,      76800,     1024,     4096, 0x009b0068
+0,      77824,      77824,     1024,     4096, 0x50f8eee1
+0,      78848,      78848,     1024,     4096, 0xa73ef503
+0,      79872,      79872,     1024,     4096, 0xaac8f7e5
+0,      80896,      80896,     1024,     4096, 0x0229f31b
+0,      81920,      81920,     1024,     4096, 0x7eb0edc9
+0,      82944,      82944,     1024,     4096, 0x88e0eddd
+0,      83968,      83968,     1024,     4096, 0x7982fe3f
+0,      84992,      84992,     1024,     4096, 0x91caf665
+0,      86016,      86016,     1024,     4096, 0x2fd1f3d7
+0,      87040,      87040,     1024,     4096, 0x9b3de465
+0,      88064,      88064,     1024,     4096, 0xd3f5e99d
+0,      89088,      89088,     1024,     4096, 0xeb00b4df
+0,      90112,      90112,     1024,     4096, 0xc0a5e92f
+0,      91136,      91136,     1024,     4096, 0xaed2ef59
+0,      92160,      92160,     1024,     4096, 0x80591586
+0,      93184,      93184,     1024,     4096, 0x32d4f0ef
+0,      94208,      94208,     1024,     4096, 0x8ba4f0f9
+0,      95232,      95232,     1024,     4096, 0x8d3bc631
+0,      96256,      96256,     1024,     4096, 0xddede7c5
+0,      97280,      97280,     1024,     4096, 0x6a459463
+0,      98304,      98304,     1024,     4096, 0xeca818b8
+0,      99328,      99328,     1024,     4096, 0x0c91c6c9
+0,     100352,     100352,     1024,     4096, 0x6241e69b
+0,     101376,     101376,     1024,     4096, 0xe220d9a7
+0,     102400,     102400,     1024,     4096, 0x9f4bcbd5
+0,     103424,     103424,     1024,     4096, 0x2c1ad90b
+0,     104448,     104448,     1024,     4096, 0x3974feb3
+0,     105472,     105472,     1024,     4096, 0x8d1ae2e1
+0,     106496,     106496,     1024,     4096, 0xa609f955
+0,     107520,     107520,     1024,     4096, 0xc5fcdd19
+0,     108544,     108544,     1024,     4096, 0xe233d8c5
+0,     109568,     109568,     1024,     4096, 0xd1d7d61d
+0,     110592,     110592,     1024,     4096, 0x52522f58
+0,     111616,     111616,     1024,     4096, 0x16d8cd63
+0,     112640,     112640,     1024,     4096, 0x3994e847
+0,     113664,     113664,     1024,     4096, 0x6fd8ea07
+0,     114688,     114688,     1024,     4096, 0x582723be
+0,     115712,     115712,     1024,     4096, 0x44d40ff6
+0,     116736,     116736,     1024,     4096, 0x98d22050
+0,     117760,     117760,     1024,     4096, 0x2cc8063c
+0,     118784,     118784,     1024,     4096, 0xf645ed8d
+0,     119808,     119808,     1024,     4096, 0xcb49dbe1
+0,     120832,     120832,     1024,     4096, 0x7efbf369
+0,     121856,     121856,     1024,     4096, 0x797333ac
+0,     122880,     122880,     1024,     4096, 0x157130fa
+0,     123904,     123904,     1024,     4096, 0x23530594
+0,     124928,     124928,     1024,     4096, 0x46783b6c
+0,     125952,     125952,     1024,     4096, 0x5fac436e
+0,     126976,     126976,     1024,     4096, 0x2a9e1c76
+0,     128000,     128000,     1024,     4096, 0x152202ac
+0,     129024,     129024,     1024,     4096, 0xe5cdf369
+0,     130048,     130048,     1024,     4096, 0x6fe2feeb
+0,     131072,     131072,     1024,     4096, 0xee24ec7f
+0,     132096,     132096,     1024,     4096, 0x6f33fd5d
+0,     133120,     133120,     1024,     4096, 0x3f52fd51
+0,     134144,     134144,     1024,     4096, 0x2292e8e6
+0,     135168,     135168,     1024,     4096, 0xbc13f7bb
+0,     136192,     136192,     1024,     4096, 0xc271f708
+0,     137216,     137216,     1024,     4096, 0x9f1ff6ec
+0,     138240,     138240,     1024,     4096, 0xdf88f599
+0,     139264,     139264,     1024,     4096, 0x6614f6ae
+0,     140288,     140288,     1024,     4096, 0x7cf9f3c4
+0,     141312,     141312,     1024,     4096, 0xcdc1f588
+0,     142336,     142336,     1024,     4096, 0xa4a1ffa9
+0,     143360,     143360,     1024,     4096, 0xcb15f5d4
+0,     144384,     144384,     1024,     4096, 0x2fd0f58f
+0,     145408,     145408,     1024,     4096, 0x08eff948
+0,     146432,     146432,     1024,     4096, 0x71f9f39f
+0,     147456,     147456,     1024,     4096, 0x70f5f4ed
+0,     148480,     148480,     1024,     4096, 0x3ccaf424
+0,     149504,     149504,     1024,     4096, 0xc170f215
+0,     150528,     150528,     1024,     4096, 0xdecfeb38
+0,     151552,     151552,     1024,     4096, 0xb7a6f0e5
+0,     152576,     152576,     1024,     4096, 0x14ecf42d
+0,     153600,     153600,     1024,     4096, 0x3af8eefc
+0,     154624,     154624,     1024,     4096, 0xec57fa8b
+0,     155648,     155648,     1024,     4096, 0x206bf602
+0,     156672,     156672,     1024,     4096, 0x15a7f45d
+0,     157696,     157696,     1024,     4096, 0xb23dea6e
+0,     158720,     158720,     1024,     4096, 0x6b6af81c
+0,     159744,     159744,     1024,     4096, 0xae73f6c7
+0,     160768,     160768,     1024,     4096, 0x19c8f293
+0,     161792,     161792,     1024,     4096, 0x752ef8aa
+0,     162816,     162816,     1024,     4096, 0xfac6f812
+0,     163840,     163840,     1024,     4096, 0xff9dfb00
+0,     164864,     164864,     1024,     4096, 0x8305f5b2
+0,     165888,     165888,     1024,     4096, 0xe2f3fea4
+0,     166912,     166912,     1024,     4096, 0xb377f0e6
+0,     167936,     167936,     1024,     4096, 0x0344f0a9
+0,     168960,     168960,     1024,     4096, 0x389afaf4
+0,     169984,     169984,     1024,     4096, 0x5f63fa0d
+0,     171008,     171008,     1024,     4096, 0xce88f5ae
+0,     172032,     172032,     1024,     4096, 0x7e55f852
+0,     173056,     173056,     1024,     4096, 0x5af0f555
+0,     174080,     174080,     1024,     4096, 0x5753fa5a
+0,     175104,     175104,     1024,     4096, 0x443ce89b
+0,     176128,     176128,     1024,     4096, 0x0068de8c
+0,     177152,     177152,     1024,     4096, 0x5209f51f
+0,     178176,     178176,     1024,     4096, 0x97e8eb3a
+0,     179200,     179200,     1024,     4096, 0xd97fe978
+0,     180224,     180224,     1024,     4096, 0x8cadff37
+0,     181248,     181248,     1024,     4096, 0x8dd40290
+0,     182272,     182272,     1024,     4096, 0x2369eb74
+0,     183296,     183296,     1024,     4096, 0x50e8e9ee
+0,     184320,     184320,     1024,     4096, 0x1e727c22
+0,     185344,     185344,     1024,     4096, 0xbe8be7ed
+0,     186368,     186368,     1024,     4096, 0xb6f0f37a
+0,     187392,     187392,     1024,     4096, 0x8a9af2a2
+0,     188416,     188416,     1024,     4096, 0x6917f395
+0,     189440,     189440,     1024,     4096, 0x649df5b4
+0,     190464,     190464,     1024,     4096, 0xebb7fc9a
+0,     191488,     191488,     1024,     4096, 0xba3eef09
+0,     192512,     192512,     1024,     4096, 0x0cf9ba5e
+0,     193536,     193536,     1024,     4096, 0x0f83eb2d
+0,     194560,     194560,     1024,     4096, 0xcd86f62c
+0,     195584,     195584,     1024,     4096, 0x1f6d05b6
+0,     196608,     196608,     1024,     4096, 0x988ff2ed
+0,     197632,     197632,     1024,     4096, 0xe066eb10
+0,     198656,     198656,     1024,     4096, 0x608be99e
+0,     199680,     199680,     1024,     4096, 0xba97e994
+0,     200704,     200704,     1024,     4096, 0xe92a8b76
+0,     201728,     201728,     1024,     4096, 0xe12ee0e2
+0,     202752,     202752,     1024,     4096, 0xc202ef7d
+0,     203776,     203776,     1024,     4096, 0xcd8afebb
+0,     204800,     204800,     1024,     4096, 0x0fc2fcbf
+0,     205824,     205824,     1024,     4096, 0x2d4df1bb
+0,     206848,     206848,     1024,     4096, 0x7282ee1f
+0,     207872,     207872,     1024,     4096, 0xaa4ee359
+0,     208896,     208896,     1024,     4096, 0x10c0deb1
+0,     209920,     209920,     1024,     4096, 0x5209f51f
+0,     210944,     210944,     1024,     4096, 0x97e8eb3a
+0,     211968,     211968,     1024,     4096, 0xd97fe978
+0,     212992,     212992,     1024,     4096, 0x8cadff37
+0,     214016,     214016,     1024,     4096, 0x8dd40290
+0,     215040,     215040,     1024,     4096, 0x2369eb74
+0,     216064,     216064,     1024,     4096, 0x50e8e9ee
+0,     217088,     217088,     1024,     4096, 0x1e727c22
+0,     218112,     218112,     1024,     4096, 0xbe8be7ed
+0,     219136,     219136,     1024,     4096, 0xb6f0f37a
+0,     220160,     220160,     1024,     4096, 0x8a9af2a2
+0,     221184,     221184,     1024,     4096, 0x6917f395
+0,     222208,     222208,     1024,     4096, 0x649df5b4
+0,     223232,     223232,     1024,     4096, 0xebb7fc9a
+0,     224256,     224256,     1024,     4096, 0xba3eef09
+0,     225280,     225280,     1024,     4096, 0x0cf9ba5e
+0,     226304,     226304,     1024,     4096, 0x0f83eb2d
+0,     227328,     227328,     1024,     4096, 0xcd86f62c
+0,     228352,     228352,     1024,     4096, 0x1f6d05b6
+0,     229376,     229376,     1024,     4096, 0x988ff2ed
+0,     230400,     230400,     1024,     4096, 0xe066eb10
+0,     231424,     231424,     1024,     4096, 0x608be99e
+0,     232448,     232448,     1024,     4096, 0xba97e994
+0,     233472,     233472,     1024,     4096, 0xe92a8b76
+0,     234496,     234496,     1024,     4096, 0xe12ee0e2
+0,     235520,     235520,     1024,     4096, 0xc202ef7d
+0,     236544,     236544,     1024,     4096, 0xcd8afebb
+0,     237568,     237568,     1024,     4096, 0x0fc2fcbf
+0,     238592,     238592,     1024,     4096, 0x2d4df1bb
+0,     239616,     239616,     1024,     4096, 0x7282ee1f
+0,     240640,     240640,     1024,     4096, 0xaa4ee359
+0,     241664,     241664,     1024,     4096, 0x10c0deb1
+0,     242688,     242688,     1024,     4096, 0x5209f51f
+0,     243712,     243712,     1024,     4096, 0x97e8eb3a
+0,     244736,     244736,     1024,     4096, 0xd97fe978
+0,     245760,     245760,     1024,     4096, 0x8cadff37
+0,     246784,     246784,     1024,     4096, 0x8dd40290
+0,     247808,     247808,     1024,     4096, 0x2369eb74
+0,     248832,     248832,     1024,     4096, 0x50e8e9ee
+0,     249856,     249856,     1024,     4096, 0x1e727c22
+0,     250880,     250880,     1024,     4096, 0xbe8be7ed
+0,     251904,     251904,     1024,     4096, 0xb6f0f37a
+0,     252928,     252928,     1024,     4096, 0x8a9af2a2
+0,     253952,     253952,     1024,     4096, 0x6917f395
+0,     254976,     254976,     1024,     4096, 0x649df5b4
+0,     256000,     256000,     1024,     4096, 0xebb7fc9a
+0,     257024,     257024,     1024,     4096, 0xba3eef09
+0,     258048,     258048,     1024,     4096, 0x0cf9ba5e
+0,     259072,     259072,     1024,     4096, 0x0f83eb2d
+0,     260096,     260096,     1024,     4096, 0xcd86f62c
+0,     261120,     261120,     1024,     4096, 0x1f6d05b6
+0,     262144,     262144,     1024,     4096, 0x988ff2ed
+0,     263168,     263168,     1024,     4096, 0xe066eb10
+0,     264192,     264192,      408,     1632, 0xe00c26bc
diff --git a/tests/ref/fate/filter-alimiter b/tests/ref/fate/filter-alimiter
new file mode 100644
index 0000000000..aef9765a83
--- /dev/null
+++ b/tests/ref/fate/filter-alimiter
@@ -0,0 +1,265 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0xd4194af4
+0,       1024,       1024,     1024,     4096, 0x686af4ab
+0,       2048,       2048,     1024,     4096, 0xe80cee61
+0,       3072,       3072,     1024,     4096, 0xa686fbad
+0,       4096,       4096,     1024,     4096, 0x191e062c
+0,       5120,       5120,     1024,     4096, 0x1a13edb1
+0,       6144,       6144,     1024,     4096, 0xab21f8ef
+0,       7168,       7168,     1024,     4096, 0xaa30e757
+0,       8192,       8192,     1024,     4096, 0x5afdf69f
+0,       9216,       9216,     1024,     4096, 0x765e05ec
+0,      10240,      10240,     1024,     4096, 0x6484f551
+0,      11264,      11264,     1024,     4096, 0x61b9e9f7
+0,      12288,      12288,     1024,     4096, 0xa735feb3
+0,      13312,      13312,     1024,     4096, 0xb47203aa
+0,      14336,      14336,     1024,     4096, 0xb6b5fbf5
+0,      15360,      15360,     1024,     4096, 0xbc66f14f
+0,      16384,      16384,     1024,     4096, 0x2003ff5b
+0,      17408,      17408,     1024,     4096, 0x1160f17d
+0,      18432,      18432,     1024,     4096, 0x308001a4
+0,      19456,      19456,     1024,     4096, 0x9df9f429
+0,      20480,      20480,     1024,     4096, 0x3e6eec0f
+0,      21504,      21504,     1024,     4096, 0xca3301f2
+0,      22528,      22528,     1024,     4096, 0x9eb1f961
+0,      23552,      23552,     1024,     4096, 0xd0a50c8c
+0,      24576,      24576,     1024,     4096, 0x071ee96b
+0,      25600,      25600,     1024,     4096, 0x7a46f05b
+0,      26624,      26624,     1024,     4096, 0x2cb2f475
+0,      27648,      27648,     1024,     4096, 0x5bda0a52
+0,      28672,      28672,     1024,     4096, 0x33c0f727
+0,      29696,      29696,     1024,     4096, 0x53cfee59
+0,      30720,      30720,     1024,     4096, 0x1588f221
+0,      31744,      31744,     1024,     4096, 0x95d400d6
+0,      32768,      32768,     1024,     4096, 0x0078009a
+0,      33792,      33792,     1024,     4096, 0x686af4ab
+0,      34816,      34816,     1024,     4096, 0xe80cee61
+0,      35840,      35840,     1024,     4096, 0xa686fbad
+0,      36864,      36864,     1024,     4096, 0x191e062c
+0,      37888,      37888,     1024,     4096, 0x1a13edb1
+0,      38912,      38912,     1024,     4096, 0xab21f8ef
+0,      39936,      39936,     1024,     4096, 0xaa30e757
+0,      40960,      40960,     1024,     4096, 0x5afdf69f
+0,      41984,      41984,     1024,     4096, 0x765e05ec
+0,      43008,      43008,     1024,     4096, 0x6484f551
+0,      44032,      44032,     1024,     4096, 0x755e0600
+0,      45056,      45056,     1024,     4096, 0x5056ecb9
+0,      46080,      46080,     1024,     4096, 0xdcb609a8
+0,      47104,      47104,     1024,     4096, 0xc87bf4a1
+0,      48128,      48128,     1024,     4096, 0xecdfef95
+0,      49152,      49152,     1024,     4096, 0x905ff13f
+0,      50176,      50176,     1024,     4096, 0x4e69eeb3
+0,      51200,      51200,     1024,     4096, 0x16e1082c
+0,      52224,      52224,     1024,     4096, 0x606c0a22
+0,      53248,      53248,     1024,     4096, 0x9f94f351
+0,      54272,      54272,     1024,     4096, 0x2c47f63f
+0,      55296,      55296,     1024,     4096, 0x9e14ebf9
+0,      56320,      56320,     1024,     4096, 0x7804fbcb
+0,      57344,      57344,     1024,     4096, 0xc7c6ffb7
+0,      58368,      58368,     1024,     4096, 0xa547f68d
+0,      59392,      59392,     1024,     4096, 0x0c87fed7
+0,      60416,      60416,     1024,     4096, 0x88b5fef1
+0,      61440,      61440,     1024,     4096, 0x325af00d
+0,      62464,      62464,     1024,     4096, 0xd826edd9
+0,      63488,      63488,     1024,     4096, 0x1fbe1138
+0,      64512,      64512,     1024,     4096, 0xdf85da7b
+0,      65536,      65536,     1024,     4096, 0xf987f9b3
+0,      66560,      66560,     1024,     4096, 0x5df5e12f
+0,      67584,      67584,     1024,     4096, 0x259cf8ef
+0,      68608,      68608,     1024,     4096, 0xa191eb4f
+0,      69632,      69632,     1024,     4096, 0xfe5bf1fd
+0,      70656,      70656,     1024,     4096, 0x7675e2cb
+0,      71680,      71680,     1024,     4096, 0x796a2f90
+0,      72704,      72704,     1024,     4096, 0xaa52e7a5
+0,      73728,      73728,     1024,     4096, 0x2b56fd81
+0,      74752,      74752,     1024,     4096, 0xbf7c02ee
+0,      75776,      75776,     1024,     4096, 0xfe4cebb1
+0,      76800,      76800,     1024,     4096, 0xe5b7fdf7
+0,      77824,      77824,     1024,     4096, 0xd271ece7
+0,      78848,      78848,     1024,     4096, 0x96e0f69f
+0,      79872,      79872,     1024,     4096, 0x6e5eef33
+0,      80896,      80896,     1024,     4096, 0x78b70b6e
+0,      81920,      81920,     1024,     4096, 0x61f2f075
+0,      82944,      82944,     1024,     4096, 0xf1dc47dc
+0,      83968,      83968,     1024,     4096, 0xf4b406d2
+0,      84992,      84992,     1024,     4096, 0xe33806fe
+0,      86016,      86016,     1024,     4096, 0x5b5ef087
+0,      87040,      87040,     1024,     4096, 0x3fa207da
+0,      88064,      88064,     1024,     4096, 0x4719f201
+0,      89088,      89088,     1024,     4096, 0x641feaad
+0,      90112,      90112,     1024,     4096, 0x905402ec
+0,      91136,      91136,     1024,     4096, 0xf529e11f
+0,      92160,      92160,     1024,     4096, 0x65a41838
+0,      93184,      93184,     1024,     4096, 0x651efb6f
+0,      94208,      94208,     1024,     4096, 0x251b1390
+0,      95232,      95232,     1024,     4096, 0x45ea05a8
+0,      96256,      96256,     1024,     4096, 0xe65be141
+0,      97280,      97280,     1024,     4096, 0xd452d3dd
+0,      98304,      98304,     1024,     4096, 0x3bdff821
+0,      99328,      99328,     1024,     4096, 0x74da00e6
+0,     100352,     100352,     1024,     4096, 0x4474fa19
+0,     101376,     101376,     1024,     4096, 0x11ddedef
+0,     102400,     102400,     1024,     4096, 0xf027d72b
+0,     103424,     103424,     1024,     4096, 0xaa0a1ce6
+0,     104448,     104448,     1024,     4096, 0x7168145e
+0,     105472,     105472,     1024,     4096, 0x94a710a4
+0,     106496,     106496,     1024,     4096, 0x6f55ecf1
+0,     107520,     107520,     1024,     4096, 0xc12de6d7
+0,     108544,     108544,     1024,     4096, 0x8ff7db15
+0,     109568,     109568,     1024,     4096, 0x366d0cc6
+0,     110592,     110592,     1024,     4096, 0xb04afa4f
+0,     111616,     111616,     1024,     4096, 0xf6abbee7
+0,     112640,     112640,     1024,     4096, 0xbe9910dc
+0,     113664,     113664,     1024,     4096, 0x96c3047e
+0,     114688,     114688,     1024,     4096, 0x9dc1e8e1
+0,     115712,     115712,     1024,     4096, 0x4b2c1092
+0,     116736,     116736,     1024,     4096, 0x592d212c
+0,     117760,     117760,     1024,     4096, 0x5c3bda15
+0,     118784,     118784,     1024,     4096, 0x43c8e90f
+0,     119808,     119808,     1024,     4096, 0x3bfa074e
+0,     120832,     120832,     1024,     4096, 0xa2d7d443
+0,     121856,     121856,     1024,     4096, 0xd4b02844
+0,     122880,     122880,     1024,     4096, 0x9f5d2a92
+0,     123904,     123904,     1024,     4096, 0xc19bf69d
+0,     124928,     124928,     1024,     4096, 0x47b8fe75
+0,     125952,     125952,     1024,     4096, 0x337334b0
+0,     126976,     126976,     1024,     4096, 0x96ed14f0
+0,     128000,     128000,     1024,     4096, 0x9af0f67b
+0,     129024,     129024,     1024,     4096, 0xdf541a60
+0,     130048,     130048,     1024,     4096, 0x684f0c06
+0,     131072,     131072,     1024,     4096, 0xe3d0015e
+0,     132096,     132096,     1024,     4096, 0xf648d73c
+0,     133120,     133120,     1024,     4096, 0x4041f3ee
+0,     134144,     134144,     1024,     4096, 0x1421025f
+0,     135168,     135168,     1024,     4096, 0x4eb5fc97
+0,     136192,     136192,     1024,     4096, 0x510f02fe
+0,     137216,     137216,     1024,     4096, 0x85e9e95e
+0,     138240,     138240,     1024,     4096, 0xb1d0fe10
+0,     139264,     139264,     1024,     4096, 0xda66f5f8
+0,     140288,     140288,     1024,     4096, 0x3826eaa8
+0,     141312,     141312,     1024,     4096, 0xa7cc0176
+0,     142336,     142336,     1024,     4096, 0x71e8fe5a
+0,     143360,     143360,     1024,     4096, 0x0149fcfa
+0,     144384,     144384,     1024,     4096, 0xbd36fd8e
+0,     145408,     145408,     1024,     4096, 0xec1afcc6
+0,     146432,     146432,     1024,     4096, 0xea80ec5e
+0,     147456,     147456,     1024,     4096, 0x8da1f0ac
+0,     148480,     148480,     1024,     4096, 0x63c3e61c
+0,     149504,     149504,     1024,     4096, 0x188cf09b
+0,     150528,     150528,     1024,     4096, 0x7eebea85
+0,     151552,     151552,     1024,     4096, 0x7ef6f718
+0,     152576,     152576,     1024,     4096, 0xcd9fecfb
+0,     153600,     153600,     1024,     4096, 0x1aa7f624
+0,     154624,     154624,     1024,     4096, 0xcab5f1e3
+0,     155648,     155648,     1024,     4096, 0x36e9f795
+0,     156672,     156672,     1024,     4096, 0x952cf54d
+0,     157696,     157696,     1024,     4096, 0x54a4ed3b
+0,     158720,     158720,     1024,     4096, 0x1e24f992
+0,     159744,     159744,     1024,     4096, 0xab6bfa09
+0,     160768,     160768,     1024,     4096, 0xa021020b
+0,     161792,     161792,     1024,     4096, 0xaa0600f5
+0,     162816,     162816,     1024,     4096, 0xadf7ec92
+0,     163840,     163840,     1024,     4096, 0x5dd5f63f
+0,     164864,     164864,     1024,     4096, 0xc01bff89
+0,     165888,     165888,     1024,     4096, 0x05dbf1e7
+0,     166912,     166912,     1024,     4096, 0x44f00038
+0,     167936,     167936,     1024,     4096, 0x6dc5f886
+0,     168960,     168960,     1024,     4096, 0xeb88e729
+0,     169984,     169984,     1024,     4096, 0xfe5cf53e
+0,     171008,     171008,     1024,     4096, 0x2692f7a0
+0,     172032,     172032,     1024,     4096, 0xe984f24b
+0,     173056,     173056,     1024,     4096, 0x1a4ef732
+0,     174080,     174080,     1024,     4096, 0x3b60010b
+0,     175104,     175104,     1024,     4096, 0x6dd0eaf2
+0,     176128,     176128,     1024,     4096, 0x313de851
+0,     177152,     177152,     1024,     4096, 0x239ef043
+0,     178176,     178176,     1024,     4096, 0x2366fe43
+0,     179200,     179200,     1024,     4096, 0xbfd6f3b9
+0,     180224,     180224,     1024,     4096, 0xb34bf67b
+0,     181248,     181248,     1024,     4096, 0x00def7c1
+0,     182272,     182272,     1024,     4096, 0xa6d0f466
+0,     183296,     183296,     1024,     4096, 0xd1a1f1c2
+0,     184320,     184320,     1024,     4096, 0x32f8923c
+0,     185344,     185344,     1024,     4096, 0x137001d2
+0,     186368,     186368,     1024,     4096, 0xb881f6cd
+0,     187392,     187392,     1024,     4096, 0xf44e034a
+0,     188416,     188416,     1024,     4096, 0xb43fecf7
+0,     189440,     189440,     1024,     4096, 0xe62ced50
+0,     190464,     190464,     1024,     4096, 0x221dfd0d
+0,     191488,     191488,     1024,     4096, 0x85400147
+0,     192512,     192512,     1024,     4096, 0x8bf8d054
+0,     193536,     193536,     1024,     4096, 0x08370170
+0,     194560,     194560,     1024,     4096, 0xec62effa
+0,     195584,     195584,     1024,     4096, 0xd58cf67c
+0,     196608,     196608,     1024,     4096, 0xf597f9a1
+0,     197632,     197632,     1024,     4096, 0x63fcf0b0
+0,     198656,     198656,     1024,     4096, 0x8cc8fd32
+0,     199680,     199680,     1024,     4096, 0xf8c2072c
+0,     200704,     200704,     1024,     4096, 0x0c7e93a5
+0,     201728,     201728,     1024,     4096, 0x1cc3f612
+0,     202752,     202752,     1024,     4096, 0x83adf8ee
+0,     203776,     203776,     1024,     4096, 0x680e0195
+0,     204800,     204800,     1024,     4096, 0x9d34fd2e
+0,     205824,     205824,     1024,     4096, 0x44cdfb34
+0,     206848,     206848,     1024,     4096, 0x193df790
+0,     207872,     207872,     1024,     4096, 0xb337ef64
+0,     208896,     208896,     1024,     4096, 0x0074ee38
+0,     209920,     209920,     1024,     4096, 0x239ef043
+0,     210944,     210944,     1024,     4096, 0x2366fe43
+0,     211968,     211968,     1024,     4096, 0xbfd6f3b9
+0,     212992,     212992,     1024,     4096, 0xb34bf67b
+0,     214016,     214016,     1024,     4096, 0x00def7c1
+0,     215040,     215040,     1024,     4096, 0xa6d0f466
+0,     216064,     216064,     1024,     4096, 0xd1a1f1c2
+0,     217088,     217088,     1024,     4096, 0x32f8923c
+0,     218112,     218112,     1024,     4096, 0x137001d2
+0,     219136,     219136,     1024,     4096, 0xb881f6cd
+0,     220160,     220160,     1024,     4096, 0xf44e034a
+0,     221184,     221184,     1024,     4096, 0xb43fecf7
+0,     222208,     222208,     1024,     4096, 0xe62ced50
+0,     223232,     223232,     1024,     4096, 0x221dfd0d
+0,     224256,     224256,     1024,     4096, 0x85400147
+0,     225280,     225280,     1024,     4096, 0x8bf8d054
+0,     226304,     226304,     1024,     4096, 0x08370170
+0,     227328,     227328,     1024,     4096, 0xec62effa
+0,     228352,     228352,     1024,     4096, 0xd58cf67c
+0,     229376,     229376,     1024,     4096, 0xf597f9a1
+0,     230400,     230400,     1024,     4096, 0x63fcf0b0
+0,     231424,     231424,     1024,     4096, 0x8cc8fd32
+0,     232448,     232448,     1024,     4096, 0xf8c2072c
+0,     233472,     233472,     1024,     4096, 0x0c7e93a5
+0,     234496,     234496,     1024,     4096, 0x1cc3f612
+0,     235520,     235520,     1024,     4096, 0x83adf8ee
+0,     236544,     236544,     1024,     4096, 0x680e0195
+0,     237568,     237568,     1024,     4096, 0x9d34fd2e
+0,     238592,     238592,     1024,     4096, 0x44cdfb34
+0,     239616,     239616,     1024,     4096, 0x193df790
+0,     240640,     240640,     1024,     4096, 0xb337ef64
+0,     241664,     241664,     1024,     4096, 0x0074ee38
+0,     242688,     242688,     1024,     4096, 0x239ef043
+0,     243712,     243712,     1024,     4096, 0x2366fe43
+0,     244736,     244736,     1024,     4096, 0xbfd6f3b9
+0,     245760,     245760,     1024,     4096, 0xb34bf67b
+0,     246784,     246784,     1024,     4096, 0x00def7c1
+0,     247808,     247808,     1024,     4096, 0xa6d0f466
+0,     248832,     248832,     1024,     4096, 0xd1a1f1c2
+0,     249856,     249856,     1024,     4096, 0x32f8923c
+0,     250880,     250880,     1024,     4096, 0x137001d2
+0,     251904,     251904,     1024,     4096, 0xb881f6cd
+0,     252928,     252928,     1024,     4096, 0xf44e034a
+0,     253952,     253952,     1024,     4096, 0xb43fecf7
+0,     254976,     254976,     1024,     4096, 0xe62ced50
+0,     256000,     256000,     1024,     4096, 0x221dfd0d
+0,     257024,     257024,     1024,     4096, 0x85400147
+0,     258048,     258048,     1024,     4096, 0x8bf8d054
+0,     259072,     259072,     1024,     4096, 0x08370170
+0,     260096,     260096,     1024,     4096, 0xec62effa
+0,     261120,     261120,     1024,     4096, 0xd58cf67c
+0,     262144,     262144,     1024,     4096, 0xf597f9a1
+0,     263168,     263168,     1024,     4096, 0x63fcf0b0
+0,     264192,     264192,      408,     1632, 0xedfa314a
diff --git a/tests/ref/fate/filter-allrgb b/tests/ref/fate/filter-allrgb
new file mode 100644
index 0000000000..b54efc5504
--- /dev/null
+++ b/tests/ref/fate/filter-allrgb
@@ -0,0 +1,10 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 4096x4096
+#sar 0: 1/1
+0,          0,          0,        1, 50331648, 0x9cc26aca
+0,          1,          1,        1, 50331648, 0x9cc26aca
+0,          2,          2,        1, 50331648, 0x9cc26aca
+0,          3,          3,        1, 50331648, 0x9cc26aca
+0,          4,          4,        1, 50331648, 0x9cc26aca
diff --git a/tests/ref/fate/filter-allyuv b/tests/ref/fate/filter-allyuv
new file mode 100644
index 0000000000..477992f0ea
--- /dev/null
+++ b/tests/ref/fate/filter-allyuv
@@ -0,0 +1,10 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 4096x4096
+#sar 0: 1/1
+0,          0,          0,        1, 50331648, 0x70b16aca
+0,          1,          1,        1, 50331648, 0x70b16aca
+0,          2,          2,        1, 50331648, 0x70b16aca
+0,          3,          3,        1, 50331648, 0x70b16aca
+0,          4,          4,        1, 50331648, 0x70b16aca
diff --git a/tests/ref/fate/filter-alphaextract_alphamerge_rgb b/tests/ref/fate/filter-alphaextract_alphamerge_rgb
new file mode 100644
index 0000000000..eac9971638
--- /dev/null
+++ b/tests/ref/fate/filter-alphaextract_alphamerge_rgb
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   405504, 0x6d5666c8
+0,          1,          1,        1,   405504, 0x4813ba17
+0,          2,          2,        1,   405504, 0x23880ee1
+0,          3,          3,        1,   405504, 0x3709926b
+0,          4,          4,        1,   405504, 0x1748e102
+0,          5,          5,        1,   405504, 0x12b4472b
+0,          6,          6,        1,   405504, 0x0441fe6b
+0,          7,          7,        1,   405504, 0x4fa8d058
+0,          8,          8,        1,   405504, 0xa0d810fb
+0,          9,          9,        1,   405504, 0xaca3ca02
+0,         10,         10,        1,   405504, 0x0afe65ea
+0,         11,         11,        1,   405504, 0xb81a9bd1
+0,         12,         12,        1,   405504, 0xb85f10eb
+0,         13,         13,        1,   405504, 0x4dc5e992
+0,         14,         14,        1,   405504, 0x6e9f8042
+0,         15,         15,        1,   405504, 0xf8e58f43
+0,         16,         16,        1,   405504, 0xc717635c
+0,         17,         17,        1,   405504, 0x5928548d
+0,         18,         18,        1,   405504, 0x8f2295f9
+0,         19,         19,        1,   405504, 0x5c449294
+0,         20,         20,        1,   405504, 0xe8c5d6ef
+0,         21,         21,        1,   405504, 0x3608a811
+0,         22,         22,        1,   405504, 0xa3788a12
+0,         23,         23,        1,   405504, 0x90ad93a3
+0,         24,         24,        1,   405504, 0x26c603bc
+0,         25,         25,        1,   405504, 0x055d69a8
+0,         26,         26,        1,   405504, 0x834747ea
+0,         27,         27,        1,   405504, 0x16eea5dd
+0,         28,         28,        1,   405504, 0xa2af8e0d
+0,         29,         29,        1,   405504, 0x65d2380f
+0,         30,         30,        1,   405504, 0xf4858c72
+0,         31,         31,        1,   405504, 0x90755bc9
+0,         32,         32,        1,   405504, 0xabfac3b0
+0,         33,         33,        1,   405504, 0x4a76adbd
+0,         34,         34,        1,   405504, 0x633183e9
+0,         35,         35,        1,   405504, 0xcb8ff8fe
+0,         36,         36,        1,   405504, 0x9c96074a
+0,         37,         37,        1,   405504, 0x700ea35c
+0,         38,         38,        1,   405504, 0x31bb483c
+0,         39,         39,        1,   405504, 0x50dd7ca7
+0,         40,         40,        1,   405504, 0x047988a0
+0,         41,         41,        1,   405504, 0xe4d7a9dd
+0,         42,         42,        1,   405504, 0x455d82ab
+0,         43,         43,        1,   405504, 0x8f875343
+0,         44,         44,        1,   405504, 0x8be18c94
+0,         45,         45,        1,   405504, 0x75431a7d
+0,         46,         46,        1,   405504, 0x08122c08
+0,         47,         47,        1,   405504, 0xfca4159a
+0,         48,         48,        1,   405504, 0x90c9afd6
+0,         49,         49,        1,   405504, 0x817e3b6a
diff --git a/tests/ref/fate/filter-alphaextract_alphamerge_yuv b/tests/ref/fate/filter-alphaextract_alphamerge_yuv
new file mode 100644
index 0000000000..2cae357b99
--- /dev/null
+++ b/tests/ref/fate/filter-alphaextract_alphamerge_yuv
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   253440, 0x1ada7ac4
+0,          1,          1,        1,   253440, 0x711c1599
+0,          2,          2,        1,   253440, 0x533017ea
+0,          3,          3,        1,   253440, 0x86c6865f
+0,          4,          4,        1,   253440, 0xe5962b75
+0,          5,          5,        1,   253440, 0xe45dae97
+0,          6,          6,        1,   253440, 0x2d6b8047
+0,          7,          7,        1,   253440, 0xdd48b706
+0,          8,          8,        1,   253440, 0xb7a7823a
+0,          9,          9,        1,   253440, 0xa491f11f
+0,         10,         10,        1,   253440, 0x48b9abd5
+0,         11,         11,        1,   253440, 0x7d72078e
+0,         12,         12,        1,   253440, 0xe6901732
+0,         13,         13,        1,   253440, 0x8866ee68
+0,         14,         14,        1,   253440, 0x603e8fbc
+0,         15,         15,        1,   253440, 0x25c5633d
+0,         16,         16,        1,   253440, 0x7ef22b82
+0,         17,         17,        1,   253440, 0xffb25705
+0,         18,         18,        1,   253440, 0x921f9560
+0,         19,         19,        1,   253440, 0xd367c2a4
+0,         20,         20,        1,   253440, 0x6962a02d
+0,         21,         21,        1,   253440, 0x780d2b78
+0,         22,         22,        1,   253440, 0xa7bdf61e
+0,         23,         23,        1,   253440, 0x19797146
+0,         24,         24,        1,   253440, 0x3128c3bd
+0,         25,         25,        1,   253440, 0x2a3df40e
+0,         26,         26,        1,   253440, 0x3eb71582
+0,         27,         27,        1,   253440, 0x57f8c64d
+0,         28,         28,        1,   253440, 0x7e5872b1
+0,         29,         29,        1,   253440, 0x2c092689
+0,         30,         30,        1,   253440, 0xe92f4956
+0,         31,         31,        1,   253440, 0x6b49e20f
+0,         32,         32,        1,   253440, 0x274e4d28
+0,         33,         33,        1,   253440, 0xc1660f8c
+0,         34,         34,        1,   253440, 0xca9e5566
+0,         35,         35,        1,   253440, 0x30fa342a
+0,         36,         36,        1,   253440, 0xcbf915fd
+0,         37,         37,        1,   253440, 0x27fa90f6
+0,         38,         38,        1,   253440, 0x777743aa
+0,         39,         39,        1,   253440, 0xe6104ff6
+0,         40,         40,        1,   253440, 0xed51cb35
+0,         41,         41,        1,   253440, 0x218d192d
+0,         42,         42,        1,   253440, 0x100a5c86
+0,         43,         43,        1,   253440, 0xddcc3023
+0,         44,         44,        1,   253440, 0x788ff77d
+0,         45,         45,        1,   253440, 0x4488fb59
+0,         46,         46,        1,   253440, 0x634ff895
+0,         47,         47,        1,   253440, 0xd68bccb6
+0,         48,         48,        1,   253440, 0x1a9810ff
+0,         49,         49,        1,   253440, 0x05beb75b
diff --git a/tests/ref/fate/filter-amerge b/tests/ref/fate/filter-amerge
new file mode 100644
index 0000000000..b3e5eb50cc
--- /dev/null
+++ b/tests/ref/fate/filter-amerge
@@ -0,0 +1,136 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     2048,     8192, 0x120efa65
+0,       2048,       2048,     2048,     8192, 0x7b3cebf7
+0,       4096,       4096,     2048,     8192, 0x0fb8ee01
+0,       6144,       6144,     2048,     8192, 0x47a9f271
+0,       8192,       8192,     2048,     8192, 0x47a8ed5b
+0,      10240,      10240,     2048,     8192, 0xdab6f33f
+0,      12288,      12288,     2048,     8192, 0xda4df7eb
+0,      14336,      14336,     2048,     8192, 0xc83ce449
+0,      16384,      16384,     2048,     8192, 0x4954e765
+0,      18432,      18432,     2048,     8192, 0x0214f5d5
+0,      20480,      20480,     2048,     8192, 0x2302f3c9
+0,      22528,      22528,     2048,     8192, 0x2b57ef5b
+0,      24576,      24576,     2048,     8192, 0xad22f075
+0,      26624,      26624,     2048,     8192, 0x9bd5ee8b
+0,      28672,      28672,     2048,     8192, 0x91a4e9e1
+0,      30720,      30720,     2048,     8192, 0x85a9fd7f
+0,      32768,      32768,     2048,     8192, 0x120efa65
+0,      34816,      34816,     2048,     8192, 0x7b3cebf7
+0,      36864,      36864,     2048,     8192, 0x0fb8ee01
+0,      38912,      38912,     2048,     8192, 0x47a9f271
+0,      40960,      40960,     2048,     8192, 0x47a8ed5b
+0,      43008,      43008,     2048,     8192, 0x76f7c64f
+0,      45056,      45056,     2048,     8192, 0xade0f6f5
+0,      47104,      47104,     2048,     8192, 0xcc1ce131
+0,      49152,      49152,     2048,     8192, 0x11aaf88b
+0,      51200,      51200,     2048,     8192, 0xcd50e409
+0,      53248,      53248,     2048,     8192, 0x7f72ee63
+0,      55296,      55296,     2048,     8192, 0xf7b4ff5d
+0,      57344,      57344,     2048,     8192, 0xd8bc4192
+0,      59392,      59392,     2048,     8192, 0xc8fb0418
+0,      61440,      61440,     2048,     8192, 0x0859cac9
+0,      63488,      63488,     2048,     8192, 0x7529f279
+0,      65536,      65536,     2048,     8192, 0x0ee0df7b
+0,      67584,      67584,     2048,     8192, 0x07edef6d
+0,      69632,      69632,     2048,     8192, 0x7d02ea45
+0,      71680,      71680,     2048,     8192, 0x770104a8
+0,      73728,      73728,     2048,     8192, 0x7124f553
+0,      75776,      75776,     2048,     8192, 0x6df6269a
+0,      77824,      77824,     2048,     8192, 0x4218002c
+0,      79872,      79872,     2048,     8192, 0x274fe03d
+0,      81920,      81920,     2048,     8192, 0xd00f5aae
+0,      83968,      83968,     2048,     8192, 0x907dfe51
+0,      86016,      86016,     2048,     8192, 0xc2c10ed2
+0,      88064,      88064,     2048,     8192, 0x293aa355
+0,      90112,      90112,     2048,     8192, 0xb84a591d
+0,      92160,      92160,     2048,     8192, 0x44f64e87
+0,      94208,      94208,     2048,     8192, 0x0f6869bd
+0,      96256,      96256,     2048,     8192, 0xb3dcc44b
+0,      98304,      98304,     2048,     8192, 0x44f85293
+0,     100352,     100352,     2048,     8192, 0x8545ad0f
+0,     102400,     102400,     2048,     8192, 0xdee2a193
+0,     104448,     104448,     2048,     8192, 0x46a96e2d
+0,     106496,     106496,     2048,     8192, 0xcebc56a1
+0,     108544,     108544,     2048,     8192, 0x5353a35b
+0,     110592,     110592,     2048,     8192, 0x74aceb33
+0,     112640,     112640,     2048,     8192, 0x34fa1488
+0,     114688,     114688,     2048,     8192, 0x711ecd6d
+0,     116736,     116736,     2048,     8192, 0x277ac8ab
+0,     118784,     118784,     2048,     8192, 0xb7b91ba8
+0,     120832,     120832,     2048,     8192, 0xcab704de
+0,     122880,     122880,     2048,     8192, 0x695ae413
+0,     124928,     124928,     2048,     8192, 0xee618d29
+0,     126976,     126976,     2048,     8192, 0xe7caf401
+0,     129024,     129024,     2048,     8192, 0xc12c230e
+0,     131072,     131072,     2048,     8192, 0x9124ec71
+0,     133120,     133120,     2048,     8192, 0xd2bad2f7
+0,     135168,     135168,     2048,     8192, 0x2fc6da33
+0,     137216,     137216,     2048,     8192, 0x66d92c28
+0,     139264,     139264,     2048,     8192, 0x3373ddfd
+0,     141312,     141312,     2048,     8192, 0x419ae325
+0,     143360,     143360,     2048,     8192, 0x6b5ad233
+0,     145408,     145408,     2048,     8192, 0xb62f11a0
+0,     147456,     147456,     2048,     8192, 0x7084c5ef
+0,     149504,     149504,     2048,     8192, 0x42c8f8bd
+0,     151552,     151552,     2048,     8192, 0xd0e2d5a3
+0,     153600,     153600,     2048,     8192, 0xcf8f0826
+0,     155648,     155648,     2048,     8192, 0x164cc963
+0,     157696,     157696,     2048,     8192, 0xb14db49f
+0,     159744,     159744,     2048,     8192, 0x0fe50df4
+0,     161792,     161792,     2048,     8192, 0x7669207a
+0,     163840,     163840,     2048,     8192, 0x2a16f23b
+0,     165888,     165888,     2048,     8192, 0xc629f685
+0,     167936,     167936,     2048,     8192, 0x79ee0298
+0,     169984,     169984,     2048,     8192, 0xf9bdf179
+0,     172032,     172032,     2048,     8192, 0x5220d047
+0,     174080,     174080,     2048,     8192, 0x915ae8b7
+0,     176128,     176128,     2048,     8192, 0x8c26e3af
+0,     178176,     178176,     2048,     8192, 0x72e5c661
+0,     180224,     180224,     2048,     8192, 0xfca2d795
+0,     182272,     182272,     2048,     8192, 0x6367f5a9
+0,     184320,     184320,     2048,     8192, 0x32f8d0d1
+0,     186368,     186368,     2048,     8192, 0x7a08c3c7
+0,     188416,     188416,     2048,     8192, 0xe2f0fb55
+0,     190464,     190464,     2048,     8192, 0x3fd706e8
+0,     192512,     192512,     2048,     8192, 0xf5845786
+0,     194560,     194560,     2048,     8192, 0x2a8fdcbd
+0,     196608,     196608,     2048,     8192, 0xa71f03fc
+0,     198656,     198656,     2048,     8192, 0xc1210dce
+0,     200704,     200704,     2048,     8192, 0x0cd21800
+0,     202752,     202752,     2048,     8192, 0x2e8cfb47
+0,     204800,     204800,     2048,     8192, 0x2ab816ec
+0,     206848,     206848,     2048,     8192, 0xc2b40256
+0,     208896,     208896,     2048,     8192, 0xf72d0018
+0,     210944,     210944,     2048,     8192, 0xc7e01b76
+0,     212992,     212992,     2048,     8192, 0xbcf50a48
+0,     215040,     215040,     2048,     8192, 0x1101ec23
+0,     217088,     217088,     2048,     8192, 0x066a1108
+0,     219136,     219136,     2048,     8192, 0xda831e12
+0,     221184,     221184,     2048,     8192, 0x92f9e677
+0,     223232,     223232,     2048,     8192, 0x3439daf3
+0,     225280,     225280,     2048,     8192, 0xf812694a
+0,     227328,     227328,     2048,     8192, 0x3751051e
+0,     229376,     229376,     2048,     8192, 0x9f4cdddd
+0,     231424,     231424,     2048,     8192, 0xae4ad40b
+0,     233472,     233472,     2048,     8192, 0x569ec9db
+0,     235520,     235520,     2048,     8192, 0x2056e683
+0,     237568,     237568,     2048,     8192, 0x84d8caef
+0,     239616,     239616,     2048,     8192, 0x9eefdf83
+0,     241664,     241664,     2048,     8192, 0x4feee1c1
+0,     243712,     243712,     2048,     8192, 0x72e5c661
+0,     245760,     245760,     2048,     8192, 0xfca2d795
+0,     247808,     247808,     2048,     8192, 0x6367f5a9
+0,     249856,     249856,     2048,     8192, 0x32f8d0d1
+0,     251904,     251904,     2048,     8192, 0x7a08c3c7
+0,     253952,     253952,     2048,     8192, 0xe2f0fb55
+0,     256000,     256000,     2048,     8192, 0x3fd706e8
+0,     258048,     258048,     2048,     8192, 0xf5845786
+0,     260096,     260096,     2048,     8192, 0x2a8fdcbd
+0,     262144,     262144,     2048,     8192, 0xa71f03fc
+0,     264192,     264192,      408,     1632, 0x53c44589
diff --git a/tests/ref/fate/filter-anequalizer b/tests/ref/fate/filter-anequalizer
new file mode 100644
index 0000000000..caed836bdf
--- /dev/null
+++ b/tests/ref/fate/filter-anequalizer
@@ -0,0 +1,265 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x8e1bf8e0
+0,       1024,       1024,     1024,     4096, 0xe315f564
+0,       2048,       2048,     1024,     4096, 0x3d0efa98
+0,       3072,       3072,     1024,     4096, 0x5c1bf6b2
+0,       4096,       4096,     1024,     4096, 0xb5b4ff02
+0,       5120,       5120,     1024,     4096, 0xb9b1f4b6
+0,       6144,       6144,     1024,     4096, 0x86e9f411
+0,       7168,       7168,     1024,     4096, 0x36aafbd3
+0,       8192,       8192,     1024,     4096, 0x05d2f63f
+0,       9216,       9216,     1024,     4096, 0x1d95fd16
+0,      10240,      10240,     1024,     4096, 0x4fb0f009
+0,      11264,      11264,     1024,     4096, 0x6a6301c6
+0,      12288,      12288,     1024,     4096, 0x299cfbd8
+0,      13312,      13312,     1024,     4096, 0x2a7ffe8c
+0,      14336,      14336,     1024,     4096, 0xceace509
+0,      15360,      15360,     1024,     4096, 0xd084feec
+0,      16384,      16384,     1024,     4096, 0xd956f613
+0,      17408,      17408,     1024,     4096, 0xf61dfa8c
+0,      18432,      18432,     1024,     4096, 0x6ebcf53e
+0,      19456,      19456,     1024,     4096, 0x8601f9f2
+0,      20480,      20480,     1024,     4096, 0x6a4bf2d9
+0,      21504,      21504,     1024,     4096, 0xb917fc1d
+0,      22528,      22528,     1024,     4096, 0x85cffbca
+0,      23552,      23552,     1024,     4096, 0x80d9f509
+0,      24576,      24576,     1024,     4096, 0xa4acf898
+0,      25600,      25600,     1024,     4096, 0x7614f3c0
+0,      26624,      26624,     1024,     4096, 0x5f3700dc
+0,      27648,      27648,     1024,     4096, 0x4308ef21
+0,      28672,      28672,     1024,     4096, 0x670df4fe
+0,      29696,      29696,     1024,     4096, 0x98d0f24f
+0,      30720,      30720,     1024,     4096, 0xed360be0
+0,      31744,      31744,     1024,     4096, 0xbe10f1eb
+0,      32768,      32768,     1024,     4096, 0xb5d0fac0
+0,      33792,      33792,     1024,     4096, 0x94c1f649
+0,      34816,      34816,     1024,     4096, 0x3617fb9b
+0,      35840,      35840,     1024,     4096, 0x1840f6e6
+0,      36864,      36864,     1024,     4096, 0x0ce8fdfa
+0,      37888,      37888,     1024,     4096, 0xd7c1f4b8
+0,      38912,      38912,     1024,     4096, 0x86e9f411
+0,      39936,      39936,     1024,     4096, 0x36aafbd3
+0,      40960,      40960,     1024,     4096, 0x05d2f63f
+0,      41984,      41984,     1024,     4096, 0x1d95fd16
+0,      43008,      43008,     1024,     4096, 0x4fb0f009
+0,      44032,      44032,     1024,     4096, 0xc6de743e
+0,      45056,      45056,     1024,     4096, 0xe878f6e3
+0,      46080,      46080,     1024,     4096, 0x40c3fdf9
+0,      47104,      47104,     1024,     4096, 0x19def744
+0,      48128,      48128,     1024,     4096, 0x9e3d0016
+0,      49152,      49152,     1024,     4096, 0x2d3bfaee
+0,      50176,      50176,     1024,     4096, 0x0ae800c8
+0,      51200,      51200,     1024,     4096, 0xd6530007
+0,      52224,      52224,     1024,     4096, 0x3ec6fa96
+0,      53248,      53248,     1024,     4096, 0x4f3df4c4
+0,      54272,      54272,     1024,     4096, 0x8584f574
+0,      55296,      55296,     1024,     4096, 0xaa2311e8
+0,      56320,      56320,     1024,     4096, 0xfc04ed39
+0,      57344,      57344,     1024,     4096, 0xdefc1dcf
+0,      58368,      58368,     1024,     4096, 0x26120297
+0,      59392,      59392,     1024,     4096, 0x12db0600
+0,      60416,      60416,     1024,     4096, 0x590cfb36
+0,      61440,      61440,     1024,     4096, 0x03d2e732
+0,      62464,      62464,     1024,     4096, 0xa0b1eecb
+0,      63488,      63488,     1024,     4096, 0x89e6f0f8
+0,      64512,      64512,     1024,     4096, 0x96c3fde6
+0,      65536,      65536,     1024,     4096, 0x5d3ef320
+0,      66560,      66560,     1024,     4096, 0x780beba1
+0,      67584,      67584,     1024,     4096, 0x8a6ef641
+0,      68608,      68608,     1024,     4096, 0x716df2d2
+0,      69632,      69632,     1024,     4096, 0xe02bf742
+0,      70656,      70656,     1024,     4096, 0x636f0676
+0,      71680,      71680,     1024,     4096, 0x211fef81
+0,      72704,      72704,     1024,     4096, 0x230d03c2
+0,      73728,      73728,     1024,     4096, 0x78c7ec7e
+0,      74752,      74752,     1024,     4096, 0x57aaf08e
+0,      75776,      75776,     1024,     4096, 0xf35c034e
+0,      76800,      76800,     1024,     4096, 0xa52120e1
+0,      77824,      77824,     1024,     4096, 0xcd0ffe7c
+0,      78848,      78848,     1024,     4096, 0x76a40264
+0,      79872,      79872,     1024,     4096, 0x3daae73c
+0,      80896,      80896,     1024,     4096, 0x02bfebb8
+0,      81920,      81920,     1024,     4096, 0x2fad0aef
+0,      82944,      82944,     1024,     4096, 0xaf3d1e35
+0,      83968,      83968,     1024,     4096, 0x1577f70b
+0,      84992,      84992,     1024,     4096, 0x7330ff44
+0,      86016,      86016,     1024,     4096, 0xfc10f794
+0,      87040,      87040,     1024,     4096, 0xf883ff53
+0,      88064,      88064,     1024,     4096, 0x4d91f664
+0,      89088,      89088,     1024,     4096, 0x7bbcf94a
+0,      90112,      90112,     1024,     4096, 0x5243da5a
+0,      91136,      91136,     1024,     4096, 0xc9f2b510
+0,      92160,      92160,     1024,     4096, 0xd45daee9
+0,      93184,      93184,     1024,     4096, 0xf040cbe7
+0,      94208,      94208,     1024,     4096, 0xc755db61
+0,      95232,      95232,     1024,     4096, 0x2a2bdb39
+0,      96256,      96256,     1024,     4096, 0xd180faf7
+0,      97280,      97280,     1024,     4096, 0xe05bf3b3
+0,      98304,      98304,     1024,     4096, 0xee84c6a1
+0,      99328,      99328,     1024,     4096, 0xb05ec71b
+0,     100352,     100352,     1024,     4096, 0xf788e856
+0,     101376,     101376,     1024,     4096, 0x884fe6b4
+0,     102400,     102400,     1024,     4096, 0xc474ef2f
+0,     103424,     103424,     1024,     4096, 0x8ea2e3e3
+0,     104448,     104448,     1024,     4096, 0x32e2ba03
+0,     105472,     105472,     1024,     4096, 0xde62e2be
+0,     106496,     106496,     1024,     4096, 0xd9c1a387
+0,     107520,     107520,     1024,     4096, 0xb923e9c8
+0,     108544,     108544,     1024,     4096, 0xe0e2ef73
+0,     109568,     109568,     1024,     4096, 0xdc66f037
+0,     110592,     110592,     1024,     4096, 0x4c5ddb65
+0,     111616,     111616,     1024,     4096, 0xddc5e6dc
+0,     112640,     112640,     1024,     4096, 0x2c2afa48
+0,     113664,     113664,     1024,     4096, 0xfe1cefab
+0,     114688,     114688,     1024,     4096, 0xa761d9b1
+0,     115712,     115712,     1024,     4096, 0xac1af519
+0,     116736,     116736,     1024,     4096, 0x1d3e0455
+0,     117760,     117760,     1024,     4096, 0xca8bdaec
+0,     118784,     118784,     1024,     4096, 0x1c890dd7
+0,     119808,     119808,     1024,     4096, 0xd01023ec
+0,     120832,     120832,     1024,     4096, 0xd608fa07
+0,     121856,     121856,     1024,     4096, 0xa01bdceb
+0,     122880,     122880,     1024,     4096, 0x5b6e0428
+0,     123904,     123904,     1024,     4096, 0x699bffc9
+0,     124928,     124928,     1024,     4096, 0x7200d6ea
+0,     125952,     125952,     1024,     4096, 0x60ece933
+0,     126976,     126976,     1024,     4096, 0x6d1305ad
+0,     128000,     128000,     1024,     4096, 0xf932e234
+0,     129024,     129024,     1024,     4096, 0xc88dfc53
+0,     130048,     130048,     1024,     4096, 0xecaafd32
+0,     131072,     131072,     1024,     4096, 0x4683eec4
+0,     132096,     132096,     1024,     4096, 0x01a40877
+0,     133120,     133120,     1024,     4096, 0x68affdb9
+0,     134144,     134144,     1024,     4096, 0x3d50049a
+0,     135168,     135168,     1024,     4096, 0x28c3e64a
+0,     136192,     136192,     1024,     4096, 0xe77eff83
+0,     137216,     137216,     1024,     4096, 0x778ef1d7
+0,     138240,     138240,     1024,     4096, 0x8632016c
+0,     139264,     139264,     1024,     4096, 0x113ff74d
+0,     140288,     140288,     1024,     4096, 0x8a410144
+0,     141312,     141312,     1024,     4096, 0xf1f8032c
+0,     142336,     142336,     1024,     4096, 0x4ea9f305
+0,     143360,     143360,     1024,     4096, 0x08beed52
+0,     144384,     144384,     1024,     4096, 0xe62e0599
+0,     145408,     145408,     1024,     4096, 0xabc1f9cb
+0,     146432,     146432,     1024,     4096, 0x0a3cf37c
+0,     147456,     147456,     1024,     4096, 0x9d84eaec
+0,     148480,     148480,     1024,     4096, 0x0ecafb82
+0,     149504,     149504,     1024,     4096, 0x3898f9f9
+0,     150528,     150528,     1024,     4096, 0xbe95f626
+0,     151552,     151552,     1024,     4096, 0x2bd01290
+0,     152576,     152576,     1024,     4096, 0xb3ccf9cc
+0,     153600,     153600,     1024,     4096, 0x1d6510a7
+0,     154624,     154624,     1024,     4096, 0xb758f5ec
+0,     155648,     155648,     1024,     4096, 0xe163f2f7
+0,     156672,     156672,     1024,     4096, 0x208cf625
+0,     157696,     157696,     1024,     4096, 0x0e7ee529
+0,     158720,     158720,     1024,     4096, 0x82fef772
+0,     159744,     159744,     1024,     4096, 0xbcadfd1a
+0,     160768,     160768,     1024,     4096, 0xb84914e1
+0,     161792,     161792,     1024,     4096, 0xae9de78e
+0,     162816,     162816,     1024,     4096, 0x17afdd4d
+0,     163840,     163840,     1024,     4096, 0x6f41e1ac
+0,     164864,     164864,     1024,     4096, 0x07b2019e
+0,     165888,     165888,     1024,     4096, 0x92a9f923
+0,     166912,     166912,     1024,     4096, 0xb284f10b
+0,     167936,     167936,     1024,     4096, 0x6a3ffa40
+0,     168960,     168960,     1024,     4096, 0xaee7e8bd
+0,     169984,     169984,     1024,     4096, 0xa409e2f3
+0,     171008,     171008,     1024,     4096, 0x26f3f5ff
+0,     172032,     172032,     1024,     4096, 0x1a89eca5
+0,     173056,     173056,     1024,     4096, 0x8a49f293
+0,     174080,     174080,     1024,     4096, 0x9d4506f7
+0,     175104,     175104,     1024,     4096, 0x0ca2f075
+0,     176128,     176128,     1024,     4096, 0x7beb063f
+0,     177152,     177152,     1024,     4096, 0xe2b1e8a0
+0,     178176,     178176,     1024,     4096, 0xcc77fbd0
+0,     179200,     179200,     1024,     4096, 0x7c93f956
+0,     180224,     180224,     1024,     4096, 0xdb28fb69
+0,     181248,     181248,     1024,     4096, 0xe49afc39
+0,     182272,     182272,     1024,     4096, 0x60e904b5
+0,     183296,     183296,     1024,     4096, 0xbb67ebbc
+0,     184320,     184320,     1024,     4096, 0xc1e4ca2b
+0,     185344,     185344,     1024,     4096, 0xdcb8e550
+0,     186368,     186368,     1024,     4096, 0xe70bfe5d
+0,     187392,     187392,     1024,     4096, 0x5da3f4d4
+0,     188416,     188416,     1024,     4096, 0xfe9f04f6
+0,     189440,     189440,     1024,     4096, 0xf960f3cd
+0,     190464,     190464,     1024,     4096, 0xe6b7fc42
+0,     191488,     191488,     1024,     4096, 0xb8b9f1e2
+0,     192512,     192512,     1024,     4096, 0x520dd814
+0,     193536,     193536,     1024,     4096, 0x00f30212
+0,     194560,     194560,     1024,     4096, 0x8298f610
+0,     195584,     195584,     1024,     4096, 0xf0d9f47f
+0,     196608,     196608,     1024,     4096, 0x5063f4c4
+0,     197632,     197632,     1024,     4096, 0x6910f4bf
+0,     198656,     198656,     1024,     4096, 0x8c27ec24
+0,     199680,     199680,     1024,     4096, 0xf803052a
+0,     200704,     200704,     1024,     4096, 0xe31b1507
+0,     201728,     201728,     1024,     4096, 0x0ca30bbf
+0,     202752,     202752,     1024,     4096, 0x2659f272
+0,     203776,     203776,     1024,     4096, 0x54c0fc05
+0,     204800,     204800,     1024,     4096, 0x7427ebec
+0,     205824,     205824,     1024,     4096, 0xb652fd0c
+0,     206848,     206848,     1024,     4096, 0xa6c9f494
+0,     207872,     207872,     1024,     4096, 0xd429fef3
+0,     208896,     208896,     1024,     4096, 0xbbd5f8e3
+0,     209920,     209920,     1024,     4096, 0x8b74eed4
+0,     210944,     210944,     1024,     4096, 0xf21cfac1
+0,     211968,     211968,     1024,     4096, 0x055efc5f
+0,     212992,     212992,     1024,     4096, 0x334efc0f
+0,     214016,     214016,     1024,     4096, 0x29e7fc16
+0,     215040,     215040,     1024,     4096, 0xf0f904c0
+0,     216064,     216064,     1024,     4096, 0xaec3ebbb
+0,     217088,     217088,     1024,     4096, 0xc1e4ca2b
+0,     218112,     218112,     1024,     4096, 0xdcb8e550
+0,     219136,     219136,     1024,     4096, 0xe70bfe5d
+0,     220160,     220160,     1024,     4096, 0x5da3f4d4
+0,     221184,     221184,     1024,     4096, 0xfe9f04f6
+0,     222208,     222208,     1024,     4096, 0xf960f3cd
+0,     223232,     223232,     1024,     4096, 0xe6b7fc42
+0,     224256,     224256,     1024,     4096, 0xb8b9f1e2
+0,     225280,     225280,     1024,     4096, 0x520dd814
+0,     226304,     226304,     1024,     4096, 0x00f30212
+0,     227328,     227328,     1024,     4096, 0x8298f610
+0,     228352,     228352,     1024,     4096, 0xf0d9f47f
+0,     229376,     229376,     1024,     4096, 0x5063f4c4
+0,     230400,     230400,     1024,     4096, 0x6910f4bf
+0,     231424,     231424,     1024,     4096, 0x8c27ec24
+0,     232448,     232448,     1024,     4096, 0xf803052a
+0,     233472,     233472,     1024,     4096, 0xe31b1507
+0,     234496,     234496,     1024,     4096, 0x0ca30bbf
+0,     235520,     235520,     1024,     4096, 0x2659f272
+0,     236544,     236544,     1024,     4096, 0x54c0fc05
+0,     237568,     237568,     1024,     4096, 0x7427ebec
+0,     238592,     238592,     1024,     4096, 0xb652fd0c
+0,     239616,     239616,     1024,     4096, 0xa6c9f494
+0,     240640,     240640,     1024,     4096, 0xd429fef3
+0,     241664,     241664,     1024,     4096, 0xbbd5f8e3
+0,     242688,     242688,     1024,     4096, 0x8b74eed4
+0,     243712,     243712,     1024,     4096, 0xf21cfac1
+0,     244736,     244736,     1024,     4096, 0x055efc5f
+0,     245760,     245760,     1024,     4096, 0x334efc0f
+0,     246784,     246784,     1024,     4096, 0x29e7fc16
+0,     247808,     247808,     1024,     4096, 0xf0f904c0
+0,     248832,     248832,     1024,     4096, 0xaec3ebbb
+0,     249856,     249856,     1024,     4096, 0xc1e4ca2b
+0,     250880,     250880,     1024,     4096, 0xdcb8e550
+0,     251904,     251904,     1024,     4096, 0xe70bfe5d
+0,     252928,     252928,     1024,     4096, 0x5da3f4d4
+0,     253952,     253952,     1024,     4096, 0xfe9f04f6
+0,     254976,     254976,     1024,     4096, 0xf960f3cd
+0,     256000,     256000,     1024,     4096, 0xe6b7fc42
+0,     257024,     257024,     1024,     4096, 0xb8b9f1e2
+0,     258048,     258048,     1024,     4096, 0x520dd814
+0,     259072,     259072,     1024,     4096, 0x00f30212
+0,     260096,     260096,     1024,     4096, 0x8298f610
+0,     261120,     261120,     1024,     4096, 0xf0d9f47f
+0,     262144,     262144,     1024,     4096, 0x5063f4c4
+0,     263168,     263168,     1024,     4096, 0x6910f4bf
+0,     264192,     264192,      408,     1632, 0xe6d032c8
diff --git a/tests/ref/fate/filter-apad b/tests/ref/fate/filter-apad
new file mode 100644
index 0000000000..9bf662d46a
--- /dev/null
+++ b/tests/ref/fate/filter-apad
@@ -0,0 +1,266 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x29e3eecf
+0,       1024,       1024,     1024,     4096, 0x18390b96
+0,       2048,       2048,     1024,     4096, 0xc477fa99
+0,       3072,       3072,     1024,     4096, 0x3bc0f14f
+0,       4096,       4096,     1024,     4096, 0x2379ed91
+0,       5120,       5120,     1024,     4096, 0xfd6a0070
+0,       6144,       6144,     1024,     4096, 0x0b01f4cf
+0,       7168,       7168,     1024,     4096, 0x6716fd93
+0,       8192,       8192,     1024,     4096, 0x1840f25b
+0,       9216,       9216,     1024,     4096, 0x9c1ffaf1
+0,      10240,      10240,     1024,     4096, 0xcbedefaf
+0,      11264,      11264,     1024,     4096, 0x3e050390
+0,      12288,      12288,     1024,     4096, 0xb30e0090
+0,      13312,      13312,     1024,     4096, 0x26b8f75b
+0,      14336,      14336,     1024,     4096, 0xd706e311
+0,      15360,      15360,     1024,     4096, 0x0c480138
+0,      16384,      16384,     1024,     4096, 0x6c9a0216
+0,      17408,      17408,     1024,     4096, 0x7abce54f
+0,      18432,      18432,     1024,     4096, 0xda45f63f
+0,      19456,      19456,     1024,     4096, 0x50d5ff87
+0,      20480,      20480,     1024,     4096, 0x59be0352
+0,      21504,      21504,     1024,     4096, 0xa61af077
+0,      22528,      22528,     1024,     4096, 0x84c4fc07
+0,      23552,      23552,     1024,     4096, 0x4a35f345
+0,      24576,      24576,     1024,     4096, 0xbb65fa81
+0,      25600,      25600,     1024,     4096, 0xf6c7f5e5
+0,      26624,      26624,     1024,     4096, 0xd3270138
+0,      27648,      27648,     1024,     4096, 0x4782ed53
+0,      28672,      28672,     1024,     4096, 0xe308f055
+0,      29696,      29696,     1024,     4096, 0x7d33f97d
+0,      30720,      30720,     1024,     4096, 0xb8b00dd4
+0,      31744,      31744,     1024,     4096, 0x7ff7efab
+0,      32768,      32768,     1024,     4096, 0x29e3eecf
+0,      33792,      33792,     1024,     4096, 0x18390b96
+0,      34816,      34816,     1024,     4096, 0xc477fa99
+0,      35840,      35840,     1024,     4096, 0x3bc0f14f
+0,      36864,      36864,     1024,     4096, 0x2379ed91
+0,      37888,      37888,     1024,     4096, 0xfd6a0070
+0,      38912,      38912,     1024,     4096, 0x0b01f4cf
+0,      39936,      39936,     1024,     4096, 0x6716fd93
+0,      40960,      40960,     1024,     4096, 0x1840f25b
+0,      41984,      41984,     1024,     4096, 0x9c1ffaf1
+0,      43008,      43008,     1024,     4096, 0xcbedefaf
+0,      44032,      44032,     1024,     4096, 0xda37d691
+0,      45056,      45056,     1024,     4096, 0x7193ecbf
+0,      46080,      46080,     1024,     4096, 0x6e4a0a36
+0,      47104,      47104,     1024,     4096, 0x61cfe70d
+0,      48128,      48128,     1024,     4096, 0xc19ffa15
+0,      49152,      49152,     1024,     4096, 0x7b32fb3d
+0,      50176,      50176,     1024,     4096, 0xdacefd3f
+0,      51200,      51200,     1024,     4096, 0x3964f64d
+0,      52224,      52224,     1024,     4096, 0xdcf2edad
+0,      53248,      53248,     1024,     4096, 0x1367f69b
+0,      54272,      54272,     1024,     4096, 0xd4c6f7b9
+0,      55296,      55296,     1024,     4096, 0x9e041186
+0,      56320,      56320,     1024,     4096, 0xe939edd7
+0,      57344,      57344,     1024,     4096, 0xa932336a
+0,      58368,      58368,     1024,     4096, 0x5f510e28
+0,      59392,      59392,     1024,     4096, 0x4b8501c8
+0,      60416,      60416,     1024,     4096, 0xfbc30250
+0,      61440,      61440,     1024,     4096, 0x5e7fd855
+0,      62464,      62464,     1024,     4096, 0x8ef1f265
+0,      63488,      63488,     1024,     4096, 0x9f7601c2
+0,      64512,      64512,     1024,     4096, 0xb400f0b7
+0,      65536,      65536,     1024,     4096, 0x4c91e10b
+0,      66560,      66560,     1024,     4096, 0x3f41fe61
+0,      67584,      67584,     1024,     4096, 0x74fff9b9
+0,      68608,      68608,     1024,     4096, 0x18bbf5a5
+0,      69632,      69632,     1024,     4096, 0x51a70180
+0,      70656,      70656,     1024,     4096, 0x29f3e8c5
+0,      71680,      71680,     1024,     4096, 0x562efdb9
+0,      72704,      72704,     1024,     4096, 0xa2e006e0
+0,      73728,      73728,     1024,     4096, 0xa1bff541
+0,      74752,      74752,     1024,     4096, 0xd95b0012
+0,      75776,      75776,     1024,     4096, 0xd93e0912
+0,      76800,      76800,     1024,     4096, 0x6c2a1d88
+0,      77824,      77824,     1024,     4096, 0xb4d8fb8b
+0,      78848,      78848,     1024,     4096, 0xf14b0492
+0,      79872,      79872,     1024,     4096, 0x1c7be7b7
+0,      80896,      80896,     1024,     4096, 0xc181f877
+0,      81920,      81920,     1024,     4096, 0xba132d14
+0,      82944,      82944,     1024,     4096, 0xabae2d9a
+0,      83968,      83968,     1024,     4096, 0xb07fff15
+0,      84992,      84992,     1024,     4096, 0xa0c1ff2d
+0,      86016,      86016,     1024,     4096, 0x19f7fd1f
+0,      87040,      87040,     1024,     4096, 0xcb6d11a4
+0,      88064,      88064,     1024,     4096, 0x166ac8b7
+0,      89088,      89088,     1024,     4096, 0xe68dda8f
+0,      90112,      90112,     1024,     4096, 0xe457b505
+0,      91136,      91136,     1024,     4096, 0xda25a409
+0,      92160,      92160,     1024,     4096, 0x5b5d9d3b
+0,      93184,      93184,     1024,     4096, 0xa61eb13d
+0,      94208,      94208,     1024,     4096, 0xac93b66f
+0,      95232,      95232,     1024,     4096, 0xc7aeb33f
+0,      96256,      96256,     1024,     4096, 0x52cccfb5
+0,      97280,      97280,     1024,     4096, 0x4e4cf487
+0,      98304,      98304,     1024,     4096, 0x19c07f35
+0,      99328,      99328,     1024,     4096, 0x63ecd34f
+0,     100352,     100352,     1024,     4096, 0x122aec53
+0,     101376,     101376,     1024,     4096, 0x6581c0ad
+0,     102400,     102400,     1024,     4096, 0x640edb15
+0,     103424,     103424,     1024,     4096, 0x5d66c66f
+0,     104448,     104448,     1024,     4096, 0x069e9d35
+0,     105472,     105472,     1024,     4096, 0x5c9fd0e9
+0,     106496,     106496,     1024,     4096, 0x72468667
+0,     107520,     107520,     1024,     4096, 0x6e6dd02b
+0,     108544,     108544,     1024,     4096, 0x93edce33
+0,     109568,     109568,     1024,     4096, 0xcdfbd519
+0,     110592,     110592,     1024,     4096, 0x8463f2bb
+0,     111616,     111616,     1024,     4096, 0x5ca6f869
+0,     112640,     112640,     1024,     4096, 0x099a0398
+0,     113664,     113664,     1024,     4096, 0xa7fa10f0
+0,     114688,     114688,     1024,     4096, 0x28caddd3
+0,     115712,     115712,     1024,     4096, 0x4852ef8b
+0,     116736,     116736,     1024,     4096, 0x0250ee7b
+0,     117760,     117760,     1024,     4096, 0x9583da21
+0,     118784,     118784,     1024,     4096, 0x7365fb33
+0,     119808,     119808,     1024,     4096, 0x28c82066
+0,     120832,     120832,     1024,     4096, 0x94650be4
+0,     121856,     121856,     1024,     4096, 0xeb21f8eb
+0,     122880,     122880,     1024,     4096, 0xcd88f455
+0,     123904,     123904,     1024,     4096, 0x66a9efaf
+0,     124928,     124928,     1024,     4096, 0x5500c6ed
+0,     125952,     125952,     1024,     4096, 0x0ee0c62d
+0,     126976,     126976,     1024,     4096, 0x34d30762
+0,     128000,     128000,     1024,     4096, 0x8c0dec9f
+0,     129024,     129024,     1024,     4096, 0x790011d8
+0,     130048,     130048,     1024,     4096, 0xb76a1136
+0,     131072,     131072,     1024,     4096, 0x7dddfea7
+0,     132096,     132096,     1024,     4096, 0xdfa3ed49
+0,     133120,     133120,     1024,     4096, 0xc129f54e
+0,     134144,     134144,     1024,     4096, 0x9a86f077
+0,     135168,     135168,     1024,     4096, 0xc9eef209
+0,     136192,     136192,     1024,     4096, 0x72d4029b
+0,     137216,     137216,     1024,     4096, 0x8ec20590
+0,     138240,     138240,     1024,     4096, 0xd48f18ed
+0,     139264,     139264,     1024,     4096, 0xd807eadc
+0,     140288,     140288,     1024,     4096, 0x1e2bea09
+0,     141312,     141312,     1024,     4096, 0x937af12e
+0,     142336,     142336,     1024,     4096, 0xdedbf303
+0,     143360,     143360,     1024,     4096, 0xdc75df88
+0,     144384,     144384,     1024,     4096, 0x1845ffd6
+0,     145408,     145408,     1024,     4096, 0x20e8150c
+0,     146432,     146432,     1024,     4096, 0x5ea7eeef
+0,     147456,     147456,     1024,     4096, 0x4c7efa21
+0,     148480,     148480,     1024,     4096, 0x8b97e30e
+0,     149504,     149504,     1024,     4096, 0xe5040228
+0,     150528,     150528,     1024,     4096, 0x6283f78c
+0,     151552,     151552,     1024,     4096, 0xe7100140
+0,     152576,     152576,     1024,     4096, 0x9ea6f9b2
+0,     153600,     153600,     1024,     4096, 0x5f0e1563
+0,     154624,     154624,     1024,     4096, 0x510bf18e
+0,     155648,     155648,     1024,     4096, 0x5f4fe425
+0,     156672,     156672,     1024,     4096, 0x507af3c0
+0,     157696,     157696,     1024,     4096, 0xbf14ddc6
+0,     158720,     158720,     1024,     4096, 0x1871ed69
+0,     159744,     159744,     1024,     4096, 0xc349ef9f
+0,     160768,     160768,     1024,     4096, 0x4e2c1834
+0,     161792,     161792,     1024,     4096, 0x2383fe04
+0,     162816,     162816,     1024,     4096, 0x6626f415
+0,     163840,     163840,     1024,     4096, 0x283be379
+0,     164864,     164864,     1024,     4096, 0xc76c0ceb
+0,     165888,     165888,     1024,     4096, 0xa0b8040f
+0,     166912,     166912,     1024,     4096, 0x2535eb6d
+0,     167936,     167936,     1024,     4096, 0xeb180bb5
+0,     168960,     168960,     1024,     4096, 0xbc5cf059
+0,     169984,     169984,     1024,     4096, 0x1862f1ac
+0,     171008,     171008,     1024,     4096, 0x9cc2ea2b
+0,     172032,     172032,     1024,     4096, 0xbb9ae754
+0,     173056,     173056,     1024,     4096, 0x716debb5
+0,     174080,     174080,     1024,     4096, 0xff3aff2a
+0,     175104,     175104,     1024,     4096, 0x755dfa5c
+0,     176128,     176128,     1024,     4096, 0x3b830605
+0,     177152,     177152,     1024,     4096, 0x0030dc9e
+0,     178176,     178176,     1024,     4096, 0xb017fd54
+0,     179200,     179200,     1024,     4096, 0x5c7dfa2e
+0,     180224,     180224,     1024,     4096, 0x7887e599
+0,     181248,     181248,     1024,     4096, 0xb730e72f
+0,     182272,     182272,     1024,     4096, 0x6bb3fae4
+0,     183296,     183296,     1024,     4096, 0xcc08fc36
+0,     184320,     184320,     1024,     4096, 0x5afd9ec2
+0,     185344,     185344,     1024,     4096, 0xa1d3e83d
+0,     186368,     186368,     1024,     4096, 0x7f96013c
+0,     187392,     187392,     1024,     4096, 0x7a0afe31
+0,     188416,     188416,     1024,     4096, 0xa37d1701
+0,     189440,     189440,     1024,     4096, 0x4615ebc2
+0,     190464,     190464,     1024,     4096, 0x217005c1
+0,     191488,     191488,     1024,     4096, 0x1755f789
+0,     192512,     192512,     1024,     4096, 0x83e6db65
+0,     193536,     193536,     1024,     4096, 0x92ab1447
+0,     194560,     194560,     1024,     4096, 0xedbdf383
+0,     195584,     195584,     1024,     4096, 0x4316f6a9
+0,     196608,     196608,     1024,     4096, 0x1a6a0b4c
+0,     197632,     197632,     1024,     4096, 0xdfd809b7
+0,     198656,     198656,     1024,     4096, 0x1d2cf5f1
+0,     199680,     199680,     1024,     4096, 0xd366f4a1
+0,     200704,     200704,     1024,     4096, 0x6a2f86e0
+0,     201728,     201728,     1024,     4096, 0xf51f08a9
+0,     202752,     202752,     1024,     4096, 0x05edefa8
+0,     203776,     203776,     1024,     4096, 0x255df2a6
+0,     204800,     204800,     1024,     4096, 0xe881d9e4
+0,     205824,     205824,     1024,     4096, 0x50380523
+0,     206848,     206848,     1024,     4096, 0x8b93eb26
+0,     207872,     207872,     1024,     4096, 0x759cf94c
+0,     208896,     208896,     1024,     4096, 0x8474f591
+0,     209920,     209920,     1024,     4096, 0x0030dc9e
+0,     210944,     210944,     1024,     4096, 0xb017fd54
+0,     211968,     211968,     1024,     4096, 0x5c7dfa2e
+0,     212992,     212992,     1024,     4096, 0x7887e599
+0,     214016,     214016,     1024,     4096, 0xb730e72f
+0,     215040,     215040,     1024,     4096, 0x6bb3fae4
+0,     216064,     216064,     1024,     4096, 0xcc08fc36
+0,     217088,     217088,     1024,     4096, 0x5afd9ec2
+0,     218112,     218112,     1024,     4096, 0xa1d3e83d
+0,     219136,     219136,     1024,     4096, 0x7f96013c
+0,     220160,     220160,     1024,     4096, 0x7a0afe31
+0,     221184,     221184,     1024,     4096, 0xa37d1701
+0,     222208,     222208,     1024,     4096, 0x4615ebc2
+0,     223232,     223232,     1024,     4096, 0x217005c1
+0,     224256,     224256,     1024,     4096, 0x1755f789
+0,     225280,     225280,     1024,     4096, 0x83e6db65
+0,     226304,     226304,     1024,     4096, 0x92ab1447
+0,     227328,     227328,     1024,     4096, 0xedbdf383
+0,     228352,     228352,     1024,     4096, 0x4316f6a9
+0,     229376,     229376,     1024,     4096, 0x1a6a0b4c
+0,     230400,     230400,     1024,     4096, 0xdfd809b7
+0,     231424,     231424,     1024,     4096, 0x1d2cf5f1
+0,     232448,     232448,     1024,     4096, 0xd366f4a1
+0,     233472,     233472,     1024,     4096, 0x6a2f86e0
+0,     234496,     234496,     1024,     4096, 0xf51f08a9
+0,     235520,     235520,     1024,     4096, 0x05edefa8
+0,     236544,     236544,     1024,     4096, 0x255df2a6
+0,     237568,     237568,     1024,     4096, 0xe881d9e4
+0,     238592,     238592,     1024,     4096, 0x50380523
+0,     239616,     239616,     1024,     4096, 0x8b93eb26
+0,     240640,     240640,     1024,     4096, 0x759cf94c
+0,     241664,     241664,     1024,     4096, 0x8474f591
+0,     242688,     242688,     1024,     4096, 0x0030dc9e
+0,     243712,     243712,     1024,     4096, 0xb017fd54
+0,     244736,     244736,     1024,     4096, 0x5c7dfa2e
+0,     245760,     245760,     1024,     4096, 0x7887e599
+0,     246784,     246784,     1024,     4096, 0xb730e72f
+0,     247808,     247808,     1024,     4096, 0x6bb3fae4
+0,     248832,     248832,     1024,     4096, 0xcc08fc36
+0,     249856,     249856,     1024,     4096, 0x5afd9ec2
+0,     250880,     250880,     1024,     4096, 0xa1d3e83d
+0,     251904,     251904,     1024,     4096, 0x7f96013c
+0,     252928,     252928,     1024,     4096, 0x7a0afe31
+0,     253952,     253952,     1024,     4096, 0xa37d1701
+0,     254976,     254976,     1024,     4096, 0x4615ebc2
+0,     256000,     256000,     1024,     4096, 0x217005c1
+0,     257024,     257024,     1024,     4096, 0x1755f789
+0,     258048,     258048,     1024,     4096, 0x83e6db65
+0,     259072,     259072,     1024,     4096, 0x92ab1447
+0,     260096,     260096,     1024,     4096, 0xedbdf383
+0,     261120,     261120,     1024,     4096, 0x4316f6a9
+0,     262144,     262144,     1024,     4096, 0x1a6a0b4c
+0,     263168,     263168,     1024,     4096, 0xdfd809b7
+0,     264192,     264192,      408,     1632, 0xf412313e
+0,     264600,     264600,       10,       40, 0x00000000
diff --git a/tests/ref/fate/filter-asetnsamples-nopad b/tests/ref/fate/filter-asetnsamples-nopad
new file mode 100644
index 0000000000..c1cc01a710
--- /dev/null
+++ b/tests/ref/fate/filter-asetnsamples-nopad
@@ -0,0 +1,523 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,      512,     2048, 0xd2dbf701
+0,        512,        512,      512,     2048, 0xdb22f7bf
+0,       1024,       1024,      512,     2048, 0x82a103be
+0,       1536,       1536,      512,     2048, 0xa3c707d8
+0,       2048,       2048,      512,     2048, 0x8aaafb8f
+0,       2560,       2560,      512,     2048, 0x4bdafefb
+0,       3072,       3072,      512,     2048, 0x75a3e833
+0,       3584,       3584,      512,     2048, 0xc130091c
+0,       4096,       4096,      512,     2048, 0x99d8f36d
+0,       4608,       4608,      512,     2048, 0xaf6efa15
+0,       5120,       5120,      512,     2048, 0xff5f0506
+0,       5632,       5632,      512,     2048, 0xcba4fb5b
+0,       6144,       6144,      512,     2048, 0x729309c6
+0,       6656,       6656,      512,     2048, 0x63cdeb09
+0,       7168,       7168,      512,     2048, 0x386cfccb
+0,       7680,       7680,      512,     2048, 0x602100c8
+0,       8192,       8192,      512,     2048, 0x3573f565
+0,       8704,       8704,      512,     2048, 0x47b9fce7
+0,       9216,       9216,      512,     2048, 0xd1e90b7a
+0,       9728,       9728,      512,     2048, 0xf4c3ef77
+0,      10240,      10240,      512,     2048, 0x59ebfe3f
+0,      10752,      10752,      512,     2048, 0x02d4f161
+0,      11264,      11264,      512,     2048, 0xbbf5ff05
+0,      11776,      11776,      512,     2048, 0xe26a047c
+0,      12288,      12288,      512,     2048, 0x5452f02b
+0,      12800,      12800,      512,     2048, 0x961e1056
+0,      13312,      13312,      512,     2048, 0x9192f803
+0,      13824,      13824,      512,     2048, 0x08d7ff49
+0,      14336,      14336,      512,     2048, 0x7c64ee03
+0,      14848,      14848,      512,     2048, 0xd303f4ff
+0,      15360,      15360,      512,     2048, 0xda5902be
+0,      15872,      15872,      512,     2048, 0x4096fe6b
+0,      16384,      16384,      512,     2048, 0x178e016a
+0,      16896,      16896,      512,     2048, 0x046700ac
+0,      17408,      17408,      512,     2048, 0x5f20f4ad
+0,      17920,      17920,      512,     2048, 0x40e2f093
+0,      18432,      18432,      512,     2048, 0x5c37fccd
+0,      18944,      18944,      512,     2048, 0x9f85f963
+0,      19456,      19456,      512,     2048, 0x69461038
+0,      19968,      19968,      512,     2048, 0x1ff1ef4f
+0,      20480,      20480,      512,     2048, 0x409304fc
+0,      20992,      20992,      512,     2048, 0x36d3fe47
+0,      21504,      21504,      512,     2048, 0xea01f367
+0,      22016,      22016,      512,     2048, 0x11f5fd01
+0,      22528,      22528,      512,     2048, 0x6deeeea5
+0,      23040,      23040,      512,     2048, 0x7eec0d62
+0,      23552,      23552,      512,     2048, 0xb47bfb93
+0,      24064,      24064,      512,     2048, 0x87b8f7a3
+0,      24576,      24576,      512,     2048, 0xcba0fefb
+0,      25088,      25088,      512,     2048, 0xa02efb77
+0,      25600,      25600,      512,     2048, 0x1030ecf1
+0,      26112,      26112,      512,     2048, 0xef7f08f4
+0,      26624,      26624,      512,     2048, 0x8d4efa1d
+0,      27136,      27136,      512,     2048, 0xe88b070c
+0,      27648,      27648,      512,     2048, 0x229cf957
+0,      28160,      28160,      512,     2048, 0xf7f2f3ed
+0,      28672,      28672,      512,     2048, 0x8f5f0840
+0,      29184,      29184,      512,     2048, 0x4fcbe815
+0,      29696,      29696,      512,     2048, 0x57dd006a
+0,      30208,      30208,      512,     2048, 0xd51af913
+0,      30720,      30720,      512,     2048, 0x63c50a68
+0,      31232,      31232,      512,     2048, 0x100e036c
+0,      31744,      31744,      512,     2048, 0x0af0f5ad
+0,      32256,      32256,      512,     2048, 0x99d5f9ef
+0,      32768,      32768,      512,     2048, 0xd2dbf701
+0,      33280,      33280,      512,     2048, 0xdb22f7bf
+0,      33792,      33792,      512,     2048, 0x82a103be
+0,      34304,      34304,      512,     2048, 0xa3c707d8
+0,      34816,      34816,      512,     2048, 0x8aaafb8f
+0,      35328,      35328,      512,     2048, 0x4bdafefb
+0,      35840,      35840,      512,     2048, 0x75a3e833
+0,      36352,      36352,      512,     2048, 0xc130091c
+0,      36864,      36864,      512,     2048, 0x99d8f36d
+0,      37376,      37376,      512,     2048, 0xaf6efa15
+0,      37888,      37888,      512,     2048, 0xff5f0506
+0,      38400,      38400,      512,     2048, 0xcba4fb5b
+0,      38912,      38912,      512,     2048, 0x729309c6
+0,      39424,      39424,      512,     2048, 0x63cdeb09
+0,      39936,      39936,      512,     2048, 0x386cfccb
+0,      40448,      40448,      512,     2048, 0x602100c8
+0,      40960,      40960,      512,     2048, 0x3573f565
+0,      41472,      41472,      512,     2048, 0x47b9fce7
+0,      41984,      41984,      512,     2048, 0xd1e90b7a
+0,      42496,      42496,      512,     2048, 0xf4c3ef77
+0,      43008,      43008,      512,     2048, 0x59ebfe3f
+0,      43520,      43520,      512,     2048, 0x02d4f161
+0,      44032,      44032,      512,     2048, 0x2c09f943
+0,      44544,      44544,      512,     2048, 0x2158dd3f
+0,      45056,      45056,      512,     2048, 0x9c150cf4
+0,      45568,      45568,      512,     2048, 0x2f66dfcb
+0,      46080,      46080,      512,     2048, 0xd62c05c4
+0,      46592,      46592,      512,     2048, 0x755d0472
+0,      47104,      47104,      512,     2048, 0x4aece261
+0,      47616,      47616,      512,     2048, 0xa4b704ac
+0,      48128,      48128,      512,     2048, 0x18410020
+0,      48640,      48640,      512,     2048, 0xa94ff9f5
+0,      49152,      49152,      512,     2048, 0xddf705ba
+0,      49664,      49664,      512,     2048, 0xca7af583
+0,      50176,      50176,      512,     2048, 0xf57af029
+0,      50688,      50688,      512,     2048, 0x2cb60d16
+0,      51200,      51200,      512,     2048, 0x97f2f90b
+0,      51712,      51712,      512,     2048, 0xd49cfd33
+0,      52224,      52224,      512,     2048, 0x4f56f1dd
+0,      52736,      52736,      512,     2048, 0x343bfbc1
+0,      53248,      53248,      512,     2048, 0x2058fd6b
+0,      53760,      53760,      512,     2048, 0x243bf921
+0,      54272,      54272,      512,     2048, 0x658b1272
+0,      54784,      54784,      512,     2048, 0xd68fe547
+0,      55296,      55296,      512,     2048, 0xab63068c
+0,      55808,      55808,      512,     2048, 0x8f860afa
+0,      56320,      56320,      512,     2048, 0x290de797
+0,      56832,      56832,      512,     2048, 0x9b990640
+0,      57344,      57344,      512,     2048, 0x859920bc
+0,      57856,      57856,      512,     2048, 0x343f12ae
+0,      58368,      58368,      512,     2048, 0xddf318e4
+0,      58880,      58880,      512,     2048, 0x55a6f535
+0,      59392,      59392,      512,     2048, 0x48ce08f6
+0,      59904,      59904,      512,     2048, 0x4e7ff8c3
+0,      60416,      60416,      512,     2048, 0xde8803c0
+0,      60928,      60928,      512,     2048, 0x1b79fe81
+0,      61440,      61440,      512,     2048, 0x853be72f
+0,      61952,      61952,      512,     2048, 0xf4cff117
+0,      62464,      62464,      512,     2048, 0xb61df45f
+0,      62976,      62976,      512,     2048, 0x6e38fdf7
+0,      63488,      63488,      512,     2048, 0x41c6042c
+0,      64000,      64000,      512,     2048, 0xfbb2fd87
+0,      64512,      64512,      512,     2048, 0x6da4eb69
+0,      65024,      65024,      512,     2048, 0x8ff8054e
+0,      65536,      65536,      512,     2048, 0x8c44ef81
+0,      66048,      66048,      512,     2048, 0x47faf17b
+0,      66560,      66560,      512,     2048, 0x0bd5012a
+0,      67072,      67072,      512,     2048, 0xe2d6fd37
+0,      67584,      67584,      512,     2048, 0x128ffedd
+0,      68096,      68096,      512,     2048, 0x02f7facd
+0,      68608,      68608,      512,     2048, 0x3f43f77d
+0,      69120,      69120,      512,     2048, 0x7d65fe19
+0,      69632,      69632,      512,     2048, 0x66c705ba
+0,      70144,      70144,      512,     2048, 0x182efbb7
+0,      70656,      70656,      512,     2048, 0xf718e481
+0,      71168,      71168,      512,     2048, 0xbfa10444
+0,      71680,      71680,      512,     2048, 0xc3aa0360
+0,      72192,      72192,      512,     2048, 0x90e0fa59
+0,      72704,      72704,      512,     2048, 0x903706c2
+0,      73216,      73216,      512,     2048, 0xff70001e
+0,      73728,      73728,      512,     2048, 0x9240ef79
+0,      74240,      74240,      512,     2048, 0xd72c05c8
+0,      74752,      74752,      512,     2048, 0x9655f5f5
+0,      75264,      75264,      512,     2048, 0x27b60a0e
+0,      75776,      75776,      512,     2048, 0x5917f885
+0,      76288,      76288,      512,     2048, 0xe39c107e
+0,      76800,      76800,      512,     2048, 0x2a4812c0
+0,      77312,      77312,      512,     2048, 0x39180ac8
+0,      77824,      77824,      512,     2048, 0x8b9efe57
+0,      78336,      78336,      512,     2048, 0xf9eefd25
+0,      78848,      78848,      512,     2048, 0xd3660cae
+0,      79360,      79360,      512,     2048, 0xa7ebf7d5
+0,      79872,      79872,      512,     2048, 0x4baaf59f
+0,      80384,      80384,      512,     2048, 0x659ff209
+0,      80896,      80896,      512,     2048, 0x1cf80e0e
+0,      81408,      81408,      512,     2048, 0x2df9ea69
+0,      81920,      81920,      512,     2048, 0xff8ffa2d
+0,      82432,      82432,      512,     2048, 0xdd2732d8
+0,      82944,      82944,      512,     2048, 0xcd6e31ec
+0,      83456,      83456,      512,     2048, 0x66d0fb9f
+0,      83968,      83968,      512,     2048, 0xbc11f229
+0,      84480,      84480,      512,     2048, 0x3ae00cec
+0,      84992,      84992,      512,     2048, 0xb032fb19
+0,      85504,      85504,      512,     2048, 0xb2c90414
+0,      86016,      86016,      512,     2048, 0xb7a1eeaf
+0,      86528,      86528,      512,     2048, 0x7a5d0e70
+0,      87040,      87040,      512,     2048, 0x16f11516
+0,      87552,      87552,      512,     2048, 0xfa95fc7f
+0,      88064,      88064,      512,     2048, 0x4fe705a6
+0,      88576,      88576,      512,     2048, 0x93d1c311
+0,      89088,      89088,      512,     2048, 0x8230f4f1
+0,      89600,      89600,      512,     2048, 0x6985e58f
+0,      90112,      90112,      512,     2048, 0xc4d8f07f
+0,      90624,      90624,      512,     2048, 0xb6b4c477
+0,      91136,      91136,      512,     2048, 0xc95bce8b
+0,      91648,      91648,      512,     2048, 0x57efd56f
+0,      92160,      92160,      512,     2048, 0xd453c295
+0,      92672,      92672,      512,     2048, 0x83c0da97
+0,      93184,      93184,      512,     2048, 0xf6bfe307
+0,      93696,      93696,      512,     2048, 0x0ce8ce27
+0,      94208,      94208,      512,     2048, 0xc925e53f
+0,      94720,      94720,      512,     2048, 0x7fe9d121
+0,      95232,      95232,      512,     2048, 0x00d3dcf9
+0,      95744,      95744,      512,     2048, 0x9743d637
+0,      96256,      96256,      512,     2048, 0x5163f37f
+0,      96768,      96768,      512,     2048, 0x9736dc27
+0,      97280,      97280,      512,     2048, 0xb0b1e85b
+0,      97792,      97792,      512,     2048, 0x589f0c2c
+0,      98304,      98304,      512,     2048, 0xb3b7aab9
+0,      98816,      98816,      512,     2048, 0x4df0d46d
+0,      99328,      99328,      512,     2048, 0xb917d4db
+0,      99840,      99840,      512,     2048, 0x6efdfe65
+0,     100352,     100352,      512,     2048, 0x426bd85d
+0,     100864,     100864,      512,     2048, 0x824313f6
+0,     101376,     101376,      512,     2048, 0xe755cf47
+0,     101888,     101888,      512,     2048, 0xe4e8f157
+0,     102400,     102400,      512,     2048, 0x05a8d1cb
+0,     102912,     102912,      512,     2048, 0xa405094a
+0,     103424,     103424,      512,     2048, 0x5060e40d
+0,     103936,     103936,      512,     2048, 0x3a17e253
+0,     104448,     104448,      512,     2048, 0xb8cdd80f
+0,     104960,     104960,      512,     2048, 0x7073c517
+0,     105472,     105472,      512,     2048, 0x634b00c4
+0,     105984,     105984,      512,     2048, 0xd8ebd025
+0,     106496,     106496,      512,     2048, 0x3a65cff7
+0,     107008,     107008,      512,     2048, 0x1e61b661
+0,     107520,     107520,      512,     2048, 0x3a1dcae9
+0,     108032,     108032,      512,     2048, 0x8d280542
+0,     108544,     108544,      512,     2048, 0xe918f499
+0,     109056,     109056,      512,     2048, 0x701bd98b
+0,     109568,     109568,      512,     2048, 0xd2a8e72f
+0,     110080,     110080,      512,     2048, 0x16ededdb
+0,     110592,     110592,      512,     2048, 0xfeb1fdbb
+0,     111104,     111104,      512,     2048, 0x36b1f4f1
+0,     111616,     111616,      512,     2048, 0x5bc5f27b
+0,     112128,     112128,      512,     2048, 0xb72605ee
+0,     112640,     112640,      512,     2048, 0x718d112e
+0,     113152,     113152,      512,     2048, 0x1ff7f25b
+0,     113664,     113664,      512,     2048, 0x1dd115cc
+0,     114176,     114176,      512,     2048, 0x1ff7fb15
+0,     114688,     114688,      512,     2048, 0xeb61f241
+0,     115200,     115200,      512,     2048, 0xc3bdeb83
+0,     115712,     115712,      512,     2048, 0xea80011a
+0,     116224,     116224,      512,     2048, 0x8d3cee71
+0,     116736,     116736,      512,     2048, 0x8cfbf589
+0,     117248,     117248,      512,     2048, 0xba23f8e3
+0,     117760,     117760,      512,     2048, 0x87a1e86d
+0,     118272,     118272,      512,     2048, 0x38e6f1a5
+0,     118784,     118784,      512,     2048, 0xe05a12fe
+0,     119296,     119296,      512,     2048, 0x9a14e835
+0,     119808,     119808,      512,     2048, 0x11a11780
+0,     120320,     120320,      512,     2048, 0x0c2308e6
+0,     120832,     120832,      512,     2048, 0xc8adfa4b
+0,     121344,     121344,      512,     2048, 0xfe4c118a
+0,     121856,     121856,      512,     2048, 0xa6240ac0
+0,     122368,     122368,      512,     2048, 0x3ff3ee2b
+0,     122880,     122880,      512,     2048, 0xc6aaf769
+0,     123392,     123392,      512,     2048, 0x4adafcdd
+0,     123904,     123904,      512,     2048, 0xabd6e845
+0,     124416,     124416,      512,     2048, 0x25e6076a
+0,     124928,     124928,      512,     2048, 0xb6e6d4b9
+0,     125440,     125440,      512,     2048, 0x7251f225
+0,     125952,     125952,      512,     2048, 0xc3b5f751
+0,     126464,     126464,      512,     2048, 0x4f27cecd
+0,     126976,     126976,      512,     2048, 0x237c020c
+0,     127488,     127488,      512,     2048, 0xb0580556
+0,     128000,     128000,      512,     2048, 0x717008a4
+0,     128512,     128512,      512,     2048, 0xf683e3fb
+0,     129024,     129024,      512,     2048, 0x1ddefd33
+0,     129536,     129536,      512,     2048, 0x4c6c1496
+0,     130048,     130048,      512,     2048, 0x67f907fe
+0,     130560,     130560,      512,     2048, 0x5bb10938
+0,     131072,     131072,      512,     2048, 0x24a20eac
+0,     131584,     131584,      512,     2048, 0xf251effb
+0,     132096,     132096,      512,     2048, 0xafd7eb04
+0,     132608,     132608,      512,     2048, 0xa1950245
+0,     133120,     133120,      512,     2048, 0x8cdefb0d
+0,     133632,     133632,      512,     2048, 0x5694fa32
+0,     134144,     134144,      512,     2048, 0x0942eeb6
+0,     134656,     134656,      512,     2048, 0x715a01c1
+0,     135168,     135168,      512,     2048, 0x4531f63e
+0,     135680,     135680,      512,     2048, 0x214ffbbc
+0,     136192,     136192,      512,     2048, 0x0f50fe21
+0,     136704,     136704,      512,     2048, 0xe456046b
+0,     137216,     137216,      512,     2048, 0xd6eaff4d
+0,     137728,     137728,      512,     2048, 0xd8140634
+0,     138240,     138240,      512,     2048, 0x608e0bff
+0,     138752,     138752,      512,     2048, 0x76610cee
+0,     139264,     139264,      512,     2048, 0x6b48f0ff
+0,     139776,     139776,      512,     2048, 0x03c7f9ce
+0,     140288,     140288,      512,     2048, 0xf718fad1
+0,     140800,     140800,      512,     2048, 0x296bef29
+0,     141312,     141312,      512,     2048, 0x2311f2bf
+0,     141824,     141824,      512,     2048, 0x069ffe60
+0,     142336,     142336,      512,     2048, 0x6126055d
+0,     142848,     142848,      512,     2048, 0x9330eda6
+0,     143360,     143360,      512,     2048, 0xdfbeedc1
+0,     143872,     143872,      512,     2048, 0x8536f1b8
+0,     144384,     144384,      512,     2048, 0xfe30fd72
+0,     144896,     144896,      512,     2048, 0x13320264
+0,     145408,     145408,      512,     2048, 0x83ad09db
+0,     145920,     145920,      512,     2048, 0xc08b0b31
+0,     146432,     146432,      512,     2048, 0xda8afea0
+0,     146944,     146944,      512,     2048, 0x0cb3f040
+0,     147456,     147456,      512,     2048, 0x80c0fc17
+0,     147968,     147968,      512,     2048, 0x9d80fdfb
+0,     148480,     148480,      512,     2048, 0x9f1af1fd
+0,     148992,     148992,      512,     2048, 0x92fef102
+0,     149504,     149504,      512,     2048, 0x5b62f7be
+0,     150016,     150016,      512,     2048, 0x25800a5b
+0,     150528,     150528,      512,     2048, 0xc660fba3
+0,     151040,     151040,      512,     2048, 0x0e21fbda
+0,     151552,     151552,      512,     2048, 0x2e7f027d
+0,     152064,     152064,      512,     2048, 0xcf65feb4
+0,     152576,     152576,      512,     2048, 0x4e0ffa6d
+0,     153088,     153088,      512,     2048, 0x732bff36
+0,     153600,     153600,      512,     2048, 0x3df20e7e
+0,     154112,     154112,      512,     2048, 0x2a5006e5
+0,     154624,     154624,      512,     2048, 0xfd3bfa2a
+0,     155136,     155136,      512,     2048, 0x8e73f755
+0,     155648,     155648,      512,     2048, 0x6f93ece1
+0,     156160,     156160,      512,     2048, 0x78a4f735
+0,     156672,     156672,      512,     2048, 0x3a7cfc1c
+0,     157184,     157184,      512,     2048, 0xbfc0f795
+0,     157696,     157696,      512,     2048, 0x7a8cfed2
+0,     158208,     158208,      512,     2048, 0x3d0fdee5
+0,     158720,     158720,      512,     2048, 0x902afc78
+0,     159232,     159232,      512,     2048, 0x51dcf0e2
+0,     159744,     159744,      512,     2048, 0x1f59fc00
+0,     160256,     160256,      512,     2048, 0x2dd0f390
+0,     160768,     160768,      512,     2048, 0x2ff30f7c
+0,     161280,     161280,      512,     2048, 0x36f508b8
+0,     161792,     161792,      512,     2048, 0x51e8ef2d
+0,     162304,     162304,      512,     2048, 0xf9660ed7
+0,     162816,     162816,      512,     2048, 0x50f3fd4d
+0,     163328,     163328,      512,     2048, 0x366ef6b9
+0,     163840,     163840,      512,     2048, 0xf023f17a
+0,     164352,     164352,      512,     2048, 0xf6c6f1f0
+0,     164864,     164864,      512,     2048, 0x6d1dfebf
+0,     165376,     165376,      512,     2048, 0xead60e1d
+0,     165888,     165888,      512,     2048, 0xbe5201a6
+0,     166400,     166400,      512,     2048, 0xb1940269
+0,     166912,     166912,      512,     2048, 0xb6cdf350
+0,     167424,     167424,      512,     2048, 0x7c44f80e
+0,     167936,     167936,      512,     2048, 0x1fff03ef
+0,     168448,     168448,      512,     2048, 0x514807c6
+0,     168960,     168960,      512,     2048, 0xe04eede7
+0,     169472,     169472,      512,     2048, 0x347e0272
+0,     169984,     169984,      512,     2048, 0x8c00fb96
+0,     170496,     170496,      512,     2048, 0x6660f607
+0,     171008,     171008,      512,     2048, 0xe9a7017d
+0,     171520,     171520,      512,     2048, 0xca58e8ae
+0,     172032,     172032,      512,     2048, 0x795af92a
+0,     172544,     172544,      512,     2048, 0x7d6aee1b
+0,     173056,     173056,      512,     2048, 0x4ab9f58f
+0,     173568,     173568,      512,     2048, 0x3b91f617
+0,     174080,     174080,      512,     2048, 0x09e1f7d7
+0,     174592,     174592,      512,     2048, 0xc9280753
+0,     175104,     175104,      512,     2048, 0x8620f662
+0,     175616,     175616,      512,     2048, 0x6bb103fa
+0,     176128,     176128,      512,     2048, 0xcfee0371
+0,     176640,     176640,      512,     2048, 0xe1e20294
+0,     177152,     177152,      512,     2048, 0xdb98fea4
+0,     177664,     177664,      512,     2048, 0x8d1fddeb
+0,     178176,     178176,      512,     2048, 0x4e7501bf
+0,     178688,     178688,      512,     2048, 0x68d0fb95
+0,     179200,     179200,      512,     2048, 0xf685001e
+0,     179712,     179712,      512,     2048, 0x75dafa10
+0,     180224,     180224,      512,     2048, 0x534fe772
+0,     180736,     180736,      512,     2048, 0x28b4fe18
+0,     181248,     181248,      512,     2048, 0x2ba00678
+0,     181760,     181760,      512,     2048, 0xc884e0b7
+0,     182272,     182272,      512,     2048, 0x6ae40787
+0,     182784,     182784,      512,     2048, 0xc53cf35d
+0,     183296,     183296,      512,     2048, 0x738d06b4
+0,     183808,     183808,      512,     2048, 0xb551f582
+0,     184320,     184320,      512,     2048, 0x8a5a8764
+0,     184832,     184832,      512,     2048, 0x711f175e
+0,     185344,     185344,      512,     2048, 0xe5e1ed43
+0,     185856,     185856,      512,     2048, 0x34adfaeb
+0,     186368,     186368,      512,     2048, 0x79fb0142
+0,     186880,     186880,      512,     2048, 0xf4f6ffeb
+0,     187392,     187392,      512,     2048, 0xd3540a6b
+0,     187904,     187904,      512,     2048, 0x49caf3c6
+0,     188416,     188416,      512,     2048, 0xc1db05b7
+0,     188928,     188928,      512,     2048, 0x26f0114a
+0,     189440,     189440,      512,     2048, 0x576eead9
+0,     189952,     189952,      512,     2048, 0xb87f00e9
+0,     190464,     190464,      512,     2048, 0x470d030f
+0,     190976,     190976,      512,     2048, 0x60ec02b2
+0,     191488,     191488,      512,     2048, 0xb84a0b44
+0,     192000,     192000,      512,     2048, 0x39b6ec45
+0,     192512,     192512,      512,     2048, 0x1e07e580
+0,     193024,     193024,      512,     2048, 0xfa3cf5d6
+0,     193536,     193536,      512,     2048, 0x0801f9b8
+0,     194048,     194048,      512,     2048, 0x55981a80
+0,     194560,     194560,      512,     2048, 0x9510f6ad
+0,     195072,     195072,      512,     2048, 0x7d03fcc7
+0,     195584,     195584,      512,     2048, 0xf17bf84e
+0,     196096,     196096,      512,     2048, 0x6d1ffe4c
+0,     196608,     196608,      512,     2048, 0x91e210f9
+0,     197120,     197120,      512,     2048, 0xb881fa44
+0,     197632,     197632,      512,     2048, 0xb7cdf1f3
+0,     198144,     198144,      512,     2048, 0x1e9b17b5
+0,     198656,     198656,      512,     2048, 0x74dff0e3
+0,     199168,     199168,      512,     2048, 0x1f55050e
+0,     199680,     199680,      512,     2048, 0x7498f1b8
+0,     200192,     200192,      512,     2048, 0x2d7c02e9
+0,     200704,     200704,      512,     2048, 0x8c84a5c4
+0,     201216,     201216,      512,     2048, 0x6feae10d
+0,     201728,     201728,      512,     2048, 0xfda90b28
+0,     202240,     202240,      512,     2048, 0xb230fd72
+0,     202752,     202752,      512,     2048, 0x6298f728
+0,     203264,     203264,      512,     2048, 0xef60f871
+0,     203776,     203776,      512,     2048, 0x14e7ee01
+0,     204288,     204288,      512,     2048, 0x98d704a5
+0,     204800,     204800,      512,     2048, 0x1ccaf2b4
+0,     205312,     205312,      512,     2048, 0xb9ede721
+0,     205824,     205824,      512,     2048, 0x8c570d92
+0,     206336,     206336,      512,     2048, 0x2d7ef782
+0,     206848,     206848,      512,     2048, 0xa84cf55e
+0,     207360,     207360,      512,     2048, 0x8033f5b9
+0,     207872,     207872,      512,     2048, 0x27f3ed27
+0,     208384,     208384,      512,     2048, 0xa6730c25
+0,     208896,     208896,      512,     2048, 0x489bf2fd
+0,     209408,     209408,      512,     2048, 0xe1e20294
+0,     209920,     209920,      512,     2048, 0xdb98fea4
+0,     210432,     210432,      512,     2048, 0x8d1fddeb
+0,     210944,     210944,      512,     2048, 0x4e7501bf
+0,     211456,     211456,      512,     2048, 0x68d0fb95
+0,     211968,     211968,      512,     2048, 0xf685001e
+0,     212480,     212480,      512,     2048, 0x75dafa10
+0,     212992,     212992,      512,     2048, 0x534fe772
+0,     213504,     213504,      512,     2048, 0x28b4fe18
+0,     214016,     214016,      512,     2048, 0x2ba00678
+0,     214528,     214528,      512,     2048, 0xc884e0b7
+0,     215040,     215040,      512,     2048, 0x6ae40787
+0,     215552,     215552,      512,     2048, 0xc53cf35d
+0,     216064,     216064,      512,     2048, 0x738d06b4
+0,     216576,     216576,      512,     2048, 0xb551f582
+0,     217088,     217088,      512,     2048, 0x8a5a8764
+0,     217600,     217600,      512,     2048, 0x711f175e
+0,     218112,     218112,      512,     2048, 0xe5e1ed43
+0,     218624,     218624,      512,     2048, 0x34adfaeb
+0,     219136,     219136,      512,     2048, 0x79fb0142
+0,     219648,     219648,      512,     2048, 0xf4f6ffeb
+0,     220160,     220160,      512,     2048, 0xd3540a6b
+0,     220672,     220672,      512,     2048, 0x49caf3c6
+0,     221184,     221184,      512,     2048, 0xc1db05b7
+0,     221696,     221696,      512,     2048, 0x26f0114a
+0,     222208,     222208,      512,     2048, 0x576eead9
+0,     222720,     222720,      512,     2048, 0xb87f00e9
+0,     223232,     223232,      512,     2048, 0x470d030f
+0,     223744,     223744,      512,     2048, 0x60ec02b2
+0,     224256,     224256,      512,     2048, 0xb84a0b44
+0,     224768,     224768,      512,     2048, 0x39b6ec45
+0,     225280,     225280,      512,     2048, 0x1e07e580
+0,     225792,     225792,      512,     2048, 0xfa3cf5d6
+0,     226304,     226304,      512,     2048, 0x0801f9b8
+0,     226816,     226816,      512,     2048, 0x55981a80
+0,     227328,     227328,      512,     2048, 0x9510f6ad
+0,     227840,     227840,      512,     2048, 0x7d03fcc7
+0,     228352,     228352,      512,     2048, 0xf17bf84e
+0,     228864,     228864,      512,     2048, 0x6d1ffe4c
+0,     229376,     229376,      512,     2048, 0x91e210f9
+0,     229888,     229888,      512,     2048, 0xb881fa44
+0,     230400,     230400,      512,     2048, 0xb7cdf1f3
+0,     230912,     230912,      512,     2048, 0x1e9b17b5
+0,     231424,     231424,      512,     2048, 0x74dff0e3
+0,     231936,     231936,      512,     2048, 0x1f55050e
+0,     232448,     232448,      512,     2048, 0x7498f1b8
+0,     232960,     232960,      512,     2048, 0x2d7c02e9
+0,     233472,     233472,      512,     2048, 0x8c84a5c4
+0,     233984,     233984,      512,     2048, 0x6feae10d
+0,     234496,     234496,      512,     2048, 0xfda90b28
+0,     235008,     235008,      512,     2048, 0xb230fd72
+0,     235520,     235520,      512,     2048, 0x6298f728
+0,     236032,     236032,      512,     2048, 0xef60f871
+0,     236544,     236544,      512,     2048, 0x14e7ee01
+0,     237056,     237056,      512,     2048, 0x98d704a5
+0,     237568,     237568,      512,     2048, 0x1ccaf2b4
+0,     238080,     238080,      512,     2048, 0xb9ede721
+0,     238592,     238592,      512,     2048, 0x8c570d92
+0,     239104,     239104,      512,     2048, 0x2d7ef782
+0,     239616,     239616,      512,     2048, 0xa84cf55e
+0,     240128,     240128,      512,     2048, 0x8033f5b9
+0,     240640,     240640,      512,     2048, 0x27f3ed27
+0,     241152,     241152,      512,     2048, 0xa6730c25
+0,     241664,     241664,      512,     2048, 0x489bf2fd
+0,     242176,     242176,      512,     2048, 0xe1e20294
+0,     242688,     242688,      512,     2048, 0xdb98fea4
+0,     243200,     243200,      512,     2048, 0x8d1fddeb
+0,     243712,     243712,      512,     2048, 0x4e7501bf
+0,     244224,     244224,      512,     2048, 0x68d0fb95
+0,     244736,     244736,      512,     2048, 0xf685001e
+0,     245248,     245248,      512,     2048, 0x75dafa10
+0,     245760,     245760,      512,     2048, 0x534fe772
+0,     246272,     246272,      512,     2048, 0x28b4fe18
+0,     246784,     246784,      512,     2048, 0x2ba00678
+0,     247296,     247296,      512,     2048, 0xc884e0b7
+0,     247808,     247808,      512,     2048, 0x6ae40787
+0,     248320,     248320,      512,     2048, 0xc53cf35d
+0,     248832,     248832,      512,     2048, 0x738d06b4
+0,     249344,     249344,      512,     2048, 0xb551f582
+0,     249856,     249856,      512,     2048, 0x8a5a8764
+0,     250368,     250368,      512,     2048, 0x711f175e
+0,     250880,     250880,      512,     2048, 0xe5e1ed43
+0,     251392,     251392,      512,     2048, 0x34adfaeb
+0,     251904,     251904,      512,     2048, 0x79fb0142
+0,     252416,     252416,      512,     2048, 0xf4f6ffeb
+0,     252928,     252928,      512,     2048, 0xd3540a6b
+0,     253440,     253440,      512,     2048, 0x49caf3c6
+0,     253952,     253952,      512,     2048, 0xc1db05b7
+0,     254464,     254464,      512,     2048, 0x26f0114a
+0,     254976,     254976,      512,     2048, 0x576eead9
+0,     255488,     255488,      512,     2048, 0xb87f00e9
+0,     256000,     256000,      512,     2048, 0x470d030f
+0,     256512,     256512,      512,     2048, 0x60ec02b2
+0,     257024,     257024,      512,     2048, 0xb84a0b44
+0,     257536,     257536,      512,     2048, 0x39b6ec45
+0,     258048,     258048,      512,     2048, 0x1e07e580
+0,     258560,     258560,      512,     2048, 0xfa3cf5d6
+0,     259072,     259072,      512,     2048, 0x0801f9b8
+0,     259584,     259584,      512,     2048, 0x55981a80
+0,     260096,     260096,      512,     2048, 0x9510f6ad
+0,     260608,     260608,      512,     2048, 0x7d03fcc7
+0,     261120,     261120,      512,     2048, 0xf17bf84e
+0,     261632,     261632,      512,     2048, 0x6d1ffe4c
+0,     262144,     262144,      512,     2048, 0x91e210f9
+0,     262656,     262656,      512,     2048, 0xb881fa44
+0,     263168,     263168,      512,     2048, 0xb7cdf1f3
+0,     263680,     263680,      512,     2048, 0x1e9b17b5
+0,     264192,     264192,      408,     1632, 0xf412313e
diff --git a/tests/ref/fate/filter-asetnsamples-pad b/tests/ref/fate/filter-asetnsamples-pad
new file mode 100644
index 0000000000..23cf11b8af
--- /dev/null
+++ b/tests/ref/fate/filter-asetnsamples-pad
@@ -0,0 +1,523 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,      512,     2048, 0xd2dbf701
+0,        512,        512,      512,     2048, 0xdb22f7bf
+0,       1024,       1024,      512,     2048, 0x82a103be
+0,       1536,       1536,      512,     2048, 0xa3c707d8
+0,       2048,       2048,      512,     2048, 0x8aaafb8f
+0,       2560,       2560,      512,     2048, 0x4bdafefb
+0,       3072,       3072,      512,     2048, 0x75a3e833
+0,       3584,       3584,      512,     2048, 0xc130091c
+0,       4096,       4096,      512,     2048, 0x99d8f36d
+0,       4608,       4608,      512,     2048, 0xaf6efa15
+0,       5120,       5120,      512,     2048, 0xff5f0506
+0,       5632,       5632,      512,     2048, 0xcba4fb5b
+0,       6144,       6144,      512,     2048, 0x729309c6
+0,       6656,       6656,      512,     2048, 0x63cdeb09
+0,       7168,       7168,      512,     2048, 0x386cfccb
+0,       7680,       7680,      512,     2048, 0x602100c8
+0,       8192,       8192,      512,     2048, 0x3573f565
+0,       8704,       8704,      512,     2048, 0x47b9fce7
+0,       9216,       9216,      512,     2048, 0xd1e90b7a
+0,       9728,       9728,      512,     2048, 0xf4c3ef77
+0,      10240,      10240,      512,     2048, 0x59ebfe3f
+0,      10752,      10752,      512,     2048, 0x02d4f161
+0,      11264,      11264,      512,     2048, 0xbbf5ff05
+0,      11776,      11776,      512,     2048, 0xe26a047c
+0,      12288,      12288,      512,     2048, 0x5452f02b
+0,      12800,      12800,      512,     2048, 0x961e1056
+0,      13312,      13312,      512,     2048, 0x9192f803
+0,      13824,      13824,      512,     2048, 0x08d7ff49
+0,      14336,      14336,      512,     2048, 0x7c64ee03
+0,      14848,      14848,      512,     2048, 0xd303f4ff
+0,      15360,      15360,      512,     2048, 0xda5902be
+0,      15872,      15872,      512,     2048, 0x4096fe6b
+0,      16384,      16384,      512,     2048, 0x178e016a
+0,      16896,      16896,      512,     2048, 0x046700ac
+0,      17408,      17408,      512,     2048, 0x5f20f4ad
+0,      17920,      17920,      512,     2048, 0x40e2f093
+0,      18432,      18432,      512,     2048, 0x5c37fccd
+0,      18944,      18944,      512,     2048, 0x9f85f963
+0,      19456,      19456,      512,     2048, 0x69461038
+0,      19968,      19968,      512,     2048, 0x1ff1ef4f
+0,      20480,      20480,      512,     2048, 0x409304fc
+0,      20992,      20992,      512,     2048, 0x36d3fe47
+0,      21504,      21504,      512,     2048, 0xea01f367
+0,      22016,      22016,      512,     2048, 0x11f5fd01
+0,      22528,      22528,      512,     2048, 0x6deeeea5
+0,      23040,      23040,      512,     2048, 0x7eec0d62
+0,      23552,      23552,      512,     2048, 0xb47bfb93
+0,      24064,      24064,      512,     2048, 0x87b8f7a3
+0,      24576,      24576,      512,     2048, 0xcba0fefb
+0,      25088,      25088,      512,     2048, 0xa02efb77
+0,      25600,      25600,      512,     2048, 0x1030ecf1
+0,      26112,      26112,      512,     2048, 0xef7f08f4
+0,      26624,      26624,      512,     2048, 0x8d4efa1d
+0,      27136,      27136,      512,     2048, 0xe88b070c
+0,      27648,      27648,      512,     2048, 0x229cf957
+0,      28160,      28160,      512,     2048, 0xf7f2f3ed
+0,      28672,      28672,      512,     2048, 0x8f5f0840
+0,      29184,      29184,      512,     2048, 0x4fcbe815
+0,      29696,      29696,      512,     2048, 0x57dd006a
+0,      30208,      30208,      512,     2048, 0xd51af913
+0,      30720,      30720,      512,     2048, 0x63c50a68
+0,      31232,      31232,      512,     2048, 0x100e036c
+0,      31744,      31744,      512,     2048, 0x0af0f5ad
+0,      32256,      32256,      512,     2048, 0x99d5f9ef
+0,      32768,      32768,      512,     2048, 0xd2dbf701
+0,      33280,      33280,      512,     2048, 0xdb22f7bf
+0,      33792,      33792,      512,     2048, 0x82a103be
+0,      34304,      34304,      512,     2048, 0xa3c707d8
+0,      34816,      34816,      512,     2048, 0x8aaafb8f
+0,      35328,      35328,      512,     2048, 0x4bdafefb
+0,      35840,      35840,      512,     2048, 0x75a3e833
+0,      36352,      36352,      512,     2048, 0xc130091c
+0,      36864,      36864,      512,     2048, 0x99d8f36d
+0,      37376,      37376,      512,     2048, 0xaf6efa15
+0,      37888,      37888,      512,     2048, 0xff5f0506
+0,      38400,      38400,      512,     2048, 0xcba4fb5b
+0,      38912,      38912,      512,     2048, 0x729309c6
+0,      39424,      39424,      512,     2048, 0x63cdeb09
+0,      39936,      39936,      512,     2048, 0x386cfccb
+0,      40448,      40448,      512,     2048, 0x602100c8
+0,      40960,      40960,      512,     2048, 0x3573f565
+0,      41472,      41472,      512,     2048, 0x47b9fce7
+0,      41984,      41984,      512,     2048, 0xd1e90b7a
+0,      42496,      42496,      512,     2048, 0xf4c3ef77
+0,      43008,      43008,      512,     2048, 0x59ebfe3f
+0,      43520,      43520,      512,     2048, 0x02d4f161
+0,      44032,      44032,      512,     2048, 0x2c09f943
+0,      44544,      44544,      512,     2048, 0x2158dd3f
+0,      45056,      45056,      512,     2048, 0x9c150cf4
+0,      45568,      45568,      512,     2048, 0x2f66dfcb
+0,      46080,      46080,      512,     2048, 0xd62c05c4
+0,      46592,      46592,      512,     2048, 0x755d0472
+0,      47104,      47104,      512,     2048, 0x4aece261
+0,      47616,      47616,      512,     2048, 0xa4b704ac
+0,      48128,      48128,      512,     2048, 0x18410020
+0,      48640,      48640,      512,     2048, 0xa94ff9f5
+0,      49152,      49152,      512,     2048, 0xddf705ba
+0,      49664,      49664,      512,     2048, 0xca7af583
+0,      50176,      50176,      512,     2048, 0xf57af029
+0,      50688,      50688,      512,     2048, 0x2cb60d16
+0,      51200,      51200,      512,     2048, 0x97f2f90b
+0,      51712,      51712,      512,     2048, 0xd49cfd33
+0,      52224,      52224,      512,     2048, 0x4f56f1dd
+0,      52736,      52736,      512,     2048, 0x343bfbc1
+0,      53248,      53248,      512,     2048, 0x2058fd6b
+0,      53760,      53760,      512,     2048, 0x243bf921
+0,      54272,      54272,      512,     2048, 0x658b1272
+0,      54784,      54784,      512,     2048, 0xd68fe547
+0,      55296,      55296,      512,     2048, 0xab63068c
+0,      55808,      55808,      512,     2048, 0x8f860afa
+0,      56320,      56320,      512,     2048, 0x290de797
+0,      56832,      56832,      512,     2048, 0x9b990640
+0,      57344,      57344,      512,     2048, 0x859920bc
+0,      57856,      57856,      512,     2048, 0x343f12ae
+0,      58368,      58368,      512,     2048, 0xddf318e4
+0,      58880,      58880,      512,     2048, 0x55a6f535
+0,      59392,      59392,      512,     2048, 0x48ce08f6
+0,      59904,      59904,      512,     2048, 0x4e7ff8c3
+0,      60416,      60416,      512,     2048, 0xde8803c0
+0,      60928,      60928,      512,     2048, 0x1b79fe81
+0,      61440,      61440,      512,     2048, 0x853be72f
+0,      61952,      61952,      512,     2048, 0xf4cff117
+0,      62464,      62464,      512,     2048, 0xb61df45f
+0,      62976,      62976,      512,     2048, 0x6e38fdf7
+0,      63488,      63488,      512,     2048, 0x41c6042c
+0,      64000,      64000,      512,     2048, 0xfbb2fd87
+0,      64512,      64512,      512,     2048, 0x6da4eb69
+0,      65024,      65024,      512,     2048, 0x8ff8054e
+0,      65536,      65536,      512,     2048, 0x8c44ef81
+0,      66048,      66048,      512,     2048, 0x47faf17b
+0,      66560,      66560,      512,     2048, 0x0bd5012a
+0,      67072,      67072,      512,     2048, 0xe2d6fd37
+0,      67584,      67584,      512,     2048, 0x128ffedd
+0,      68096,      68096,      512,     2048, 0x02f7facd
+0,      68608,      68608,      512,     2048, 0x3f43f77d
+0,      69120,      69120,      512,     2048, 0x7d65fe19
+0,      69632,      69632,      512,     2048, 0x66c705ba
+0,      70144,      70144,      512,     2048, 0x182efbb7
+0,      70656,      70656,      512,     2048, 0xf718e481
+0,      71168,      71168,      512,     2048, 0xbfa10444
+0,      71680,      71680,      512,     2048, 0xc3aa0360
+0,      72192,      72192,      512,     2048, 0x90e0fa59
+0,      72704,      72704,      512,     2048, 0x903706c2
+0,      73216,      73216,      512,     2048, 0xff70001e
+0,      73728,      73728,      512,     2048, 0x9240ef79
+0,      74240,      74240,      512,     2048, 0xd72c05c8
+0,      74752,      74752,      512,     2048, 0x9655f5f5
+0,      75264,      75264,      512,     2048, 0x27b60a0e
+0,      75776,      75776,      512,     2048, 0x5917f885
+0,      76288,      76288,      512,     2048, 0xe39c107e
+0,      76800,      76800,      512,     2048, 0x2a4812c0
+0,      77312,      77312,      512,     2048, 0x39180ac8
+0,      77824,      77824,      512,     2048, 0x8b9efe57
+0,      78336,      78336,      512,     2048, 0xf9eefd25
+0,      78848,      78848,      512,     2048, 0xd3660cae
+0,      79360,      79360,      512,     2048, 0xa7ebf7d5
+0,      79872,      79872,      512,     2048, 0x4baaf59f
+0,      80384,      80384,      512,     2048, 0x659ff209
+0,      80896,      80896,      512,     2048, 0x1cf80e0e
+0,      81408,      81408,      512,     2048, 0x2df9ea69
+0,      81920,      81920,      512,     2048, 0xff8ffa2d
+0,      82432,      82432,      512,     2048, 0xdd2732d8
+0,      82944,      82944,      512,     2048, 0xcd6e31ec
+0,      83456,      83456,      512,     2048, 0x66d0fb9f
+0,      83968,      83968,      512,     2048, 0xbc11f229
+0,      84480,      84480,      512,     2048, 0x3ae00cec
+0,      84992,      84992,      512,     2048, 0xb032fb19
+0,      85504,      85504,      512,     2048, 0xb2c90414
+0,      86016,      86016,      512,     2048, 0xb7a1eeaf
+0,      86528,      86528,      512,     2048, 0x7a5d0e70
+0,      87040,      87040,      512,     2048, 0x16f11516
+0,      87552,      87552,      512,     2048, 0xfa95fc7f
+0,      88064,      88064,      512,     2048, 0x4fe705a6
+0,      88576,      88576,      512,     2048, 0x93d1c311
+0,      89088,      89088,      512,     2048, 0x8230f4f1
+0,      89600,      89600,      512,     2048, 0x6985e58f
+0,      90112,      90112,      512,     2048, 0xc4d8f07f
+0,      90624,      90624,      512,     2048, 0xb6b4c477
+0,      91136,      91136,      512,     2048, 0xc95bce8b
+0,      91648,      91648,      512,     2048, 0x57efd56f
+0,      92160,      92160,      512,     2048, 0xd453c295
+0,      92672,      92672,      512,     2048, 0x83c0da97
+0,      93184,      93184,      512,     2048, 0xf6bfe307
+0,      93696,      93696,      512,     2048, 0x0ce8ce27
+0,      94208,      94208,      512,     2048, 0xc925e53f
+0,      94720,      94720,      512,     2048, 0x7fe9d121
+0,      95232,      95232,      512,     2048, 0x00d3dcf9
+0,      95744,      95744,      512,     2048, 0x9743d637
+0,      96256,      96256,      512,     2048, 0x5163f37f
+0,      96768,      96768,      512,     2048, 0x9736dc27
+0,      97280,      97280,      512,     2048, 0xb0b1e85b
+0,      97792,      97792,      512,     2048, 0x589f0c2c
+0,      98304,      98304,      512,     2048, 0xb3b7aab9
+0,      98816,      98816,      512,     2048, 0x4df0d46d
+0,      99328,      99328,      512,     2048, 0xb917d4db
+0,      99840,      99840,      512,     2048, 0x6efdfe65
+0,     100352,     100352,      512,     2048, 0x426bd85d
+0,     100864,     100864,      512,     2048, 0x824313f6
+0,     101376,     101376,      512,     2048, 0xe755cf47
+0,     101888,     101888,      512,     2048, 0xe4e8f157
+0,     102400,     102400,      512,     2048, 0x05a8d1cb
+0,     102912,     102912,      512,     2048, 0xa405094a
+0,     103424,     103424,      512,     2048, 0x5060e40d
+0,     103936,     103936,      512,     2048, 0x3a17e253
+0,     104448,     104448,      512,     2048, 0xb8cdd80f
+0,     104960,     104960,      512,     2048, 0x7073c517
+0,     105472,     105472,      512,     2048, 0x634b00c4
+0,     105984,     105984,      512,     2048, 0xd8ebd025
+0,     106496,     106496,      512,     2048, 0x3a65cff7
+0,     107008,     107008,      512,     2048, 0x1e61b661
+0,     107520,     107520,      512,     2048, 0x3a1dcae9
+0,     108032,     108032,      512,     2048, 0x8d280542
+0,     108544,     108544,      512,     2048, 0xe918f499
+0,     109056,     109056,      512,     2048, 0x701bd98b
+0,     109568,     109568,      512,     2048, 0xd2a8e72f
+0,     110080,     110080,      512,     2048, 0x16ededdb
+0,     110592,     110592,      512,     2048, 0xfeb1fdbb
+0,     111104,     111104,      512,     2048, 0x36b1f4f1
+0,     111616,     111616,      512,     2048, 0x5bc5f27b
+0,     112128,     112128,      512,     2048, 0xb72605ee
+0,     112640,     112640,      512,     2048, 0x718d112e
+0,     113152,     113152,      512,     2048, 0x1ff7f25b
+0,     113664,     113664,      512,     2048, 0x1dd115cc
+0,     114176,     114176,      512,     2048, 0x1ff7fb15
+0,     114688,     114688,      512,     2048, 0xeb61f241
+0,     115200,     115200,      512,     2048, 0xc3bdeb83
+0,     115712,     115712,      512,     2048, 0xea80011a
+0,     116224,     116224,      512,     2048, 0x8d3cee71
+0,     116736,     116736,      512,     2048, 0x8cfbf589
+0,     117248,     117248,      512,     2048, 0xba23f8e3
+0,     117760,     117760,      512,     2048, 0x87a1e86d
+0,     118272,     118272,      512,     2048, 0x38e6f1a5
+0,     118784,     118784,      512,     2048, 0xe05a12fe
+0,     119296,     119296,      512,     2048, 0x9a14e835
+0,     119808,     119808,      512,     2048, 0x11a11780
+0,     120320,     120320,      512,     2048, 0x0c2308e6
+0,     120832,     120832,      512,     2048, 0xc8adfa4b
+0,     121344,     121344,      512,     2048, 0xfe4c118a
+0,     121856,     121856,      512,     2048, 0xa6240ac0
+0,     122368,     122368,      512,     2048, 0x3ff3ee2b
+0,     122880,     122880,      512,     2048, 0xc6aaf769
+0,     123392,     123392,      512,     2048, 0x4adafcdd
+0,     123904,     123904,      512,     2048, 0xabd6e845
+0,     124416,     124416,      512,     2048, 0x25e6076a
+0,     124928,     124928,      512,     2048, 0xb6e6d4b9
+0,     125440,     125440,      512,     2048, 0x7251f225
+0,     125952,     125952,      512,     2048, 0xc3b5f751
+0,     126464,     126464,      512,     2048, 0x4f27cecd
+0,     126976,     126976,      512,     2048, 0x237c020c
+0,     127488,     127488,      512,     2048, 0xb0580556
+0,     128000,     128000,      512,     2048, 0x717008a4
+0,     128512,     128512,      512,     2048, 0xf683e3fb
+0,     129024,     129024,      512,     2048, 0x1ddefd33
+0,     129536,     129536,      512,     2048, 0x4c6c1496
+0,     130048,     130048,      512,     2048, 0x67f907fe
+0,     130560,     130560,      512,     2048, 0x5bb10938
+0,     131072,     131072,      512,     2048, 0x24a20eac
+0,     131584,     131584,      512,     2048, 0xf251effb
+0,     132096,     132096,      512,     2048, 0xafd7eb04
+0,     132608,     132608,      512,     2048, 0xa1950245
+0,     133120,     133120,      512,     2048, 0x8cdefb0d
+0,     133632,     133632,      512,     2048, 0x5694fa32
+0,     134144,     134144,      512,     2048, 0x0942eeb6
+0,     134656,     134656,      512,     2048, 0x715a01c1
+0,     135168,     135168,      512,     2048, 0x4531f63e
+0,     135680,     135680,      512,     2048, 0x214ffbbc
+0,     136192,     136192,      512,     2048, 0x0f50fe21
+0,     136704,     136704,      512,     2048, 0xe456046b
+0,     137216,     137216,      512,     2048, 0xd6eaff4d
+0,     137728,     137728,      512,     2048, 0xd8140634
+0,     138240,     138240,      512,     2048, 0x608e0bff
+0,     138752,     138752,      512,     2048, 0x76610cee
+0,     139264,     139264,      512,     2048, 0x6b48f0ff
+0,     139776,     139776,      512,     2048, 0x03c7f9ce
+0,     140288,     140288,      512,     2048, 0xf718fad1
+0,     140800,     140800,      512,     2048, 0x296bef29
+0,     141312,     141312,      512,     2048, 0x2311f2bf
+0,     141824,     141824,      512,     2048, 0x069ffe60
+0,     142336,     142336,      512,     2048, 0x6126055d
+0,     142848,     142848,      512,     2048, 0x9330eda6
+0,     143360,     143360,      512,     2048, 0xdfbeedc1
+0,     143872,     143872,      512,     2048, 0x8536f1b8
+0,     144384,     144384,      512,     2048, 0xfe30fd72
+0,     144896,     144896,      512,     2048, 0x13320264
+0,     145408,     145408,      512,     2048, 0x83ad09db
+0,     145920,     145920,      512,     2048, 0xc08b0b31
+0,     146432,     146432,      512,     2048, 0xda8afea0
+0,     146944,     146944,      512,     2048, 0x0cb3f040
+0,     147456,     147456,      512,     2048, 0x80c0fc17
+0,     147968,     147968,      512,     2048, 0x9d80fdfb
+0,     148480,     148480,      512,     2048, 0x9f1af1fd
+0,     148992,     148992,      512,     2048, 0x92fef102
+0,     149504,     149504,      512,     2048, 0x5b62f7be
+0,     150016,     150016,      512,     2048, 0x25800a5b
+0,     150528,     150528,      512,     2048, 0xc660fba3
+0,     151040,     151040,      512,     2048, 0x0e21fbda
+0,     151552,     151552,      512,     2048, 0x2e7f027d
+0,     152064,     152064,      512,     2048, 0xcf65feb4
+0,     152576,     152576,      512,     2048, 0x4e0ffa6d
+0,     153088,     153088,      512,     2048, 0x732bff36
+0,     153600,     153600,      512,     2048, 0x3df20e7e
+0,     154112,     154112,      512,     2048, 0x2a5006e5
+0,     154624,     154624,      512,     2048, 0xfd3bfa2a
+0,     155136,     155136,      512,     2048, 0x8e73f755
+0,     155648,     155648,      512,     2048, 0x6f93ece1
+0,     156160,     156160,      512,     2048, 0x78a4f735
+0,     156672,     156672,      512,     2048, 0x3a7cfc1c
+0,     157184,     157184,      512,     2048, 0xbfc0f795
+0,     157696,     157696,      512,     2048, 0x7a8cfed2
+0,     158208,     158208,      512,     2048, 0x3d0fdee5
+0,     158720,     158720,      512,     2048, 0x902afc78
+0,     159232,     159232,      512,     2048, 0x51dcf0e2
+0,     159744,     159744,      512,     2048, 0x1f59fc00
+0,     160256,     160256,      512,     2048, 0x2dd0f390
+0,     160768,     160768,      512,     2048, 0x2ff30f7c
+0,     161280,     161280,      512,     2048, 0x36f508b8
+0,     161792,     161792,      512,     2048, 0x51e8ef2d
+0,     162304,     162304,      512,     2048, 0xf9660ed7
+0,     162816,     162816,      512,     2048, 0x50f3fd4d
+0,     163328,     163328,      512,     2048, 0x366ef6b9
+0,     163840,     163840,      512,     2048, 0xf023f17a
+0,     164352,     164352,      512,     2048, 0xf6c6f1f0
+0,     164864,     164864,      512,     2048, 0x6d1dfebf
+0,     165376,     165376,      512,     2048, 0xead60e1d
+0,     165888,     165888,      512,     2048, 0xbe5201a6
+0,     166400,     166400,      512,     2048, 0xb1940269
+0,     166912,     166912,      512,     2048, 0xb6cdf350
+0,     167424,     167424,      512,     2048, 0x7c44f80e
+0,     167936,     167936,      512,     2048, 0x1fff03ef
+0,     168448,     168448,      512,     2048, 0x514807c6
+0,     168960,     168960,      512,     2048, 0xe04eede7
+0,     169472,     169472,      512,     2048, 0x347e0272
+0,     169984,     169984,      512,     2048, 0x8c00fb96
+0,     170496,     170496,      512,     2048, 0x6660f607
+0,     171008,     171008,      512,     2048, 0xe9a7017d
+0,     171520,     171520,      512,     2048, 0xca58e8ae
+0,     172032,     172032,      512,     2048, 0x795af92a
+0,     172544,     172544,      512,     2048, 0x7d6aee1b
+0,     173056,     173056,      512,     2048, 0x4ab9f58f
+0,     173568,     173568,      512,     2048, 0x3b91f617
+0,     174080,     174080,      512,     2048, 0x09e1f7d7
+0,     174592,     174592,      512,     2048, 0xc9280753
+0,     175104,     175104,      512,     2048, 0x8620f662
+0,     175616,     175616,      512,     2048, 0x6bb103fa
+0,     176128,     176128,      512,     2048, 0xcfee0371
+0,     176640,     176640,      512,     2048, 0xe1e20294
+0,     177152,     177152,      512,     2048, 0xdb98fea4
+0,     177664,     177664,      512,     2048, 0x8d1fddeb
+0,     178176,     178176,      512,     2048, 0x4e7501bf
+0,     178688,     178688,      512,     2048, 0x68d0fb95
+0,     179200,     179200,      512,     2048, 0xf685001e
+0,     179712,     179712,      512,     2048, 0x75dafa10
+0,     180224,     180224,      512,     2048, 0x534fe772
+0,     180736,     180736,      512,     2048, 0x28b4fe18
+0,     181248,     181248,      512,     2048, 0x2ba00678
+0,     181760,     181760,      512,     2048, 0xc884e0b7
+0,     182272,     182272,      512,     2048, 0x6ae40787
+0,     182784,     182784,      512,     2048, 0xc53cf35d
+0,     183296,     183296,      512,     2048, 0x738d06b4
+0,     183808,     183808,      512,     2048, 0xb551f582
+0,     184320,     184320,      512,     2048, 0x8a5a8764
+0,     184832,     184832,      512,     2048, 0x711f175e
+0,     185344,     185344,      512,     2048, 0xe5e1ed43
+0,     185856,     185856,      512,     2048, 0x34adfaeb
+0,     186368,     186368,      512,     2048, 0x79fb0142
+0,     186880,     186880,      512,     2048, 0xf4f6ffeb
+0,     187392,     187392,      512,     2048, 0xd3540a6b
+0,     187904,     187904,      512,     2048, 0x49caf3c6
+0,     188416,     188416,      512,     2048, 0xc1db05b7
+0,     188928,     188928,      512,     2048, 0x26f0114a
+0,     189440,     189440,      512,     2048, 0x576eead9
+0,     189952,     189952,      512,     2048, 0xb87f00e9
+0,     190464,     190464,      512,     2048, 0x470d030f
+0,     190976,     190976,      512,     2048, 0x60ec02b2
+0,     191488,     191488,      512,     2048, 0xb84a0b44
+0,     192000,     192000,      512,     2048, 0x39b6ec45
+0,     192512,     192512,      512,     2048, 0x1e07e580
+0,     193024,     193024,      512,     2048, 0xfa3cf5d6
+0,     193536,     193536,      512,     2048, 0x0801f9b8
+0,     194048,     194048,      512,     2048, 0x55981a80
+0,     194560,     194560,      512,     2048, 0x9510f6ad
+0,     195072,     195072,      512,     2048, 0x7d03fcc7
+0,     195584,     195584,      512,     2048, 0xf17bf84e
+0,     196096,     196096,      512,     2048, 0x6d1ffe4c
+0,     196608,     196608,      512,     2048, 0x91e210f9
+0,     197120,     197120,      512,     2048, 0xb881fa44
+0,     197632,     197632,      512,     2048, 0xb7cdf1f3
+0,     198144,     198144,      512,     2048, 0x1e9b17b5
+0,     198656,     198656,      512,     2048, 0x74dff0e3
+0,     199168,     199168,      512,     2048, 0x1f55050e
+0,     199680,     199680,      512,     2048, 0x7498f1b8
+0,     200192,     200192,      512,     2048, 0x2d7c02e9
+0,     200704,     200704,      512,     2048, 0x8c84a5c4
+0,     201216,     201216,      512,     2048, 0x6feae10d
+0,     201728,     201728,      512,     2048, 0xfda90b28
+0,     202240,     202240,      512,     2048, 0xb230fd72
+0,     202752,     202752,      512,     2048, 0x6298f728
+0,     203264,     203264,      512,     2048, 0xef60f871
+0,     203776,     203776,      512,     2048, 0x14e7ee01
+0,     204288,     204288,      512,     2048, 0x98d704a5
+0,     204800,     204800,      512,     2048, 0x1ccaf2b4
+0,     205312,     205312,      512,     2048, 0xb9ede721
+0,     205824,     205824,      512,     2048, 0x8c570d92
+0,     206336,     206336,      512,     2048, 0x2d7ef782
+0,     206848,     206848,      512,     2048, 0xa84cf55e
+0,     207360,     207360,      512,     2048, 0x8033f5b9
+0,     207872,     207872,      512,     2048, 0x27f3ed27
+0,     208384,     208384,      512,     2048, 0xa6730c25
+0,     208896,     208896,      512,     2048, 0x489bf2fd
+0,     209408,     209408,      512,     2048, 0xe1e20294
+0,     209920,     209920,      512,     2048, 0xdb98fea4
+0,     210432,     210432,      512,     2048, 0x8d1fddeb
+0,     210944,     210944,      512,     2048, 0x4e7501bf
+0,     211456,     211456,      512,     2048, 0x68d0fb95
+0,     211968,     211968,      512,     2048, 0xf685001e
+0,     212480,     212480,      512,     2048, 0x75dafa10
+0,     212992,     212992,      512,     2048, 0x534fe772
+0,     213504,     213504,      512,     2048, 0x28b4fe18
+0,     214016,     214016,      512,     2048, 0x2ba00678
+0,     214528,     214528,      512,     2048, 0xc884e0b7
+0,     215040,     215040,      512,     2048, 0x6ae40787
+0,     215552,     215552,      512,     2048, 0xc53cf35d
+0,     216064,     216064,      512,     2048, 0x738d06b4
+0,     216576,     216576,      512,     2048, 0xb551f582
+0,     217088,     217088,      512,     2048, 0x8a5a8764
+0,     217600,     217600,      512,     2048, 0x711f175e
+0,     218112,     218112,      512,     2048, 0xe5e1ed43
+0,     218624,     218624,      512,     2048, 0x34adfaeb
+0,     219136,     219136,      512,     2048, 0x79fb0142
+0,     219648,     219648,      512,     2048, 0xf4f6ffeb
+0,     220160,     220160,      512,     2048, 0xd3540a6b
+0,     220672,     220672,      512,     2048, 0x49caf3c6
+0,     221184,     221184,      512,     2048, 0xc1db05b7
+0,     221696,     221696,      512,     2048, 0x26f0114a
+0,     222208,     222208,      512,     2048, 0x576eead9
+0,     222720,     222720,      512,     2048, 0xb87f00e9
+0,     223232,     223232,      512,     2048, 0x470d030f
+0,     223744,     223744,      512,     2048, 0x60ec02b2
+0,     224256,     224256,      512,     2048, 0xb84a0b44
+0,     224768,     224768,      512,     2048, 0x39b6ec45
+0,     225280,     225280,      512,     2048, 0x1e07e580
+0,     225792,     225792,      512,     2048, 0xfa3cf5d6
+0,     226304,     226304,      512,     2048, 0x0801f9b8
+0,     226816,     226816,      512,     2048, 0x55981a80
+0,     227328,     227328,      512,     2048, 0x9510f6ad
+0,     227840,     227840,      512,     2048, 0x7d03fcc7
+0,     228352,     228352,      512,     2048, 0xf17bf84e
+0,     228864,     228864,      512,     2048, 0x6d1ffe4c
+0,     229376,     229376,      512,     2048, 0x91e210f9
+0,     229888,     229888,      512,     2048, 0xb881fa44
+0,     230400,     230400,      512,     2048, 0xb7cdf1f3
+0,     230912,     230912,      512,     2048, 0x1e9b17b5
+0,     231424,     231424,      512,     2048, 0x74dff0e3
+0,     231936,     231936,      512,     2048, 0x1f55050e
+0,     232448,     232448,      512,     2048, 0x7498f1b8
+0,     232960,     232960,      512,     2048, 0x2d7c02e9
+0,     233472,     233472,      512,     2048, 0x8c84a5c4
+0,     233984,     233984,      512,     2048, 0x6feae10d
+0,     234496,     234496,      512,     2048, 0xfda90b28
+0,     235008,     235008,      512,     2048, 0xb230fd72
+0,     235520,     235520,      512,     2048, 0x6298f728
+0,     236032,     236032,      512,     2048, 0xef60f871
+0,     236544,     236544,      512,     2048, 0x14e7ee01
+0,     237056,     237056,      512,     2048, 0x98d704a5
+0,     237568,     237568,      512,     2048, 0x1ccaf2b4
+0,     238080,     238080,      512,     2048, 0xb9ede721
+0,     238592,     238592,      512,     2048, 0x8c570d92
+0,     239104,     239104,      512,     2048, 0x2d7ef782
+0,     239616,     239616,      512,     2048, 0xa84cf55e
+0,     240128,     240128,      512,     2048, 0x8033f5b9
+0,     240640,     240640,      512,     2048, 0x27f3ed27
+0,     241152,     241152,      512,     2048, 0xa6730c25
+0,     241664,     241664,      512,     2048, 0x489bf2fd
+0,     242176,     242176,      512,     2048, 0xe1e20294
+0,     242688,     242688,      512,     2048, 0xdb98fea4
+0,     243200,     243200,      512,     2048, 0x8d1fddeb
+0,     243712,     243712,      512,     2048, 0x4e7501bf
+0,     244224,     244224,      512,     2048, 0x68d0fb95
+0,     244736,     244736,      512,     2048, 0xf685001e
+0,     245248,     245248,      512,     2048, 0x75dafa10
+0,     245760,     245760,      512,     2048, 0x534fe772
+0,     246272,     246272,      512,     2048, 0x28b4fe18
+0,     246784,     246784,      512,     2048, 0x2ba00678
+0,     247296,     247296,      512,     2048, 0xc884e0b7
+0,     247808,     247808,      512,     2048, 0x6ae40787
+0,     248320,     248320,      512,     2048, 0xc53cf35d
+0,     248832,     248832,      512,     2048, 0x738d06b4
+0,     249344,     249344,      512,     2048, 0xb551f582
+0,     249856,     249856,      512,     2048, 0x8a5a8764
+0,     250368,     250368,      512,     2048, 0x711f175e
+0,     250880,     250880,      512,     2048, 0xe5e1ed43
+0,     251392,     251392,      512,     2048, 0x34adfaeb
+0,     251904,     251904,      512,     2048, 0x79fb0142
+0,     252416,     252416,      512,     2048, 0xf4f6ffeb
+0,     252928,     252928,      512,     2048, 0xd3540a6b
+0,     253440,     253440,      512,     2048, 0x49caf3c6
+0,     253952,     253952,      512,     2048, 0xc1db05b7
+0,     254464,     254464,      512,     2048, 0x26f0114a
+0,     254976,     254976,      512,     2048, 0x576eead9
+0,     255488,     255488,      512,     2048, 0xb87f00e9
+0,     256000,     256000,      512,     2048, 0x470d030f
+0,     256512,     256512,      512,     2048, 0x60ec02b2
+0,     257024,     257024,      512,     2048, 0xb84a0b44
+0,     257536,     257536,      512,     2048, 0x39b6ec45
+0,     258048,     258048,      512,     2048, 0x1e07e580
+0,     258560,     258560,      512,     2048, 0xfa3cf5d6
+0,     259072,     259072,      512,     2048, 0x0801f9b8
+0,     259584,     259584,      512,     2048, 0x55981a80
+0,     260096,     260096,      512,     2048, 0x9510f6ad
+0,     260608,     260608,      512,     2048, 0x7d03fcc7
+0,     261120,     261120,      512,     2048, 0xf17bf84e
+0,     261632,     261632,      512,     2048, 0x6d1ffe4c
+0,     262144,     262144,      512,     2048, 0x91e210f9
+0,     262656,     262656,      512,     2048, 0xb881fa44
+0,     263168,     263168,      512,     2048, 0xb7cdf1f3
+0,     263680,     263680,      512,     2048, 0x1e9b17b5
+0,     264192,     264192,      512,     2048, 0xfd82313e
diff --git a/tests/ref/fate/filter-asetrate b/tests/ref/fate/filter-asetrate
new file mode 100644
index 0000000000..6ffa940361
--- /dev/null
+++ b/tests/ref/fate/filter-asetrate
@@ -0,0 +1,26 @@
+#tb 0: 1/20000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 20000
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x29e3eecf
+0,       1024,       1024,     1024,     4096, 0x18390b96
+0,       2048,       2048,     1024,     4096, 0xc477fa99
+0,       3072,       3072,     1024,     4096, 0x3bc0f14f
+0,       4096,       4096,     1024,     4096, 0x2379ed91
+0,       5120,       5120,     1024,     4096, 0xfd6a0070
+0,       6144,       6144,     1024,     4096, 0x0b01f4cf
+0,       7168,       7168,     1024,     4096, 0x6716fd93
+0,       8192,       8192,     1024,     4096, 0x1840f25b
+0,       9216,       9216,     1024,     4096, 0x9c1ffaf1
+0,      10240,      10240,     1024,     4096, 0xcbedefaf
+0,      11264,      11264,     1024,     4096, 0x3e050390
+0,      12288,      12288,     1024,     4096, 0xb30e0090
+0,      13312,      13312,     1024,     4096, 0x26b8f75b
+0,      14336,      14336,     1024,     4096, 0xd706e311
+0,      15360,      15360,     1024,     4096, 0x0c480138
+0,      16384,      16384,     1024,     4096, 0x6c9a0216
+0,      17408,      17408,     1024,     4096, 0x7abce54f
+0,      18432,      18432,     1024,     4096, 0xda45f63f
+0,      19456,      19456,     1024,     4096, 0x50d5ff87
diff --git a/tests/ref/fate/filter-atrim-duration b/tests/ref/fate/filter-atrim-duration
index a51dff7dfd..fafda1717f 100644
--- a/tests/ref/fate/filter-atrim-duration
+++ b/tests/ref/fate/filter-atrim-duration
@@ -1,2 +1,7 @@
 #tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,       4410,       4410,      441,     1764, 0x61e374f7
diff --git a/tests/ref/fate/filter-atrim-mixed b/tests/ref/fate/filter-atrim-mixed
index ae3281a1a8..4cd1d8004f 100644
--- a/tests/ref/fate/filter-atrim-mixed
+++ b/tests/ref/fate/filter-atrim-mixed
@@ -1,4 +1,9 @@
 #tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,       1025,       1025,     1023,     4092, 0x78560a4c
 0,       2048,       2048,     1024,     4096, 0xc477fa99
 0,       3072,       3072,     1024,     4096, 0x3bc0f14f
diff --git a/tests/ref/fate/filter-atrim-samples b/tests/ref/fate/filter-atrim-samples
index 3461666394..2d8c9a5235 100644
--- a/tests/ref/fate/filter-atrim-samples
+++ b/tests/ref/fate/filter-atrim-samples
@@ -1,2 +1,7 @@
 #tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,         26,         26,       54,      216, 0x6b376c6c
diff --git a/tests/ref/fate/filter-atrim-time b/tests/ref/fate/filter-atrim-time
index a3682101ce..a0c626c4ba 100644
--- a/tests/ref/fate/filter-atrim-time
+++ b/tests/ref/fate/filter-atrim-time
@@ -1,4 +1,9 @@
 #tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,       4410,       4410,      710,     2840, 0x658982a3
 0,       5120,       5120,     1024,     4096, 0xfd6a0070
 0,       6144,       6144,     1024,     4096, 0x0b01f4cf
diff --git a/tests/ref/fate/filter-boxblur b/tests/ref/fate/filter-boxblur
index acb2beb022..d332f3a02a 100644
--- a/tests/ref/fate/filter-boxblur
+++ b/tests/ref/fate/filter-boxblur
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x113489f8
 0,          1,          1,        1,   152064, 0x650a64ca
 0,          2,          2,        1,   152064, 0x29ecf6b1
diff --git a/tests/ref/fate/filter-chorus b/tests/ref/fate/filter-chorus
new file mode 100644
index 0000000000..211e60ecb1
--- /dev/null
+++ b/tests/ref/fate/filter-chorus
@@ -0,0 +1,16 @@
+#tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+0,          0,          0,     2048,     4096, 0x1fc6f1f1
+0,       2048,       2048,     2048,     4096, 0xe5f7f442
+0,       4096,       4096,     2048,     4096, 0x4f14ecb9
+0,       6144,       6144,     2048,     4096, 0xd431eeee
+0,       8192,       8192,     2048,     4096, 0x4c38ead6
+0,      10240,      10240,     2048,     4096, 0x786cf071
+0,      12288,      12288,     2048,     4096, 0xe291f200
+0,      14336,      14336,     2048,     4096, 0x47d2f1dd
+0,      16384,      16384,     2048,     4096, 0xd6a1f028
+0,      18432,      18432,     2048,     4096, 0x2bf4ec79
diff --git a/tests/ref/fate/filter-codecview-mvs b/tests/ref/fate/filter-codecview-mvs
new file mode 100644
index 0000000000..4e1e53d897
--- /dev/null
+++ b/tests/ref/fate/filter-codecview-mvs
@@ -0,0 +1,65 @@
+#tb 0: 32768/785647
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 576x320
+#sar 0: 0/1
+0,          0,          0,        1,   276480, 0x5f7a0d4f
+0,          1,          1,        1,   276480, 0x5f7a0d4f
+0,          2,          2,        1,   276480, 0x5f7a0d4f
+0,          3,          3,        1,   276480, 0x5f7a0d4f
+0,          4,          4,        1,   276480, 0x5f7a0d4f
+0,          5,          5,        1,   276480, 0x5f7a0d4f
+0,          6,          6,        1,   276480, 0x5f7a0d4f
+0,          7,          7,        1,   276480, 0x5f7a0d4f
+0,          8,          8,        1,   276480, 0x5f7a0d4f
+0,          9,          9,        1,   276480, 0x5f7a0d4f
+0,         10,         10,        1,   276480, 0x5f7a0d4f
+0,         11,         11,        1,   276480, 0x5f7a0d4f
+0,         12,         12,        1,   276480, 0x5f7a0d4f
+0,         13,         13,        1,   276480, 0x5f7a0d4f
+0,         14,         14,        1,   276480, 0x5f7a0d4f
+0,         15,         15,        1,   276480, 0x5f7a0d4f
+0,         16,         16,        1,   276480, 0xc3b80edf
+0,         17,         17,        1,   276480, 0x5f7a0d4f
+0,         18,         18,        1,   276480, 0x5f7a0d4f
+0,         19,         19,        1,   276480, 0x5f7a0d4f
+0,         20,         20,        1,   276480, 0xc3b80edf
+0,         21,         21,        1,   276480, 0x5f7a0d4f
+0,         22,         22,        1,   276480, 0x5f7a0d4f
+0,         23,         23,        1,   276480, 0x5f7a0d4f
+0,         24,         24,        1,   276480, 0xc3b80edf
+0,         25,         25,        1,   276480, 0x5f7a0d4f
+0,         26,         26,        1,   276480, 0x5f7a0d4f
+0,         27,         27,        1,   276480, 0x5f7a0d4f
+0,         28,         28,        1,   276480, 0xc3b80edf
+0,         29,         29,        1,   276480, 0x5f7a0d4f
+0,         30,         30,        1,   276480, 0x5f7a0d4f
+0,         31,         31,        1,   276480, 0x5f7a0d4f
+0,         32,         32,        1,   276480, 0xc3b80edf
+0,         33,         33,        1,   276480, 0x75641594
+0,         34,         34,        1,   276480, 0x32ee3526
+0,         35,         35,        1,   276480, 0xcb53479a
+0,         36,         36,        1,   276480, 0xe1be6e26
+0,         37,         37,        1,   276480, 0x5ce39368
+0,         38,         38,        1,   276480, 0x4ec1e418
+0,         39,         39,        1,   276480, 0x23c418ae
+0,         40,         40,        1,   276480, 0x036a5515
+0,         41,         41,        1,   276480, 0x7946efbd
+0,         42,         42,        1,   276480, 0xd9aa1382
+0,         43,         43,        1,   276480, 0x3863f9c8
+0,         44,         44,        1,   276480, 0x33e47330
+0,         45,         45,        1,   276480, 0xff6e8038
+0,         46,         46,        1,   276480, 0xed3ff087
+0,         47,         47,        1,   276480, 0xe7834514
+0,         48,         48,        1,   276480, 0x4d5d909d
+0,         49,         49,        1,   276480, 0x82eea962
+0,         50,         50,        1,   276480, 0x8075bca3
+0,         51,         51,        1,   276480, 0xd5dc3185
+0,         52,         52,        1,   276480, 0x859e0490
+0,         53,         53,        1,   276480, 0x6ceebf3e
+0,         54,         54,        1,   276480, 0xada5d62d
+0,         55,         55,        1,   276480, 0x991a7628
+0,         56,         56,        1,   276480, 0xe169042a
+0,         57,         57,        1,   276480, 0x226e52c4
+0,         58,         58,        1,   276480, 0xa3fe775c
+0,         59,         59,        1,   276480, 0x6b80e99f
diff --git a/tests/ref/fate/filter-colorchannelmixer b/tests/ref/fate/filter-colorchannelmixer
new file mode 100644
index 0000000000..93f9a39e61
--- /dev/null
+++ b/tests/ref/fate/filter-colorchannelmixer
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   304128, 0x42900c13
+0,          1,          1,        1,   304128, 0xfb0439bc
+0,          2,          2,        1,   304128, 0x967b9f0d
+0,          3,          3,        1,   304128, 0xc2c92489
+0,          4,          4,        1,   304128, 0x024499b1
+0,          5,          5,        1,   304128, 0x66144785
+0,          6,          6,        1,   304128, 0x0e505bcd
+0,          7,          7,        1,   304128, 0xc8b26ed2
+0,          8,          8,        1,   304128, 0x14b5717b
+0,          9,          9,        1,   304128, 0x2ba3144a
+0,         10,         10,        1,   304128, 0x1185992b
+0,         11,         11,        1,   304128, 0xd55b289a
+0,         12,         12,        1,   304128, 0x59f2f3be
+0,         13,         13,        1,   304128, 0xfe4d6adf
+0,         14,         14,        1,   304128, 0x630806cc
+0,         15,         15,        1,   304128, 0x2deb2f19
+0,         16,         16,        1,   304128, 0xfbffa923
+0,         17,         17,        1,   304128, 0xb7770d46
+0,         18,         18,        1,   304128, 0xda09bd0e
+0,         19,         19,        1,   304128, 0x17a422d2
+0,         20,         20,        1,   304128, 0xbb6172f5
+0,         21,         21,        1,   304128, 0xcf639456
+0,         22,         22,        1,   304128, 0xdb0ae1ac
+0,         23,         23,        1,   304128, 0x850d6a68
+0,         24,         24,        1,   304128, 0xdc8409fb
+0,         25,         25,        1,   304128, 0x26216c51
+0,         26,         26,        1,   304128, 0x1d0004de
+0,         27,         27,        1,   304128, 0xed019a70
+0,         28,         28,        1,   304128, 0xb1abd985
+0,         29,         29,        1,   304128, 0xec1c14b2
+0,         30,         30,        1,   304128, 0x046db068
+0,         31,         31,        1,   304128, 0xa4fb1029
+0,         32,         32,        1,   304128, 0x49e05e61
+0,         33,         33,        1,   304128, 0x7668d6d1
+0,         34,         34,        1,   304128, 0x6dd0ce9d
+0,         35,         35,        1,   304128, 0x87983f5e
+0,         36,         36,        1,   304128, 0xb98278cf
+0,         37,         37,        1,   304128, 0x55186244
+0,         38,         38,        1,   304128, 0x3135e7ea
+0,         39,         39,        1,   304128, 0xdbf59a2c
+0,         40,         40,        1,   304128, 0x944cdc92
+0,         41,         41,        1,   304128, 0x5849dfe8
+0,         42,         42,        1,   304128, 0xaf9075ba
+0,         43,         43,        1,   304128, 0xb4f01118
+0,         44,         44,        1,   304128, 0x4dfb711f
+0,         45,         45,        1,   304128, 0xb558e732
+0,         46,         46,        1,   304128, 0xb23a171e
+0,         47,         47,        1,   304128, 0xb5c68065
+0,         48,         48,        1,   304128, 0xcf1b122e
+0,         49,         49,        1,   304128, 0x1e2d38e5
diff --git a/tests/ref/fate/filter-colormatrix1 b/tests/ref/fate/filter-colormatrix1
new file mode 100644
index 0000000000..2f25f6cf4b
--- /dev/null
+++ b/tests/ref/fate/filter-colormatrix1
@@ -0,0 +1 @@
+colormatrix1        1593e24a71db42d07781b92665cf99a9
diff --git a/tests/ref/fate/filter-colormatrix2 b/tests/ref/fate/filter-colormatrix2
new file mode 100644
index 0000000000..b57b59482c
--- /dev/null
+++ b/tests/ref/fate/filter-colormatrix2
@@ -0,0 +1 @@
+colormatrix2        cafba294debb89f59143b519f3cd1673
diff --git a/tests/ref/fate/filter-compand b/tests/ref/fate/filter-compand
new file mode 100644
index 0000000000..ac9095f4e3
--- /dev/null
+++ b/tests/ref/fate/filter-compand
@@ -0,0 +1,26 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0xfc10e61b
+0,       1024,       1024,     1024,     4096, 0x8801ef13
+0,       2048,       2048,     1024,     4096, 0xba55fc17
+0,       3072,       3072,     1024,     4096, 0x70f203a0
+0,       4096,       4096,     1024,     4096, 0x9f2ff593
+0,       5120,       5120,     1024,     4096, 0x52f0fb77
+0,       6144,       6144,     1024,     4096, 0x435502ec
+0,       7168,       7168,     1024,     4096, 0xaacfe4bb
+0,       8192,       8192,     1024,     4096, 0x38010f44
+0,       9216,       9216,     1024,     4096, 0x8a79e351
+0,      10240,      10240,     1024,     4096, 0x3d66ec91
+0,      11264,      11264,     1024,     4096, 0x03031b7e
+0,      12288,      12288,     1024,     4096, 0xd9c310ec
+0,      13312,      13312,     1024,     4096, 0x076af28b
+0,      14336,      14336,     1024,     4096, 0xb80fdfe3
+0,      15360,      15360,     1024,     4096, 0xff0fe68d
+0,      16384,      16384,     1024,     4096, 0x679efb4d
+0,      17408,      17408,     1024,     4096, 0xf84fe6e3
+0,      18432,      18432,     1024,     4096, 0x01ebf175
+0,      19456,      19456,     1024,     4096, 0xe7cdea1b
diff --git a/tests/ref/fate/filter-concat b/tests/ref/fate/filter-concat
new file mode 100644
index 0000000000..022697ec5b
--- /dev/null
+++ b/tests/ref/fate/filter-concat
@@ -0,0 +1,211 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+#tb 1: 1/44100
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 44100
+#channel_layout 1: 4
+#channel_layout_name 1: mono
+0,          0,          0,        1,   230400, 0x88c4d19a
+1,          0,          0,     1024,     2048, 0xb3f10192
+1,       1024,       1024,     1024,     2048, 0xb340fe4e
+1,       2048,       2048,     1024,     2048, 0x0a5f0111
+1,       3072,       3072,     1024,     2048, 0x51be06b8
+1,       4096,       4096,     1024,     2048, 0x71a1ffcb
+1,       5120,       5120,     1024,     2048, 0x7f64f50f
+1,       6144,       6144,     1024,     2048, 0x70a8fa17
+1,       7168,       7168,     1024,     2048, 0x0dad072a
+1,       8192,       8192,     1024,     2048, 0x5e810c51
+0,          1,          1,        1,   230400, 0x0d77c977
+1,       9216,       9216,     1024,     2048, 0xbe5bf462
+1,      10240,      10240,     1024,     2048, 0xbcd9faeb
+1,      11264,      11264,     1024,     2048, 0x0d5bfe9c
+1,      12288,      12288,     1024,     2048, 0x97d80297
+1,      13312,      13312,     1024,     2048, 0xba0f0894
+1,      14336,      14336,     1024,     2048, 0xcc22f291
+1,      15360,      15360,     1024,     2048, 0x11a9fa03
+1,      16384,      16384,     1024,     2048, 0x9a920378
+1,      17408,      17408,     1024,     2048, 0x901b0525
+0,          2,          2,        1,   230400, 0x242629d7
+1,      18432,      18432,     1024,     2048, 0x74b2003f
+1,      19456,      19456,     1024,     2048, 0xa20ef3ed
+1,      20480,      20480,     1024,     2048, 0x44cef9de
+1,      21504,      21504,     1024,     2048, 0x4b2e039b
+1,      22528,      22528,     1024,     2048, 0x198509a1
+1,      23552,      23552,     1024,     2048, 0xcab6f9e5
+1,      24576,      24576,     1024,     2048, 0x67f8f608
+1,      25600,      25600,     1024,     2048, 0x8d7f03fa
+0,          3,          3,        1,   230400, 0x62cdc018
+1,      26624,      26624,     1024,     2048, 0x3e1e0566
+1,      27648,      27648,     1024,     2048, 0x2cfe0308
+1,      28672,      28672,     1024,     2048, 0x1ceaf702
+1,      29696,      29696,     1024,     2048, 0x38a9f3d1
+1,      30720,      30720,     1024,     2048, 0x6c3306b7
+1,      31744,      31744,     1024,     2048, 0x600f0579
+1,      32768,      32768,     1024,     2048, 0x3e5afa28
+1,      33792,      33792,     1024,     2048, 0x053ff47a
+1,      34816,      34816,     1024,     2048, 0x0d28fed9
+0,          4,          4,        1,   230400, 0x248ad058
+1,      35840,      35840,     1024,     2048, 0x279805cc
+1,      36864,      36864,     1024,     2048, 0xb16a0a12
+1,      37888,      37888,     1024,     2048, 0xb45af340
+1,      38912,      38912,     1024,     2048, 0x1834f972
+1,      39936,      39936,     1024,     2048, 0xb5d206ae
+1,      40960,      40960,     1024,     2048, 0xc5760375
+1,      41984,      41984,     1024,     2048, 0x503800ce
+1,      43008,      43008,     1024,     2048, 0xa3bbf4af
+1,      44032,      44032,       68,      136, 0xc8d751c7
+0,          5,          5,        1,   230400, 0x223d134f
+1,      44100,      44100,     9600,    19200, 0x00000000
+0,          6,          6,        1,   230400, 0xbf1c3d34
+1,      53700,      53700,     9600,    19200, 0x00000000
+0,          7,          7,        1,   230400, 0xae0efe96
+1,      63300,      63300,     9600,    19200, 0x00000000
+0,          8,          8,        1,   230400, 0x0cd624d1
+1,      72900,      72900,     9600,    19200, 0x00000000
+0,          9,          9,        1,   230400, 0x6dedf2c0
+1,      82500,      82500,     5700,    11400, 0x00000000
+0,         10,         10,        1,   230400, 0x88c4d19a
+1,      88200,      88200,     1024,     2048, 0x283efb3a
+1,      89224,      89224,     1024,     2048, 0x7692fb8f
+1,      90248,      90248,     1024,     2048, 0xbaaafcc0
+1,      91272,      91272,     1024,     2048, 0xadc8017e
+1,      92296,      92296,     1024,     2048, 0x4f4dffdc
+1,      93320,      93320,     1024,     2048, 0x7ffbff48
+1,      94344,      94344,     1024,     2048, 0x2f990719
+1,      95368,      95368,     1024,     2048, 0xe2caf65c
+1,      96392,      96392,     1024,     2048, 0x825208e4
+0,         11,         11,        1,   230400, 0x0d77c977
+1,      97416,      97416,     1024,     2048, 0xf563f13b
+1,      98440,      98440,     1024,     2048, 0x855d03e9
+1,      99464,      99464,     1024,     2048, 0x0ba9fa4b
+1,     100488,     100488,     1024,     2048, 0x83e1fb92
+1,     101512,     101512,     1024,     2048, 0x1162f965
+1,     102536,     102536,     1024,     2048, 0x0cfef73d
+1,     103560,     103560,     1024,     2048, 0x5688ff75
+1,     104584,     104584,     1024,     2048, 0xf6c0ede9
+1,     105608,     105608,     1024,     2048, 0xfdb20602
+0,         12,         12,        1,   230400, 0x242629d7
+1,     106632,     106632,     1024,     2048, 0x40c5f17b
+1,     107656,     107656,     1024,     2048, 0x559600b1
+1,     108680,     108680,     1024,     2048, 0xccc3f930
+1,     109704,     109704,     1024,     2048, 0xdc800045
+1,     110728,     110728,     1024,     2048, 0xdce4fb3e
+1,     111752,     111752,     1024,     2048, 0x1e5efba9
+1,     112776,     112776,     1024,     2048, 0x8c2e0832
+1,     113800,     113800,     1024,     2048, 0x5c42f66d
+0,         13,         13,        1,   230400, 0x62cdc018
+1,     114824,     114824,     1024,     2048, 0x08e20b1e
+1,     115848,     115848,     1024,     2048, 0x4cf7f903
+1,     116872,     116872,     1024,     2048, 0xe6b90794
+1,     117896,     117896,     1024,     2048, 0x5956f8e6
+1,     118920,     118920,     1024,     2048, 0x6632ff16
+1,     119944,     119944,     1024,     2048, 0x46c8fe11
+1,     120968,     120968,     1024,     2048, 0x7431f732
+1,     121992,     121992,     1024,     2048, 0xa258049f
+1,     123016,     123016,     1024,     2048, 0xdb71f00e
+0,         14,         14,        1,   230400, 0x248ad058
+1,     124040,     124040,     1024,     2048, 0xa89b0359
+1,     125064,     125064,     1024,     2048, 0xe0aff0f2
+1,     126088,     126088,     1024,     2048, 0xc33e0085
+1,     127112,     127112,     1024,     2048, 0x9d09f379
+1,     128136,     128136,     1024,     2048, 0x8c78fd06
+1,     129160,     129160,     1024,     2048, 0x532bfbdd
+1,     130184,     130184,     1024,     2048, 0xfc36f5cd
+1,     131208,     131208,     1024,     2048, 0x2e8f0699
+1,     132232,     132232,     1024,     2048, 0x52382578
+1,     133256,     133256,     1024,     2048, 0x97ed1a28
+1,     134280,     134280,     1024,     2048, 0xabcdf73f
+1,     135304,     135304,     1024,     2048, 0x3a24082c
+1,     136328,     136328,     1024,     2048, 0xbe1cfc3d
+1,     137352,     137352,     1024,     2048, 0xad5800a5
+1,     138376,     138376,     1024,     2048, 0x90b80522
+1,     139400,     139400,     1024,     2048, 0x1fa1f912
+1,     140424,     140424,     1024,     2048, 0x733a0878
+1,     141448,     141448,     1024,     2048, 0x9a3eee47
+1,     142472,     142472,     1024,     2048, 0x5d900759
+1,     143496,     143496,     1024,     2048, 0x1287f540
+1,     144520,     144520,     1024,     2048, 0x941cfe5d
+1,     145544,     145544,     1024,     2048, 0x1587f8a9
+1,     146568,     146568,     1024,     2048, 0xb9e7f888
+1,     147592,     147592,     1024,     2048, 0xe9defbe2
+1,     148616,     148616,     1024,     2048, 0x3a5ef312
+1,     149640,     149640,     1024,     2048, 0xdcbe0544
+1,     150664,     150664,     1024,     2048, 0xbe51ecc5
+1,     151688,     151688,     1024,     2048, 0x21a60721
+1,     152712,     152712,     1024,     2048, 0xf29ff318
+1,     153736,     153736,     1024,     2048, 0xcd4c02ea
+1,     154760,     154760,     1024,     2048, 0xa424faac
+1,     155784,     155784,     1024,     2048, 0xbaedfdab
+1,     156808,     156808,     1024,     2048, 0xcbff047c
+1,     157832,     157832,     1024,     2048, 0x9ac8f96b
+1,     158856,     158856,     1024,     2048, 0x43220bee
+1,     159880,     159880,     1024,     2048, 0x547bf351
+1,     160904,     160904,     1024,     2048, 0x7dd10d6e
+1,     161928,     161928,     1024,     2048, 0x77cbf603
+1,     162952,     162952,     1024,     2048, 0xb6fcff50
+1,     163976,     163976,     1024,     2048, 0x927bfde5
+1,     165000,     165000,     1024,     2048, 0x5bd0fca5
+1,     166024,     166024,     1024,     2048, 0x672cff2a
+1,     167048,     167048,     1024,     2048, 0x3e3ef01c
+1,     168072,     168072,     1024,     2048, 0xe52607af
+1,     169096,     169096,     1024,     2048, 0x66bceaf5
+1,     170120,     170120,     1024,     2048, 0xe065046b
+1,     171144,     171144,     1024,     2048, 0x350bf21f
+1,     172168,     172168,     1024,     2048, 0x60b1fca4
+1,     173192,     173192,     1024,     2048, 0x8b1efa55
+1,     174216,     174216,     1024,     2048, 0xf86ff855
+1,     175240,     175240,     1024,     2048, 0x6934061b
+1,     176264,     176264,      136,      272, 0x4a458a45
+0,         20,         20,        1,   230400, 0x88c4d19a
+1,     176400,     176400,     1024,     2048, 0xdb0cfe95
+1,     177424,     177424,     1024,     2048, 0xcff3fdf1
+1,     178448,     178448,     1024,     2048, 0x070cf585
+1,     179472,     179472,     1024,     2048, 0xe9b8007f
+1,     180496,     180496,     1024,     2048, 0xc51ffd64
+1,     181520,     181520,     1024,     2048, 0xede2fbf9
+1,     182544,     182544,     1024,     2048, 0x51510410
+1,     183568,     183568,     1024,     2048, 0x198af498
+1,     184592,     184592,     1024,     2048, 0xae3603a2
+0,         21,         21,        1,   230400, 0x0d77c977
+1,     185616,     185616,     1024,     2048, 0x6200f7a1
+1,     186640,     186640,     1024,     2048, 0xe6e3fe32
+1,     187664,     187664,     1024,     2048, 0xb2e2fd77
+1,     188688,     188688,     1024,     2048, 0x063dff2f
+1,     189712,     189712,     1024,     2048, 0xa89ffe21
+1,     190736,     190736,     1024,     2048, 0x9e6ffa6d
+1,     191760,     191760,     1024,     2048, 0x028b004e
+1,     192784,     192784,     1024,     2048, 0x57edfa23
+1,     193808,     193808,     1024,     2048, 0x6d8efe1f
+0,         22,         22,        1,   230400, 0x242629d7
+1,     194832,     194832,     1024,     2048, 0x774bfe54
+1,     195856,     195856,     1024,     2048, 0xa931fcfb
+1,     196880,     196880,     1024,     2048, 0x3505004b
+1,     197904,     197904,     1024,     2048, 0x5001f576
+1,     198928,     198928,     1024,     2048, 0x78ea049b
+1,     199952,     199952,     1024,     2048, 0xd45bf733
+1,     200976,     200976,     1024,     2048, 0x6395fead
+1,     202000,     202000,     1024,     2048, 0xc126015e
+0,         23,         23,        1,   230400, 0x62cdc018
+1,     203024,     203024,     1024,     2048, 0xbecff8aa
+1,     204048,     204048,     1024,     2048, 0x0fea06c3
+1,     205072,     205072,     1024,     2048, 0xdea6f351
+1,     206096,     206096,     1024,     2048, 0x35b808f0
+1,     207120,     207120,     1024,     2048, 0x5487ee73
+1,     208144,     208144,     1024,     2048, 0xac69050e
+1,     209168,     209168,     1024,     2048, 0xcc5ffb00
+1,     210192,     210192,     1024,     2048, 0x328c00cb
+1,     211216,     211216,     1024,     2048, 0xa707fd82
+0,         24,         24,        1,   230400, 0x248ad058
+1,     212240,     212240,     1024,     2048, 0xe442f73d
+1,     213264,     213264,     1024,     2048, 0x545c0418
+1,     214288,     214288,     1024,     2048, 0x744ff3f7
+1,     215312,     215312,     1024,     2048, 0x01aa04fd
+1,     216336,     216336,     1024,     2048, 0xa885f7cd
+1,     217360,     217360,     1024,     2048, 0xcfca04f4
+1,     218384,     218384,     1024,     2048, 0x67fdf91b
+1,     219408,     219408,     1024,     2048, 0xce2b001d
+1,     220432,     220432,       68,      136, 0x33e64a0d
diff --git a/tests/ref/fate/filter-crop b/tests/ref/fate/filter-crop
index b226c96b6b..e48461ea6f 100644
--- a/tests/ref/fate/filter-crop
+++ b/tests/ref/fate/filter-crop
@@ -1 +1 @@
-crop                f3a9421392a9aa71a974c1b933c8d6ee
+crop                59c225f4cdab05af984dd259f10be762
diff --git a/tests/ref/fate/filter-crop_scale b/tests/ref/fate/filter-crop_scale
index b80a83fa75..9bc7de7ac4 100644
--- a/tests/ref/fate/filter-crop_scale
+++ b/tests/ref/fate/filter-crop_scale
@@ -1 +1 @@
-crop_scale          fe197338c0cb626766cb04f7d46fcc44
+crop_scale          728fa480f1b959cddd3f83c92d8719c4
diff --git a/tests/ref/fate/filter-crop_scale_vflip b/tests/ref/fate/filter-crop_scale_vflip
index b1eba7ecf4..36874db953 100644
--- a/tests/ref/fate/filter-crop_scale_vflip
+++ b/tests/ref/fate/filter-crop_scale_vflip
@@ -1 +1 @@
-crop_scale_vflip    1e456de396706899f3dca38ef2b43777
+crop_scale_vflip    d6a0bb35b159aa6787add0082088a59f
diff --git a/tests/ref/fate/filter-crop_vflip b/tests/ref/fate/filter-crop_vflip
index 56aa383906..2f6a32019d 100644
--- a/tests/ref/fate/filter-crop_vflip
+++ b/tests/ref/fate/filter-crop_vflip
@@ -1 +1 @@
-crop_vflip          2527b0a2a7b4a6a732fd0e0f07b9bb74
+crop_vflip          0652fe087e7a0cc110c3a876543b8662
diff --git a/tests/ref/fate/filter-curves b/tests/ref/fate/filter-curves
new file mode 100644
index 0000000000..401bd2eaf9
--- /dev/null
+++ b/tests/ref/fate/filter-curves
@@ -0,0 +1,10 @@
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+0,          0,          0,        1,   921600, 0xcf426780
+0,          1,          1,        1,   921600, 0x7642892d
+0,          2,          2,        1,   921600, 0x13c1ab7e
+0,          3,          3,        1,   921600, 0x3eca04bf
+0,          4,          4,        1,   921600, 0x61539162
diff --git a/tests/ref/fate/filter-dcshift b/tests/ref/fate/filter-dcshift
new file mode 100644
index 0000000000..dad3df3ff0
--- /dev/null
+++ b/tests/ref/fate/filter-dcshift
@@ -0,0 +1,26 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x96868842
+0,       1024,       1024,     1024,     4096, 0xeff98700
+0,       2048,       2048,     1024,     4096, 0x6ea28e1e
+0,       3072,       3072,     1024,     4096, 0x67b982be
+0,       4096,       4096,     1024,     4096, 0xd08a8302
+0,       5120,       5120,     1024,     4096, 0xfdf891dc
+0,       6144,       6144,     1024,     4096, 0xbec4784a
+0,       7168,       7168,     1024,     4096, 0x04ca910a
+0,       8192,       8192,     1024,     4096, 0xe4af87d0
+0,       9216,       9216,     1024,     4096, 0xc7f18c66
+0,      10240,      10240,     1024,     4096, 0x6448732a
+0,      11264,      11264,     1024,     4096, 0x98b89706
+0,      12288,      12288,     1024,     4096, 0xf47887f4
+0,      13312,      13312,     1024,     4096, 0x387290d2
+0,      14336,      14336,     1024,     4096, 0xc5716e84
+0,      15360,      15360,     1024,     4096, 0x94de8aa8
+0,      16384,      16384,     1024,     4096, 0x3a618d88
+0,      17408,      17408,     1024,     4096, 0xfeb56ec2
+0,      18432,      18432,     1024,     4096, 0x55fe8fb6
+0,      19456,      19456,     1024,     4096, 0x8ff788fa
diff --git a/tests/ref/fate/filter-delogo b/tests/ref/fate/filter-delogo
index 1a1f4970da..0e59f82221 100644
--- a/tests/ref/fate/filter-delogo
+++ b/tests/ref/fate/filter-delogo
@@ -1,110 +1,114 @@
-#tb 0: 1/1000
-0,          1,          1,        0,   126720, 0x689de87e
-0,         33,         33,        0,   126720, 0x3db9e91c
-0,         66,         66,        0,   126720, 0x3db9e91c
-0,        100,        100,        0,   126720, 0x3db9e91c
-0,        133,        133,        0,   126720, 0xfa6ae95e
-0,        166,        166,        0,   126720, 0x5bcbf0e6
-0,        200,        200,        0,   126720, 0x94a0f126
-0,        233,        233,        0,   126720, 0x0250f106
-0,        266,        266,        0,   126720, 0xcf6ab4bc
-0,        300,        300,        0,   126720, 0x429eb57c
-0,        333,        333,        0,   126720, 0x3bf0b5bc
-0,        367,        367,        0,   126720, 0xcaedb591
-0,        400,        400,        0,   126720, 0xa492b5ec
-0,        433,        433,        0,   126720, 0x2431b85c
-0,        467,        467,        0,   126720, 0x8283b8dc
-0,        500,        500,        0,   126720, 0xd71bb871
-0,        533,        533,        0,   126720, 0x698eb5cc
-0,        567,        567,        0,   126720, 0x4719aa98
-0,        600,        600,        0,   126720, 0x9ca1962c
-0,        633,        633,        0,   126720, 0x18cda460
-0,        667,        667,        0,   126720, 0xc230b716
-0,        700,        700,        0,   126720, 0x8451a4e2
-0,        734,        734,        0,   126720, 0x59e9a7ea
-0,        767,        767,        0,   126720, 0xc77ca73d
-0,        800,        800,        0,   126720, 0x725fb976
-0,        834,        834,        0,   126720, 0xb30da3b3
-0,        867,        867,        0,   126720, 0x7af2ea86
-0,        900,        900,        0,   126720, 0x40d4b4eb
-0,        934,        934,        0,   126720, 0x49d00307
-0,        967,        967,        0,   126720, 0x0654849c
-0,       1000,       1000,        0,   126720, 0xe46d0107
-0,       1034,       1034,        0,   126720, 0xa483b963
-0,       1067,       1067,        0,   126720, 0xd0e903f0
-0,       1101,       1101,        0,   126720, 0x964ed592
-0,       1134,       1134,        0,   126720, 0x23fbdb3c
-0,       1167,       1167,        0,   126720, 0x59fdace5
-0,       1201,       1201,        0,   126720, 0xb1e37954
-0,       1234,       1234,        0,   126720, 0x8ed9c554
-0,       1267,       1267,        0,   126720, 0xe3c4b39f
-0,       1301,       1301,        0,   126720, 0xfd17e0ce
-0,       1334,       1334,        0,   126720, 0xf26e1dcc
-0,       1368,       1368,        0,   126720, 0x13cc783c
-0,       1401,       1401,        0,   126720, 0x47ad47a1
-0,       1434,       1434,        0,   126720, 0x427c8b0d
-0,       1468,       1468,        0,   126720, 0x59d99901
-0,       1501,       1501,        0,   126720, 0xc40707da
-0,       1534,       1534,        0,   126720, 0xcd060dce
-0,       1568,       1568,        0,   126720, 0xed4024f6
-0,       1601,       1601,        0,   126720, 0x7decd2b4
-0,       1634,       1634,        0,   126720, 0xd1d2e730
-0,       1668,       1668,        0,   126720, 0x77cee457
-0,       1701,       1701,        0,   126720, 0xe78d02c0
-0,       1735,       1735,        0,   126720, 0xad0beb29
-0,       1768,       1768,        0,   126720, 0xc414eea2
-0,       1801,       1801,        0,   126720, 0x6a15f17d
-0,       1835,       1835,        0,   126720, 0x516027f6
-0,       1868,       1868,        0,   126720, 0x4eda9dce
-0,       1901,       1901,        0,   126720, 0x7d9bdba3
-0,       1935,       1935,        0,   126720, 0x7aa3d5c0
-0,       1968,       1968,        0,   126720, 0x7c7a04f9
-0,       2001,       2001,        0,   126720, 0x3e8fb6cc
-0,       2035,       2035,        0,   126720, 0xd5474916
-0,       2068,       2068,        0,   126720, 0xf3f62bab
-0,       2102,       2102,        0,   126720, 0x2f054987
-0,       2135,       2135,        0,   126720, 0x974c2e81
-0,       2168,       2168,        0,   126720, 0xe7e28a97
-0,       2202,       2202,        0,   126720, 0x45e38b41
-0,       2235,       2235,        0,   126720, 0x169c7f19
-0,       2268,       2268,        0,   126720, 0x91d90ee8
-0,       2302,       2302,        0,   126720, 0xdd653e24
-0,       2335,       2335,        0,   126720, 0x0da598c4
-0,       2369,       2369,        0,   126720, 0x687e62cc
-0,       2402,       2402,        0,   126720, 0x7631232d
-0,       2435,       2435,        0,   126720, 0xbd1ea826
-0,       2469,       2469,        0,   126720, 0xb55f7f4b
-0,       2502,       2502,        0,   126720, 0x923f3fc9
-0,       2535,       2535,        0,   126720, 0x15515301
-0,       2569,       2569,        0,   126720, 0x9ee066e5
-0,       2602,       2602,        0,   126720, 0x7c21664b
-0,       2635,       2635,        0,   126720, 0x36849100
-0,       2669,       2669,        0,   126720, 0x08b1f61a
-0,       2702,       2702,        0,   126720, 0x5bfca6e2
-0,       2736,       2736,        0,   126720, 0x929f60e3
-0,       2769,       2769,        0,   126720, 0xa2b55c29
-0,       2802,       2802,        0,   126720, 0x68bd3ff3
-0,       2836,       2836,        0,   126720, 0x30db5b29
-0,       2869,       2869,        0,   126720, 0x00578f9b
-0,       2902,       2902,        0,   126720, 0x18368642
-0,       2936,       2936,        0,   126720, 0xbcb83a80
-0,       2969,       2969,        0,   126720, 0x90f36b72
-0,       3002,       3002,        0,   126720, 0x85e46522
-0,       3036,       3036,        0,   126720, 0x2429660a
-0,       3069,       3069,        0,   126720, 0xf283dfe2
-0,       3103,       3103,        0,   126720, 0x896b27dc
-0,       3136,       3136,        0,   126720, 0x5af4f961
-0,       3169,       3169,        0,   126720, 0x31897085
-0,       3203,       3203,        0,   126720, 0x441ce33e
-0,       3236,       3236,        0,   126720, 0x903f8009
-0,       3269,       3269,        0,   126720, 0xbdf33dba
-0,       3303,       3303,        0,   126720, 0x8a364f36
-0,       3336,       3336,        0,   126720, 0xda5513f6
-0,       3370,       3370,        0,   126720, 0xd60012b3
-0,       3403,       3403,        0,   126720, 0x67bce7be
-0,       3436,       3436,        0,   126720, 0x697e6174
-0,       3470,       3470,        0,   126720, 0xbe3e3e90
-0,       3503,       3503,        0,   126720, 0xf3e4bba6
-0,       3536,       3536,        0,   126720, 0x8124a679
-0,       3570,       3570,        0,   126720, 0x58d1acde
-0,       3603,       3603,        0,   126720, 0xd8a15ba3
+#tb 0: 32768/982057
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x240
+#sar 0: 0/1
+0,          0,          0,        1,   126720, 0xcefaec47
+0,          1,          1,        1,   126720, 0xa416ece5
+0,          2,          2,        1,   126720, 0xa416ece5
+0,          3,          3,        1,   126720, 0xa416ece5
+0,          4,          4,        1,   126720, 0x60d6ed27
+0,          5,          5,        1,   126720, 0x259af497
+0,          6,          6,        1,   126720, 0x5e6ff4d7
+0,          7,          7,        1,   126720, 0xcc10f4b7
+0,          8,          8,        1,   126720, 0x2811b819
+0,          9,          9,        1,   126720, 0x9b36b8d9
+0,         10,         10,        1,   126720, 0x9488b919
+0,         11,         11,        1,   126720, 0x316cb902
+0,         12,         12,        1,   126720, 0xfd2ab949
+0,         13,         13,        1,   126720, 0x7cc9bbb9
+0,         14,         14,        1,   126720, 0xdb1bbc39
+0,         15,         15,        1,   126720, 0x3d9abbe2
+0,         16,         16,        1,   126720, 0xc226b929
+0,         17,         17,        1,   126720, 0x3623ae2e
+0,         18,         18,        1,   126720, 0x8aff9a0d
+0,         19,         19,        1,   126720, 0x7c85a832
+0,         20,         20,        1,   126720, 0xbe2fba7e
+0,         21,         21,        1,   126720, 0xb4eea89c
+0,         22,         22,        1,   126720, 0x2ce0ab91
+0,         23,         23,        1,   126720, 0x5808aace
+0,         24,         24,        1,   126720, 0x6e5ebcde
+0,         25,         25,        1,   126720, 0x9202a769
+0,         26,         26,        1,   126720, 0x7df4eed2
+0,         27,         27,        1,   126720, 0x4763b8e7
+0,         28,         28,        1,   126720, 0x06970809
+0,         29,         29,        1,   126720, 0xf30189d0
+0,         30,         30,        1,   126720, 0x4a6b05c1
+0,         31,         31,        1,   126720, 0x5caebf3d
+0,         32,         32,        1,   126720, 0x640d08d4
+0,         33,         33,        1,   126720, 0x4b72d969
+0,         34,         34,        1,   126720, 0xbfe8df9d
+0,         35,         35,        1,   126720, 0xfc26b0f5
+0,         36,         36,        1,   126720, 0x142b7c58
+0,         37,         37,        1,   126720, 0x1b5dba4c
+0,         38,         38,        1,   126720, 0x5fcea883
+0,         39,         39,        1,   126720, 0xd9f7d365
+0,         40,         40,        1,   126720, 0xb8a300aa
+0,         41,         41,        1,   126720, 0x675650a6
+0,         42,         42,        1,   126720, 0xf06d2016
+0,         43,         43,        1,   126720, 0x4ee56425
+0,         44,         44,        1,   126720, 0x98ec6723
+0,         45,         45,        1,   126720, 0x80d4cb5b
+0,         46,         46,        1,   126720, 0x8d1cd091
+0,         47,         47,        1,   126720, 0xaca8e9fe
+0,         48,         48,        1,   126720, 0x1ae18b52
+0,         49,         49,        1,   126720, 0xe53d997a
+0,         50,         50,        1,   126720, 0xcb4b8ff3
+0,         51,         51,        1,   126720, 0x9682b249
+0,         52,         52,        1,   126720, 0xf4e19918
+0,         53,         53,        1,   126720, 0x28849c20
+0,         54,         54,        1,   126720, 0xe4b89dda
+0,         55,         55,        1,   126720, 0xe981d407
+0,         56,         56,        1,   126720, 0x73ad4998
+0,         57,         57,        1,   126720, 0x346387bd
+0,         58,         58,        1,   126720, 0xa07c822f
+0,         59,         59,        1,   126720, 0xd911b08b
+0,         60,         60,        1,   126720, 0x7a1b6161
+0,         61,         61,        1,   126720, 0xa451f33f
+0,         62,         62,        1,   126720, 0xb9aed79d
+0,         63,         63,        1,   126720, 0x50c6f4e5
+0,         64,         64,        1,   126720, 0x6ed9d8e3
+0,         65,         65,        1,   126720, 0xea6d352a
+0,         66,         66,        1,   126720, 0xb8f4373b
+0,         67,         67,        1,   126720, 0xf5a52e4c
+0,         68,         68,        1,   126720, 0xf8dbbd01
+0,         69,         69,        1,   126720, 0x7395ec3c
+0,         70,         70,        1,   126720, 0x1249470b
+0,         71,         71,        1,   126720, 0xf12a1105
+0,         72,         72,        1,   126720, 0xef38d2ba
+0,         73,         73,        1,   126720, 0xa1325a34
+0,         74,         74,        1,   126720, 0xc38232b1
+0,         75,         75,        1,   126720, 0x08f9f498
+0,         76,         76,        1,   126720, 0xf6f208c5
+0,         77,         77,        1,   126720, 0x694b1fed
+0,         78,         78,        1,   126720, 0xac811fc2
+0,         79,         79,        1,   126720, 0x2f2b4903
+0,         80,         80,        1,   126720, 0x4a4aad01
+0,         81,         81,        1,   126720, 0xce4557e3
+0,         82,         82,        1,   126720, 0x257a1145
+0,         83,         83,        1,   126720, 0x94580be2
+0,         84,         84,        1,   126720, 0x2422ee8a
+0,         85,         85,        1,   126720, 0x801905b7
+0,         86,         86,        1,   126720, 0x4de639ba
+0,         87,         87,        1,   126720, 0x24d22fa8
+0,         88,         88,        1,   126720, 0xbb38e309
+0,         89,         89,        1,   126720, 0xb8ec150d
+0,         90,         90,        1,   126720, 0xc9fb0eb7
+0,         91,         91,        1,   126720, 0xb6e40f48
+0,         92,         92,        1,   126720, 0xd7028922
+0,         93,         93,        1,   126720, 0x3a24d332
+0,         94,         94,        1,   126720, 0x06b2a598
+0,         95,         95,        1,   126720, 0xf2041a92
+0,         96,         96,        1,   126720, 0xc58a8d10
+0,         97,         97,        1,   126720, 0x0d99293d
+0,         98,         98,        1,   126720, 0x7b72e768
+0,         99,         99,        1,   126720, 0x0c62f900
+0,        100,        100,        1,   126720, 0xcdb7bc31
+0,        101,        101,        1,   126720, 0x04d3bdc2
+0,        102,        102,        1,   126720, 0x0355928e
+0,        103,        103,        1,   126720, 0x84310d32
+0,        104,        104,        1,   126720, 0xc202ebe6
+0,        105,        105,        1,   126720, 0x0cf2703a
+0,        106,        106,        1,   126720, 0xe4c95979
+0,        107,        107,        1,   126720, 0x4f846144
+0,        108,        108,        1,   126720, 0x3f1a17a4
diff --git a/tests/ref/fate/filter-drawbox b/tests/ref/fate/filter-drawbox
index 869b9f32b0..8ffd381cd5 100644
--- a/tests/ref/fate/filter-drawbox
+++ b/tests/ref/fate/filter-drawbox
@@ -1,51 +1,55 @@
 #tb 0: 1/25
-0,          0,          0,        1,   152064, 0x7eee5ca3
-0,          1,          1,        1,   152064, 0x61125759
-0,          2,          2,        1,   152064, 0x2a64f47f
-0,          3,          3,        1,   152064, 0xc1089594
-0,          4,          4,        1,   152064, 0xd9e18830
-0,          5,          5,        1,   152064, 0xeb135e03
-0,          6,          6,        1,   152064, 0x6a5b40d7
-0,          7,          7,        1,   152064, 0x0a356a16
-0,          8,          8,        1,   152064, 0xfc1d7858
-0,          9,          9,        1,   152064, 0xa04bfeb8
-0,         10,         10,        1,   152064, 0x2d952ef0
-0,         11,         11,        1,   152064, 0x7f360233
-0,         12,         12,        1,   152064, 0xdd2bd142
-0,         13,         13,        1,   152064, 0xd231ad4a
-0,         14,         14,        1,   152064, 0x0543400e
-0,         15,         15,        1,   152064, 0x8252be2b
-0,         16,         16,        1,   152064, 0xd9f702be
-0,         17,         17,        1,   152064, 0xed5cf787
-0,         18,         18,        1,   152064, 0xf9472f8e
-0,         19,         19,        1,   152064, 0x89e4a60b
-0,         20,         20,        1,   152064, 0x1f12c1f5
-0,         21,         21,        1,   152064, 0x76eaf390
-0,         22,         22,        1,   152064, 0x60b5eba3
-0,         23,         23,        1,   152064, 0xf09e348c
-0,         24,         24,        1,   152064, 0x1afabf8a
-0,         25,         25,        1,   152064, 0xd16c558e
-0,         26,         26,        1,   152064, 0x78634796
-0,         27,         27,        1,   152064, 0xcd13b1e3
-0,         28,         28,        1,   152064, 0x59c2c6e5
-0,         29,         29,        1,   152064, 0x265e6beb
-0,         30,         30,        1,   152064, 0x82c656af
-0,         31,         31,        1,   152064, 0x919e923c
-0,         32,         32,        1,   152064, 0xc428fc15
-0,         33,         33,        1,   152064, 0x488760cd
-0,         34,         34,        1,   152064, 0x0a080c93
-0,         35,         35,        1,   152064, 0xaab649e6
-0,         36,         36,        1,   152064, 0x9b34edaa
-0,         37,         37,        1,   152064, 0x44e12816
-0,         38,         38,        1,   152064, 0x03777927
-0,         39,         39,        1,   152064, 0x6644573e
-0,         40,         40,        1,   152064, 0x18574df7
-0,         41,         41,        1,   152064, 0x5dce82f6
-0,         42,         42,        1,   152064, 0xb8be9205
-0,         43,         43,        1,   152064, 0xb927eacb
-0,         44,         44,        1,   152064, 0x303ec874
-0,         45,         45,        1,   152064, 0x05eb3c6f
-0,         46,         46,        1,   152064, 0x74a614d6
-0,         47,         47,        1,   152064, 0x6d078969
-0,         48,         48,        1,   152064, 0xe57a7ae0
-0,         49,         49,        1,   152064, 0xd6fca9ec
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x9ada9be9
+0,          1,          1,        1,   152064, 0xb0ec7d59
+0,          2,          2,        1,   152064, 0x938816b8
+0,          3,          3,        1,   152064, 0x1d8fac2e
+0,          4,          4,        1,   152064, 0x8ed4bbf6
+0,          5,          5,        1,   152064, 0xc9e585de
+0,          6,          6,        1,   152064, 0xf1e83c0b
+0,          7,          7,        1,   152064, 0xed0e5981
+0,          8,          8,        1,   152064, 0x6fc55e8c
+0,          9,          9,        1,   152064, 0xcf3e2eb5
+0,         10,         10,        1,   152064, 0xe62d4dcf
+0,         11,         11,        1,   152064, 0xd30712cd
+0,         12,         12,        1,   152064, 0xcb99d3e8
+0,         13,         13,        1,   152064, 0x6b9cb3ed
+0,         14,         14,        1,   152064, 0xb96774c1
+0,         15,         15,        1,   152064, 0xfae0f615
+0,         16,         16,        1,   152064, 0xeb211f65
+0,         17,         17,        1,   152064, 0xc9f7ff9f
+0,         18,         18,        1,   152064, 0xe5bc2b7f
+0,         19,         19,        1,   152064, 0x8f82a022
+0,         20,         20,        1,   152064, 0xb8e5bb92
+0,         21,         21,        1,   152064, 0x051aeb1a
+0,         22,         22,        1,   152064, 0x5b3ce556
+0,         23,         23,        1,   152064, 0xda552e9c
+0,         24,         24,        1,   152064, 0x865ebca1
+0,         25,         25,        1,   152064, 0xd77b6d16
+0,         26,         26,        1,   152064, 0xcf7e89d8
+0,         27,         27,        1,   152064, 0xe340d477
+0,         28,         28,        1,   152064, 0x8167c0e4
+0,         29,         29,        1,   152064, 0xa6af7555
+0,         30,         30,        1,   152064, 0x305a6def
+0,         31,         31,        1,   152064, 0xf395b657
+0,         32,         32,        1,   152064, 0x6f6bdfdc
+0,         33,         33,        1,   152064, 0x976c50ff
+0,         34,         34,        1,   152064, 0x89661e9d
+0,         35,         35,        1,   152064, 0x001760a0
+0,         36,         36,        1,   152064, 0x7ac624ba
+0,         37,         37,        1,   152064, 0x40941960
+0,         38,         38,        1,   152064, 0x89917c8a
+0,         39,         39,        1,   152064, 0xcf4667e5
+0,         40,         40,        1,   152064, 0x985f6670
+0,         41,         41,        1,   152064, 0x5368a016
+0,         42,         42,        1,   152064, 0x2f04b620
+0,         43,         43,        1,   152064, 0x637f1129
+0,         44,         44,        1,   152064, 0x4b41f131
+0,         45,         45,        1,   152064, 0x6e786dea
+0,         46,         46,        1,   152064, 0xeafa55b3
+0,         47,         47,        1,   152064, 0xfdf2d102
+0,         48,         48,        1,   152064, 0x127abdfa
+0,         49,         49,        1,   152064, 0x0e4ae6c7
diff --git a/tests/ref/fate/filter-earwax b/tests/ref/fate/filter-earwax
new file mode 100644
index 0000000000..855f579cac
--- /dev/null
+++ b/tests/ref/fate/filter-earwax
@@ -0,0 +1,26 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x900af751
+0,       1024,       1024,     1024,     4096, 0xad570065
+0,       2048,       2048,     1024,     4096, 0x93d5f494
+0,       3072,       3072,     1024,     4096, 0x2c65ef7d
+0,       4096,       4096,     1024,     4096, 0xdc8af6d2
+0,       5120,       5120,     1024,     4096, 0x7ae00249
+0,       6144,       6144,     1024,     4096, 0xaab5fdd0
+0,       7168,       7168,     1024,     4096, 0x4373ef39
+0,       8192,       8192,     1024,     4096, 0x0756eb43
+0,       9216,       9216,     1024,     4096, 0x494d06e0
+0,      10240,      10240,     1024,     4096, 0x4393ffae
+0,      11264,      11264,     1024,     4096, 0x6972f97e
+0,      12288,      12288,     1024,     4096, 0xb834ea05
+0,      13312,      13312,     1024,     4096, 0x39b8f871
+0,      14336,      14336,     1024,     4096, 0xf032fccd
+0,      15360,      15360,     1024,     4096, 0xefcd0709
+0,      16384,      16384,     1024,     4096, 0x0590ebc0
+0,      17408,      17408,     1024,     4096, 0x2e75f264
+0,      18432,      18432,     1024,     4096, 0xbea1fd03
+0,      19456,      19456,     1024,     4096, 0x9bbe0434
diff --git a/tests/ref/fate/filter-edgedetect b/tests/ref/fate/filter-edgedetect
new file mode 100644
index 0000000000..23c9953e61
--- /dev/null
+++ b/tests/ref/fate/filter-edgedetect
@@ -0,0 +1 @@
+edgedetect          93ceace33f6636bcdbeb037317c65745
diff --git a/tests/ref/fate/filter-edgedetect-colormix b/tests/ref/fate/filter-edgedetect-colormix
new file mode 100644
index 0000000000..e828c6bd19
--- /dev/null
+++ b/tests/ref/fate/filter-edgedetect-colormix
@@ -0,0 +1 @@
+edgedetect-colormix 1b8658252e2f03fbae30e6d63dd24c7c
diff --git a/tests/ref/fate/filter-extrastereo b/tests/ref/fate/filter-extrastereo
new file mode 100644
index 0000000000..179c167792
--- /dev/null
+++ b/tests/ref/fate/filter-extrastereo
@@ -0,0 +1,26 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x29e3eecf
+0,       1024,       1024,     1024,     4096, 0x18390b96
+0,       2048,       2048,     1024,     4096, 0xc477fa99
+0,       3072,       3072,     1024,     4096, 0x3bc0f14f
+0,       4096,       4096,     1024,     4096, 0x2379ed91
+0,       5120,       5120,     1024,     4096, 0xfd6a0070
+0,       6144,       6144,     1024,     4096, 0x0b01f4cf
+0,       7168,       7168,     1024,     4096, 0x6716fd93
+0,       8192,       8192,     1024,     4096, 0x1840f25b
+0,       9216,       9216,     1024,     4096, 0x9c1ffaf1
+0,      10240,      10240,     1024,     4096, 0xcbedefaf
+0,      11264,      11264,     1024,     4096, 0x3e050390
+0,      12288,      12288,     1024,     4096, 0xb30e0090
+0,      13312,      13312,     1024,     4096, 0x26b8f75b
+0,      14336,      14336,     1024,     4096, 0xd706e311
+0,      15360,      15360,     1024,     4096, 0x0c480138
+0,      16384,      16384,     1024,     4096, 0x6c9a0216
+0,      17408,      17408,     1024,     4096, 0x7abce54f
+0,      18432,      18432,     1024,     4096, 0xda45f63f
+0,      19456,      19456,     1024,     4096, 0x50d5ff87
diff --git a/tests/ref/fate/filter-fade b/tests/ref/fate/filter-fade
index 131b614b0c..2ba7671c1a 100644
--- a/tests/ref/fate/filter-fade
+++ b/tests/ref/fate/filter-fade
@@ -1,51 +1,55 @@
 #tb 0: 1/25
-0,          0,          0,        1,   152064, 0xeb8105cd
-0,          1,          1,        1,   152064, 0x0bc0a27d
-0,          2,          2,        1,   152064, 0x9dcd3a04
-0,          3,          3,        1,   152064, 0xecd9e8ec
-0,          4,          4,        1,   152064, 0xdcc09bca
-0,          5,          5,        1,   152064, 0xbf1537ad
-0,          6,          6,        1,   152064, 0xf32214db
-0,          7,          7,        1,   152064, 0x9584ce5e
-0,          8,          8,        1,   152064, 0xbaa930e7
-0,          9,          9,        1,   152064, 0xce411a6c
-0,         10,         10,        1,   152064, 0xdbc2c004
-0,         11,         11,        1,   152064, 0x635a55df
-0,         12,         12,        1,   152064, 0x49d5807f
-0,         13,         13,        1,   152064, 0xd18734a6
-0,         14,         14,        1,   152064, 0xf9d3581f
-0,         15,         15,        1,   152064, 0x423dbdf7
-0,         16,         16,        1,   152064, 0x0c52a4a2
-0,         17,         17,        1,   152064, 0xf7a6a90e
-0,         18,         18,        1,   152064, 0x472441c2
-0,         19,         19,        1,   152064, 0x9470c09a
-0,         20,         20,        1,   152064, 0xce7da1a3
-0,         21,         21,        1,   152064, 0xdb01a0c9
-0,         22,         22,        1,   152064, 0x052e74cb
-0,         23,         23,        1,   152064, 0xab0eab85
-0,         24,         24,        1,   152064, 0x069c1d15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xb4e6c735
+0,          1,          1,        1,   152064, 0xb4e6c735
+0,          2,          2,        1,   152064, 0xb4e6c735
+0,          3,          3,        1,   152064, 0xb4e6c735
+0,          4,          4,        1,   152064, 0xb4e6c735
+0,          5,          5,        1,   152064, 0xb4e6c735
+0,          6,          6,        1,   152064, 0x1f3b0657
+0,          7,          7,        1,   152064, 0x6e7547e6
+0,          8,          8,        1,   152064, 0x1197524c
+0,          9,          9,        1,   152064, 0xb4cdb293
+0,         10,         10,        1,   152064, 0xdd7cf1b8
+0,         11,         11,        1,   152064, 0x360b1005
+0,         12,         12,        1,   152064, 0x11a49918
+0,         13,         13,        1,   152064, 0xa10dd4f9
+0,         14,         14,        1,   152064, 0x78da71d7
+0,         15,         15,        1,   152064, 0x105e4cc0
+0,         16,         16,        1,   152064, 0x54bfa1c5
+0,         17,         17,        1,   152064, 0xd666559e
+0,         18,         18,        1,   152064, 0xd93faa1c
+0,         19,         19,        1,   152064, 0xb1af85ed
+0,         20,         20,        1,   152064, 0xfc7bf570
+0,         21,         21,        1,   152064, 0x9dc72412
+0,         22,         22,        1,   152064, 0x445d1d59
+0,         23,         23,        1,   152064, 0x2f2768ef
+0,         24,         24,        1,   152064, 0xce09f9d6
 0,         25,         25,        1,   152064, 0x95579936
-0,         26,         26,        1,   152064, 0x292dc6d4
-0,         27,         27,        1,   152064, 0x951d382d
-0,         28,         28,        1,   152064, 0x9ce23e7d
-0,         29,         29,        1,   152064, 0x5ceb17dd
-0,         30,         30,        1,   152064, 0xe0835003
-0,         31,         31,        1,   152064, 0x7b8a03ba
-0,         32,         32,        1,   152064, 0x1531b18c
-0,         33,         33,        1,   152064, 0xa4a2ee9a
-0,         34,         34,        1,   152064, 0xa5b0e442
-0,         35,         35,        1,   152064, 0x47e0554d
-0,         36,         36,        1,   152064, 0x9443792e
-0,         37,         37,        1,   152064, 0x1a3316ce
-0,         38,         38,        1,   152064, 0xbe8088d7
-0,         39,         39,        1,   152064, 0xd3013824
-0,         40,         40,        1,   152064, 0x342f2f5d
-0,         41,         41,        1,   152064, 0x638a816f
-0,         42,         42,        1,   152064, 0x0cf11a0f
-0,         43,         43,        1,   152064, 0xc4d87159
-0,         44,         44,        1,   152064, 0xa5c36b72
-0,         45,         45,        1,   152064, 0x17a9970d
-0,         46,         46,        1,   152064, 0x5479e51c
-0,         47,         47,        1,   152064, 0x2ae4382a
-0,         48,         48,        1,   152064, 0xab7097a6
-0,         49,         49,        1,   152064, 0xbc97d4bb
+0,         26,         26,        1,   152064, 0x43d796b5
+0,         27,         27,        1,   152064, 0xd780d887
+0,         28,         28,        1,   152064, 0x76d2a455
+0,         29,         29,        1,   152064, 0x6dc3650e
+0,         30,         30,        1,   152064, 0x0f9d6aca
+0,         31,         31,        1,   152064, 0xddae8141
+0,         32,         32,        1,   152064, 0x67cb8f24
+0,         33,         33,        1,   152064, 0xc7a72348
+0,         34,         34,        1,   152064, 0x0d7a1144
+0,         35,         35,        1,   152064, 0x39adfb3d
+0,         36,         36,        1,   152064, 0x0ecc70d5
+0,         37,         37,        1,   152064, 0xf3a6805e
+0,         38,         38,        1,   152064, 0xc3bd71ad
+0,         39,         39,        1,   152064, 0xa9be9730
+0,         40,         40,        1,   152064, 0xab9af790
+0,         41,         41,        1,   152064, 0x4c3ccd25
+0,         42,         42,        1,   152064, 0xbc83c58a
+0,         43,         43,        1,   152064, 0x94877df4
+0,         44,         44,        1,   152064, 0xa2360ea6
+0,         45,         45,        1,   152064, 0xb4e6c735
+0,         46,         46,        1,   152064, 0xb4e6c735
+0,         47,         47,        1,   152064, 0xb4e6c735
+0,         48,         48,        1,   152064, 0xb4e6c735
+0,         49,         49,        1,   152064, 0xb4e6c735
diff --git a/tests/ref/fate/filter-fieldorder b/tests/ref/fate/filter-fieldorder
index 6bb647a966..9a73e6edaf 100644
--- a/tests/ref/fate/filter-fieldorder
+++ b/tests/ref/fate/filter-fieldorder
@@ -1,4 +1,8 @@
 #tb 0: 2/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   202752, 0x789424b6
 0,          1,          1,        1,   202752, 0x7a1f47a9
 0,          2,          2,        1,   202752, 0xa55a9aba
diff --git a/tests/ref/fate/filter-formats b/tests/ref/fate/filter-formats
new file mode 100644
index 0000000000..ea85eed23d
--- /dev/null
+++ b/tests/ref/fate/filter-formats
@@ -0,0 +1,88 @@
+mono
+2 channels (FC+LFE)
+stereo
+2.1
+3.0
+3.1
+3 channels (FC+BL+BR)
+4 channels (FC+LFE+BL+BR)
+quad
+5 channels (FL+FR+LFE+BL+BR)
+5.0
+5.1
+2 channels (FC+BC)
+3 channels (FC+LFE+BC)
+3.0(back)
+4 channels (FL+FR+LFE+BC)
+4.0
+4.1
+3 channels (FC+SL+SR)
+4 channels (FC+LFE+SL+SR)
+quad(side)
+5 channels (FL+FR+LFE+SL+SR)
+5.0(side)
+5.1(side)
+5 channels (FC+BL+BR+SL+SR)
+6 channels (FC+LFE+BL+BR+SL+SR)
+6 channels (FL+FR+BL+BR+SL+SR)
+7 channels (FL+FR+LFE+BL+BR+SL+SR)
+7.0
+7.1
+4 channels (FC+BC+SL+SR)
+5 channels (FC+LFE+BC+SL+SR)
+5 channels (FL+FR+BC+SL+SR)
+6 channels (FL+FR+LFE+BC+SL+SR)
+6.0
+6.1
+3 channels (FC+DL+DR)
+4 channels (FC+LFE+DL+DR)
+4 channels (FL+FR+DL+DR)
+5 channels (FL+FR+LFE+DL+DR)
+5 channels (FL+FR+FC+DL+DR)
+6 channels (FL+FR+FC+LFE+DL+DR)
+5 channels (FC+BL+BR+DL+DR)
+6 channels (FC+LFE+BL+BR+DL+DR)
+6 channels (FL+FR+BL+BR+DL+DR)
+7 channels (FL+FR+LFE+BL+BR+DL+DR)
+7 channels (FL+FR+FC+BL+BR+DL+DR)
+8 channels (FL+FR+FC+LFE+BL+BR+DL+DR)
+4 channels (FC+BC+DL+DR)
+5 channels (FC+LFE+BC+DL+DR)
+5 channels (FL+FR+BC+DL+DR)
+6 channels (FL+FR+LFE+BC+DL+DR)
+6 channels (FL+FR+FC+BC+DL+DR)
+7 channels (FL+FR+FC+LFE+BC+DL+DR)
+5 channels (FC+SL+SR+DL+DR)
+6 channels (FC+LFE+SL+SR+DL+DR)
+6 channels (FL+FR+SL+SR+DL+DR)
+7 channels (FL+FR+LFE+SL+SR+DL+DR)
+7 channels (FL+FR+FC+SL+SR+DL+DR)
+8 channels (FL+FR+FC+LFE+SL+SR+DL+DR)
+7 channels (FC+BL+BR+SL+SR+DL+DR)
+8 channels (FC+LFE+BL+BR+SL+SR+DL+DR)
+8 channels (FL+FR+BL+BR+SL+SR+DL+DR)
+6 channels (FC+BC+SL+SR+DL+DR)
+7 channels (FC+LFE+BC+SL+SR+DL+DR)
+7 channels (FL+FR+BC+SL+SR+DL+DR)
+8 channels (FL+FR+LFE+BC+SL+SR+DL+DR)
+8 channels (FL+FR+FC+BC+SL+SR+DL+DR)
+-1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, blah);
+0 = ff_parse_channel_layout(0000000000000001,  1, 1);
+0 = ff_parse_channel_layout(0000000000000002,  1, 2);
+-1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, -1);
+0 = ff_parse_channel_layout(000000000000003C,  4, 60);
+0 = ff_parse_channel_layout(0000000000000041,  2, 65);
+0 = ff_parse_channel_layout(0000000000000004,  1, 1c);
+0 = ff_parse_channel_layout(0000000000000003,  2, 2c);
+-1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, -1c);
+0 = ff_parse_channel_layout(0000000000000000, 60, 60c);
+-1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, 65c);
+0 = ff_parse_channel_layout(0000000000000000,  2, 2C);
+0 = ff_parse_channel_layout(0000000000000000, 60, 60C);
+-1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, 65C);
+0 = ff_parse_channel_layout(000000000000003F,  6, 5.1);
+0 = ff_parse_channel_layout(0000000000000003,  2, stereo);
+0 = ff_parse_channel_layout(0000000000000001,  1, 1+1+1+1);
+0 = ff_parse_channel_layout(0000000000000004,  1, 1c+1c+1c+1c);
+0 = ff_parse_channel_layout(0000000000000007,  3, 2c+1c);
+0 = ff_parse_channel_layout(0000000000000003,  2, 0x3);
diff --git a/tests/ref/fate/filter-fps b/tests/ref/fate/filter-fps
new file mode 100644
index 0000000000..242fb04e85
--- /dev/null
+++ b/tests/ref/fate/filter-fps
@@ -0,0 +1,93 @@
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 112x182
+#sar 0: 0/1
+0,          0,          0,        1,    30576, 0xcdc29b3d
+0,          1,          1,        1,    30576, 0xcdc29b3d
+0,          2,          2,        1,    30576, 0xcdc29b3d
+0,          3,          3,        1,    30576, 0xcdc29b3d
+0,          4,          4,        1,    30576, 0xcdc29b3d
+0,          5,          5,        1,    30576, 0xcdc29b3d
+0,          6,          6,        1,    30576, 0x5c83656c
+0,          7,          7,        1,    30576, 0x5c83656c
+0,          8,          8,        1,    30576, 0x5c83656c
+0,          9,          9,        1,    30576, 0x5c83656c
+0,         10,         10,        1,    30576, 0x5c83656c
+0,         11,         11,        1,    30576, 0x5c83656c
+0,         12,         12,        1,    30576, 0x5c83656c
+0,         13,         13,        1,    30576, 0x26b67f83
+0,         14,         14,        1,    30576, 0x26b67f83
+0,         15,         15,        1,    30576, 0x26b67f83
+0,         16,         16,        1,    30576, 0x26b67f83
+0,         17,         17,        1,    30576, 0x26b67f83
+0,         18,         18,        1,    30576, 0x26b67f83
+0,         19,         19,        1,    30576, 0x26b67f83
+0,         20,         20,        1,    30576, 0x26b67f83
+0,         21,         21,        1,    30576, 0x26b67f83
+0,         22,         22,        1,    30576, 0x26b67f83
+0,         23,         23,        1,    30576, 0x26b67f83
+0,         24,         24,        1,    30576, 0x26b67f83
+0,         25,         25,        1,    30576, 0x26b67f83
+0,         26,         26,        1,    30576, 0x26b67f83
+0,         27,         27,        1,    30576, 0x26b67f83
+0,         28,         28,        1,    30576, 0x26b67f83
+0,         29,         29,        1,    30576, 0x26b67f83
+0,         30,         30,        1,    30576, 0x26b67f83
+0,         31,         31,        1,    30576, 0x26b67f83
+0,         32,         32,        1,    30576, 0x26b67f83
+0,         33,         33,        1,    30576, 0x26b67f83
+0,         34,         34,        1,    30576, 0x26b67f83
+0,         35,         35,        1,    30576, 0x26b67f83
+0,         36,         36,        1,    30576, 0x26b67f83
+0,         37,         37,        1,    30576, 0x26b67f83
+0,         38,         38,        1,    30576, 0x26b67f83
+0,         39,         39,        1,    30576, 0x26b67f83
+0,         40,         40,        1,    30576, 0x26b67f83
+0,         41,         41,        1,    30576, 0x26b67f83
+0,         42,         42,        1,    30576, 0x26b67f83
+0,         43,         43,        1,    30576, 0x26b67f83
+0,         44,         44,        1,    30576, 0x26b67f83
+0,         45,         45,        1,    30576, 0x26b67f83
+0,         46,         46,        1,    30576, 0x26b67f83
+0,         47,         47,        1,    30576, 0x26b67f83
+0,         48,         48,        1,    30576, 0x26b67f83
+0,         49,         49,        1,    30576, 0x26b67f83
+0,         50,         50,        1,    30576, 0x26b67f83
+0,         51,         51,        1,    30576, 0x26b67f83
+0,         52,         52,        1,    30576, 0x26b67f83
+0,         53,         53,        1,    30576, 0x26b67f83
+0,         54,         54,        1,    30576, 0x26b67f83
+0,         55,         55,        1,    30576, 0x26b67f83
+0,         56,         56,        1,    30576, 0x26b67f83
+0,         57,         57,        1,    30576, 0x26b67f83
+0,         58,         58,        1,    30576, 0x26b67f83
+0,         59,         59,        1,    30576, 0x26b67f83
+0,         60,         60,        1,    30576, 0x26b67f83
+0,         61,         61,        1,    30576, 0x26b67f83
+0,         62,         62,        1,    30576, 0x26b67f83
+0,         63,         63,        1,    30576, 0x26b67f83
+0,         64,         64,        1,    30576, 0x26b67f83
+0,         65,         65,        1,    30576, 0x26b67f83
+0,         66,         66,        1,    30576, 0x26b67f83
+0,         67,         67,        1,    30576, 0x26b67f83
+0,         68,         68,        1,    30576, 0x26b67f83
+0,         69,         69,        1,    30576, 0x26b67f83
+0,         70,         70,        1,    30576, 0x26b67f83
+0,         71,         71,        1,    30576, 0x26b67f83
+0,         72,         72,        1,    30576, 0x26b67f83
+0,         73,         73,        1,    30576, 0xa2fcd06f
+0,         74,         74,        1,    30576, 0xa2fcd06f
+0,         75,         75,        1,    30576, 0xa2fcd06f
+0,         76,         76,        1,    30576, 0xa2fcd06f
+0,         77,         77,        1,    30576, 0xa2fcd06f
+0,         78,         78,        1,    30576, 0xa2fcd06f
+0,         79,         79,        1,    30576, 0xa2fcd06f
+0,         80,         80,        1,    30576, 0xa2fcd06f
+0,         81,         81,        1,    30576, 0xd4150aad
+0,         82,         82,        1,    30576, 0xd4150aad
+0,         83,         83,        1,    30576, 0xd4150aad
+0,         84,         84,        1,    30576, 0xd4150aad
+0,         85,         85,        1,    30576, 0xd4150aad
+0,         86,         86,        1,    30576, 0xd4150aad
+0,         87,         87,        1,    30576, 0xd4150aad
diff --git a/tests/ref/fate/filter-fps-cfr b/tests/ref/fate/filter-fps-cfr
new file mode 100644
index 0000000000..242fb04e85
--- /dev/null
+++ b/tests/ref/fate/filter-fps-cfr
@@ -0,0 +1,93 @@
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 112x182
+#sar 0: 0/1
+0,          0,          0,        1,    30576, 0xcdc29b3d
+0,          1,          1,        1,    30576, 0xcdc29b3d
+0,          2,          2,        1,    30576, 0xcdc29b3d
+0,          3,          3,        1,    30576, 0xcdc29b3d
+0,          4,          4,        1,    30576, 0xcdc29b3d
+0,          5,          5,        1,    30576, 0xcdc29b3d
+0,          6,          6,        1,    30576, 0x5c83656c
+0,          7,          7,        1,    30576, 0x5c83656c
+0,          8,          8,        1,    30576, 0x5c83656c
+0,          9,          9,        1,    30576, 0x5c83656c
+0,         10,         10,        1,    30576, 0x5c83656c
+0,         11,         11,        1,    30576, 0x5c83656c
+0,         12,         12,        1,    30576, 0x5c83656c
+0,         13,         13,        1,    30576, 0x26b67f83
+0,         14,         14,        1,    30576, 0x26b67f83
+0,         15,         15,        1,    30576, 0x26b67f83
+0,         16,         16,        1,    30576, 0x26b67f83
+0,         17,         17,        1,    30576, 0x26b67f83
+0,         18,         18,        1,    30576, 0x26b67f83
+0,         19,         19,        1,    30576, 0x26b67f83
+0,         20,         20,        1,    30576, 0x26b67f83
+0,         21,         21,        1,    30576, 0x26b67f83
+0,         22,         22,        1,    30576, 0x26b67f83
+0,         23,         23,        1,    30576, 0x26b67f83
+0,         24,         24,        1,    30576, 0x26b67f83
+0,         25,         25,        1,    30576, 0x26b67f83
+0,         26,         26,        1,    30576, 0x26b67f83
+0,         27,         27,        1,    30576, 0x26b67f83
+0,         28,         28,        1,    30576, 0x26b67f83
+0,         29,         29,        1,    30576, 0x26b67f83
+0,         30,         30,        1,    30576, 0x26b67f83
+0,         31,         31,        1,    30576, 0x26b67f83
+0,         32,         32,        1,    30576, 0x26b67f83
+0,         33,         33,        1,    30576, 0x26b67f83
+0,         34,         34,        1,    30576, 0x26b67f83
+0,         35,         35,        1,    30576, 0x26b67f83
+0,         36,         36,        1,    30576, 0x26b67f83
+0,         37,         37,        1,    30576, 0x26b67f83
+0,         38,         38,        1,    30576, 0x26b67f83
+0,         39,         39,        1,    30576, 0x26b67f83
+0,         40,         40,        1,    30576, 0x26b67f83
+0,         41,         41,        1,    30576, 0x26b67f83
+0,         42,         42,        1,    30576, 0x26b67f83
+0,         43,         43,        1,    30576, 0x26b67f83
+0,         44,         44,        1,    30576, 0x26b67f83
+0,         45,         45,        1,    30576, 0x26b67f83
+0,         46,         46,        1,    30576, 0x26b67f83
+0,         47,         47,        1,    30576, 0x26b67f83
+0,         48,         48,        1,    30576, 0x26b67f83
+0,         49,         49,        1,    30576, 0x26b67f83
+0,         50,         50,        1,    30576, 0x26b67f83
+0,         51,         51,        1,    30576, 0x26b67f83
+0,         52,         52,        1,    30576, 0x26b67f83
+0,         53,         53,        1,    30576, 0x26b67f83
+0,         54,         54,        1,    30576, 0x26b67f83
+0,         55,         55,        1,    30576, 0x26b67f83
+0,         56,         56,        1,    30576, 0x26b67f83
+0,         57,         57,        1,    30576, 0x26b67f83
+0,         58,         58,        1,    30576, 0x26b67f83
+0,         59,         59,        1,    30576, 0x26b67f83
+0,         60,         60,        1,    30576, 0x26b67f83
+0,         61,         61,        1,    30576, 0x26b67f83
+0,         62,         62,        1,    30576, 0x26b67f83
+0,         63,         63,        1,    30576, 0x26b67f83
+0,         64,         64,        1,    30576, 0x26b67f83
+0,         65,         65,        1,    30576, 0x26b67f83
+0,         66,         66,        1,    30576, 0x26b67f83
+0,         67,         67,        1,    30576, 0x26b67f83
+0,         68,         68,        1,    30576, 0x26b67f83
+0,         69,         69,        1,    30576, 0x26b67f83
+0,         70,         70,        1,    30576, 0x26b67f83
+0,         71,         71,        1,    30576, 0x26b67f83
+0,         72,         72,        1,    30576, 0x26b67f83
+0,         73,         73,        1,    30576, 0xa2fcd06f
+0,         74,         74,        1,    30576, 0xa2fcd06f
+0,         75,         75,        1,    30576, 0xa2fcd06f
+0,         76,         76,        1,    30576, 0xa2fcd06f
+0,         77,         77,        1,    30576, 0xa2fcd06f
+0,         78,         78,        1,    30576, 0xa2fcd06f
+0,         79,         79,        1,    30576, 0xa2fcd06f
+0,         80,         80,        1,    30576, 0xa2fcd06f
+0,         81,         81,        1,    30576, 0xd4150aad
+0,         82,         82,        1,    30576, 0xd4150aad
+0,         83,         83,        1,    30576, 0xd4150aad
+0,         84,         84,        1,    30576, 0xd4150aad
+0,         85,         85,        1,    30576, 0xd4150aad
+0,         86,         86,        1,    30576, 0xd4150aad
+0,         87,         87,        1,    30576, 0xd4150aad
diff --git a/tests/ref/fate/filter-fps-r b/tests/ref/fate/filter-fps-r
new file mode 100644
index 0000000000..c1bc7d1547
--- /dev/null
+++ b/tests/ref/fate/filter-fps-r
@@ -0,0 +1,78 @@
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 112x182
+#sar 0: 0/1
+0,          0,          0,        1,    30576, 0xcdc29b3d
+0,          1,          1,        1,    30576, 0xcdc29b3d
+0,          2,          2,        1,    30576, 0xcdc29b3d
+0,          4,          4,        1,    30576, 0xcdc29b3d
+0,          5,          5,        1,    30576, 0xcdc29b3d
+0,          6,          6,        1,    30576, 0x5c83656c
+0,          7,          7,        1,    30576, 0x5c83656c
+0,          8,          8,        1,    30576, 0x5c83656c
+0,         10,         10,        1,    30576, 0x5c83656c
+0,         11,         11,        1,    30576, 0x5c83656c
+0,         12,         12,        1,    30576, 0x5c83656c
+0,         13,         13,        1,    30576, 0x26b67f83
+0,         14,         14,        1,    30576, 0x26b67f83
+0,         16,         16,        1,    30576, 0x26b67f83
+0,         17,         17,        1,    30576, 0x26b67f83
+0,         18,         18,        1,    30576, 0x26b67f83
+0,         19,         19,        1,    30576, 0x26b67f83
+0,         20,         20,        1,    30576, 0x26b67f83
+0,         22,         22,        1,    30576, 0x26b67f83
+0,         23,         23,        1,    30576, 0x26b67f83
+0,         24,         24,        1,    30576, 0x26b67f83
+0,         25,         25,        1,    30576, 0x26b67f83
+0,         26,         26,        1,    30576, 0x26b67f83
+0,         28,         28,        1,    30576, 0x26b67f83
+0,         29,         29,        1,    30576, 0x26b67f83
+0,         30,         30,        1,    30576, 0x26b67f83
+0,         31,         31,        1,    30576, 0x26b67f83
+0,         32,         32,        1,    30576, 0x26b67f83
+0,         34,         34,        1,    30576, 0x26b67f83
+0,         35,         35,        1,    30576, 0x26b67f83
+0,         36,         36,        1,    30576, 0x26b67f83
+0,         37,         37,        1,    30576, 0x26b67f83
+0,         38,         38,        1,    30576, 0x26b67f83
+0,         40,         40,        1,    30576, 0x26b67f83
+0,         41,         41,        1,    30576, 0x26b67f83
+0,         42,         42,        1,    30576, 0x26b67f83
+0,         43,         43,        1,    30576, 0x26b67f83
+0,         44,         44,        1,    30576, 0x26b67f83
+0,         46,         46,        1,    30576, 0x26b67f83
+0,         47,         47,        1,    30576, 0x26b67f83
+0,         48,         48,        1,    30576, 0x26b67f83
+0,         49,         49,        1,    30576, 0x26b67f83
+0,         50,         50,        1,    30576, 0x26b67f83
+0,         52,         52,        1,    30576, 0x26b67f83
+0,         53,         53,        1,    30576, 0x26b67f83
+0,         54,         54,        1,    30576, 0x26b67f83
+0,         55,         55,        1,    30576, 0x26b67f83
+0,         56,         56,        1,    30576, 0x26b67f83
+0,         58,         58,        1,    30576, 0x26b67f83
+0,         59,         59,        1,    30576, 0x26b67f83
+0,         60,         60,        1,    30576, 0x26b67f83
+0,         61,         61,        1,    30576, 0x26b67f83
+0,         62,         62,        1,    30576, 0x26b67f83
+0,         64,         64,        1,    30576, 0x26b67f83
+0,         65,         65,        1,    30576, 0x26b67f83
+0,         66,         66,        1,    30576, 0x26b67f83
+0,         67,         67,        1,    30576, 0x26b67f83
+0,         68,         68,        1,    30576, 0x26b67f83
+0,         70,         70,        1,    30576, 0x26b67f83
+0,         71,         71,        1,    30576, 0x26b67f83
+0,         72,         72,        1,    30576, 0x26b67f83
+0,         73,         73,        1,    30576, 0xa2fcd06f
+0,         74,         74,        1,    30576, 0xa2fcd06f
+0,         76,         76,        1,    30576, 0xa2fcd06f
+0,         77,         77,        1,    30576, 0xa2fcd06f
+0,         78,         78,        1,    30576, 0xa2fcd06f
+0,         79,         79,        1,    30576, 0xa2fcd06f
+0,         80,         80,        1,    30576, 0xa2fcd06f
+0,         82,         82,        1,    30576, 0xd4150aad
+0,         83,         83,        1,    30576, 0xd4150aad
+0,         84,         84,        1,    30576, 0xd4150aad
+0,         85,         85,        1,    30576, 0xd4150aad
+0,         86,         86,        1,    30576, 0xd4150aad
diff --git a/tests/ref/fate/filter-framepack-columns b/tests/ref/fate/filter-framepack-columns
index f38763286e..ac688c9060 100644
--- a/tests/ref/fate/filter-framepack-columns
+++ b/tests/ref/fate/filter-framepack-columns
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 704x288
+#sar 0: 0/1
 0,          0,          0,        1,   304128, 0x8cde13ed
 0,          1,          1,        1,   304128, 0xc97fcaa2
 0,          2,          2,        1,   304128, 0x8139eca3
diff --git a/tests/ref/fate/filter-framepack-frameseq b/tests/ref/fate/filter-framepack-frameseq
index 83c08a0324..7174fe4ecd 100644
--- a/tests/ref/fate/filter-framepack-frameseq
+++ b/tests/ref/fate/filter-framepack-frameseq
@@ -1,4 +1,8 @@
 #tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x05b789ef
 0,          1,          1,        1,   152064, 0x05b789ef
 0,          2,          2,        1,   152064, 0x4bb46551
diff --git a/tests/ref/fate/filter-framepack-lines b/tests/ref/fate/filter-framepack-lines
index d714462e55..d8cc2896bd 100644
--- a/tests/ref/fate/filter-framepack-lines
+++ b/tests/ref/fate/filter-framepack-lines
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x576
+#sar 0: 0/1
 0,          0,          0,        1,   304128, 0x901a13ed
 0,          1,          1,        1,   304128, 0x793ccaa2
 0,          2,          2,        1,   304128, 0x9eafeca3
diff --git a/tests/ref/fate/filter-framepack-sbs b/tests/ref/fate/filter-framepack-sbs
index d714462e55..d4b47f07a8 100644
--- a/tests/ref/fate/filter-framepack-sbs
+++ b/tests/ref/fate/filter-framepack-sbs
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 704x288
+#sar 0: 0/1
 0,          0,          0,        1,   304128, 0x901a13ed
 0,          1,          1,        1,   304128, 0x793ccaa2
 0,          2,          2,        1,   304128, 0x9eafeca3
diff --git a/tests/ref/fate/filter-framepack-tab b/tests/ref/fate/filter-framepack-tab
index 0346f06bce..500cfb7ce5 100644
--- a/tests/ref/fate/filter-framepack-tab
+++ b/tests/ref/fate/filter-framepack-tab
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x576
+#sar 0: 0/1
 0,          0,          0,        1,   304128, 0x0b6b13ed
 0,          1,          1,        1,   304128, 0x406bcaa2
 0,          2,          2,        1,   304128, 0xb0deeca3
diff --git a/tests/ref/fate/filter-framerate-down b/tests/ref/fate/filter-framerate-down
new file mode 100644
index 0000000000..4eab7aab85
--- /dev/null
+++ b/tests/ref/fate/filter-framerate-down
@@ -0,0 +1,6 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   115200, 0x3744b3ed
diff --git a/tests/ref/fate/filter-framerate-up b/tests/ref/fate/filter-framerate-up
new file mode 100644
index 0000000000..b2af9cb879
--- /dev/null
+++ b/tests/ref/fate/filter-framerate-up
@@ -0,0 +1,15 @@
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   115200, 0x3744b3ed
+0,          1,          1,        1,   115200, 0xc44bdc65
+0,          2,          2,        1,   115200, 0xa17f0d74
+0,          3,          3,        1,   115200, 0xb0c83274
+0,          4,          4,        1,   115200, 0x232d6368
+0,          5,          5,        1,   115200, 0x6e318ba0
+0,          6,          6,        1,   115200, 0x247e846e
+0,          7,          7,        1,   115200, 0x89e27599
+0,          8,          8,        1,   115200, 0x31c5704e
+0,          9,          9,        1,   115200, 0x97e45fec
diff --git a/tests/ref/fate/filter-gradfun b/tests/ref/fate/filter-gradfun
index 794fae93e0..cadb9cb557 100644
--- a/tests/ref/fate/filter-gradfun
+++ b/tests/ref/fate/filter-gradfun
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xaebf898f
 0,          1,          1,        1,   152064, 0x217b6560
 0,          2,          2,        1,   152064, 0x0269f62d
diff --git a/tests/ref/fate/filter-gradfun-sample b/tests/ref/fate/filter-gradfun-sample
new file mode 100644
index 0000000000..e6e2dc8a44
--- /dev/null
+++ b/tests/ref/fate/filter-gradfun-sample
@@ -0,0 +1,25 @@
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+0,          0,          0,        1,    76800, 0xea62ab65
+0,          1,          1,        1,    76800, 0xbc0d8b58
+0,          2,          2,        1,    76800, 0x682967d0
+0,          3,          3,        1,    76800, 0x2f1d3353
+0,          4,          4,        1,    76800, 0x0f3306c5
+0,          5,          5,        1,    76800, 0x1f026ce0
+0,          6,          6,        1,    76800, 0xefff2a28
+0,          7,          7,        1,    76800, 0xa7daf536
+0,          8,          8,        1,    76800, 0x8b95b1b2
+0,          9,          9,        1,    76800, 0x821b76c2
+0,         10,         10,        1,    76800, 0x48193d3d
+0,         11,         11,        1,    76800, 0x6182634a
+0,         12,         12,        1,    76800, 0x442b2dcc
+0,         13,         13,        1,    76800, 0x83e2ee26
+0,         14,         14,        1,    76800, 0x47d8b74d
+0,         15,         15,        1,    76800, 0x412b7dcd
+0,         16,         16,        1,    76800, 0x65e33b7c
+0,         17,         17,        1,    76800, 0xb04a0915
+0,         18,         18,        1,    76800, 0x5405c876
+0,         19,         19,        1,    76800, 0xce6d98bc
diff --git a/tests/ref/fate/filter-histogram-levels b/tests/ref/fate/filter-histogram-levels
new file mode 100644
index 0000000000..697d7d19c0
--- /dev/null
+++ b/tests/ref/fate/filter-histogram-levels
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x636
+#sar 0: 1/1
+0,          0,          0,        1,   488448, 0xc27a6cac
+0,          1,          1,        1,   488448, 0xf00a152e
+0,          2,          2,        1,   488448, 0x060b8c70
+0,          3,          3,        1,   488448, 0xf75d6ee2
+0,          4,          4,        1,   488448, 0xd7a7f06e
+0,          5,          5,        1,   488448, 0x585281a5
+0,          6,          6,        1,   488448, 0xb06e3ee8
+0,          7,          7,        1,   488448, 0x201d0b8c
+0,          8,          8,        1,   488448, 0x4e14e319
+0,          9,          9,        1,   488448, 0x5aef5cca
+0,         10,         10,        1,   488448, 0x57018668
+0,         11,         11,        1,   488448, 0x2ad45b3f
+0,         12,         12,        1,   488448, 0x62cc36b8
+0,         13,         13,        1,   488448, 0x9e84585e
+0,         14,         14,        1,   488448, 0xe6552e42
+0,         15,         15,        1,   488448, 0x13b90c2c
+0,         16,         16,        1,   488448, 0xf9557145
+0,         17,         17,        1,   488448, 0x818340bc
+0,         18,         18,        1,   488448, 0x5112c6e1
+0,         19,         19,        1,   488448, 0x5d5b8f43
+0,         20,         20,        1,   488448, 0xf2101ea6
+0,         21,         21,        1,   488448, 0x4266af4d
+0,         22,         22,        1,   488448, 0xb358806e
+0,         23,         23,        1,   488448, 0xe336aa60
+0,         24,         24,        1,   488448, 0x64fcc339
+0,         25,         25,        1,   488448, 0x86e4b729
+0,         26,         26,        1,   488448, 0x48c380d0
+0,         27,         27,        1,   488448, 0xaee36fd3
+0,         28,         28,        1,   488448, 0x20b84429
+0,         29,         29,        1,   488448, 0x84d85542
+0,         30,         30,        1,   488448, 0x94aea169
+0,         31,         31,        1,   488448, 0x6278fa2c
+0,         32,         32,        1,   488448, 0xaadf998d
+0,         33,         33,        1,   488448, 0x29bba90d
+0,         34,         34,        1,   488448, 0xef1117ad
+0,         35,         35,        1,   488448, 0xd961e36d
+0,         36,         36,        1,   488448, 0xff53296e
+0,         37,         37,        1,   488448, 0x41f381f9
+0,         38,         38,        1,   488448, 0x66fcfc2a
+0,         39,         39,        1,   488448, 0x758bb472
+0,         40,         40,        1,   488448, 0xefc6dc9e
+0,         41,         41,        1,   488448, 0x77fccb69
+0,         42,         42,        1,   488448, 0x7a1d82a4
+0,         43,         43,        1,   488448, 0xc9d61a1b
+0,         44,         44,        1,   488448, 0x8e689deb
+0,         45,         45,        1,   488448, 0x52133e75
+0,         46,         46,        1,   488448, 0xcc0a098e
+0,         47,         47,        1,   488448, 0x045cd17f
+0,         48,         48,        1,   488448, 0x97f89963
+0,         49,         49,        1,   488448, 0xa1f835ff
diff --git a/tests/ref/fate/filter-hls b/tests/ref/fate/filter-hls
new file mode 100644
index 0000000000..ee3c7b2c62
--- /dev/null
+++ b/tests/ref/fate/filter-hls
@@ -0,0 +1,772 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+0,          0,          0,     1152,     2304, 0x907cb7fa
+0,       1152,       1152,     1152,     2304, 0xb8dc7525
+0,       2304,       2304,     1152,     2304, 0x3e7d6905
+0,       3456,       3456,     1152,     2304, 0xef47877b
+0,       4608,       4608,     1152,     2304, 0xfe916b7e
+0,       5760,       5760,     1152,     2304, 0xe3d08cde
+0,       6912,       6912,     1152,     2304, 0xff7f86cf
+0,       8064,       8064,     1152,     2304, 0x843e6f95
+0,       9216,       9216,     1152,     2304, 0x81577c26
+0,      10368,      10368,     1152,     2304, 0x04a085d5
+0,      11520,      11520,     1152,     2304, 0x1c5a76f5
+0,      12672,      12672,     1152,     2304, 0x4ee78623
+0,      13824,      13824,     1152,     2304, 0x8ec861dc
+0,      14976,      14976,     1152,     2304, 0x0ca179d8
+0,      16128,      16128,     1152,     2304, 0xc6da750f
+0,      17280,      17280,     1152,     2304, 0xf6bf79b5
+0,      18432,      18432,     1152,     2304, 0x97b88a43
+0,      19584,      19584,     1152,     2304, 0xf13c7b9c
+0,      20736,      20736,     1152,     2304, 0xdfba83af
+0,      21888,      21888,     1152,     2304, 0xc9467d4b
+0,      23040,      23040,     1152,     2304, 0xbbb58e2b
+0,      24192,      24192,     1152,     2304, 0x3a1078ea
+0,      25344,      25344,     1152,     2304, 0xe9587a5c
+0,      26496,      26496,     1152,     2304, 0xef5a8039
+0,      27648,      27648,     1152,     2304, 0x9d5f782f
+0,      28800,      28800,     1152,     2304, 0x1a548291
+0,      29952,      29952,     1152,     2304, 0x07517701
+0,      31104,      31104,     1152,     2304, 0x78127d6e
+0,      32256,      32256,     1152,     2304, 0x62e2788a
+0,      33408,      33408,     1152,     2304, 0x29397ad9
+0,      34560,      34560,     1152,     2304, 0x45da82d6
+0,      35712,      35712,     1152,     2304, 0x8ed66e51
+0,      36864,      36864,     1152,     2304, 0x660775cd
+0,      38016,      38016,     1152,     2304, 0x802c767a
+0,      39168,      39168,     1152,     2304, 0xcc055840
+0,      40320,      40320,     1152,     2304, 0x701b7eaf
+0,      41472,      41472,     1152,     2304, 0x8290749f
+0,      42624,      42624,     1152,     2304, 0x2c7b7d30
+0,      43776,      43776,     1152,     2304, 0xe4f17743
+0,      44928,      44928,     1152,     2304, 0x0e747d6e
+0,      46080,      46080,     1152,     2304, 0xbe7775a0
+0,      47232,      47232,     1152,     2304, 0xcf797673
+0,      48384,      48384,     1152,     2304, 0x29cb7800
+0,      49536,      49536,     1152,     2304, 0xfc947890
+0,      50688,      50688,     1152,     2304, 0x62757fc6
+0,      51840,      51840,     1152,     2304, 0x098876d0
+0,      52992,      52992,     1152,     2304, 0xa9567ee2
+0,      54144,      54144,     1152,     2304, 0xe3bb9173
+0,      55296,      55296,     1152,     2304, 0xcc2d6dee
+0,      56448,      56448,     1152,     2304, 0xe94591ab
+0,      57600,      57600,     1152,     2304, 0x5c7588de
+0,      58752,      58752,     1152,     2304, 0xfd83643c
+0,      59904,      59904,     1152,     2304, 0x528177f1
+0,      61056,      61056,     1152,     2304, 0x65d08474
+0,      62208,      62208,     1152,     2304, 0x738d765b
+0,      63360,      63360,     1152,     2304, 0xdd3d810e
+0,      64512,      64512,     1152,     2304, 0xef4f90d3
+0,      65664,      65664,     1152,     2304, 0x61e28d43
+0,      66816,      66816,     1152,     2304, 0x9a11796b
+0,      67968,      67968,     1152,     2304, 0x96c97dcd
+0,      69120,      69120,     1152,     2304, 0xa8fe8621
+0,      70272,      70272,     1152,     2304, 0x499b7d38
+0,      71424,      71424,     1152,     2304, 0xfcb078a9
+0,      72576,      72576,     1152,     2304, 0x40d78651
+0,      73728,      73728,     1152,     2304, 0xa4af7234
+0,      74880,      74880,     1152,     2304, 0x6831870a
+0,      76032,      76032,     1152,     2304, 0x030e7b9d
+0,      77184,      77184,     1152,     2304, 0x445a75b6
+0,      78336,      78336,     1152,     2304, 0x09857389
+0,      79488,      79488,     1152,     2304, 0x0d018866
+0,      80640,      80640,     1152,     2304, 0x2afe810a
+0,      81792,      81792,     1152,     2304, 0x0bcf7c43
+0,      82944,      82944,     1152,     2304, 0x13737c12
+0,      84096,      84096,     1152,     2304, 0x716c7bba
+0,      85248,      85248,     1152,     2304, 0xb801823b
+0,      86400,      86400,     1152,     2304, 0x0fd573ee
+0,      87552,      87552,     1152,     2304, 0xe1ab879c
+0,      88704,      88704,     1152,     2304, 0x49e6764f
+0,      89856,      89856,     1152,     2304, 0xd5f26ddc
+0,      91008,      91008,     1152,     2304, 0x076775ff
+0,      92160,      92160,     1152,     2304, 0xfbb86fce
+0,      93312,      93312,     1152,     2304, 0x20c56858
+0,      94464,      94464,     1152,     2304, 0x043e6891
+0,      95616,      95616,     1152,     2304, 0x59648729
+0,      96768,      96768,     1152,     2304, 0xd4907a63
+0,      97920,      97920,     1152,     2304, 0xd0208a4c
+0,      99072,      99072,     1152,     2304, 0xce968383
+0,     100224,     100224,     1152,     2304, 0x3cfc7cd1
+0,     101376,     101376,     1152,     2304, 0x628a7bf5
+0,     102528,     102528,     1152,     2304, 0x9cfe8a4f
+0,     103680,     103680,     1152,     2304, 0xdf6f7c6d
+0,     104832,     104832,     1152,     2304, 0x6cf6882a
+0,     105984,     105984,     1152,     2304, 0x099773a3
+0,     107136,     107136,     1152,     2304, 0x4a1c7649
+0,     108288,     108288,     1152,     2304, 0x31ea71cb
+0,     109440,     109440,     1152,     2304, 0xed127ed9
+0,     110592,     110592,     1152,     2304, 0x5b156954
+0,     111744,     111744,     1152,     2304, 0xdd638532
+0,     112896,     112896,     1152,     2304, 0xf1a271f2
+0,     114048,     114048,     1152,     2304, 0x779184d7
+0,     115200,     115200,     1152,     2304, 0x49a88aa8
+0,     116352,     116352,     1152,     2304, 0xa11b7c90
+0,     117504,     117504,     1152,     2304, 0xbf488274
+0,     118656,     118656,     1152,     2304, 0x002f79a8
+0,     119808,     119808,     1152,     2304, 0x0ed97e2f
+0,     120960,     120960,     1152,     2304, 0x7845878f
+0,     122112,     122112,     1152,     2304, 0x46d777dc
+0,     123264,     123264,     1152,     2304, 0x8d0179e3
+0,     124416,     124416,     1152,     2304, 0x38917f9f
+0,     125568,     125568,     1152,     2304, 0x449876e7
+0,     126720,     126720,     1152,     2304, 0x001a8769
+0,     127872,     127872,     1152,     2304, 0x06c1826b
+0,     129024,     129024,     1152,     2304, 0x41b68047
+0,     130176,     130176,     1152,     2304, 0xeb9782c6
+0,     131328,     131328,     1152,     2304, 0x7cd9719c
+0,     132480,     132480,     1152,     2304, 0x3a4a767c
+0,     133632,     133632,     1152,     2304, 0x7f887e81
+0,     134784,     134784,     1152,     2304, 0xf75d714b
+0,     135936,     135936,     1152,     2304, 0x33b57e9f
+0,     137088,     137088,     1152,     2304, 0xc732749e
+0,     138240,     138240,     1152,     2304, 0x386f7e1a
+0,     139392,     139392,     1152,     2304, 0x6b9c767d
+0,     140544,     140544,     1152,     2304, 0x701c83e5
+0,     141696,     141696,     1152,     2304, 0xb92571e1
+0,     142848,     142848,     1152,     2304, 0x833a84bc
+0,     144000,     144000,     1152,     2304, 0x1b6984e0
+0,     145152,     145152,     1152,     2304, 0x1b2474ba
+0,     146304,     146304,     1152,     2304, 0xc22775a6
+0,     147456,     147456,     1152,     2304, 0x3e8f7972
+0,     148608,     148608,     1152,     2304, 0x17a28a65
+0,     149760,     149760,     1152,     2304, 0x9b6178a4
+0,     150912,     150912,     1152,     2304, 0x5d707873
+0,     152064,     152064,     1152,     2304, 0x68e2645a
+0,     153216,     153216,     1152,     2304, 0x1e377d28
+0,     154368,     154368,     1152,     2304, 0x54b384be
+0,     155520,     155520,     1152,     2304, 0x0617808c
+0,     156672,     156672,     1152,     2304, 0xbc2b8a6c
+0,     157824,     157824,     1152,     2304, 0x7ced7180
+0,     158976,     158976,     1152,     2304, 0xf22180ab
+0,     160128,     160128,     1152,     2304, 0xf13682c9
+0,     161280,     161280,     1152,     2304, 0x7eff87fd
+0,     162432,     162432,     1152,     2304, 0x5a0b5cec
+0,     163584,     163584,     1152,     2304, 0x57c18906
+0,     164736,     164736,     1152,     2304, 0xb55a6a16
+0,     165888,     165888,     1152,     2304, 0xf2608371
+0,     167040,     167040,     1152,     2304, 0x36df7576
+0,     168192,     168192,     1152,     2304, 0xdb106fb4
+0,     169344,     169344,     1152,     2304, 0x7e4f85d0
+0,     170496,     170496,     1152,     2304, 0xe3ee78ab
+0,     171648,     171648,     1152,     2304, 0xd36b7dc7
+0,     172800,     172800,     1152,     2304, 0xadab7c5c
+0,     173952,     173952,     1152,     2304, 0x70786f26
+0,     175104,     175104,     1152,     2304, 0xcd5d717e
+0,     176256,     176256,     1152,     2304, 0xc1a96f9a
+0,     177408,     177408,     1152,     2304, 0xad777887
+0,     178560,     178560,     1152,     2304, 0x98277c16
+0,     179712,     179712,     1152,     2304, 0x868882c5
+0,     180864,     180864,     1152,     2304, 0xc48092b9
+0,     182016,     182016,     1152,     2304, 0x230069da
+0,     183168,     183168,     1152,     2304, 0x14147ad6
+0,     184320,     184320,     1152,     2304, 0xc9007172
+0,     185472,     185472,     1152,     2304, 0x85d67bcc
+0,     186624,     186624,     1152,     2304, 0x22418bab
+0,     187776,     187776,     1152,     2304, 0xe53c8b71
+0,     188928,     188928,     1152,     2304, 0x5a1a9053
+0,     190080,     190080,     1152,     2304, 0x9cd179af
+0,     191232,     191232,     1152,     2304, 0xbb3c7d72
+0,     192384,     192384,     1152,     2304, 0x477a8677
+0,     193536,     193536,     1152,     2304, 0xe3337834
+0,     194688,     194688,     1152,     2304, 0x1cb56d77
+0,     195840,     195840,     1152,     2304, 0xe89d6dac
+0,     196992,     196992,     1152,     2304, 0xd468827e
+0,     198144,     198144,     1152,     2304, 0xebc46b87
+0,     199296,     199296,     1152,     2304, 0x5fbb78d2
+0,     200448,     200448,     1152,     2304, 0xa1b483d6
+0,     201600,     201600,     1152,     2304, 0x6fec7cab
+0,     202752,     202752,     1152,     2304, 0xd86d6f6c
+0,     203904,     203904,     1152,     2304, 0x8c2c7d51
+0,     205056,     205056,     1152,     2304, 0xe8377cd7
+0,     206208,     206208,     1152,     2304, 0xb57071b4
+0,     207360,     207360,     1152,     2304, 0xc35c71fd
+0,     208512,     208512,     1152,     2304, 0x789079e9
+0,     209664,     209664,     1152,     2304, 0x413b710e
+0,     210816,     210816,     1152,     2304, 0x82678332
+0,     211968,     211968,     1152,     2304, 0xe1576e75
+0,     213120,     213120,     1152,     2304, 0x7c0b7ad6
+0,     214272,     214272,     1152,     2304, 0xc6b6786d
+0,     215424,     215424,     1152,     2304, 0x736f7b89
+0,     216576,     216576,     1152,     2304, 0x0ded72f1
+0,     217728,     217728,     1152,     2304, 0xcb877a3c
+0,     218880,     218880,     1152,     2304, 0x7c497d40
+0,     220032,     220032,     1152,     2304, 0xaefc798c
+0,     221184,     221184,     1152,     2304, 0x4cce748c
+0,     222336,     222336,     1152,     2304, 0xaa187fbe
+0,     223488,     223488,     1152,     2304, 0x1aa77db9
+0,     224640,     224640,     1152,     2304, 0x9e0074b8
+0,     225792,     225792,     1152,     2304, 0x74ee822b
+0,     226944,     226944,     1152,     2304, 0x975c6ff6
+0,     228096,     228096,     1152,     2304, 0xe1847bb4
+0,     229248,     229248,     1152,     2304, 0xe0828777
+0,     230400,     230400,     1152,     2304, 0xf4027205
+0,     231552,     231552,     1152,     2304, 0x535e7a20
+0,     232704,     232704,     1152,     2304, 0x5bd88404
+0,     233856,     233856,     1152,     2304, 0xf29478b1
+0,     235008,     235008,     1152,     2304, 0x9b7c7d88
+0,     236160,     236160,     1152,     2304, 0xaeb07335
+0,     237312,     237312,     1152,     2304, 0xbef06e08
+0,     238464,     238464,     1152,     2304, 0x795f7b8c
+0,     239616,     239616,     1152,     2304, 0x435a674d
+0,     240768,     240768,     1152,     2304, 0xd8ee7a09
+0,     241920,     241920,     1152,     2304, 0x9059812e
+0,     243072,     243072,     1152,     2304, 0x7481744a
+0,     244224,     244224,     1152,     2304, 0xdff27475
+0,     245376,     245376,     1152,     2304, 0xb17783ab
+0,     246528,     246528,     1152,     2304, 0x42e9706b
+0,     247680,     247680,     1152,     2304, 0x9f0d86b4
+0,     248832,     248832,     1152,     2304, 0x2963955f
+0,     249984,     249984,     1152,     2304, 0x059a6957
+0,     251136,     251136,     1152,     2304, 0x85948206
+0,     252288,     252288,     1152,     2304, 0x185e8400
+0,     253440,     253440,     1152,     2304, 0xe98e70df
+0,     254592,     254592,     1152,     2304, 0x69057b27
+0,     255744,     255744,     1152,     2304, 0x49e26f21
+0,     256896,     256896,     1152,     2304, 0xb0867da5
+0,     258048,     258048,     1152,     2304, 0x785980ff
+0,     259200,     259200,     1152,     2304, 0xf4b774be
+0,     260352,     260352,     1152,     2304, 0x63897e8c
+0,     261504,     261504,     1152,     2304, 0x248b89af
+0,     262656,     262656,     1152,     2304, 0xd3627c4a
+0,     263808,     263808,     1152,     2304, 0x5a4d9349
+0,     264960,     264960,     1152,     2304, 0xe2ce7c4c
+0,     266112,     266112,     1152,     2304, 0x321f6c0b
+0,     267264,     267264,     1152,     2304, 0x51ac74e0
+0,     268416,     268416,     1152,     2304, 0x8efa91ba
+0,     269568,     269568,     1152,     2304, 0x8b4b784c
+0,     270720,     270720,     1152,     2304, 0xe9e4879e
+0,     271872,     271872,     1152,     2304, 0x8dc28081
+0,     273024,     273024,     1152,     2304, 0x44b477b0
+0,     274176,     274176,     1152,     2304, 0xf7b67084
+0,     275328,     275328,     1152,     2304, 0x4b198c17
+0,     276480,     276480,     1152,     2304, 0x9c947194
+0,     277632,     277632,     1152,     2304, 0x6eaa7f15
+0,     278784,     278784,     1152,     2304, 0x119f7c1d
+0,     279936,     279936,     1152,     2304, 0x157b7f43
+0,     281088,     281088,     1152,     2304, 0xcd2e7acc
+0,     282240,     282240,     1152,     2304, 0x97597247
+0,     283392,     283392,     1152,     2304, 0x7ba06acb
+0,     284544,     284544,     1152,     2304, 0x233c7995
+0,     285696,     285696,     1152,     2304, 0x08e28587
+0,     286848,     286848,     1152,     2304, 0x92be84b5
+0,     288000,     288000,     1152,     2304, 0xbb857d43
+0,     289152,     289152,     1152,     2304, 0x168e7c74
+0,     290304,     290304,     1152,     2304, 0xac5465d9
+0,     291456,     291456,     1152,     2304, 0x18f58831
+0,     292608,     292608,     1152,     2304, 0x19b48196
+0,     293760,     293760,     1152,     2304, 0x20297653
+0,     294912,     294912,     1152,     2304, 0x93397a82
+0,     296064,     296064,     1152,     2304, 0x65ea7deb
+0,     297216,     297216,     1152,     2304, 0xd7316e20
+0,     298368,     298368,     1152,     2304, 0x94107f2b
+0,     299520,     299520,     1152,     2304, 0xec3b7dc6
+0,     300672,     300672,     1152,     2304, 0x2d3783aa
+0,     301824,     301824,     1152,     2304, 0x07e47340
+0,     302976,     302976,     1152,     2304, 0xbc117893
+0,     304128,     304128,     1152,     2304, 0x8bd97851
+0,     305280,     305280,     1152,     2304, 0xc27376a9
+0,     306432,     306432,     1152,     2304, 0x30d88c83
+0,     307584,     307584,     1152,     2304, 0x19c2704c
+0,     308736,     308736,     1152,     2304, 0x093b7b6e
+0,     309888,     309888,     1152,     2304, 0x221a7349
+0,     311040,     311040,     1152,     2304, 0xa4fd82cd
+0,     312192,     312192,     1152,     2304, 0x762e6bc9
+0,     313344,     313344,     1152,     2304, 0x270075d4
+0,     314496,     314496,     1152,     2304, 0xa5f27b90
+0,     315648,     315648,     1152,     2304, 0xf72e7edc
+0,     316800,     316800,     1152,     2304, 0x42178486
+0,     317952,     317952,     1152,     2304, 0x5f7978e8
+0,     319104,     319104,     1152,     2304, 0x5d7c6703
+0,     320256,     320256,     1152,     2304, 0x2c4483d5
+0,     321408,     321408,     1152,     2304, 0x31bd951d
+0,     322560,     322560,     1152,     2304, 0x99487af0
+0,     323712,     323712,     1152,     2304, 0x0bd27ee7
+0,     324864,     324864,     1152,     2304, 0xc3e07ac4
+0,     326016,     326016,     1152,     2304, 0x98a16ba7
+0,     327168,     327168,     1152,     2304, 0xd7a5747b
+0,     328320,     328320,     1152,     2304, 0x96fb811c
+0,     329472,     329472,     1152,     2304, 0x7cee8109
+0,     330624,     330624,     1152,     2304, 0x52b18ba2
+0,     331776,     331776,     1152,     2304, 0x33be8861
+0,     332928,     332928,     1152,     2304, 0xf41282a0
+0,     334080,     334080,     1152,     2304, 0xb4268993
+0,     335232,     335232,     1152,     2304, 0x52126a1c
+0,     336384,     336384,     1152,     2304, 0x050b6f7a
+0,     337536,     337536,     1152,     2304, 0x67a26fc3
+0,     338688,     338688,     1152,     2304, 0x966c7cf2
+0,     339840,     339840,     1152,     2304, 0x22097750
+0,     340992,     340992,     1152,     2304, 0xfbb0796c
+0,     342144,     342144,     1152,     2304, 0xbd508964
+0,     343296,     343296,     1152,     2304, 0xc24478d8
+0,     344448,     344448,     1152,     2304, 0x3913769d
+0,     345600,     345600,     1152,     2304, 0x8aab872f
+0,     346752,     346752,     1152,     2304, 0x7cb4822f
+0,     347904,     347904,     1152,     2304, 0xea318144
+0,     349056,     349056,     1152,     2304, 0xaf0f86d2
+0,     350208,     350208,     1152,     2304, 0x24f27598
+0,     351360,     351360,     1152,     2304, 0xd76f6d40
+0,     352512,     352512,     1152,     2304, 0x085071a7
+0,     353664,     353664,     1152,     2304, 0x1d11704c
+0,     354816,     354816,     1152,     2304, 0x21517cbd
+0,     355968,     355968,     1152,     2304, 0xcdca8d32
+0,     357120,     357120,     1152,     2304, 0x71c18433
+0,     358272,     358272,     1152,     2304, 0xd39d7d81
+0,     359424,     359424,     1152,     2304, 0x7a0d7a43
+0,     360576,     360576,     1152,     2304, 0x007c8884
+0,     361728,     361728,     1152,     2304, 0x403282d0
+0,     362880,     362880,     1152,     2304, 0xe3737214
+0,     364032,     364032,     1152,     2304, 0xaf906f47
+0,     365184,     365184,     1152,     2304, 0x54f57b3b
+0,     366336,     366336,     1152,     2304, 0x29be7791
+0,     367488,     367488,     1152,     2304, 0xe3c663d5
+0,     368640,     368640,     1152,     2304, 0xd7258238
+0,     369792,     369792,     1152,     2304, 0x3719820d
+0,     370944,     370944,     1152,     2304, 0xbe04814f
+0,     372096,     372096,     1152,     2304, 0x556c815e
+0,     373248,     373248,     1152,     2304, 0xb2447e10
+0,     374400,     374400,     1152,     2304, 0x7c16867c
+0,     375552,     375552,     1152,     2304, 0x6a7b78ed
+0,     376704,     376704,     1152,     2304, 0x5d307b81
+0,     377856,     377856,     1152,     2304, 0xaab680d3
+0,     379008,     379008,     1152,     2304, 0xb5d37a23
+0,     380160,     380160,     1152,     2304, 0x7f7d6f76
+0,     381312,     381312,     1152,     2304, 0x317a8296
+0,     382464,     382464,     1152,     2304, 0x8a987b3d
+0,     383616,     383616,     1152,     2304, 0x4f317a27
+0,     384768,     384768,     1152,     2304, 0xfc65852f
+0,     385920,     385920,     1152,     2304, 0x40527719
+0,     387072,     387072,     1152,     2304, 0x84988e13
+0,     388224,     388224,     1152,     2304, 0x318b6ddc
+0,     389376,     389376,     1152,     2304, 0x94cf7939
+0,     390528,     390528,     1152,     2304, 0x6f22819d
+0,     391680,     391680,     1152,     2304, 0xa7dd80a9
+0,     392832,     392832,     1152,     2304, 0x1c7968fa
+0,     393984,     393984,     1152,     2304, 0xd9937bae
+0,     395136,     395136,     1152,     2304, 0xf7137cf9
+0,     396288,     396288,     1152,     2304, 0xeadb84b5
+0,     397440,     397440,     1152,     2304, 0x9a2390ac
+0,     398592,     398592,     1152,     2304, 0xdb6a73f6
+0,     399744,     399744,     1152,     2304, 0x69e07507
+0,     400896,     400896,     1152,     2304, 0xbc8478b2
+0,     402048,     402048,     1152,     2304, 0x32cf8638
+0,     403200,     403200,     1152,     2304, 0x2b8d755a
+0,     404352,     404352,     1152,     2304, 0x52e05bd2
+0,     405504,     405504,     1152,     2304, 0x2aed8c49
+0,     406656,     406656,     1152,     2304, 0x587a896e
+0,     407808,     407808,     1152,     2304, 0x6dd87dee
+0,     408960,     408960,     1152,     2304, 0xd2858338
+0,     410112,     410112,     1152,     2304, 0xd90f7842
+0,     411264,     411264,     1152,     2304, 0xd6fb6d4a
+0,     412416,     412416,     1152,     2304, 0x85498aea
+0,     413568,     413568,     1152,     2304, 0x18597790
+0,     414720,     414720,     1152,     2304, 0x3cd78fea
+0,     415872,     415872,     1152,     2304, 0x94377fbc
+0,     417024,     417024,     1152,     2304, 0xf9db73f5
+0,     418176,     418176,     1152,     2304, 0x14fb6fca
+0,     419328,     419328,     1152,     2304, 0xe9d17d69
+0,     420480,     420480,     1152,     2304, 0xdeb57286
+0,     421632,     421632,     1152,     2304, 0xa5d37e17
+0,     422784,     422784,     1152,     2304, 0xcf6882fb
+0,     423936,     423936,     1152,     2304, 0x31758066
+0,     425088,     425088,     1152,     2304, 0x6b4d8175
+0,     426240,     426240,     1152,     2304, 0x2a3d7f8e
+0,     427392,     427392,     1152,     2304, 0xc066743b
+0,     428544,     428544,     1152,     2304, 0xcab88146
+0,     429696,     429696,     1152,     2304, 0x2b4c6e13
+0,     430848,     430848,     1152,     2304, 0x00b36b6f
+0,     432000,     432000,     1152,     2304, 0x664a88d3
+0,     433152,     433152,     1152,     2304, 0x18a66f76
+0,     434304,     434304,     1152,     2304, 0x4f828a8b
+0,     435456,     435456,     1152,     2304, 0x9cc7728e
+0,     436608,     436608,     1152,     2304, 0xbe357936
+0,     437760,     437760,     1152,     2304, 0x19878f8d
+0,     438912,     438912,     1152,     2304, 0x227b7c71
+0,     440064,     440064,     1152,     2304, 0xf7c879ec
+0,     441216,     441216,     1152,     2304, 0x0bca7b50
+0,     442368,     442368,     1152,     2304, 0xe4398304
+0,     443520,     443520,     1152,     2304, 0xf5da75c7
+0,     444672,     444672,     1152,     2304, 0x9f9070a3
+0,     445824,     445824,     1152,     2304, 0x789076f6
+0,     446976,     446976,     1152,     2304, 0x362977cc
+0,     448128,     448128,     1152,     2304, 0x4d0a8928
+0,     449280,     449280,     1152,     2304, 0x1bb767ec
+0,     450432,     450432,     1152,     2304, 0xbe727fa5
+0,     451584,     451584,     1152,     2304, 0x27f38347
+0,     452736,     452736,     1152,     2304, 0x0a3c8783
+0,     453888,     453888,     1152,     2304, 0x8249639c
+0,     455040,     455040,     1152,     2304, 0x3b076f69
+0,     456192,     456192,     1152,     2304, 0xd9597ee3
+0,     457344,     457344,     1152,     2304, 0x026e7fad
+0,     458496,     458496,     1152,     2304, 0xbd7a6de4
+0,     459648,     459648,     1152,     2304, 0x7d718a4d
+0,     460800,     460800,     1152,     2304, 0x1f5e83b4
+0,     461952,     461952,     1152,     2304, 0x597d7755
+0,     463104,     463104,     1152,     2304, 0x3fb080bd
+0,     464256,     464256,     1152,     2304, 0xdcbd7b16
+0,     465408,     465408,     1152,     2304, 0x5c48865f
+0,     466560,     466560,     1152,     2304, 0xcda37ae8
+0,     467712,     467712,     1152,     2304, 0x4810796d
+0,     468864,     468864,     1152,     2304, 0x34317fd0
+0,     470016,     470016,     1152,     2304, 0x5c0e7456
+0,     471168,     471168,     1152,     2304, 0x44d78040
+0,     472320,     472320,     1152,     2304, 0x88587882
+0,     473472,     473472,     1152,     2304, 0x77687d5e
+0,     474624,     474624,     1152,     2304, 0x116d68bb
+0,     475776,     475776,     1152,     2304, 0x3e5b6f60
+0,     476928,     476928,     1152,     2304, 0x64ea783c
+0,     478080,     478080,     1152,     2304, 0x23547f7d
+0,     479232,     479232,     1152,     2304, 0x2eee7892
+0,     480384,     480384,     1152,     2304, 0xfb837cba
+0,     481536,     481536,     1152,     2304, 0x86518209
+0,     482688,     482688,     1152,     2304, 0x672f7bba
+0,     483840,     483840,     1152,     2304, 0x6ab583fb
+0,     484992,     484992,     1152,     2304, 0xc1297428
+0,     486144,     486144,     1152,     2304, 0x164e7717
+0,     487296,     487296,     1152,     2304, 0xb754976d
+0,     488448,     488448,     1152,     2304, 0xb99d81b2
+0,     489600,     489600,     1152,     2304, 0x79046fd6
+0,     490752,     490752,     1152,     2304, 0x9a3f8426
+0,     491904,     491904,     1152,     2304, 0x896371f5
+0,     493056,     493056,     1152,     2304, 0x63d1799f
+0,     494208,     494208,     1152,     2304, 0x4842844e
+0,     495360,     495360,     1152,     2304, 0x850e8372
+0,     496512,     496512,     1152,     2304, 0x85d07022
+0,     497664,     497664,     1152,     2304, 0x9e6683d1
+0,     498816,     498816,     1152,     2304, 0x301b8981
+0,     499968,     499968,     1152,     2304, 0x1f1e98c5
+0,     501120,     501120,     1152,     2304, 0xc8797b03
+0,     502272,     502272,     1152,     2304, 0xf9d189f5
+0,     503424,     503424,     1152,     2304, 0x0e0d88be
+0,     504576,     504576,     1152,     2304, 0x6c1d7843
+0,     505728,     505728,     1152,     2304, 0xd13b8a38
+0,     506880,     506880,     1152,     2304, 0x9b8f773c
+0,     508032,     508032,     1152,     2304, 0x9acd7309
+0,     509184,     509184,     1152,     2304, 0x5e7d7d15
+0,     510336,     510336,     1152,     2304, 0xf09d7640
+0,     511488,     511488,     1152,     2304, 0xaebb718f
+0,     512640,     512640,     1152,     2304, 0x0c8570f4
+0,     513792,     513792,     1152,     2304, 0x3c93862c
+0,     514944,     514944,     1152,     2304, 0xcee46696
+0,     516096,     516096,     1152,     2304, 0x01ba7e20
+0,     517248,     517248,     1152,     2304, 0x7fcb7a09
+0,     518400,     518400,     1152,     2304, 0xddf18c14
+0,     519552,     519552,     1152,     2304, 0xd2e97eeb
+0,     520704,     520704,     1152,     2304, 0x514d8719
+0,     521856,     521856,     1152,     2304, 0xe89279c9
+0,     523008,     523008,     1152,     2304, 0x806d6a95
+0,     524160,     524160,     1152,     2304, 0xbc7a8a60
+0,     525312,     525312,     1152,     2304, 0x302f8fa8
+0,     526464,     526464,     1152,     2304, 0xb136784c
+0,     527616,     527616,     1152,     2304, 0x9b0f6aab
+0,     528768,     528768,     1152,     2304, 0xd8e27582
+0,     529920,     529920,     1152,     2304, 0xdaaf78b1
+0,     531072,     531072,     1152,     2304, 0x65967f5f
+0,     532224,     532224,     1152,     2304, 0x6f917aa4
+0,     533376,     533376,     1152,     2304, 0x7f607444
+0,     534528,     534528,     1152,     2304, 0xfd316f2c
+0,     535680,     535680,     1152,     2304, 0x776e83c7
+0,     536832,     536832,     1152,     2304, 0xb9c17e16
+0,     537984,     537984,     1152,     2304, 0xdf287de8
+0,     539136,     539136,     1152,     2304, 0xf33d96a3
+0,     540288,     540288,     1152,     2304, 0xad216e5b
+0,     541440,     541440,     1152,     2304, 0x4a328342
+0,     542592,     542592,     1152,     2304, 0xcf3f8079
+0,     543744,     543744,     1152,     2304, 0xb46f77b0
+0,     544896,     544896,     1152,     2304, 0x3199713d
+0,     546048,     546048,     1152,     2304, 0x5e667a0d
+0,     547200,     547200,     1152,     2304, 0xa3047ae3
+0,     548352,     548352,     1152,     2304, 0x9edf8594
+0,     549504,     549504,     1152,     2304, 0xd16382d5
+0,     550656,     550656,     1152,     2304, 0x6e838328
+0,     551808,     551808,     1152,     2304, 0xa1f697c1
+0,     552960,     552960,     1152,     2304, 0xefcc749c
+0,     554112,     554112,     1152,     2304, 0x1f94839e
+0,     555264,     555264,     1152,     2304, 0x429e7c5b
+0,     556416,     556416,     1152,     2304, 0x9b59711c
+0,     557568,     557568,     1152,     2304, 0xdac27323
+0,     558720,     558720,     1152,     2304, 0xa4856d2b
+0,     559872,     559872,     1152,     2304, 0x07a37498
+0,     561024,     561024,     1152,     2304, 0xe1ce7512
+0,     562176,     562176,     1152,     2304, 0x15e182c3
+0,     563328,     563328,     1152,     2304, 0x0fa46b8c
+0,     564480,     564480,     1152,     2304, 0xbdf07bfd
+0,     565632,     565632,     1152,     2304, 0xe0238b2a
+0,     566784,     566784,     1152,     2304, 0xab537267
+0,     567936,     567936,     1152,     2304, 0xd46b75f3
+0,     569088,     569088,     1152,     2304, 0xec73794b
+0,     570240,     570240,     1152,     2304, 0x680580c1
+0,     571392,     571392,     1152,     2304, 0x1ace8f6c
+0,     572544,     572544,     1152,     2304, 0x19d583ac
+0,     573696,     573696,     1152,     2304, 0x4b6b8105
+0,     574848,     574848,     1152,     2304, 0x392a78b2
+0,     576000,     576000,     1152,     2304, 0xd3916dad
+0,     577152,     577152,     1152,     2304, 0x569c7a75
+0,     578304,     578304,     1152,     2304, 0xf5ac814b
+0,     579456,     579456,     1152,     2304, 0x18d77e98
+0,     580608,     580608,     1152,     2304, 0x007074ce
+0,     581760,     581760,     1152,     2304, 0x0fe38373
+0,     582912,     582912,     1152,     2304, 0x5a967920
+0,     584064,     584064,     1152,     2304, 0x22167501
+0,     585216,     585216,     1152,     2304, 0xf0828cab
+0,     586368,     586368,     1152,     2304, 0xaeec71b7
+0,     587520,     587520,     1152,     2304, 0xc47b62ff
+0,     588672,     588672,     1152,     2304, 0xab688478
+0,     589824,     589824,     1152,     2304, 0xf35e7bd2
+0,     590976,     590976,     1152,     2304, 0x9cff763e
+0,     592128,     592128,     1152,     2304, 0x59568dc8
+0,     593280,     593280,     1152,     2304, 0x51a278ac
+0,     594432,     594432,     1152,     2304, 0xc08a6e68
+0,     595584,     595584,     1152,     2304, 0xd3067ef4
+0,     596736,     596736,     1152,     2304, 0x54767c49
+0,     597888,     597888,     1152,     2304, 0xf8ff8386
+0,     599040,     599040,     1152,     2304, 0xef267f63
+0,     600192,     600192,     1152,     2304, 0xe2537cd9
+0,     601344,     601344,     1152,     2304, 0x77a57680
+0,     602496,     602496,     1152,     2304, 0x325c74ad
+0,     603648,     603648,     1152,     2304, 0xd7fe87c4
+0,     604800,     604800,     1152,     2304, 0x2e756310
+0,     605952,     605952,     1152,     2304, 0x6a81796b
+0,     607104,     607104,     1152,     2304, 0x2f057daf
+0,     608256,     608256,     1152,     2304, 0xcd9f7c9d
+0,     609408,     609408,     1152,     2304, 0xc91560a0
+0,     610560,     610560,     1152,     2304, 0x962a91eb
+0,     611712,     611712,     1152,     2304, 0xa0ff7416
+0,     612864,     612864,     1152,     2304, 0xcb5c7dff
+0,     614016,     614016,     1152,     2304, 0xd3527041
+0,     615168,     615168,     1152,     2304, 0xc89d77c2
+0,     616320,     616320,     1152,     2304, 0xe1ce7ccf
+0,     617472,     617472,     1152,     2304, 0xe3417c4c
+0,     618624,     618624,     1152,     2304, 0x3f1a7166
+0,     619776,     619776,     1152,     2304, 0xcdcc7e23
+0,     620928,     620928,     1152,     2304, 0x4e727e97
+0,     622080,     622080,     1152,     2304, 0x53427ff1
+0,     623232,     623232,     1152,     2304, 0x173f6ca9
+0,     624384,     624384,     1152,     2304, 0x962887ec
+0,     625536,     625536,     1152,     2304, 0xcbec67f4
+0,     626688,     626688,     1152,     2304, 0x7a2c943d
+0,     627840,     627840,     1152,     2304, 0x8b877570
+0,     628992,     628992,     1152,     2304, 0xcf337323
+0,     630144,     630144,     1152,     2304, 0x8c8682a4
+0,     631296,     631296,     1152,     2304, 0x94c3753c
+0,     632448,     632448,     1152,     2304, 0x86898d79
+0,     633600,     633600,     1152,     2304, 0xdf667312
+0,     634752,     634752,     1152,     2304, 0x062f8ba8
+0,     635904,     635904,     1152,     2304, 0xa2c36f08
+0,     637056,     637056,     1152,     2304, 0x5bca7358
+0,     638208,     638208,     1152,     2304, 0x5648804d
+0,     639360,     639360,     1152,     2304, 0xefac87c8
+0,     640512,     640512,     1152,     2304, 0x66bf7dcf
+0,     641664,     641664,     1152,     2304, 0x62ad73bc
+0,     642816,     642816,     1152,     2304, 0x72fe630c
+0,     643968,     643968,     1152,     2304, 0xeebe87da
+0,     645120,     645120,     1152,     2304, 0x11c870cf
+0,     646272,     646272,     1152,     2304, 0x18fb7c27
+0,     647424,     647424,     1152,     2304, 0x39047145
+0,     648576,     648576,     1152,     2304, 0xdcf07032
+0,     649728,     649728,     1152,     2304, 0x61027c50
+0,     650880,     650880,     1152,     2304, 0x6e2e89de
+0,     652032,     652032,     1152,     2304, 0xc50c6d1d
+0,     653184,     653184,     1152,     2304, 0xeed587ee
+0,     654336,     654336,     1152,     2304, 0xe38269c7
+0,     655488,     655488,     1152,     2304, 0xcf66806e
+0,     656640,     656640,     1152,     2304, 0x2d3b7c1b
+0,     657792,     657792,     1152,     2304, 0xa4127d48
+0,     658944,     658944,     1152,     2304, 0x480b8325
+0,     660096,     660096,     1152,     2304, 0xc1527221
+0,     661248,     661248,     1152,     2304, 0x94c1769a
+0,     662400,     662400,     1152,     2304, 0xcfb37271
+0,     663552,     663552,     1152,     2304, 0x946d7a96
+0,     664704,     664704,     1152,     2304, 0xdfc18e50
+0,     665856,     665856,     1152,     2304, 0x10c48393
+0,     667008,     667008,     1152,     2304, 0x58556b10
+0,     668160,     668160,     1152,     2304, 0x997b7993
+0,     669312,     669312,     1152,     2304, 0x4a787992
+0,     670464,     670464,     1152,     2304, 0x11406c20
+0,     671616,     671616,     1152,     2304, 0x04a4874a
+0,     672768,     672768,     1152,     2304, 0xf3077164
+0,     673920,     673920,     1152,     2304, 0x08ac80e3
+0,     675072,     675072,     1152,     2304, 0x268370d0
+0,     676224,     676224,     1152,     2304, 0x1d137778
+0,     677376,     677376,     1152,     2304, 0xfa148e97
+0,     678528,     678528,     1152,     2304, 0xec50717c
+0,     679680,     679680,     1152,     2304, 0xcbf46b75
+0,     680832,     680832,     1152,     2304, 0xd4168038
+0,     681984,     681984,     1152,     2304, 0xdd9577f0
+0,     683136,     683136,     1152,     2304, 0xc7077685
+0,     684288,     684288,     1152,     2304, 0x34d25e91
+0,     685440,     685440,     1152,     2304, 0x96537e6d
+0,     686592,     686592,     1152,     2304, 0xb12e7940
+0,     687744,     687744,     1152,     2304, 0x861d64c0
+0,     688896,     688896,     1152,     2304, 0xa2bc64ed
+0,     690048,     690048,     1152,     2304, 0x0c5f8261
+0,     691200,     691200,     1152,     2304, 0x540584ff
+0,     692352,     692352,     1152,     2304, 0xe8328b09
+0,     693504,     693504,     1152,     2304, 0x1e777079
+0,     694656,     694656,     1152,     2304, 0x453483b4
+0,     695808,     695808,     1152,     2304, 0x1cab7a1e
+0,     696960,     696960,     1152,     2304, 0xcb37856d
+0,     698112,     698112,     1152,     2304, 0x5a4883ed
+0,     699264,     699264,     1152,     2304, 0xd1f27cbf
+0,     700416,     700416,     1152,     2304, 0x0d377a4d
+0,     701568,     701568,     1152,     2304, 0x264e76df
+0,     702720,     702720,     1152,     2304, 0x2a68771e
+0,     703872,     703872,     1152,     2304, 0xcb317a31
+0,     705024,     705024,     1152,     2304, 0xfc5d7a27
+0,     706176,     706176,     1152,     2304, 0x6e067d96
+0,     707328,     707328,     1152,     2304, 0x0c538560
+0,     708480,     708480,     1152,     2304, 0xfbad717a
+0,     709632,     709632,     1152,     2304, 0xf9fc7608
+0,     710784,     710784,     1152,     2304, 0xb1817c8f
+0,     711936,     711936,     1152,     2304, 0x57c37f82
+0,     713088,     713088,     1152,     2304, 0x8cac8356
+0,     714240,     714240,     1152,     2304, 0x97108186
+0,     715392,     715392,     1152,     2304, 0x095d81bb
+0,     716544,     716544,     1152,     2304, 0x475f6b2b
+0,     717696,     717696,     1152,     2304, 0xdf7c8cc5
+0,     718848,     718848,     1152,     2304, 0x979c77be
+0,     720000,     720000,     1152,     2304, 0x56a7844b
+0,     721152,     721152,     1152,     2304, 0x7ee46b21
+0,     722304,     722304,     1152,     2304, 0x05b67220
+0,     723456,     723456,     1152,     2304, 0x25787252
+0,     724608,     724608,     1152,     2304, 0x8ad278ad
+0,     725760,     725760,     1152,     2304, 0x67bd722e
+0,     726912,     726912,     1152,     2304, 0x204f77be
+0,     728064,     728064,     1152,     2304, 0x82d27ae2
+0,     729216,     729216,     1152,     2304, 0x23fa82e4
+0,     730368,     730368,     1152,     2304, 0xa9cf8159
+0,     731520,     731520,     1152,     2304, 0x13f08749
+0,     732672,     732672,     1152,     2304, 0xf84f71b5
+0,     733824,     733824,     1152,     2304, 0x1cb777c8
+0,     734976,     734976,     1152,     2304, 0x11236722
+0,     736128,     736128,     1152,     2304, 0x10197cac
+0,     737280,     737280,     1152,     2304, 0xbd417e65
+0,     738432,     738432,     1152,     2304, 0x9a1c7d05
+0,     739584,     739584,     1152,     2304, 0x4c3a85de
+0,     740736,     740736,     1152,     2304, 0x03816eb7
+0,     741888,     741888,     1152,     2304, 0x80186e6c
+0,     743040,     743040,     1152,     2304, 0x5c097928
+0,     744192,     744192,     1152,     2304, 0x94aa823d
+0,     745344,     745344,     1152,     2304, 0xa1c27f04
+0,     746496,     746496,     1152,     2304, 0x6ddb74a9
+0,     747648,     747648,     1152,     2304, 0x5ea67901
+0,     748800,     748800,     1152,     2304, 0xd710742d
+0,     749952,     749952,     1152,     2304, 0xf8c27add
+0,     751104,     751104,     1152,     2304, 0xf1717011
+0,     752256,     752256,     1152,     2304, 0xb59072d0
+0,     753408,     753408,     1152,     2304, 0xc8dc84a7
+0,     754560,     754560,     1152,     2304, 0x33116737
+0,     755712,     755712,     1152,     2304, 0x86216bdd
+0,     756864,     756864,     1152,     2304, 0xa2f87866
+0,     758016,     758016,     1152,     2304, 0x5d77771e
+0,     759168,     759168,     1152,     2304, 0x5d8c77fd
+0,     760320,     760320,     1152,     2304, 0x23cc89cb
+0,     761472,     761472,     1152,     2304, 0x334e7407
+0,     762624,     762624,     1152,     2304, 0x01c976ff
+0,     763776,     763776,     1152,     2304, 0x3a3b7b15
+0,     764928,     764928,     1152,     2304, 0xfa427de9
+0,     766080,     766080,     1152,     2304, 0xbeaa7c91
+0,     767232,     767232,     1152,     2304, 0xd6988b31
+0,     768384,     768384,     1152,     2304, 0x4db47f80
+0,     769536,     769536,     1152,     2304, 0xea687d9e
+0,     770688,     770688,     1152,     2304, 0x1a6281ce
+0,     771840,     771840,     1152,     2304, 0xe1958003
+0,     772992,     772992,     1152,     2304, 0xb4ae7c5e
+0,     774144,     774144,     1152,     2304, 0x28827c8a
+0,     775296,     775296,     1152,     2304, 0x1fb88b25
+0,     776448,     776448,     1152,     2304, 0x588d71e8
+0,     777600,     777600,     1152,     2304, 0x68227c34
+0,     778752,     778752,     1152,     2304, 0xee4d73e8
+0,     779904,     779904,     1152,     2304, 0x69287c6d
+0,     781056,     781056,     1152,     2304, 0xbb04926a
+0,     782208,     782208,     1152,     2304, 0x89456cec
+0,     783360,     783360,     1152,     2304, 0xabe18992
+0,     784512,     784512,     1152,     2304, 0x50cc7f6c
+0,     785664,     785664,     1152,     2304, 0x6d7270be
+0,     786816,     786816,     1152,     2304, 0x664c6fef
+0,     787968,     787968,     1152,     2304, 0x7f7982f3
+0,     789120,     789120,     1152,     2304, 0x6ca170e9
+0,     790272,     790272,     1152,     2304, 0x36437d5b
+0,     791424,     791424,     1152,     2304, 0xfd2380e8
+0,     792576,     792576,     1152,     2304, 0x2e3c6e9f
+0,     793728,     793728,     1152,     2304, 0xc8427f3f
+0,     794880,     794880,     1152,     2304, 0x962a79ad
+0,     796032,     796032,     1152,     2304, 0xc9597c8b
+0,     797184,     797184,     1152,     2304, 0x899580bb
+0,     798336,     798336,     1152,     2304, 0x2d179dff
+0,     799488,     799488,     1152,     2304, 0x4ac1707c
+0,     800640,     800640,     1152,     2304, 0x32ea7e95
+0,     801792,     801792,     1152,     2304, 0x265e9a2d
+0,     802944,     802944,     1152,     2304, 0x1c6484d0
+0,     804096,     804096,     1152,     2304, 0x39ae6884
+0,     805248,     805248,     1152,     2304, 0x82ed7bc5
+0,     806400,     806400,     1152,     2304, 0x556b7b3c
+0,     807552,     807552,     1152,     2304, 0xb7f778dd
+0,     808704,     808704,     1152,     2304, 0x74447d55
+0,     809856,     809856,     1152,     2304, 0x0c66861e
+0,     811008,     811008,     1152,     2304, 0x15ba7932
+0,     812160,     812160,     1152,     2304, 0xb19170fc
+0,     813312,     813312,     1152,     2304, 0x19d37551
+0,     814464,     814464,     1152,     2304, 0xdc529142
+0,     815616,     815616,     1152,     2304, 0xf2637e77
+0,     816768,     816768,     1152,     2304, 0xd065944b
+0,     817920,     817920,     1152,     2304, 0x22878123
+0,     819072,     819072,     1152,     2304, 0xc21a8bf7
+0,     820224,     820224,     1152,     2304, 0x2e3582dc
+0,     821376,     821376,     1152,     2304, 0xd42f7987
+0,     822528,     822528,     1152,     2304, 0x69b88236
+0,     823680,     823680,     1152,     2304, 0x7c988f90
+0,     824832,     824832,     1152,     2304, 0x2cd66ded
+0,     825984,     825984,     1152,     2304, 0x3e65828b
+0,     827136,     827136,     1152,     2304, 0x7e9871c9
+0,     828288,     828288,     1152,     2304, 0xf1f2806b
+0,     829440,     829440,     1152,     2304, 0xf5087c7b
+0,     830592,     830592,     1152,     2304, 0x62b98097
+0,     831744,     831744,     1152,     2304, 0xec457c43
+0,     832896,     832896,     1152,     2304, 0x87af87a6
+0,     834048,     834048,     1152,     2304, 0x97cc757d
+0,     835200,     835200,     1152,     2304, 0x08ca76bd
+0,     836352,     836352,     1152,     2304, 0x14ae7cbd
+0,     837504,     837504,     1152,     2304, 0x1f79709a
+0,     838656,     838656,     1152,     2304, 0x17948207
+0,     839808,     839808,     1152,     2304, 0x16ee7228
+0,     840960,     840960,     1152,     2304, 0x76cc82d7
+0,     842112,     842112,     1152,     2304, 0x8f327a8e
+0,     843264,     843264,     1152,     2304, 0x14ee7756
+0,     844416,     844416,     1152,     2304, 0x15996d2f
+0,     845568,     845568,     1152,     2304, 0x4c707d5c
+0,     846720,     846720,     1152,     2304, 0x268c6fee
+0,     847872,     847872,     1152,     2304, 0x6d838c76
+0,     849024,     849024,     1152,     2304, 0xafa17e64
+0,     850176,     850176,     1152,     2304, 0xb6546e66
+0,     851328,     851328,     1152,     2304, 0x945d8b9f
+0,     852480,     852480,     1152,     2304, 0x5bfb7446
+0,     853632,     853632,     1152,     2304, 0xae6086f9
+0,     854784,     854784,     1152,     2304, 0xa01380cd
+0,     855936,     855936,     1152,     2304, 0x06f0828f
+0,     857088,     857088,     1152,     2304, 0x0ae07176
+0,     858240,     858240,     1152,     2304, 0x66f07522
+0,     859392,     859392,     1152,     2304, 0x44018106
+0,     860544,     860544,     1152,     2304, 0x8cd283da
+0,     861696,     861696,     1152,     2304, 0x14257f45
+0,     862848,     862848,     1152,     2304, 0x04979537
+0,     864000,     864000,     1152,     2304, 0x8b5f797c
+0,     865152,     865152,     1152,     2304, 0x12d67493
+0,     866304,     866304,     1152,     2304, 0xc8886a25
+0,     867456,     867456,     1152,     2304, 0x614b803a
+0,     868608,     868608,     1152,     2304, 0x75667d35
+0,     869760,     869760,     1152,     2304, 0xe42c7b00
+0,     870912,     870912,     1152,     2304, 0x37787927
+0,     872064,     872064,     1152,     2304, 0x85db8409
+0,     873216,     873216,     1152,     2304, 0x823b822c
+0,     874368,     874368,     1152,     2304, 0xa1658479
+0,     875520,     875520,     1152,     2304, 0xdbe58ff7
+0,     876672,     876672,     1152,     2304, 0x725175e2
+0,     877824,     877824,     1152,     2304, 0xb2ae7741
+0,     878976,     878976,     1152,     2304, 0x4de169e4
+0,     880128,     880128,     1152,     2304, 0x3cb18530
+0,     881280,     881280,     1152,     2304, 0x5a0c5e7b
diff --git a/tests/ref/fate/filter-hls-append b/tests/ref/fate/filter-hls-append
new file mode 100644
index 0000000000..be65c82f51
--- /dev/null
+++ b/tests/ref/fate/filter-hls-append
@@ -0,0 +1,1538 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+0,          0,          0,     1152,     2304, 0x907cb7fa
+0,       1152,       1152,     1152,     2304, 0xb8dc7525
+0,       2304,       2304,     1152,     2304, 0x3e7d6905
+0,       3456,       3456,     1152,     2304, 0xef47877b
+0,       4608,       4608,     1152,     2304, 0xfe916b7e
+0,       5760,       5760,     1152,     2304, 0xe3d08cde
+0,       6912,       6912,     1152,     2304, 0xff7f86cf
+0,       8064,       8064,     1152,     2304, 0x843e6f95
+0,       9216,       9216,     1152,     2304, 0x81577c26
+0,      10368,      10368,     1152,     2304, 0x04a085d5
+0,      11520,      11520,     1152,     2304, 0x1c5a76f5
+0,      12672,      12672,     1152,     2304, 0x4ee78623
+0,      13824,      13824,     1152,     2304, 0x8ec861dc
+0,      14976,      14976,     1152,     2304, 0x0ca179d8
+0,      16128,      16128,     1152,     2304, 0xc6da750f
+0,      17280,      17280,     1152,     2304, 0xf6bf79b5
+0,      18432,      18432,     1152,     2304, 0x97b88a43
+0,      19584,      19584,     1152,     2304, 0xf13c7b9c
+0,      20736,      20736,     1152,     2304, 0xdfba83af
+0,      21888,      21888,     1152,     2304, 0xc9467d4b
+0,      23040,      23040,     1152,     2304, 0xbbb58e2b
+0,      24192,      24192,     1152,     2304, 0x3a1078ea
+0,      25344,      25344,     1152,     2304, 0xe9587a5c
+0,      26496,      26496,     1152,     2304, 0xef5a8039
+0,      27648,      27648,     1152,     2304, 0x9d5f782f
+0,      28800,      28800,     1152,     2304, 0x1a548291
+0,      29952,      29952,     1152,     2304, 0x07517701
+0,      31104,      31104,     1152,     2304, 0x78127d6e
+0,      32256,      32256,     1152,     2304, 0x62e2788a
+0,      33408,      33408,     1152,     2304, 0x29397ad9
+0,      34560,      34560,     1152,     2304, 0x45da82d6
+0,      35712,      35712,     1152,     2304, 0x8ed66e51
+0,      36864,      36864,     1152,     2304, 0x660775cd
+0,      38016,      38016,     1152,     2304, 0x802c767a
+0,      39168,      39168,     1152,     2304, 0xcc055840
+0,      40320,      40320,     1152,     2304, 0x701b7eaf
+0,      41472,      41472,     1152,     2304, 0x8290749f
+0,      42624,      42624,     1152,     2304, 0x2c7b7d30
+0,      43776,      43776,     1152,     2304, 0xe4f17743
+0,      44928,      44928,     1152,     2304, 0x0e747d6e
+0,      46080,      46080,     1152,     2304, 0xbe7775a0
+0,      47232,      47232,     1152,     2304, 0xcf797673
+0,      48384,      48384,     1152,     2304, 0x29cb7800
+0,      49536,      49536,     1152,     2304, 0xfc947890
+0,      50688,      50688,     1152,     2304, 0x62757fc6
+0,      51840,      51840,     1152,     2304, 0x098876d0
+0,      52992,      52992,     1152,     2304, 0xa9567ee2
+0,      54144,      54144,     1152,     2304, 0xe3bb9173
+0,      55296,      55296,     1152,     2304, 0xcc2d6dee
+0,      56448,      56448,     1152,     2304, 0xe94591ab
+0,      57600,      57600,     1152,     2304, 0x5c7588de
+0,      58752,      58752,     1152,     2304, 0xfd83643c
+0,      59904,      59904,     1152,     2304, 0x528177f1
+0,      61056,      61056,     1152,     2304, 0x65d08474
+0,      62208,      62208,     1152,     2304, 0x738d765b
+0,      63360,      63360,     1152,     2304, 0xdd3d810e
+0,      64512,      64512,     1152,     2304, 0xef4f90d3
+0,      65664,      65664,     1152,     2304, 0x61e28d43
+0,      66816,      66816,     1152,     2304, 0x9a11796b
+0,      67968,      67968,     1152,     2304, 0x96c97dcd
+0,      69120,      69120,     1152,     2304, 0xa8fe8621
+0,      70272,      70272,     1152,     2304, 0x499b7d38
+0,      71424,      71424,     1152,     2304, 0xfcb078a9
+0,      72576,      72576,     1152,     2304, 0x40d78651
+0,      73728,      73728,     1152,     2304, 0xa4af7234
+0,      74880,      74880,     1152,     2304, 0x6831870a
+0,      76032,      76032,     1152,     2304, 0x030e7b9d
+0,      77184,      77184,     1152,     2304, 0x445a75b6
+0,      78336,      78336,     1152,     2304, 0x09857389
+0,      79488,      79488,     1152,     2304, 0x0d018866
+0,      80640,      80640,     1152,     2304, 0x2afe810a
+0,      81792,      81792,     1152,     2304, 0x0bcf7c43
+0,      82944,      82944,     1152,     2304, 0x13737c12
+0,      84096,      84096,     1152,     2304, 0x716c7bba
+0,      85248,      85248,     1152,     2304, 0xb801823b
+0,      86400,      86400,     1152,     2304, 0x0fd573ee
+0,      87552,      87552,     1152,     2304, 0xe1ab879c
+0,      88704,      88704,     1152,     2304, 0x49e6764f
+0,      89856,      89856,     1152,     2304, 0xd5f26ddc
+0,      91008,      91008,     1152,     2304, 0x076775ff
+0,      92160,      92160,     1152,     2304, 0xfbb86fce
+0,      93312,      93312,     1152,     2304, 0x20c56858
+0,      94464,      94464,     1152,     2304, 0x043e6891
+0,      95616,      95616,     1152,     2304, 0x59648729
+0,      96768,      96768,     1152,     2304, 0xd4907a63
+0,      97920,      97920,     1152,     2304, 0xd0208a4c
+0,      99072,      99072,     1152,     2304, 0xce968383
+0,     100224,     100224,     1152,     2304, 0x3cfc7cd1
+0,     101376,     101376,     1152,     2304, 0x628a7bf5
+0,     102528,     102528,     1152,     2304, 0x9cfe8a4f
+0,     103680,     103680,     1152,     2304, 0xdf6f7c6d
+0,     104832,     104832,     1152,     2304, 0x6cf6882a
+0,     105984,     105984,     1152,     2304, 0x099773a3
+0,     107136,     107136,     1152,     2304, 0x4a1c7649
+0,     108288,     108288,     1152,     2304, 0x31ea71cb
+0,     109440,     109440,     1152,     2304, 0xed127ed9
+0,     110592,     110592,     1152,     2304, 0x5b156954
+0,     111744,     111744,     1152,     2304, 0xdd638532
+0,     112896,     112896,     1152,     2304, 0xf1a271f2
+0,     114048,     114048,     1152,     2304, 0x779184d7
+0,     115200,     115200,     1152,     2304, 0x49a88aa8
+0,     116352,     116352,     1152,     2304, 0xa11b7c90
+0,     117504,     117504,     1152,     2304, 0xbf488274
+0,     118656,     118656,     1152,     2304, 0x002f79a8
+0,     119808,     119808,     1152,     2304, 0x0ed97e2f
+0,     120960,     120960,     1152,     2304, 0x7845878f
+0,     122112,     122112,     1152,     2304, 0x46d777dc
+0,     123264,     123264,     1152,     2304, 0x8d0179e3
+0,     124416,     124416,     1152,     2304, 0x38917f9f
+0,     125568,     125568,     1152,     2304, 0x449876e7
+0,     126720,     126720,     1152,     2304, 0x001a8769
+0,     127872,     127872,     1152,     2304, 0x06c1826b
+0,     129024,     129024,     1152,     2304, 0x41b68047
+0,     130176,     130176,     1152,     2304, 0xeb9782c6
+0,     131328,     131328,     1152,     2304, 0x7cd9719c
+0,     132480,     132480,     1152,     2304, 0x3a4a767c
+0,     133632,     133632,     1152,     2304, 0x7f887e81
+0,     134784,     134784,     1152,     2304, 0xf75d714b
+0,     135936,     135936,     1152,     2304, 0x33b57e9f
+0,     137088,     137088,     1152,     2304, 0xc732749e
+0,     138240,     138240,     1152,     2304, 0x386f7e1a
+0,     139392,     139392,     1152,     2304, 0x6b9c767d
+0,     140544,     140544,     1152,     2304, 0x701c83e5
+0,     141696,     141696,     1152,     2304, 0xb92571e1
+0,     142848,     142848,     1152,     2304, 0x833a84bc
+0,     144000,     144000,     1152,     2304, 0x1b6984e0
+0,     145152,     145152,     1152,     2304, 0x1b2474ba
+0,     146304,     146304,     1152,     2304, 0xc22775a6
+0,     147456,     147456,     1152,     2304, 0x3e8f7972
+0,     148608,     148608,     1152,     2304, 0x17a28a65
+0,     149760,     149760,     1152,     2304, 0x9b6178a4
+0,     150912,     150912,     1152,     2304, 0x5d707873
+0,     152064,     152064,     1152,     2304, 0x68e2645a
+0,     153216,     153216,     1152,     2304, 0x1e377d28
+0,     154368,     154368,     1152,     2304, 0x54b384be
+0,     155520,     155520,     1152,     2304, 0x0617808c
+0,     156672,     156672,     1152,     2304, 0xbc2b8a6c
+0,     157824,     157824,     1152,     2304, 0x7ced7180
+0,     158976,     158976,     1152,     2304, 0xf22180ab
+0,     160128,     160128,     1152,     2304, 0xf13682c9
+0,     161280,     161280,     1152,     2304, 0x7eff87fd
+0,     162432,     162432,     1152,     2304, 0x5a0b5cec
+0,     163584,     163584,     1152,     2304, 0x57c18906
+0,     164736,     164736,     1152,     2304, 0xb55a6a16
+0,     165888,     165888,     1152,     2304, 0xf2608371
+0,     167040,     167040,     1152,     2304, 0x36df7576
+0,     168192,     168192,     1152,     2304, 0xdb106fb4
+0,     169344,     169344,     1152,     2304, 0x7e4f85d0
+0,     170496,     170496,     1152,     2304, 0xe3ee78ab
+0,     171648,     171648,     1152,     2304, 0xd36b7dc7
+0,     172800,     172800,     1152,     2304, 0xadab7c5c
+0,     173952,     173952,     1152,     2304, 0x70786f26
+0,     175104,     175104,     1152,     2304, 0xcd5d717e
+0,     176256,     176256,     1152,     2304, 0xc1a96f9a
+0,     177408,     177408,     1152,     2304, 0xad777887
+0,     178560,     178560,     1152,     2304, 0x98277c16
+0,     179712,     179712,     1152,     2304, 0x868882c5
+0,     180864,     180864,     1152,     2304, 0xc48092b9
+0,     182016,     182016,     1152,     2304, 0x230069da
+0,     183168,     183168,     1152,     2304, 0x14147ad6
+0,     184320,     184320,     1152,     2304, 0xc9007172
+0,     185472,     185472,     1152,     2304, 0x85d67bcc
+0,     186624,     186624,     1152,     2304, 0x22418bab
+0,     187776,     187776,     1152,     2304, 0xe53c8b71
+0,     188928,     188928,     1152,     2304, 0x5a1a9053
+0,     190080,     190080,     1152,     2304, 0x9cd179af
+0,     191232,     191232,     1152,     2304, 0xbb3c7d72
+0,     192384,     192384,     1152,     2304, 0x477a8677
+0,     193536,     193536,     1152,     2304, 0xe3337834
+0,     194688,     194688,     1152,     2304, 0x1cb56d77
+0,     195840,     195840,     1152,     2304, 0xe89d6dac
+0,     196992,     196992,     1152,     2304, 0xd468827e
+0,     198144,     198144,     1152,     2304, 0xebc46b87
+0,     199296,     199296,     1152,     2304, 0x5fbb78d2
+0,     200448,     200448,     1152,     2304, 0xa1b483d6
+0,     201600,     201600,     1152,     2304, 0x6fec7cab
+0,     202752,     202752,     1152,     2304, 0xd86d6f6c
+0,     203904,     203904,     1152,     2304, 0x8c2c7d51
+0,     205056,     205056,     1152,     2304, 0xe8377cd7
+0,     206208,     206208,     1152,     2304, 0xb57071b4
+0,     207360,     207360,     1152,     2304, 0xc35c71fd
+0,     208512,     208512,     1152,     2304, 0x789079e9
+0,     209664,     209664,     1152,     2304, 0x413b710e
+0,     210816,     210816,     1152,     2304, 0x82678332
+0,     211968,     211968,     1152,     2304, 0xe1576e75
+0,     213120,     213120,     1152,     2304, 0x7c0b7ad6
+0,     214272,     214272,     1152,     2304, 0xc6b6786d
+0,     215424,     215424,     1152,     2304, 0x736f7b89
+0,     216576,     216576,     1152,     2304, 0x0ded72f1
+0,     217728,     217728,     1152,     2304, 0xcb877a3c
+0,     218880,     218880,     1152,     2304, 0x7c497d40
+0,     220032,     220032,     1152,     2304, 0xaefc798c
+0,     221184,     221184,     1152,     2304, 0x4cce748c
+0,     222336,     222336,     1152,     2304, 0xaa187fbe
+0,     223488,     223488,     1152,     2304, 0x1aa77db9
+0,     224640,     224640,     1152,     2304, 0x9e0074b8
+0,     225792,     225792,     1152,     2304, 0x74ee822b
+0,     226944,     226944,     1152,     2304, 0x975c6ff6
+0,     228096,     228096,     1152,     2304, 0xe1847bb4
+0,     229248,     229248,     1152,     2304, 0xe0828777
+0,     230400,     230400,     1152,     2304, 0xf4027205
+0,     231552,     231552,     1152,     2304, 0x535e7a20
+0,     232704,     232704,     1152,     2304, 0x5bd88404
+0,     233856,     233856,     1152,     2304, 0xf29478b1
+0,     235008,     235008,     1152,     2304, 0x9b7c7d88
+0,     236160,     236160,     1152,     2304, 0xaeb07335
+0,     237312,     237312,     1152,     2304, 0xbef06e08
+0,     238464,     238464,     1152,     2304, 0x795f7b8c
+0,     239616,     239616,     1152,     2304, 0x435a674d
+0,     240768,     240768,     1152,     2304, 0xd8ee7a09
+0,     241920,     241920,     1152,     2304, 0x9059812e
+0,     243072,     243072,     1152,     2304, 0x7481744a
+0,     244224,     244224,     1152,     2304, 0xdff27475
+0,     245376,     245376,     1152,     2304, 0xb17783ab
+0,     246528,     246528,     1152,     2304, 0x42e9706b
+0,     247680,     247680,     1152,     2304, 0x9f0d86b4
+0,     248832,     248832,     1152,     2304, 0x2963955f
+0,     249984,     249984,     1152,     2304, 0x059a6957
+0,     251136,     251136,     1152,     2304, 0x85948206
+0,     252288,     252288,     1152,     2304, 0x185e8400
+0,     253440,     253440,     1152,     2304, 0xe98e70df
+0,     254592,     254592,     1152,     2304, 0x69057b27
+0,     255744,     255744,     1152,     2304, 0x49e26f21
+0,     256896,     256896,     1152,     2304, 0xb0867da5
+0,     258048,     258048,     1152,     2304, 0x785980ff
+0,     259200,     259200,     1152,     2304, 0xf4b774be
+0,     260352,     260352,     1152,     2304, 0x63897e8c
+0,     261504,     261504,     1152,     2304, 0x248b89af
+0,     262656,     262656,     1152,     2304, 0xd3627c4a
+0,     263808,     263808,     1152,     2304, 0x5a4d9349
+0,     264960,     264960,     1152,     2304, 0xe2ce7c4c
+0,     266112,     266112,     1152,     2304, 0x321f6c0b
+0,     267264,     267264,     1152,     2304, 0x51ac74e0
+0,     268416,     268416,     1152,     2304, 0x8efa91ba
+0,     269568,     269568,     1152,     2304, 0x8b4b784c
+0,     270720,     270720,     1152,     2304, 0xe9e4879e
+0,     271872,     271872,     1152,     2304, 0x8dc28081
+0,     273024,     273024,     1152,     2304, 0x44b477b0
+0,     274176,     274176,     1152,     2304, 0xf7b67084
+0,     275328,     275328,     1152,     2304, 0x4b198c17
+0,     276480,     276480,     1152,     2304, 0x9c947194
+0,     277632,     277632,     1152,     2304, 0x6eaa7f15
+0,     278784,     278784,     1152,     2304, 0x119f7c1d
+0,     279936,     279936,     1152,     2304, 0x157b7f43
+0,     281088,     281088,     1152,     2304, 0xcd2e7acc
+0,     282240,     282240,     1152,     2304, 0x97597247
+0,     283392,     283392,     1152,     2304, 0x7ba06acb
+0,     284544,     284544,     1152,     2304, 0x233c7995
+0,     285696,     285696,     1152,     2304, 0x08e28587
+0,     286848,     286848,     1152,     2304, 0x92be84b5
+0,     288000,     288000,     1152,     2304, 0xbb857d43
+0,     289152,     289152,     1152,     2304, 0x168e7c74
+0,     290304,     290304,     1152,     2304, 0xac5465d9
+0,     291456,     291456,     1152,     2304, 0x18f58831
+0,     292608,     292608,     1152,     2304, 0x19b48196
+0,     293760,     293760,     1152,     2304, 0x20297653
+0,     294912,     294912,     1152,     2304, 0x93397a82
+0,     296064,     296064,     1152,     2304, 0x65ea7deb
+0,     297216,     297216,     1152,     2304, 0xd7316e20
+0,     298368,     298368,     1152,     2304, 0x94107f2b
+0,     299520,     299520,     1152,     2304, 0xec3b7dc6
+0,     300672,     300672,     1152,     2304, 0x2d3783aa
+0,     301824,     301824,     1152,     2304, 0x07e47340
+0,     302976,     302976,     1152,     2304, 0xbc117893
+0,     304128,     304128,     1152,     2304, 0x8bd97851
+0,     305280,     305280,     1152,     2304, 0xc27376a9
+0,     306432,     306432,     1152,     2304, 0x30d88c83
+0,     307584,     307584,     1152,     2304, 0x19c2704c
+0,     308736,     308736,     1152,     2304, 0x093b7b6e
+0,     309888,     309888,     1152,     2304, 0x221a7349
+0,     311040,     311040,     1152,     2304, 0xa4fd82cd
+0,     312192,     312192,     1152,     2304, 0x762e6bc9
+0,     313344,     313344,     1152,     2304, 0x270075d4
+0,     314496,     314496,     1152,     2304, 0xa5f27b90
+0,     315648,     315648,     1152,     2304, 0xf72e7edc
+0,     316800,     316800,     1152,     2304, 0x42178486
+0,     317952,     317952,     1152,     2304, 0x5f7978e8
+0,     319104,     319104,     1152,     2304, 0x5d7c6703
+0,     320256,     320256,     1152,     2304, 0x2c4483d5
+0,     321408,     321408,     1152,     2304, 0x31bd951d
+0,     322560,     322560,     1152,     2304, 0x99487af0
+0,     323712,     323712,     1152,     2304, 0x0bd27ee7
+0,     324864,     324864,     1152,     2304, 0xc3e07ac4
+0,     326016,     326016,     1152,     2304, 0x98a16ba7
+0,     327168,     327168,     1152,     2304, 0xd7a5747b
+0,     328320,     328320,     1152,     2304, 0x96fb811c
+0,     329472,     329472,     1152,     2304, 0x7cee8109
+0,     330624,     330624,     1152,     2304, 0x52b18ba2
+0,     331776,     331776,     1152,     2304, 0x33be8861
+0,     332928,     332928,     1152,     2304, 0xf41282a0
+0,     334080,     334080,     1152,     2304, 0xb4268993
+0,     335232,     335232,     1152,     2304, 0x52126a1c
+0,     336384,     336384,     1152,     2304, 0x050b6f7a
+0,     337536,     337536,     1152,     2304, 0x67a26fc3
+0,     338688,     338688,     1152,     2304, 0x966c7cf2
+0,     339840,     339840,     1152,     2304, 0x22097750
+0,     340992,     340992,     1152,     2304, 0xfbb0796c
+0,     342144,     342144,     1152,     2304, 0xbd508964
+0,     343296,     343296,     1152,     2304, 0xc24478d8
+0,     344448,     344448,     1152,     2304, 0x3913769d
+0,     345600,     345600,     1152,     2304, 0x8aab872f
+0,     346752,     346752,     1152,     2304, 0x7cb4822f
+0,     347904,     347904,     1152,     2304, 0xea318144
+0,     349056,     349056,     1152,     2304, 0xaf0f86d2
+0,     350208,     350208,     1152,     2304, 0x24f27598
+0,     351360,     351360,     1152,     2304, 0xd76f6d40
+0,     352512,     352512,     1152,     2304, 0x085071a7
+0,     353664,     353664,     1152,     2304, 0x1d11704c
+0,     354816,     354816,     1152,     2304, 0x21517cbd
+0,     355968,     355968,     1152,     2304, 0xcdca8d32
+0,     357120,     357120,     1152,     2304, 0x71c18433
+0,     358272,     358272,     1152,     2304, 0xd39d7d81
+0,     359424,     359424,     1152,     2304, 0x7a0d7a43
+0,     360576,     360576,     1152,     2304, 0x007c8884
+0,     361728,     361728,     1152,     2304, 0x403282d0
+0,     362880,     362880,     1152,     2304, 0xe3737214
+0,     364032,     364032,     1152,     2304, 0xaf906f47
+0,     365184,     365184,     1152,     2304, 0x54f57b3b
+0,     366336,     366336,     1152,     2304, 0x29be7791
+0,     367488,     367488,     1152,     2304, 0xe3c663d5
+0,     368640,     368640,     1152,     2304, 0xd7258238
+0,     369792,     369792,     1152,     2304, 0x3719820d
+0,     370944,     370944,     1152,     2304, 0xbe04814f
+0,     372096,     372096,     1152,     2304, 0x556c815e
+0,     373248,     373248,     1152,     2304, 0xb2447e10
+0,     374400,     374400,     1152,     2304, 0x7c16867c
+0,     375552,     375552,     1152,     2304, 0x6a7b78ed
+0,     376704,     376704,     1152,     2304, 0x5d307b81
+0,     377856,     377856,     1152,     2304, 0xaab680d3
+0,     379008,     379008,     1152,     2304, 0xb5d37a23
+0,     380160,     380160,     1152,     2304, 0x7f7d6f76
+0,     381312,     381312,     1152,     2304, 0x317a8296
+0,     382464,     382464,     1152,     2304, 0x8a987b3d
+0,     383616,     383616,     1152,     2304, 0x4f317a27
+0,     384768,     384768,     1152,     2304, 0xfc65852f
+0,     385920,     385920,     1152,     2304, 0x40527719
+0,     387072,     387072,     1152,     2304, 0x84988e13
+0,     388224,     388224,     1152,     2304, 0x318b6ddc
+0,     389376,     389376,     1152,     2304, 0x94cf7939
+0,     390528,     390528,     1152,     2304, 0x6f22819d
+0,     391680,     391680,     1152,     2304, 0xa7dd80a9
+0,     392832,     392832,     1152,     2304, 0x1c7968fa
+0,     393984,     393984,     1152,     2304, 0xd9937bae
+0,     395136,     395136,     1152,     2304, 0xf7137cf9
+0,     396288,     396288,     1152,     2304, 0xeadb84b5
+0,     397440,     397440,     1152,     2304, 0x9a2390ac
+0,     398592,     398592,     1152,     2304, 0xdb6a73f6
+0,     399744,     399744,     1152,     2304, 0x69e07507
+0,     400896,     400896,     1152,     2304, 0xbc8478b2
+0,     402048,     402048,     1152,     2304, 0x32cf8638
+0,     403200,     403200,     1152,     2304, 0x2b8d755a
+0,     404352,     404352,     1152,     2304, 0x52e05bd2
+0,     405504,     405504,     1152,     2304, 0x2aed8c49
+0,     406656,     406656,     1152,     2304, 0x587a896e
+0,     407808,     407808,     1152,     2304, 0x6dd87dee
+0,     408960,     408960,     1152,     2304, 0xd2858338
+0,     410112,     410112,     1152,     2304, 0xd90f7842
+0,     411264,     411264,     1152,     2304, 0xd6fb6d4a
+0,     412416,     412416,     1152,     2304, 0x85498aea
+0,     413568,     413568,     1152,     2304, 0x18597790
+0,     414720,     414720,     1152,     2304, 0x3cd78fea
+0,     415872,     415872,     1152,     2304, 0x94377fbc
+0,     417024,     417024,     1152,     2304, 0xf9db73f5
+0,     418176,     418176,     1152,     2304, 0x14fb6fca
+0,     419328,     419328,     1152,     2304, 0xe9d17d69
+0,     420480,     420480,     1152,     2304, 0xdeb57286
+0,     421632,     421632,     1152,     2304, 0xa5d37e17
+0,     422784,     422784,     1152,     2304, 0xcf6882fb
+0,     423936,     423936,     1152,     2304, 0x31758066
+0,     425088,     425088,     1152,     2304, 0x6b4d8175
+0,     426240,     426240,     1152,     2304, 0x2a3d7f8e
+0,     427392,     427392,     1152,     2304, 0xc066743b
+0,     428544,     428544,     1152,     2304, 0xcab88146
+0,     429696,     429696,     1152,     2304, 0x2b4c6e13
+0,     430848,     430848,     1152,     2304, 0x00b36b6f
+0,     432000,     432000,     1152,     2304, 0x664a88d3
+0,     433152,     433152,     1152,     2304, 0x18a66f76
+0,     434304,     434304,     1152,     2304, 0x4f828a8b
+0,     435456,     435456,     1152,     2304, 0x9cc7728e
+0,     436608,     436608,     1152,     2304, 0xbe357936
+0,     437760,     437760,     1152,     2304, 0x19878f8d
+0,     438912,     438912,     1152,     2304, 0x227b7c71
+0,     440064,     440064,     1152,     2304, 0xf7c879ec
+0,     441216,     441216,     1152,     2304, 0x0bca7b50
+0,     442368,     442368,     1152,     2304, 0xe4398304
+0,     443520,     443520,     1152,     2304, 0xf5da75c7
+0,     444672,     444672,     1152,     2304, 0x9f9070a3
+0,     445824,     445824,     1152,     2304, 0x789076f6
+0,     446976,     446976,     1152,     2304, 0x362977cc
+0,     448128,     448128,     1152,     2304, 0x4d0a8928
+0,     449280,     449280,     1152,     2304, 0x1bb767ec
+0,     450432,     450432,     1152,     2304, 0xbe727fa5
+0,     451584,     451584,     1152,     2304, 0x27f38347
+0,     452736,     452736,     1152,     2304, 0x0a3c8783
+0,     453888,     453888,     1152,     2304, 0x8249639c
+0,     455040,     455040,     1152,     2304, 0x3b076f69
+0,     456192,     456192,     1152,     2304, 0xd9597ee3
+0,     457344,     457344,     1152,     2304, 0x026e7fad
+0,     458496,     458496,     1152,     2304, 0xbd7a6de4
+0,     459648,     459648,     1152,     2304, 0x7d718a4d
+0,     460800,     460800,     1152,     2304, 0x1f5e83b4
+0,     461952,     461952,     1152,     2304, 0x597d7755
+0,     463104,     463104,     1152,     2304, 0x3fb080bd
+0,     464256,     464256,     1152,     2304, 0xdcbd7b16
+0,     465408,     465408,     1152,     2304, 0x5c48865f
+0,     466560,     466560,     1152,     2304, 0xcda37ae8
+0,     467712,     467712,     1152,     2304, 0x4810796d
+0,     468864,     468864,     1152,     2304, 0x34317fd0
+0,     470016,     470016,     1152,     2304, 0x5c0e7456
+0,     471168,     471168,     1152,     2304, 0x44d78040
+0,     472320,     472320,     1152,     2304, 0x88587882
+0,     473472,     473472,     1152,     2304, 0x77687d5e
+0,     474624,     474624,     1152,     2304, 0x116d68bb
+0,     475776,     475776,     1152,     2304, 0x3e5b6f60
+0,     476928,     476928,     1152,     2304, 0x64ea783c
+0,     478080,     478080,     1152,     2304, 0x23547f7d
+0,     479232,     479232,     1152,     2304, 0x2eee7892
+0,     480384,     480384,     1152,     2304, 0xfb837cba
+0,     481536,     481536,     1152,     2304, 0x86518209
+0,     482688,     482688,     1152,     2304, 0x672f7bba
+0,     483840,     483840,     1152,     2304, 0x6ab583fb
+0,     484992,     484992,     1152,     2304, 0xc1297428
+0,     486144,     486144,     1152,     2304, 0x164e7717
+0,     487296,     487296,     1152,     2304, 0xb754976d
+0,     488448,     488448,     1152,     2304, 0xb99d81b2
+0,     489600,     489600,     1152,     2304, 0x79046fd6
+0,     490752,     490752,     1152,     2304, 0x9a3f8426
+0,     491904,     491904,     1152,     2304, 0x896371f5
+0,     493056,     493056,     1152,     2304, 0x63d1799f
+0,     494208,     494208,     1152,     2304, 0x4842844e
+0,     495360,     495360,     1152,     2304, 0x850e8372
+0,     496512,     496512,     1152,     2304, 0x85d07022
+0,     497664,     497664,     1152,     2304, 0x9e6683d1
+0,     498816,     498816,     1152,     2304, 0x301b8981
+0,     499968,     499968,     1152,     2304, 0x1f1e98c5
+0,     501120,     501120,     1152,     2304, 0xc8797b03
+0,     502272,     502272,     1152,     2304, 0xf9d189f5
+0,     503424,     503424,     1152,     2304, 0x0e0d88be
+0,     504576,     504576,     1152,     2304, 0x6c1d7843
+0,     505728,     505728,     1152,     2304, 0xd13b8a38
+0,     506880,     506880,     1152,     2304, 0x9b8f773c
+0,     508032,     508032,     1152,     2304, 0x9acd7309
+0,     509184,     509184,     1152,     2304, 0x5e7d7d15
+0,     510336,     510336,     1152,     2304, 0xf09d7640
+0,     511488,     511488,     1152,     2304, 0xaebb718f
+0,     512640,     512640,     1152,     2304, 0x0c8570f4
+0,     513792,     513792,     1152,     2304, 0x3c93862c
+0,     514944,     514944,     1152,     2304, 0xcee46696
+0,     516096,     516096,     1152,     2304, 0x01ba7e20
+0,     517248,     517248,     1152,     2304, 0x7fcb7a09
+0,     518400,     518400,     1152,     2304, 0xddf18c14
+0,     519552,     519552,     1152,     2304, 0xd2e97eeb
+0,     520704,     520704,     1152,     2304, 0x514d8719
+0,     521856,     521856,     1152,     2304, 0xe89279c9
+0,     523008,     523008,     1152,     2304, 0x806d6a95
+0,     524160,     524160,     1152,     2304, 0xbc7a8a60
+0,     525312,     525312,     1152,     2304, 0x302f8fa8
+0,     526464,     526464,     1152,     2304, 0xb136784c
+0,     527616,     527616,     1152,     2304, 0x9b0f6aab
+0,     528768,     528768,     1152,     2304, 0xd8e27582
+0,     529920,     529920,     1152,     2304, 0xdaaf78b1
+0,     531072,     531072,     1152,     2304, 0x65967f5f
+0,     532224,     532224,     1152,     2304, 0x6f917aa4
+0,     533376,     533376,     1152,     2304, 0x7f607444
+0,     534528,     534528,     1152,     2304, 0xfd316f2c
+0,     535680,     535680,     1152,     2304, 0x776e83c7
+0,     536832,     536832,     1152,     2304, 0xb9c17e16
+0,     537984,     537984,     1152,     2304, 0xdf287de8
+0,     539136,     539136,     1152,     2304, 0xf33d96a3
+0,     540288,     540288,     1152,     2304, 0xad216e5b
+0,     541440,     541440,     1152,     2304, 0x4a328342
+0,     542592,     542592,     1152,     2304, 0xcf3f8079
+0,     543744,     543744,     1152,     2304, 0xb46f77b0
+0,     544896,     544896,     1152,     2304, 0x3199713d
+0,     546048,     546048,     1152,     2304, 0x5e667a0d
+0,     547200,     547200,     1152,     2304, 0xa3047ae3
+0,     548352,     548352,     1152,     2304, 0x9edf8594
+0,     549504,     549504,     1152,     2304, 0xd16382d5
+0,     550656,     550656,     1152,     2304, 0x6e838328
+0,     551808,     551808,     1152,     2304, 0xa1f697c1
+0,     552960,     552960,     1152,     2304, 0xefcc749c
+0,     554112,     554112,     1152,     2304, 0x1f94839e
+0,     555264,     555264,     1152,     2304, 0x429e7c5b
+0,     556416,     556416,     1152,     2304, 0x9b59711c
+0,     557568,     557568,     1152,     2304, 0xdac27323
+0,     558720,     558720,     1152,     2304, 0xa4856d2b
+0,     559872,     559872,     1152,     2304, 0x07a37498
+0,     561024,     561024,     1152,     2304, 0xe1ce7512
+0,     562176,     562176,     1152,     2304, 0x15e182c3
+0,     563328,     563328,     1152,     2304, 0x0fa46b8c
+0,     564480,     564480,     1152,     2304, 0xbdf07bfd
+0,     565632,     565632,     1152,     2304, 0xe0238b2a
+0,     566784,     566784,     1152,     2304, 0xab537267
+0,     567936,     567936,     1152,     2304, 0xd46b75f3
+0,     569088,     569088,     1152,     2304, 0xec73794b
+0,     570240,     570240,     1152,     2304, 0x680580c1
+0,     571392,     571392,     1152,     2304, 0x1ace8f6c
+0,     572544,     572544,     1152,     2304, 0x19d583ac
+0,     573696,     573696,     1152,     2304, 0x4b6b8105
+0,     574848,     574848,     1152,     2304, 0x392a78b2
+0,     576000,     576000,     1152,     2304, 0xd3916dad
+0,     577152,     577152,     1152,     2304, 0x569c7a75
+0,     578304,     578304,     1152,     2304, 0xf5ac814b
+0,     579456,     579456,     1152,     2304, 0x18d77e98
+0,     580608,     580608,     1152,     2304, 0x007074ce
+0,     581760,     581760,     1152,     2304, 0x0fe38373
+0,     582912,     582912,     1152,     2304, 0x5a967920
+0,     584064,     584064,     1152,     2304, 0x22167501
+0,     585216,     585216,     1152,     2304, 0xf0828cab
+0,     586368,     586368,     1152,     2304, 0xaeec71b7
+0,     587520,     587520,     1152,     2304, 0xc47b62ff
+0,     588672,     588672,     1152,     2304, 0xab688478
+0,     589824,     589824,     1152,     2304, 0xf35e7bd2
+0,     590976,     590976,     1152,     2304, 0x9cff763e
+0,     592128,     592128,     1152,     2304, 0x59568dc8
+0,     593280,     593280,     1152,     2304, 0x51a278ac
+0,     594432,     594432,     1152,     2304, 0xc08a6e68
+0,     595584,     595584,     1152,     2304, 0xd3067ef4
+0,     596736,     596736,     1152,     2304, 0x54767c49
+0,     597888,     597888,     1152,     2304, 0xf8ff8386
+0,     599040,     599040,     1152,     2304, 0xef267f63
+0,     600192,     600192,     1152,     2304, 0xe2537cd9
+0,     601344,     601344,     1152,     2304, 0x77a57680
+0,     602496,     602496,     1152,     2304, 0x325c74ad
+0,     603648,     603648,     1152,     2304, 0xd7fe87c4
+0,     604800,     604800,     1152,     2304, 0x2e756310
+0,     605952,     605952,     1152,     2304, 0x6a81796b
+0,     607104,     607104,     1152,     2304, 0x2f057daf
+0,     608256,     608256,     1152,     2304, 0xcd9f7c9d
+0,     609408,     609408,     1152,     2304, 0xc91560a0
+0,     610560,     610560,     1152,     2304, 0x962a91eb
+0,     611712,     611712,     1152,     2304, 0xa0ff7416
+0,     612864,     612864,     1152,     2304, 0xcb5c7dff
+0,     614016,     614016,     1152,     2304, 0xd3527041
+0,     615168,     615168,     1152,     2304, 0xc89d77c2
+0,     616320,     616320,     1152,     2304, 0xe1ce7ccf
+0,     617472,     617472,     1152,     2304, 0xe3417c4c
+0,     618624,     618624,     1152,     2304, 0x3f1a7166
+0,     619776,     619776,     1152,     2304, 0xcdcc7e23
+0,     620928,     620928,     1152,     2304, 0x4e727e97
+0,     622080,     622080,     1152,     2304, 0x53427ff1
+0,     623232,     623232,     1152,     2304, 0x173f6ca9
+0,     624384,     624384,     1152,     2304, 0x962887ec
+0,     625536,     625536,     1152,     2304, 0xcbec67f4
+0,     626688,     626688,     1152,     2304, 0x7a2c943d
+0,     627840,     627840,     1152,     2304, 0x8b877570
+0,     628992,     628992,     1152,     2304, 0xcf337323
+0,     630144,     630144,     1152,     2304, 0x8c8682a4
+0,     631296,     631296,     1152,     2304, 0x94c3753c
+0,     632448,     632448,     1152,     2304, 0x86898d79
+0,     633600,     633600,     1152,     2304, 0xdf667312
+0,     634752,     634752,     1152,     2304, 0x062f8ba8
+0,     635904,     635904,     1152,     2304, 0xa2c36f08
+0,     637056,     637056,     1152,     2304, 0x5bca7358
+0,     638208,     638208,     1152,     2304, 0x5648804d
+0,     639360,     639360,     1152,     2304, 0xefac87c8
+0,     640512,     640512,     1152,     2304, 0x66bf7dcf
+0,     641664,     641664,     1152,     2304, 0x62ad73bc
+0,     642816,     642816,     1152,     2304, 0x72fe630c
+0,     643968,     643968,     1152,     2304, 0xeebe87da
+0,     645120,     645120,     1152,     2304, 0x11c870cf
+0,     646272,     646272,     1152,     2304, 0x18fb7c27
+0,     647424,     647424,     1152,     2304, 0x39047145
+0,     648576,     648576,     1152,     2304, 0xdcf07032
+0,     649728,     649728,     1152,     2304, 0x61027c50
+0,     650880,     650880,     1152,     2304, 0x6e2e89de
+0,     652032,     652032,     1152,     2304, 0xc50c6d1d
+0,     653184,     653184,     1152,     2304, 0xeed587ee
+0,     654336,     654336,     1152,     2304, 0xe38269c7
+0,     655488,     655488,     1152,     2304, 0xcf66806e
+0,     656640,     656640,     1152,     2304, 0x2d3b7c1b
+0,     657792,     657792,     1152,     2304, 0xa4127d48
+0,     658944,     658944,     1152,     2304, 0x480b8325
+0,     660096,     660096,     1152,     2304, 0xc1527221
+0,     661248,     661248,     1152,     2304, 0x94c1769a
+0,     662400,     662400,     1152,     2304, 0xcfb37271
+0,     663552,     663552,     1152,     2304, 0x946d7a96
+0,     664704,     664704,     1152,     2304, 0xdfc18e50
+0,     665856,     665856,     1152,     2304, 0x10c48393
+0,     667008,     667008,     1152,     2304, 0x58556b10
+0,     668160,     668160,     1152,     2304, 0x997b7993
+0,     669312,     669312,     1152,     2304, 0x4a787992
+0,     670464,     670464,     1152,     2304, 0x11406c20
+0,     671616,     671616,     1152,     2304, 0x04a4874a
+0,     672768,     672768,     1152,     2304, 0xf3077164
+0,     673920,     673920,     1152,     2304, 0x08ac80e3
+0,     675072,     675072,     1152,     2304, 0x268370d0
+0,     676224,     676224,     1152,     2304, 0x1d137778
+0,     677376,     677376,     1152,     2304, 0xfa148e97
+0,     678528,     678528,     1152,     2304, 0xec50717c
+0,     679680,     679680,     1152,     2304, 0xcbf46b75
+0,     680832,     680832,     1152,     2304, 0xd4168038
+0,     681984,     681984,     1152,     2304, 0xdd9577f0
+0,     683136,     683136,     1152,     2304, 0xc7077685
+0,     684288,     684288,     1152,     2304, 0x34d25e91
+0,     685440,     685440,     1152,     2304, 0x96537e6d
+0,     686592,     686592,     1152,     2304, 0xb12e7940
+0,     687744,     687744,     1152,     2304, 0x861d64c0
+0,     688896,     688896,     1152,     2304, 0xa2bc64ed
+0,     690048,     690048,     1152,     2304, 0x0c5f8261
+0,     691200,     691200,     1152,     2304, 0x540584ff
+0,     692352,     692352,     1152,     2304, 0xe8328b09
+0,     693504,     693504,     1152,     2304, 0x1e777079
+0,     694656,     694656,     1152,     2304, 0x453483b4
+0,     695808,     695808,     1152,     2304, 0x1cab7a1e
+0,     696960,     696960,     1152,     2304, 0xcb37856d
+0,     698112,     698112,     1152,     2304, 0x5a4883ed
+0,     699264,     699264,     1152,     2304, 0xd1f27cbf
+0,     700416,     700416,     1152,     2304, 0x0d377a4d
+0,     701568,     701568,     1152,     2304, 0x264e76df
+0,     702720,     702720,     1152,     2304, 0x2a68771e
+0,     703872,     703872,     1152,     2304, 0xcb317a31
+0,     705024,     705024,     1152,     2304, 0xfc5d7a27
+0,     706176,     706176,     1152,     2304, 0x6e067d96
+0,     707328,     707328,     1152,     2304, 0x0c538560
+0,     708480,     708480,     1152,     2304, 0xfbad717a
+0,     709632,     709632,     1152,     2304, 0xf9fc7608
+0,     710784,     710784,     1152,     2304, 0xb1817c8f
+0,     711936,     711936,     1152,     2304, 0x57c37f82
+0,     713088,     713088,     1152,     2304, 0x8cac8356
+0,     714240,     714240,     1152,     2304, 0x97108186
+0,     715392,     715392,     1152,     2304, 0x095d81bb
+0,     716544,     716544,     1152,     2304, 0x475f6b2b
+0,     717696,     717696,     1152,     2304, 0xdf7c8cc5
+0,     718848,     718848,     1152,     2304, 0x979c77be
+0,     720000,     720000,     1152,     2304, 0x56a7844b
+0,     721152,     721152,     1152,     2304, 0x7ee46b21
+0,     722304,     722304,     1152,     2304, 0x05b67220
+0,     723456,     723456,     1152,     2304, 0x25787252
+0,     724608,     724608,     1152,     2304, 0x8ad278ad
+0,     725760,     725760,     1152,     2304, 0x67bd722e
+0,     726912,     726912,     1152,     2304, 0x204f77be
+0,     728064,     728064,     1152,     2304, 0x82d27ae2
+0,     729216,     729216,     1152,     2304, 0x23fa82e4
+0,     730368,     730368,     1152,     2304, 0xa9cf8159
+0,     731520,     731520,     1152,     2304, 0x13f08749
+0,     732672,     732672,     1152,     2304, 0xf84f71b5
+0,     733824,     733824,     1152,     2304, 0x1cb777c8
+0,     734976,     734976,     1152,     2304, 0x11236722
+0,     736128,     736128,     1152,     2304, 0x10197cac
+0,     737280,     737280,     1152,     2304, 0xbd417e65
+0,     738432,     738432,     1152,     2304, 0x9a1c7d05
+0,     739584,     739584,     1152,     2304, 0x4c3a85de
+0,     740736,     740736,     1152,     2304, 0x03816eb7
+0,     741888,     741888,     1152,     2304, 0x80186e6c
+0,     743040,     743040,     1152,     2304, 0x5c097928
+0,     744192,     744192,     1152,     2304, 0x94aa823d
+0,     745344,     745344,     1152,     2304, 0xa1c27f04
+0,     746496,     746496,     1152,     2304, 0x6ddb74a9
+0,     747648,     747648,     1152,     2304, 0x5ea67901
+0,     748800,     748800,     1152,     2304, 0xd710742d
+0,     749952,     749952,     1152,     2304, 0xf8c27add
+0,     751104,     751104,     1152,     2304, 0xf1717011
+0,     752256,     752256,     1152,     2304, 0xb59072d0
+0,     753408,     753408,     1152,     2304, 0xc8dc84a7
+0,     754560,     754560,     1152,     2304, 0x33116737
+0,     755712,     755712,     1152,     2304, 0x86216bdd
+0,     756864,     756864,     1152,     2304, 0xa2f87866
+0,     758016,     758016,     1152,     2304, 0x5d77771e
+0,     759168,     759168,     1152,     2304, 0x5d8c77fd
+0,     760320,     760320,     1152,     2304, 0x23cc89cb
+0,     761472,     761472,     1152,     2304, 0x334e7407
+0,     762624,     762624,     1152,     2304, 0x01c976ff
+0,     763776,     763776,     1152,     2304, 0x3a3b7b15
+0,     764928,     764928,     1152,     2304, 0xfa427de9
+0,     766080,     766080,     1152,     2304, 0xbeaa7c91
+0,     767232,     767232,     1152,     2304, 0xd6988b31
+0,     768384,     768384,     1152,     2304, 0x4db47f80
+0,     769536,     769536,     1152,     2304, 0xea687d9e
+0,     770688,     770688,     1152,     2304, 0x1a6281ce
+0,     771840,     771840,     1152,     2304, 0xe1958003
+0,     772992,     772992,     1152,     2304, 0xb4ae7c5e
+0,     774144,     774144,     1152,     2304, 0x28827c8a
+0,     775296,     775296,     1152,     2304, 0x1fb88b25
+0,     776448,     776448,     1152,     2304, 0x588d71e8
+0,     777600,     777600,     1152,     2304, 0x68227c34
+0,     778752,     778752,     1152,     2304, 0xee4d73e8
+0,     779904,     779904,     1152,     2304, 0x69287c6d
+0,     781056,     781056,     1152,     2304, 0xbb04926a
+0,     782208,     782208,     1152,     2304, 0x89456cec
+0,     783360,     783360,     1152,     2304, 0xabe18992
+0,     784512,     784512,     1152,     2304, 0x50cc7f6c
+0,     785664,     785664,     1152,     2304, 0x6d7270be
+0,     786816,     786816,     1152,     2304, 0x664c6fef
+0,     787968,     787968,     1152,     2304, 0x7f7982f3
+0,     789120,     789120,     1152,     2304, 0x6ca170e9
+0,     790272,     790272,     1152,     2304, 0x36437d5b
+0,     791424,     791424,     1152,     2304, 0xfd2380e8
+0,     792576,     792576,     1152,     2304, 0x2e3c6e9f
+0,     793728,     793728,     1152,     2304, 0xc8427f3f
+0,     794880,     794880,     1152,     2304, 0x962a79ad
+0,     796032,     796032,     1152,     2304, 0xc9597c8b
+0,     797184,     797184,     1152,     2304, 0x899580bb
+0,     798336,     798336,     1152,     2304, 0x2d179dff
+0,     799488,     799488,     1152,     2304, 0x4ac1707c
+0,     800640,     800640,     1152,     2304, 0x32ea7e95
+0,     801792,     801792,     1152,     2304, 0x265e9a2d
+0,     802944,     802944,     1152,     2304, 0x1c6484d0
+0,     804096,     804096,     1152,     2304, 0x39ae6884
+0,     805248,     805248,     1152,     2304, 0x82ed7bc5
+0,     806400,     806400,     1152,     2304, 0x556b7b3c
+0,     807552,     807552,     1152,     2304, 0xb7f778dd
+0,     808704,     808704,     1152,     2304, 0x74447d55
+0,     809856,     809856,     1152,     2304, 0x0c66861e
+0,     811008,     811008,     1152,     2304, 0x15ba7932
+0,     812160,     812160,     1152,     2304, 0xb19170fc
+0,     813312,     813312,     1152,     2304, 0x19d37551
+0,     814464,     814464,     1152,     2304, 0xdc529142
+0,     815616,     815616,     1152,     2304, 0xf2637e77
+0,     816768,     816768,     1152,     2304, 0xd065944b
+0,     817920,     817920,     1152,     2304, 0x22878123
+0,     819072,     819072,     1152,     2304, 0xc21a8bf7
+0,     820224,     820224,     1152,     2304, 0x2e3582dc
+0,     821376,     821376,     1152,     2304, 0xd42f7987
+0,     822528,     822528,     1152,     2304, 0x69b88236
+0,     823680,     823680,     1152,     2304, 0x7c988f90
+0,     824832,     824832,     1152,     2304, 0x2cd66ded
+0,     825984,     825984,     1152,     2304, 0x3e65828b
+0,     827136,     827136,     1152,     2304, 0x7e9871c9
+0,     828288,     828288,     1152,     2304, 0xf1f2806b
+0,     829440,     829440,     1152,     2304, 0xf5087c7b
+0,     830592,     830592,     1152,     2304, 0x62b98097
+0,     831744,     831744,     1152,     2304, 0xec457c43
+0,     832896,     832896,     1152,     2304, 0x87af87a6
+0,     834048,     834048,     1152,     2304, 0x97cc757d
+0,     835200,     835200,     1152,     2304, 0x08ca76bd
+0,     836352,     836352,     1152,     2304, 0x14ae7cbd
+0,     837504,     837504,     1152,     2304, 0x1f79709a
+0,     838656,     838656,     1152,     2304, 0x17948207
+0,     839808,     839808,     1152,     2304, 0x16ee7228
+0,     840960,     840960,     1152,     2304, 0x76cc82d7
+0,     842112,     842112,     1152,     2304, 0x8f327a8e
+0,     843264,     843264,     1152,     2304, 0x14ee7756
+0,     844416,     844416,     1152,     2304, 0x15996d2f
+0,     845568,     845568,     1152,     2304, 0x4c707d5c
+0,     846720,     846720,     1152,     2304, 0x268c6fee
+0,     847872,     847872,     1152,     2304, 0x6d838c76
+0,     849024,     849024,     1152,     2304, 0xafa17e64
+0,     850176,     850176,     1152,     2304, 0xb6546e66
+0,     851328,     851328,     1152,     2304, 0x945d8b9f
+0,     852480,     852480,     1152,     2304, 0x5bfb7446
+0,     853632,     853632,     1152,     2304, 0xae6086f9
+0,     854784,     854784,     1152,     2304, 0xa01380cd
+0,     855936,     855936,     1152,     2304, 0x06f0828f
+0,     857088,     857088,     1152,     2304, 0x0ae07176
+0,     858240,     858240,     1152,     2304, 0x66f07522
+0,     859392,     859392,     1152,     2304, 0x44018106
+0,     860544,     860544,     1152,     2304, 0x8cd283da
+0,     861696,     861696,     1152,     2304, 0x14257f45
+0,     862848,     862848,     1152,     2304, 0x04979537
+0,     864000,     864000,     1152,     2304, 0x8b5f797c
+0,     865152,     865152,     1152,     2304, 0x12d67493
+0,     866304,     866304,     1152,     2304, 0xc8886a25
+0,     867456,     867456,     1152,     2304, 0x614b803a
+0,     868608,     868608,     1152,     2304, 0x75667d35
+0,     869760,     869760,     1152,     2304, 0xe42c7b00
+0,     870912,     870912,     1152,     2304, 0x37787927
+0,     872064,     872064,     1152,     2304, 0x85db8409
+0,     873216,     873216,     1152,     2304, 0x823b822c
+0,     874368,     874368,     1152,     2304, 0xa1658479
+0,     875520,     875520,     1152,     2304, 0xdbe58ff7
+0,     876672,     876672,     1152,     2304, 0x725175e2
+0,     877824,     877824,     1152,     2304, 0xb2ae7741
+0,     878976,     878976,     1152,     2304, 0x4de169e4
+0,     880128,     880128,     1152,     2304, 0x3cb18530
+0,     881280,     881280,     1152,     2304, 0x5a0c5e7b
+0,     882432,     882432,     1152,     2304, 0x4e1f68b6
+0,     883584,     883584,     1152,     2304, 0x9a0c7525
+0,     884736,     884736,     1152,     2304, 0x86ae6a04
+0,     885888,     885888,     1152,     2304, 0xf508877c
+0,     887040,     887040,     1152,     2304, 0x29746d7c
+0,     888192,     888192,     1152,     2304, 0x24078edb
+0,     889344,     889344,     1152,     2304, 0x4f9784d2
+0,     890496,     890496,     1152,     2304, 0x24186e95
+0,     891648,     891648,     1152,     2304, 0xd1927b28
+0,     892800,     892800,     1152,     2304, 0xc77283d5
+0,     893952,     893952,     1152,     2304, 0xc0ad73f8
+0,     895104,     895104,     1152,     2304, 0x0de78524
+0,     896256,     896256,     1152,     2304, 0x8b0061dc
+0,     897408,     897408,     1152,     2304, 0x37c77ad6
+0,     898560,     898560,     1152,     2304, 0x5eae7410
+0,     899712,     899712,     1152,     2304, 0x72d97ab5
+0,     900864,     900864,     1152,     2304, 0x1afd8745
+0,     902016,     902016,     1152,     2304, 0xe30b7c9b
+0,     903168,     903168,     1152,     2304, 0xe86480b3
+0,     904320,     904320,     1152,     2304, 0xb9c77a4e
+0,     905472,     905472,     1152,     2304, 0x64508f2a
+0,     906624,     906624,     1152,     2304, 0x839a74ed
+0,     907776,     907776,     1152,     2304, 0x12147a5d
+0,     908928,     908928,     1152,     2304, 0x33b07d3b
+0,     910080,     910080,     1152,     2304, 0x65e67731
+0,     911232,     911232,     1152,     2304, 0x8d1c8191
+0,     912384,     912384,     1152,     2304, 0xada17701
+0,     913536,     913536,     1152,     2304, 0x49d47f6c
+0,     914688,     914688,     1152,     2304, 0x5df97989
+0,     915840,     915840,     1152,     2304, 0x0db17ad9
+0,     916992,     916992,     1152,     2304, 0x0d3281d7
+0,     918144,     918144,     1152,     2304, 0x2503704f
+0,     919296,     919296,     1152,     2304, 0xdf7c73d0
+0,     920448,     920448,     1152,     2304, 0x93dd737c
+0,     921600,     921600,     1152,     2304, 0x48ed5740
+0,     922752,     922752,     1152,     2304, 0x6d477eaf
+0,     923904,     923904,     1152,     2304, 0xe72373a1
+0,     925056,     925056,     1152,     2304, 0x7d3e7e2e
+0,     926208,     926208,     1152,     2304, 0x0d167743
+0,     927360,     927360,     1152,     2304, 0xc2d97f6c
+0,     928512,     928512,     1152,     2304, 0xc66175a0
+0,     929664,     929664,     1152,     2304, 0xd0127475
+0,     930816,     930816,     1152,     2304, 0xdbf57801
+0,     931968,     931968,     1152,     2304, 0x52b47a8e
+0,     933120,     933120,     1152,     2304, 0xc96b80c5
+0,     934272,     934272,     1152,     2304, 0x070c76cf
+0,     935424,     935424,     1152,     2304, 0x2aa07ee2
+0,     936576,     936576,     1152,     2304, 0x04059074
+0,     937728,     937728,     1152,     2304, 0x228f6def
+0,     938880,     938880,     1152,     2304, 0x927893a8
+0,     940032,     940032,     1152,     2304, 0x581a87df
+0,     941184,     941184,     1152,     2304, 0x0d3f653c
+0,     942336,     942336,     1152,     2304, 0xc0e775f3
+0,     943488,     943488,     1152,     2304, 0x41d98473
+0,     944640,     944640,     1152,     2304, 0x68fb775a
+0,     945792,     945792,     1152,     2304, 0x81e0810e
+0,     946944,     946944,     1152,     2304, 0xf35790d3
+0,     948096,     948096,     1152,     2304, 0xc1468c45
+0,     949248,     949248,     1152,     2304, 0x6949796a
+0,     950400,     950400,     1152,     2304, 0xa0bb7dcd
+0,     951552,     951552,     1152,     2304, 0x50af8424
+0,     952704,     952704,     1152,     2304, 0x449b7d37
+0,     953856,     953856,     1152,     2304, 0xcf2779a8
+0,     955008,     955008,     1152,     2304, 0x069d894e
+0,     956160,     956160,     1152,     2304, 0x41bd7334
+0,     957312,     957312,     1152,     2304, 0x0dfd8c05
+0,     958464,     958464,     1152,     2304, 0x2ce27b9d
+0,     959616,     959616,     1152,     2304, 0x422875b5
+0,     960768,     960768,     1152,     2304, 0xd5297389
+0,     961920,     961920,     1152,     2304, 0x49ed8668
+0,     963072,     963072,     1152,     2304, 0x2a9a810b
+0,     964224,     964224,     1152,     2304, 0x5a3f7b43
+0,     965376,     965376,     1152,     2304, 0x32087c12
+0,     966528,     966528,     1152,     2304, 0x759c7bba
+0,     967680,     967680,     1152,     2304, 0x5b26823b
+0,     968832,     968832,     1152,     2304, 0xeeb872ef
+0,     969984,     969984,     1152,     2304, 0x6eb0869d
+0,     971136,     971136,     1152,     2304, 0x4b3e764f
+0,     972288,     972288,     1152,     2304, 0x30a66fdb
+0,     973440,     973440,     1152,     2304, 0x958374ff
+0,     974592,     974592,     1152,     2304, 0x411b71cc
+0,     975744,     975744,     1152,     2304, 0x80136759
+0,     976896,     976896,     1152,     2304, 0x05ed6793
+0,     978048,     978048,     1152,     2304, 0x48f18827
+0,     979200,     979200,     1152,     2304, 0xb40d7866
+0,     980352,     980352,     1152,     2304, 0xcad18c4a
+0,     981504,     981504,     1152,     2304, 0x9ad68582
+0,     982656,     982656,     1152,     2304, 0x3ad17fce
+0,     983808,     983808,     1152,     2304, 0x824b7af6
+0,     984960,     984960,     1152,     2304, 0xcc9d894f
+0,     986112,     986112,     1152,     2304, 0x46167a70
+0,     987264,     987264,     1152,     2304, 0x2479872a
+0,     988416,     988416,     1152,     2304, 0x58cb72a5
+0,     989568,     989568,     1152,     2304, 0x01957747
+0,     990720,     990720,     1152,     2304, 0x6df172cb
+0,     991872,     991872,     1152,     2304, 0x9ebd7ed9
+0,     993024,     993024,     1152,     2304, 0x89436a53
+0,     994176,     994176,     1152,     2304, 0xcce78433
+0,     995328,     995328,     1152,     2304, 0x1b7a70f2
+0,     996480,     996480,     1152,     2304, 0x530584d7
+0,     997632,     997632,     1152,     2304, 0xda158aa9
+0,     998784,     998784,     1152,     2304, 0xe85e7b90
+0,     999936,     999936,     1152,     2304, 0xa8ac8176
+0,    1001088,    1001088,     1152,     2304, 0xe43578a9
+0,    1002240,    1002240,     1152,     2304, 0x9ecc7c30
+0,    1003392,    1003392,     1152,     2304, 0x1cbd8591
+0,    1004544,    1004544,     1152,     2304, 0x84917bd9
+0,    1005696,    1005696,     1152,     2304, 0xea8477e4
+0,    1006848,    1006848,     1152,     2304, 0xf50c7ea1
+0,    1008000,    1008000,     1152,     2304, 0xc85e76e7
+0,    1009152,    1009152,     1152,     2304, 0xa5148768
+0,    1010304,    1010304,     1152,     2304, 0x2bd5846a
+0,    1011456,    1011456,     1152,     2304, 0x1cd88641
+0,    1012608,    1012608,     1152,     2304, 0x04b883c5
+0,    1013760,    1013760,     1152,     2304, 0x5bf1719b
+0,    1014912,    1014912,     1152,     2304, 0x0abe777c
+0,    1016064,    1016064,     1152,     2304, 0xc74a7f7f
+0,    1017216,    1017216,     1152,     2304, 0xd36a724b
+0,    1018368,    1018368,     1152,     2304, 0x4ae67e9e
+0,    1019520,    1019520,     1152,     2304, 0xfb6173a0
+0,    1020672,    1020672,     1152,     2304, 0x31d77e19
+0,    1021824,    1021824,     1152,     2304, 0x6153767d
+0,    1022976,    1022976,     1152,     2304, 0xe40d84e4
+0,    1024128,    1024128,     1152,     2304, 0xc8ef71e2
+0,    1025280,    1025280,     1152,     2304, 0xdeca81be
+0,    1026432,    1026432,     1152,     2304, 0x75da85df
+0,    1027584,    1027584,     1152,     2304, 0x6c8e71bd
+0,    1028736,    1028736,     1152,     2304, 0x6f8576a4
+0,    1029888,    1029888,     1152,     2304, 0xe6637b71
+0,    1031040,    1031040,     1152,     2304, 0xddfe8866
+0,    1032192,    1032192,     1152,     2304, 0xa08578a5
+0,    1033344,    1033344,     1152,     2304, 0x72af7873
+0,    1034496,    1034496,     1152,     2304, 0xb550615c
+0,    1035648,    1035648,     1152,     2304, 0x9ef87d28
+0,    1036800,    1036800,     1152,     2304, 0xe30d83bf
+0,    1037952,    1037952,     1152,     2304, 0xf030818c
+0,    1039104,    1039104,     1152,     2304, 0x1e23896c
+0,    1040256,    1040256,     1152,     2304, 0xf4c87180
+0,    1041408,    1041408,     1152,     2304, 0xe34181aa
+0,    1042560,    1042560,     1152,     2304, 0x660681cb
+0,    1043712,    1043712,     1152,     2304, 0x7ebb87fc
+0,    1044864,    1044864,     1152,     2304, 0xa8305eeb
+0,    1046016,    1046016,     1152,     2304, 0xea898906
+0,    1047168,    1047168,     1152,     2304, 0x342b6c13
+0,    1048320,    1048320,     1152,     2304, 0x7fd18372
+0,    1049472,    1049472,     1152,     2304, 0x965c7377
+0,    1050624,    1050624,     1152,     2304, 0xb53b70b3
+0,    1051776,    1051776,     1152,     2304, 0xd54884d1
+0,    1052928,    1052928,     1152,     2304, 0x546d77ac
+0,    1054080,    1054080,     1152,     2304, 0xd7a77dc7
+0,    1055232,    1055232,     1152,     2304, 0x4b0e7c5c
+0,    1056384,    1056384,     1152,     2304, 0x346d7026
+0,    1057536,    1057536,     1152,     2304, 0x3f346e81
+0,    1058688,    1058688,     1152,     2304, 0x3f167098
+0,    1059840,    1059840,     1152,     2304, 0x1c857987
+0,    1060992,    1060992,     1152,     2304, 0xf9317c16
+0,    1062144,    1062144,     1152,     2304, 0x25ea82c4
+0,    1063296,    1063296,     1152,     2304, 0x2b0f90bb
+0,    1064448,    1064448,     1152,     2304, 0x999668db
+0,    1065600,    1065600,     1152,     2304, 0x9a0676da
+0,    1066752,    1066752,     1152,     2304, 0x97a87172
+0,    1067904,    1067904,     1152,     2304, 0x323d7ace
+0,    1069056,    1069056,     1152,     2304, 0x1b538baa
+0,    1070208,    1070208,     1152,     2304, 0xeb208b72
+0,    1071360,    1071360,     1152,     2304, 0x36c69152
+0,    1072512,    1072512,     1152,     2304, 0x570c7bac
+0,    1073664,    1073664,     1152,     2304, 0xd7287c72
+0,    1074816,    1074816,     1152,     2304, 0xc4d78776
+0,    1075968,    1075968,     1152,     2304, 0xdcbb7735
+0,    1077120,    1077120,     1152,     2304, 0x08066d78
+0,    1078272,    1078272,     1152,     2304, 0x5cb96bad
+0,    1079424,    1079424,     1152,     2304, 0x30d58180
+0,    1080576,    1080576,     1152,     2304, 0x3ac96b87
+0,    1081728,    1081728,     1152,     2304, 0x1fc878d2
+0,    1082880,    1082880,     1152,     2304, 0x2c7c85d4
+0,    1084032,    1084032,     1152,     2304, 0x6c307caa
+0,    1085184,    1085184,     1152,     2304, 0x647b6d6e
+0,    1086336,    1086336,     1152,     2304, 0xfbef7e51
+0,    1087488,    1087488,     1152,     2304, 0x27867bd7
+0,    1088640,    1088640,     1152,     2304, 0xa2b875b1
+0,    1089792,    1089792,     1152,     2304, 0xc7dd73fb
+0,    1090944,    1090944,     1152,     2304, 0x717e79e9
+0,    1092096,    1092096,     1152,     2304, 0xfecb710d
+0,    1093248,    1093248,     1152,     2304, 0xa5308333
+0,    1094400,    1094400,     1152,     2304, 0x92fe6b77
+0,    1095552,    1095552,     1152,     2304, 0x7db17ad6
+0,    1096704,    1096704,     1152,     2304, 0x1248786d
+0,    1097856,    1097856,     1152,     2304, 0xf3647a8a
+0,    1099008,    1099008,     1152,     2304, 0x7b2173f0
+0,    1100160,    1100160,     1152,     2304, 0xfd1f7a3c
+0,    1101312,    1101312,     1152,     2304, 0x09e57f3e
+0,    1102464,    1102464,     1152,     2304, 0x13d7798d
+0,    1103616,    1103616,     1152,     2304, 0x7d4d758a
+0,    1104768,    1104768,     1152,     2304, 0xdf1a80be
+0,    1105920,    1105920,     1152,     2304, 0xb91b7cb9
+0,    1107072,    1107072,     1152,     2304, 0x102e73ba
+0,    1108224,    1108224,     1152,     2304, 0x8dce8428
+0,    1109376,    1109376,     1152,     2304, 0xdf9070f6
+0,    1110528,    1110528,     1152,     2304, 0x27d77bb4
+0,    1111680,    1111680,     1152,     2304, 0x2f8a8579
+0,    1112832,    1112832,     1152,     2304, 0xd1e27204
+0,    1113984,    1113984,     1152,     2304, 0x4f087920
+0,    1115136,    1115136,     1152,     2304, 0x69f58306
+0,    1116288,    1116288,     1152,     2304, 0xfc7378b0
+0,    1117440,    1117440,     1152,     2304, 0x8b167d89
+0,    1118592,    1118592,     1152,     2304, 0x0c867235
+0,    1119744,    1119744,     1152,     2304, 0xc3126e09
+0,    1120896,    1120896,     1152,     2304, 0x7d097d89
+0,    1122048,    1122048,     1152,     2304, 0x73dc664e
+0,    1123200,    1123200,     1152,     2304, 0xdc247a0a
+0,    1124352,    1124352,     1152,     2304, 0xaa8d7f2f
+0,    1125504,    1125504,     1152,     2304, 0x9a1d744b
+0,    1126656,    1126656,     1152,     2304, 0xd9e87475
+0,    1127808,    1127808,     1152,     2304, 0xf6f182ab
+0,    1128960,    1128960,     1152,     2304, 0x4937706b
+0,    1130112,    1130112,     1152,     2304, 0x837189b1
+0,    1131264,    1131264,     1152,     2304, 0xd565975d
+0,    1132416,    1132416,     1152,     2304, 0xc6156a56
+0,    1133568,    1133568,     1152,     2304, 0xcd9c8107
+0,    1134720,    1134720,     1152,     2304, 0x1f868400
+0,    1135872,    1135872,     1152,     2304, 0xeddb71e0
+0,    1137024,    1137024,     1152,     2304, 0x5fa2782a
+0,    1138176,    1138176,     1152,     2304, 0x9b076e22
+0,    1139328,    1139328,     1152,     2304, 0x90027ba7
+0,    1140480,    1140480,     1152,     2304, 0x40a481fd
+0,    1141632,    1141632,     1152,     2304, 0x240873bf
+0,    1142784,    1142784,     1152,     2304, 0x28cd7d8e
+0,    1143936,    1143936,     1152,     2304, 0x5d4287b0
+0,    1145088,    1145088,     1152,     2304, 0xf9567c4b
+0,    1146240,    1146240,     1152,     2304, 0x67dd924a
+0,    1147392,    1147392,     1152,     2304, 0x33d37b4c
+0,    1148544,    1148544,     1152,     2304, 0x37316d0b
+0,    1149696,    1149696,     1152,     2304, 0x43a877dc
+0,    1150848,    1150848,     1152,     2304, 0x44fc90bc
+0,    1152000,    1152000,     1152,     2304, 0x90f5774c
+0,    1153152,    1153152,     1152,     2304, 0x106e85a0
+0,    1154304,    1154304,     1152,     2304, 0xb78b7f83
+0,    1155456,    1155456,     1152,     2304, 0x3c3a77af
+0,    1156608,    1156608,     1152,     2304, 0x7a5f7282
+0,    1157760,    1157760,     1152,     2304, 0x164d891a
+0,    1158912,    1158912,     1152,     2304, 0x930a7194
+0,    1160064,    1160064,     1152,     2304, 0xb2628013
+0,    1161216,    1161216,     1152,     2304, 0x3adf7e1c
+0,    1162368,    1162368,     1152,     2304, 0x48627c45
+0,    1163520,    1163520,     1152,     2304, 0xa3367cca
+0,    1164672,    1164672,     1152,     2304, 0x9cf77248
+0,    1165824,    1165824,     1152,     2304, 0x75a86acb
+0,    1166976,    1166976,     1152,     2304, 0x75487698
+0,    1168128,    1168128,     1152,     2304, 0xd65b8389
+0,    1169280,    1169280,     1152,     2304, 0xb71d84b5
+0,    1170432,    1170432,     1152,     2304, 0xdca87e42
+0,    1171584,    1171584,     1152,     2304, 0x44dd7d72
+0,    1172736,    1172736,     1152,     2304, 0xb29465da
+0,    1173888,    1173888,     1152,     2304, 0x88ed8930
+0,    1175040,    1175040,     1152,     2304, 0xabdd8096
+0,    1176192,    1176192,     1152,     2304, 0xe5f57653
+0,    1177344,    1177344,     1152,     2304, 0x7c777984
+0,    1178496,    1178496,     1152,     2304, 0x631d7deb
+0,    1179648,    1179648,     1152,     2304, 0x70d36e1f
+0,    1180800,    1180800,     1152,     2304, 0x412c802b
+0,    1181952,    1181952,     1152,     2304, 0xacc281c1
+0,    1183104,    1183104,     1152,     2304, 0x569d86a8
+0,    1184256,    1184256,     1152,     2304, 0x5c69743f
+0,    1185408,    1185408,     1152,     2304, 0x29637794
+0,    1186560,    1186560,     1152,     2304, 0x0d1b7a4f
+0,    1187712,    1187712,     1152,     2304, 0xfc6978a6
+0,    1188864,    1188864,     1152,     2304, 0x9b178987
+0,    1190016,    1190016,     1152,     2304, 0xe436714a
+0,    1191168,    1191168,     1152,     2304, 0x783a7b6e
+0,    1192320,    1192320,     1152,     2304, 0x6ff16f4e
+0,    1193472,    1193472,     1152,     2304, 0x9fd582cc
+0,    1194624,    1194624,     1152,     2304, 0xff0d6bc9
+0,    1195776,    1195776,     1152,     2304, 0x6f4975d5
+0,    1196928,    1196928,     1152,     2304, 0x94a77a90
+0,    1198080,    1198080,     1152,     2304, 0x764f80db
+0,    1199232,    1199232,     1152,     2304, 0x68e88782
+0,    1200384,    1200384,     1152,     2304, 0x91a378e8
+0,    1201536,    1201536,     1152,     2304, 0x29f26903
+0,    1202688,    1202688,     1152,     2304, 0xc3b684d4
+0,    1203840,    1203840,     1152,     2304, 0x7d95921f
+0,    1204992,    1204992,     1152,     2304, 0x876a7ded
+0,    1206144,    1206144,     1152,     2304, 0x0fbe7ee8
+0,    1207296,    1207296,     1152,     2304, 0x7d0f78c5
+0,    1208448,    1208448,     1152,     2304, 0xce906ba8
+0,    1209600,    1209600,     1152,     2304, 0xd281747b
+0,    1210752,    1210752,     1152,     2304, 0xec38811b
+0,    1211904,    1211904,     1152,     2304, 0x8170810a
+0,    1213056,    1213056,     1152,     2304, 0x4d858ba2
+0,    1214208,    1214208,     1152,     2304, 0x8c798662
+0,    1215360,    1215360,     1152,     2304, 0x23a8879b
+0,    1216512,    1216512,     1152,     2304, 0x9d0c8894
+0,    1217664,    1217664,     1152,     2304, 0xf07c681f
+0,    1218816,    1218816,     1152,     2304, 0x03ab6f7a
+0,    1219968,    1219968,     1152,     2304, 0x88c170c2
+0,    1221120,    1221120,     1152,     2304, 0xeb977bf3
+0,    1222272,    1222272,     1152,     2304, 0x33b6774f
+0,    1223424,    1223424,     1152,     2304, 0x534c776e
+0,    1224576,    1224576,     1152,     2304, 0x33c4826a
+0,    1225728,    1225728,     1152,     2304, 0xdb9878d8
+0,    1226880,    1226880,     1152,     2304, 0xeffd789b
+0,    1228032,    1228032,     1152,     2304, 0x2cc9862f
+0,    1229184,    1229184,     1152,     2304, 0x9bf18131
+0,    1230336,    1230336,     1152,     2304, 0xfa078144
+0,    1231488,    1231488,     1152,     2304, 0x922885d2
+0,    1232640,    1232640,     1152,     2304, 0x29ad7796
+0,    1233792,    1233792,     1152,     2304, 0x62766f3f
+0,    1234944,    1234944,     1152,     2304, 0x72a873a5
+0,    1236096,    1236096,     1152,     2304, 0x65176e4d
+0,    1237248,    1237248,     1152,     2304, 0x75447cbd
+0,    1238400,    1238400,     1152,     2304, 0x83528e32
+0,    1239552,    1239552,     1152,     2304, 0x0c758531
+0,    1240704,    1240704,     1152,     2304, 0x4a5c7a84
+0,    1241856,    1241856,     1152,     2304, 0xd5937648
+0,    1243008,    1243008,     1152,     2304, 0xef5c8983
+0,    1244160,    1244160,     1152,     2304, 0x24b281d0
+0,    1245312,    1245312,     1152,     2304, 0xc0af7017
+0,    1246464,    1246464,     1152,     2304, 0xf1cc7145
+0,    1247616,    1247616,     1152,     2304, 0x7ddb7a3b
+0,    1248768,    1248768,     1152,     2304, 0xd2e57692
+0,    1249920,    1249920,     1152,     2304, 0x7abc61d6
+0,    1251072,    1251072,     1152,     2304, 0x44a68338
+0,    1252224,    1252224,     1152,     2304, 0x9cad810e
+0,    1253376,    1253376,     1152,     2304, 0xbf3a7f51
+0,    1254528,    1254528,     1152,     2304, 0x52ac815e
+0,    1255680,    1255680,     1152,     2304, 0xdf327e10
+0,    1256832,    1256832,     1152,     2304, 0x797c867b
+0,    1257984,    1257984,     1152,     2304, 0x685b79ec
+0,    1259136,    1259136,     1152,     2304, 0x60267b82
+0,    1260288,    1260288,     1152,     2304, 0xe70e7fd4
+0,    1261440,    1261440,     1152,     2304, 0xaf197a22
+0,    1262592,    1262592,     1152,     2304, 0xf5e57075
+0,    1263744,    1263744,     1152,     2304, 0xa86f8197
+0,    1264896,    1264896,     1152,     2304, 0x922c7b3d
+0,    1266048,    1266048,     1152,     2304, 0x8e3b7929
+0,    1267200,    1267200,     1152,     2304, 0x816f862d
+0,    1268352,    1268352,     1152,     2304, 0xc09c761a
+0,    1269504,    1269504,     1152,     2304, 0xf1cd9010
+0,    1270656,    1270656,     1152,     2304, 0xcf5c72d8
+0,    1271808,    1271808,     1152,     2304, 0x0e607a38
+0,    1272960,    1272960,     1152,     2304, 0x6cb0819c
+0,    1274112,    1274112,     1152,     2304, 0x9e2880aa
+0,    1275264,    1275264,     1152,     2304, 0xb46f69f9
+0,    1276416,    1276416,     1152,     2304, 0xbc807eab
+0,    1277568,    1277568,     1152,     2304, 0x91237cf9
+0,    1278720,    1278720,     1152,     2304, 0xb6bf82b6
+0,    1279872,    1279872,     1152,     2304, 0xfcd58daf
+0,    1281024,    1281024,     1152,     2304, 0x53b176f4
+0,    1282176,    1282176,     1152,     2304, 0xc79d7507
+0,    1283328,    1283328,     1152,     2304, 0x810677b2
+0,    1284480,    1284480,     1152,     2304, 0x13148737
+0,    1285632,    1285632,     1152,     2304, 0x2eb5755a
+0,    1286784,    1286784,     1152,     2304, 0x5bec5cd2
+0,    1287936,    1287936,     1152,     2304, 0x66c68d47
+0,    1289088,    1289088,     1152,     2304, 0x55d18770
+0,    1290240,    1290240,     1152,     2304, 0x13997def
+0,    1291392,    1291392,     1152,     2304, 0x23cd8437
+0,    1292544,    1292544,     1152,     2304, 0x5cd07942
+0,    1293696,    1293696,     1152,     2304, 0x43ab6b4c
+0,    1294848,    1294848,     1152,     2304, 0xc55788ec
+0,    1296000,    1296000,     1152,     2304, 0x6b69788e
+0,    1297152,    1297152,     1152,     2304, 0xcacb8fea
+0,    1298304,    1298304,     1152,     2304, 0x83407ebd
+0,    1299456,    1299456,     1152,     2304, 0x998275f3
+0,    1300608,    1300608,     1152,     2304, 0x0ca76dcc
+0,    1301760,    1301760,     1152,     2304, 0xa1ff7c6a
+0,    1302912,    1302912,     1152,     2304, 0x4a597683
+0,    1304064,    1304064,     1152,     2304, 0xc8e57f16
+0,    1305216,    1305216,     1152,     2304, 0x376d82fb
+0,    1306368,    1306368,     1152,     2304, 0x489b8164
+0,    1307520,    1307520,     1152,     2304, 0xece27f77
+0,    1308672,    1308672,     1152,     2304, 0x4c197e8f
+0,    1309824,    1309824,     1152,     2304, 0x6eb07739
+0,    1310976,    1310976,     1152,     2304, 0xef628145
+0,    1312128,    1312128,     1152,     2304, 0x549d6f12
+0,    1313280,    1313280,     1152,     2304, 0xbe566b70
+0,    1314432,    1314432,     1152,     2304, 0x2bde87d3
+0,    1315584,    1315584,     1152,     2304, 0x0ffd7175
+0,    1316736,    1316736,     1152,     2304, 0x47d28a8b
+0,    1317888,    1317888,     1152,     2304, 0x6f6c718e
+0,    1319040,    1319040,     1152,     2304, 0x665e7937
+0,    1320192,    1320192,     1152,     2304, 0x73538e8d
+0,    1321344,    1321344,     1152,     2304, 0x56167d71
+0,    1322496,    1322496,     1152,     2304, 0x3d0278ed
+0,    1323648,    1323648,     1152,     2304, 0x9baf7a51
+0,    1324800,    1324800,     1152,     2304, 0x8c058105
+0,    1325952,    1325952,     1152,     2304, 0x2b9573ca
+0,    1327104,    1327104,     1152,     2304, 0x4a2271a1
+0,    1328256,    1328256,     1152,     2304, 0x3d5276f6
+0,    1329408,    1329408,     1152,     2304, 0x43c076cd
+0,    1330560,    1330560,     1152,     2304, 0x4fec8929
+0,    1331712,    1331712,     1152,     2304, 0xaa7167ec
+0,    1332864,    1332864,     1152,     2304, 0x39ff7ea5
+0,    1334016,    1334016,     1152,     2304, 0x2dd58348
+0,    1335168,    1335168,     1152,     2304, 0x03fc8782
+0,    1336320,    1336320,     1152,     2304, 0x55a4649c
+0,    1337472,    1337472,     1152,     2304, 0x71407067
+0,    1338624,    1338624,     1152,     2304, 0x3b667ce6
+0,    1339776,    1339776,     1152,     2304, 0xb12e81aa
+0,    1340928,    1340928,     1152,     2304, 0xc1646ee3
+0,    1342080,    1342080,     1152,     2304, 0x6b55884f
+0,    1343232,    1343232,     1152,     2304, 0x292382b5
+0,    1344384,    1344384,     1152,     2304, 0x18f97854
+0,    1345536,    1345536,     1152,     2304, 0x47a480be
+0,    1346688,    1346688,     1152,     2304, 0xe0857b16
+0,    1347840,    1347840,     1152,     2304, 0xe3368462
+0,    1348992,    1348992,     1152,     2304, 0xced17ae8
+0,    1350144,    1350144,     1152,     2304, 0x4020796d
+0,    1351296,    1351296,     1152,     2304, 0x26797fd0
+0,    1352448,    1352448,     1152,     2304, 0x0e087554
+0,    1353600,    1353600,     1152,     2304, 0xf8868040
+0,    1354752,    1354752,     1152,     2304, 0x3f0a7784
+0,    1355904,    1355904,     1152,     2304, 0xbe517d5e
+0,    1357056,    1357056,     1152,     2304, 0xed0b66bc
+0,    1358208,    1358208,     1152,     2304, 0x79b96d63
+0,    1359360,    1359360,     1152,     2304, 0x1ab4793a
+0,    1360512,    1360512,     1152,     2304, 0xd2db7f7d
+0,    1361664,    1361664,     1152,     2304, 0x91017992
+0,    1362816,    1362816,     1152,     2304, 0xf88f7cb9
+0,    1363968,    1363968,     1152,     2304, 0x0cc98309
+0,    1365120,    1365120,     1152,     2304, 0x38b77cb8
+0,    1366272,    1366272,     1152,     2304, 0x0cb185f9
+0,    1367424,    1367424,     1152,     2304, 0xc4a27824
+0,    1368576,    1368576,     1152,     2304, 0x1ce97618
+0,    1369728,    1369728,     1152,     2304, 0x1423976e
+0,    1370880,    1370880,     1152,     2304, 0xdbb781b2
+0,    1372032,    1372032,     1152,     2304, 0x156d71d3
+0,    1373184,    1373184,     1152,     2304, 0xce228625
+0,    1374336,    1374336,     1152,     2304, 0x318072f3
+0,    1375488,    1375488,     1152,     2304, 0x464b77a1
+0,    1376640,    1376640,     1152,     2304, 0x0204854d
+0,    1377792,    1377792,     1152,     2304, 0x498c8373
+0,    1378944,    1378944,     1152,     2304, 0xfe1a6e23
+0,    1380096,    1380096,     1152,     2304, 0x705284d0
+0,    1381248,    1381248,     1152,     2304, 0x91848980
+0,    1382400,    1382400,     1152,     2304, 0x259098c5
+0,    1383552,    1383552,     1152,     2304, 0x52b07c02
+0,    1384704,    1384704,     1152,     2304, 0x017289f6
+0,    1385856,    1385856,     1152,     2304, 0xb87687bf
+0,    1387008,    1387008,     1152,     2304, 0x72de7843
+0,    1388160,    1388160,     1152,     2304, 0x3daf8939
+0,    1389312,    1389312,     1152,     2304, 0x0dfb763c
+0,    1390464,    1390464,     1152,     2304, 0xc3017408
+0,    1391616,    1391616,     1152,     2304, 0x73f27f14
+0,    1392768,    1392768,     1152,     2304, 0x1c517541
+0,    1393920,    1393920,     1152,     2304, 0xf390748b
+0,    1395072,    1395072,     1152,     2304, 0xe6ac71f3
+0,    1396224,    1396224,     1152,     2304, 0x6277862d
+0,    1397376,    1397376,     1152,     2304, 0x923d6794
+0,    1398528,    1398528,     1152,     2304, 0x320a7f20
+0,    1399680,    1399680,     1152,     2304, 0x12f07a09
+0,    1400832,    1400832,     1152,     2304, 0xf9568b14
+0,    1401984,    1401984,     1152,     2304, 0x4d787fea
+0,    1403136,    1403136,     1152,     2304, 0x57c5861a
+0,    1404288,    1404288,     1152,     2304, 0x826b7cc7
+0,    1405440,    1405440,     1152,     2304, 0x7d056a94
+0,    1406592,    1406592,     1152,     2304, 0xbf3e8a60
+0,    1407744,    1407744,     1152,     2304, 0x5e518cab
+0,    1408896,    1408896,     1152,     2304, 0x64e7794b
+0,    1410048,    1410048,     1152,     2304, 0x9c9569ac
+0,    1411200,    1411200,     1152,     2304, 0xde167582
+0,    1412352,    1412352,     1152,     2304, 0xdd8f78b1
+0,    1413504,    1413504,     1152,     2304, 0xec577e60
+0,    1414656,    1414656,     1152,     2304, 0x06877aa4
+0,    1415808,    1415808,     1152,     2304, 0xb5157742
+0,    1416960,    1416960,     1152,     2304, 0xf9be6f2b
+0,    1418112,    1418112,     1152,     2304, 0xf95784c7
+0,    1419264,    1419264,     1152,     2304, 0x5aec7e15
+0,    1420416,    1420416,     1152,     2304, 0x666e7ce9
+0,    1421568,    1421568,     1152,     2304, 0xa76393a7
+0,    1422720,    1422720,     1152,     2304, 0xd1bb6d5c
+0,    1423872,    1423872,     1152,     2304, 0x48d88144
+0,    1425024,    1425024,     1152,     2304, 0xa7df8177
+0,    1426176,    1426176,     1152,     2304, 0x906476b1
+0,    1427328,    1427328,     1152,     2304, 0x9f46723d
+0,    1428480,    1428480,     1152,     2304, 0xa6d37a0c
+0,    1429632,    1429632,     1152,     2304, 0x73e57be2
+0,    1430784,    1430784,     1152,     2304, 0x666e8594
+0,    1431936,    1431936,     1152,     2304, 0xd4b481d7
+0,    1433088,    1433088,     1152,     2304, 0xfced8427
+0,    1434240,    1434240,     1152,     2304, 0x743999bd
+0,    1435392,    1435392,     1152,     2304, 0x71dd759b
+0,    1436544,    1436544,     1152,     2304, 0x54a2849e
+0,    1437696,    1437696,     1152,     2304, 0x07377f58
+0,    1438848,    1438848,     1152,     2304, 0xfd8f721a
+0,    1440000,    1440000,     1152,     2304, 0x4d917422
+0,    1441152,    1441152,     1152,     2304, 0xaaa46e2b
+0,    1442304,    1442304,     1152,     2304, 0x49e57597
+0,    1443456,    1443456,     1152,     2304, 0x29337511
+0,    1444608,    1444608,     1152,     2304, 0xdfee84c2
+0,    1445760,    1445760,     1152,     2304, 0x57266b8c
+0,    1446912,    1446912,     1152,     2304, 0x5bf27cfc
+0,    1448064,    1448064,     1152,     2304, 0xdc4b8b29
+0,    1449216,    1449216,     1152,     2304, 0xf49e7466
+0,    1450368,    1450368,     1152,     2304, 0xf1d975f3
+0,    1451520,    1451520,     1152,     2304, 0xc863774d
+0,    1452672,    1452672,     1152,     2304, 0x5fab80c0
+0,    1453824,    1453824,     1152,     2304, 0x19548d6f
+0,    1454976,    1454976,     1152,     2304, 0x165983ac
+0,    1456128,    1456128,     1152,     2304, 0x2d658203
+0,    1457280,    1457280,     1152,     2304, 0x717678b2
+0,    1458432,    1458432,     1152,     2304, 0x1ed26dae
+0,    1459584,    1459584,     1152,     2304, 0xecef7975
+0,    1460736,    1460736,     1152,     2304, 0xcd2b804c
+0,    1461888,    1461888,     1152,     2304, 0xf4597f97
+0,    1463040,    1463040,     1152,     2304, 0x904b75cd
+0,    1464192,    1464192,     1152,     2304, 0x6b508374
+0,    1465344,    1465344,     1152,     2304, 0xb6b4791f
+0,    1466496,    1466496,     1152,     2304, 0xce6d7501
+0,    1467648,    1467648,     1152,     2304, 0x99ec8bac
+0,    1468800,    1468800,     1152,     2304, 0x65d772b7
+0,    1469952,    1469952,     1152,     2304, 0xbc2762ff
+0,    1471104,    1471104,     1152,     2304, 0xf8a48378
+0,    1472256,    1472256,     1152,     2304, 0x18057ad4
+0,    1473408,    1473408,     1152,     2304, 0x89af753f
+0,    1474560,    1474560,     1152,     2304, 0x95a48fc5
+0,    1475712,    1475712,     1152,     2304, 0x8b7576af
+0,    1476864,    1476864,     1152,     2304, 0xcdcb6e67
+0,    1478016,    1478016,     1152,     2304, 0xe02a7ff3
+0,    1479168,    1479168,     1152,     2304, 0x4f0a7d48
+0,    1480320,    1480320,     1152,     2304, 0x9bab8287
+0,    1481472,    1481472,     1152,     2304, 0xc1fa8063
+0,    1482624,    1482624,     1152,     2304, 0x410e7dd7
+0,    1483776,    1483776,     1152,     2304, 0xd4de777f
+0,    1484928,    1484928,     1152,     2304, 0x403675ac
+0,    1486080,    1486080,     1152,     2304, 0x4d7687c5
+0,    1487232,    1487232,     1152,     2304, 0x10c6650d
+0,    1488384,    1488384,     1152,     2304, 0xd7e67b69
+0,    1489536,    1489536,     1152,     2304, 0x42b97fae
+0,    1490688,    1490688,     1152,     2304, 0xa8b57a9f
+0,    1491840,    1491840,     1152,     2304, 0xc24960a0
+0,    1492992,    1492992,     1152,     2304, 0x16198fec
+0,    1494144,    1494144,     1152,     2304, 0x29297416
+0,    1495296,    1495296,     1152,     2304, 0x129b7d00
+0,    1496448,    1496448,     1152,     2304, 0xa9677141
+0,    1497600,    1497600,     1152,     2304, 0x86a779bf
+0,    1498752,    1498752,     1152,     2304, 0xa3857dce
+0,    1499904,    1499904,     1152,     2304, 0xee6d7c4d
+0,    1501056,    1501056,     1152,     2304, 0x97127166
+0,    1502208,    1502208,     1152,     2304, 0x6e407c25
+0,    1503360,    1503360,     1152,     2304, 0x82a07c9a
+0,    1504512,    1504512,     1152,     2304, 0xf62381ef
+0,    1505664,    1505664,     1152,     2304, 0x2ab86ca8
+0,    1506816,    1506816,     1152,     2304, 0x97ca87ed
+0,    1507968,    1507968,     1152,     2304, 0x6b4868f2
+0,    1509120,    1509120,     1152,     2304, 0xdb2a953c
+0,    1510272,    1510272,     1152,     2304, 0x061e7770
+0,    1511424,    1511424,     1152,     2304, 0xae067224
+0,    1512576,    1512576,     1152,     2304, 0x88a282a3
+0,    1513728,    1513728,     1152,     2304, 0x4e14743e
+0,    1514880,    1514880,     1152,     2304, 0x3dbd8b7b
+0,    1516032,    1516032,     1152,     2304, 0xcae57312
+0,    1517184,    1517184,     1152,     2304, 0xf9038ca7
+0,    1518336,    1518336,     1152,     2304, 0x03ec6f07
+0,    1519488,    1519488,     1152,     2304, 0x8c297359
+0,    1520640,    1520640,     1152,     2304, 0x8af1804c
+0,    1521792,    1521792,     1152,     2304, 0xf30087c8
+0,    1522944,    1522944,     1152,     2304, 0x21127cd1
+0,    1524096,    1524096,     1152,     2304, 0xc66772bd
+0,    1525248,    1525248,     1152,     2304, 0x05e6630b
+0,    1526400,    1526400,     1152,     2304, 0x020688d9
+0,    1527552,    1527552,     1152,     2304, 0xee3873cd
+0,    1528704,    1528704,     1152,     2304, 0xf263782b
+0,    1529856,    1529856,     1152,     2304, 0xf8877144
+0,    1531008,    1531008,     1152,     2304, 0xce1e6f33
+0,    1532160,    1532160,     1152,     2304, 0xf0457e4f
+0,    1533312,    1533312,     1152,     2304, 0xde9387df
+0,    1534464,    1534464,     1152,     2304, 0x5df86d1d
+0,    1535616,    1535616,     1152,     2304, 0x949087ef
+0,    1536768,    1536768,     1152,     2304, 0xdbd269c6
+0,    1537920,    1537920,     1152,     2304, 0xd530806e
+0,    1539072,    1539072,     1152,     2304, 0x80027b1d
+0,    1540224,    1540224,     1152,     2304, 0xccb47c48
+0,    1541376,    1541376,     1152,     2304, 0x4f2f8326
+0,    1542528,    1542528,     1152,     2304, 0xfe046f23
+0,    1543680,    1543680,     1152,     2304, 0x5939759b
+0,    1544832,    1544832,     1152,     2304, 0x83147073
+0,    1545984,    1545984,     1152,     2304, 0xc9e77b95
+0,    1547136,    1547136,     1152,     2304, 0x702d8e51
+0,    1548288,    1548288,     1152,     2304, 0x5f5f8492
+0,    1549440,    1549440,     1152,     2304, 0x10116d0e
+0,    1550592,    1550592,     1152,     2304, 0xb8587894
+0,    1551744,    1551744,     1152,     2304, 0x2b357892
+0,    1552896,    1552896,     1152,     2304, 0x160e6c20
+0,    1554048,    1554048,     1152,     2304, 0x0534874b
+0,    1555200,    1555200,     1152,     2304, 0xde687064
+0,    1556352,    1556352,     1152,     2304, 0x91ef7fe4
+0,    1557504,    1557504,     1152,     2304, 0x077473ce
+0,    1558656,    1558656,     1152,     2304, 0x1be77777
+0,    1559808,    1559808,     1152,     2304, 0xaada9096
+0,    1560960,    1560960,     1152,     2304, 0xeac96f7e
+0,    1562112,    1562112,     1152,     2304, 0xe9ca6e72
+0,    1563264,    1563264,     1152,     2304, 0xd0868038
+0,    1564416,    1564416,     1152,     2304, 0x689176f1
+0,    1565568,    1565568,     1152,     2304, 0xdfdb7684
+0,    1566720,    1566720,     1152,     2304, 0x83c55d92
+0,    1567872,    1567872,     1152,     2304, 0x77587b70
+0,    1569024,    1569024,     1152,     2304, 0x60937941
+0,    1570176,    1570176,     1152,     2304, 0xb00267bd
+0,    1571328,    1571328,     1152,     2304, 0xd0a166eb
+0,    1572480,    1572480,     1152,     2304, 0x88718162
+0,    1573632,    1573632,     1152,     2304, 0xf9e084ff
+0,    1574784,    1574784,     1152,     2304, 0x2ddc8c08
+0,    1575936,    1575936,     1152,     2304, 0x843a7178
+0,    1577088,    1577088,     1152,     2304, 0x1d9784b4
+0,    1578240,    1578240,     1152,     2304, 0x98aa7b1d
+0,    1579392,    1579392,     1152,     2304, 0x583e846e
+0,    1580544,    1580544,     1152,     2304, 0xa6d284ec
+0,    1581696,    1581696,     1152,     2304, 0xa0147cbf
+0,    1582848,    1582848,     1152,     2304, 0xb3bf7b4b
+0,    1584000,    1584000,     1152,     2304, 0x7f8b78dd
+0,    1585152,    1585152,     1152,     2304, 0xd3fb761f
+0,    1586304,    1586304,     1152,     2304, 0x78147c2f
+0,    1587456,    1587456,     1152,     2304, 0x5e747b26
+0,    1588608,    1588608,     1152,     2304, 0x0d8e7d96
+0,    1589760,    1589760,     1152,     2304, 0x73728362
+0,    1590912,    1590912,     1152,     2304, 0x7c54707b
+0,    1592064,    1592064,     1152,     2304, 0xb89c7806
+0,    1593216,    1593216,     1152,     2304, 0x5f0f7a91
+0,    1594368,    1594368,     1152,     2304, 0x35217e84
+0,    1595520,    1595520,     1152,     2304, 0xb3798553
+0,    1596672,    1596672,     1152,     2304, 0xd8377e8a
+0,    1597824,    1597824,     1152,     2304, 0x339181ba
+0,    1598976,    1598976,     1152,     2304, 0xbe196b2c
+0,    1600128,    1600128,     1152,     2304, 0xdc708cc4
+0,    1601280,    1601280,     1152,     2304, 0x649c74c1
+0,    1602432,    1602432,     1152,     2304, 0xac128649
+0,    1603584,    1603584,     1152,     2304, 0xcd266a22
+0,    1604736,    1604736,     1152,     2304, 0xdfde7023
+0,    1605888,    1605888,     1152,     2304, 0xf92d7450
+0,    1607040,    1607040,     1152,     2304, 0x9ce379ac
+0,    1608192,    1608192,     1152,     2304, 0xee5e712e
+0,    1609344,    1609344,     1152,     2304, 0xa12676c0
+0,    1610496,    1610496,     1152,     2304, 0x4cee7be1
+0,    1611648,    1611648,     1152,     2304, 0x90c881e5
+0,    1612800,    1612800,     1152,     2304, 0xa6a78158
+0,    1613952,    1613952,     1152,     2304, 0xd248864a
+0,    1615104,    1615104,     1152,     2304, 0x7a8972b4
+0,    1616256,    1616256,     1152,     2304, 0x5c8a75cb
+0,    1617408,    1617408,     1152,     2304, 0x07606722
+0,    1618560,    1618560,     1152,     2304, 0xbf497aae
+0,    1619712,    1619712,     1152,     2304, 0xffab7d66
+0,    1620864,    1620864,     1152,     2304, 0xefdc7d05
+0,    1622016,    1622016,     1152,     2304, 0x02d686dd
+0,    1623168,    1623168,     1152,     2304, 0x852e6eb6
+0,    1624320,    1624320,     1152,     2304, 0x3445706b
+0,    1625472,    1625472,     1152,     2304, 0x04677828
+0,    1626624,    1626624,     1152,     2304, 0x5d5c833c
+0,    1627776,    1627776,     1152,     2304, 0xf4277e06
+0,    1628928,    1628928,     1152,     2304, 0xcece72ab
+0,    1630080,    1630080,     1152,     2304, 0x10837aff
+0,    1631232,    1631232,     1152,     2304, 0x0265762b
+0,    1632384,    1632384,     1152,     2304, 0x0fc979de
+0,    1633536,    1633536,     1152,     2304, 0xeecf7010
+0,    1634688,    1634688,     1152,     2304, 0x313975cd
+0,    1635840,    1635840,     1152,     2304, 0xccce84a7
+0,    1636992,    1636992,     1152,     2304, 0x823e6935
+0,    1638144,    1638144,     1152,     2304, 0xa0606ade
+0,    1639296,    1639296,     1152,     2304, 0x2c2d7866
+0,    1640448,    1640448,     1152,     2304, 0x3a5a781e
+0,    1641600,    1641600,     1152,     2304, 0xdaf677fd
+0,    1642752,    1642752,     1152,     2304, 0x79d88aca
+0,    1643904,    1643904,     1152,     2304, 0x3db27308
+0,    1645056,    1645056,     1152,     2304, 0x627175ff
+0,    1646208,    1646208,     1152,     2304, 0x40697b16
+0,    1647360,    1647360,     1152,     2304, 0x40e47ee7
+0,    1648512,    1648512,     1152,     2304, 0x6a6a7d91
+0,    1649664,    1649664,     1152,     2304, 0x8d3e8a32
+0,    1650816,    1650816,     1152,     2304, 0x576a817e
+0,    1651968,    1651968,     1152,     2304, 0x86287f9b
+0,    1653120,    1653120,     1152,     2304, 0x43e081ce
+0,    1654272,    1654272,     1152,     2304, 0xe44b8003
+0,    1655424,    1655424,     1152,     2304, 0xfb237f5b
+0,    1656576,    1656576,     1152,     2304, 0x28967c8a
+0,    1657728,    1657728,     1152,     2304, 0x97478829
+0,    1658880,    1658880,     1152,     2304, 0x615570e8
+0,    1660032,    1660032,     1152,     2304, 0xa52c7d34
+0,    1661184,    1661184,     1152,     2304, 0xb55473e8
+0,    1662336,    1662336,     1152,     2304, 0x08a07d6c
+0,    1663488,    1663488,     1152,     2304, 0x2eed916a
+0,    1664640,    1664640,     1152,     2304, 0x8ce36cec
+0,    1665792,    1665792,     1152,     2304, 0x775e8992
+0,    1666944,    1666944,     1152,     2304, 0x99ad816b
+0,    1668096,    1668096,     1152,     2304, 0x697a70be
+0,    1669248,    1669248,     1152,     2304, 0x38c46cf2
+0,    1670400,    1670400,     1152,     2304, 0xf9d681f4
+0,    1671552,    1671552,     1152,     2304, 0xa7336fea
+0,    1672704,    1672704,     1152,     2304, 0xd2a97e59
+0,    1673856,    1673856,     1152,     2304, 0x02b880e9
+0,    1675008,    1675008,     1152,     2304, 0x2a486e9e
+0,    1676160,    1676160,     1152,     2304, 0x5f197c43
+0,    1677312,    1677312,     1152,     2304, 0x266679ad
+0,    1678464,    1678464,     1152,     2304, 0x7cfd7c8a
+0,    1679616,    1679616,     1152,     2304, 0x43b681bb
+0,    1680768,    1680768,     1152,     2304, 0x63309cff
+0,    1681920,    1681920,     1152,     2304, 0x80f36f7d
+0,    1683072,    1683072,     1152,     2304, 0xcead7b98
+0,    1684224,    1684224,     1152,     2304, 0x8475992f
+0,    1685376,    1685376,     1152,     2304, 0x746782d2
+0,    1686528,    1686528,     1152,     2304, 0x2b486982
+0,    1687680,    1687680,     1152,     2304, 0xc80c7fc2
+0,    1688832,    1688832,     1152,     2304, 0x148c7c3b
+0,    1689984,    1689984,     1152,     2304, 0x49c477df
+0,    1691136,    1691136,     1152,     2304, 0x1bf97c56
+0,    1692288,    1692288,     1152,     2304, 0x89a38221
+0,    1693440,    1693440,     1152,     2304, 0xcb757a31
+0,    1694592,    1694592,     1152,     2304, 0xd3bb72fa
+0,    1695744,    1695744,     1152,     2304, 0xe5727650
+0,    1696896,    1696896,     1152,     2304, 0x5d4e9242
+0,    1698048,    1698048,     1152,     2304, 0x29207f75
+0,    1699200,    1699200,     1152,     2304, 0x5b1d954a
+0,    1700352,    1700352,     1152,     2304, 0xa2888223
+0,    1701504,    1701504,     1152,     2304, 0xe31d8af7
+0,    1702656,    1702656,     1152,     2304, 0x29ee82dd
+0,    1703808,    1703808,     1152,     2304, 0x4b1d7887
+0,    1704960,    1704960,     1152,     2304, 0xc0308236
+0,    1706112,    1706112,     1152,     2304, 0xaed68e92
+0,    1707264,    1707264,     1152,     2304, 0xbc1171e9
+0,    1708416,    1708416,     1152,     2304, 0x379f828b
+0,    1709568,    1709568,     1152,     2304, 0x83de72c8
+0,    1710720,    1710720,     1152,     2304, 0xb11a806a
+0,    1711872,    1711872,     1152,     2304, 0x7ac17e7a
+0,    1713024,    1713024,     1152,     2304, 0x031b7d9a
+0,    1714176,    1714176,     1152,     2304, 0xebc97c43
+0,    1715328,    1715328,     1152,     2304, 0x914e86a7
+0,    1716480,    1716480,     1152,     2304, 0x88e2747e
+0,    1717632,    1717632,     1152,     2304, 0x153076bc
+0,    1718784,    1718784,     1152,     2304, 0xdacc7ebb
+0,    1719936,    1719936,     1152,     2304, 0x0905709a
+0,    1721088,    1721088,     1152,     2304, 0x13358109
+0,    1722240,    1722240,     1152,     2304, 0x18227228
+0,    1723392,    1723392,     1152,     2304, 0x318082d7
+0,    1724544,    1724544,     1152,     2304, 0x8aec7a8e
+0,    1725696,    1725696,     1152,     2304, 0x8c9c7755
+0,    1726848,    1726848,     1152,     2304, 0xdba46e2f
+0,    1728000,    1728000,     1152,     2304, 0xd47d7f5a
+0,    1729152,    1729152,     1152,     2304, 0xeb1370ec
+0,    1730304,    1730304,     1152,     2304, 0xf6d68e74
+0,    1731456,    1731456,     1152,     2304, 0x3d5a7c66
+0,    1732608,    1732608,     1152,     2304, 0x264b6d68
+0,    1733760,    1733760,     1152,     2304, 0x7cde8b9f
+0,    1734912,    1734912,     1152,     2304, 0xba467347
+0,    1736064,    1736064,     1152,     2304, 0x921987f7
+0,    1737216,    1737216,     1152,     2304, 0x9c6c7fce
+0,    1738368,    1738368,     1152,     2304, 0x02cb828f
+0,    1739520,    1739520,     1152,     2304, 0x3b427077
+0,    1740672,    1740672,     1152,     2304, 0x6f9c7523
+0,    1741824,    1741824,     1152,     2304, 0xef688204
+0,    1742976,    1742976,     1152,     2304, 0x263782dc
+0,    1744128,    1744128,     1152,     2304, 0xb6ca7e46
+0,    1745280,    1745280,     1152,     2304, 0xb0929636
+0,    1746432,    1746432,     1152,     2304, 0x60a97b7a
+0,    1747584,    1747584,     1152,     2304, 0xcf037690
+0,    1748736,    1748736,     1152,     2304, 0xc9046a25
+0,    1749888,    1749888,     1152,     2304, 0xbf247f3c
+0,    1751040,    1751040,     1152,     2304, 0x71e77d34
+0,    1752192,    1752192,     1152,     2304, 0x96ce7a01
+0,    1753344,    1753344,     1152,     2304, 0xf9b07a27
+0,    1754496,    1754496,     1152,     2304, 0x984b830b
+0,    1755648,    1755648,     1152,     2304, 0xff11822b
+0,    1756800,    1756800,     1152,     2304, 0xb0a18578
+0,    1757952,    1757952,     1152,     2304, 0xa9d98ef8
+0,    1759104,    1759104,     1152,     2304, 0x4f9076e1
+0,    1760256,    1760256,     1152,     2304, 0xb63c7742
+0,    1761408,    1761408,     1152,     2304, 0xb4c06ae2
+0,    1762560,    1762560,     1152,     2304, 0x41738531
+0,    1763712,    1763712,     1152,     2304, 0x55125e7b
diff --git a/tests/ref/fate/filter-hq2x b/tests/ref/fate/filter-hq2x
new file mode 100644
index 0000000000..2c1d8b77ca
--- /dev/null
+++ b/tests/ref/fate/filter-hq2x
@@ -0,0 +1,7 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 382x574
+#sar 0: 1/1
+0,          0,          0,        1,   877072, 0x9369339e
+0,          1,          1,        1,   877072, 0x32d119a1
diff --git a/tests/ref/fate/filter-hq3x b/tests/ref/fate/filter-hq3x
new file mode 100644
index 0000000000..a7db99e312
--- /dev/null
+++ b/tests/ref/fate/filter-hq3x
@@ -0,0 +1,7 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 573x861
+#sar 0: 1/1
+0,          0,          0,        1,  1973412, 0xafc227fa
+0,          1,          1,        1,  1973412, 0x93aebf19
diff --git a/tests/ref/fate/filter-hq4x b/tests/ref/fate/filter-hq4x
new file mode 100644
index 0000000000..6702fe4db7
--- /dev/null
+++ b/tests/ref/fate/filter-hq4x
@@ -0,0 +1,7 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 764x1148
+#sar 0: 1/1
+0,          0,          0,        1,  3508288, 0x034ef75e
+0,          1,          1,        1,  3508288, 0x738e9bbb
diff --git a/tests/ref/fate/filter-hqdn3d b/tests/ref/fate/filter-hqdn3d
index 6f121c37fc..d6496295c6 100644
--- a/tests/ref/fate/filter-hqdn3d
+++ b/tests/ref/fate/filter-hqdn3d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x0c09883a
 0,          1,          1,        1,   152064, 0xfc2748a0
 0,          2,          2,        1,   152064, 0xb746eea8
diff --git a/tests/ref/fate/filter-hqdn3d-sample b/tests/ref/fate/filter-hqdn3d-sample
new file mode 100644
index 0000000000..24d25a6d74
--- /dev/null
+++ b/tests/ref/fate/filter-hqdn3d-sample
@@ -0,0 +1,78 @@
+#tb 0: 1/9
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   115200, 0x2c810465
+0,          1,          1,        1,   115200, 0x957c0563
+0,          2,          2,        1,   115200, 0x786c6d5b
+0,          3,          3,        1,   115200, 0xd5ef87d3
+0,          4,          4,        1,   115200, 0x3a2158e2
+0,          5,          5,        1,   115200, 0x19d7d048
+0,          6,          6,        1,   115200, 0x16d5e09a
+0,          7,          7,        1,   115200, 0x73cca454
+0,          8,          8,        1,   115200, 0x4d6be3bc
+0,          9,          9,        1,   115200, 0x672aad0f
+0,         10,         10,        1,   115200, 0x1bd103b7
+0,         11,         11,        1,   115200, 0xbc3a9c02
+0,         12,         12,        1,   115200, 0xa19cb68c
+0,         13,         13,        1,   115200, 0x83477b6c
+0,         14,         14,        1,   115200, 0x68b6898e
+0,         15,         15,        1,   115200, 0xebbc5701
+0,         16,         16,        1,   115200, 0x37e873db
+0,         17,         17,        1,   115200, 0xcf9e7ad1
+0,         18,         18,        1,   115200, 0x3fdffd3a
+0,         19,         19,        1,   115200, 0x413da058
+0,         20,         20,        1,   115200, 0xa432b2f6
+0,         21,         21,        1,   115200, 0x9c532b61
+0,         22,         22,        1,   115200, 0x40c03856
+0,         23,         23,        1,   115200, 0xf8310ec7
+0,         24,         24,        1,   115200, 0x89246da7
+0,         25,         25,        1,   115200, 0x501d4dd0
+0,         26,         26,        1,   115200, 0xe5151ebf
+0,         27,         27,        1,   115200, 0xc166e201
+0,         28,         28,        1,   115200, 0xded25b69
+0,         29,         29,        1,   115200, 0xb51ec43f
+0,         30,         30,        1,   115200, 0x9bba20eb
+0,         31,         31,        1,   115200, 0x7a7b9278
+0,         32,         32,        1,   115200, 0xe98475d0
+0,         33,         33,        1,   115200, 0x960dc933
+0,         34,         34,        1,   115200, 0xe93f558b
+0,         35,         35,        1,   115200, 0x37ae3e42
+0,         36,         36,        1,   115200, 0x0ecaf64a
+0,         37,         37,        1,   115200, 0xd5938191
+0,         38,         38,        1,   115200, 0xeb04510a
+0,         39,         39,        1,   115200, 0xf5729201
+0,         40,         40,        1,   115200, 0xb2c04015
+0,         41,         41,        1,   115200, 0xd883143e
+0,         42,         42,        1,   115200, 0x5e04197b
+0,         43,         43,        1,   115200, 0x6b846e24
+0,         44,         44,        1,   115200, 0x026e7a0b
+0,         45,         45,        1,   115200, 0xef23db9d
+0,         46,         46,        1,   115200, 0x9e94265d
+0,         47,         47,        1,   115200, 0x2830098a
+0,         48,         48,        1,   115200, 0xf5d211d6
+0,         49,         49,        1,   115200, 0xb96b22b0
+0,         50,         50,        1,   115200, 0x9acda7c9
+0,         51,         51,        1,   115200, 0xed7b40f6
+0,         52,         52,        1,   115200, 0x8250278f
+0,         53,         53,        1,   115200, 0xa10003e0
+0,         54,         54,        1,   115200, 0xe67b5513
+0,         55,         55,        1,   115200, 0x2c581d60
+0,         56,         56,        1,   115200, 0xd7a506ed
+0,         57,         57,        1,   115200, 0x35e09799
+0,         58,         58,        1,   115200, 0x2d4f5499
+0,         59,         59,        1,   115200, 0x92fdc85b
+0,         60,         60,        1,   115200, 0x33f4888a
+0,         61,         61,        1,   115200, 0x65e04e05
+0,         62,         62,        1,   115200, 0x14766728
+0,         63,         63,        1,   115200, 0x2a432c3f
+0,         64,         64,        1,   115200, 0x136a1362
+0,         65,         65,        1,   115200, 0xfbf4cb01
+0,         66,         66,        1,   115200, 0x7dcaff69
+0,         67,         67,        1,   115200, 0x5afd3b9e
+0,         68,         68,        1,   115200, 0x86fcb122
+0,         69,         69,        1,   115200, 0xc988b519
+0,         70,         70,        1,   115200, 0x48fd3e75
+0,         71,         71,        1,   115200, 0x2728a2d7
+0,         72,         72,        1,   115200, 0xa2ac6418
diff --git a/tests/ref/fate/filter-hstack b/tests/ref/fate/filter-hstack
new file mode 100644
index 0000000000..889afe56bf
--- /dev/null
+++ b/tests/ref/fate/filter-hstack
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 704x288
+#sar 0: 0/1
+0,          0,          0,        1,   304128, 0x901a13ed
+0,          1,          1,        1,   304128, 0x793ccaa2
+0,          2,          2,        1,   304128, 0x9eafeca3
+0,          3,          3,        1,   304128, 0x18f0016f
+0,          4,          4,        1,   304128, 0xc90f6cb3
+0,          5,          5,        1,   304128, 0x82d751db
+0,          6,          6,        1,   304128, 0x7cd2f846
+0,          7,          7,        1,   304128, 0xb3801767
+0,          8,          8,        1,   304128, 0x3372005b
+0,          9,          9,        1,   304128, 0x822a722a
+0,         10,         10,        1,   304128, 0x05908ec0
+0,         11,         11,        1,   304128, 0xabbbf9b9
+0,         12,         12,        1,   304128, 0x1b345ad1
+0,         13,         13,        1,   304128, 0x6ccd4455
+0,         14,         14,        1,   304128, 0xad541bc9
+0,         15,         15,        1,   304128, 0x16231e0a
+0,         16,         16,        1,   304128, 0xb2b29c30
+0,         17,         17,        1,   304128, 0x5c6d7190
+0,         18,         18,        1,   304128, 0x733cd598
+0,         19,         19,        1,   304128, 0x605fb80d
+0,         20,         20,        1,   304128, 0x9f21eaef
+0,         21,         21,        1,   304128, 0xb6f14824
+0,         22,         22,        1,   304128, 0x78933ab2
+0,         23,         23,        1,   304128, 0x3fd2d1de
+0,         24,         24,        1,   304128, 0x62c1f3bb
+0,         25,         25,        1,   304128, 0x2d06327b
+0,         26,         26,        1,   304128, 0xdbd22d79
+0,         27,         27,        1,   304128, 0x9dc9b11d
+0,         28,         28,        1,   304128, 0x059148b9
+0,         29,         29,        1,   304128, 0x04a1ca1c
+0,         30,         30,        1,   304128, 0xba39d594
+0,         31,         31,        1,   304128, 0xc38e8a4b
+0,         32,         32,        1,   304128, 0x2ea7f929
+0,         33,         33,        1,   304128, 0xfd96f460
+0,         34,         34,        1,   304128, 0x952b86f0
+0,         35,         35,        1,   304128, 0x6bd82a05
+0,         36,         36,        1,   304128, 0x40b96f56
+0,         37,         37,        1,   304128, 0x867003f0
+0,         38,         38,        1,   304128, 0xe6feb298
+0,         39,         39,        1,   304128, 0xec409dba
+0,         40,         40,        1,   304128, 0x9816b24a
+0,         41,         41,        1,   304128, 0xe2fc3c1f
+0,         42,         42,        1,   304128, 0x67227f61
+0,         43,         43,        1,   304128, 0x16e141d8
+0,         44,         44,        1,   304128, 0xed5408e2
+0,         45,         45,        1,   304128, 0x8a14fce6
+0,         46,         46,        1,   304128, 0xecbda7fe
+0,         47,         47,        1,   304128, 0xfa0c8b93
+0,         48,         48,        1,   304128, 0x47fe6915
+0,         49,         49,        1,   304128, 0x9570b1e3
diff --git a/tests/ref/fate/filter-hue b/tests/ref/fate/filter-hue
new file mode 100644
index 0000000000..2f1ae619dd
--- /dev/null
+++ b/tests/ref/fate/filter-hue
@@ -0,0 +1 @@
+hue                 57463dd9bc17156a51b704dd7271c863
diff --git a/tests/ref/fate/filter-idet b/tests/ref/fate/filter-idet
new file mode 100644
index 0000000000..a0f579d8c1
--- /dev/null
+++ b/tests/ref/fate/filter-idet
@@ -0,0 +1,30 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x432
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x6e4f89ef
+0,          1,          1,        1,   152064, 0x7f5f6551
+0,          2,          2,        1,   152064, 0xc566f64a
+0,          3,          3,        1,   152064, 0xceb080b0
+0,          4,          4,        1,   152064, 0x473db652
+0,          5,          5,        1,   152064, 0x287da8e6
+0,          6,          6,        1,   152064, 0x68b47c23
+0,          7,          7,        1,   152064, 0xe9028bac
+0,          8,          8,        1,   152064, 0x28ff8026
+0,          9,          9,        1,   152064, 0x2d7c3915
+0,         10,         10,        1,   152064, 0xb45c4760
+0,         11,         11,        1,   152064, 0xb247fcd5
+0,         12,         12,        1,   152064, 0xcc0bad61
+0,         13,         13,        1,   152064, 0xb1d6a223
+0,         14,         14,        1,   152064, 0x75b38ddd
+0,         15,         15,        1,   152064, 0x6e080f05
+0,         16,         16,        1,   152064, 0x93414e18
+0,         17,         17,        1,   152064, 0xa3e038c8
+0,         18,         18,        1,   152064, 0xec506acc
+0,         19,         19,        1,   152064, 0x1a0ddbff
+0,         20,         20,        1,   152064, 0x19b0f570
+0,         21,         21,        1,   152064, 0xc15e2412
+0,         22,         22,        1,   152064, 0x59ac1d59
+0,         23,         23,        1,   152064, 0x813468ef
+0,         24,         24,        1,   152064, 0x4491f9d6
diff --git a/tests/ref/fate/filter-interlace b/tests/ref/fate/filter-interlace
index 4659942590..24423ccbe9 100644
--- a/tests/ref/fate/filter-interlace
+++ b/tests/ref/fate/filter-interlace
@@ -1,4 +1,8 @@
 #tb 0: 2/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x6077db38
 0,          1,          1,        1,   152064, 0x3d4f1b15
 0,          2,          2,        1,   152064, 0x447594f6
diff --git a/tests/ref/fate/filter-interlace-complex b/tests/ref/fate/filter-interlace-complex
new file mode 100644
index 0000000000..e8db46a934
--- /dev/null
+++ b/tests/ref/fate/filter-interlace-complex
@@ -0,0 +1,30 @@
+#tb 0: 2/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x778ab0c1
+0,          1,          1,        1,   152064, 0xdc30f7c3
+0,          2,          2,        1,   152064, 0xcb637467
+0,          3,          3,        1,   152064, 0xcbf778ce
+0,          4,          4,        1,   152064, 0x573d9f6d
+0,          5,          5,        1,   152064, 0xd794df2c
+0,          6,          6,        1,   152064, 0x3e885448
+0,          7,          7,        1,   152064, 0xccec1794
+0,          8,          8,        1,   152064, 0x6f32f51a
+0,          9,          9,        1,   152064, 0x0657f5ac
+0,         10,         10,        1,   152064, 0xfa82d600
+0,         11,         11,        1,   152064, 0x15ff7f32
+0,         12,         12,        1,   152064, 0x1cac0342
+0,         13,         13,        1,   152064, 0x6afb7c49
+0,         14,         14,        1,   152064, 0x6c47d554
+0,         15,         15,        1,   152064, 0xe0fbd132
+0,         16,         16,        1,   152064, 0x4f891e8d
+0,         17,         17,        1,   152064, 0x88554045
+0,         18,         18,        1,   152064, 0x0c8e6192
+0,         19,         19,        1,   152064, 0xf73c91c3
+0,         20,         20,        1,   152064, 0x49ac328d
+0,         21,         21,        1,   152064, 0xf18ebd82
+0,         22,         22,        1,   152064, 0x3359760d
+0,         23,         23,        1,   152064, 0x5c85601a
+0,         24,         24,        1,   152064, 0x28c1657b
diff --git a/tests/ref/fate/filter-lavd-life b/tests/ref/fate/filter-lavd-life
new file mode 100644
index 0000000000..48546ab0fd
--- /dev/null
+++ b/tests/ref/fate/filter-lavd-life
@@ -0,0 +1,15 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 40x40
+#sar 0: 1/1
+0,          0,          0,        1,     4800, 0xf2a15b15
+0,          1,          1,        1,     4800, 0x78c29dcf
+0,          2,          2,        1,     4800, 0x28509d6e
+0,          3,          3,        1,     4800, 0xb9d0841a
+0,          4,          4,        1,     4800, 0x53ac6a72
+0,          5,          5,        1,     4800, 0x6e6a6587
+0,          6,          6,        1,     4800, 0x6de46287
+0,          7,          7,        1,     4800, 0x7e0d5b95
+0,          8,          8,        1,     4800, 0xf30f5a1b
+0,          9,          9,        1,     4800, 0x84505420
diff --git a/tests/ref/fate/filter-lavd-scalenorm b/tests/ref/fate/filter-lavd-scalenorm
new file mode 100644
index 0000000000..7b9a60aa68
--- /dev/null
+++ b/tests/ref/fate/filter-lavd-scalenorm
@@ -0,0 +1,15 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x96
+#sar 0: 1/1
+0,          0,          0,        1,    18432, 0xac484db5
+0,          1,          1,        1,    18432, 0x94734db6
+0,          2,          2,        1,    18432, 0x3fac4db3
+0,          3,          3,        1,    18432, 0x37a94dcd
+0,          4,          4,        1,    18432, 0x2b3e4dbb
+0,          5,          5,        1,    18432, 0xd23a67bf
+0,          6,          6,        1,    18432, 0x898368e1
+0,          7,          7,        1,    18432, 0x79466438
+0,          8,          8,        1,    18432, 0x458c5d95
+0,          9,          9,        1,    18432, 0x9d9a56ee
diff --git a/tests/ref/fate/filter-lavd-testsrc b/tests/ref/fate/filter-lavd-testsrc
new file mode 100644
index 0000000000..a421cc404c
--- /dev/null
+++ b/tests/ref/fate/filter-lavd-testsrc
@@ -0,0 +1,75 @@
+#tb 0: 1/7
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   230400, 0x88c4d19a
+0,          1,          1,        1,   230400, 0xcc930a2e
+0,          2,          2,        1,   230400, 0x8e1b0e23
+0,          3,          3,        1,   230400, 0xff3b5a72
+0,          4,          4,        1,   230400, 0xb0ad3760
+0,          5,          5,        1,   230400, 0x8013eaaf
+0,          6,          6,        1,   230400, 0xa6eaa9c3
+0,          7,          7,        1,   230400, 0xef4695a2
+0,          8,          8,        1,   230400, 0x8f144889
+0,          9,          9,        1,   230400, 0x693779f9
+0,         10,         10,        1,   230400, 0xedaf92f0
+0,         11,         11,        1,   230400, 0x1c39d7c4
+0,         12,         12,        1,   230400, 0xb72589bb
+0,         13,         13,        1,   230400, 0x61c2de4a
+0,         14,         14,        1,   230400, 0xc46085ae
+0,         15,         15,        1,   230400, 0xad059d62
+0,         16,         16,        1,   230400, 0xe82ea157
+0,         17,         17,        1,   230400, 0xa30aeda6
+0,         18,         18,        1,   230400, 0x7f86ca94
+0,         19,         19,        1,   230400, 0x4c4f7df2
+0,         20,         20,        1,   230400, 0x535a3d06
+0,         21,         21,        1,   230400, 0x449262ff
+0,         22,         22,        1,   230400, 0x971c15e6
+0,         23,         23,        1,   230400, 0xda1d4756
+0,         24,         24,        1,   230400, 0x78ad604d
+0,         25,         25,        1,   230400, 0x72d8a521
+0,         26,         26,        1,   230400, 0x8f395718
+0,         27,         27,        1,   230400, 0x6e57aba7
+0,         28,         28,        1,   230400, 0x54ad968f
+0,         29,         29,        1,   230400, 0x59d9ae43
+0,         30,         30,        1,   230400, 0x843fb238
+0,         31,         31,        1,   230400, 0x0f77fe87
+0,         32,         32,        1,   230400, 0x8c8adb75
+0,         33,         33,        1,   230400, 0xdd568ed3
+0,         34,         34,        1,   230400, 0x38bd4de7
+0,         35,         35,        1,   230400, 0x62ad62ff
+0,         36,         36,        1,   230400, 0x1f0215e6
+0,         37,         37,        1,   230400, 0xe8534756
+0,         38,         38,        1,   230400, 0x3d36604d
+0,         39,         39,        1,   230400, 0x0c57a521
+0,         40,         40,        1,   230400, 0x2b555718
+0,         41,         41,        1,   230400, 0x2a3faba7
+0,         42,         42,        1,   230400, 0x4e0a74cd
+0,         43,         43,        1,   230400, 0xa06b8c81
+0,         44,         44,        1,   230400, 0x61f39076
+0,         45,         45,        1,   230400, 0xd313dcc5
+0,         46,         46,        1,   230400, 0x8485b9b3
+0,         47,         47,        1,   230400, 0x53eb6d11
+0,         48,         48,        1,   230400, 0x7ac22c25
+0,         49,         49,        1,   230400, 0xce7b84c1
+0,         50,         50,        1,   230400, 0x6e4937a8
+0,         51,         51,        1,   230400, 0x486c6918
+0,         52,         52,        1,   230400, 0xcce4820f
+0,         53,         53,        1,   230400, 0xfb5fc6e3
+0,         54,         54,        1,   230400, 0x965a78da
+0,         55,         55,        1,   230400, 0x40f7cd69
+0,         56,         56,        1,   230400, 0x68db63ec
+0,         57,         57,        1,   230400, 0x51807ba0
+0,         58,         58,        1,   230400, 0x8ca97f95
+0,         59,         59,        1,   230400, 0x4785cbe4
+0,         60,         60,        1,   230400, 0x2401a8d2
+0,         61,         61,        1,   230400, 0xf0bb5c30
+0,         62,         62,        1,   230400, 0xf7c61b44
+0,         63,         63,        1,   230400, 0x7d7e521e
+0,         64,         64,        1,   230400, 0xd0080505
+0,         65,         65,        1,   230400, 0x13183675
+0,         66,         66,        1,   230400, 0xb1994f6c
+0,         67,         67,        1,   230400, 0xabc49440
+0,         68,         68,        1,   230400, 0xc8254637
+0,         69,         69,        1,   230400, 0xa7439ac6
diff --git a/tests/ref/fate/filter-mcdeint-fast b/tests/ref/fate/filter-mcdeint-fast
new file mode 100644
index 0000000000..228be5e17d
--- /dev/null
+++ b/tests/ref/fate/filter-mcdeint-fast
@@ -0,0 +1,35 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 16/15
+0,          9,          9,        1,   622080, 0xb3b66c5c
+0,         10,         10,        1,   622080, 0xc6568bd7
+0,         11,         11,        1,   622080, 0xa5b543c3
+0,         12,         12,        1,   622080, 0x4095ac51
+0,         13,         13,        1,   622080, 0xccd8c1d9
+0,         14,         14,        1,   622080, 0x84a88f22
+0,         15,         15,        1,   622080, 0x7273c26b
+0,         16,         16,        1,   622080, 0xac188c41
+0,         17,         17,        1,   622080, 0xf32f6fb4
+0,         18,         18,        1,   622080, 0xd696ccce
+0,         19,         19,        1,   622080, 0x9778a418
+0,         20,         20,        1,   622080, 0xf2b5be2e
+0,         21,         21,        1,   622080, 0x653ee12a
+0,         22,         22,        1,   622080, 0xe7fce188
+0,         23,         23,        1,   622080, 0x6e9f1deb
+0,         24,         24,        1,   622080, 0x33090aac
+0,         25,         25,        1,   622080, 0x840a57f1
+0,         26,         26,        1,   622080, 0x635e430a
+0,         27,         27,        1,   622080, 0x52f98809
+0,         28,         28,        1,   622080, 0xc567b6a5
+0,         29,         29,        1,   622080, 0x4134f583
+0,         30,         30,        1,   622080, 0xd02a73bc
+0,         31,         31,        1,   622080, 0x763085d6
+0,         32,         32,        1,   622080, 0x77fdc7a6
+0,         33,         33,        1,   622080, 0x77f71b9f
+0,         34,         34,        1,   622080, 0x71c91244
+0,         35,         35,        1,   622080, 0xc7b86da5
+0,         36,         36,        1,   622080, 0x1edf8890
+0,         37,         37,        1,   622080, 0x03c82bec
+0,         38,         38,        1,   622080, 0x148b6a04
diff --git a/tests/ref/fate/filter-mcdeint-medium b/tests/ref/fate/filter-mcdeint-medium
new file mode 100644
index 0000000000..05d1d722f8
--- /dev/null
+++ b/tests/ref/fate/filter-mcdeint-medium
@@ -0,0 +1,35 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 16/15
+0,          9,          9,        1,   622080, 0xb3b66c5c
+0,         10,         10,        1,   622080, 0x26a29152
+0,         11,         11,        1,   622080, 0x787adddc
+0,         12,         12,        1,   622080, 0xcc52df08
+0,         13,         13,        1,   622080, 0x53dad126
+0,         14,         14,        1,   622080, 0xe1448652
+0,         15,         15,        1,   622080, 0x159fd353
+0,         16,         16,        1,   622080, 0xcbe893a0
+0,         17,         17,        1,   622080, 0x43a67c6b
+0,         18,         18,        1,   622080, 0xef30caf9
+0,         19,         19,        1,   622080, 0xa9cea62b
+0,         20,         20,        1,   622080, 0x4c4cada1
+0,         21,         21,        1,   622080, 0x8e91f6de
+0,         22,         22,        1,   622080, 0xb03ef044
+0,         23,         23,        1,   622080, 0x6b54262b
+0,         24,         24,        1,   622080, 0x911e0cea
+0,         25,         25,        1,   622080, 0x8320632c
+0,         26,         26,        1,   622080, 0x2bde42b2
+0,         27,         27,        1,   622080, 0xe9d988c3
+0,         28,         28,        1,   622080, 0xa9f0b1db
+0,         29,         29,        1,   622080, 0xb5bcf186
+0,         30,         30,        1,   622080, 0x469c6717
+0,         31,         31,        1,   622080, 0x2ca883e6
+0,         32,         32,        1,   622080, 0x4f5fba72
+0,         33,         33,        1,   622080, 0xa2e423ca
+0,         34,         34,        1,   622080, 0xc1fb0aaf
+0,         35,         35,        1,   622080, 0x96a879b8
+0,         36,         36,        1,   622080, 0x212e92e6
+0,         37,         37,        1,   622080, 0x9f26378a
+0,         38,         38,        1,   622080, 0xdeaf77ab
diff --git a/tests/ref/fate/filter-mergeplanes b/tests/ref/fate/filter-mergeplanes
new file mode 100644
index 0000000000..e13670362d
--- /dev/null
+++ b/tests/ref/fate/filter-mergeplanes
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   304128, 0x90660272
+0,          1,          1,        1,   304128, 0x6b09c8a6
+0,          2,          2,        1,   304128, 0x343858f3
+0,          3,          3,        1,   304128, 0x2f8ba46c
+0,          4,          4,        1,   304128, 0xe31fc163
+0,          5,          5,        1,   304128, 0xc1f3a301
+0,          6,          6,        1,   304128, 0x76b132d2
+0,          7,          7,        1,   304128, 0xf47b97f1
+0,          8,          8,        1,   304128, 0x12089641
+0,          9,          9,        1,   304128, 0x04156f0f
+0,         10,         10,        1,   304128, 0xc8bf96e8
+0,         11,         11,        1,   304128, 0xbecdae62
+0,         12,         12,        1,   304128, 0x74053994
+0,         13,         13,        1,   304128, 0xc1f3eec7
+0,         14,         14,        1,   304128, 0xf4e496b3
+0,         15,         15,        1,   304128, 0xa5a3d663
+0,         16,         16,        1,   304128, 0x1d3738ea
+0,         17,         17,        1,   304128, 0xfdfa09f5
+0,         18,         18,        1,   304128, 0x8844bbc5
+0,         19,         19,        1,   304128, 0x7eb20cea
+0,         20,         20,        1,   304128, 0x5b5e7351
+0,         21,         21,        1,   304128, 0x2b5e5fc1
+0,         22,         22,        1,   304128, 0xd6a2e9a7
+0,         23,         23,        1,   304128, 0xf56ed1be
+0,         24,         24,        1,   304128, 0xd60530a5
+0,         25,         25,        1,   304128, 0x363aa5bf
+0,         26,         26,        1,   304128, 0x37f56bb0
+0,         27,         27,        1,   304128, 0xe8428c1f
+0,         28,         28,        1,   304128, 0x78ef39cf
+0,         29,         29,        1,   304128, 0x76b2ab97
+0,         30,         30,        1,   304128, 0x3f09f5ef
+0,         31,         31,        1,   304128, 0x6f2c0371
+0,         32,         32,        1,   304128, 0x8baaf4a3
+0,         33,         33,        1,   304128, 0xda157bc0
+0,         34,         34,        1,   304128, 0xae46ebb0
+0,         35,         35,        1,   304128, 0xbe3458a2
+0,         36,         36,        1,   304128, 0x9784f913
+0,         37,         37,        1,   304128, 0xa67d93cd
+0,         38,         38,        1,   304128, 0x8b0e84ba
+0,         39,         39,        1,   304128, 0x583250f1
+0,         40,         40,        1,   304128, 0x7d1ee0a8
+0,         41,         41,        1,   304128, 0x6d83f980
+0,         42,         42,        1,   304128, 0x027ce4c5
+0,         43,         43,        1,   304128, 0xcf1a0c75
+0,         44,         44,        1,   304128, 0xbd1c2e5c
+0,         45,         45,        1,   304128, 0x36d4fe48
+0,         46,         46,        1,   304128, 0x9cc1650e
+0,         47,         47,        1,   304128, 0xf1af6288
+0,         48,         48,        1,   304128, 0x5eb8d36e
+0,         49,         49,        1,   304128, 0x2c4f2305
diff --git a/tests/ref/fate/filter-meta-4560-rotate0 b/tests/ref/fate/filter-meta-4560-rotate0
new file mode 100644
index 0000000000..97552ffb97
--- /dev/null
+++ b/tests/ref/fate/filter-meta-4560-rotate0
@@ -0,0 +1,268 @@
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 480x272
+#sar 0: 0/1
+#tb 1: 1/44100
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 44100
+#channel_layout 1: 4
+#channel_layout_name 1: mono
+0,          0,          0,        1,   195840, 0x0602351d
+1,          0,          0,     1024,     2048, 0x00000000
+1,       1024,       1024,     1024,     2048, 0xe6b00ffc
+0,          1,          1,        1,   195840, 0xcad55625
+1,       2048,       2048,     1024,     2048, 0x9275068a
+0,          2,          2,        1,   195840, 0x1a47a5ca
+1,       3072,       3072,     1024,     2048, 0xcd35a7ce
+1,       4096,       4096,     1024,     2048, 0x3f846a1e
+0,          3,          3,        1,   195840, 0x5cd02d7c
+1,       5120,       5120,     1024,     2048, 0x60ff5fd1
+0,          4,          4,        1,   195840, 0x07d08f16
+1,       6144,       6144,     1024,     2048, 0x9e9d96ee
+1,       7168,       7168,     1024,     2048, 0xb2622c29
+0,          5,          5,        1,   195840, 0xe8abf6dd
+1,       8192,       8192,     1024,     2048, 0xdeddcd6a
+0,          6,          6,        1,   195840, 0x096a5c58
+1,       9216,       9216,     1024,     2048, 0xc8798b23
+1,      10240,      10240,     1024,     2048, 0xea1dac49
+0,          7,          7,        1,   195840, 0x4e1a17bd
+1,      11264,      11264,     1024,     2048, 0x6b50813e
+0,          8,          8,        1,   195840, 0x96349c20
+1,      12288,      12288,     1024,     2048, 0x89698347
+0,          9,          9,        1,   195840, 0x6bb16907
+1,      13312,      13312,     1024,     2048, 0xaa608a47
+1,      14336,      14336,     1024,     2048, 0x169b8cf7
+0,         10,         10,        1,   195840, 0x7e44e4dd
+1,      15360,      15360,     1024,     2048, 0x2f127455
+0,         11,         11,        1,   195840, 0x4c3c0cf1
+1,      16384,      16384,     1024,     2048, 0x269c7583
+1,      17408,      17408,     1024,     2048, 0x917f7279
+0,         12,         12,        1,   195840, 0x4f2e3f2d
+1,      18432,      18432,     1024,     2048, 0x27055ffb
+0,         13,         13,        1,   195840, 0xcba539cd
+1,      19456,      19456,     1024,     2048, 0x7eca49e4
+1,      20480,      20480,     1024,     2048, 0xad067184
+0,         14,         14,        1,   195840, 0xf2811c9b
+1,      21504,      21504,     1024,     2048, 0xca406454
+0,         15,         15,        1,   195840, 0x8357eab2
+1,      22528,      22528,     1024,     2048, 0x69d48a55
+0,         16,         16,        1,   195840, 0xdba9c438
+1,      23552,      23552,     1024,     2048, 0x0a836c14
+1,      24576,      24576,     1024,     2048, 0xa9e967f9
+0,         17,         17,        1,   195840, 0x58bcb594
+1,      25600,      25600,     1024,     2048, 0xd7f73f35
+0,         18,         18,        1,   195840, 0x3edc5a1c
+1,      26624,      26624,     1024,     2048, 0x70ed8364
+1,      27648,      27648,     1024,     2048, 0x913f9b73
+0,         19,         19,        1,   195840, 0x94e4c186
+1,      28672,      28672,     1024,     2048, 0x7db083eb
+0,         20,         20,        1,   195840, 0xffad5f59
+1,      29696,      29696,     1024,     2048, 0x951b97a9
+1,      30720,      30720,     1024,     2048, 0x072ea78e
+0,         21,         21,        1,   195840, 0x84d1b114
+1,      31744,      31744,     1024,     2048, 0x9b127ba5
+0,         22,         22,        1,   195840, 0x358c1d0a
+1,      32768,      32768,     1024,     2048, 0x051c90c0
+1,      33792,      33792,     1024,     2048, 0x232d93b5
+0,         23,         23,        1,   195840, 0x3ed1ffc8
+1,      34816,      34816,     1024,     2048, 0x76b89477
+0,         24,         24,        1,   195840, 0xf048f47c
+1,      35840,      35840,     1024,     2048, 0x50b2568d
+0,         25,         25,        1,   195840, 0x3c2a3de6
+1,      36864,      36864,     1024,     2048, 0x97947e5e
+1,      37888,      37888,     1024,     2048, 0x21569819
+0,         26,         26,        1,   195840, 0x7ca208b1
+1,      38912,      38912,     1024,     2048, 0xc4358de4
+0,         27,         27,        1,   195840, 0x105cf9fc
+1,      39936,      39936,     1024,     2048, 0x69964977
+1,      40960,      40960,     1024,     2048, 0xef81892e
+0,         28,         28,        1,   195840, 0x9fe50c29
+1,      41984,      41984,     1024,     2048, 0x6f7084e7
+0,         29,         29,        1,   195840, 0xb459720f
+1,      43008,      43008,     1024,     2048, 0x7be080f7
+1,      44032,      44032,     1024,     2048, 0xadb18939
+0,         30,         30,        1,   195840, 0x6eda17b0
+1,      45056,      45056,     1024,     2048, 0x6cd9506d
+0,         31,         31,        1,   195840, 0x098871b0
+1,      46080,      46080,     1024,     2048, 0xba88ab8b
+0,         32,         32,        1,   195840, 0xc664cc79
+1,      47104,      47104,     1024,     2048, 0xe0bd726b
+1,      48128,      48128,     1024,     2048, 0x15604a65
+0,         33,         33,        1,   195840, 0x8d02708d
+1,      49152,      49152,     1024,     2048, 0x2a89f85b
+0,         34,         34,        1,   195840, 0xe90a8705
+1,      50176,      50176,     1024,     2048, 0xd71857dd
+1,      51200,      51200,     1024,     2048, 0x93d98aee
+0,         35,         35,        1,   195840, 0x55f6c5b6
+1,      52224,      52224,     1024,     2048, 0xcc537c08
+0,         36,         36,        1,   195840, 0xe4ad145d
+1,      53248,      53248,     1024,     2048, 0xe0ea7c21
+1,      54272,      54272,     1024,     2048, 0x883ba380
+0,         37,         37,        1,   195840, 0x9e766d50
+1,      55296,      55296,     1024,     2048, 0xaaf65ca7
+0,         38,         38,        1,   195840, 0xc2eac289
+1,      56320,      56320,     1024,     2048, 0xe01e98ca
+0,         39,         39,        1,   195840, 0x0baf5871
+1,      57344,      57344,     1024,     2048, 0xca85a551
+1,      58368,      58368,     1024,     2048, 0x6fea7f82
+0,         40,         40,        1,   195840, 0x15f85f38
+1,      59392,      59392,     1024,     2048, 0x9fd59843
+0,         41,         41,        1,   195840, 0x77b03072
+1,      60416,      60416,     1024,     2048, 0xd7419d35
+1,      61440,      61440,     1024,     2048, 0xc285bc0e
+0,         42,         42,        1,   195840, 0x0abb7abf
+1,      62464,      62464,     1024,     2048, 0x5180419c
+0,         43,         43,        1,   195840, 0x05076724
+1,      63488,      63488,     1024,     2048, 0xac9fd91b
+1,      64512,      64512,     1024,     2048, 0x6de689b3
+0,         44,         44,        1,   195840, 0x2e8c6163
+1,      65536,      65536,     1024,     2048, 0x655bb415
+0,         45,         45,        1,   195840, 0x4f350cde
+1,      66560,      66560,     1024,     2048, 0xe59d7404
+1,      67584,      67584,     1024,     2048, 0xaa9356b9
+0,         46,         46,        1,   195840, 0xefc6bda1
+1,      68608,      68608,     1024,     2048, 0xe193549d
+0,         47,         47,        1,   195840, 0xe2cdee68
+1,      69632,      69632,     1024,     2048, 0xd05c9736
+0,         48,         48,        1,   195840, 0xcc62401e
+1,      70656,      70656,     1024,     2048, 0x086f6829
+1,      71680,      71680,     1024,     2048, 0x79624f93
+0,         49,         49,        1,   195840, 0x4ed76e1b
+1,      72704,      72704,     1024,     2048, 0xf70a2f21
+0,         50,         50,        1,   195840, 0xf4f8599a
+1,      73728,      73728,     1024,     2048, 0xd32c643c
+1,      74752,      74752,     1024,     2048, 0xd6f07035
+0,         51,         51,        1,   195840, 0xb05edf96
+1,      75776,      75776,     1024,     2048, 0x137c6ca0
+0,         52,         52,        1,   195840, 0xfb1a1e15
+1,      76800,      76800,     1024,     2048, 0x916242de
+1,      77824,      77824,     1024,     2048, 0x0d910367
+0,         53,         53,        1,   195840, 0x970ebb58
+1,      78848,      78848,     1024,     2048, 0x460b8f1e
+0,         54,         54,        1,   195840, 0xf4046957
+1,      79872,      79872,     1024,     2048, 0x616a6102
+0,         55,         55,        1,   195840, 0xd5eca339
+1,      80896,      80896,     1024,     2048, 0xfc507e1d
+1,      81920,      81920,     1024,     2048, 0x34accc94
+0,         56,         56,        1,   195840, 0x52d3cb24
+1,      82944,      82944,     1024,     2048, 0xcf679f1a
+0,         57,         57,        1,   195840, 0x259cac47
+1,      83968,      83968,     1024,     2048, 0x72c45d8a
+1,      84992,      84992,     1024,     2048, 0xfd21264a
+0,         58,         58,        1,   195840, 0x9190a95b
+1,      86016,      86016,     1024,     2048, 0x02895c31
+0,         59,         59,        1,   195840, 0x5baccfb5
+1,      87040,      87040,     1024,     2048, 0xdc041e9c
+1,      88064,      88064,     1024,     2048, 0x266407a5
+0,         60,         60,        1,   195840, 0x80d19a09
+1,      89088,      89088,     1024,     2048, 0x8f111c49
+0,         61,         61,        1,   195840, 0x5ad44ce3
+1,      90112,      90112,     1024,     2048, 0xead031dd
+1,      91136,      91136,     1024,     2048, 0x238325d4
+0,         62,         62,        1,   195840, 0x7b1ad12b
+1,      92160,      92160,     1024,     2048, 0x24171913
+0,         63,         63,        1,   195840, 0x57e1a5e5
+1,      93184,      93184,     1024,     2048, 0xbcda41c5
+0,         64,         64,        1,   195840, 0x70cb6d38
+1,      94208,      94208,     1024,     2048, 0x124f5eed
+1,      95232,      95232,     1024,     2048, 0x4cadc088
+0,         65,         65,        1,   195840, 0x39dac35a
+1,      96256,      96256,     1024,     2048, 0x062cd95a
+0,         66,         66,        1,   195840, 0x4f9fccca
+1,      97280,      97280,     1024,     2048, 0xc26a888d
+1,      98304,      98304,     1024,     2048, 0x864f1a68
+0,         67,         67,        1,   195840, 0xadcb5585
+1,      99328,      99328,     1024,     2048, 0x4bb1ecf4
+0,         68,         68,        1,   195840, 0xe596c1b4
+1,     100352,     100352,     1024,     2048, 0xb4ddc0a7
+1,     101376,     101376,     1024,     2048, 0x665badb3
+0,         69,         69,        1,   195840, 0x64a05339
+1,     102400,     102400,     1024,     2048, 0x70beaa68
+0,         70,         70,        1,   195840, 0xaefa0990
+1,     103424,     103424,     1024,     2048, 0x8ac7c7de
+0,         71,         71,        1,   195840, 0x9c0b5c3d
+1,     104448,     104448,     1024,     2048, 0x158cad8e
+1,     105472,     105472,     1024,     2048, 0x0ab8faf2
+0,         72,         72,        1,   195840, 0xbae8bd6b
+1,     106496,     106496,     1024,     2048, 0x994e79f1
+0,         73,         73,        1,   195840, 0xb2ac7857
+1,     107520,     107520,     1024,     2048, 0xc727104e
+1,     108544,     108544,     1024,     2048, 0x1e1f720a
+0,         74,         74,        1,   195840, 0xcf2865e3
+1,     109568,     109568,     1024,     2048, 0x7232bede
+0,         75,         75,        1,   195840, 0x4e8589af
+1,     110592,     110592,     1024,     2048, 0x015fd697
+1,     111616,     111616,     1024,     2048, 0x4b33ebc9
+0,         76,         76,        1,   195840, 0x31c21938
+1,     112640,     112640,     1024,     2048, 0x8e61948a
+0,         77,         77,        1,   195840, 0xe6163c50
+1,     113664,     113664,     1024,     2048, 0x83fab6ac
+0,         78,         78,        1,   195840, 0x888ef74f
+1,     114688,     114688,     1024,     2048, 0x8d55d683
+1,     115712,     115712,     1024,     2048, 0x4e91a2c7
+0,         79,         79,        1,   195840, 0x00d822f7
+1,     116736,     116736,     1024,     2048, 0x8c79c692
+0,         80,         80,        1,   195840, 0xcbe77d2b
+1,     117760,     117760,     1024,     2048, 0xe744d102
+1,     118784,     118784,     1024,     2048, 0x2bf4e6b1
+0,         81,         81,        1,   195840, 0x9f2ff6e5
+1,     119808,     119808,     1024,     2048, 0xd6fd9b91
+0,         82,         82,        1,   195840, 0x08f65f5f
+1,     120832,     120832,     1024,     2048, 0xedcd8e8a
+1,     121856,     121856,     1024,     2048, 0x67b422bd
+0,         83,         83,        1,   195840, 0xd3950469
+1,     122880,     122880,     1024,     2048, 0xa0329606
+0,         84,         84,        1,   195840, 0xb8e014b8
+1,     123904,     123904,     1024,     2048, 0xae47c015
+1,     124928,     124928,     1024,     2048, 0xaec1dfb2
+0,         85,         85,        1,   195840, 0xa4399742
+1,     125952,     125952,     1024,     2048, 0x719e9bac
+0,         86,         86,        1,   195840, 0x84b5a8ec
+1,     126976,     126976,     1024,     2048, 0x5d99a16c
+0,         87,         87,        1,   195840, 0x1bfaa027
+1,     128000,     128000,     1024,     2048, 0x87aacd09
+1,     129024,     129024,     1024,     2048, 0x1473be08
+0,         88,         88,        1,   195840, 0x7bdbb172
+1,     130048,     130048,     1024,     2048, 0xdee3d975
+0,         89,         89,        1,   195840, 0x00f2b3f7
+1,     131072,     131072,     1024,     2048, 0x0180b050
+1,     132096,     132096,     1024,     2048, 0xb035d915
+0,         90,         90,        1,   195840, 0x86503bc7
+1,     133120,     133120,     1024,     2048, 0x1b77a3fd
+0,         91,         91,        1,   195840, 0xc4ab358e
+1,     134144,     134144,     1024,     2048, 0xf233b7bc
+1,     135168,     135168,     1024,     2048, 0xf1fad173
+0,         92,         92,        1,   195840, 0x1b330ba0
+1,     136192,     136192,     1024,     2048, 0x8b6ac5b9
+0,         93,         93,        1,   195840, 0xccc9822f
+1,     137216,     137216,     1024,     2048, 0x1228c03f
+0,         94,         94,        1,   195840, 0xffe3486d
+1,     138240,     138240,     1024,     2048, 0xbe99cc61
+1,     139264,     139264,     1024,     2048, 0x8486bad7
+0,         95,         95,        1,   195840, 0x30dc0efe
+1,     140288,     140288,     1024,     2048, 0x423ca644
+0,         96,         96,        1,   195840, 0x6bfae71e
+1,     141312,     141312,     1024,     2048, 0x33afb5a3
+1,     142336,     142336,     1024,     2048, 0x90c33f49
+0,         97,         97,        1,   195840, 0x0fa017b8
+1,     143360,     143360,     1024,     2048, 0x0e59f9d7
+0,         98,         98,        1,   195840, 0x1d0c9810
+1,     144384,     144384,     1024,     2048, 0x4f513d3d
+1,     145408,     145408,     1024,     2048, 0xe2f1406b
+0,         99,         99,        1,   195840, 0x775778f0
+1,     146432,     146432,     1024,     2048, 0xe55d2a99
+0,        100,        100,        1,   195840, 0xdcb0ede5
+1,     147456,     147456,     1024,     2048, 0xb0e236c2
+0,        101,        101,        1,   195840, 0x67624270
+1,     148480,     148480,     1024,     2048, 0xdc80c8fb
+1,     149504,     149504,     1024,     2048, 0x97c30778
+0,        102,        102,        1,   195840, 0xce86f6a3
+1,     150528,     150528,     1024,     2048, 0x6e403113
+0,        103,        103,        1,   195840, 0xa4b3e032
+1,     151552,     151552,     1024,     2048, 0x429605a1
+1,     152576,     152576,     1024,     2048, 0x25d61b75
+0,        104,        104,        1,   195840, 0x46851b87
+1,     153600,     153600,     1024,     2048, 0xa32cf42d
+0,        105,        105,        1,   195840, 0x02d97dc4
diff --git a/tests/ref/fate/filter-metadata-avf-aphase-meter-mono b/tests/ref/fate/filter-metadata-avf-aphase-meter-mono
new file mode 100644
index 0000000000..4a537555c0
--- /dev/null
+++ b/tests/ref/fate/filter-metadata-avf-aphase-meter-mono
@@ -0,0 +1,47 @@
+pkt_pts=0|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=1024|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=2048|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=3072|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=4096|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=5120|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=6144|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=7168|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=8192|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=9216|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=10240|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=11264|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=12288|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=13312|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=14336|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=15360|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=16384|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=17408|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=18432|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=19456|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=20480|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=21504|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=22528|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=23552|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=24576|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=25600|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=26624|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=27648|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=28672|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=29696|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=30720|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=31744|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=32768|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=33792|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=34816|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=35840|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=36864|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=37888|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=38912|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=39936|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=40960|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=41984|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=43008|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=44032|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=45056|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=46080|tag:lavfi.aphasemeter.phase=1.000000
+pkt_pts=47104|tag:lavfi.aphasemeter.phase=1.000000
diff --git a/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase b/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase
new file mode 100644
index 0000000000..a200e934d2
--- /dev/null
+++ b/tests/ref/fate/filter-metadata-avf-aphase-meter-out-of-phase
@@ -0,0 +1,11 @@
+pkt_pts=0|tag:lavfi.aphasemeter.phase=-1.000000
+pkt_pts=4608|tag:lavfi.aphasemeter.phase=-1.000000
+pkt_pts=9216|tag:lavfi.aphasemeter.phase=-1.000000
+pkt_pts=13824|tag:lavfi.aphasemeter.phase=-1.000000
+pkt_pts=18432|tag:lavfi.aphasemeter.phase=-1.000000
+pkt_pts=23040|tag:lavfi.aphasemeter.phase=-1.000000
+pkt_pts=27648|tag:lavfi.aphasemeter.phase=-1.000000
+pkt_pts=32256|tag:lavfi.aphasemeter.phase=-1.000000
+pkt_pts=36864|tag:lavfi.aphasemeter.phase=-1.000000
+pkt_pts=41472|tag:lavfi.aphasemeter.phase=-1.000000
+pkt_pts=46080|tag:lavfi.aphasemeter.phase=-1.000000
diff --git a/tests/ref/fate/filter-metadata-cropdetect b/tests/ref/fate/filter-metadata-cropdetect
new file mode 100644
index 0000000000..c49f9f0ea6
--- /dev/null
+++ b/tests/ref/fate/filter-metadata-cropdetect
@@ -0,0 +1,32 @@
+pkt_pts=0
+pkt_pts=400
+pkt_pts=800|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=1200|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=1600|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=2000|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=2400|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=2800|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=3200|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=3600|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=4000|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=4400|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=4800|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=5200|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=5600|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=6000|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=6400|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=6800|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=7200|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=7600|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=8000|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=8400|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=8800|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=9200|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=9600|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=10000|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=10400|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=10800|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=11200|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=11600|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=12000|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
+pkt_pts=12400|tag:lavfi.cropdetect.x1=0|tag:lavfi.cropdetect.x2=719|tag:lavfi.cropdetect.y1=61|tag:lavfi.cropdetect.y2=424|tag:lavfi.cropdetect.w=720|tag:lavfi.cropdetect.h=352|tag:lavfi.cropdetect.x=0|tag:lavfi.cropdetect.y=68
diff --git a/tests/ref/fate/filter-metadata-ebur128 b/tests/ref/fate/filter-metadata-ebur128
new file mode 100644
index 0000000000..7a060bdf87
--- /dev/null
+++ b/tests/ref/fate/filter-metadata-ebur128
@@ -0,0 +1,280 @@
+pkt_pts=0|tag:lavfi.r128.M=-120.691|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-70.000|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=4800|tag:lavfi.r128.M=-120.691|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-70.000|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=9600|tag:lavfi.r128.M=-120.691|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-70.000|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=14400|tag:lavfi.r128.M=-21.333|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-21.340|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=19200|tag:lavfi.r128.M=-21.249|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-21.295|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=24000|tag:lavfi.r128.M=-21.235|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-21.276|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=28800|tag:lavfi.r128.M=-21.587|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-21.353|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=33600|tag:lavfi.r128.M=-21.999|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-21.475|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=38400|tag:lavfi.r128.M=-22.371|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-21.613|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=43200|tag:lavfi.r128.M=-23.195|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-21.807|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=48000|tag:lavfi.r128.M=-23.550|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-21.991|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=52800|tag:lavfi.r128.M=-23.901|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-22.167|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=57600|tag:lavfi.r128.M=-24.461|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-22.350|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=62400|tag:lavfi.r128.M=-24.984|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-22.533|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=67200|tag:lavfi.r128.M=-25.448|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-22.714|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=72000|tag:lavfi.r128.M=-25.847|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-22.889|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=76800|tag:lavfi.r128.M=-26.187|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-23.058|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=81600|tag:lavfi.r128.M=-26.229|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-23.210|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=86400|tag:lavfi.r128.M=-26.132|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-23.346|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=91200|tag:lavfi.r128.M=-26.164|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-23.470|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=96000|tag:lavfi.r128.M=-26.282|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-23.586|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=100800|tag:lavfi.r128.M=-26.371|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-23.696|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=105600|tag:lavfi.r128.M=-26.421|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-23.799|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=110400|tag:lavfi.r128.M=-26.362|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-23.892|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=115200|tag:lavfi.r128.M=-26.278|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-23.977|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=120000|tag:lavfi.r128.M=-26.524|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-24.061|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=124800|tag:lavfi.r128.M=-26.867|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-24.148|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=129600|tag:lavfi.r128.M=-27.286|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-24.239|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=134400|tag:lavfi.r128.M=-27.372|tag:lavfi.r128.S=-120.691|tag:lavfi.r128.I=-24.326|tag:lavfi.r128.LRA=0.000|tag:lavfi.r128.LRA.low=0.000|tag:lavfi.r128.LRA.high=0.000
+pkt_pts=139200|tag:lavfi.r128.M=-27.449|tag:lavfi.r128.S=-24.296|tag:lavfi.r128.I=-24.409|tag:lavfi.r128.LRA=20.000|tag:lavfi.r128.LRA.low=-44.300|tag:lavfi.r128.LRA.high=-24.300
+pkt_pts=144000|tag:lavfi.r128.M=-27.083|tag:lavfi.r128.S=-24.455|tag:lavfi.r128.I=-24.481|tag:lavfi.r128.LRA=20.080|tag:lavfi.r128.LRA.low=-44.380|tag:lavfi.r128.LRA.high=-24.300
+pkt_pts=148800|tag:lavfi.r128.M=-26.899|tag:lavfi.r128.S=-24.719|tag:lavfi.r128.I=-24.545|tag:lavfi.r128.LRA=20.190|tag:lavfi.r128.LRA.low=-44.490|tag:lavfi.r128.LRA.high=-24.300
+pkt_pts=153600|tag:lavfi.r128.M=-26.880|tag:lavfi.r128.S=-24.962|tag:lavfi.r128.I=-24.606|tag:lavfi.r128.LRA=20.310|tag:lavfi.r128.LRA.low=-44.610|tag:lavfi.r128.LRA.high=-24.300
+pkt_pts=158400|tag:lavfi.r128.M=-26.886|tag:lavfi.r128.S=-25.214|tag:lavfi.r128.I=-24.664|tag:lavfi.r128.LRA=0.920|tag:lavfi.r128.LRA.low=-25.220|tag:lavfi.r128.LRA.high=-24.300
+pkt_pts=163200|tag:lavfi.r128.M=-27.096|tag:lavfi.r128.S=-25.459|tag:lavfi.r128.I=-24.722|tag:lavfi.r128.LRA=1.160|tag:lavfi.r128.LRA.low=-25.460|tag:lavfi.r128.LRA.high=-24.300
+pkt_pts=168000|tag:lavfi.r128.M=-26.430|tag:lavfi.r128.S=-25.729|tag:lavfi.r128.I=-24.765|tag:lavfi.r128.LRA=1.430|tag:lavfi.r128.LRA.low=-25.730|tag:lavfi.r128.LRA.high=-24.300
+pkt_pts=172800|tag:lavfi.r128.M=-25.736|tag:lavfi.r128.S=-25.816|tag:lavfi.r128.I=-24.791|tag:lavfi.r128.LRA=1.520|tag:lavfi.r128.LRA.low=-25.820|tag:lavfi.r128.LRA.high=-24.300
+pkt_pts=177600|tag:lavfi.r128.M=-25.976|tag:lavfi.r128.S=-26.011|tag:lavfi.r128.I=-24.821|tag:lavfi.r128.LRA=1.720|tag:lavfi.r128.LRA.low=-26.020|tag:lavfi.r128.LRA.high=-24.300
+pkt_pts=182400|tag:lavfi.r128.M=-26.417|tag:lavfi.r128.S=-26.240|tag:lavfi.r128.I=-24.858|tag:lavfi.r128.LRA=1.940|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-24.300
+pkt_pts=187200|tag:lavfi.r128.M=-27.102|tag:lavfi.r128.S=-26.393|tag:lavfi.r128.I=-24.906|tag:lavfi.r128.LRA=1.940|tag:lavfi.r128.LRA.low=-26.400|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=192000|tag:lavfi.r128.M=-28.221|tag:lavfi.r128.S=-26.511|tag:lavfi.r128.I=-24.968|tag:lavfi.r128.LRA=2.060|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=196800|tag:lavfi.r128.M=-27.900|tag:lavfi.r128.S=-26.618|tag:lavfi.r128.I=-25.023|tag:lavfi.r128.LRA=2.160|tag:lavfi.r128.LRA.low=-26.620|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=201600|tag:lavfi.r128.M=-27.179|tag:lavfi.r128.S=-26.666|tag:lavfi.r128.I=-25.065|tag:lavfi.r128.LRA=2.210|tag:lavfi.r128.LRA.low=-26.670|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=206400|tag:lavfi.r128.M=-26.274|tag:lavfi.r128.S=-26.604|tag:lavfi.r128.I=-25.091|tag:lavfi.r128.LRA=2.160|tag:lavfi.r128.LRA.low=-26.620|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=211200|tag:lavfi.r128.M=-25.385|tag:lavfi.r128.S=-26.501|tag:lavfi.r128.I=-25.098|tag:lavfi.r128.LRA=2.160|tag:lavfi.r128.LRA.low=-26.620|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=216000|tag:lavfi.r128.M=-25.220|tag:lavfi.r128.S=-26.511|tag:lavfi.r128.I=-25.101|tag:lavfi.r128.LRA=2.160|tag:lavfi.r128.LRA.low=-26.620|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=220800|tag:lavfi.r128.M=-23.888|tag:lavfi.r128.S=-26.237|tag:lavfi.r128.I=-25.069|tag:lavfi.r128.LRA=2.160|tag:lavfi.r128.LRA.low=-26.620|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=225600|tag:lavfi.r128.M=-24.544|tag:lavfi.r128.S=-26.315|tag:lavfi.r128.I=-25.057|tag:lavfi.r128.LRA=2.160|tag:lavfi.r128.LRA.low=-26.620|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=230400|tag:lavfi.r128.M=-25.042|tag:lavfi.r128.S=-26.325|tag:lavfi.r128.I=-25.057|tag:lavfi.r128.LRA=2.160|tag:lavfi.r128.LRA.low=-26.620|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=235200|tag:lavfi.r128.M=-25.146|tag:lavfi.r128.S=-26.349|tag:lavfi.r128.I=-25.059|tag:lavfi.r128.LRA=2.160|tag:lavfi.r128.LRA.low=-26.620|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=240000|tag:lavfi.r128.M=-27.510|tag:lavfi.r128.S=-26.380|tag:lavfi.r128.I=-25.098|tag:lavfi.r128.LRA=2.160|tag:lavfi.r128.LRA.low=-26.620|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=244800|tag:lavfi.r128.M=-26.266|tag:lavfi.r128.S=-26.301|tag:lavfi.r128.I=-25.119|tag:lavfi.r128.LRA=2.160|tag:lavfi.r128.LRA.low=-26.620|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=249600|tag:lavfi.r128.M=-26.455|tag:lavfi.r128.S=-26.329|tag:lavfi.r128.I=-25.142|tag:lavfi.r128.LRA=2.160|tag:lavfi.r128.LRA.low=-26.620|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=254400|tag:lavfi.r128.M=-26.169|tag:lavfi.r128.S=-26.323|tag:lavfi.r128.I=-25.160|tag:lavfi.r128.LRA=2.150|tag:lavfi.r128.LRA.low=-26.610|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=259200|tag:lavfi.r128.M=-25.834|tag:lavfi.r128.S=-26.317|tag:lavfi.r128.I=-25.172|tag:lavfi.r128.LRA=2.150|tag:lavfi.r128.LRA.low=-26.610|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=264000|tag:lavfi.r128.M=-26.461|tag:lavfi.r128.S=-26.293|tag:lavfi.r128.I=-25.194|tag:lavfi.r128.LRA=2.150|tag:lavfi.r128.LRA.low=-26.610|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=268800|tag:lavfi.r128.M=-26.327|tag:lavfi.r128.S=-26.262|tag:lavfi.r128.I=-25.212|tag:lavfi.r128.LRA=2.150|tag:lavfi.r128.LRA.low=-26.610|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=273600|tag:lavfi.r128.M=-26.559|tag:lavfi.r128.S=-26.239|tag:lavfi.r128.I=-25.233|tag:lavfi.r128.LRA=2.150|tag:lavfi.r128.LRA.low=-26.610|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=278400|tag:lavfi.r128.M=-26.657|tag:lavfi.r128.S=-26.236|tag:lavfi.r128.I=-25.255|tag:lavfi.r128.LRA=2.150|tag:lavfi.r128.LRA.low=-26.610|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=283200|tag:lavfi.r128.M=-26.563|tag:lavfi.r128.S=-26.193|tag:lavfi.r128.I=-25.275|tag:lavfi.r128.LRA=1.890|tag:lavfi.r128.LRA.low=-26.610|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=288000|tag:lavfi.r128.M=-26.632|tag:lavfi.r128.S=-26.210|tag:lavfi.r128.I=-25.295|tag:lavfi.r128.LRA=1.890|tag:lavfi.r128.LRA.low=-26.610|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=292800|tag:lavfi.r128.M=-26.750|tag:lavfi.r128.S=-26.222|tag:lavfi.r128.I=-25.316|tag:lavfi.r128.LRA=1.890|tag:lavfi.r128.LRA.low=-26.610|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=297600|tag:lavfi.r128.M=-26.727|tag:lavfi.r128.S=-26.218|tag:lavfi.r128.I=-25.336|tag:lavfi.r128.LRA=1.890|tag:lavfi.r128.LRA.low=-26.610|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=302400|tag:lavfi.r128.M=-26.945|tag:lavfi.r128.S=-26.200|tag:lavfi.r128.I=-25.358|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=307200|tag:lavfi.r128.M=-26.839|tag:lavfi.r128.S=-26.181|tag:lavfi.r128.I=-25.379|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=312000|tag:lavfi.r128.M=-26.056|tag:lavfi.r128.S=-26.172|tag:lavfi.r128.I=-25.389|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=316800|tag:lavfi.r128.M=-26.589|tag:lavfi.r128.S=-26.335|tag:lavfi.r128.I=-25.405|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=321600|tag:lavfi.r128.M=-27.190|tag:lavfi.r128.S=-26.351|tag:lavfi.r128.I=-25.428|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=326400|tag:lavfi.r128.M=-28.078|tag:lavfi.r128.S=-26.359|tag:lavfi.r128.I=-25.458|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=331200|tag:lavfi.r128.M=-27.878|tag:lavfi.r128.S=-26.250|tag:lavfi.r128.I=-25.486|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=336000|tag:lavfi.r128.M=-26.604|tag:lavfi.r128.S=-26.169|tag:lavfi.r128.I=-25.500|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=340800|tag:lavfi.r128.M=-26.289|tag:lavfi.r128.S=-26.173|tag:lavfi.r128.I=-25.511|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=345600|tag:lavfi.r128.M=-24.672|tag:lavfi.r128.S=-26.000|tag:lavfi.r128.I=-25.498|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=350400|tag:lavfi.r128.M=-25.114|tag:lavfi.r128.S=-26.077|tag:lavfi.r128.I=-25.492|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=355200|tag:lavfi.r128.M=-24.561|tag:lavfi.r128.S=-26.027|tag:lavfi.r128.I=-25.478|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=360000|tag:lavfi.r128.M=-23.558|tag:lavfi.r128.S=-25.849|tag:lavfi.r128.I=-25.445|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=364800|tag:lavfi.r128.M=-24.650|tag:lavfi.r128.S=-26.154|tag:lavfi.r128.I=-25.433|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=369600|tag:lavfi.r128.M=-23.700|tag:lavfi.r128.S=-25.903|tag:lavfi.r128.I=-25.405|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=374400|tag:lavfi.r128.M=-24.144|tag:lavfi.r128.S=-25.863|tag:lavfi.r128.I=-25.386|tag:lavfi.r128.LRA=1.800|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=379200|tag:lavfi.r128.M=-23.935|tag:lavfi.r128.S=-25.635|tag:lavfi.r128.I=-25.364|tag:lavfi.r128.LRA=1.550|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.970
+pkt_pts=384000|tag:lavfi.r128.M=-22.202|tag:lavfi.r128.S=-25.242|tag:lavfi.r128.I=-25.305|tag:lavfi.r128.LRA=1.550|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.970
+pkt_pts=388800|tag:lavfi.r128.M=-22.634|tag:lavfi.r128.S=-25.257|tag:lavfi.r128.I=-25.258|tag:lavfi.r128.LRA=1.550|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.970
+pkt_pts=393600|tag:lavfi.r128.M=-22.480|tag:lavfi.r128.S=-25.165|tag:lavfi.r128.I=-25.210|tag:lavfi.r128.LRA=1.550|tag:lavfi.r128.LRA.low=-26.520|tag:lavfi.r128.LRA.high=-24.970
+pkt_pts=398400|tag:lavfi.r128.M=-23.030|tag:lavfi.r128.S=-25.124|tag:lavfi.r128.I=-25.176|tag:lavfi.r128.LRA=1.540|tag:lavfi.r128.LRA.low=-26.510|tag:lavfi.r128.LRA.high=-24.970
+pkt_pts=403200|tag:lavfi.r128.M=-24.357|tag:lavfi.r128.S=-25.042|tag:lavfi.r128.I=-25.165|tag:lavfi.r128.LRA=1.540|tag:lavfi.r128.LRA.low=-26.510|tag:lavfi.r128.LRA.high=-24.970
+pkt_pts=408000|tag:lavfi.r128.M=-24.346|tag:lavfi.r128.S=-24.990|tag:lavfi.r128.I=-25.154|tag:lavfi.r128.LRA=1.540|tag:lavfi.r128.LRA.low=-26.510|tag:lavfi.r128.LRA.high=-24.970
+pkt_pts=412800|tag:lavfi.r128.M=-24.868|tag:lavfi.r128.S=-24.992|tag:lavfi.r128.I=-25.151|tag:lavfi.r128.LRA=1.540|tag:lavfi.r128.LRA.low=-26.510|tag:lavfi.r128.LRA.high=-24.970
+pkt_pts=417600|tag:lavfi.r128.M=-25.190|tag:lavfi.r128.S=-24.972|tag:lavfi.r128.I=-25.151|tag:lavfi.r128.LRA=1.540|tag:lavfi.r128.LRA.low=-26.510|tag:lavfi.r128.LRA.high=-24.970
+pkt_pts=422400|tag:lavfi.r128.M=-26.094|tag:lavfi.r128.S=-24.987|tag:lavfi.r128.I=-25.161|tag:lavfi.r128.LRA=1.540|tag:lavfi.r128.LRA.low=-26.510|tag:lavfi.r128.LRA.high=-24.970
+pkt_pts=427200|tag:lavfi.r128.M=-26.093|tag:lavfi.r128.S=-24.944|tag:lavfi.r128.I=-25.171|tag:lavfi.r128.LRA=1.560|tag:lavfi.r128.LRA.low=-26.510|tag:lavfi.r128.LRA.high=-24.950
+pkt_pts=432000|tag:lavfi.r128.M=-26.243|tag:lavfi.r128.S=-24.955|tag:lavfi.r128.I=-25.182|tag:lavfi.r128.LRA=1.560|tag:lavfi.r128.LRA.low=-26.510|tag:lavfi.r128.LRA.high=-24.950
+pkt_pts=436800|tag:lavfi.r128.M=-25.959|tag:lavfi.r128.S=-24.896|tag:lavfi.r128.I=-25.190|tag:lavfi.r128.LRA=1.610|tag:lavfi.r128.LRA.low=-26.510|tag:lavfi.r128.LRA.high=-24.900
+pkt_pts=441600|tag:lavfi.r128.M=-24.870|tag:lavfi.r128.S=-24.785|tag:lavfi.r128.I=-25.186|tag:lavfi.r128.LRA=1.720|tag:lavfi.r128.LRA.low=-26.510|tag:lavfi.r128.LRA.high=-24.790
+pkt_pts=446400|tag:lavfi.r128.M=-24.644|tag:lavfi.r128.S=-24.696|tag:lavfi.r128.I=-25.180|tag:lavfi.r128.LRA=1.680|tag:lavfi.r128.LRA.low=-26.400|tag:lavfi.r128.LRA.high=-24.720
+pkt_pts=451200|tag:lavfi.r128.M=-24.141|tag:lavfi.r128.S=-24.643|tag:lavfi.r128.I=-25.167|tag:lavfi.r128.LRA=1.700|tag:lavfi.r128.LRA.low=-26.400|tag:lavfi.r128.LRA.high=-24.700
+pkt_pts=456000|tag:lavfi.r128.M=-23.990|tag:lavfi.r128.S=-24.634|tag:lavfi.r128.I=-25.153|tag:lavfi.r128.LRA=1.750|tag:lavfi.r128.LRA.low=-26.400|tag:lavfi.r128.LRA.high=-24.650
+pkt_pts=460800|tag:lavfi.r128.M=-24.020|tag:lavfi.r128.S=-24.487|tag:lavfi.r128.I=-25.139|tag:lavfi.r128.LRA=1.760|tag:lavfi.r128.LRA.low=-26.400|tag:lavfi.r128.LRA.high=-24.640
+pkt_pts=465600|tag:lavfi.r128.M=-24.627|tag:lavfi.r128.S=-24.442|tag:lavfi.r128.I=-25.133|tag:lavfi.r128.LRA=1.910|tag:lavfi.r128.LRA.low=-26.400|tag:lavfi.r128.LRA.high=-24.490
+pkt_pts=470400|tag:lavfi.r128.M=-25.115|tag:lavfi.r128.S=-24.394|tag:lavfi.r128.I=-25.133|tag:lavfi.r128.LRA=1.940|tag:lavfi.r128.LRA.low=-26.400|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=475200|tag:lavfi.r128.M=-25.672|tag:lavfi.r128.S=-24.456|tag:lavfi.r128.I=-25.138|tag:lavfi.r128.LRA=1.940|tag:lavfi.r128.LRA.low=-26.400|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=480000|tag:lavfi.r128.M=-26.632|tag:lavfi.r128.S=-24.490|tag:lavfi.r128.I=-25.151|tag:lavfi.r128.LRA=1.940|tag:lavfi.r128.LRA.low=-26.400|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=484800|tag:lavfi.r128.M=-25.996|tag:lavfi.r128.S=-24.416|tag:lavfi.r128.I=-25.159|tag:lavfi.r128.LRA=1.940|tag:lavfi.r128.LRA.low=-26.400|tag:lavfi.r128.LRA.high=-24.460
+pkt_pts=489600|tag:lavfi.r128.M=-24.937|tag:lavfi.r128.S=-24.426|tag:lavfi.r128.I=-25.157|tag:lavfi.r128.LRA=1.950|tag:lavfi.r128.LRA.low=-26.400|tag:lavfi.r128.LRA.high=-24.450
+pkt_pts=494400|tag:lavfi.r128.M=-22.685|tag:lavfi.r128.S=-24.098|tag:lavfi.r128.I=-25.124|tag:lavfi.r128.LRA=1.960|tag:lavfi.r128.LRA.low=-26.390|tag:lavfi.r128.LRA.high=-24.430
+pkt_pts=499200|tag:lavfi.r128.M=-21.913|tag:lavfi.r128.S=-24.036|tag:lavfi.r128.I=-25.078|tag:lavfi.r128.LRA=1.970|tag:lavfi.r128.LRA.low=-26.390|tag:lavfi.r128.LRA.high=-24.420
+pkt_pts=504000|tag:lavfi.r128.M=-21.524|tag:lavfi.r128.S=-24.013|tag:lavfi.r128.I=-25.025|tag:lavfi.r128.LRA=1.990|tag:lavfi.r128.LRA.low=-26.390|tag:lavfi.r128.LRA.high=-24.400
+pkt_pts=508800|tag:lavfi.r128.M=-21.267|tag:lavfi.r128.S=-23.821|tag:lavfi.r128.I=-24.968|tag:lavfi.r128.LRA=2.090|tag:lavfi.r128.LRA.low=-26.390|tag:lavfi.r128.LRA.high=-24.300
+pkt_pts=513600|tag:lavfi.r128.M=-22.730|tag:lavfi.r128.S=-23.942|tag:lavfi.r128.I=-24.940|tag:lavfi.r128.LRA=2.290|tag:lavfi.r128.LRA.low=-26.390|tag:lavfi.r128.LRA.high=-24.100
+pkt_pts=518400|tag:lavfi.r128.M=-23.373|tag:lavfi.r128.S=-23.927|tag:lavfi.r128.I=-24.923|tag:lavfi.r128.LRA=2.350|tag:lavfi.r128.LRA.low=-26.390|tag:lavfi.r128.LRA.high=-24.040
+pkt_pts=523200|tag:lavfi.r128.M=-24.172|tag:lavfi.r128.S=-24.045|tag:lavfi.r128.I=-24.915|tag:lavfi.r128.LRA=2.350|tag:lavfi.r128.LRA.low=-26.390|tag:lavfi.r128.LRA.high=-24.040
+pkt_pts=528000|tag:lavfi.r128.M=-25.060|tag:lavfi.r128.S=-24.247|tag:lavfi.r128.I=-24.916|tag:lavfi.r128.LRA=2.350|tag:lavfi.r128.LRA.low=-26.390|tag:lavfi.r128.LRA.high=-24.040
+pkt_pts=532800|tag:lavfi.r128.M=-24.555|tag:lavfi.r128.S=-24.232|tag:lavfi.r128.I=-24.913|tag:lavfi.r128.LRA=2.350|tag:lavfi.r128.LRA.low=-26.390|tag:lavfi.r128.LRA.high=-24.040
+pkt_pts=537600|tag:lavfi.r128.M=-25.070|tag:lavfi.r128.S=-24.306|tag:lavfi.r128.I=-24.915|tag:lavfi.r128.LRA=2.350|tag:lavfi.r128.LRA.low=-26.390|tag:lavfi.r128.LRA.high=-24.040
+pkt_pts=542400|tag:lavfi.r128.M=-25.104|tag:lavfi.r128.S=-24.332|tag:lavfi.r128.I=-24.916|tag:lavfi.r128.LRA=2.320|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-24.040
+pkt_pts=547200|tag:lavfi.r128.M=-25.813|tag:lavfi.r128.S=-24.411|tag:lavfi.r128.I=-24.924|tag:lavfi.r128.LRA=2.320|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-24.040
+pkt_pts=552000|tag:lavfi.r128.M=-25.950|tag:lavfi.r128.S=-24.409|tag:lavfi.r128.I=-24.932|tag:lavfi.r128.LRA=2.320|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-24.040
+pkt_pts=556800|tag:lavfi.r128.M=-25.759|tag:lavfi.r128.S=-24.402|tag:lavfi.r128.I=-24.938|tag:lavfi.r128.LRA=2.320|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-24.040
+pkt_pts=561600|tag:lavfi.r128.M=-25.702|tag:lavfi.r128.S=-24.385|tag:lavfi.r128.I=-24.944|tag:lavfi.r128.LRA=2.320|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-24.040
+pkt_pts=566400|tag:lavfi.r128.M=-24.540|tag:lavfi.r128.S=-24.245|tag:lavfi.r128.I=-24.941|tag:lavfi.r128.LRA=2.320|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-24.040
+pkt_pts=571200|tag:lavfi.r128.M=-23.455|tag:lavfi.r128.S=-24.093|tag:lavfi.r128.I=-24.926|tag:lavfi.r128.LRA=2.310|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-24.050
+pkt_pts=576000|tag:lavfi.r128.M=-22.161|tag:lavfi.r128.S=-23.848|tag:lavfi.r128.I=-24.893|tag:lavfi.r128.LRA=2.320|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-24.040
+pkt_pts=580800|tag:lavfi.r128.M=-21.752|tag:lavfi.r128.S=-23.772|tag:lavfi.r128.I=-24.855|tag:lavfi.r128.LRA=2.340|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-24.020
+pkt_pts=585600|tag:lavfi.r128.M=-21.869|tag:lavfi.r128.S=-23.772|tag:lavfi.r128.I=-24.819|tag:lavfi.r128.LRA=2.410|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-23.950
+pkt_pts=590400|tag:lavfi.r128.M=-22.553|tag:lavfi.r128.S=-23.788|tag:lavfi.r128.I=-24.795|tag:lavfi.r128.LRA=2.430|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-23.930
+pkt_pts=595200|tag:lavfi.r128.M=-23.563|tag:lavfi.r128.S=-23.771|tag:lavfi.r128.I=-24.783|tag:lavfi.r128.LRA=2.510|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-23.850
+pkt_pts=600000|tag:lavfi.r128.M=-23.930|tag:lavfi.r128.S=-23.764|tag:lavfi.r128.I=-24.776|tag:lavfi.r128.LRA=2.530|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-23.830
+pkt_pts=604800|tag:lavfi.r128.M=-24.599|tag:lavfi.r128.S=-23.841|tag:lavfi.r128.I=-24.774|tag:lavfi.r128.LRA=2.530|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-23.830
+pkt_pts=609600|tag:lavfi.r128.M=-24.476|tag:lavfi.r128.S=-23.772|tag:lavfi.r128.I=-24.772|tag:lavfi.r128.LRA=2.570|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-23.790
+pkt_pts=614400|tag:lavfi.r128.M=-24.380|tag:lavfi.r128.S=-23.694|tag:lavfi.r128.I=-24.769|tag:lavfi.r128.LRA=2.580|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-23.780
+pkt_pts=619200|tag:lavfi.r128.M=-23.440|tag:lavfi.r128.S=-23.520|tag:lavfi.r128.I=-24.756|tag:lavfi.r128.LRA=2.580|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-23.780
+pkt_pts=624000|tag:lavfi.r128.M=-22.290|tag:lavfi.r128.S=-23.347|tag:lavfi.r128.I=-24.731|tag:lavfi.r128.LRA=2.580|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-23.780
+pkt_pts=628800|tag:lavfi.r128.M=-21.092|tag:lavfi.r128.S=-23.100|tag:lavfi.r128.I=-24.687|tag:lavfi.r128.LRA=2.580|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-23.780
+pkt_pts=633600|tag:lavfi.r128.M=-20.607|tag:lavfi.r128.S=-23.007|tag:lavfi.r128.I=-24.635|tag:lavfi.r128.LRA=2.590|tag:lavfi.r128.LRA.low=-26.360|tag:lavfi.r128.LRA.high=-23.770
+pkt_pts=638400|tag:lavfi.r128.M=-20.608|tag:lavfi.r128.S=-23.110|tag:lavfi.r128.I=-24.585|tag:lavfi.r128.LRA=2.650|tag:lavfi.r128.LRA.low=-26.350|tag:lavfi.r128.LRA.high=-23.700
+pkt_pts=643200|tag:lavfi.r128.M=-20.622|tag:lavfi.r128.S=-23.077|tag:lavfi.r128.I=-24.536|tag:lavfi.r128.LRA=2.820|tag:lavfi.r128.LRA.low=-26.350|tag:lavfi.r128.LRA.high=-23.530
+pkt_pts=648000|tag:lavfi.r128.M=-21.543|tag:lavfi.r128.S=-23.104|tag:lavfi.r128.I=-24.504|tag:lavfi.r128.LRA=3.000|tag:lavfi.r128.LRA.low=-26.350|tag:lavfi.r128.LRA.high=-23.350
+pkt_pts=652800|tag:lavfi.r128.M=-22.071|tag:lavfi.r128.S=-23.156|tag:lavfi.r128.I=-24.480|tag:lavfi.r128.LRA=3.190|tag:lavfi.r128.LRA.low=-26.350|tag:lavfi.r128.LRA.high=-23.160
+pkt_pts=657600|tag:lavfi.r128.M=-22.327|tag:lavfi.r128.S=-23.049|tag:lavfi.r128.I=-24.459|tag:lavfi.r128.LRA=3.240|tag:lavfi.r128.LRA.low=-26.350|tag:lavfi.r128.LRA.high=-23.110
+pkt_pts=662400|tag:lavfi.r128.M=-22.810|tag:lavfi.r128.S=-23.003|tag:lavfi.r128.I=-24.445|tag:lavfi.r128.LRA=3.240|tag:lavfi.r128.LRA.low=-26.350|tag:lavfi.r128.LRA.high=-23.110
+pkt_pts=667200|tag:lavfi.r128.M=-22.676|tag:lavfi.r128.S=-22.921|tag:lavfi.r128.I=-24.429|tag:lavfi.r128.LRA=3.240|tag:lavfi.r128.LRA.low=-26.350|tag:lavfi.r128.LRA.high=-23.110
+pkt_pts=672000|tag:lavfi.r128.M=-22.942|tag:lavfi.r128.S=-22.927|tag:lavfi.r128.I=-24.416|tag:lavfi.r128.LRA=3.250|tag:lavfi.r128.LRA.low=-26.350|tag:lavfi.r128.LRA.high=-23.100
+pkt_pts=676800|tag:lavfi.r128.M=-23.165|tag:lavfi.r128.S=-22.897|tag:lavfi.r128.I=-24.406|tag:lavfi.r128.LRA=3.270|tag:lavfi.r128.LRA.low=-26.350|tag:lavfi.r128.LRA.high=-23.080
+pkt_pts=681600|tag:lavfi.r128.M=-23.339|tag:lavfi.r128.S=-22.830|tag:lavfi.r128.I=-24.397|tag:lavfi.r128.LRA=3.300|tag:lavfi.r128.LRA.low=-26.350|tag:lavfi.r128.LRA.high=-23.050
+pkt_pts=686400|tag:lavfi.r128.M=-23.672|tag:lavfi.r128.S=-22.786|tag:lavfi.r128.I=-24.392|tag:lavfi.r128.LRA=3.330|tag:lavfi.r128.LRA.low=-26.340|tag:lavfi.r128.LRA.high=-23.010
+pkt_pts=691200|tag:lavfi.r128.M=-23.306|tag:lavfi.r128.S=-22.701|tag:lavfi.r128.I=-24.383|tag:lavfi.r128.LRA=3.330|tag:lavfi.r128.LRA.low=-26.340|tag:lavfi.r128.LRA.high=-23.010
+pkt_pts=696000|tag:lavfi.r128.M=-23.384|tag:lavfi.r128.S=-22.672|tag:lavfi.r128.I=-24.375|tag:lavfi.r128.LRA=3.410|tag:lavfi.r128.LRA.low=-26.340|tag:lavfi.r128.LRA.high=-22.930
+pkt_pts=700800|tag:lavfi.r128.M=-23.531|tag:lavfi.r128.S=-22.637|tag:lavfi.r128.I=-24.369|tag:lavfi.r128.LRA=3.410|tag:lavfi.r128.LRA.low=-26.340|tag:lavfi.r128.LRA.high=-22.930
+pkt_pts=705600|tag:lavfi.r128.M=-23.311|tag:lavfi.r128.S=-22.574|tag:lavfi.r128.I=-24.361|tag:lavfi.r128.LRA=3.440|tag:lavfi.r128.LRA.low=-26.340|tag:lavfi.r128.LRA.high=-22.900
+pkt_pts=710400|tag:lavfi.r128.M=-23.705|tag:lavfi.r128.S=-22.621|tag:lavfi.r128.I=-24.356|tag:lavfi.r128.LRA=3.500|tag:lavfi.r128.LRA.low=-26.340|tag:lavfi.r128.LRA.high=-22.840
+pkt_pts=715200|tag:lavfi.r128.M=-24.104|tag:lavfi.r128.S=-22.740|tag:lavfi.r128.I=-24.354|tag:lavfi.r128.LRA=3.550|tag:lavfi.r128.LRA.low=-26.340|tag:lavfi.r128.LRA.high=-22.790
+pkt_pts=720000|tag:lavfi.r128.M=-24.403|tag:lavfi.r128.S=-22.905|tag:lavfi.r128.I=-24.355|tag:lavfi.r128.LRA=3.550|tag:lavfi.r128.LRA.low=-26.340|tag:lavfi.r128.LRA.high=-22.790
+pkt_pts=724800|tag:lavfi.r128.M=-24.337|tag:lavfi.r128.S=-22.900|tag:lavfi.r128.I=-24.354|tag:lavfi.r128.LRA=3.550|tag:lavfi.r128.LRA.low=-26.340|tag:lavfi.r128.LRA.high=-22.790
+pkt_pts=729600|tag:lavfi.r128.M=-23.538|tag:lavfi.r128.S=-22.846|tag:lavfi.r128.I=-24.348|tag:lavfi.r128.LRA=3.550|tag:lavfi.r128.LRA.low=-26.340|tag:lavfi.r128.LRA.high=-22.790
+pkt_pts=734400|tag:lavfi.r128.M=-22.774|tag:lavfi.r128.S=-22.770|tag:lavfi.r128.I=-24.336|tag:lavfi.r128.LRA=3.560|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.770
+pkt_pts=739200|tag:lavfi.r128.M=-21.589|tag:lavfi.r128.S=-22.628|tag:lavfi.r128.I=-24.311|tag:lavfi.r128.LRA=3.590|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.740
+pkt_pts=744000|tag:lavfi.r128.M=-21.003|tag:lavfi.r128.S=-22.482|tag:lavfi.r128.I=-24.279|tag:lavfi.r128.LRA=3.620|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.710
+pkt_pts=748800|tag:lavfi.r128.M=-21.057|tag:lavfi.r128.S=-22.384|tag:lavfi.r128.I=-24.248|tag:lavfi.r128.LRA=3.650|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.680
+pkt_pts=753600|tag:lavfi.r128.M=-20.378|tag:lavfi.r128.S=-22.196|tag:lavfi.r128.I=-24.208|tag:lavfi.r128.LRA=3.690|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.640
+pkt_pts=758400|tag:lavfi.r128.M=-20.735|tag:lavfi.r128.S=-22.147|tag:lavfi.r128.I=-24.174|tag:lavfi.r128.LRA=3.700|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.630
+pkt_pts=763200|tag:lavfi.r128.M=-21.502|tag:lavfi.r128.S=-22.228|tag:lavfi.r128.I=-24.150|tag:lavfi.r128.LRA=3.700|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.630
+pkt_pts=768000|tag:lavfi.r128.M=-21.158|tag:lavfi.r128.S=-22.211|tag:lavfi.r128.I=-24.123|tag:lavfi.r128.LRA=3.700|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.630
+pkt_pts=772800|tag:lavfi.r128.M=-22.252|tag:lavfi.r128.S=-22.375|tag:lavfi.r128.I=-24.109|tag:lavfi.r128.LRA=3.750|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.580
+pkt_pts=777600|tag:lavfi.r128.M=-22.753|tag:lavfi.r128.S=-22.481|tag:lavfi.r128.I=-24.099|tag:lavfi.r128.LRA=3.840|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.490
+pkt_pts=782400|tag:lavfi.r128.M=-22.726|tag:lavfi.r128.S=-22.565|tag:lavfi.r128.I=-24.089|tag:lavfi.r128.LRA=3.840|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.490
+pkt_pts=787200|tag:lavfi.r128.M=-23.676|tag:lavfi.r128.S=-22.655|tag:lavfi.r128.I=-24.086|tag:lavfi.r128.LRA=3.840|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.490
+pkt_pts=792000|tag:lavfi.r128.M=-23.719|tag:lavfi.r128.S=-22.660|tag:lavfi.r128.I=-24.084|tag:lavfi.r128.LRA=3.840|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.490
+pkt_pts=796800|tag:lavfi.r128.M=-23.765|tag:lavfi.r128.S=-22.692|tag:lavfi.r128.I=-24.082|tag:lavfi.r128.LRA=3.840|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.490
+pkt_pts=801600|tag:lavfi.r128.M=-22.760|tag:lavfi.r128.S=-22.624|tag:lavfi.r128.I=-24.073|tag:lavfi.r128.LRA=3.840|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.490
+pkt_pts=806400|tag:lavfi.r128.M=-21.532|tag:lavfi.r128.S=-22.468|tag:lavfi.r128.I=-24.052|tag:lavfi.r128.LRA=3.840|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.490
+pkt_pts=811200|tag:lavfi.r128.M=-21.329|tag:lavfi.r128.S=-22.455|tag:lavfi.r128.I=-24.029|tag:lavfi.r128.LRA=3.860|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.470
+pkt_pts=816000|tag:lavfi.r128.M=-20.701|tag:lavfi.r128.S=-22.338|tag:lavfi.r128.I=-24.000|tag:lavfi.r128.LRA=3.870|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.460
+pkt_pts=820800|tag:lavfi.r128.M=-20.533|tag:lavfi.r128.S=-22.218|tag:lavfi.r128.I=-23.969|tag:lavfi.r128.LRA=3.940|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.390
+pkt_pts=825600|tag:lavfi.r128.M=-21.049|tag:lavfi.r128.S=-22.151|tag:lavfi.r128.I=-23.944|tag:lavfi.r128.LRA=3.950|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.380
+pkt_pts=830400|tag:lavfi.r128.M=-21.066|tag:lavfi.r128.S=-22.110|tag:lavfi.r128.I=-23.920|tag:lavfi.r128.LRA=3.990|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.340
+pkt_pts=835200|tag:lavfi.r128.M=-20.990|tag:lavfi.r128.S=-22.023|tag:lavfi.r128.I=-23.896|tag:lavfi.r128.LRA=4.100|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.230
+pkt_pts=840000|tag:lavfi.r128.M=-21.658|tag:lavfi.r128.S=-22.007|tag:lavfi.r128.I=-23.879|tag:lavfi.r128.LRA=4.110|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.220
+pkt_pts=844800|tag:lavfi.r128.M=-21.649|tag:lavfi.r128.S=-21.928|tag:lavfi.r128.I=-23.863|tag:lavfi.r128.LRA=4.110|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.220
+pkt_pts=849600|tag:lavfi.r128.M=-22.120|tag:lavfi.r128.S=-21.973|tag:lavfi.r128.I=-23.850|tag:lavfi.r128.LRA=4.130|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.200
+pkt_pts=854400|tag:lavfi.r128.M=-23.297|tag:lavfi.r128.S=-21.984|tag:lavfi.r128.I=-23.847|tag:lavfi.r128.LRA=4.170|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.160
+pkt_pts=859200|tag:lavfi.r128.M=-22.936|tag:lavfi.r128.S=-21.898|tag:lavfi.r128.I=-23.841|tag:lavfi.r128.LRA=4.170|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.160
+pkt_pts=864000|tag:lavfi.r128.M=-22.360|tag:lavfi.r128.S=-21.736|tag:lavfi.r128.I=-23.831|tag:lavfi.r128.LRA=4.180|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.150
+pkt_pts=868800|tag:lavfi.r128.M=-20.997|tag:lavfi.r128.S=-21.601|tag:lavfi.r128.I=-23.809|tag:lavfi.r128.LRA=4.220|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.110
+pkt_pts=873600|tag:lavfi.r128.M=-20.852|tag:lavfi.r128.S=-21.651|tag:lavfi.r128.I=-23.786|tag:lavfi.r128.LRA=4.300|tag:lavfi.r128.LRA.low=-26.330|tag:lavfi.r128.LRA.high=-22.030
+pkt_pts=878400|tag:lavfi.r128.M=-21.194|tag:lavfi.r128.S=-21.695|tag:lavfi.r128.I=-23.766|tag:lavfi.r128.LRA=4.310|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-22.010
+pkt_pts=883200|tag:lavfi.r128.M=-22.598|tag:lavfi.r128.S=-21.862|tag:lavfi.r128.I=-23.759|tag:lavfi.r128.LRA=4.330|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.990
+pkt_pts=888000|tag:lavfi.r128.M=-24.897|tag:lavfi.r128.S=-22.013|tag:lavfi.r128.I=-23.764|tag:lavfi.r128.LRA=4.330|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.990
+pkt_pts=892800|tag:lavfi.r128.M=-25.212|tag:lavfi.r128.S=-22.080|tag:lavfi.r128.I=-23.771|tag:lavfi.r128.LRA=4.330|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.990
+pkt_pts=897600|tag:lavfi.r128.M=-24.334|tag:lavfi.r128.S=-22.191|tag:lavfi.r128.I=-23.774|tag:lavfi.r128.LRA=4.330|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.990
+pkt_pts=902400|tag:lavfi.r128.M=-22.984|tag:lavfi.r128.S=-22.176|tag:lavfi.r128.I=-23.769|tag:lavfi.r128.LRA=4.330|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.990
+pkt_pts=907200|tag:lavfi.r128.M=-21.388|tag:lavfi.r128.S=-21.996|tag:lavfi.r128.I=-23.753|tag:lavfi.r128.LRA=4.330|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.990
+pkt_pts=912000|tag:lavfi.r128.M=-20.307|tag:lavfi.r128.S=-21.928|tag:lavfi.r128.I=-23.725|tag:lavfi.r128.LRA=4.340|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.980
+pkt_pts=916800|tag:lavfi.r128.M=-20.094|tag:lavfi.r128.S=-21.838|tag:lavfi.r128.I=-23.695|tag:lavfi.r128.LRA=4.390|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.930
+pkt_pts=921600|tag:lavfi.r128.M=-20.032|tag:lavfi.r128.S=-21.756|tag:lavfi.r128.I=-23.665|tag:lavfi.r128.LRA=4.390|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.930
+pkt_pts=926400|tag:lavfi.r128.M=-20.060|tag:lavfi.r128.S=-21.599|tag:lavfi.r128.I=-23.635|tag:lavfi.r128.LRA=4.420|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.900
+pkt_pts=931200|tag:lavfi.r128.M=-20.372|tag:lavfi.r128.S=-21.507|tag:lavfi.r128.I=-23.610|tag:lavfi.r128.LRA=4.450|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.870
+pkt_pts=936000|tag:lavfi.r128.M=-20.643|tag:lavfi.r128.S=-21.468|tag:lavfi.r128.I=-23.588|tag:lavfi.r128.LRA=4.480|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.840
+pkt_pts=940800|tag:lavfi.r128.M=-20.647|tag:lavfi.r128.S=-21.389|tag:lavfi.r128.I=-23.567|tag:lavfi.r128.LRA=4.560|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.760
+pkt_pts=945600|tag:lavfi.r128.M=-21.341|tag:lavfi.r128.S=-21.431|tag:lavfi.r128.I=-23.552|tag:lavfi.r128.LRA=4.580|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.740
+pkt_pts=950400|tag:lavfi.r128.M=-21.704|tag:lavfi.r128.S=-21.530|tag:lavfi.r128.I=-23.540|tag:lavfi.r128.LRA=4.620|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.700
+pkt_pts=955200|tag:lavfi.r128.M=-21.778|tag:lavfi.r128.S=-21.527|tag:lavfi.r128.I=-23.529|tag:lavfi.r128.LRA=4.620|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.700
+pkt_pts=960000|tag:lavfi.r128.M=-22.390|tag:lavfi.r128.S=-21.613|tag:lavfi.r128.I=-23.523|tag:lavfi.r128.LRA=4.660|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=964800|tag:lavfi.r128.M=-22.355|tag:lavfi.r128.S=-21.682|tag:lavfi.r128.I=-23.516|tag:lavfi.r128.LRA=4.660|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=969600|tag:lavfi.r128.M=-22.697|tag:lavfi.r128.S=-21.739|tag:lavfi.r128.I=-23.512|tag:lavfi.r128.LRA=4.660|tag:lavfi.r128.LRA.low=-26.320|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=974400|tag:lavfi.r128.M=-22.814|tag:lavfi.r128.S=-21.745|tag:lavfi.r128.I=-23.508|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.310|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=979200|tag:lavfi.r128.M=-22.749|tag:lavfi.r128.S=-21.842|tag:lavfi.r128.I=-23.504|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.310|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=984000|tag:lavfi.r128.M=-23.155|tag:lavfi.r128.S=-21.856|tag:lavfi.r128.I=-23.502|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.310|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=988800|tag:lavfi.r128.M=-22.927|tag:lavfi.r128.S=-21.893|tag:lavfi.r128.I=-23.499|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.310|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=993600|tag:lavfi.r128.M=-22.583|tag:lavfi.r128.S=-21.800|tag:lavfi.r128.I=-23.494|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.310|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=998400|tag:lavfi.r128.M=-22.022|tag:lavfi.r128.S=-21.702|tag:lavfi.r128.I=-23.486|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.310|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=1003200|tag:lavfi.r128.M=-21.852|tag:lavfi.r128.S=-21.729|tag:lavfi.r128.I=-23.476|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.310|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=1008000|tag:lavfi.r128.M=-21.746|tag:lavfi.r128.S=-21.814|tag:lavfi.r128.I=-23.466|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.310|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=1012800|tag:lavfi.r128.M=-21.751|tag:lavfi.r128.S=-21.912|tag:lavfi.r128.I=-23.456|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.310|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=1017600|tag:lavfi.r128.M=-21.891|tag:lavfi.r128.S=-21.855|tag:lavfi.r128.I=-23.447|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.310|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=1022400|tag:lavfi.r128.M=-21.392|tag:lavfi.r128.S=-21.759|tag:lavfi.r128.I=-23.435|tag:lavfi.r128.LRA=4.640|tag:lavfi.r128.LRA.low=-26.300|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=1027200|tag:lavfi.r128.M=-21.375|tag:lavfi.r128.S=-21.660|tag:lavfi.r128.I=-23.422|tag:lavfi.r128.LRA=4.640|tag:lavfi.r128.LRA.low=-26.300|tag:lavfi.r128.LRA.high=-21.660
+pkt_pts=1032000|tag:lavfi.r128.M=-21.806|tag:lavfi.r128.S=-21.620|tag:lavfi.r128.I=-23.413|tag:lavfi.r128.LRA=4.680|tag:lavfi.r128.LRA.low=-26.300|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1036800|tag:lavfi.r128.M=-21.826|tag:lavfi.r128.S=-21.550|tag:lavfi.r128.I=-23.404|tag:lavfi.r128.LRA=4.680|tag:lavfi.r128.LRA.low=-26.300|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1041600|tag:lavfi.r128.M=-22.447|tag:lavfi.r128.S=-21.588|tag:lavfi.r128.I=-23.399|tag:lavfi.r128.LRA=4.690|tag:lavfi.r128.LRA.low=-26.300|tag:lavfi.r128.LRA.high=-21.610
+pkt_pts=1046400|tag:lavfi.r128.M=-22.717|tag:lavfi.r128.S=-21.633|tag:lavfi.r128.I=-23.396|tag:lavfi.r128.LRA=4.690|tag:lavfi.r128.LRA.low=-26.300|tag:lavfi.r128.LRA.high=-21.610
+pkt_pts=1051200|tag:lavfi.r128.M=-23.325|tag:lavfi.r128.S=-21.845|tag:lavfi.r128.I=-23.396|tag:lavfi.r128.LRA=4.680|tag:lavfi.r128.LRA.low=-26.300|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1056000|tag:lavfi.r128.M=-23.105|tag:lavfi.r128.S=-21.933|tag:lavfi.r128.I=-23.394|tag:lavfi.r128.LRA=4.680|tag:lavfi.r128.LRA.low=-26.300|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1060800|tag:lavfi.r128.M=-23.086|tag:lavfi.r128.S=-22.015|tag:lavfi.r128.I=-23.393|tag:lavfi.r128.LRA=4.680|tag:lavfi.r128.LRA.low=-26.300|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1065600|tag:lavfi.r128.M=-22.412|tag:lavfi.r128.S=-22.001|tag:lavfi.r128.I=-23.388|tag:lavfi.r128.LRA=4.680|tag:lavfi.r128.LRA.low=-26.300|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1070400|tag:lavfi.r128.M=-20.845|tag:lavfi.r128.S=-21.992|tag:lavfi.r128.I=-23.372|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.270|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1075200|tag:lavfi.r128.M=-20.738|tag:lavfi.r128.S=-22.001|tag:lavfi.r128.I=-23.356|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.270|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1080000|tag:lavfi.r128.M=-20.165|tag:lavfi.r128.S=-21.924|tag:lavfi.r128.I=-23.335|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.270|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1084800|tag:lavfi.r128.M=-19.829|tag:lavfi.r128.S=-21.840|tag:lavfi.r128.I=-23.311|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.270|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1089600|tag:lavfi.r128.M=-20.699|tag:lavfi.r128.S=-21.887|tag:lavfi.r128.I=-23.295|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.270|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1094400|tag:lavfi.r128.M=-20.677|tag:lavfi.r128.S=-21.838|tag:lavfi.r128.I=-23.279|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.270|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1099200|tag:lavfi.r128.M=-20.121|tag:lavfi.r128.S=-21.654|tag:lavfi.r128.I=-23.259|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.270|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1104000|tag:lavfi.r128.M=-20.893|tag:lavfi.r128.S=-21.635|tag:lavfi.r128.I=-23.245|tag:lavfi.r128.LRA=4.650|tag:lavfi.r128.LRA.low=-26.270|tag:lavfi.r128.LRA.high=-21.620
+pkt_pts=1108800|tag:lavfi.r128.M=-19.603|tag:lavfi.r128.S=-21.450|tag:lavfi.r128.I=-23.220|tag:lavfi.r128.LRA=4.660|tag:lavfi.r128.LRA.low=-26.270|tag:lavfi.r128.LRA.high=-21.610
+pkt_pts=1113600|tag:lavfi.r128.M=-19.675|tag:lavfi.r128.S=-21.385|tag:lavfi.r128.I=-23.197|tag:lavfi.r128.LRA=4.670|tag:lavfi.r128.LRA.low=-26.270|tag:lavfi.r128.LRA.high=-21.600
+pkt_pts=1118400|tag:lavfi.r128.M=-20.415|tag:lavfi.r128.S=-21.339|tag:lavfi.r128.I=-23.180|tag:lavfi.r128.LRA=4.660|tag:lavfi.r128.LRA.low=-26.250|tag:lavfi.r128.LRA.high=-21.590
+pkt_pts=1123200|tag:lavfi.r128.M=-20.446|tag:lavfi.r128.S=-21.333|tag:lavfi.r128.I=-23.164|tag:lavfi.r128.LRA=4.690|tag:lavfi.r128.LRA.low=-26.250|tag:lavfi.r128.LRA.high=-21.560
+pkt_pts=1128000|tag:lavfi.r128.M=-21.361|tag:lavfi.r128.S=-21.254|tag:lavfi.r128.I=-23.154|tag:lavfi.r128.LRA=4.720|tag:lavfi.r128.LRA.low=-26.250|tag:lavfi.r128.LRA.high=-21.530
+pkt_pts=1132800|tag:lavfi.r128.M=-21.725|tag:lavfi.r128.S=-21.257|tag:lavfi.r128.I=-23.147|tag:lavfi.r128.LRA=4.720|tag:lavfi.r128.LRA.low=-26.250|tag:lavfi.r128.LRA.high=-21.530
+pkt_pts=1137600|tag:lavfi.r128.M=-22.311|tag:lavfi.r128.S=-21.311|tag:lavfi.r128.I=-23.143|tag:lavfi.r128.LRA=4.740|tag:lavfi.r128.LRA.low=-26.250|tag:lavfi.r128.LRA.high=-21.510
+pkt_pts=1142400|tag:lavfi.r128.M=-21.973|tag:lavfi.r128.S=-21.327|tag:lavfi.r128.I=-23.137|tag:lavfi.r128.LRA=4.780|tag:lavfi.r128.LRA.low=-26.250|tag:lavfi.r128.LRA.high=-21.470
+pkt_pts=1147200|tag:lavfi.r128.M=-22.032|tag:lavfi.r128.S=-21.275|tag:lavfi.r128.I=-23.132|tag:lavfi.r128.LRA=4.780|tag:lavfi.r128.LRA.low=-26.250|tag:lavfi.r128.LRA.high=-21.470
+pkt_pts=1152000|tag:lavfi.r128.M=-21.631|tag:lavfi.r128.S=-21.243|tag:lavfi.r128.I=-23.125|tag:lavfi.r128.LRA=4.800|tag:lavfi.r128.LRA.low=-26.250|tag:lavfi.r128.LRA.high=-21.450
+pkt_pts=1156800|tag:lavfi.r128.M=-20.494|tag:lavfi.r128.S=-21.139|tag:lavfi.r128.I=-23.110|tag:lavfi.r128.LRA=4.810|tag:lavfi.r128.LRA.low=-26.250|tag:lavfi.r128.LRA.high=-21.440
+pkt_pts=1161600|tag:lavfi.r128.M=-19.902|tag:lavfi.r128.S=-21.041|tag:lavfi.r128.I=-23.090|tag:lavfi.r128.LRA=4.860|tag:lavfi.r128.LRA.low=-26.250|tag:lavfi.r128.LRA.high=-21.390
+pkt_pts=1166400|tag:lavfi.r128.M=-20.221|tag:lavfi.r128.S=-21.104|tag:lavfi.r128.I=-23.073|tag:lavfi.r128.LRA=4.850|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.390
+pkt_pts=1171200|tag:lavfi.r128.M=-20.245|tag:lavfi.r128.S=-21.080|tag:lavfi.r128.I=-23.057|tag:lavfi.r128.LRA=4.900|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.340
+pkt_pts=1176000|tag:lavfi.r128.M=-21.470|tag:lavfi.r128.S=-21.099|tag:lavfi.r128.I=-23.049|tag:lavfi.r128.LRA=4.900|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.340
+pkt_pts=1180800|tag:lavfi.r128.M=-22.623|tag:lavfi.r128.S=-21.123|tag:lavfi.r128.I=-23.047|tag:lavfi.r128.LRA=4.910|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.330
+pkt_pts=1185600|tag:lavfi.r128.M=-22.312|tag:lavfi.r128.S=-21.090|tag:lavfi.r128.I=-23.044|tag:lavfi.r128.LRA=4.920|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.320
+pkt_pts=1190400|tag:lavfi.r128.M=-22.937|tag:lavfi.r128.S=-21.099|tag:lavfi.r128.I=-23.043|tag:lavfi.r128.LRA=4.960|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.280
+pkt_pts=1195200|tag:lavfi.r128.M=-22.401|tag:lavfi.r128.S=-21.017|tag:lavfi.r128.I=-23.041|tag:lavfi.r128.LRA=4.980|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.260
+pkt_pts=1200000|tag:lavfi.r128.M=-22.004|tag:lavfi.r128.S=-21.018|tag:lavfi.r128.I=-23.036|tag:lavfi.r128.LRA=4.980|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.260
+pkt_pts=1204800|tag:lavfi.r128.M=-22.416|tag:lavfi.r128.S=-21.030|tag:lavfi.r128.I=-23.033|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1209600|tag:lavfi.r128.M=-22.481|tag:lavfi.r128.S=-21.106|tag:lavfi.r128.I=-23.031|tag:lavfi.r128.LRA=5.100|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.140
+pkt_pts=1214400|tag:lavfi.r128.M=-22.841|tag:lavfi.r128.S=-21.245|tag:lavfi.r128.I=-23.030|tag:lavfi.r128.LRA=5.100|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.140
+pkt_pts=1219200|tag:lavfi.r128.M=-23.663|tag:lavfi.r128.S=-21.332|tag:lavfi.r128.I=-23.033|tag:lavfi.r128.LRA=5.100|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.140
+pkt_pts=1224000|tag:lavfi.r128.M=-22.728|tag:lavfi.r128.S=-21.357|tag:lavfi.r128.I=-23.031|tag:lavfi.r128.LRA=5.100|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.140
+pkt_pts=1228800|tag:lavfi.r128.M=-23.016|tag:lavfi.r128.S=-21.530|tag:lavfi.r128.I=-23.031|tag:lavfi.r128.LRA=5.100|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.140
+pkt_pts=1233600|tag:lavfi.r128.M=-22.934|tag:lavfi.r128.S=-21.518|tag:lavfi.r128.I=-23.031|tag:lavfi.r128.LRA=5.100|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.140
+pkt_pts=1238400|tag:lavfi.r128.M=-21.320|tag:lavfi.r128.S=-21.426|tag:lavfi.r128.I=-23.023|tag:lavfi.r128.LRA=5.100|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.140
+pkt_pts=1243200|tag:lavfi.r128.M=-21.282|tag:lavfi.r128.S=-21.541|tag:lavfi.r128.I=-23.015|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1248000|tag:lavfi.r128.M=-20.639|tag:lavfi.r128.S=-21.490|tag:lavfi.r128.I=-23.002|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1252800|tag:lavfi.r128.M=-20.626|tag:lavfi.r128.S=-21.711|tag:lavfi.r128.I=-22.990|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1257600|tag:lavfi.r128.M=-21.333|tag:lavfi.r128.S=-21.710|tag:lavfi.r128.I=-22.982|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1262400|tag:lavfi.r128.M=-21.384|tag:lavfi.r128.S=-21.694|tag:lavfi.r128.I=-22.975|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1267200|tag:lavfi.r128.M=-21.410|tag:lavfi.r128.S=-21.639|tag:lavfi.r128.I=-22.968|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1272000|tag:lavfi.r128.M=-21.461|tag:lavfi.r128.S=-21.725|tag:lavfi.r128.I=-22.961|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1276800|tag:lavfi.r128.M=-21.846|tag:lavfi.r128.S=-21.726|tag:lavfi.r128.I=-22.956|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1281600|tag:lavfi.r128.M=-22.482|tag:lavfi.r128.S=-21.713|tag:lavfi.r128.I=-22.954|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1286400|tag:lavfi.r128.M=-22.681|tag:lavfi.r128.S=-21.720|tag:lavfi.r128.I=-22.953|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1291200|tag:lavfi.r128.M=-22.718|tag:lavfi.r128.S=-21.804|tag:lavfi.r128.I=-22.952|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1296000|tag:lavfi.r128.M=-22.849|tag:lavfi.r128.S=-21.873|tag:lavfi.r128.I=-22.952|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1300800|tag:lavfi.r128.M=-23.041|tag:lavfi.r128.S=-22.068|tag:lavfi.r128.I=-22.952|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1305600|tag:lavfi.r128.M=-23.898|tag:lavfi.r128.S=-22.285|tag:lavfi.r128.I=-22.956|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1310400|tag:lavfi.r128.M=-24.280|tag:lavfi.r128.S=-22.343|tag:lavfi.r128.I=-22.960|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1315200|tag:lavfi.r128.M=-25.072|tag:lavfi.r128.S=-22.479|tag:lavfi.r128.I=-22.966|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1320000|tag:lavfi.r128.M=-25.530|tag:lavfi.r128.S=-22.491|tag:lavfi.r128.I=-22.973|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1324800|tag:lavfi.r128.M=-25.269|tag:lavfi.r128.S=-22.536|tag:lavfi.r128.I=-22.980|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1329600|tag:lavfi.r128.M=-25.127|tag:lavfi.r128.S=-22.630|tag:lavfi.r128.I=-22.986|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1334400|tag:lavfi.r128.M=-24.909|tag:lavfi.r128.S=-22.673|tag:lavfi.r128.I=-22.991|tag:lavfi.r128.LRA=4.990|tag:lavfi.r128.LRA.low=-26.240|tag:lavfi.r128.LRA.high=-21.250
+pkt_pts=1339200
diff --git a/tests/ref/fate/filter-metadata-readvitc-def b/tests/ref/fate/filter-metadata-readvitc-def
new file mode 100644
index 0000000000..8a650f1eca
--- /dev/null
+++ b/tests/ref/fate/filter-metadata-readvitc-def
@@ -0,0 +1,5 @@
+pkt_pts=0|tag:lavfi.readvitc.found=0
+pkt_pts=1|tag:lavfi.readvitc.found=1|tag:lavfi.readvitc.tc_str=05:01:02:21
+pkt_pts=2|tag:lavfi.readvitc.found=1|tag:lavfi.readvitc.tc_str=05:01:02:22
+pkt_pts=3|tag:lavfi.readvitc.found=1|tag:lavfi.readvitc.tc_str=05:01:02:23
+pkt_pts=4|tag:lavfi.readvitc.found=0
diff --git a/tests/ref/fate/filter-metadata-readvitc-thr b/tests/ref/fate/filter-metadata-readvitc-thr
new file mode 100644
index 0000000000..408666348a
--- /dev/null
+++ b/tests/ref/fate/filter-metadata-readvitc-thr
@@ -0,0 +1,5 @@
+pkt_pts=0|tag:lavfi.readvitc.found=1|tag:lavfi.readvitc.tc_str=05:01:02:20
+pkt_pts=1|tag:lavfi.readvitc.found=1|tag:lavfi.readvitc.tc_str=05:01:02:21
+pkt_pts=2|tag:lavfi.readvitc.found=1|tag:lavfi.readvitc.tc_str=05:01:02:22
+pkt_pts=3|tag:lavfi.readvitc.found=1|tag:lavfi.readvitc.tc_str=05:01:02:23
+pkt_pts=4|tag:lavfi.readvitc.found=1|tag:lavfi.readvitc.tc_str=05:01:02:24
diff --git a/tests/ref/fate/filter-metadata-scenedetect b/tests/ref/fate/filter-metadata-scenedetect
new file mode 100644
index 0000000000..d04054a951
--- /dev/null
+++ b/tests/ref/fate/filter-metadata-scenedetect
@@ -0,0 +1,10 @@
+pkt_pts=1620|tag:lavfi.scene_score=1.000000
+pkt_pts=4140|tag:lavfi.scene_score=0.875036
+pkt_pts=5800|tag:lavfi.scene_score=1.000000
+pkt_pts=6720|tag:lavfi.scene_score=0.461625
+pkt_pts=8160|tag:lavfi.scene_score=1.000000
+pkt_pts=9760|tag:lavfi.scene_score=1.000000
+pkt_pts=14080|tag:lavfi.scene_score=0.838916
+pkt_pts=15700|tag:lavfi.scene_score=1.000000
+pkt_pts=18500|tag:lavfi.scene_score=0.474948
+pkt_pts=21760|tag:lavfi.scene_score=1.000000
diff --git a/tests/ref/fate/filter-metadata-silencedetect b/tests/ref/fate/filter-metadata-silencedetect
new file mode 100644
index 0000000000..4161287e6c
--- /dev/null
+++ b/tests/ref/fate/filter-metadata-silencedetect
@@ -0,0 +1,512 @@
+pkt_pts=0
+pkt_pts=320
+pkt_pts=640
+pkt_pts=960
+pkt_pts=1280
+pkt_pts=1600
+pkt_pts=1920|tag:lavfi.silence_start=0.02
+pkt_pts=2240
+pkt_pts=2560|tag:lavfi.silence_end=0.16|tag:lavfi.silence_duration=0.14
+pkt_pts=2880
+pkt_pts=3200
+pkt_pts=3520
+pkt_pts=3840
+pkt_pts=4160
+pkt_pts=4480
+pkt_pts=4800
+pkt_pts=5120
+pkt_pts=5440
+pkt_pts=5760|tag:lavfi.silence_start=0.26|tag:lavfi.silence_end=0.36|tag:lavfi.silence_duration=0.1
+pkt_pts=6080
+pkt_pts=6400
+pkt_pts=6720
+pkt_pts=7040
+pkt_pts=7360
+pkt_pts=7680
+pkt_pts=8000
+pkt_pts=8320
+pkt_pts=8640
+pkt_pts=8960
+pkt_pts=9280
+pkt_pts=9600
+pkt_pts=9920
+pkt_pts=10240
+pkt_pts=10560
+pkt_pts=10880
+pkt_pts=11200
+pkt_pts=11520
+pkt_pts=11840
+pkt_pts=12160
+pkt_pts=12480
+pkt_pts=12800
+pkt_pts=13120
+pkt_pts=13440
+pkt_pts=13760
+pkt_pts=14080
+pkt_pts=14400
+pkt_pts=14720
+pkt_pts=15040
+pkt_pts=15360
+pkt_pts=15680
+pkt_pts=16000
+pkt_pts=16320
+pkt_pts=16640
+pkt_pts=16960
+pkt_pts=17280
+pkt_pts=17600
+pkt_pts=17920
+pkt_pts=18240
+pkt_pts=18560
+pkt_pts=18880
+pkt_pts=19200
+pkt_pts=19520
+pkt_pts=19840
+pkt_pts=20160
+pkt_pts=20480
+pkt_pts=20800
+pkt_pts=21120
+pkt_pts=21440
+pkt_pts=21760
+pkt_pts=22080|tag:lavfi.silence_start=1.28
+pkt_pts=22400
+pkt_pts=22720
+pkt_pts=23040
+pkt_pts=23360
+pkt_pts=23680
+pkt_pts=24000
+pkt_pts=24320
+pkt_pts=24640
+pkt_pts=24960
+pkt_pts=25280
+pkt_pts=25600
+pkt_pts=25920
+pkt_pts=26240
+pkt_pts=26560
+pkt_pts=26880
+pkt_pts=27200
+pkt_pts=27520
+pkt_pts=27840
+pkt_pts=28160
+pkt_pts=28480
+pkt_pts=28800
+pkt_pts=29120
+pkt_pts=29440
+pkt_pts=29760
+pkt_pts=30080
+pkt_pts=30400
+pkt_pts=30720
+pkt_pts=31040
+pkt_pts=31360
+pkt_pts=31680|tag:lavfi.silence_end=1.98|tag:lavfi.silence_duration=0.7
+pkt_pts=32000
+pkt_pts=32320
+pkt_pts=32640
+pkt_pts=32960
+pkt_pts=33280
+pkt_pts=33600
+pkt_pts=33920
+pkt_pts=34240
+pkt_pts=34560
+pkt_pts=34880
+pkt_pts=35200
+pkt_pts=35520
+pkt_pts=35840
+pkt_pts=36160
+pkt_pts=36480
+pkt_pts=36800
+pkt_pts=37120
+pkt_pts=37440
+pkt_pts=37760
+pkt_pts=38080
+pkt_pts=38400
+pkt_pts=38720
+pkt_pts=39040
+pkt_pts=39360
+pkt_pts=39680
+pkt_pts=40000
+pkt_pts=40320
+pkt_pts=40640
+pkt_pts=40960
+pkt_pts=41280
+pkt_pts=41600
+pkt_pts=41920
+pkt_pts=42240
+pkt_pts=42560
+pkt_pts=42880
+pkt_pts=43200
+pkt_pts=43520
+pkt_pts=43840
+pkt_pts=44160
+pkt_pts=44480
+pkt_pts=44800
+pkt_pts=45120
+pkt_pts=45440
+pkt_pts=45760
+pkt_pts=46080
+pkt_pts=46400
+pkt_pts=46720
+pkt_pts=47040
+pkt_pts=47360
+pkt_pts=47680
+pkt_pts=48000
+pkt_pts=48320
+pkt_pts=48640
+pkt_pts=48960
+pkt_pts=49280
+pkt_pts=49600
+pkt_pts=49920
+pkt_pts=50240
+pkt_pts=50560
+pkt_pts=50880
+pkt_pts=51200
+pkt_pts=51520
+pkt_pts=51840
+pkt_pts=52160
+pkt_pts=52480
+pkt_pts=52800|tag:lavfi.silence_start=3.2
+pkt_pts=53120
+pkt_pts=53440
+pkt_pts=53760
+pkt_pts=54080
+pkt_pts=54400
+pkt_pts=54720
+pkt_pts=55040
+pkt_pts=55360
+pkt_pts=55680
+pkt_pts=56000
+pkt_pts=56320
+pkt_pts=56640
+pkt_pts=56960
+pkt_pts=57280
+pkt_pts=57600
+pkt_pts=57920
+pkt_pts=58240
+pkt_pts=58560
+pkt_pts=58880
+pkt_pts=59200
+pkt_pts=59520
+pkt_pts=59840
+pkt_pts=60160
+pkt_pts=60480
+pkt_pts=60800
+pkt_pts=61120
+pkt_pts=61440
+pkt_pts=61760
+pkt_pts=62080
+pkt_pts=62400|tag:lavfi.silence_end=3.9|tag:lavfi.silence_duration=0.7
+pkt_pts=62720
+pkt_pts=63040
+pkt_pts=63360
+pkt_pts=63680
+pkt_pts=64000
+pkt_pts=64320
+pkt_pts=64640
+pkt_pts=64960
+pkt_pts=65280
+pkt_pts=65600
+pkt_pts=65920
+pkt_pts=66240
+pkt_pts=66560
+pkt_pts=66880
+pkt_pts=67200
+pkt_pts=67520
+pkt_pts=67840
+pkt_pts=68160
+pkt_pts=68480
+pkt_pts=68800
+pkt_pts=69120
+pkt_pts=69440
+pkt_pts=69760
+pkt_pts=70080
+pkt_pts=70400
+pkt_pts=70720
+pkt_pts=71040
+pkt_pts=71360
+pkt_pts=71680
+pkt_pts=72000
+pkt_pts=72320
+pkt_pts=72640
+pkt_pts=72960
+pkt_pts=73280
+pkt_pts=73600
+pkt_pts=73920
+pkt_pts=74240
+pkt_pts=74560
+pkt_pts=74880
+pkt_pts=75200
+pkt_pts=75520
+pkt_pts=75840
+pkt_pts=76160
+pkt_pts=76480
+pkt_pts=76800
+pkt_pts=77120
+pkt_pts=77440
+pkt_pts=77760
+pkt_pts=78080
+pkt_pts=78400
+pkt_pts=78720
+pkt_pts=79040
+pkt_pts=79360
+pkt_pts=79680
+pkt_pts=80000|tag:lavfi.silence_start=4.9
+pkt_pts=80320
+pkt_pts=80640
+pkt_pts=80960
+pkt_pts=81280
+pkt_pts=81600
+pkt_pts=81920
+pkt_pts=82240
+pkt_pts=82560
+pkt_pts=82880
+pkt_pts=83200
+pkt_pts=83520
+pkt_pts=83840
+pkt_pts=84160
+pkt_pts=84480
+pkt_pts=84800
+pkt_pts=85120
+pkt_pts=85440
+pkt_pts=85760
+pkt_pts=86080
+pkt_pts=86400
+pkt_pts=86720
+pkt_pts=87040|tag:lavfi.silence_end=5.44|tag:lavfi.silence_duration=0.54
+pkt_pts=87360
+pkt_pts=87680
+pkt_pts=88000
+pkt_pts=88320
+pkt_pts=88640
+pkt_pts=88960
+pkt_pts=89280
+pkt_pts=89600
+pkt_pts=89920
+pkt_pts=90240
+pkt_pts=90560
+pkt_pts=90880
+pkt_pts=91200
+pkt_pts=91520
+pkt_pts=91840
+pkt_pts=92160
+pkt_pts=92480
+pkt_pts=92800
+pkt_pts=93120
+pkt_pts=93440
+pkt_pts=93760
+pkt_pts=94080
+pkt_pts=94400
+pkt_pts=94720
+pkt_pts=95040
+pkt_pts=95360
+pkt_pts=95680
+pkt_pts=96000
+pkt_pts=96320
+pkt_pts=96640
+pkt_pts=96960
+pkt_pts=97280
+pkt_pts=97600
+pkt_pts=97920
+pkt_pts=98240
+pkt_pts=98560
+pkt_pts=98880
+pkt_pts=99200
+pkt_pts=99520
+pkt_pts=99840
+pkt_pts=100160
+pkt_pts=100480
+pkt_pts=100800
+pkt_pts=101120
+pkt_pts=101440
+pkt_pts=101760
+pkt_pts=102080
+pkt_pts=102400
+pkt_pts=102720
+pkt_pts=103040
+pkt_pts=103360
+pkt_pts=103680
+pkt_pts=104000
+pkt_pts=104320
+pkt_pts=104640|tag:lavfi.silence_start=6.44
+pkt_pts=104960
+pkt_pts=105280
+pkt_pts=105600
+pkt_pts=105920
+pkt_pts=106240
+pkt_pts=106560
+pkt_pts=106880
+pkt_pts=107200
+pkt_pts=107520
+pkt_pts=107840
+pkt_pts=108160
+pkt_pts=108480
+pkt_pts=108800
+pkt_pts=109120
+pkt_pts=109440
+pkt_pts=109760
+pkt_pts=110080
+pkt_pts=110400
+pkt_pts=110720
+pkt_pts=111040
+pkt_pts=111360
+pkt_pts=111680
+pkt_pts=112000
+pkt_pts=112320
+pkt_pts=112640
+pkt_pts=112960
+pkt_pts=113280
+pkt_pts=113600
+pkt_pts=113920
+pkt_pts=114240
+pkt_pts=114560
+pkt_pts=114880
+pkt_pts=115200
+pkt_pts=115520
+pkt_pts=115840
+pkt_pts=116160|tag:lavfi.silence_end=7.26|tag:lavfi.silence_duration=0.82
+pkt_pts=116480
+pkt_pts=116800
+pkt_pts=117120
+pkt_pts=117440
+pkt_pts=117760
+pkt_pts=118080
+pkt_pts=118400
+pkt_pts=118720
+pkt_pts=119040
+pkt_pts=119360
+pkt_pts=119680
+pkt_pts=120000
+pkt_pts=120320
+pkt_pts=120640
+pkt_pts=120960
+pkt_pts=121280
+pkt_pts=121600
+pkt_pts=121920
+pkt_pts=122240
+pkt_pts=122560
+pkt_pts=122880
+pkt_pts=123200
+pkt_pts=123520
+pkt_pts=123840
+pkt_pts=124160
+pkt_pts=124480
+pkt_pts=124800
+pkt_pts=125120
+pkt_pts=125440
+pkt_pts=125760
+pkt_pts=126080
+pkt_pts=126400
+pkt_pts=126720
+pkt_pts=127040
+pkt_pts=127360
+pkt_pts=127680
+pkt_pts=128000
+pkt_pts=128320
+pkt_pts=128640
+pkt_pts=128960
+pkt_pts=129280
+pkt_pts=129600
+pkt_pts=129920
+pkt_pts=130240
+pkt_pts=130560
+pkt_pts=130880
+pkt_pts=131200
+pkt_pts=131520
+pkt_pts=131840
+pkt_pts=132160
+pkt_pts=132480
+pkt_pts=132800
+pkt_pts=133120
+pkt_pts=133440
+pkt_pts=133760
+pkt_pts=134080
+pkt_pts=134400
+pkt_pts=134720
+pkt_pts=135040
+pkt_pts=135360
+pkt_pts=135680
+pkt_pts=136000
+pkt_pts=136320
+pkt_pts=136640
+pkt_pts=136960
+pkt_pts=137280
+pkt_pts=137600|tag:lavfi.silence_start=8.5
+pkt_pts=137920
+pkt_pts=138240
+pkt_pts=138560
+pkt_pts=138880|tag:lavfi.silence_end=8.68|tag:lavfi.silence_duration=0.18
+pkt_pts=139200
+pkt_pts=139520
+pkt_pts=139840
+pkt_pts=140160
+pkt_pts=140480|tag:lavfi.silence_start=8.68
+pkt_pts=140800
+pkt_pts=141120
+pkt_pts=141440
+pkt_pts=141760
+pkt_pts=142080
+pkt_pts=142400
+pkt_pts=142720
+pkt_pts=143040
+pkt_pts=143360
+pkt_pts=143680|tag:lavfi.silence_end=8.98|tag:lavfi.silence_duration=0.3
+pkt_pts=144000
+pkt_pts=144320
+pkt_pts=144640
+pkt_pts=144960
+pkt_pts=145280
+pkt_pts=145600
+pkt_pts=145920
+pkt_pts=146240
+pkt_pts=146560
+pkt_pts=146880
+pkt_pts=147200
+pkt_pts=147520
+pkt_pts=147840
+pkt_pts=148160
+pkt_pts=148480
+pkt_pts=148800
+pkt_pts=149120
+pkt_pts=149440
+pkt_pts=149760
+pkt_pts=150080
+pkt_pts=150400
+pkt_pts=150720
+pkt_pts=151040
+pkt_pts=151360
+pkt_pts=151680
+pkt_pts=152000
+pkt_pts=152320
+pkt_pts=152640
+pkt_pts=152960
+pkt_pts=153280
+pkt_pts=153600
+pkt_pts=153920
+pkt_pts=154240
+pkt_pts=154560
+pkt_pts=154880
+pkt_pts=155200
+pkt_pts=155520
+pkt_pts=155840
+pkt_pts=156160
+pkt_pts=156480
+pkt_pts=156800
+pkt_pts=157120
+pkt_pts=157440
+pkt_pts=157760
+pkt_pts=158080
+pkt_pts=158400
+pkt_pts=158720
+pkt_pts=159040
+pkt_pts=159360
+pkt_pts=159680
+pkt_pts=160000
+pkt_pts=160320
+pkt_pts=160640
+pkt_pts=160960
+pkt_pts=161280
+pkt_pts=161600|tag:lavfi.silence_start=10
+pkt_pts=161920
+pkt_pts=162240
+pkt_pts=162560
+pkt_pts=162880
+pkt_pts=163200
+pkt_pts=163520
diff --git a/tests/ref/fate/filter-mpdecimate b/tests/ref/fate/filter-mpdecimate
new file mode 100644
index 0000000000..9c1dc36562
--- /dev/null
+++ b/tests/ref/fate/filter-mpdecimate
@@ -0,0 +1,24 @@
+#tb 0: 1/3
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   115200, 0x3744b3ed
+0,          2,          2,        1,   115200, 0x6e318ba0
+0,          3,          3,        1,   115200, 0x48d65876
+0,          5,          5,        1,   115200, 0x9087e4f1
+0,          6,          6,        1,   115200, 0xc58d5c94
+0,          8,          8,        1,   115200, 0x8c4ad4f4
+0,          9,          9,        1,   115200, 0xf96f6755
+0,         11,         11,        1,   115200, 0x90beb7ba
+0,         12,         12,        1,   115200, 0xa8f4f31b
+0,         14,         14,        1,   115200, 0x21441a03
+0,         15,         15,        1,   115200, 0x393b3494
+0,         17,         17,        1,   115200, 0xc7aeec1d
+0,         18,         18,        1,   115200, 0x2bd24a0e
+0,         20,         20,        1,   115200, 0xea66d804
+0,         21,         21,        1,   115200, 0x237953c3
+0,         23,         23,        1,   115200, 0xff98a9b1
+0,         24,         24,        1,   115200, 0x056d40ca
+0,         26,         26,        1,   115200, 0xa4374737
+0,         27,         27,        1,   115200, 0x3eaa3ae8
diff --git a/tests/ref/fate/filter-negate b/tests/ref/fate/filter-negate
index 1d2ea73043..88d04718ae 100644
--- a/tests/ref/fate/filter-negate
+++ b/tests/ref/fate/filter-negate
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xef20e1ec
 0,          1,          1,        1,   152064, 0x899606ec
 0,          2,          2,        1,   152064, 0xaea175d2
diff --git a/tests/ref/fate/filter-null b/tests/ref/fate/filter-null
index 3a1d0c1824..034ee8db20 100644
--- a/tests/ref/fate/filter-null
+++ b/tests/ref/fate/filter-null
@@ -1 +1 @@
-null                7aaf1057c0edf7d5e9700f9c8e510ea9
+null                fcb007249fba9371fe84a61c974fcb00
diff --git a/tests/ref/fate/filter-overlay b/tests/ref/fate/filter-overlay
index d988a2e4e1..bcbde5458f 100644
--- a/tests/ref/fate/filter-overlay
+++ b/tests/ref/fate/filter-overlay
@@ -1,51 +1,55 @@
 #tb 0: 1/25
-0,          0,          0,        1,   152064, 0xf6f773b6
-0,          1,          1,        1,   152064, 0x8e67618e
-0,          2,          2,        1,   152064, 0xc8eff2ef
-0,          3,          3,        1,   152064, 0xcf39936c
-0,          4,          4,        1,   152064, 0xaf18c4d1
-0,          5,          5,        1,   152064, 0x7e69911e
-0,          6,          6,        1,   152064, 0x1b70214f
-0,          7,          7,        1,   152064, 0xc8032176
-0,          8,          8,        1,   152064, 0xefb42ecc
-0,          9,          9,        1,   152064, 0xfb210e4b
-0,         10,         10,        1,   152064, 0x2ee24b11
-0,         11,         11,        1,   152064, 0x0dac02a5
-0,         12,         12,        1,   152064, 0x9a5ce483
-0,         13,         13,        1,   152064, 0x6bb7c758
-0,         14,         14,        1,   152064, 0xcbb545e5
-0,         15,         15,        1,   152064, 0x81c1b339
-0,         16,         16,        1,   152064, 0xfa38d624
-0,         17,         17,        1,   152064, 0x56c5e63e
-0,         18,         18,        1,   152064, 0x419d194d
-0,         19,         19,        1,   152064, 0xed1a92b8
-0,         20,         20,        1,   152064, 0xd2c0aa39
-0,         21,         21,        1,   152064, 0x6214ddd5
-0,         22,         22,        1,   152064, 0xa978e19f
-0,         23,         23,        1,   152064, 0x676422a2
-0,         24,         24,        1,   152064, 0x5213dd62
-0,         25,         25,        1,   152064, 0x13c1a404
-0,         26,         26,        1,   152064, 0xa543a1a2
-0,         27,         27,        1,   152064, 0x8d0d0bed
-0,         28,         28,        1,   152064, 0x000304cf
-0,         29,         29,        1,   152064, 0x7f75b0ab
-0,         30,         30,        1,   152064, 0x68d07ce6
-0,         31,         31,        1,   152064, 0xb88c9852
-0,         32,         32,        1,   152064, 0x4be5ae13
-0,         33,         33,        1,   152064, 0x85b3f7b1
-0,         34,         34,        1,   152064, 0x9facb7d5
-0,         35,         35,        1,   152064, 0x9f11617e
-0,         36,         36,        1,   152064, 0x43393f46
-0,         37,         37,        1,   152064, 0xd45c3b92
-0,         38,         38,        1,   152064, 0x53de7e1b
-0,         39,         39,        1,   152064, 0xd1c685a7
-0,         40,         40,        1,   152064, 0x21e1778f
-0,         41,         41,        1,   152064, 0xe2b1abe1
-0,         42,         42,        1,   152064, 0x8623b5aa
-0,         43,         43,        1,   152064, 0xfc700aa3
-0,         44,         44,        1,   152064, 0x30a2d120
-0,         45,         45,        1,   152064, 0xa35e4d15
-0,         46,         46,        1,   152064, 0xa3fb11c5
-0,         47,         47,        1,   152064, 0x034f8fb7
-0,         48,         48,        1,   152064, 0x921c7d85
-0,         49,         49,        1,   152064, 0x7a94b9bf
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x2b1a7a92
+0,          1,          1,        1,   152064, 0x6f28685a
+0,          2,          2,        1,   152064, 0xeac9f99c
+0,          3,          3,        1,   152064, 0x3a059a74
+0,          4,          4,        1,   152064, 0xb53ecbf0
+0,          5,          5,        1,   152064, 0x288c9843
+0,          6,          6,        1,   152064, 0x927a293b
+0,          7,          7,        1,   152064, 0x85f72884
+0,          8,          8,        1,   152064, 0x42c234b9
+0,          9,          9,        1,   152064, 0x36c2152f
+0,         10,         10,        1,   152064, 0x903b529a
+0,         11,         11,        1,   152064, 0x29ce0a02
+0,         12,         12,        1,   152064, 0x3683ebce
+0,         13,         13,        1,   152064, 0xfb88cdab
+0,         14,         14,        1,   152064, 0x3a6a4c7c
+0,         15,         15,        1,   152064, 0x8d81ba4a
+0,         16,         16,        1,   152064, 0x982cdddb
+0,         17,         17,        1,   152064, 0x9554ee2f
+0,         18,         18,        1,   152064, 0x1e61219d
+0,         19,         19,        1,   152064, 0xfcfe9b00
+0,         20,         20,        1,   152064, 0x891fb285
+0,         21,         21,        1,   152064, 0x4401e619
+0,         22,         22,        1,   152064, 0x57beea17
+0,         23,         23,        1,   152064, 0x94102ade
+0,         24,         24,        1,   152064, 0x5240e58d
+0,         25,         25,        1,   152064, 0x3783abba
+0,         26,         26,        1,   152064, 0x2570a936
+0,         27,         27,        1,   152064, 0x53071378
+0,         28,         28,        1,   152064, 0x3cda0c41
+0,         29,         29,        1,   152064, 0x3a8cb83d
+0,         30,         30,        1,   152064, 0x5fc0840b
+0,         31,         31,        1,   152064, 0x32519f3d
+0,         32,         32,        1,   152064, 0xac56b3f7
+0,         33,         33,        1,   152064, 0xe36dfece
+0,         34,         34,        1,   152064, 0xb663bfbd
+0,         35,         35,        1,   152064, 0xafdf691c
+0,         36,         36,        1,   152064, 0x31bd4631
+0,         37,         37,        1,   152064, 0xac7a421a
+0,         38,         38,        1,   152064, 0x05f7856d
+0,         39,         39,        1,   152064, 0xec3a8ccf
+0,         40,         40,        1,   152064, 0x9e7a7efb
+0,         41,         41,        1,   152064, 0x9747b314
+0,         42,         42,        1,   152064, 0x1ba4bcc0
+0,         43,         43,        1,   152064, 0x90e31197
+0,         44,         44,        1,   152064, 0x98f5d7cd
+0,         45,         45,        1,   152064, 0x763053cb
+0,         46,         46,        1,   152064, 0x4fb8183e
+0,         47,         47,        1,   152064, 0xf27596ad
+0,         48,         48,        1,   152064, 0x4c6a843a
+0,         49,         49,        1,   152064, 0x7ff3c070
diff --git a/tests/ref/fate/filter-overlay-dvdsub-2397 b/tests/ref/fate/filter-overlay-dvdsub-2397
new file mode 100644
index 0000000000..b86a2184b7
--- /dev/null
+++ b/tests/ref/fate/filter-overlay-dvdsub-2397
@@ -0,0 +1,857 @@
+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 1/1
+#tb 1: 1/1000
+#media_type 1: audio
+#codec_id 1: dts
+#sample_rate 1: 48000
+#channel_layout 1: 60f
+#channel_layout_name 1: 5.1(side)
+0,          0,          0,        1,   518400, 0x6b05d48a
+1,         27,         27,       10,     2013, 0x68e7b03a
+0,          1,          1,        1,   518400, 0x2c2219cd
+1,         37,         37,       10,     2013, 0x0b1d88d3
+1,         47,         47,       10,     2013, 0x65febc94
+1,         57,         57,       10,     2013, 0x1bb4b445
+0,          2,          2,        1,   518400, 0xa71638c3
+1,         67,         67,       10,     2013, 0x88819a72
+1,         77,         77,       10,     2013, 0x35b89574
+1,         87,         87,       10,     2013, 0x1f08c7e3
+1,         97,         97,       10,     2013, 0x0afc948f
+0,          3,          3,        1,   518400, 0x54bda463
+1,        112,        112,       10,     2013, 0x1d14a693
+1,        122,        122,       10,     2013, 0x53acb554
+1,        132,        132,       10,     2013, 0x71d0a075
+0,          4,          4,        1,   518400, 0xd1e00574
+1,        142,        142,       10,     2013, 0xdcc8a88a
+1,        152,        152,       10,     2013, 0xd1b6a8a2
+1,        162,        162,       10,     2013, 0x46bba243
+0,          5,          5,        1,   518400, 0x53b07f2d
+1,        172,        172,       10,     2013, 0xdcbe9933
+1,        182,        182,       10,     2013, 0xdef5ab52
+1,        198,        198,       10,     2013, 0xd16e8245
+0,          6,          6,        1,   518400, 0x4d19c80b
+1,        208,        208,       10,     2013, 0x5567acd7
+1,        218,        218,       10,     2013, 0xfb129919
+1,        228,        228,       10,     2013, 0x26f8b101
+0,          7,          7,        1,   518400, 0xd34866a2
+1,        238,        238,       10,     2013, 0xa903aff2
+1,        248,        248,       10,     2013, 0x056ba445
+1,        258,        258,       10,     2013, 0xd30ab214
+0,          8,          8,        1,   518400, 0x0321c3db
+1,        268,        268,       10,     2013, 0x35409ef0
+1,        283,        283,       10,     2013, 0xa01b99a8
+1,        293,        293,       10,     2013, 0x776da122
+0,          9,          9,        1,   518400, 0x3f460a79
+1,        303,        303,       10,     2013, 0x411ea855
+1,        313,        313,       10,     2013, 0x0f199df4
+1,        323,        323,       10,     2013, 0xb0598e93
+1,        333,        333,       10,     2013, 0xc63a905a
+0,         10,         10,        1,   518400, 0x71202482
+1,        343,        343,       10,     2013, 0x3fbabd24
+1,        353,        353,       10,     2013, 0xfd55ba5c
+0,         11,         11,        1,   518400, 0x2f7df36e
+1,        368,        368,       10,     2013, 0xf260b04e
+1,        378,        378,       10,     2013, 0xa1f6a1cf
+1,        388,        388,       10,     2013, 0x3559a529
+1,        398,        398,       10,     2013, 0x956e95ed
+0,         12,         12,        1,   518400, 0xaf9888c4
+1,        408,        408,       10,     2013, 0xb9d3a2f8
+1,        418,        418,       10,     2013, 0x3eda8113
+1,        428,        428,       10,     2013, 0x367fa367
+0,         13,         13,        1,   518400, 0x2055a657
+1,        438,        438,       10,     2013, 0xc2fe9685
+1,        454,        454,       10,     2013, 0xf7aead38
+1,        464,        464,       10,     2013, 0x49ada587
+0,         14,         14,        1,   518400, 0x22ccda4c
+1,        474,        474,       10,     2013, 0x8c0ca225
+1,        484,        484,       10,     2013, 0x29ee9122
+1,        494,        494,       10,     2013, 0x6ce1976a
+0,         15,         15,        1,   518400, 0xd6adb9a7
+1,        504,        504,       10,     2013, 0x6a0b9d5b
+1,        514,        514,       10,     2013, 0x1337a33b
+1,        524,        524,       10,     2013, 0xaa12a3b0
+0,         16,         16,        1,   518400, 0x6a7dd791
+1,        539,        539,       10,     2013, 0xaf59aaf4
+1,        549,        549,       10,     2013, 0x4ffab2c5
+1,        559,        559,       10,     2013, 0x56249944
+0,         17,         17,        1,   518400, 0x5c3319c7
+1,        569,        569,       10,     2013, 0x95f6ad07
+1,        579,        579,       10,     2013, 0xb8e6a610
+1,        589,        589,       10,     2013, 0xaee2948b
+1,        599,        599,       10,     2013, 0xc686adac
+0,         18,         18,        1,   518400, 0xe9b5a47d
+1,        609,        609,       10,     2013, 0x6bcdb073
+1,        624,        624,       10,     2013, 0x26d496b2
+0,         19,         19,        1,   518400, 0xf0bd6556
+1,        634,        634,       10,     2013, 0xaa419b09
+1,        644,        644,       10,     2013, 0xee6ba974
+1,        654,        654,       10,     2013, 0x690893b8
+1,        664,        664,       10,     2013, 0xaa7eb6c5
+0,         20,         20,        1,   518400, 0x6b16e31b
+1,        674,        674,       10,     2013, 0x73e094c3
+1,        684,        684,       10,     2013, 0xa297a539
+1,        694,        694,       10,     2013, 0x15e7a304
+0,         21,         21,        1,   518400, 0x859b3832
+1,        710,        710,       10,     2013, 0xc8dfaa11
+1,        720,        720,       10,     2013, 0xc2b5939b
+1,        730,        730,       10,     2013, 0xecaaab92
+0,         22,         22,        1,   518400, 0x36b426b8
+1,        740,        740,       10,     2013, 0xc522ab70
+1,        750,        750,       10,     2013, 0x1668985c
+1,        760,        760,       10,     2013, 0x59a596f7
+0,         23,         23,        1,   518400, 0x60f3e06a
+1,        770,        770,       10,     2013, 0x12d8a3c4
+1,        780,        780,       10,     2013, 0x71f1b02f
+1,        795,        795,       10,     2013, 0x7138c757
+0,         24,         24,        1,   518400, 0xe56a65a3
+1,        805,        805,       10,     2013, 0x199d9631
+1,        815,        815,       10,     2013, 0x8955ae90
+1,        825,        825,       10,     2013, 0xbdf0a97d
+0,         25,         25,        1,   518400, 0x5641e549
+1,        835,        835,       10,     2013, 0x47faa1e7
+1,        845,        845,       10,     2013, 0x01bbb638
+1,        855,        855,       10,     2013, 0x4e4da199
+1,        865,        865,       10,     2013, 0x3ba7abf4
+0,         26,         26,        1,   518400, 0x7b51a06b
+1,        880,        880,       10,     2013, 0xa3fda508
+1,        890,        890,       10,     2013, 0x81c0ad1d
+1,        900,        900,       10,     2013, 0x93beaf3b
+0,         27,         27,        1,   518400, 0xc6f53f46
+1,        910,        910,       10,     2013, 0xe30eac59
+1,        920,        920,       10,     2013, 0x797eaa78
+1,        930,        930,       10,     2013, 0xca4e8f1e
+0,         28,         28,        1,   518400, 0x2e12e6c4
+1,        940,        940,       10,     2013, 0x39fa945d
+1,        950,        950,       10,     2013, 0xff31b5d6
+1,        966,        966,       10,     2013, 0x3b7e9efa
+0,         29,         29,        1,   518400, 0xebc97246
+1,        976,        976,       10,     2013, 0xc3e6b7b5
+1,        986,        986,       10,     2013, 0x37c7c3f9
+1,        996,        996,       10,     2013, 0x2966c8b8
+0,         30,         30,        1,   518400, 0x814ca8fa
+1,       1006,       1006,       10,     2013, 0xc1b79ccd
+1,       1016,       1016,       10,     2013, 0x80afad19
+1,       1026,       1026,       10,     2013, 0xb2f2adc4
+0,         31,         31,        1,   518400, 0xc875f1f8
+1,       1036,       1036,       10,     2013, 0xfed29216
+1,       1051,       1051,       10,     2013, 0x47ebb382
+1,       1061,       1061,       10,     2013, 0x5f89bb83
+0,         32,         32,        1,   518400, 0x11295e3b
+1,       1071,       1071,       10,     2013, 0x0e07ab5d
+1,       1081,       1081,       10,     2013, 0x6f00af38
+1,       1091,       1091,       10,     2013, 0xe7fcadfb
+1,       1101,       1101,       10,     2013, 0x34c0a648
+0,         33,         33,        1,   518400, 0x5895f2f4
+1,       1111,       1111,       10,     2013, 0x24c88fe2
+1,       1121,       1121,       10,     2013, 0xe57e9d1f
+0,         34,         34,        1,   518400, 0x2bdbb858
+1,       1136,       1136,       10,     2013, 0xda03a3d8
+1,       1146,       1146,       10,     2013, 0x5655b308
+1,       1156,       1156,       10,     2013, 0x13a7c01d
+1,       1166,       1166,       10,     2013, 0x56559682
+0,         35,         35,        1,   518400, 0x5f296abe
+1,       1176,       1176,       10,     2013, 0x26d8cca6
+1,       1186,       1186,       10,     2013, 0x0ac79ed5
+1,       1196,       1196,       10,     2013, 0x353fadcf
+0,         36,         36,        1,   518400, 0x0b00e1f2
+1,       1206,       1206,       10,     2013, 0xc5d9a96e
+1,       1222,       1222,       10,     2013, 0xf51ba278
+1,       1232,       1232,       10,     2013, 0x7bf0b79e
+0,         37,         37,        1,   518400, 0x64afd3fc
+1,       1242,       1242,       10,     2013, 0xbbc58df7
+1,       1252,       1252,       10,     2013, 0xa1739cc8
+1,       1262,       1262,       10,     2013, 0x34deaec6
+0,         38,         38,        1,   518400, 0xc1ae1d85
+1,       1272,       1272,       10,     2013, 0x750ba20b
+1,       1282,       1282,       10,     2013, 0xaaccacfa
+1,       1292,       1292,       10,     2013, 0x02cc9b72
+0,         39,         39,        1,   518400, 0x5189f5e6
+1,       1307,       1307,       10,     2013, 0xc1c6aa7e
+1,       1317,       1317,       10,     2013, 0xd609ab26
+1,       1327,       1327,       10,     2013, 0xc880a135
+0,         40,         40,        1,   518400, 0x61c7dc36
+1,       1337,       1337,       10,     2013, 0xddc4bc69
+1,       1347,       1347,       10,     2013, 0x934caf65
+1,       1357,       1357,       10,     2013, 0xafa6af4a
+1,       1367,       1367,       10,     2013, 0x886eab2b
+0,         41,         41,        1,   518400, 0xc0e617c8
+1,       1377,       1377,       10,     2013, 0x7880a5ac
+1,       1392,       1392,       10,     2013, 0x55cf9a72
+0,         42,         42,        1,   518400, 0xcc78bfbf
+1,       1402,       1402,       10,     2013, 0xff199a41
+1,       1412,       1412,       10,     2013, 0xdbc7a029
+1,       1422,       1422,       10,     2013, 0x1012940a
+0,         43,         43,        1,   518400, 0x8a9b924f
+1,       1435,       1435,       10,     2013, 0x0598b84f
+1,       1445,       1445,       10,     2013, 0x2dea9296
+1,       1455,       1455,       10,     2013, 0x443580c3
+1,       1465,       1465,       10,     2013, 0x8d319f10
+0,         44,         44,        1,   518400, 0xb21db38a
+1,       1475,       1475,       10,     2013, 0xacf4acfe
+1,       1485,       1485,       10,     2013, 0x82b0ac7b
+1,       1495,       1495,       10,     2013, 0x9a7cb71c
+0,         45,         45,        1,   518400, 0xd5ab5f27
+1,       1505,       1505,       10,     2013, 0xbe7c9bc4
+1,       1520,       1520,       10,     2013, 0x93cba1fd
+1,       1530,       1530,       10,     2013, 0x7fb7b11f
+0,         46,         46,        1,   518400, 0xc1b7b060
+1,       1540,       1540,       10,     2013, 0xd9dea46b
+1,       1550,       1550,       10,     2013, 0xfe11a5b2
+1,       1560,       1560,       10,     2013, 0x0243a937
+0,         47,         47,        1,   518400, 0x4cd477e8
+1,       1570,       1570,       10,     2013, 0x1eaba981
+1,       1580,       1580,       10,     2013, 0x088f9626
+1,       1590,       1590,       10,     2013, 0x4f1aa59a
+0,         48,         48,        1,   518400, 0x84fb48b3
+1,       1606,       1606,       10,     2013, 0x0352b14d
+1,       1616,       1616,       10,     2013, 0x03cc9bf9
+1,       1626,       1626,       10,     2013, 0xa9949060
+0,         49,         49,        1,   518400, 0x6d2fdd37
+1,       1636,       1636,       10,     2013, 0x07a89509
+1,       1646,       1646,       10,     2013, 0x1e588e8a
+1,       1656,       1656,       10,     2013, 0x7845b7c1
+1,       1666,       1666,       10,     2013, 0x676fa3c7
+0,         50,         50,        1,   518400, 0xf754edd8
+1,       1676,       1676,       10,     2013, 0xe5bfae55
+1,       1691,       1691,       10,     2013, 0xb1bc9249
+1,       1701,       1701,       10,     2013, 0xecd7abfb
+0,         51,         51,        1,   518400, 0x520cbdcd
+1,       1711,       1711,       10,     2013, 0x0389a6d5
+1,       1721,       1721,       10,     2013, 0xf9b69da1
+1,       1731,       1731,       10,     2013, 0x2bbaafc4
+0,         52,         52,        1,   518400, 0x54a53c59
+1,       1741,       1741,       10,     2013, 0x45738eb2
+1,       1751,       1751,       10,     2013, 0xf28ea9b6
+1,       1761,       1761,       10,     2013, 0x0d6dab7a
+0,         53,         53,        1,   518400, 0xbb9d3c93
+1,       1776,       1776,       10,     2013, 0x6c04b586
+1,       1786,       1786,       10,     2013, 0x74e4b50c
+1,       1796,       1796,       10,     2013, 0x7cd6ad9b
+0,         54,         54,        1,   518400, 0xbb84e583
+1,       1806,       1806,       10,     2013, 0x70c79d83
+1,       1816,       1816,       10,     2013, 0x741eab3c
+1,       1826,       1826,       10,     2013, 0xb972a8cf
+0,         55,         55,        1,   518400, 0xf03b9f4f
+1,       1836,       1836,       10,     2013, 0x4143a734
+1,       1846,       1846,       10,     2013, 0xa98cb454
+1,       1862,       1862,       10,     2013, 0x51e89073
+0,         56,         56,        1,   518400, 0x8b88635d
+1,       1872,       1872,       10,     2013, 0x192cb418
+1,       1882,       1882,       10,     2013, 0x6c55aa29
+1,       1892,       1892,       10,     2013, 0xf86fad70
+0,         57,         57,        1,   518400, 0x975fb58d
+1,       1902,       1902,       10,     2013, 0x06eca62d
+1,       1912,       1912,       10,     2013, 0xe4f2a1d2
+1,       1922,       1922,       10,     2013, 0xe542afb6
+1,       1932,       1932,       10,     2013, 0x77f1b0c3
+0,         58,         58,        1,   518400, 0x9d63c101
+1,       1947,       1947,       10,     2013, 0x27ce9cd1
+1,       1957,       1957,       10,     2013, 0x6c8d8f02
+1,       1967,       1967,       10,     2013, 0x32afa383
+0,         59,         59,        1,   518400, 0x6e739153
+1,       1977,       1977,       10,     2013, 0xb90c88a7
+1,       1987,       1987,       10,     2013, 0x10b494ed
+1,       1997,       1997,       10,     2013, 0x0cf8a595
+0,         60,         60,        1,   518400, 0xaf6a5fac
+1,       2007,       2007,       10,     2013, 0x09f88863
+1,       2017,       2017,       10,     2013, 0x67f5a87e
+1,       2032,       2032,       10,     2013, 0xc63892b8
+0,         61,         61,        1,   518400, 0xc87efe9c
+1,       2042,       2042,       10,     2013, 0x6de9935c
+1,       2052,       2052,       10,     2013, 0xadfcb473
+1,       2062,       2062,       10,     2013, 0x7ba9abe7
+0,         62,         62,        1,   518400, 0xdf47969f
+1,       2072,       2072,       10,     2013, 0x6b79b6c8
+1,       2082,       2082,       10,     2013, 0xae46b670
+1,       2092,       2092,       10,     2013, 0xa3fb9961
+1,       2102,       2102,       10,     2013, 0x3413a4cb
+0,         63,         63,        1,   518400, 0xfa5d2ab0
+1,       2118,       2118,       10,     2013, 0x2c16b48e
+1,       2128,       2128,       10,     2013, 0xd2559fd5
+0,         64,         64,        1,   518400, 0x7428a46a
+1,       2138,       2138,       10,     2013, 0xafdeb68d
+1,       2148,       2148,       10,     2013, 0x52f79c97
+1,       2158,       2158,       10,     2013, 0x6f2091e1
+1,       2168,       2168,       10,     2013, 0x03fca1fd
+0,         65,         65,        1,   518400, 0x3c6c93d9
+1,       2178,       2178,       10,     2013, 0x62d98a8b
+1,       2188,       2188,       10,     2013, 0x727c9845
+0,         66,         66,        1,   518400, 0x9a2fde5d
+1,       2203,       2203,       10,     2013, 0x8103ae15
+1,       2213,       2213,       10,     2013, 0x7bcaa4fc
+1,       2223,       2223,       10,     2013, 0x2d809a43
+1,       2233,       2233,       10,     2013, 0xaa20ab9d
+0,         67,         67,        1,   518400, 0x3858fd67
+1,       2243,       2243,       10,     2013, 0x40c0b8f1
+1,       2253,       2253,       10,     2013, 0x412c9a7e
+1,       2263,       2263,       10,     2013, 0xc7159943
+0,         68,         68,        1,   518400, 0x7d65fc58
+1,       2273,       2273,       10,     2013, 0x3c83a3c1
+1,       2288,       2288,       10,     2013, 0xf1b0b7b5
+1,       2298,       2298,       10,     2013, 0xf7b8a928
+0,         69,         69,        1,   518400, 0xdcbd4b53
+1,       2308,       2308,       10,     2013, 0xb3ec9f8c
+1,       2318,       2318,       10,     2013, 0x088db3b4
+1,       2328,       2328,       10,     2013, 0xd3b7b01d
+0,         70,         70,        1,   518400, 0x03f733d2
+1,       2338,       2338,       10,     2013, 0x26e9c747
+1,       2348,       2348,       10,     2013, 0xb34978e2
+1,       2358,       2358,       10,     2013, 0x91dbb10c
+0,         71,         71,        1,   518400, 0x58d917b0
+1,       2374,       2374,       10,     2013, 0xd9d3a2f1
+1,       2384,       2384,       10,     2013, 0x39f5b151
+1,       2394,       2394,       10,     2013, 0x29fb91e0
+0,         72,         72,        1,   518400, 0x1898371f
+1,       2404,       2404,       10,     2013, 0x93d4b550
+1,       2414,       2414,       10,     2013, 0x290fa162
+1,       2424,       2424,       10,     2013, 0x5e169f0b
+1,       2434,       2434,       10,     2013, 0x2f53acff
+0,         73,         73,        1,   518400, 0x2f5b5418
+1,       2444,       2444,       10,     2013, 0x0173ab1d
+1,       2459,       2459,       10,     2013, 0x3f37a8f8
+1,       2469,       2469,       10,     2013, 0xe61baa50
+0,         74,         74,        1,   518400, 0xa71f5a29
+1,       2479,       2479,       10,     2013, 0x25be9bb7
+1,       2489,       2489,       10,     2013, 0x73109dcc
+1,       2499,       2499,       10,     2013, 0x2d89b116
+0,         75,         75,        1,   518400, 0xad78426b
+1,       2509,       2509,       10,     2013, 0x0ae5adbe
+1,       2519,       2519,       10,     2013, 0x64a798ae
+1,       2529,       2529,       10,     2013, 0x583fac0c
+0,         76,         76,        1,   518400, 0x0c9155e3
+1,       2544,       2544,       10,     2013, 0xe752b7be
+1,       2554,       2554,       10,     2013, 0xb3fb9d5d
+1,       2564,       2564,       10,     2013, 0xaeb0bf93
+0,         77,         77,        1,   518400, 0x4fac4817
+1,       2574,       2574,       10,     2013, 0xab61c17d
+1,       2584,       2584,       10,     2013, 0x92d2add0
+1,       2594,       2594,       10,     2013, 0xb34b96ec
+0,         78,         78,        1,   518400, 0xcacb963e
+1,       2604,       2604,       10,     2013, 0x9cb19d35
+1,       2614,       2614,       10,     2013, 0xb7b3b961
+1,       2630,       2630,       10,     2013, 0x2a52a20b
+0,         79,         79,        1,   518400, 0x3a6183cc
+1,       2640,       2640,       10,     2013, 0x059eaf06
+1,       2650,       2650,       10,     2013, 0x0d49ac8a
+1,       2660,       2660,       10,     2013, 0x095b97cf
+0,         80,         80,        1,   518400, 0x65d47e90
+1,       2670,       2670,       10,     2013, 0x03e28d94
+1,       2680,       2680,       10,     2013, 0x50d79f48
+1,       2690,       2690,       10,     2013, 0x71c9a459
+1,       2700,       2700,       10,     2013, 0x8cd6affc
+0,         81,         81,        1,   518400, 0xf9b7e517
+1,       2715,       2715,       10,     2013, 0x89fba9c9
+1,       2725,       2725,       10,     2013, 0x74a1b800
+1,       2735,       2735,       10,     2013, 0x675dc84d
+0,         82,         82,        1,   518400, 0x8aac2e66
+1,       2745,       2745,       10,     2013, 0x25fe8f0c
+1,       2755,       2755,       10,     2013, 0xf38da26b
+1,       2765,       2765,       10,     2013, 0x1d04a500
+0,         83,         83,        1,   518400, 0x555456e4
+1,       2775,       2775,       10,     2013, 0xf01cb227
+1,       2785,       2785,       10,     2013, 0xe37e9028
+1,       2800,       2800,       10,     2013, 0xf6b5aa7c
+0,         84,         84,        1,   518400, 0x73bc6194
+1,       2810,       2810,       10,     2013, 0xea2391b0
+1,       2820,       2820,       10,     2013, 0xb234abcd
+1,       2830,       2830,       10,     2013, 0x5840a50f
+0,         85,         85,        1,   518400, 0x147b678a
+1,       2840,       2840,       10,     2013, 0x482cad7b
+1,       2850,       2850,       10,     2013, 0xd085a629
+1,       2860,       2860,       10,     2013, 0x1adf8ea8
+0,         86,         86,        1,   518400, 0x67209622
+1,       2870,       2870,       10,     2013, 0xbc3aba31
+1,       2886,       2886,       10,     2013, 0x5e7ea857
+1,       2896,       2896,       10,     2013, 0x7e669671
+0,         87,         87,        1,   518400, 0xdbf0438b
+1,       2906,       2906,       10,     2013, 0xe2d39670
+1,       2916,       2916,       10,     2013, 0xe829b4a8
+1,       2926,       2926,       10,     2013, 0x5b73a363
+1,       2936,       2936,       10,     2013, 0xc1ffa824
+0,         88,         88,        1,   518400, 0xe712b764
+1,       2946,       2946,       10,     2013, 0x919ba91a
+1,       2956,       2956,       10,     2013, 0xa1799be7
+0,         89,         89,        1,   518400, 0xf396de88
+1,       2971,       2971,       10,     2013, 0x9b8e92c1
+1,       2981,       2981,       10,     2013, 0x5ddeb554
+1,       2991,       2991,       10,     2013, 0xf6b99d0b
+1,       3001,       3001,       10,     2013, 0x6987c4a4
+0,         90,         90,        1,   518400, 0x5bb4a81d
+1,       3011,       3011,       10,     2013, 0xf3be9f72
+1,       3021,       3021,       10,     2013, 0xae51a2ef
+1,       3031,       3031,       10,     2013, 0x5c23aaac
+0,         91,         91,        1,   518400, 0x731a98c8
+1,       3041,       3041,       10,     2013, 0xe7a9a994
+1,       3056,       3056,       10,     2013, 0xdd10a997
+1,       3066,       3066,       10,     2013, 0x76e0a749
+0,         92,         92,        1,   518400, 0xb0f61608
+1,       3076,       3076,       10,     2013, 0x899ea6fb
+1,       3086,       3086,       10,     2013, 0xc8449029
+1,       3096,       3096,       10,     2013, 0x6a34b469
+0,         93,         93,        1,   518400, 0x86845d11
+1,       3106,       3106,       10,     2013, 0xf6f1b172
+1,       3116,       3116,       10,     2013, 0x790796f8
+1,       3126,       3126,       10,     2013, 0x190a874a
+0,         94,         94,        1,   518400, 0x2511350a
+1,       3142,       3142,       10,     2013, 0x99a4a5e3
+1,       3152,       3152,       10,     2013, 0x9b619c33
+1,       3162,       3162,       10,     2013, 0x2462a1c0
+0,         95,         95,        1,   518400, 0xd08f20d1
+1,       3172,       3172,       10,     2013, 0xd446b781
+1,       3182,       3182,       10,     2013, 0xd421aec0
+1,       3192,       3192,       10,     2013, 0x6a9d9164
+1,       3202,       3202,       10,     2013, 0x02cbaf7f
+0,         96,         96,        1,   518400, 0x0619c067
+1,       3212,       3212,       10,     2013, 0x5ab1a098
+1,       3227,       3227,       10,     2013, 0xe280ace1
+0,         97,         97,        1,   518400, 0x9f54a84a
+1,       3237,       3237,       10,     2013, 0x32d0aecf
+1,       3247,       3247,       10,     2013, 0xb805a758
+1,       3257,       3257,       10,     2013, 0x618ab629
+1,       3267,       3267,       10,     2013, 0xe4c29e0d
+0,         98,         98,        1,   518400, 0x00486dcf
+1,       3277,       3277,       10,     2013, 0x9119a3ba
+1,       3287,       3287,       10,     2013, 0x1f5ea3d0
+1,       3297,       3297,       10,     2013, 0x903e99c2
+0,         99,         99,        1,   518400, 0x6881078c
+1,       3312,       3312,       10,     2013, 0x126b9e64
+1,       3322,       3322,       10,     2013, 0xd207aa91
+1,       3332,       3332,       10,     2013, 0x7a229fad
+0,        100,        100,        1,   518400, 0x4873f7c2
+1,       3342,       3342,       10,     2013, 0x7651aeda
+1,       3352,       3352,       10,     2013, 0xb74c7f0c
+1,       3362,       3362,       10,     2013, 0xaf9fbb89
+0,        101,        101,        1,   518400, 0x63ab53c8
+1,       3372,       3372,       10,     2013, 0xf0f5a62f
+1,       3382,       3382,       10,     2013, 0xa2009133
+1,       3398,       3398,       10,     2013, 0xb6d9a556
+0,        102,        102,        1,   518400, 0xc768db1a
+1,       3408,       3408,       10,     2013, 0x0f95a286
+1,       3418,       3418,       10,     2013, 0x4fbe8975
+1,       3428,       3428,       10,     2013, 0x18f19c54
+0,        103,        103,        1,   518400, 0x5a4eb9c0
+1,       3440,       3440,       10,     2013, 0x95769be6
+1,       3450,       3450,       10,     2013, 0x739ba722
+1,       3460,       3460,       10,     2013, 0xc7dda687
+1,       3470,       3470,       10,     2013, 0xe322a3a4
+0,        104,        104,        1,   518400, 0x0616fddd
+1,       3480,       3480,       10,     2013, 0x4ce7ba9c
+1,       3490,       3490,       10,     2013, 0x33748c20
+1,       3500,       3500,       10,     2013, 0xdd98b65d
+0,        105,        105,        1,   518400, 0xfdf176d6
+1,       3510,       3510,       10,     2013, 0xd02e9cd6
+1,       3526,       3526,       10,     2013, 0x81dbb3c7
+1,       3536,       3536,       10,     2013, 0x3afba1e0
+0,        106,        106,        1,   518400, 0x674998a2
+1,       3546,       3546,       10,     2013, 0x735994ff
+1,       3556,       3556,       10,     2013, 0xf54cbda2
+1,       3566,       3566,       10,     2013, 0x3c53ad5b
+0,        107,        107,        1,   518400, 0xc2401937
+1,       3576,       3576,       10,     2013, 0x3a2595a8
+1,       3586,       3586,       10,     2013, 0xb7b39f34
+1,       3596,       3596,       10,     2013, 0x269fa949
+0,        108,        108,        1,   518400, 0xbfa320f6
+1,       3611,       3611,       10,     2013, 0x3519ab0b
+1,       3621,       3621,       10,     2013, 0xb9f2a7c1
+1,       3631,       3631,       10,     2013, 0xff47844c
+0,        109,        109,        1,   518400, 0x4b4fa759
+1,       3641,       3641,       10,     2013, 0x835ea1ef
+1,       3651,       3651,       10,     2013, 0xf491bc4e
+1,       3661,       3661,       10,     2013, 0x90bc88f0
+0,        110,        110,        1,   518400, 0x0d3f30fa
+1,       3671,       3671,       10,     2013, 0x6718ac48
+1,       3681,       3681,       10,     2013, 0xfa85bdb6
+1,       3696,       3696,       10,     2013, 0x645cb677
+0,        111,        111,        1,   518400, 0x8e8b9202
+1,       3706,       3706,       10,     2013, 0x6c47c630
+1,       3716,       3716,       10,     2013, 0x10aa8813
+1,       3726,       3726,       10,     2013, 0xfcb0afb3
+1,       3736,       3736,       10,     2013, 0x5f499be8
+0,        112,        112,        1,   518400, 0xf4b693c6
+1,       3746,       3746,       10,     2013, 0xd1b5a128
+1,       3756,       3756,       10,     2013, 0x303cc102
+1,       3766,       3766,       10,     2013, 0xb6ca93df
+0,        113,        113,        1,   518400, 0xce3dc275
+1,       3782,       3782,       10,     2013, 0x0db7a475
+1,       3792,       3792,       10,     2013, 0xf3f49ed7
+1,       3802,       3802,       10,     2013, 0xf495a819
+0,        114,        114,        1,   518400, 0xefbb7496
+1,       3812,       3812,       10,     2013, 0x2b67a99d
+1,       3822,       3822,       10,     2013, 0xe4efb19a
+1,       3832,       3832,       10,     2013, 0xb0e897ca
+0,        115,        115,        1,   518400, 0x6842b14e
+1,       3842,       3842,       10,     2013, 0x338ebe28
+1,       3852,       3852,       10,     2013, 0x0583ad3f
+1,       3867,       3867,       10,     2013, 0x7ae1a08d
+0,        116,        116,        1,   518400, 0x7a3fd65c
+1,       3877,       3877,       10,     2013, 0x95a39f9c
+1,       3887,       3887,       10,     2013, 0x4f7ea123
+1,       3897,       3897,       10,     2013, 0x9efb9ba1
+0,        117,        117,        1,   518400, 0x949e1e8b
+1,       3907,       3907,       10,     2013, 0xf395b2cd
+1,       3917,       3917,       10,     2013, 0x261a881e
+1,       3927,       3927,       10,     2013, 0x7f2d9f72
+1,       3937,       3937,       10,     2013, 0x0105b38d
+0,        118,        118,        1,   518400, 0xfc6c09aa
+1,       3952,       3952,       10,     2013, 0x0e5db67e
+1,       3962,       3962,       10,     2013, 0xfc9baf97
+0,        119,        119,        1,   518400, 0x561c2ff5
+1,       3972,       3972,       10,     2013, 0x8e02a1b1
+1,       3982,       3982,       10,     2013, 0x6eecaac8
+1,       3992,       3992,       10,     2013, 0xf5558f0c
+1,       4002,       4002,       10,     2013, 0x512ba99b
+0,        120,        120,        1,   518400, 0xfd62e6bd
+1,       4012,       4012,       10,     2013, 0x932b9932
+1,       4022,       4022,       10,     2013, 0xc01ea987
+0,        121,        121,        1,   518400, 0x0427a070
+1,       4038,       4038,       10,     2013, 0x10879cf7
+1,       4048,       4048,       10,     2013, 0x90679338
+1,       4058,       4058,       10,     2013, 0x077d8a9e
+1,       4068,       4068,       10,     2013, 0x969fa57c
+0,        122,        122,        1,   518400, 0x0bf48fff
+1,       4078,       4078,       10,     2013, 0xe049ab07
+1,       4088,       4088,       10,     2013, 0xf535b3b3
+1,       4098,       4098,       10,     2013, 0xfe76bd37
+0,        123,        123,        1,   518400, 0x354d4700
+1,       4108,       4108,       10,     2013, 0xde79ad8c
+1,       4123,       4123,       10,     2013, 0xe89b9c47
+1,       4133,       4133,       10,     2013, 0xc570b0f0
+0,        124,        124,        1,   518400, 0x6081c80c
+1,       4143,       4143,       10,     2013, 0xee709cd9
+1,       4153,       4153,       10,     2013, 0xcfe5afab
+1,       4163,       4163,       10,     2013, 0x98ff8ce4
+0,        125,        125,        1,   518400, 0x9c6c51c6
+1,       4173,       4173,       10,     2013, 0x9d19b44c
+1,       4183,       4183,       10,     2013, 0x4349917a
+1,       4193,       4193,       10,     2013, 0xbf54a59a
+0,        126,        126,        1,   518400, 0xaacd34d7
+1,       4208,       4208,       10,     2013, 0xc4a399e0
+1,       4218,       4218,       10,     2013, 0x1bf58ff0
+1,       4228,       4228,       10,     2013, 0x3518ac56
+0,        127,        127,        1,   518400, 0x566bce8e
+1,       4238,       4238,       10,     2013, 0xcd38c1de
+1,       4248,       4248,       10,     2013, 0xbe7d9c4d
+1,       4258,       4258,       10,     2013, 0xe113a306
+1,       4268,       4268,       10,     2013, 0x083197ea
+0,        128,        128,        1,   518400, 0xb14f68b3
+1,       4278,       4278,       10,     2013, 0x1929b1eb
+1,       4294,       4294,       10,     2013, 0x5d6ea5af
+1,       4304,       4304,       10,     2013, 0x05519d53
+0,        129,        129,        1,   518400, 0x00545b29
+1,       4314,       4314,       10,     2013, 0x5773b380
+1,       4324,       4324,       10,     2013, 0xaa70a8f5
+1,       4334,       4334,       10,     2013, 0x990db0ec
+0,        130,        130,        1,   518400, 0x984bede5
+1,       4344,       4344,       10,     2013, 0x91d3a623
+1,       4354,       4354,       10,     2013, 0xc91f9824
+1,       4364,       4364,       10,     2013, 0x1d058abf
+0,        131,        131,        1,   518400, 0x6b9319c6
+1,       4379,       4379,       10,     2013, 0x8de1b8d5
+1,       4389,       4389,       10,     2013, 0x7872b06b
+1,       4399,       4399,       10,     2013, 0xa084c203
+0,        132,        132,        1,   518400, 0x1582ae8c
+1,       4409,       4409,       10,     2013, 0xff90ae8d
+1,       4419,       4419,       10,     2013, 0x61dead8e
+1,       4429,       4429,       10,     2013, 0xee76b284
+0,        133,        133,        1,   518400, 0xece339b6
+1,       4439,       4439,       10,     2013, 0xe888af7f
+1,       4449,       4449,       10,     2013, 0x5d57b115
+1,       4464,       4464,       10,     2013, 0xcdbfb1d0
+0,        134,        134,        1,   518400, 0x74946b8b
+1,       4474,       4474,       10,     2013, 0x2e28a952
+1,       4484,       4484,       10,     2013, 0x4795a994
+1,       4494,       4494,       10,     2013, 0x7e7ea304
+1,       4504,       4504,       10,     2013, 0x9502c1e1
+0,        135,        135,        1,   518400, 0x5dffc0d6
+1,       4514,       4514,       10,     2013, 0xf7c78ab2
+1,       4524,       4524,       10,     2013, 0x24049816
+1,       4534,       4534,       10,     2013, 0x52089dcf
+0,        136,        136,        1,   518400, 0x3f85c053
+1,       4550,       4550,       10,     2013, 0x2150a0b1
+1,       4560,       4560,       10,     2013, 0x3c2e9b93
+1,       4570,       4570,       10,     2013, 0x491f932b
+0,        137,        137,        1,   518400, 0x7124125d
+1,       4580,       4580,       10,     2013, 0x31359cf8
+1,       4590,       4590,       10,     2013, 0x1b00ac3f
+1,       4600,       4600,       10,     2013, 0x8d7ab3cb
+0,        138,        138,        1,   518400, 0x46b736d5
+1,       4610,       4610,       10,     2013, 0xb2c2a4de
+1,       4620,       4620,       10,     2013, 0x80a4abf2
+1,       4635,       4635,       10,     2013, 0x0701a4ee
+0,        139,        139,        1,   518400, 0x7bcac123
+1,       4645,       4645,       10,     2013, 0xdc1ba5bc
+1,       4655,       4655,       10,     2013, 0x6083a8a4
+1,       4665,       4665,       10,     2013, 0x6226ad45
+0,        140,        140,        1,   518400, 0x79899382
+1,       4675,       4675,       10,     2013, 0x2732a205
+1,       4685,       4685,       10,     2013, 0x0f62a0d3
+1,       4695,       4695,       10,     2013, 0xc1799249
+0,        141,        141,        1,   518400, 0x4a56acef
+1,       4705,       4705,       10,     2013, 0xbccfa9c8
+1,       4720,       4720,       10,     2013, 0xded096e7
+1,       4730,       4730,       10,     2013, 0x7f0daf43
+0,        142,        142,        1,   518400, 0xb0a983e5
+1,       4740,       4740,       10,     2013, 0xc47ea682
+1,       4750,       4750,       10,     2013, 0x5a72b07a
+1,       4760,       4760,       10,     2013, 0x386faa8c
+1,       4770,       4770,       10,     2013, 0xf9919a91
+0,        143,        143,        1,   518400, 0xb49255cc
+1,       4780,       4780,       10,     2013, 0x4908897e
+1,       4790,       4790,       10,     2013, 0x4882b594
+0,        144,        144,        1,   518400, 0x48808663
+1,       4806,       4806,       10,     2013, 0x113e98d1
+1,       4816,       4816,       10,     2013, 0x5098b30d
+1,       4826,       4826,       10,     2013, 0x0ef7b857
+1,       4836,       4836,       10,     2013, 0x216ea176
+0,        145,        145,        1,   518400, 0xf5be828c
+1,       4846,       4846,       10,     2013, 0xf906944a
+1,       4856,       4856,       10,     2013, 0xee9b92fb
+1,       4866,       4866,       10,     2013, 0xd6029209
+0,        146,        146,        1,   518400, 0xb6688ea3
+1,       4876,       4876,       10,     2013, 0x2256a12e
+1,       4891,       4891,       10,     2013, 0x89de8e4a
+1,       4901,       4901,       10,     2013, 0x0bf0a584
+0,        147,        147,        1,   518400, 0x9eb2bfd1
+1,       4911,       4911,       10,     2013, 0x6a5ebd58
+1,       4921,       4921,       10,     2013, 0x3edd9aa4
+1,       4931,       4931,       10,     2013, 0xbd66ac26
+0,        148,        148,        1,   518400, 0xab3bdfb5
+1,       4941,       4941,       10,     2013, 0x313896ea
+1,       4951,       4951,       10,     2013, 0x6b83a6a0
+1,       4961,       4961,       10,     2013, 0x9aafb109
+0,        149,        149,        1,   518400, 0xe65f1d81
+1,       4976,       4976,       10,     2013, 0x5192a85a
+1,       4986,       4986,       10,     2013, 0x1f919f79
+1,       4996,       4996,       10,     2013, 0xc0799c40
+0,        150,        150,        1,   518400, 0x61ca8d13
+1,       5006,       5006,       10,     2013, 0x2988bcd8
+1,       5016,       5016,       10,     2013, 0x1482913a
+1,       5026,       5026,       10,     2013, 0x74da9a94
+1,       5036,       5036,       10,     2013, 0x763eb709
+0,        151,        151,        1,   518400, 0xbdd0d82f
+1,       5046,       5046,       10,     2013, 0x1285b405
+1,       5062,       5062,       10,     2013, 0xb6ab9dfc
+0,        152,        152,        1,   518400, 0xab1acaad
+1,       5072,       5072,       10,     2013, 0xe4c8bf19
+1,       5082,       5082,       10,     2013, 0xabbbade8
+1,       5092,       5092,       10,     2013, 0xf8b69d89
+1,       5102,       5102,       10,     2013, 0xce04a866
+0,        153,        153,        1,   518400, 0x1889f31c
+1,       5112,       5112,       10,     2013, 0x07528abf
+1,       5122,       5122,       10,     2013, 0x74fb98bf
+1,       5132,       5132,       10,     2013, 0x579fb1c9
+0,        154,        154,        1,   518400, 0x02484cce
+1,       5147,       5147,       10,     2013, 0x7ddea2ed
+1,       5157,       5157,       10,     2013, 0x296caa2c
+1,       5167,       5167,       10,     2013, 0x346d9c4f
+0,        155,        155,        1,   518400, 0x59998165
+1,       5177,       5177,       10,     2013, 0x3e1fba15
+1,       5187,       5187,       10,     2013, 0x48a2908f
+1,       5197,       5197,       10,     2013, 0xc1938d09
+0,        156,        156,        1,   518400, 0x0f3dd671
+1,       5207,       5207,       10,     2013, 0x0e96a060
+1,       5217,       5217,       10,     2013, 0x7b6a9e06
+1,       5232,       5232,       10,     2013, 0x5b779d28
+0,        157,        157,        1,   518400, 0x378bee63
+1,       5242,       5242,       10,     2013, 0xf600aca1
+1,       5252,       5252,       10,     2013, 0x3a6c9e68
+1,       5262,       5262,       10,     2013, 0x0c8dc1b0
+0,        158,        158,        1,   518400, 0x0d8e17d2
+1,       5272,       5272,       10,     2013, 0x26beb245
+1,       5282,       5282,       10,     2013, 0x2bc09557
+1,       5292,       5292,       10,     2013, 0x27fc8845
+1,       5302,       5302,       10,     2013, 0x1025aa47
+0,        159,        159,        1,   518400, 0x61f113bf
+1,       5318,       5318,       10,     2013, 0xc2e69baa
+1,       5328,       5328,       10,     2013, 0xdb249b92
+1,       5338,       5338,       10,     2013, 0x6ccda29e
+0,        160,        160,        1,   518400, 0x44ec211a
+1,       5348,       5348,       10,     2013, 0xeaf6a1cf
+1,       5358,       5358,       10,     2013, 0x509ba397
+1,       5368,       5368,       10,     2013, 0xfaf8a2df
+0,        161,        161,        1,   518400, 0xcb036306
+1,       5378,       5378,       10,     2013, 0x41388f28
+1,       5388,       5388,       10,     2013, 0xfe5eab39
+1,       5403,       5403,       10,     2013, 0xd5ffa066
+0,        162,        162,        1,   518400, 0x7f1dec7d
+1,       5413,       5413,       10,     2013, 0x6813a30a
+1,       5423,       5423,       10,     2013, 0x9be89718
+1,       5433,       5433,       10,     2013, 0xaec3a27b
+0,        163,        163,        1,   518400, 0x8b8c6640
+1,       5446,       5446,       10,     2013, 0x579a983e
+1,       5456,       5456,       10,     2013, 0x98cea21f
+1,       5466,       5466,       10,     2013, 0xca77a58a
+0,        164,        164,        1,   518400, 0xea04737c
+1,       5476,       5476,       10,     2013, 0xcbc3b1ee
+1,       5486,       5486,       10,     2013, 0xf3bb8f07
+1,       5496,       5496,       10,     2013, 0x6aeebd92
+0,        165,        165,        1,   518400, 0xe779fe0c
+1,       5506,       5506,       10,     2013, 0xe955a449
+1,       5516,       5516,       10,     2013, 0x9436aa5b
+1,       5531,       5531,       10,     2013, 0x4f0a8f9f
+0,        166,        166,        1,   518400, 0xcd78bf13
+1,       5541,       5541,       10,     2013, 0x3551b22d
+1,       5551,       5551,       10,     2013, 0x0959a3d4
+1,       5561,       5561,       10,     2013, 0x2ed5a11b
+1,       5571,       5571,       10,     2013, 0x8f52a5c3
+0,        167,        167,        1,   518400, 0x45b0c048
+1,       5581,       5581,       10,     2013, 0x6552978d
+1,       5591,       5591,       10,     2013, 0x7dcca0c1
+1,       5601,       5601,       10,     2013, 0xbcd4a3c9
+0,        168,        168,        1,   518400, 0x9783dcd8
+1,       5616,       5616,       10,     2013, 0xfe41a8d8
+1,       5626,       5626,       10,     2013, 0xc85aae14
+1,       5636,       5636,       10,     2013, 0x1185b346
+0,        169,        169,        1,   518400, 0xbcd1514c
+1,       5646,       5646,       10,     2013, 0xf7429a0d
+1,       5656,       5656,       10,     2013, 0x48c2a160
+1,       5666,       5666,       10,     2013, 0x9d85a85d
+0,        170,        170,        1,   518400, 0xf229575f
+1,       5676,       5676,       10,     2013, 0xbbe89fe9
+1,       5686,       5686,       10,     2013, 0xea429fe2
+1,       5702,       5702,       10,     2013, 0x221ca1d4
+0,        171,        171,        1,   518400, 0x576e365e
+1,       5712,       5712,       10,     2013, 0x394b925b
+1,       5722,       5722,       10,     2013, 0x556dc26f
+1,       5732,       5732,       10,     2013, 0xce21a5e1
+0,        172,        172,        1,   518400, 0xa2d2d87b
+1,       5742,       5742,       10,     2013, 0xbc87c0a8
+1,       5752,       5752,       10,     2013, 0xbac4ac07
+1,       5762,       5762,       10,     2013, 0xdeefa4aa
+1,       5772,       5772,       10,     2013, 0x1f15b362
+0,        173,        173,        1,   518400, 0x3804d74a
+1,       5787,       5787,       10,     2013, 0x6406b7b2
+1,       5797,       5797,       10,     2013, 0x8030a03d
+0,        174,        174,        1,   518400, 0xf05de372
+1,       5807,       5807,       10,     2013, 0x0373a5b1
+1,       5817,       5817,       10,     2013, 0x34ef93da
+1,       5827,       5827,       10,     2013, 0x94c198fe
+1,       5837,       5837,       10,     2013, 0xfefcabad
+0,        175,        175,        1,   518400, 0x21035b4f
+1,       5847,       5847,       10,     2013, 0x8755b3ec
+1,       5857,       5857,       10,     2013, 0xe436a6fd
+1,       5872,       5872,       10,     2013, 0x9cf5a11e
+0,        176,        176,        1,   518400, 0x6e97d583
+1,       5882,       5882,       10,     2013, 0x03b8a98c
+1,       5892,       5892,       10,     2013, 0x6216a138
+1,       5902,       5902,       10,     2013, 0xd87b9f12
+0,        177,        177,        1,   518400, 0x197879a9
+1,       5912,       5912,       10,     2013, 0x4ce99653
+1,       5922,       5922,       10,     2013, 0x6c2ea9e2
+1,       5932,       5932,       10,     2013, 0x918cae4c
+0,        178,        178,        1,   518400, 0x787780ee
+1,       5942,       5942,       10,     2013, 0xd19fa5f2
+1,       5958,       5958,       10,     2013, 0x0bdda7c6
+1,       5968,       5968,       10,     2013, 0x0f9ab0ca
+0,        179,        179,        1,   518400, 0x13fcc74d
+1,       5978,       5978,       10,     2013, 0x410a92b1
+1,       5988,       5988,       10,     2013, 0xcfbe9d1c
+1,       5998,       5998,       10,     2013, 0x59ed9d15
+0,        180,        180,        1,   518400, 0x9bd1c5da
+1,       6008,       6008,       10,     2013, 0x4e129e27
+1,       6018,       6018,       10,     2013, 0x7bb9ac0a
+1,       6028,       6028,       10,     2013, 0x826ca82b
+0,        181,        181,        1,   518400, 0x8e21e4ba
+1,       6043,       6043,       10,     2013, 0x9ad5a74b
+1,       6053,       6053,       10,     2013, 0x6c5f969a
+1,       6063,       6063,       10,     2013, 0x8479a0e5
+0,        182,        182,        1,   518400, 0x5fe59996
+1,       6073,       6073,       10,     2013, 0x165298ef
+1,       6083,       6083,       10,     2013, 0xdcadb4a1
+1,       6093,       6093,       10,     2013, 0xa90e987c
+1,       6103,       6103,       10,     2013, 0x1ac5b510
+0,        183,        183,        1,   518400, 0x308af432
+1,       6113,       6113,       10,     2013, 0x66728d85
+1,       6128,       6128,       10,     2013, 0xe4859fc5
+1,       6138,       6138,       10,     2013, 0x9901786e
+0,        184,        184,        1,   518400, 0xc05a9eb1
+1,       6148,       6148,       10,     2013, 0x6aebb406
+1,       6158,       6158,       10,     2013, 0x7d13a2cc
+1,       6168,       6168,       10,     2013, 0x99b7a8cc
+0,        185,        185,        1,   518400, 0xb9a02e51
+1,       6178,       6178,       10,     2013, 0x80b8a624
+1,       6188,       6188,       10,     2013, 0xbb6aa271
+1,       6198,       6198,       10,     2013, 0x17af9e4a
+0,        186,        186,        1,   518400, 0xbd9543aa
+1,       6214,       6214,       10,     2013, 0xfaf0a8f1
+1,       6224,       6224,       10,     2013, 0xd6849b93
+1,       6234,       6234,       10,     2013, 0xe9829669
+0,        187,        187,        1,   518400, 0x0a0cb795
+1,       6244,       6244,       10,     2013, 0x7ec98944
+1,       6254,       6254,       10,     2013, 0x2b2099a4
+1,       6264,       6264,       10,     2013, 0x1033a82f
+0,        188,        188,        1,   518400, 0xe4bb8a0c
+1,       6274,       6274,       10,     2013, 0x5ec88990
+1,       6284,       6284,       10,     2013, 0xd2a19b3d
+1,       6299,       6299,       10,     2013, 0xa377b268
+0,        189,        189,        1,   518400, 0x226fd11e
+1,       6309,       6309,       10,     2013, 0xfa859901
+1,       6319,       6319,       10,     2013, 0x1713955a
+1,       6329,       6329,       10,     2013, 0x70aab0da
+1,       6339,       6339,       10,     2013, 0xcdaea422
+0,        190,        190,        1,   518400, 0x76e1604d
+1,       6349,       6349,       10,     2013, 0x65c3bf80
+1,       6359,       6359,       10,     2013, 0x1d75a55f
+1,       6369,       6369,       10,     2013, 0xa5bea4de
+0,        191,        191,        1,   518400, 0xca06117c
+1,       6384,       6384,       10,     2013, 0x184db71c
+1,       6394,       6394,       10,     2013, 0x99858ec8
+1,       6404,       6404,       10,     2013, 0xb8f2aee5
+0,        192,        192,        1,   518400, 0xeca14952
+1,       6414,       6414,       10,     2013, 0x4435b2ef
+1,       6424,       6424,       10,     2013, 0x8acfa6c7
+1,       6434,       6434,       10,     2013, 0x42b4c01f
+0,        193,        193,        1,   518400, 0x3106dbee
+1,       6444,       6444,       10,     2013, 0x6e308c13
+1,       6454,       6454,       10,     2013, 0x8227a0f6
+1,       6470,       6470,       10,     2013, 0x6f12a7a2
+0,        194,        194,        1,   518400, 0x57fa6392
+1,       6480,       6480,       10,     2013, 0x785392be
+1,       6490,       6490,       10,     2013, 0x81849c2b
+1,       6500,       6500,       10,     2013, 0x5cf2af65
+0,        195,        195,        1,   518400, 0x47651ac8
+1,       6510,       6510,       10,     2013, 0x0c6ca6b4
+1,       6520,       6520,       10,     2013, 0x412fab9f
+1,       6530,       6530,       10,     2013, 0x08e792b4
+0,        196,        196,        1,   518400, 0x3c1ba6a5
+1,       6540,       6540,       10,     2013, 0x407aace3
+1,       6555,       6555,       10,     2013, 0xd26bac16
+1,       6565,       6565,       10,     2013, 0xac8bb295
+0,        197,        197,        1,   518400, 0xbc3ec05b
+1,       6575,       6575,       10,     2013, 0xddd1949c
+1,       6585,       6585,       10,     2013, 0x6b26b868
+1,       6595,       6595,       10,     2013, 0x5eaba587
+1,       6605,       6605,       10,     2013, 0xef0793b9
+0,        198,        198,        1,   518400, 0xd6ae59da
+1,       6615,       6615,       10,     2013, 0xdef19bd6
+1,       6625,       6625,       10,     2013, 0xca98a635
+0,        199,        199,        1,   518400, 0xc62f0e63
+1,       6640,       6640,       10,     2013, 0x06269a5a
+1,       6650,       6650,       10,     2013, 0x32cb9952
+1,       6660,       6660,       10,     2013, 0xf01fa95a
+1,       6670,       6670,       10,     2013, 0xefab9e55
+0,        200,        200,        1,   518400, 0xae96cc02
+1,       6680,       6680,       10,     2013, 0x55a3b63a
+1,       6690,       6690,       10,     2013, 0xcd36a553
+1,       6700,       6700,       10,     2013, 0x2ec19877
+0,        201,        201,        1,   518400, 0x2aa0917b
+1,       6710,       6710,       10,     2013, 0xc18b924c
+1,       6726,       6726,       10,     2013, 0xf132b04c
+1,       6736,       6736,       10,     2013, 0x7975a44d
+0,        202,        202,        1,   518400, 0xf0d13b48
+1,       6746,       6746,       10,     2013, 0x2aaf94cb
+1,       6756,       6756,       10,     2013, 0x58cfa60f
+1,       6766,       6766,       10,     2013, 0x9757a658
+0,        203,        203,        1,   518400, 0x067f56f8
+1,       6776,       6776,       10,     2013, 0x67ebc0d5
+1,       6786,       6786,       10,     2013, 0x3c50a70e
+1,       6796,       6796,       10,     2013, 0x9c5799c6
+0,        204,        204,        1,   518400, 0x1026025c
+1,       6811,       6811,       10,     2013, 0x018d85b2
+1,       6821,       6821,       10,     2013, 0x5367a956
+0,        205,        205,        1,   518400, 0x11ee7f7f
+0,        208,        208,        1,   518400, 0x30a6b398
+0,        240,        240,        1,   518400, 0x9d2e3977
diff --git a/tests/ref/fate/filter-overlay_gbrap_gbrap b/tests/ref/fate/filter-overlay_gbrap_gbrap
new file mode 100644
index 0000000000..49e14c643c
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_gbrap_gbrap
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    65536, 0xbac99946
diff --git a/tests/ref/fate/filter-overlay_gbrp_gbrap b/tests/ref/fate/filter-overlay_gbrp_gbrap
new file mode 100644
index 0000000000..204c9d0625
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_gbrp_gbrap
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    49152, 0xa905d586
diff --git a/tests/ref/fate/filter-overlay_rgb b/tests/ref/fate/filter-overlay_rgb
new file mode 100644
index 0000000000..89a0177ada
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_rgb
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   304128, 0x027e34c6
+0,          1,          1,        1,   304128, 0xc436b3d2
+0,          2,          2,        1,   304128, 0x86b77f58
+0,          3,          3,        1,   304128, 0x94e279e1
+0,          4,          4,        1,   304128, 0x658da060
+0,          5,          5,        1,   304128, 0x2005ffb7
+0,          6,          6,        1,   304128, 0x4730c6b1
+0,          7,          7,        1,   304128, 0x9e29fbca
+0,          8,          8,        1,   304128, 0xfcbe105a
+0,          9,          9,        1,   304128, 0x96b6af91
+0,         10,         10,        1,   304128, 0xe1a4ecd5
+0,         11,         11,        1,   304128, 0x53f42f84
+0,         12,         12,        1,   304128, 0xa5221a14
+0,         13,         13,        1,   304128, 0xaf7d2ab4
+0,         14,         14,        1,   304128, 0x1bc8208f
+0,         15,         15,        1,   304128, 0x5e090d01
+0,         16,         16,        1,   304128, 0xf01de68a
+0,         17,         17,        1,   304128, 0x33ad5467
+0,         18,         18,        1,   304128, 0x3b37d722
+0,         19,         19,        1,   304128, 0x410f0872
+0,         20,         20,        1,   304128, 0xc110db2a
+0,         21,         21,        1,   304128, 0x2023e6e2
+0,         22,         22,        1,   304128, 0xf63fa6fc
+0,         23,         23,        1,   304128, 0x25f10ab0
+0,         24,         24,        1,   304128, 0x0efe0a9b
+0,         25,         25,        1,   304128, 0x5779e963
+0,         26,         26,        1,   304128, 0xa43226da
+0,         27,         27,        1,   304128, 0xc6d4e99d
+0,         28,         28,        1,   304128, 0x39c5e32d
+0,         29,         29,        1,   304128, 0x78dd509b
+0,         30,         30,        1,   304128, 0x496f07af
+0,         31,         31,        1,   304128, 0xb878805c
+0,         32,         32,        1,   304128, 0xc62e4825
+0,         33,         33,        1,   304128, 0x8e7a2787
+0,         34,         34,        1,   304128, 0xebee121d
+0,         35,         35,        1,   304128, 0x12f6fd57
+0,         36,         36,        1,   304128, 0x08b05d8d
+0,         37,         37,        1,   304128, 0x57e02088
+0,         38,         38,        1,   304128, 0x6ff1dd89
+0,         39,         39,        1,   304128, 0xa5b0e20f
+0,         40,         40,        1,   304128, 0x4e9c0cf7
+0,         41,         41,        1,   304128, 0x64c93f20
+0,         42,         42,        1,   304128, 0x4264e490
+0,         43,         43,        1,   304128, 0xd7a3d763
+0,         44,         44,        1,   304128, 0x0fecf186
+0,         45,         45,        1,   304128, 0x3b87dd16
+0,         46,         46,        1,   304128, 0x7f46b1cd
+0,         47,         47,        1,   304128, 0xc635aca4
+0,         48,         48,        1,   304128, 0xfbaebb8d
+0,         49,         49,        1,   304128, 0x73976bb4
diff --git a/tests/ref/fate/filter-overlay_rgb_rgba b/tests/ref/fate/filter-overlay_rgb_rgba
new file mode 100644
index 0000000000..d7dc6980cc
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_rgb_rgba
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    49152, 0xb0e3d586
diff --git a/tests/ref/fate/filter-overlay_rgba_rgba b/tests/ref/fate/filter-overlay_rgba_rgba
new file mode 100644
index 0000000000..a1c85e69e4
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_rgba_rgba
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    65536, 0x33549946
diff --git a/tests/ref/fate/filter-overlay_yuv420 b/tests/ref/fate/filter-overlay_yuv420
new file mode 100644
index 0000000000..7cd0708a07
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_yuv420
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xfbd72a27
+0,          1,          1,        1,   152064, 0x06d10a14
+0,          2,          2,        1,   152064, 0x629e9a71
+0,          3,          3,        1,   152064, 0xd899f14b
+0,          4,          4,        1,   152064, 0x2de2e162
+0,          5,          5,        1,   152064, 0x1987b281
+0,          6,          6,        1,   152064, 0x36b68a47
+0,          7,          7,        1,   152064, 0x8d53cd7e
+0,          8,          8,        1,   152064, 0x3aa8daa1
+0,          9,          9,        1,   152064, 0xf329f3f4
+0,         10,         10,        1,   152064, 0xdff21c52
+0,         11,         11,        1,   152064, 0xe2550bc3
+0,         12,         12,        1,   152064, 0xb1ae65ef
+0,         13,         13,        1,   152064, 0x7401d246
+0,         14,         14,        1,   152064, 0x62c46ff5
+0,         15,         15,        1,   152064, 0xf5fd16df
+0,         16,         16,        1,   152064, 0x0052369e
+0,         17,         17,        1,   152064, 0x2b184fc2
+0,         18,         18,        1,   152064, 0xf244a268
+0,         19,         19,        1,   152064, 0x51210f57
+0,         20,         20,        1,   152064, 0x5f553ffc
+0,         21,         21,        1,   152064, 0x61da8757
+0,         22,         22,        1,   152064, 0x31dfa701
+0,         23,         23,        1,   152064, 0x7af0ccad
+0,         24,         24,        1,   152064, 0xa5766f36
+0,         25,         25,        1,   152064, 0xa1230c4f
+0,         26,         26,        1,   152064, 0x5166dca5
+0,         27,         27,        1,   152064, 0x3eff1d08
+0,         28,         28,        1,   152064, 0x738a44ea
+0,         29,         29,        1,   152064, 0x8ff6550f
+0,         30,         30,        1,   152064, 0x4b5d3a23
+0,         31,         31,        1,   152064, 0x354c4776
+0,         32,         32,        1,   152064, 0x6c02557b
+0,         33,         33,        1,   152064, 0xdc949adc
+0,         34,         34,        1,   152064, 0xfe1e85f1
+0,         35,         35,        1,   152064, 0xed52dbf2
+0,         36,         36,        1,   152064, 0x29bb4cd9
+0,         37,         37,        1,   152064, 0x61cc6102
+0,         38,         38,        1,   152064, 0x833b2351
+0,         39,         39,        1,   152064, 0x58af469f
+0,         40,         40,        1,   152064, 0x3fe6351b
+0,         41,         41,        1,   152064, 0x51987aaf
+0,         42,         42,        1,   152064, 0xb0636ca6
+0,         43,         43,        1,   152064, 0x83ebb949
+0,         44,         44,        1,   152064, 0x81168854
+0,         45,         45,        1,   152064, 0x251ef894
+0,         46,         46,        1,   152064, 0xa40bc6c4
+0,         47,         47,        1,   152064, 0x176a5d4a
+0,         48,         48,        1,   152064, 0x8d04302f
+0,         49,         49,        1,   152064, 0x444f8690
diff --git a/tests/ref/fate/filter-overlay_yuv420_yuva420 b/tests/ref/fate/filter-overlay_yuv420_yuva420
new file mode 100644
index 0000000000..ee0c82e062
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_yuv420_yuva420
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    24576, 0x1505f000
diff --git a/tests/ref/fate/filter-overlay_yuv422 b/tests/ref/fate/filter-overlay_yuv422
new file mode 100644
index 0000000000..99ce8c59e9
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_yuv422
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   304128, 0x9b9e09b2
+0,          1,          1,        1,   304128, 0x33addb48
+0,          2,          2,        1,   304128, 0xd5b973e9
+0,          3,          3,        1,   304128, 0xcb847cb6
+0,          4,          4,        1,   304128, 0xf64536f0
+0,          5,          5,        1,   304128, 0xda17564a
+0,          6,          6,        1,   304128, 0x85e33692
+0,          7,          7,        1,   304128, 0x081a657f
+0,          8,          8,        1,   304128, 0xf15f69ee
+0,          9,          9,        1,   304128, 0x0a2dd737
+0,         10,         10,        1,   304128, 0x14ae5b1b
+0,         11,         11,        1,   304128, 0x0b654f1e
+0,         12,         12,        1,   304128, 0x35a11962
+0,         13,         13,        1,   304128, 0x010b7514
+0,         14,         14,        1,   304128, 0x5db20c43
+0,         15,         15,        1,   304128, 0xafb6c615
+0,         16,         16,        1,   304128, 0xa671a3ac
+0,         17,         17,        1,   304128, 0x1a0fc75d
+0,         18,         18,        1,   304128, 0xe3a05ff1
+0,         19,         19,        1,   304128, 0x58437c36
+0,         20,         20,        1,   304128, 0x1303f940
+0,         21,         21,        1,   304128, 0xec2f3248
+0,         22,         22,        1,   304128, 0xe9ff7d49
+0,         23,         23,        1,   304128, 0x3972a1ed
+0,         24,         24,        1,   304128, 0xee2311df
+0,         25,         25,        1,   304128, 0x5b62c4d9
+0,         26,         26,        1,   304128, 0x9e1e52e2
+0,         27,         27,        1,   304128, 0x60c56d07
+0,         28,         28,        1,   304128, 0x313a8534
+0,         29,         29,        1,   304128, 0x9f548f56
+0,         30,         30,        1,   304128, 0x8d894ed3
+0,         31,         31,        1,   304128, 0x3ce0500a
+0,         32,         32,        1,   304128, 0xb8dd487a
+0,         33,         33,        1,   304128, 0xdde97863
+0,         34,         34,        1,   304128, 0x8d9d1689
+0,         35,         35,        1,   304128, 0x703634dd
+0,         36,         36,        1,   304128, 0x3e321210
+0,         37,         37,        1,   304128, 0x6b5a1a8c
+0,         38,         38,        1,   304128, 0xffc1015d
+0,         39,         39,        1,   304128, 0x4abc4495
+0,         40,         40,        1,   304128, 0x3c03ada9
+0,         41,         41,        1,   304128, 0x6fa0344a
+0,         42,         42,        1,   304128, 0x36572833
+0,         43,         43,        1,   304128, 0x31646c4d
+0,         44,         44,        1,   304128, 0xa22d18c7
+0,         45,         45,        1,   304128, 0xf3b058f2
+0,         46,         46,        1,   304128, 0x4c6be349
+0,         47,         47,        1,   304128, 0xda98914a
+0,         48,         48,        1,   304128, 0x1a6d2f58
+0,         49,         49,        1,   304128, 0x12684280
diff --git a/tests/ref/fate/filter-overlay_yuv422_yuva422 b/tests/ref/fate/filter-overlay_yuv422_yuva422
new file mode 100644
index 0000000000..7d21e1b84a
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_yuv422_yuva422
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    32768, 0x2d88b114
diff --git a/tests/ref/fate/filter-overlay_yuv444 b/tests/ref/fate/filter-overlay_yuv444
new file mode 100644
index 0000000000..3b6e53a26f
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_yuv444
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   405504, 0xaa82add0
+0,          1,          1,        1,   405504, 0x0e9d65d0
+0,          2,          2,        1,   405504, 0xd8470d82
+0,          3,          3,        1,   405504, 0x11dc7a8a
+0,          4,          4,        1,   405504, 0xc538c776
+0,          5,          5,        1,   405504, 0x653b848e
+0,          6,          6,        1,   405504, 0xa6b773ef
+0,          7,          7,        1,   405504, 0x6cf17c3a
+0,          8,          8,        1,   405504, 0x7f5d6f17
+0,          9,          9,        1,   405504, 0x09167f36
+0,         10,         10,        1,   405504, 0xc650bb68
+0,         11,         11,        1,   405504, 0x25cebcac
+0,         12,         12,        1,   405504, 0xb2eb6342
+0,         13,         13,        1,   405504, 0xe827a01a
+0,         14,         14,        1,   405504, 0xe0bb2aba
+0,         15,         15,        1,   405504, 0xd32e0e45
+0,         16,         16,        1,   405504, 0xd5956738
+0,         17,         17,        1,   405504, 0xb8dd99db
+0,         18,         18,        1,   405504, 0x6d21c1ef
+0,         19,         19,        1,   405504, 0xd8db3a49
+0,         20,         20,        1,   405504, 0x235a53c6
+0,         21,         21,        1,   405504, 0x9db66c64
+0,         22,         22,        1,   405504, 0x71dc0e7a
+0,         23,         23,        1,   405504, 0x05f530f8
+0,         24,         24,        1,   405504, 0x4f053cb1
+0,         25,         25,        1,   405504, 0xdcf51aba
+0,         26,         26,        1,   405504, 0x59031fd1
+0,         27,         27,        1,   405504, 0x8451f2e2
+0,         28,         28,        1,   405504, 0xd393ebfc
+0,         29,         29,        1,   405504, 0x95a9ed6b
+0,         30,         30,        1,   405504, 0xa04b5e71
+0,         31,         31,        1,   405504, 0xf1ee4788
+0,         32,         32,        1,   405504, 0x9f3213ea
+0,         33,         33,        1,   405504, 0x1e021a23
+0,         34,         34,        1,   405504, 0xa1c21b9b
+0,         35,         35,        1,   405504, 0x15a9d0ee
+0,         36,         36,        1,   405504, 0xd99f8291
+0,         37,         37,        1,   405504, 0x3e197839
+0,         38,         38,        1,   405504, 0x851ba77b
+0,         39,         39,        1,   405504, 0xc808270a
+0,         40,         40,        1,   405504, 0x8e38821e
+0,         41,         41,        1,   405504, 0x75858815
+0,         42,         42,        1,   405504, 0x4633861b
+0,         43,         43,        1,   405504, 0xb0bdb8a9
+0,         44,         44,        1,   405504, 0x15681e03
+0,         45,         45,        1,   405504, 0x467cfea8
+0,         46,         46,        1,   405504, 0xd53d02ad
+0,         47,         47,        1,   405504, 0xf4cde081
+0,         48,         48,        1,   405504, 0x3ab111f5
+0,         49,         49,        1,   405504, 0xd1fa9f1d
diff --git a/tests/ref/fate/filter-overlay_yuv444_yuva444 b/tests/ref/fate/filter-overlay_yuv444_yuva444
new file mode 100644
index 0000000000..e1e5db2d7d
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_yuv444_yuva444
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    49152, 0x92da3b63
diff --git a/tests/ref/fate/filter-overlay_yuva420_yuva420 b/tests/ref/fate/filter-overlay_yuva420_yuva420
new file mode 100644
index 0000000000..a17cc5c2e5
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_yuva420_yuva420
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    40960, 0x0a1ab3c0
diff --git a/tests/ref/fate/filter-overlay_yuva422_yuva422 b/tests/ref/fate/filter-overlay_yuva422_yuva422
new file mode 100644
index 0000000000..e4d2e3977e
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_yuva422_yuva422
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    49152, 0x369974d4
diff --git a/tests/ref/fate/filter-overlay_yuva444_yuva444 b/tests/ref/fate/filter-overlay_yuva444_yuva444
new file mode 100644
index 0000000000..f2d9c56437
--- /dev/null
+++ b/tests/ref/fate/filter-overlay_yuva444_yuva444
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    65536, 0xa279ff14
diff --git a/tests/ref/fate/filter-pad b/tests/ref/fate/filter-pad
new file mode 100644
index 0000000000..1c46b696aa
--- /dev/null
+++ b/tests/ref/fate/filter-pad
@@ -0,0 +1 @@
+pad                 8fdc977f88a9884b95cf87836603022e
diff --git a/tests/ref/fate/filter-palettegen-1 b/tests/ref/fate/filter-palettegen-1
new file mode 100644
index 0000000000..bebfd24e19
--- /dev/null
+++ b/tests/ref/fate/filter-palettegen-1
@@ -0,0 +1,6 @@
+#tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x16
+#sar 0: 1/1
+0,          0,          0,        1,     1024, 0x3395ef5a
diff --git a/tests/ref/fate/filter-palettegen-2 b/tests/ref/fate/filter-palettegen-2
new file mode 100644
index 0000000000..aa07b6cb93
--- /dev/null
+++ b/tests/ref/fate/filter-palettegen-2
@@ -0,0 +1,6 @@
+#tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x16
+#sar 0: 1/1
+0,          0,          0,        1,     1024, 0x906ff5aa
diff --git a/tests/ref/fate/filter-paletteuse-bayer b/tests/ref/fate/filter-paletteuse-bayer
new file mode 100644
index 0000000000..5ca0115053
--- /dev/null
+++ b/tests/ref/fate/filter-paletteuse-bayer
@@ -0,0 +1,76 @@
+#tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x180
+#sar 0: 1/1
+0,          0,          0,        1,   230400, 0x7b259d08
+0,          1,          1,        1,   230400, 0xf04095e0
+0,          2,          2,        1,   230400, 0x84d49cd5
+0,          3,          3,        1,   230400, 0xd7a29aaf
+0,          4,          4,        1,   230400, 0x9047947c
+0,          5,          5,        1,   230400, 0xfeb990e7
+0,          6,          6,        1,   230400, 0x51ee9295
+0,          7,          7,        1,   230400, 0x66fd4833
+0,          8,          8,        1,   230400, 0x4c0948f0
+0,          9,          9,        1,   230400, 0x632b4776
+0,         10,         10,        1,   230400, 0x7a3c87e2
+0,         11,         11,        1,   230400, 0x4a9286ba
+0,         12,         12,        1,   230400, 0x54dc8649
+0,         13,         13,        1,   230400, 0x92628944
+0,         14,         14,        1,   230400, 0x80f9899f
+0,         15,         15,        1,   230400, 0x5cd78bd8
+0,         16,         16,        1,   230400, 0x4b4ca390
+0,         17,         17,        1,   230400, 0x82cca153
+0,         18,         18,        1,   230400, 0x65f1a2d0
+0,         19,         19,        1,   230400, 0x7df6ae4c
+0,         20,         20,        1,   230400, 0x909baccc
+0,         21,         21,        1,   230400, 0x1892ac65
+0,         22,         22,        1,   230400, 0x3247bb32
+0,         23,         23,        1,   230400, 0x592fbbe5
+0,         24,         24,        1,   230400, 0x189db9d5
+0,         25,         25,        1,   230400, 0x1a38b8da
+0,         26,         26,        1,   230400, 0xccd6bd07
+0,         27,         27,        1,   230400, 0xd4a2bc53
+0,         28,         28,        1,   230400, 0x9ce3bb4e
+0,         29,         29,        1,   230400, 0x5ffdc4db
+0,         30,         30,        1,   230400, 0xc885c7c9
+0,         31,         31,        1,   230400, 0xe27b9d33
+0,         32,         32,        1,   230400, 0xac03a256
+0,         33,         33,        1,   230400, 0xa2c73929
+0,         34,         34,        1,   230400, 0x33793b73
+0,         35,         35,        1,   230400, 0x1e400add
+0,         36,         36,        1,   230400, 0x98e50c6e
+0,         37,         37,        1,   230400, 0x68ed226d
+0,         38,         38,        1,   230400, 0x569e23cb
+0,         39,         39,        1,   230400, 0x82bf3fc0
+0,         40,         40,        1,   230400, 0x2b202e86
+0,         41,         41,        1,   230400, 0x7acd2dee
+0,         42,         42,        1,   230400, 0xfe872e42
+0,         43,         43,        1,   230400, 0x026c12e5
+0,         44,         44,        1,   230400, 0x81561399
+0,         45,         45,        1,   230400, 0xa08c13b6
+0,         46,         46,        1,   230400, 0x89e712f5
+0,         47,         47,        1,   230400, 0x569011ac
+0,         48,         48,        1,   230400, 0xd4691112
+0,         49,         49,        1,   230400, 0x2e50165a
+0,         50,         50,        1,   230400, 0x0a1215b6
+0,         51,         51,        1,   230400, 0x3c5316e3
+0,         52,         52,        1,   230400, 0x079c1393
+0,         53,         53,        1,   230400, 0x39ca1c48
+0,         54,         54,        1,   230400, 0xe27f199c
+0,         55,         55,        1,   230400, 0x10ab1bab
+0,         56,         56,        1,   230400, 0xeab017c3
+0,         57,         57,        1,   230400, 0x5f701f77
+0,         58,         58,        1,   230400, 0x01371d7d
+0,         59,         59,        1,   230400, 0x22751e99
+0,         60,         60,        1,   230400, 0xaee91a97
+0,         61,         61,        1,   230400, 0x27b41f32
+0,         62,         62,        1,   230400, 0x4ff32bb1
+0,         63,         63,        1,   230400, 0x86e02864
+0,         64,         64,        1,   230400, 0x5eb52b3e
+0,         65,         65,        1,   230400, 0xd9252ba8
+0,         66,         66,        1,   230400, 0x72232d9b
+0,         67,         67,        1,   230400, 0x599a206f
+0,         68,         68,        1,   230400, 0x4d2c1ca5
+0,         69,         69,        1,   230400, 0x9166293b
+0,         70,         70,        1,   230400, 0x00992453
diff --git a/tests/ref/fate/filter-paletteuse-nodither b/tests/ref/fate/filter-paletteuse-nodither
new file mode 100644
index 0000000000..a2e61c3690
--- /dev/null
+++ b/tests/ref/fate/filter-paletteuse-nodither
@@ -0,0 +1,76 @@
+#tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x180
+#sar 0: 1/1
+0,          0,          0,        1,   230400, 0x690560cb
+0,          1,          1,        1,   230400, 0x197a5a54
+0,          2,          2,        1,   230400, 0x665961db
+0,          3,          3,        1,   230400, 0xce0b5fa8
+0,          4,          4,        1,   230400, 0xa40e5cb0
+0,          5,          5,        1,   230400, 0xa5aa58da
+0,          6,          6,        1,   230400, 0x8e0259bb
+0,          7,          7,        1,   230400, 0x476d0dba
+0,          8,          8,        1,   230400, 0xfb1b0e8c
+0,          9,          9,        1,   230400, 0x50f60d3b
+0,         10,         10,        1,   230400, 0x12cd4bab
+0,         11,         11,        1,   230400, 0x4c274b13
+0,         12,         12,        1,   230400, 0xea494b0a
+0,         13,         13,        1,   230400, 0x118c4cc1
+0,         14,         14,        1,   230400, 0xd4224db7
+0,         15,         15,        1,   230400, 0xc3014f88
+0,         16,         16,        1,   230400, 0xe07a6838
+0,         17,         17,        1,   230400, 0x1b97659a
+0,         18,         18,        1,   230400, 0xf104670c
+0,         19,         19,        1,   230400, 0x7b63733d
+0,         20,         20,        1,   230400, 0x2c237200
+0,         21,         21,        1,   230400, 0x775d7248
+0,         22,         22,        1,   230400, 0xcaee7f9e
+0,         23,         23,        1,   230400, 0x4e4680a1
+0,         24,         24,        1,   230400, 0x21fb7e53
+0,         25,         25,        1,   230400, 0xf0297db6
+0,         26,         26,        1,   230400, 0x79a9829d
+0,         27,         27,        1,   230400, 0x8ccb80f7
+0,         28,         28,        1,   230400, 0xf4dd807f
+0,         29,         29,        1,   230400, 0xb6cc8696
+0,         30,         30,        1,   230400, 0x6c8a8917
+0,         31,         31,        1,   230400, 0x9e08615a
+0,         32,         32,        1,   230400, 0xc098685b
+0,         33,         33,        1,   230400, 0x5c09e710
+0,         34,         34,        1,   230400, 0xe4c4e9be
+0,         35,         35,        1,   230400, 0xac59c150
+0,         36,         36,        1,   230400, 0x6045c272
+0,         37,         37,        1,   230400, 0xf71ee6dc
+0,         38,         38,        1,   230400, 0xc82ce6f6
+0,         39,         39,        1,   230400, 0xb7ed039a
+0,         40,         40,        1,   230400, 0xda93f241
+0,         41,         41,        1,   230400, 0x194bf23b
+0,         42,         42,        1,   230400, 0xe7e6f2e2
+0,         43,         43,        1,   230400, 0xe479d834
+0,         44,         44,        1,   230400, 0xefdfd87e
+0,         45,         45,        1,   230400, 0xec66d8c0
+0,         46,         46,        1,   230400, 0x3a6bd81b
+0,         47,         47,        1,   230400, 0xb5d1d700
+0,         48,         48,        1,   230400, 0x3bc69e8b
+0,         49,         49,        1,   230400, 0x723fa455
+0,         50,         50,        1,   230400, 0x7c49a392
+0,         51,         51,        1,   230400, 0x272ea4b7
+0,         52,         52,        1,   230400, 0xebdda081
+0,         53,         53,        1,   230400, 0xfd26ab99
+0,         54,         54,        1,   230400, 0xfa02a891
+0,         55,         55,        1,   230400, 0xda2caa7f
+0,         56,         56,        1,   230400, 0x2360a611
+0,         57,         57,        1,   230400, 0xaa3baefd
+0,         58,         58,        1,   230400, 0x0961ad5c
+0,         59,         59,        1,   230400, 0x48d2ae47
+0,         60,         60,        1,   230400, 0x20eda81b
+0,         61,         61,        1,   230400, 0x8821adbb
+0,         62,         62,        1,   230400, 0x1150b810
+0,         63,         63,        1,   230400, 0x08dab596
+0,         64,         64,        1,   230400, 0x4731b7a5
+0,         65,         65,        1,   230400, 0xf382b87e
+0,         66,         66,        1,   230400, 0xdba7bac2
+0,         67,         67,        1,   230400, 0xf569acf9
+0,         68,         68,        1,   230400, 0x22d8a95d
+0,         69,         69,        1,   230400, 0xed0bb4fb
+0,         70,         70,        1,   230400, 0x2dccb218
diff --git a/tests/ref/fate/filter-paletteuse-sierra2_4a b/tests/ref/fate/filter-paletteuse-sierra2_4a
new file mode 100644
index 0000000000..d257820a32
--- /dev/null
+++ b/tests/ref/fate/filter-paletteuse-sierra2_4a
@@ -0,0 +1,76 @@
+#tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x180
+#sar 0: 1/1
+0,          0,          0,        1,   230400, 0xa4f85758
+0,          1,          1,        1,   230400, 0xbe83505c
+0,          2,          2,        1,   230400, 0x0a09584e
+0,          3,          3,        1,   230400, 0xd2065629
+0,          4,          4,        1,   230400, 0x11eb5319
+0,          5,          5,        1,   230400, 0x61024f4c
+0,          6,          6,        1,   230400, 0xd5384faa
+0,          7,          7,        1,   230400, 0xdeae0343
+0,          8,          8,        1,   230400, 0xcb640541
+0,          9,          9,        1,   230400, 0xea2602c3
+0,         10,         10,        1,   230400, 0xa7974293
+0,         11,         11,        1,   230400, 0x67cd4287
+0,         12,         12,        1,   230400, 0x83fa437a
+0,         13,         13,        1,   230400, 0x852b42bf
+0,         14,         14,        1,   230400, 0x6d2d434c
+0,         15,         15,        1,   230400, 0x20c44629
+0,         16,         16,        1,   230400, 0xf2a35f57
+0,         17,         17,        1,   230400, 0x232959ec
+0,         18,         18,        1,   230400, 0x1f8e5c48
+0,         19,         19,        1,   230400, 0x88dc69bd
+0,         20,         20,        1,   230400, 0x4b6866f3
+0,         21,         21,        1,   230400, 0xe8f966dc
+0,         22,         22,        1,   230400, 0xe0877466
+0,         23,         23,        1,   230400, 0x8799748c
+0,         24,         24,        1,   230400, 0xcab871bc
+0,         25,         25,        1,   230400, 0x2e0372b4
+0,         26,         26,        1,   230400, 0x15fb77d5
+0,         27,         27,        1,   230400, 0xbadf75fc
+0,         28,         28,        1,   230400, 0xa4977626
+0,         29,         29,        1,   230400, 0x5b987943
+0,         30,         30,        1,   230400, 0x9ed57c09
+0,         31,         31,        1,   230400, 0x565d5105
+0,         32,         32,        1,   230400, 0x901b5a07
+0,         33,         33,        1,   230400, 0x8dc4e9a8
+0,         34,         34,        1,   230400, 0x0b9cee1c
+0,         35,         35,        1,   230400, 0x2bcdbe37
+0,         36,         36,        1,   230400, 0xf3e2bf71
+0,         37,         37,        1,   230400, 0xb718da67
+0,         38,         38,        1,   230400, 0x8f59da64
+0,         39,         39,        1,   230400, 0x8812f9aa
+0,         40,         40,        1,   230400, 0xe0dae6a3
+0,         41,         41,        1,   230400, 0xd2c7e5b7
+0,         42,         42,        1,   230400, 0xea2ae5d2
+0,         43,         43,        1,   230400, 0x2d66ca25
+0,         44,         44,        1,   230400, 0xf0d3cac6
+0,         45,         45,        1,   230400, 0xb9acccac
+0,         46,         46,        1,   230400, 0x8523ca4a
+0,         47,         47,        1,   230400, 0x92b9c9ef
+0,         48,         48,        1,   230400, 0x0a88946e
+0,         49,         49,        1,   230400, 0xe33699b8
+0,         50,         50,        1,   230400, 0x5e7b9917
+0,         51,         51,        1,   230400, 0xdac99998
+0,         52,         52,        1,   230400, 0xb5c995fc
+0,         53,         53,        1,   230400, 0x908b9f50
+0,         54,         54,        1,   230400, 0x60d59ced
+0,         55,         55,        1,   230400, 0x212e9f55
+0,         56,         56,        1,   230400, 0x95e69b2a
+0,         57,         57,        1,   230400, 0x6c38a34a
+0,         58,         58,        1,   230400, 0xeb32a103
+0,         59,         59,        1,   230400, 0x0131a1b7
+0,         60,         60,        1,   230400, 0xd59b9c4e
+0,         61,         61,        1,   230400, 0x2fc0a13f
+0,         62,         62,        1,   230400, 0x7a40adf9
+0,         63,         63,        1,   230400, 0x5cdbab2f
+0,         64,         64,        1,   230400, 0xcdc0ada8
+0,         65,         65,        1,   230400, 0x2f5faf32
+0,         66,         66,        1,   230400, 0xd463b224
+0,         67,         67,        1,   230400, 0xe337a2d5
+0,         68,         68,        1,   230400, 0xe775a0c1
+0,         69,         69,        1,   230400, 0x726aab49
+0,         70,         70,        1,   230400, 0x74dda81e
diff --git a/tests/ref/fate/filter-phase b/tests/ref/fate/filter-phase
new file mode 100644
index 0000000000..b0f8a25717
--- /dev/null
+++ b/tests/ref/fate/filter-phase
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x05b789ef
+0,          1,          1,        1,   152064, 0x4bb46551
+0,          2,          2,        1,   152064, 0x9dddf64a
+0,          3,          3,        1,   152064, 0x2a8380b0
+0,          4,          4,        1,   152064, 0x4de3b652
+0,          5,          5,        1,   152064, 0xedb5a8e6
+0,          6,          6,        1,   152064, 0xe20f7c23
+0,          7,          7,        1,   152064, 0x5ab58bac
+0,          8,          8,        1,   152064, 0x1f1b8026
+0,          9,          9,        1,   152064, 0x91373915
+0,         10,         10,        1,   152064, 0x02344760
+0,         11,         11,        1,   152064, 0x30f5fcd5
+0,         12,         12,        1,   152064, 0xc711ad61
+0,         13,         13,        1,   152064, 0x24eca223
+0,         14,         14,        1,   152064, 0x52a48ddd
+0,         15,         15,        1,   152064, 0xa91c0f05
+0,         16,         16,        1,   152064, 0x8e364e18
+0,         17,         17,        1,   152064, 0xb15d38c8
+0,         18,         18,        1,   152064, 0xf25f6acc
+0,         19,         19,        1,   152064, 0xf34ddbff
+0,         20,         20,        1,   152064, 0xfc7bf570
+0,         21,         21,        1,   152064, 0x9dc72412
+0,         22,         22,        1,   152064, 0x445d1d59
+0,         23,         23,        1,   152064, 0x2f2768ef
+0,         24,         24,        1,   152064, 0xce09f9d6
+0,         25,         25,        1,   152064, 0x95579936
+0,         26,         26,        1,   152064, 0x43d796b5
+0,         27,         27,        1,   152064, 0xd780d887
+0,         28,         28,        1,   152064, 0x76d2a455
+0,         29,         29,        1,   152064, 0x6dc3650e
+0,         30,         30,        1,   152064, 0x0f9d6aca
+0,         31,         31,        1,   152064, 0xe295c51e
+0,         32,         32,        1,   152064, 0xd766fc8d
+0,         33,         33,        1,   152064, 0xe22f7a30
+0,         34,         34,        1,   152064, 0x7fea4378
+0,         35,         35,        1,   152064, 0xfa8d94fb
+0,         36,         36,        1,   152064, 0x4c9737ab
+0,         37,         37,        1,   152064, 0xa50d01f8
+0,         38,         38,        1,   152064, 0x0b07594c
+0,         39,         39,        1,   152064, 0x88734edd
+0,         40,         40,        1,   152064, 0xd2735925
+0,         41,         41,        1,   152064, 0xd4e49e08
+0,         42,         42,        1,   152064, 0x20cebfa9
+0,         43,         43,        1,   152064, 0x575c20ec
+0,         44,         44,        1,   152064, 0xfd500471
+0,         45,         45,        1,   152064, 0x61b47e73
+0,         46,         46,        1,   152064, 0x09ef53ff
+0,         47,         47,        1,   152064, 0x6e88c5c2
+0,         48,         48,        1,   152064, 0xbb87b483
+0,         49,         49,        1,   152064, 0x4bbad8ea
diff --git a/tests/ref/fate/filter-pixdesc-0bgr b/tests/ref/fate/filter-pixdesc-0bgr
new file mode 100644
index 0000000000..7bbb03dc25
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-0bgr
@@ -0,0 +1 @@
+pixdesc-0bgr        89fa866f5532548a67b6e742b4d49e03
diff --git a/tests/ref/fate/filter-pixdesc-0rgb b/tests/ref/fate/filter-pixdesc-0rgb
new file mode 100644
index 0000000000..e0da275840
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-0rgb
@@ -0,0 +1 @@
+pixdesc-0rgb        b181e1d3d4ca1e64d55f434e97c9fdba
diff --git a/tests/ref/fate/filter-pixdesc-abgr b/tests/ref/fate/filter-pixdesc-abgr
index 691bc0751e..194819e431 100644
--- a/tests/ref/fate/filter-pixdesc-abgr
+++ b/tests/ref/fate/filter-pixdesc-abgr
@@ -1 +1 @@
-pixdesc-abgr        0a96433ddadb89d577870419c0c0f122
+pixdesc-abgr        ded06f35fe57b74f6cdbba9e356cd02d
diff --git a/tests/ref/fate/filter-pixdesc-argb b/tests/ref/fate/filter-pixdesc-argb
index 27531dc0c6..a21a87a64b 100644
--- a/tests/ref/fate/filter-pixdesc-argb
+++ b/tests/ref/fate/filter-pixdesc-argb
@@ -1 +1 @@
-pixdesc-argb        29a7781fc931a8fe4847bbbd02ca966a
+pixdesc-argb        f983e1f44ce61c3c2bfac3cb55d3cdd8
diff --git a/tests/ref/fate/filter-pixdesc-ayuv64le b/tests/ref/fate/filter-pixdesc-ayuv64le
new file mode 100644
index 0000000000..385ce1399c
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-ayuv64le
@@ -0,0 +1 @@
+pixdesc-ayuv64le    2269279a2df156931021793927876e84
diff --git a/tests/ref/fate/filter-pixdesc-bgr0 b/tests/ref/fate/filter-pixdesc-bgr0
new file mode 100644
index 0000000000..f4a2c1bc14
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-bgr0
@@ -0,0 +1 @@
+pixdesc-bgr0        5bf31ebb28690035b15eb8252c11b630
diff --git a/tests/ref/fate/filter-pixdesc-bgr24 b/tests/ref/fate/filter-pixdesc-bgr24
index 7c530b44e4..c63da5812f 100644
--- a/tests/ref/fate/filter-pixdesc-bgr24
+++ b/tests/ref/fate/filter-pixdesc-bgr24
@@ -1 +1 @@
-pixdesc-bgr24       0c8ccab8bf3055c6299f943e94e90e25
+pixdesc-bgr24       30134c7e6c9298df1d830398edca22b9
diff --git a/tests/ref/fate/filter-pixdesc-bgr444be b/tests/ref/fate/filter-pixdesc-bgr444be
index 6de43e78a0..1c6ce575c4 100644
--- a/tests/ref/fate/filter-pixdesc-bgr444be
+++ b/tests/ref/fate/filter-pixdesc-bgr444be
@@ -1 +1 @@
-pixdesc-bgr444be    4f223284a5797b7665994cea8045bc70
+pixdesc-bgr444be    bbe69fdff1c6965674bf5be5d14a342d
diff --git a/tests/ref/fate/filter-pixdesc-bgr444le b/tests/ref/fate/filter-pixdesc-bgr444le
index 0d3a6eda0b..2886eee5bf 100644
--- a/tests/ref/fate/filter-pixdesc-bgr444le
+++ b/tests/ref/fate/filter-pixdesc-bgr444le
@@ -1 +1 @@
-pixdesc-bgr444le    fa37199bf217a5a82a628f175b375a86
+pixdesc-bgr444le    497e36f9004a10b46e4bc7253e95ad9f
diff --git a/tests/ref/fate/filter-pixdesc-bgr48be b/tests/ref/fate/filter-pixdesc-bgr48be
index 65b2289077..72e2df7fe0 100644
--- a/tests/ref/fate/filter-pixdesc-bgr48be
+++ b/tests/ref/fate/filter-pixdesc-bgr48be
@@ -1 +1 @@
-pixdesc-bgr48be     728452ef75877706fddabdee386ea6a3
+pixdesc-bgr48be     c0ddbd8b786877336e725ec3c150b17e
diff --git a/tests/ref/fate/filter-pixdesc-bgr48le b/tests/ref/fate/filter-pixdesc-bgr48le
index 5906109399..dad2d06474 100644
--- a/tests/ref/fate/filter-pixdesc-bgr48le
+++ b/tests/ref/fate/filter-pixdesc-bgr48le
@@ -1 +1 @@
-pixdesc-bgr48le     82f5689e141989e7368f1057f4411040
+pixdesc-bgr48le     0d7a6d9d46fec1e701f34c2d5e2c6918
diff --git a/tests/ref/fate/filter-pixdesc-bgr4_byte b/tests/ref/fate/filter-pixdesc-bgr4_byte
index 1995bc95de..e71fec2317 100644
--- a/tests/ref/fate/filter-pixdesc-bgr4_byte
+++ b/tests/ref/fate/filter-pixdesc-bgr4_byte
@@ -1 +1 @@
-pixdesc-bgr4_byte   dc7a43438728d94f27c495491ea6b5fc
+pixdesc-bgr4_byte   68d51f7d88311efcb4661ffb5ff9582e
diff --git a/tests/ref/fate/filter-pixdesc-bgr555be b/tests/ref/fate/filter-pixdesc-bgr555be
index 6624bc47a8..a0ba70f38d 100644
--- a/tests/ref/fate/filter-pixdesc-bgr555be
+++ b/tests/ref/fate/filter-pixdesc-bgr555be
@@ -1 +1 @@
-pixdesc-bgr555be    5c247603c16194f1206cc120de268628
+pixdesc-bgr555be    2718e3363c3191b14bc2f3f1936cebdb
diff --git a/tests/ref/fate/filter-pixdesc-bgr555le b/tests/ref/fate/filter-pixdesc-bgr555le
index 155cda13c3..dd22eef8b7 100644
--- a/tests/ref/fate/filter-pixdesc-bgr555le
+++ b/tests/ref/fate/filter-pixdesc-bgr555le
@@ -1 +1 @@
-pixdesc-bgr555le    29f6a95f0c11734ab2dfbef9e7633eaf
+pixdesc-bgr555le    35bf7049f067f541ae6dad8a70bc28ed
diff --git a/tests/ref/fate/filter-pixdesc-bgr565be b/tests/ref/fate/filter-pixdesc-bgr565be
index be096b26fa..f050688676 100644
--- a/tests/ref/fate/filter-pixdesc-bgr565be
+++ b/tests/ref/fate/filter-pixdesc-bgr565be
@@ -1 +1 @@
-pixdesc-bgr565be    0225e9ef2a254369e0682832774dd0d5
+pixdesc-bgr565be    104e725cc5237aee0b03b8c537eaacac
diff --git a/tests/ref/fate/filter-pixdesc-bgr565le b/tests/ref/fate/filter-pixdesc-bgr565le
index 720a2221d8..fa35622689 100644
--- a/tests/ref/fate/filter-pixdesc-bgr565le
+++ b/tests/ref/fate/filter-pixdesc-bgr565le
@@ -1 +1 @@
-pixdesc-bgr565le    5216493ff6c65fa86e117a4fc508c45f
+pixdesc-bgr565le    33df7dd9a9d738fb9c8b82dbf23c7caa
diff --git a/tests/ref/fate/filter-pixdesc-bgr8 b/tests/ref/fate/filter-pixdesc-bgr8
index 77ca8c4b06..299665e52a 100644
--- a/tests/ref/fate/filter-pixdesc-bgr8
+++ b/tests/ref/fate/filter-pixdesc-bgr8
@@ -1 +1 @@
-pixdesc-bgr8        cbd7b5fbc9cdc1960b99338d4b7a717f
+pixdesc-bgr8        0abb130e5224af5e2e10149f1680fa2e
diff --git a/tests/ref/fate/filter-pixdesc-bgra b/tests/ref/fate/filter-pixdesc-bgra
index 061d3952b8..abdedbe48c 100644
--- a/tests/ref/fate/filter-pixdesc-bgra
+++ b/tests/ref/fate/filter-pixdesc-bgra
@@ -1 +1 @@
-pixdesc-bgra        ed2e65c70afddfb5ecdcbbe84b699125
+pixdesc-bgra        0bb08da9936d2efd20351ab4a88e9b10
diff --git a/tests/ref/fate/filter-pixdesc-bgra64be b/tests/ref/fate/filter-pixdesc-bgra64be
new file mode 100644
index 0000000000..4459e24999
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-bgra64be
@@ -0,0 +1 @@
+pixdesc-bgra64be    c524aa7e4c02dbca57035bb548afc1ec
diff --git a/tests/ref/fate/filter-pixdesc-bgra64le b/tests/ref/fate/filter-pixdesc-bgra64le
new file mode 100644
index 0000000000..82f2a5479e
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-bgra64le
@@ -0,0 +1 @@
+pixdesc-bgra64le    df3a79d47b9dcf3ed2c252afd80e062c
diff --git a/tests/ref/fate/filter-pixdesc-gbrap b/tests/ref/fate/filter-pixdesc-gbrap
index 7b6cb9e629..c8f5354983 100644
--- a/tests/ref/fate/filter-pixdesc-gbrap
+++ b/tests/ref/fate/filter-pixdesc-gbrap
@@ -1 +1 @@
-pixdesc-gbrap       27d9432f970ab0858efecb5a5411cff9
+pixdesc-gbrap       62c4d187a269f9f6fc87bb87e904ea71
diff --git a/tests/ref/fate/filter-pixdesc-gbrap10be b/tests/ref/fate/filter-pixdesc-gbrap10be
new file mode 100644
index 0000000000..fbdaf69309
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gbrap10be
@@ -0,0 +1 @@
+pixdesc-gbrap10be   95487536cdc73e10e06d739e03427390
diff --git a/tests/ref/fate/filter-pixdesc-gbrap10le b/tests/ref/fate/filter-pixdesc-gbrap10le
new file mode 100644
index 0000000000..f53ed5e212
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gbrap10le
@@ -0,0 +1 @@
+pixdesc-gbrap10le   bf2ce9a1b3cfd56667c19b30a1a51181
diff --git a/tests/ref/fate/filter-pixdesc-gbrap12be b/tests/ref/fate/filter-pixdesc-gbrap12be
index 6e27632b1a..be7c1390f5 100644
--- a/tests/ref/fate/filter-pixdesc-gbrap12be
+++ b/tests/ref/fate/filter-pixdesc-gbrap12be
@@ -1 +1 @@
-pixdesc-gbrap12be   a8ce4f5a7578f260399f86f92ae2a7be
+pixdesc-gbrap12be   419eca7130f22b62fd50cab347a56459
diff --git a/tests/ref/fate/filter-pixdesc-gbrap12le b/tests/ref/fate/filter-pixdesc-gbrap12le
index b6537a57f6..99c5901064 100644
--- a/tests/ref/fate/filter-pixdesc-gbrap12le
+++ b/tests/ref/fate/filter-pixdesc-gbrap12le
@@ -1 +1 @@
-pixdesc-gbrap12le   c14ff0058c8b1ccdb880386d7f9804e5
+pixdesc-gbrap12le   01fff1419a76749e214056618a43f8b1
diff --git a/tests/ref/fate/filter-pixdesc-gbrap16be b/tests/ref/fate/filter-pixdesc-gbrap16be
new file mode 100644
index 0000000000..b01c4047c4
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gbrap16be
@@ -0,0 +1 @@
+pixdesc-gbrap16be   7874e7fd35419ef212a450ea637ffb24
diff --git a/tests/ref/fate/filter-pixdesc-gbrap16le b/tests/ref/fate/filter-pixdesc-gbrap16le
new file mode 100644
index 0000000000..71ef29f056
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gbrap16le
@@ -0,0 +1 @@
+pixdesc-gbrap16le   a83c7d0bbbfb1c1a8208f75680358387
diff --git a/tests/ref/fate/filter-pixdesc-gbrp b/tests/ref/fate/filter-pixdesc-gbrp
index b2eb19ae90..4edfdcb36e 100644
--- a/tests/ref/fate/filter-pixdesc-gbrp
+++ b/tests/ref/fate/filter-pixdesc-gbrp
@@ -1 +1 @@
-pixdesc-gbrp        6590f4971764ad82148440354f1635d3
+pixdesc-gbrp        fe5bffda29f9afbf84fbf9cc2a8f45bd
diff --git a/tests/ref/fate/filter-pixdesc-gbrp10be b/tests/ref/fate/filter-pixdesc-gbrp10be
index b2f6ee8d01..7bcca2fa0a 100644
--- a/tests/ref/fate/filter-pixdesc-gbrp10be
+++ b/tests/ref/fate/filter-pixdesc-gbrp10be
@@ -1 +1 @@
-pixdesc-gbrp10be    7737f88a6ea043a5cd142afe89da3c21
+pixdesc-gbrp10be    c2ba960cf177208de99d4cf8d63402b1
diff --git a/tests/ref/fate/filter-pixdesc-gbrp10le b/tests/ref/fate/filter-pixdesc-gbrp10le
index bc0e2b98cb..564886e18b 100644
--- a/tests/ref/fate/filter-pixdesc-gbrp10le
+++ b/tests/ref/fate/filter-pixdesc-gbrp10le
@@ -1 +1 @@
-pixdesc-gbrp10le    a912e36ddb9380de328ef2555c303302
+pixdesc-gbrp10le    870de5644f6eb7bfbf183bd89f45130a
diff --git a/tests/ref/fate/filter-pixdesc-gbrp12be b/tests/ref/fate/filter-pixdesc-gbrp12be
index 4421c93a94..64aed2a118 100644
--- a/tests/ref/fate/filter-pixdesc-gbrp12be
+++ b/tests/ref/fate/filter-pixdesc-gbrp12be
@@ -1 +1 @@
-pixdesc-gbrp12be    7c924cf350433263f3413431ccba7efd
+pixdesc-gbrp12be    d464c9f821b37c688b8a9196bd682938
diff --git a/tests/ref/fate/filter-pixdesc-gbrp12le b/tests/ref/fate/filter-pixdesc-gbrp12le
index 1d53d0f532..1bc6ed44f5 100644
--- a/tests/ref/fate/filter-pixdesc-gbrp12le
+++ b/tests/ref/fate/filter-pixdesc-gbrp12le
@@ -1 +1 @@
-pixdesc-gbrp12le    1f8101f05b641b2a46426a26139c4f5b
+pixdesc-gbrp12le    0399e1a940870dd3e3fd7c4be7f9e681
diff --git a/tests/ref/fate/filter-pixdesc-gbrp14be b/tests/ref/fate/filter-pixdesc-gbrp14be
new file mode 100644
index 0000000000..f1ff03f876
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gbrp14be
@@ -0,0 +1 @@
+pixdesc-gbrp14be    f430b5b2f8fdf778a708a332e0ef0ebf
diff --git a/tests/ref/fate/filter-pixdesc-gbrp14le b/tests/ref/fate/filter-pixdesc-gbrp14le
new file mode 100644
index 0000000000..cca2119c45
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gbrp14le
@@ -0,0 +1 @@
+pixdesc-gbrp14le    0ca93f5e5dd4b75481a77f0a63c600d1
diff --git a/tests/ref/fate/filter-pixdesc-gbrp16be b/tests/ref/fate/filter-pixdesc-gbrp16be
new file mode 100644
index 0000000000..a7e98000c9
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gbrp16be
@@ -0,0 +1 @@
+pixdesc-gbrp16be    daccdd0a7d41d566ab40c4d00e552cbe
diff --git a/tests/ref/fate/filter-pixdesc-gbrp16le b/tests/ref/fate/filter-pixdesc-gbrp16le
new file mode 100644
index 0000000000..952c0aff92
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gbrp16le
@@ -0,0 +1 @@
+pixdesc-gbrp16le    04f40ad1a27963be3125624446ed195e
diff --git a/tests/ref/fate/filter-pixdesc-gbrp9be b/tests/ref/fate/filter-pixdesc-gbrp9be
index 3386eab6b2..6b535b8216 100644
--- a/tests/ref/fate/filter-pixdesc-gbrp9be
+++ b/tests/ref/fate/filter-pixdesc-gbrp9be
@@ -1 +1 @@
-pixdesc-gbrp9be     1c448e780b6e82e163e576f0ebb22522
+pixdesc-gbrp9be     78d289e0bd8ca8cca0674597b6d0fe2c
diff --git a/tests/ref/fate/filter-pixdesc-gbrp9le b/tests/ref/fate/filter-pixdesc-gbrp9le
index 49b03df0b0..643da41e05 100644
--- a/tests/ref/fate/filter-pixdesc-gbrp9le
+++ b/tests/ref/fate/filter-pixdesc-gbrp9le
@@ -1 +1 @@
-pixdesc-gbrp9le     77c2331ceb429454ff7999f771685f38
+pixdesc-gbrp9le     a233e529a254da36dc1f539da6a3e9bc
diff --git a/tests/ref/fate/filter-pixdesc-gray b/tests/ref/fate/filter-pixdesc-gray
index 20424cd10a..3ba6448074 100644
--- a/tests/ref/fate/filter-pixdesc-gray
+++ b/tests/ref/fate/filter-pixdesc-gray
@@ -1 +1 @@
-pixdesc-gray        6b89bdf31cbbb19580b1edd3c65b2100
+pixdesc-gray        24563fd8a34c2bfa8523da74da025e23
diff --git a/tests/ref/fate/filter-pixdesc-gray10be b/tests/ref/fate/filter-pixdesc-gray10be
new file mode 100644
index 0000000000..5ef8032e70
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gray10be
@@ -0,0 +1 @@
+pixdesc-gray10be    987bee0355054fcfc915e1e41aad523a
diff --git a/tests/ref/fate/filter-pixdesc-gray10le b/tests/ref/fate/filter-pixdesc-gray10le
new file mode 100644
index 0000000000..ea86b22dc5
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gray10le
@@ -0,0 +1 @@
+pixdesc-gray10le    674bed2aa8686b78dd5fa4b15c15c655
diff --git a/tests/ref/fate/filter-pixdesc-gray12be b/tests/ref/fate/filter-pixdesc-gray12be
index de997347d5..6388f14764 100644
--- a/tests/ref/fate/filter-pixdesc-gray12be
+++ b/tests/ref/fate/filter-pixdesc-gray12be
@@ -1 +1 @@
-pixdesc-gray12be    bff4fa5910e99725b275fb70270b0cf9
+pixdesc-gray12be    29aeecc116c4b3e0c5109810fbd9ca17
diff --git a/tests/ref/fate/filter-pixdesc-gray12le b/tests/ref/fate/filter-pixdesc-gray12le
index c2c5f68684..28e900f68e 100644
--- a/tests/ref/fate/filter-pixdesc-gray12le
+++ b/tests/ref/fate/filter-pixdesc-gray12le
@@ -1 +1 @@
-pixdesc-gray12le    d0900fab4e757ef17fff8c1ffd0b3816
+pixdesc-gray12le    030882d5b4a502210644f2d520f7b92c
diff --git a/tests/ref/fate/filter-pixdesc-gray16be b/tests/ref/fate/filter-pixdesc-gray16be
index 8ecaf57858..b4d28d38a6 100644
--- a/tests/ref/fate/filter-pixdesc-gray16be
+++ b/tests/ref/fate/filter-pixdesc-gray16be
@@ -1 +1 @@
-pixdesc-gray16be    d8acd9d657ad5d916cc6b016fa62044e
+pixdesc-gray16be    99e7e54973b479845932e92581292b03
diff --git a/tests/ref/fate/filter-pixdesc-gray16le b/tests/ref/fate/filter-pixdesc-gray16le
index d99ca6159e..841d3ee1c5 100644
--- a/tests/ref/fate/filter-pixdesc-gray16le
+++ b/tests/ref/fate/filter-pixdesc-gray16le
@@ -1 +1 @@
-pixdesc-gray16le    db884b18fd1a09c53f2cf3d6ca30e086
+pixdesc-gray16le    33bd1b950d279a4bb22af325905d3604
diff --git a/tests/ref/fate/filter-pixdesc-gray9be b/tests/ref/fate/filter-pixdesc-gray9be
new file mode 100644
index 0000000000..bf92e299b5
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gray9be
@@ -0,0 +1 @@
+pixdesc-gray9be     19aef736657607fdc6191f5338860580
diff --git a/tests/ref/fate/filter-pixdesc-gray9le b/tests/ref/fate/filter-pixdesc-gray9le
new file mode 100644
index 0000000000..4c65fb97c2
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-gray9le
@@ -0,0 +1 @@
+pixdesc-gray9le     f2a28bb71966f5d6e44eedef67e0118a
diff --git a/tests/ref/fate/filter-pixdesc-monob b/tests/ref/fate/filter-pixdesc-monob
index 9f5df059bf..63a4b62bd3 100644
--- a/tests/ref/fate/filter-pixdesc-monob
+++ b/tests/ref/fate/filter-pixdesc-monob
@@ -1 +1 @@
-pixdesc-monob       48a6d35857c18e2ed20117dd9ef80fdc
+pixdesc-monob       e69e4b6e48dd419bb199312727f60a47
diff --git a/tests/ref/fate/filter-pixdesc-monow b/tests/ref/fate/filter-pixdesc-monow
index 0201f4467a..c73f3275a1 100644
--- a/tests/ref/fate/filter-pixdesc-monow
+++ b/tests/ref/fate/filter-pixdesc-monow
@@ -1 +1 @@
-pixdesc-monow       de6cd58f5525e692981d8c8678f878c4
+pixdesc-monow       51a45d1d34b95373fffdd79fc3abf457
diff --git a/tests/ref/fate/filter-pixdesc-nv12 b/tests/ref/fate/filter-pixdesc-nv12
index 6cc824b6a1..2151cd03a1 100644
--- a/tests/ref/fate/filter-pixdesc-nv12
+++ b/tests/ref/fate/filter-pixdesc-nv12
@@ -1 +1 @@
-pixdesc-nv12        d3a477a5a56d334728720ac268b1ef99
+pixdesc-nv12        7686f473937082abcba7a46f028aaa08
diff --git a/tests/ref/fate/filter-pixdesc-nv21 b/tests/ref/fate/filter-pixdesc-nv21
index 3f8393bc7a..02703836d3 100644
--- a/tests/ref/fate/filter-pixdesc-nv21
+++ b/tests/ref/fate/filter-pixdesc-nv21
@@ -1 +1 @@
-pixdesc-nv21        977c4582b5d4c7cbdda70ccabb16884b
+pixdesc-nv21        61c09258160939049f9807ed589bc90e
diff --git a/tests/ref/fate/filter-pixdesc-p010be b/tests/ref/fate/filter-pixdesc-p010be
new file mode 100644
index 0000000000..4d9dd22a1b
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-p010be
@@ -0,0 +1 @@
+pixdesc-p010be      784a49bf554861da9d0809a615bcf813
diff --git a/tests/ref/fate/filter-pixdesc-p010le b/tests/ref/fate/filter-pixdesc-p010le
new file mode 100644
index 0000000000..25006048b2
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-p010le
@@ -0,0 +1 @@
+pixdesc-p010le      7b4a503997eb4e14cba80ee52db85e39
diff --git a/tests/ref/fate/filter-pixdesc-rgb0 b/tests/ref/fate/filter-pixdesc-rgb0
new file mode 100644
index 0000000000..dccd9c130f
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-rgb0
@@ -0,0 +1 @@
+pixdesc-rgb0        bd816424fbe4d56b22b5b0f9a238e26e
diff --git a/tests/ref/fate/filter-pixdesc-rgb24 b/tests/ref/fate/filter-pixdesc-rgb24
index 21a720eb9f..67d92d8e18 100644
--- a/tests/ref/fate/filter-pixdesc-rgb24
+++ b/tests/ref/fate/filter-pixdesc-rgb24
@@ -1 +1 @@
-pixdesc-rgb24       f902267656c28501c123e0bde836421b
+pixdesc-rgb24       6fa2d8a2a57d1cb1a30354851e8dfd82
diff --git a/tests/ref/fate/filter-pixdesc-rgb444be b/tests/ref/fate/filter-pixdesc-rgb444be
index a8ff704c8a..63ba2885b7 100644
--- a/tests/ref/fate/filter-pixdesc-rgb444be
+++ b/tests/ref/fate/filter-pixdesc-rgb444be
@@ -1 +1 @@
-pixdesc-rgb444be    bc6cb36dbf15cb132ff6d8eee765a95e
+pixdesc-rgb444be    cfa4ee284dd89df92eed7f99f19a0218
diff --git a/tests/ref/fate/filter-pixdesc-rgb444le b/tests/ref/fate/filter-pixdesc-rgb444le
index 3b77e74a44..eafe2eb134 100644
--- a/tests/ref/fate/filter-pixdesc-rgb444le
+++ b/tests/ref/fate/filter-pixdesc-rgb444le
@@ -1 +1 @@
-pixdesc-rgb444le    a425e8048218b25dad9a81506d891b6f
+pixdesc-rgb444le    a40633dce705f439ecfc1a1b75661e17
diff --git a/tests/ref/fate/filter-pixdesc-rgb48be b/tests/ref/fate/filter-pixdesc-rgb48be
index f7ac2ac968..43b4b3c12c 100644
--- a/tests/ref/fate/filter-pixdesc-rgb48be
+++ b/tests/ref/fate/filter-pixdesc-rgb48be
@@ -1 +1 @@
-pixdesc-rgb48be     d42c8b9fb2d34df383a5f9c2388b5243
+pixdesc-rgb48be     464a81ce147465017b7edb71f806f434
diff --git a/tests/ref/fate/filter-pixdesc-rgb48le b/tests/ref/fate/filter-pixdesc-rgb48le
index ff3dee918b..614f1648af 100644
--- a/tests/ref/fate/filter-pixdesc-rgb48le
+++ b/tests/ref/fate/filter-pixdesc-rgb48le
@@ -1 +1 @@
-pixdesc-rgb48le     ded9e1cb5a4e40de05c0849143658daf
+pixdesc-rgb48le     e05c1d73c722b93735ec2d5f8109e1f3
diff --git a/tests/ref/fate/filter-pixdesc-rgb4_byte b/tests/ref/fate/filter-pixdesc-rgb4_byte
index 6763c11a72..99fce381f7 100644
--- a/tests/ref/fate/filter-pixdesc-rgb4_byte
+++ b/tests/ref/fate/filter-pixdesc-rgb4_byte
@@ -1 +1 @@
-pixdesc-rgb4_byte   c38cb84e03142ba79b67efa6eb435a40
+pixdesc-rgb4_byte   0d4f7b0112d0e942527f168a651a6f8c
diff --git a/tests/ref/fate/filter-pixdesc-rgb555be b/tests/ref/fate/filter-pixdesc-rgb555be
index 520eeccba4..4cc69d8fde 100644
--- a/tests/ref/fate/filter-pixdesc-rgb555be
+++ b/tests/ref/fate/filter-pixdesc-rgb555be
@@ -1 +1 @@
-pixdesc-rgb555be    0684e7db3ed49f0fc8bb2787b44bbdf6
+pixdesc-rgb555be    6ba7d102e12460af51365ee66e070ad4
diff --git a/tests/ref/fate/filter-pixdesc-rgb555le b/tests/ref/fate/filter-pixdesc-rgb555le
index f178868420..1bd13c0428 100644
--- a/tests/ref/fate/filter-pixdesc-rgb555le
+++ b/tests/ref/fate/filter-pixdesc-rgb555le
@@ -1 +1 @@
-pixdesc-rgb555le    1a890ce4ebe5f59fb53e1bf3275c799b
+pixdesc-rgb555le    ab391dde7ec72eb100c6a38aa301ff55
diff --git a/tests/ref/fate/filter-pixdesc-rgb565be b/tests/ref/fate/filter-pixdesc-rgb565be
index c2cf284253..59dbaae46b 100644
--- a/tests/ref/fate/filter-pixdesc-rgb565be
+++ b/tests/ref/fate/filter-pixdesc-rgb565be
@@ -1 +1 @@
-pixdesc-rgb565be    c5c1ee14a373afcf4ac3fc32fc9583e1
+pixdesc-rgb565be    8f05c5786c1e5c9bd64cc6dab05139a5
diff --git a/tests/ref/fate/filter-pixdesc-rgb565le b/tests/ref/fate/filter-pixdesc-rgb565le
index 1766eaf56d..418a18b91e 100644
--- a/tests/ref/fate/filter-pixdesc-rgb565le
+++ b/tests/ref/fate/filter-pixdesc-rgb565le
@@ -1 +1 @@
-pixdesc-rgb565le    3d16aef38fc165413d3aa35194151d78
+pixdesc-rgb565le    427bd36cdf8e8786be888368bbfb35be
diff --git a/tests/ref/fate/filter-pixdesc-rgb8 b/tests/ref/fate/filter-pixdesc-rgb8
index 6c798c0693..d9c4c6298a 100644
--- a/tests/ref/fate/filter-pixdesc-rgb8
+++ b/tests/ref/fate/filter-pixdesc-rgb8
@@ -1 +1 @@
-pixdesc-rgb8        cd3dd114110b48758df3410aae6dd7d3
+pixdesc-rgb8        2ce87991241972bea465f41e4d82d27a
diff --git a/tests/ref/fate/filter-pixdesc-rgba b/tests/ref/fate/filter-pixdesc-rgba
index 2ea2c56075..ff98607c0c 100644
--- a/tests/ref/fate/filter-pixdesc-rgba
+++ b/tests/ref/fate/filter-pixdesc-rgba
@@ -1 +1 @@
-pixdesc-rgba        301a8e45ab9d14a06c5cde7bbedef0b8
+pixdesc-rgba        f55378fcaad1b471faaa4068be30104c
diff --git a/tests/ref/fate/filter-pixdesc-rgba64be b/tests/ref/fate/filter-pixdesc-rgba64be
new file mode 100644
index 0000000000..0c999db22c
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-rgba64be
@@ -0,0 +1 @@
+pixdesc-rgba64be    8d5aea96a7c90aad9d97b06533ad291c
diff --git a/tests/ref/fate/filter-pixdesc-rgba64le b/tests/ref/fate/filter-pixdesc-rgba64le
new file mode 100644
index 0000000000..6534cc2f94
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-rgba64le
@@ -0,0 +1 @@
+pixdesc-rgba64le    2c757090db978d11718bae97027f3a56
diff --git a/tests/ref/fate/filter-pixdesc-uyvy422 b/tests/ref/fate/filter-pixdesc-uyvy422
index 2d89065c27..52d83b0c53 100644
--- a/tests/ref/fate/filter-pixdesc-uyvy422
+++ b/tests/ref/fate/filter-pixdesc-uyvy422
@@ -1 +1 @@
-pixdesc-uyvy422     a36a7fa35ad4acc647431a51c9beec4d
+pixdesc-uyvy422     45211ac7c751e7a7ce6b703a74ce9e71
diff --git a/tests/ref/fate/filter-pixdesc-xyz12be b/tests/ref/fate/filter-pixdesc-xyz12be
new file mode 100644
index 0000000000..d355f9bcc3
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-xyz12be
@@ -0,0 +1 @@
+pixdesc-xyz12be     4ec824668b9753e26c1bccffca866e27
diff --git a/tests/ref/fate/filter-pixdesc-xyz12le b/tests/ref/fate/filter-pixdesc-xyz12le
new file mode 100644
index 0000000000..1c14fba213
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-xyz12le
@@ -0,0 +1 @@
+pixdesc-xyz12le     88d2563589044a3e28f6cde9a43599f9
diff --git a/tests/ref/fate/filter-pixdesc-ya8 b/tests/ref/fate/filter-pixdesc-ya8
new file mode 100644
index 0000000000..fa59613d77
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-ya8
@@ -0,0 +1 @@
+pixdesc-ya8         d087df6cabb2a38d14db347fce634e2f
diff --git a/tests/ref/fate/filter-pixdesc-yuv410p b/tests/ref/fate/filter-pixdesc-yuv410p
index 7522a3e6a3..f758204472 100644
--- a/tests/ref/fate/filter-pixdesc-yuv410p
+++ b/tests/ref/fate/filter-pixdesc-yuv410p
@@ -1 +1 @@
-pixdesc-yuv410p     21a5303f9ef6819bd7abe4b86dc8cdf2
+pixdesc-yuv410p     87d3cb32a4b5a44b94cd6f61e441d279
diff --git a/tests/ref/fate/filter-pixdesc-yuv411p b/tests/ref/fate/filter-pixdesc-yuv411p
index 3e0e8a2e6d..5cc45c2fb0 100644
--- a/tests/ref/fate/filter-pixdesc-yuv411p
+++ b/tests/ref/fate/filter-pixdesc-yuv411p
@@ -1 +1 @@
-pixdesc-yuv411p     c69ecd3af68379064fddc2f75611965e
+pixdesc-yuv411p     0b5beeda04c6f9d091f75ca767b5ffb7
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p b/tests/ref/fate/filter-pixdesc-yuv420p
index ea94f8c518..f0003c0984 100644
--- a/tests/ref/fate/filter-pixdesc-yuv420p
+++ b/tests/ref/fate/filter-pixdesc-yuv420p
@@ -1 +1 @@
-pixdesc-yuv420p     7aaf1057c0edf7d5e9700f9c8e510ea9
+pixdesc-yuv420p     fcb007249fba9371fe84a61c974fcb00
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p10be b/tests/ref/fate/filter-pixdesc-yuv420p10be
index 34c2dc86b7..058db9e88c 100644
--- a/tests/ref/fate/filter-pixdesc-yuv420p10be
+++ b/tests/ref/fate/filter-pixdesc-yuv420p10be
@@ -1 +1 @@
-pixdesc-yuv420p10be 05662068c354779b0c26255efe33c955
+pixdesc-yuv420p10be 51349063819809ca088e76c01041f3e9
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p10le b/tests/ref/fate/filter-pixdesc-yuv420p10le
index bec240b9cf..b5f62f2091 100644
--- a/tests/ref/fate/filter-pixdesc-yuv420p10le
+++ b/tests/ref/fate/filter-pixdesc-yuv420p10le
@@ -1 +1 @@
-pixdesc-yuv420p10le 591af435ff8650b48824ec3705a933d5
+pixdesc-yuv420p10le 070fe05fe4df43e117d1e4cff578655d
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p12be b/tests/ref/fate/filter-pixdesc-yuv420p12be
index 77cc341d9b..35a908ab88 100644
--- a/tests/ref/fate/filter-pixdesc-yuv420p12be
+++ b/tests/ref/fate/filter-pixdesc-yuv420p12be
@@ -1 +1 @@
-pixdesc-yuv420p12be 6d665168703a982178ac395de9be422f
+pixdesc-yuv420p12be 0527525aee87d21db82ecc738ab76848
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p12le b/tests/ref/fate/filter-pixdesc-yuv420p12le
index 8ef325a97d..9d6410278d 100644
--- a/tests/ref/fate/filter-pixdesc-yuv420p12le
+++ b/tests/ref/fate/filter-pixdesc-yuv420p12le
@@ -1 +1 @@
-pixdesc-yuv420p12le 0898b89cc0e0aec143fea7d3ecec991b
+pixdesc-yuv420p12le cb513fbc83b63eedf0cafb26914d37be
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p14be b/tests/ref/fate/filter-pixdesc-yuv420p14be
new file mode 100644
index 0000000000..adbf04dbff
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-yuv420p14be
@@ -0,0 +1 @@
+pixdesc-yuv420p14be ecafa03e42e81d83c8e8711f2133b128
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p14le b/tests/ref/fate/filter-pixdesc-yuv420p14le
new file mode 100644
index 0000000000..ab80278ba6
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-yuv420p14le
@@ -0,0 +1 @@
+pixdesc-yuv420p14le a7ed1889fec8fff122dd2b065a5082ba
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p16be b/tests/ref/fate/filter-pixdesc-yuv420p16be
index 3e9c4f039f..85ea329523 100644
--- a/tests/ref/fate/filter-pixdesc-yuv420p16be
+++ b/tests/ref/fate/filter-pixdesc-yuv420p16be
@@ -1 +1 @@
-pixdesc-yuv420p16be df8ed373b77222ee82f12564b5edfa77
+pixdesc-yuv420p16be 9219829ae866614f64889a0b2603240d
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p16le b/tests/ref/fate/filter-pixdesc-yuv420p16le
index c6e51415ed..f10521c2fa 100644
--- a/tests/ref/fate/filter-pixdesc-yuv420p16le
+++ b/tests/ref/fate/filter-pixdesc-yuv420p16le
@@ -1 +1 @@
-pixdesc-yuv420p16le 5aa9648f73f09c1a3d1c652f2285762a
+pixdesc-yuv420p16le be0f1d41796ac141f33161349d47b4b5
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p9be b/tests/ref/fate/filter-pixdesc-yuv420p9be
index 00fb78eb69..1be5103c31 100644
--- a/tests/ref/fate/filter-pixdesc-yuv420p9be
+++ b/tests/ref/fate/filter-pixdesc-yuv420p9be
@@ -1 +1 @@
-pixdesc-yuv420p9be  605305ba8581d63f160c7885630514a6
+pixdesc-yuv420p9be  69e0e50358ee0f7301d4cf252e9c35b1
diff --git a/tests/ref/fate/filter-pixdesc-yuv420p9le b/tests/ref/fate/filter-pixdesc-yuv420p9le
index 864456bfc9..8677a36dcc 100644
--- a/tests/ref/fate/filter-pixdesc-yuv420p9le
+++ b/tests/ref/fate/filter-pixdesc-yuv420p9le
@@ -1 +1 @@
-pixdesc-yuv420p9le  73722053a27e8c5ef8aa407a2452c652
+pixdesc-yuv420p9le  eed25f5d0562d3158ae2f97589950ba9
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p b/tests/ref/fate/filter-pixdesc-yuv422p
index b49f995d84..d782585e80 100644
--- a/tests/ref/fate/filter-pixdesc-yuv422p
+++ b/tests/ref/fate/filter-pixdesc-yuv422p
@@ -1 +1 @@
-pixdesc-yuv422p     12b097c00dd1e526186d3d7dcba204bc
+pixdesc-yuv422p     81452c764f8da88d823c925d52cce322
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p10be b/tests/ref/fate/filter-pixdesc-yuv422p10be
index 1e8729476c..9e2779b867 100644
--- a/tests/ref/fate/filter-pixdesc-yuv422p10be
+++ b/tests/ref/fate/filter-pixdesc-yuv422p10be
@@ -1 +1 @@
-pixdesc-yuv422p10be f53e6d39e40e1ae35cc855716dda8dbc
+pixdesc-yuv422p10be 55c4d6699258c42444265aa8dae7720e
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p10le b/tests/ref/fate/filter-pixdesc-yuv422p10le
index d0d845d092..db31f7f88f 100644
--- a/tests/ref/fate/filter-pixdesc-yuv422p10le
+++ b/tests/ref/fate/filter-pixdesc-yuv422p10le
@@ -1 +1 @@
-pixdesc-yuv422p10le deab1e4f7f3907ffd06ec448cf142f3f
+pixdesc-yuv422p10le 8732c020f4401b757caa9e5616f426f2
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p12be b/tests/ref/fate/filter-pixdesc-yuv422p12be
index 8cfd917731..4c94151546 100644
--- a/tests/ref/fate/filter-pixdesc-yuv422p12be
+++ b/tests/ref/fate/filter-pixdesc-yuv422p12be
@@ -1 +1 @@
-pixdesc-yuv422p12be 470f5361088e1af7f6ae70945d411a25
+pixdesc-yuv422p12be a3119254cc1aa9893478faedf3b49b4f
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p12le b/tests/ref/fate/filter-pixdesc-yuv422p12le
index e457288969..6974e69386 100644
--- a/tests/ref/fate/filter-pixdesc-yuv422p12le
+++ b/tests/ref/fate/filter-pixdesc-yuv422p12le
@@ -1 +1 @@
-pixdesc-yuv422p12le dd79803aff3bf939c818304884341c17
+pixdesc-yuv422p12le 8d397de88edec1a85b5fbbe7bdce08ac
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p14be b/tests/ref/fate/filter-pixdesc-yuv422p14be
new file mode 100644
index 0000000000..50202f92ba
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-yuv422p14be
@@ -0,0 +1 @@
+pixdesc-yuv422p14be c9d0750d9b784ca43d279479372f3a3e
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p14le b/tests/ref/fate/filter-pixdesc-yuv422p14le
new file mode 100644
index 0000000000..a2ee82a1db
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-yuv422p14le
@@ -0,0 +1 @@
+pixdesc-yuv422p14le c8233b3c0fee4036ead0ac7a65489f69
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p16be b/tests/ref/fate/filter-pixdesc-yuv422p16be
index e09298c7ed..b09a4711f4 100644
--- a/tests/ref/fate/filter-pixdesc-yuv422p16be
+++ b/tests/ref/fate/filter-pixdesc-yuv422p16be
@@ -1 +1 @@
-pixdesc-yuv422p16be fddc6580ccbc42d1d2d4e40f44403c54
+pixdesc-yuv422p16be 1dddb5353eb5b2e99cb54707eb7b80a7
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p16le b/tests/ref/fate/filter-pixdesc-yuv422p16le
index eea2005d6d..c829162f0c 100644
--- a/tests/ref/fate/filter-pixdesc-yuv422p16le
+++ b/tests/ref/fate/filter-pixdesc-yuv422p16le
@@ -1 +1 @@
-pixdesc-yuv422p16le 37760ff26bcc46d7cae41be0f7aa7287
+pixdesc-yuv422p16le ba6cdf27c86b2dfdfaa29c394eea76cb
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p9be b/tests/ref/fate/filter-pixdesc-yuv422p9be
index 2b38cf0be3..fab8b9bd9c 100644
--- a/tests/ref/fate/filter-pixdesc-yuv422p9be
+++ b/tests/ref/fate/filter-pixdesc-yuv422p9be
@@ -1 +1 @@
-pixdesc-yuv422p9be  d29a3861d4fb85b1f14af82b6c098d10
+pixdesc-yuv422p9be  25929926226d191bc1c459e67546c6c8
diff --git a/tests/ref/fate/filter-pixdesc-yuv422p9le b/tests/ref/fate/filter-pixdesc-yuv422p9le
index 154abce700..9358181245 100644
--- a/tests/ref/fate/filter-pixdesc-yuv422p9le
+++ b/tests/ref/fate/filter-pixdesc-yuv422p9le
@@ -1 +1 @@
-pixdesc-yuv422p9le  77d1eb4547c7f1a22977924c154d049c
+pixdesc-yuv422p9le  1de20cc8c68751dbf3e8f2bd64f2ffd7
diff --git a/tests/ref/fate/filter-pixdesc-yuv440p b/tests/ref/fate/filter-pixdesc-yuv440p
index dd9a59c064..b2ef32399e 100644
--- a/tests/ref/fate/filter-pixdesc-yuv440p
+++ b/tests/ref/fate/filter-pixdesc-yuv440p
@@ -1 +1 @@
-pixdesc-yuv440p     7f3e289e7109a051379313933e6e430f
+pixdesc-yuv440p     155eec1fc346090dab79d25cf1a3902a
diff --git a/tests/ref/fate/filter-pixdesc-yuv440p10be b/tests/ref/fate/filter-pixdesc-yuv440p10be
new file mode 100644
index 0000000000..b3a49414b4
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-yuv440p10be
@@ -0,0 +1 @@
+pixdesc-yuv440p10be 3ad2b1fd9659be2f2f0a1d824c1bdede
diff --git a/tests/ref/fate/filter-pixdesc-yuv440p10le b/tests/ref/fate/filter-pixdesc-yuv440p10le
new file mode 100644
index 0000000000..99924dbfa1
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-yuv440p10le
@@ -0,0 +1 @@
+pixdesc-yuv440p10le 657aa6e83f5bcd91c1feab2c6d2db8e8
diff --git a/tests/ref/fate/filter-pixdesc-yuv440p12be b/tests/ref/fate/filter-pixdesc-yuv440p12be
new file mode 100644
index 0000000000..9c4db9ae7e
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-yuv440p12be
@@ -0,0 +1 @@
+pixdesc-yuv440p12be 3c1ae4bdffe084ad574eff46bd88d556
diff --git a/tests/ref/fate/filter-pixdesc-yuv440p12le b/tests/ref/fate/filter-pixdesc-yuv440p12le
new file mode 100644
index 0000000000..c2b6e53f20
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-yuv440p12le
@@ -0,0 +1 @@
+pixdesc-yuv440p12le ac9101bdea22b00dc24d4975935425bb
diff --git a/tests/ref/fate/filter-pixdesc-yuv444p b/tests/ref/fate/filter-pixdesc-yuv444p
index 2ef114a132..28bb87a075 100644
--- a/tests/ref/fate/filter-pixdesc-yuv444p
+++ b/tests/ref/fate/filter-pixdesc-yuv444p
@@ -1 +1 @@
-pixdesc-yuv444p     37edfdeae2a93c91209e806cd9e0ceee
+pixdesc-yuv444p     d8401af0780d85b75769571a07fa8538
diff --git a/tests/ref/fate/filter-pixdesc-yuv444p10be b/tests/ref/fate/filter-pixdesc-yuv444p10be
index 05c346ec0e..f6c2c20e55 100644
--- a/tests/ref/fate/filter-pixdesc-yuv444p10be
+++ b/tests/ref/fate/filter-pixdesc-yuv444p10be
@@ -1 +1 @@
-pixdesc-yuv444p10be df6bd44006a00116c4b805e0c83a98ba
+pixdesc-yuv444p10be 05f72cb93495d28ad032a54ad5b69cc5
diff --git a/tests/ref/fate/filter-pixdesc-yuv444p10le b/tests/ref/fate/filter-pixdesc-yuv444p10le
index 57c5161b26..e412cd155c 100644
--- a/tests/ref/fate/filter-pixdesc-yuv444p10le
+++ b/tests/ref/fate/filter-pixdesc-yuv444p10le
@@ -1 +1 @@
-pixdesc-yuv444p10le 94c579bd8e88f271cd193be222f93694
+pixdesc-yuv444p10le 8f34212f8f9b95c9266cf7cd62eeae3f
diff --git a/tests/ref/fate/filter-pixdesc-yuv444p12be b/tests/ref/fate/filter-pixdesc-yuv444p12be
index e8c1201985..832b2457ec 100644
--- a/tests/ref/fate/filter-pixdesc-yuv444p12be
+++ b/tests/ref/fate/filter-pixdesc-yuv444p12be
@@ -1 +1 @@
-pixdesc-yuv444p12be f20564006d137df0fc6bb7466fd0fc64
+pixdesc-yuv444p12be 24540e0c367e31a66f3ba40a6b847600
diff --git a/tests/ref/fate/filter-pixdesc-yuv444p12le b/tests/ref/fate/filter-pixdesc-yuv444p12le
index 9807ff074a..f29ad77690 100644
--- a/tests/ref/fate/filter-pixdesc-yuv444p12le
+++ b/tests/ref/fate/filter-pixdesc-yuv444p12le
@@ -1 +1 @@
-pixdesc-yuv444p12le 9d5db1a9354b62181e09aa93c1ffa19a
+pixdesc-yuv444p12le 15d9282fae68c44f17005e5eb15bc7e7
diff --git a/tests/ref/fate/filter-pixdesc-yuv444p14be b/tests/ref/fate/filter-pixdesc-yuv444p14be
new file mode 100644
index 0000000000..e138abd6aa
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-yuv444p14be
@@ -0,0 +1 @@
+pixdesc-yuv444p14be 682673e893053a3a3d61dacb5212112e
diff --git a/tests/ref/fate/filter-pixdesc-yuv444p14le b/tests/ref/fate/filter-pixdesc-yuv444p14le
new file mode 100644
index 0000000000..0c30509b69
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-yuv444p14le
@@ -0,0 +1 @@
+pixdesc-yuv444p14le 9e9edf45e52df28d1b74e032815ad17f
diff --git a/tests/ref/fate/filter-pixdesc-yuv444p16be b/tests/ref/fate/filter-pixdesc-yuv444p16be
index c8f19f4442..c79078000b 100644
--- a/tests/ref/fate/filter-pixdesc-yuv444p16be
+++ b/tests/ref/fate/filter-pixdesc-yuv444p16be
@@ -1 +1 @@
-pixdesc-yuv444p16be 8172616c2590bfe95fb3115684b3bf06
+pixdesc-yuv444p16be 5cea1d7afdc3d7b47043947eb61de666
diff --git a/tests/ref/fate/filter-pixdesc-yuv444p16le b/tests/ref/fate/filter-pixdesc-yuv444p16le
index f4402bf83f..5b5e1f2e99 100644
--- a/tests/ref/fate/filter-pixdesc-yuv444p16le
+++ b/tests/ref/fate/filter-pixdesc-yuv444p16le
@@ -1 +1 @@
-pixdesc-yuv444p16le 0cb500e7313e15513c5510edae51d46c
+pixdesc-yuv444p16le 4fbf077117a0cadf4d277e99ebf254d6
diff --git a/tests/ref/fate/filter-pixdesc-yuv444p9be b/tests/ref/fate/filter-pixdesc-yuv444p9be
index ad8ed8b0e7..9500abdebd 100644
--- a/tests/ref/fate/filter-pixdesc-yuv444p9be
+++ b/tests/ref/fate/filter-pixdesc-yuv444p9be
@@ -1 +1 @@
-pixdesc-yuv444p9be  6410ac29a501711ac3d7485adbee0736
+pixdesc-yuv444p9be  d59a020d35a4434d5904effdfa70ca69
diff --git a/tests/ref/fate/filter-pixdesc-yuv444p9le b/tests/ref/fate/filter-pixdesc-yuv444p9le
index dcf05e95bb..1a31ab65c7 100644
--- a/tests/ref/fate/filter-pixdesc-yuv444p9le
+++ b/tests/ref/fate/filter-pixdesc-yuv444p9le
@@ -1 +1 @@
-pixdesc-yuv444p9le  ed579c47f3a0cdb481a886e2b3192c42
+pixdesc-yuv444p9le  d6b9667d8bc7aab7fa5d27540c65010d
diff --git a/tests/ref/fate/filter-pixdesc-yuva420p b/tests/ref/fate/filter-pixdesc-yuva420p
index 49d5485dae..9b60dfb901 100644
--- a/tests/ref/fate/filter-pixdesc-yuva420p
+++ b/tests/ref/fate/filter-pixdesc-yuva420p
@@ -1 +1 @@
-pixdesc-yuva420p    43d7123392af51a8716447a7dd69608b
+pixdesc-yuva420p    3f4612e9436065a77a40945a71fdc0b8
diff --git a/tests/ref/fate/filter-pixdesc-yuva420p10be b/tests/ref/fate/filter-pixdesc-yuva420p10be
index 6ed19b1fd0..75526a765f 100644
--- a/tests/ref/fate/filter-pixdesc-yuva420p10be
+++ b/tests/ref/fate/filter-pixdesc-yuva420p10be
@@ -1 +1 @@
-pixdesc-yuva420p10beb3d4763eae9de728a4e10ddc89a18cf6
+pixdesc-yuva420p10beeea756629ceb059a9368899ebe8623d7
diff --git a/tests/ref/fate/filter-pixdesc-yuva420p10le b/tests/ref/fate/filter-pixdesc-yuva420p10le
index d4f21a0774..d60dc0ba0d 100644
--- a/tests/ref/fate/filter-pixdesc-yuva420p10le
+++ b/tests/ref/fate/filter-pixdesc-yuva420p10le
@@ -1 +1 @@
-pixdesc-yuva420p10leaa8d76f2871dc8f9a20919a2f13688ec
+pixdesc-yuva420p10leca41b24346d7b71baff040d8e05d1c99
diff --git a/tests/ref/fate/filter-pixdesc-yuva420p16be b/tests/ref/fate/filter-pixdesc-yuva420p16be
index 077eab5697..1d5b5c59e1 100644
--- a/tests/ref/fate/filter-pixdesc-yuva420p16be
+++ b/tests/ref/fate/filter-pixdesc-yuva420p16be
@@ -1 +1 @@
-pixdesc-yuva420p16beaba97863a5e670a2a6b772cf82940e04
+pixdesc-yuva420p16be62309264f29a79ffe2c7e224a49afb10
diff --git a/tests/ref/fate/filter-pixdesc-yuva420p16le b/tests/ref/fate/filter-pixdesc-yuva420p16le
index 3fb3a2e260..144b7b0630 100644
--- a/tests/ref/fate/filter-pixdesc-yuva420p16le
+++ b/tests/ref/fate/filter-pixdesc-yuva420p16le
@@ -1 +1 @@
-pixdesc-yuva420p16leb1680b05ce69447bdc53dec154addc0a
+pixdesc-yuva420p16le8e3f544099b9b92421fae4147bb64892
diff --git a/tests/ref/fate/filter-pixdesc-yuva420p9be b/tests/ref/fate/filter-pixdesc-yuva420p9be
index 1004d313f9..5e1b048b44 100644
--- a/tests/ref/fate/filter-pixdesc-yuva420p9be
+++ b/tests/ref/fate/filter-pixdesc-yuva420p9be
@@ -1 +1 @@
-pixdesc-yuva420p9be 3c9ce8191c1510b35fee892ad15d39b9
+pixdesc-yuva420p9be daadd46290d54a592bb1c0e657001e06
diff --git a/tests/ref/fate/filter-pixdesc-yuva420p9le b/tests/ref/fate/filter-pixdesc-yuva420p9le
index 8ed1daff22..8e8fda2a56 100644
--- a/tests/ref/fate/filter-pixdesc-yuva420p9le
+++ b/tests/ref/fate/filter-pixdesc-yuva420p9le
@@ -1 +1 @@
-pixdesc-yuva420p9le 1955fb115953284ea0ecdc0d4b10e0ae
+pixdesc-yuva420p9le e417b7c2a5d18768dd42f44c50a67a47
diff --git a/tests/ref/fate/filter-pixdesc-yuva422p b/tests/ref/fate/filter-pixdesc-yuva422p
index df5a856760..ad0c619432 100644
--- a/tests/ref/fate/filter-pixdesc-yuva422p
+++ b/tests/ref/fate/filter-pixdesc-yuva422p
@@ -1 +1 @@
-pixdesc-yuva422p    639ce1131de9b362d18b3dc7f871c1ae
+pixdesc-yuva422p    1faf18b3fef6c3792d8e2f1ac6e7490a
diff --git a/tests/ref/fate/filter-pixdesc-yuva422p10be b/tests/ref/fate/filter-pixdesc-yuva422p10be
index 601e66f2c5..d3ffa81fa6 100644
--- a/tests/ref/fate/filter-pixdesc-yuva422p10be
+++ b/tests/ref/fate/filter-pixdesc-yuva422p10be
@@ -1 +1 @@
-pixdesc-yuva422p10bec797caa09ee483d6cc0b06eac7fc606b
+pixdesc-yuva422p10be48269e4c136138ebf989f3829b636136
diff --git a/tests/ref/fate/filter-pixdesc-yuva422p10le b/tests/ref/fate/filter-pixdesc-yuva422p10le
index 9b4b1c39dc..59cd80ce83 100644
--- a/tests/ref/fate/filter-pixdesc-yuva422p10le
+++ b/tests/ref/fate/filter-pixdesc-yuva422p10le
@@ -1 +1 @@
-pixdesc-yuva422p10le61a6339e7321972ee6f45428bd55a8f3
+pixdesc-yuva422p10le1e9a7ea03647cb6d8f5a4cb3085124e3
diff --git a/tests/ref/fate/filter-pixdesc-yuva422p16be b/tests/ref/fate/filter-pixdesc-yuva422p16be
index 1c651d1de3..fbcbaf779d 100644
--- a/tests/ref/fate/filter-pixdesc-yuva422p16be
+++ b/tests/ref/fate/filter-pixdesc-yuva422p16be
@@ -1 +1 @@
-pixdesc-yuva422p16be01381b27508afbca57241d7431da7ba9
+pixdesc-yuva422p16be3ed898fd49bb4210a1c204a555c63997
diff --git a/tests/ref/fate/filter-pixdesc-yuva422p16le b/tests/ref/fate/filter-pixdesc-yuva422p16le
index 1f1f1d3c17..ebadc1b220 100644
--- a/tests/ref/fate/filter-pixdesc-yuva422p16le
+++ b/tests/ref/fate/filter-pixdesc-yuva422p16le
@@ -1 +1 @@
-pixdesc-yuva422p16lef5c8d306a099d594749ddebeb279b259
+pixdesc-yuva422p16led3ca3020575d91f2a9bf27eaf3c9bce6
diff --git a/tests/ref/fate/filter-pixdesc-yuva422p9be b/tests/ref/fate/filter-pixdesc-yuva422p9be
index ff6514cab4..6f2e248040 100644
--- a/tests/ref/fate/filter-pixdesc-yuva422p9be
+++ b/tests/ref/fate/filter-pixdesc-yuva422p9be
@@ -1 +1 @@
-pixdesc-yuva422p9be eb35d12008a9dce4ff860951ded90edb
+pixdesc-yuva422p9be a9da61fa1aecb8c8f55eff08a89f8f4d
diff --git a/tests/ref/fate/filter-pixdesc-yuva422p9le b/tests/ref/fate/filter-pixdesc-yuva422p9le
index 22003df83d..7414ca1bea 100644
--- a/tests/ref/fate/filter-pixdesc-yuva422p9le
+++ b/tests/ref/fate/filter-pixdesc-yuva422p9le
@@ -1 +1 @@
-pixdesc-yuva422p9le e97bd27f580cd46ee3feb2ba3c8c057d
+pixdesc-yuva422p9le bd427a5fd70aa2e07aa5869dcd9d7d17
diff --git a/tests/ref/fate/filter-pixdesc-yuva444p b/tests/ref/fate/filter-pixdesc-yuva444p
index 56bc201812..a2b8c01fe6 100644
--- a/tests/ref/fate/filter-pixdesc-yuva444p
+++ b/tests/ref/fate/filter-pixdesc-yuva444p
@@ -1 +1 @@
-pixdesc-yuva444p    d78d51ee6286394b1f1839dd74d68861
+pixdesc-yuva444p    7ce64f043f8d3658c7c627d2163ad19f
diff --git a/tests/ref/fate/filter-pixdesc-yuva444p10be b/tests/ref/fate/filter-pixdesc-yuva444p10be
index 89df14f6cb..737b49cbe2 100644
--- a/tests/ref/fate/filter-pixdesc-yuva444p10be
+++ b/tests/ref/fate/filter-pixdesc-yuva444p10be
@@ -1 +1 @@
-pixdesc-yuva444p10be32f40553f2d8d771561d4f6f8514e1e8
+pixdesc-yuva444p10beadba33abe66edb10474ca6e81a05b5aa
diff --git a/tests/ref/fate/filter-pixdesc-yuva444p10le b/tests/ref/fate/filter-pixdesc-yuva444p10le
index cb4b6634aa..3737a367e0 100644
--- a/tests/ref/fate/filter-pixdesc-yuva444p10le
+++ b/tests/ref/fate/filter-pixdesc-yuva444p10le
@@ -1 +1 @@
-pixdesc-yuva444p10le1bb71c784b65cdcb06408a37c2fa2eef
+pixdesc-yuva444p10lea649ca6173037030cae3d21936d3b19d
diff --git a/tests/ref/fate/filter-pixdesc-yuva444p16be b/tests/ref/fate/filter-pixdesc-yuva444p16be
index a9bffff95b..fb26bb2017 100644
--- a/tests/ref/fate/filter-pixdesc-yuva444p16be
+++ b/tests/ref/fate/filter-pixdesc-yuva444p16be
@@ -1 +1 @@
-pixdesc-yuva444p16beb52b5efbad264a6a8aa7280234e0c9d6
+pixdesc-yuva444p16bede8077bfb08bc61284b23db5d524563b
diff --git a/tests/ref/fate/filter-pixdesc-yuva444p16le b/tests/ref/fate/filter-pixdesc-yuva444p16le
index 249090cd57..6182e4cabc 100644
--- a/tests/ref/fate/filter-pixdesc-yuva444p16le
+++ b/tests/ref/fate/filter-pixdesc-yuva444p16le
@@ -1 +1 @@
-pixdesc-yuva444p16le54d4ab00bb5a0e7228a974d27b59285c
+pixdesc-yuva444p16lecf80d3441689eca8cd5fe007c4091c35
diff --git a/tests/ref/fate/filter-pixdesc-yuva444p9be b/tests/ref/fate/filter-pixdesc-yuva444p9be
index 041a57bcf4..7a6ec9f934 100644
--- a/tests/ref/fate/filter-pixdesc-yuva444p9be
+++ b/tests/ref/fate/filter-pixdesc-yuva444p9be
@@ -1 +1 @@
-pixdesc-yuva444p9be 0139f53dd39f1538648c5be2f38fb3ed
+pixdesc-yuva444p9be 0f5d25349e3fd1e0580300b3a36724ac
diff --git a/tests/ref/fate/filter-pixdesc-yuva444p9le b/tests/ref/fate/filter-pixdesc-yuva444p9le
index 71e449036c..579c1f6415 100644
--- a/tests/ref/fate/filter-pixdesc-yuva444p9le
+++ b/tests/ref/fate/filter-pixdesc-yuva444p9le
@@ -1 +1 @@
-pixdesc-yuva444p9le 6f16075ddc120457eef912beb20ed546
+pixdesc-yuva444p9le 46e052f61b8cebd4b016836857f54b39
diff --git a/tests/ref/fate/filter-pixdesc-yuvj411p b/tests/ref/fate/filter-pixdesc-yuvj411p
new file mode 100644
index 0000000000..5dfc0dc4cd
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-yuvj411p
@@ -0,0 +1 @@
+pixdesc-yuvj411p    cac93399031ad86e8de0796b60b5bb8a
diff --git a/tests/ref/fate/filter-pixdesc-yuvj420p b/tests/ref/fate/filter-pixdesc-yuvj420p
index d31bdfc3d4..ad2f968a1f 100644
--- a/tests/ref/fate/filter-pixdesc-yuvj420p
+++ b/tests/ref/fate/filter-pixdesc-yuvj420p
@@ -1 +1 @@
-pixdesc-yuvj420p    6cb083afe6e0b54ba9753744194ca765
+pixdesc-yuvj420p    5244374882cf07c3cbcde71940caf8e5
diff --git a/tests/ref/fate/filter-pixdesc-yuvj422p b/tests/ref/fate/filter-pixdesc-yuvj422p
index 1480ae5088..5f80d585d6 100644
--- a/tests/ref/fate/filter-pixdesc-yuvj422p
+++ b/tests/ref/fate/filter-pixdesc-yuvj422p
@@ -1 +1 @@
-pixdesc-yuvj422p    6b2dfa7e50dfe279cd73eeaf9b767dc0
+pixdesc-yuvj422p    6c9722aa9e0c1b8f9d953efeb93dc318
diff --git a/tests/ref/fate/filter-pixdesc-yuvj440p b/tests/ref/fate/filter-pixdesc-yuvj440p
index 480017f823..c98669285b 100644
--- a/tests/ref/fate/filter-pixdesc-yuvj440p
+++ b/tests/ref/fate/filter-pixdesc-yuvj440p
@@ -1 +1 @@
-pixdesc-yuvj440p    278317b4ff8b272b22465481d3673a7c
+pixdesc-yuvj440p    34e6e86ca3ec4e6ef62d533aa2290e8f
diff --git a/tests/ref/fate/filter-pixdesc-yuvj444p b/tests/ref/fate/filter-pixdesc-yuvj444p
index 5f6c301466..3e182fa6e2 100644
--- a/tests/ref/fate/filter-pixdesc-yuvj444p
+++ b/tests/ref/fate/filter-pixdesc-yuvj444p
@@ -1 +1 @@
-pixdesc-yuvj444p    a56b1f49af0a7a42794d92bea3eca9c9
+pixdesc-yuvj444p    f67694103bb42d74742918adf9ea31c5
diff --git a/tests/ref/fate/filter-pixdesc-yuyv422 b/tests/ref/fate/filter-pixdesc-yuyv422
index 434a880e72..334aa2d500 100644
--- a/tests/ref/fate/filter-pixdesc-yuyv422
+++ b/tests/ref/fate/filter-pixdesc-yuyv422
@@ -1 +1 @@
-pixdesc-yuyv422     d154fdb0bd0258f1a0cdeaaaefa21581
+pixdesc-yuyv422     edb8aa7b424e4d810ed500fd1ea0268b
diff --git a/tests/ref/fate/filter-pixdesc-yvyu422 b/tests/ref/fate/filter-pixdesc-yvyu422
index cac9726d5a..f23eb87aae 100644
--- a/tests/ref/fate/filter-pixdesc-yvyu422
+++ b/tests/ref/fate/filter-pixdesc-yvyu422
@@ -1 +1 @@
-pixdesc-yvyu422     24f0a489853ededa47cd7386c116fb3f
+pixdesc-yvyu422     f8ac718bb6a56ccd9ab91c68d01986de
diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy
index bd16f11075..124dddeacb 100644
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@@ -1,103 +1,141 @@
-abgr                1250387304351fea5cc57b232bc0a5e5
-argb                ee5a1e2e2d4dbd2cd978d6e3bf8dee70
-bgr24               437ea8de747009d73f41af120f0360ad
-bgr444be            0a9b7c91c6f50c0ed2633aebd19d7326
-bgr444le            f032368a3134918e6802922e4cde7baf
-bgr48be             bf24403f14d4085f970475dd17a9edcd
-bgr48le             1db5661da851a44dd5b92f8dd5a0ec84
-bgr4_byte           2bf8e7fbf1179ba0543cb42d2d8a5308
-bgr555be            b8b23bcfa9a850d46850d59662e6eba8
-bgr555le            d72c90906cb4df818abb37fb07a67d01
-bgr565be            0fcba91cb4c55a458271173cb26e649d
-bgr565le            6a0d182c7165103b2613d1805c822f9f
-bgr8                36b9ef72c87da36ac547202d85a5805f
-bgra                56e6e1bfde40aaa27473e01b46345c82
-gbrap               57cb1a02d6f015a4329fe367f3bdfe49
-gbrap12be           df4b550099df0702f602a8b305702a8c
-gbrap12le           f947c43e494ab87410dfb2547e7e22f2
-gbrp                d5f73b5d3ba7f6cadbc9b4ecbc161005
-gbrp10be            eb19bda60ab7f893198364dff21342d6
-gbrp10le            546146efb36ad2605e9f74ee5e4c2a36
-gbrp12be            3a7dd35686a7ca85cc58c44d0c5c4e96
-gbrp12le            654861b1837d312569395f598da1a2a1
-gbrp9be             cbe1bf8ead497a92362a749bd4b0a57e
-gbrp9le             f88c68df5d699a4a7f1b0152df9f25fe
-gray                8c941e9bbf6da5336384c57f15a4a454
-gray12be            aecffce8ea67ab93527dc74c1a523454
-gray12le            eac4b15c8686f04ea73751294f40b8e0
-gray16be            43bda75c197b0d59a9b87ee941553644
-gray16le            a4ea1369ef1efff0e1341a1dc42dbfdf
-monob               e13b2cbfb93d3ed6fdc1f256662ea959
-monow               87a594c125f52af67dc1dd51d800ff31
-nv12                a0b3578ec9b28be3d6e66479df8b1995
-nv21                a9318dc58dc14b9931a00ea6cedea849
-rgb24               fc0c7ce1d5d6be1b89d4471542785508
-rgb444be            cc479f17c73cd50d65475a1644c5053f
-rgb444le            c98bc1811d29a86471357cb2358e5a30
-rgb48be             1e2a176dadf246e376932a20303ca572
-rgb48le             57fd6d93cda99070acc4213b6958fe70
-rgb4_byte           e4dcdc9adddcb3958ddd0ea3b0896140
-rgb555be            8fd499c9a6d98414ab2803ae08698651
-rgb555le            a9b93f8b61e52eac76aca392dc3ebd81
-rgb565be            a8c6c7817f80c8a0cee9918c3748e00c
-rgb565le            510a4ce796d7cb11aba5b25b419cdf3b
-rgb8                2e53d27e93554f874986fbba4f9d6354
-rgba                ed87fc4907951608893b421624716f9b
-uyvy422             deb3625b67a8d2a51c17a322ad2021ba
-yuv410p             dec949ce1d8a5f7bb1aa7640f97e05eb
-yuv411p             fc2f303b20ae610dce86dae4a6671881
-yuv420p             a2117c3c5d4533dca311dc94a3d157bc
-yuv420p10be         7756ef359f79d63ef6f983caeaba5c51
-yuv420p10le         aa8abcc05010b4b0df7d924fd5887291
-yuv420p12be         f93fea0e8e10e9f2d006e8f8be5b8938
-yuv420p12le         5d2810e2112328dd88ffddfb486df060
-yuv420p16be         7a708532d8ac26d598ac7332e38dd2de
-yuv420p16le         6b868d3b0c44c6b04f39415890d6ee0b
-yuv420p9be          11ffb289661f4f55347d60e99dcef632
-yuv420p9le          a0c9608b2be3ca6d4e8cf625714a3833
-yuv422p             b082344038849f5fd444ccf2a30e3f4f
-yuv422p10be         43a6293e138d0ecfd3385df3dcf9b713
-yuv422p10le         74da030a4efb5a20986fcead50018f4d
-yuv422p12be         d60480c872d6723e587199ee4ecfe86d
-yuv422p12le         2cbf87d44e9c897ec6460225d47efbda
-yuv422p16be         f7a0fb9e82805660317d07209e726100
-yuv422p16le         12eeb2f95bb0d655d52e8eed1cfbf771
-yuv422p9be          60daf1a7e61434b244c5a43f4449b617
-yuv422p9le          4c4885c48812f5ac0916a9509ba84345
-yuv440p             12000ce709b38aac3f7b7f59b07847ef
-yuv444p             628c9d1e10c22e0e512b27c0e03b46e6
-yuv444p10be         b60d77db54a592ed088ebf7964e2dd5e
-yuv444p10le         1752a238eb27fb7c746e349536f60686
-yuv444p12be         be54f88f9b9034b5b9bc466132bfba10
-yuv444p12le         714c3c5789897b56cb9ae6a45688e395
-yuv444p16be         8e1e2f04cb2e97f80fdfecbb2c5679a0
-yuv444p16le         5677b2caa63e0c075eac6937b03cf2a6
-yuv444p9be          5ab55576b180b2966e9ed5a1ea55508a
-yuv444p9le          3d9b69b8d6e17f2d25ce92602688bcc8
-yuva420p            9e9889ad7837b0d0dde023bf931ed639
-yuva420p10be        ff20f57da08f79e44e7b603e89b18d74
-yuva420p10le        a2dcfa563602232d999a19b7ae272131
-yuva420p16be        63bd8a57eedfc58e8e6319913ee1064c
-yuva420p16le        797dc4ff3a9a3f36cb84ddd808a1c04a
-yuva420p9be         d2de221d375fea605a9f81c9e0fd3661
-yuva420p9le         0dd82737677f2b604a0aaa638e65f64a
-yuva422p            375465ec39a82221a4a502e92bf0453f
-yuva422p10be        81144a6638bc34bd9e6790977159a754
-yuva422p10le        b30c735f71275004d2d7d78ec647fd5b
-yuva422p16be        b7641ec1896f306065073f0348448f19
-yuva422p16le        3ab82ddf757a78f0184c01aa0259fc42
-yuva422p9be         dd2a4affd2140d945c88c545cbd15794
-yuva422p9le         a7a00cf6c696e8e94ce62576dbb28527
-yuva444p            8031aee1a4a13d679e3fa960b70e27c7
-yuva444p10be        62dc7423df2a90da591e313dea0f72b0
-yuva444p10le        e45e36e79e39e1ed300fc93bc20a2232
-yuva444p16be        c2321be5e7184b874cf4e16fff959179
-yuva444p16le        107836d19b0735f225eb7d97da98fd49
-yuva444p9be         d8ba268bef3cf8d2dbd57a65b49be6db
-yuva444p9le         f4589d40b7514e021ec7096003907ef7
-yuvj420p            9ba65711dfe07d3078b5b874b49240fb
-yuvj422p            05873ba9f14597ded3d4a2f6e1cd7e5c
-yuvj440p            d76a421f62d692c664cbb2d1727e77d2
-yuvj444p            787e53351113065777bd1061ddb04834
-yuyv422             48d652c76bbdebec0bf7842578b39c53
-yvyu422             b0364ee13bd574d01b23a0809e6ddca9
+0bgr                4060279c35dd8810a2f55a021b836557
+0rgb                527ef3d164c8fd0700493733959689c2
+abgr                023ecf6396d324edb113e4a483b79ba2
+argb                f003b555ef429222005d33844cca9325
+ayuv64le            07b9c969dfbe4add4c0626773b151d4f
+bgr0                6fcd67c8e6cec723dab21c70cf53dc16
+bgr24               4cff3814819f02ecf5824edfd768d2b1
+bgr444be            1cd47c1555f947dfcba99192e3429d20
+bgr444le            e1832fdc9b118d4440ba03cea6e30428
+bgr48be             51477f029592ddb6b912980fdf2df7f1
+bgr48le             b34faf404b33c74cd25f5f912ca3274c
+bgr4_byte           7ca99bc8a1c7c831cb955806ac05cb72
+bgr555be            6d32031ad4f52723023e547058a62c71
+bgr555le            823a3b2f2585e537da5cb76c8ce30cf4
+bgr565be            438b0f18fd754280d5dc2f421c376ffb
+bgr565le            acab2b65c0fe5f9618c90f77f70ab3be
+bgr8                898a66734bda0572dfab1edd8239f6a2
+bgra                3934fb81a602dfa7d29420b1a66f0fd8
+bgra64be            c8d3217bf58d34f080ac88c0b0012c77
+bgra64le            b71d75a928aac14cb768403e6f6a9910
+gbrap               98d30987407c51e5620921e11d40a4ff
+gbrap10be           edcffb185e44b6dae5c2ead5505b7125
+gbrap10le           2a7392e14b21b1f9457526a071236a6d
+gbrap12be           0c4c1f8af361571265ca259d5f70f026
+gbrap12le           5f1d8c663d4c28863e687192433b34a4
+gbrap16be           e4edca4361d643794034e5aa9ef290b1
+gbrap16le           9a95b389d2bf556179e8f4b27fb550ab
+gbrp                5fbc319e30110d19d539f5b274eddb6d
+gbrp10be            703a17591a2a5c236675c5101c349bcc
+gbrp10le            ee014153f55c011918df5b2394815780
+gbrp12be            527d337eb5813ebba7cf969ee660d423
+gbrp12le            fd192920b171a0cf88d61e8310e95d81
+gbrp14be            46d502db6dc5eb7e9da3c60016b2df91
+gbrp14le            1607f5c8f13360b53b8186f523996b1b
+gbrp16be            7b6764a504c853b09f5c7d0b2223c5a4
+gbrp16le            fb9323a5bd060282bec7bfd7d38dc230
+gbrp9be             a4dc6f6f9bb051de2dc348b592ad4282
+gbrp9le             699da3a3b324f3fd001a56aee9683384
+gray                188590b1231afd231ea910815aef2b25
+gray10be            d486558ecd2e27afc17930be861f0e4c
+gray10le            917d687103b2adcca7132bfc070ca54a
+gray12be            9685614450f1282be433d2b07234ca1f
+gray12le            2700bd7fb3fea56e54eb03e31d6d4e57
+gray16be            08d997a3faa25a3db9d6be272d282eef
+gray16le            df65eb804360795e3e38a2701fa9641a
+gray9be             6382a14594a8b68f0ec7de25531f9334
+gray9le             4eb1dda58706436e3b69aef29b0089db
+monob               8b04f859fee6a0be856be184acd7a0b5
+monow               54d16d2c01abfd72ecdb5e51e283937c
+nv12                8e24feb2c544dc26a20047a71e4c27aa
+nv21                335d85c9af6110f26ae9e187a82ed2cf
+p010be              7f9842d6015026136bad60d03c035cc3
+p010le              c453421b9f726bdaf2bacf59a492c43b
+pal8                ff5929f5b42075793b2c34cb441bede5
+rgb0                0de71e5a1f97f81fb51397a0435bfa72
+rgb24               f4438057d046e6d98ade4e45294b21be
+rgb444be            115e5259b91f4a416546b09570347633
+rgb444le            f3f66689cb4c810563fba7665c526800
+rgb48be             18127d8ec64aa21619ada80b93514906
+rgb48le             60d0ba0e5a429c947aaa736be54aca87
+rgb4_byte           7d68393a3de6f392cf2ed05ffaec6259
+rgb555be            f76c8109974636b54bd0cb4c36bb883d
+rgb555le            21daf4d05999ccf3eef7d492e73c4d5b
+rgb565be            85711f35f71340ba23e553a07d246656
+rgb565le            e04771e79a8ee8a51e9a325540e6215e
+rgb8                7ac6008c84d622c2fc50581706e17576
+rgba                b6e1b441c365e03b5ffdf9b7b68d9a0c
+rgba64be            ae2ae04b5efedca3505f47c4dd6ea6ea
+rgba64le            b91e1d77f799eb92241a2d2d28437b15
+uyvy422             3bcf3c80047592f2211fae3260b1b65d
+xyz12be             a1ef56bf746d71f59669c28e48fc8450
+xyz12le             831ff03c1ba4ef19374686f16a064d8c
+ya8                 dbb99fbcdc204aaa1a7397ff561f1a67
+yuv410p             5d4d992a7728431aa4e0700f87fb7fd8
+yuv411p             7e1300e89f5bc07939e2c4a6acbdf267
+yuv420p             a014c7eb7a8385d1dd092b7a583f1bff
+yuv420p10be         f9b154364efaa1af376fa6d8eeae6955
+yuv420p10le         15c83294ef560d57f25d16ae6e0fc70c
+yuv420p12be         34da9c4e289124122ba36a9d4fb133fa
+yuv420p12le         c19a477a07fcf88e37ab37b416d064c0
+yuv420p14be         64779858686946fc0e780baf7c1391b6
+yuv420p14le         c1d012a4f9d54fbc8b04fea96d85e903
+yuv420p16be         268b07358d8dc733ee81d0b87990d5af
+yuv420p16le         dae8da9edd4255051e3e546ae7ed9bd3
+yuv420p9be          37f0476e8458a93d3d22db568f617aca
+yuv420p9le          83a6d32c91c15a3bc334bb9abf920654
+yuv422p             74f8006b4482db104f1986f49807a0af
+yuv422p10be         7291903c3c0cf4e5456dd9673a619f1d
+yuv422p10le         14cbaa728e888534359b9dddc5430f08
+yuv422p12be         e9bc7f2da217fade40feb6960dcd894e
+yuv422p12le         8d8184e4d0f1eb50e1834ac0c4af8c33
+yuv422p14be         2617c569ae9659d8fe6a01f96e2c9657
+yuv422p14le         7d01363cf090306cf93337c474cd8827
+yuv422p16be         86147d8bfb795ab1873c899611e2a361
+yuv422p16le         9df47cb7d6d39b335a547ced2865e72e
+yuv422p9be          338dbb97c9f5a12ccea2c61774ddff2e
+yuv422p9le          0822f8af35a269a036ae44878acba87e
+yuv440p             98d0f96fdb3ba415899017adf7d4a4f9
+yuv440p10be         d874167042037c1daf9b9a2f74bffad9
+yuv440p10le         3cfbd921369aa8f1e4977efdb7f44c8c
+yuv440p12be         dc3e6a40c44d5a5f9fd260b270e9037f
+yuv440p12le         2fff7746ae7c07d407075c0e372baf46
+yuv444p             8f90fb3a757878c545a8bfe5d19a9bab
+yuv444p10be         6683d5cb82c708d5f3a2a89d0311f7a4
+yuv444p10le         6d736fa464ff2de2b07e0a56af8444b7
+yuv444p12be         04320ad158450ee158f84a27c6325702
+yuv444p12le         08a81b2ea9c7c8b447e40ef8f4a46a4a
+yuv444p14be         ea3057d469d0c49c24e844256ef7871e
+yuv444p14le         940f5908ccf06e01411f0a7bddb45c6a
+yuv444p16be         aee24ab2e9a4656f889399f1b0d98639
+yuv444p16le         781c22317c02b3dd4225709000bdb847
+yuv444p9be          ac09917e5d2abc82c0d260007f4dfd77
+yuv444p9le          caef947b8aff5b52285385c6ae9b2439
+yuva420p            b227672e56215e184e702c02a771d7f3
+yuva420p10be        f66e7d677625380f7504867fab51305c
+yuva420p10le        01e94ee605714396e69b013c11dda348
+yuva420p16be        76e5e65eae1e7c5681a397a3462f4a9d
+yuva420p16le        b1930ab28ffe031c78ca28d3406311c8
+yuva420p9be         48dfa24cf0ea3864f35285074e8fa888
+yuva420p9le         0e9c9803aaaddc9f38e419de587793c2
+yuva422p            8f6bb778647e5dee62f544d646321171
+yuva422p10be        2f7204c93a1e5bfb04538852f99e4074
+yuva422p10le        c8082548aca999edde77ef2749b1ff4c
+yuva422p16be        427ad55f7464121bb3ce164641772bc6
+yuva422p16le        af6f8df651275de58129e010bb45ffcd
+yuva422p9be         47579cc2cea861ca1461589b80c4720f
+yuva422p9le         aaeab2bfe80a29390e8666103ed8bb40
+yuva444p            459fad5abfd16db9bb6a52761dc74cc1
+yuva444p10be        fa16bae4fc25429deb944ffa9f5b28a0
+yuva444p10le        92f820d3481b7ebcb48b98a73e7b4c90
+yuva444p16be        c80c1899789a6411d0025730efc8f01c
+yuva444p16le        2ed56ea50fafda4d226c9b133755dad8
+yuva444p9be         4903fde22b15d28da90761ac1cfcb1c5
+yuva444p9le         4eeb5988df0740fea720da1e31bbb829
+yuvj411p            e003eefa7e2a20f20d33767775417216
+yuvj420p            8f3d8f1b4577d11082d5ab8a901e048d
+yuvj422p            79d480e99e610112f266c833c6cb3d35
+yuvj440p            f4b18310c7174868fc92579f87460876
+yuvj444p            b161e6d5a941e2a4bb7bc56ef8af623f
+yuyv422             435c92283b538aa3d8fa2a020b0afd49
+yvyu422             8436c2a760291cc979e0dd62ab8cede0
diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop
index c42c620265..e21479ceb0 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -1,42 +1,136 @@
-abgr                5f70a21347bce16111a36fc41a117df8
-argb                35801018bb35dcb0ee31f66f0090b890
-bgr24               f9cc271089a5b560f29d9614f357c720
-bgr48be             8d957f7b11ed446dcea5f76c164f2368
-bgr48le             2a72cdae677d2c190b5beefd7e8a0e53
-bgr4_byte           8612d21fb5c353bdcf3eecb66a0bb0c3
-bgr555be            5c6c82ba788553cab28794c7c4707558
-bgr555le            326db2c29c70aef71b5d408dd6ca8c86
-bgr565be            035910ec94dbca6dae1e81f26852bcc3
-bgr565le            84dec346512486158c7d65299e62e924
-bgr8                e6d8896ccbe02c04d208bae55fc221c4
-bgra                cfc8cdc70ed29bc206dbc907495d0869
-gray                ccac69ad220529826be3d94d29157e8d
-gray16be            a8f761dc9e6dad62d1e4459eec9baf07
-gray16le            8b480306cb5584bc85fb51d1ea97b8f4
-rgb24               b85c0b1e6039a971bdef1d710bf7f8d3
-rgb48be             5ea361c8fbff68868e20385508b63181
-rgb48le             5966526796a37f871fd0831c41ddd3dc
-rgb4_byte           774ca7852d51ae52462b0360112e143f
-rgb555be            c4bd32793895432e6c2f1c4e2b6c4e94
-rgb555le            a320a2e210e4e9f1352ffa8af2793b27
-rgb565be            dc1440a7832c7ff781bbbd62dbadf6b1
-rgb565le            64f2ebebb02c2ac8eab2ed708c297fa4
-rgb8                ebc7118d01e82b77b8aeddb1f83a2872
-rgba                32bdb0cf19af40203515fd83c6cec8c8
-yuv410p             006e5b4735797ff0e7e3c7dd27660a8e
-yuv411p             894e368ed68876e357f095a8b2a7b3a7
-yuv420p             d9641cbe8436380d8505ddd695b0a7d2
-yuv420p16be         8b7ad840e9079a19da1bfed79a448847
-yuv420p16le         8827ee2f20ee18bae143b9b38b0f8622
-yuv422p             31277ec25cbb0c43eb57d4f29047a267
-yuv422p16be         49cdcc490b4e87a65eef88feacdb87d2
-yuv422p16le         e634bdf11b047f3641fb0de1eb0feb57
-yuv440p             f9340d3797c3b3446bc830e4e198d5be
-yuv444p             43bf7b75708d62f0f02fb3f6b8dd3bba
-yuv444p16be         8dc374395cd1f31e52609089c54c9908
-yuv444p16le         285df61fab70499218677c1eed4db448
-yuva420p            a8d2c50df5fe5808b7057727699640f3
-yuvj420p            cc464c6e15079539b907414b5aaa32e0
-yuvj422p            7ee6bd168e2ae34eabb6ae617f02739e
-yuvj440p            35a50b3b8ca637fbf5ad581fa742ad34
-yuvj444p            5dbd0537a42bedcf941fb27f74b54b69
+0bgr                8a83998de96327cb334538d7a265304e
+0rgb                974833c777e6abe6d84dc59af2ca5625
+abgr                1d21f5b8a20186ac9dd54459c986a2a7
+argb                8b822972049a1e207000763f2564d6e0
+ayuv64le            ab2f7bc8f150af47c42c778e3ea28bce
+bgr0                38a84849a9198667c348c686802e3b52
+bgr24               1dacd8e04bf0eff163e82250d01a9cc7
+bgr444be            e2d2b864dfa528e77684ddc117f2d974
+bgr444le            5f48e6dc70fdbf4ef6d651081f104a2f
+bgr48be             61b6a1a7c6d523b7e594f63790c7f032
+bgr48le             2b158ebcd483e03abea86c32abd21642
+bgr4_byte           441c4d66a344babfbbd3e4767413893b
+bgr555be            c5480b08d681d33ae29148054762bcfb
+bgr555le            500a2ed02aa57f7635125e6c983702db
+bgr565be            2d4a32d7e3d994b21c400ad008a5cdf0
+bgr565le            14ed3f499e83ccb0cdbfa0a457557880
+bgr8                142275ecc024d3f7b66c168ac2279ae2
+bgra                e66a5f68ba463cbc89fce23a61bb5203
+bgra64be            1ad8dd02714cafec793fb89577ddde47
+bgra64le            dd29ec9aba43aa3e8f9f5b9a93ca8831
+gbrap               188cd467fe7ae7d85ae9ca8bdfa07739
+gbrap10be           1880c4856d9cc6492b8b859f2711aaf1
+gbrap10le           c2b6e35f8b7ca363a7ec021ccdf31d1f
+gbrap12be           c9769d18733cdc2664d8b9af09a03f6d
+gbrap12le           3f80453c1ac6c5d1b2febf3ef141b476
+gbrap16be           21c98d0d7e7de2a93f9f095e5bb5c227
+gbrap16le           ea9a96870c1b742dd9f065c5db568184
+gbrp                ec671f573c2105072ab68a1933c58fee
+gbrp10be            6f0130a41f01e58593d3840446dd94b7
+gbrp10le            9c152b7dfb7ad7bc477518d97316d04f
+gbrp12be            561516202a6e37dd19543f9bb3af339f
+gbrp12le            3e7f87d834748844ab326e22eb2b7487
+gbrp14be            057232bca98c472a003cc46b3fd939e4
+gbrp14le            d4764dba3c3efd1263c2c8e0f5ac9f6a
+gbrp16be            59e4c27ee33520e23dbceafbec27aa9b
+gbrp16le            0768a2462783829f63ed0bfd53d01222
+gbrp9be             4af43999e5e9742992b6550ea5ad9b23
+gbrp9le             b4cbfa7878706a14295f09212e41f7fe
+gray                0d70b54b4b888ec4dbd89713620ac1ee
+gray10be            18ed76cab145ab9058cc353fcec6d3c4
+gray10le            fd83f7489880160783ddb125615b4638
+gray12be            472700c26cc49b8d5f74af141f6a0d38
+gray12le            4f6537fe1f32b3963350f8c435009433
+gray16be            38f599da990224de86e3dc7a543121a9
+gray16le            9ff7c866bd98def4e6c91542c1c45f80
+gray9be             8ffcb18d699480f55414bfc21ab33321
+gray9le             4d1932d4968a248584f5e39c25f1dd43
+nv12                92cda427f794374731ec0321ee00caac
+nv21                1bcfc197f4fb95de85ba58182d8d2f69
+p010be              8b2de2eb6b099bbf355bfc55a0694ddc
+p010le              373b50c766dfd0a8e79c9a73246d803a
+pal8                1f2cdc8e718f95c875dbc1034a688bfb
+rgb0                736646b70dd9a0be22b8da8041e35035
+rgb24               c5fbbf816bb2000f4d2914e335698ef5
+rgb444be            44a33306889f7fa1a71ec831b860fd0a
+rgb444le            934708063a8ecb93b46f6ab7e828419c
+rgb48be             39ef8f30c85bbb58433df9c085f158a1
+rgb48le             c92ee84f0952517a2830aa19166638a0
+rgb4_byte           847730fe0a7dc7fd99dd16599d6b828b
+rgb555be            39bb24bfcf01e379bd1653eb731ed21c
+rgb555le            e9f1e9fc4d0ef9fe18f1771b21d02dbc
+rgb565be            974ddb6347a700a75eec014311725aaa
+rgb565le            a0a2ce6d0907386f476364f9571ad3df
+rgb8                9b364a8f112ad9459fec47a51cc03b30
+rgba                9488ac85abceaf99a9309eac5a87697e
+rgba64be            89910046972ab3c68e2a348302cc8ca9
+rgba64le            fea8ebfc869b52adf353778f29eac7a7
+xyz12be             cb4571f9aaa7b59f999ef327276104b7
+xyz12le             cd6aae8d26b18bdb4b9d068586276d91
+ya8                 51a8dd297e35d40b06d3ebe8f4717895
+yuv410p             3bb6c7b64f2c46bc5e8b77198ce4ea58
+yuv411p             693e4afe96998e6dd91734037d75d887
+yuv420p             510d36163e4d3710988c23c2240ca6dc
+yuv420p10be         ce9af476d924b463b0f68579f30a6463
+yuv420p10le         65214f2af95e816bbe303fa0649ecc84
+yuv420p12be         f86f763eb2ae76d12226009e5f9595d7
+yuv420p12le         3741f6a4ccd368d0e9d00ecdebdde0c9
+yuv420p14be         5544e5fc40e718e608c0bd8c7b1d0812
+yuv420p14le         2c763a71c7c4650b91b405634556e21c
+yuv420p16be         c22f72b460beef22b0bf80806c43b25f
+yuv420p16le         564d26a52ed271792e8909f8aa9a3e87
+yuv420p9be          d0458179f9cc757a11ceb80655fde30e
+yuv420p9le          fe0215f5683437bd5a10b6255344109e
+yuv422p             42ea5e9a22df5913b2ec75512162e533
+yuv422p10be         3956017f5023ff5d56b4f814422dd711
+yuv422p10le         a5fa7cb6a21bcbb60ae3ba4a9f4e60e0
+yuv422p12be         3a7cdaa7671394aae514d60c529e099d
+yuv422p12le         3369b2b6eed18a450ab0a5581335e375
+yuv422p14be         845c42b333e331a556008ef0a16afc85
+yuv422p14le         abcdaccf8d01a9133daca94383d27db7
+yuv422p16be         565299a5d6265c77d00fd1a1d0173834
+yuv422p16le         a3fc398dd11644235e260f7e82cc87e6
+yuv422p9be          9d92f0bae2037bda1deaa70cc42998bc
+yuv422p9le          5e08f31583a6072dfc12c5ffaabedd88
+yuv440p             11786b7e8f8f45fdeafe841a258fe5fd
+yuv440p10be         7c47e76d0430f2a1de2a1bfd50221c97
+yuv440p10le         6e501e62a7f84748338cdf19b0186a19
+yuv440p12be         ab1c4c998c757b2e26d40575c5a6d0c9
+yuv440p12le         33c5cae9acde262b194efdf78ad44258
+yuv444p             28166fdead6f87f57f4c77156dce0466
+yuv444p10be         2c9b7f39c006b68d6b53791472ade1d5
+yuv444p10le         8427e65a1608ff8c5c88492f4926f6c1
+yuv444p12be         6e1f91ed1c6fc42fbc912d7d3aed0aca
+yuv444p12le         6a674498003ca57c8c2700b7d0ecb290
+yuv444p14be         bb07382a868b35875b771b37dd234605
+yuv444p14le         f8f6e6124bae7e95d0061b95bd64be66
+yuv444p16be         25b9244db531ccab7095a44b3115032d
+yuv444p16le         b537ff9b2ef601b8568ffef2fdc4281b
+yuv444p9be          770fae9f4bbb3b659a78e912ae7e0421
+yuv444p9le          764e317b46961236ad25fa174c3af5c6
+yuva420p            5fb8147030796ad0ebb4fadac776ca05
+yuva420p10be        f2127ce6fe956ee3a3b6c9b308c3bb9f
+yuva420p10le        080798ee8a995734fcb2d7238010e046
+yuva420p16be        ee90bc4624631b784dc8c9a68b72fbb0
+yuva420p16le        965dfd8e5f0e22bdd33fb2b7155eca22
+yuva420p9be         f4f93012c80c905a5885459aa2d29ef5
+yuva420p9le         abff60ecbe6e867949399710953bd1fc
+yuva422p            ad564e513a8c08ff0ec99324e204dfbd
+yuva422p10be        61c806e5e02ea4c90ad3156c90957a18
+yuva422p10le        41507ce136674ad458e562d44c67ddca
+yuva422p16be        3437cce47184e4b9a7a681831816e1ea
+yuva422p16le        0d534fcd61fc54fa9d4bbae5bde537ec
+yuva422p9be         588f72cd85285ed71a519525a947dedc
+yuva422p9le         d5a5d50f414caa1563700207931f0e0a
+yuva444p            64bd3debe7c2b8cca91bc1d6e2a8d80e
+yuva444p10be        1291045203be7d60b9015fa7e34b5716
+yuva444p10le        75865370fb0c018fb8663958bafcdc51
+yuva444p16be        f817caf234aaf5848b2bc9679582ed56
+yuva444p16le        b32ad623fc423f897ff31c4073ea2a6f
+yuva444p9be         48498d994c3c9070f31773e39da306dd
+yuva444p9le         431b0ac211a8f81c15f38fb57a73530c
+yuvj411p            241d393eeaa1517f6b4b23034222994b
+yuvj420p            35583968261c636b9c57ff03fd60eb54
+yuvj422p            c29a94439e96cd5dab7f65eb6dfc2f5c
+yuvj440p            8899d4ce717e32937d58a76df473ba7a
+yuvj444p            6c0d0ad629baaa96fe4dcb00f0f5d9de
diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field
new file mode 100644
index 0000000000..ba2af6e76f
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-field
@@ -0,0 +1,141 @@
+0bgr                8f34406a8e6f293b6468b6941d8944e6
+0rgb                e2c35753a2271d1f9455b1809bc0e907
+abgr                c0eb95959edf5d40ff8af315e62d0f8a
+argb                6dca4f2987b49b7d63f702d17bace630
+ayuv64le            d9836decca6323ba88b3b3d02257c0b6
+bgr0                1da3fdbac616b3b410d081e39ed7a1f6
+bgr24               573c76d77b1cbe6534ea7c0267dc1b13
+bgr444be            064887b4ca8f49cfb7c776057bc75c74
+bgr444le            adbbebc13a6a00db18a91086fe66e99f
+bgr48be             1516f1c0816ea22e1a7590b82b9762c7
+bgr48le             bce78fec940d8d22186418e42b5a4caf
+bgr4_byte           59d0a8b0ffd371ed645ef8a22304435d
+bgr555be            26371682da1569a7d979ce26096fc19c
+bgr555le            c31595e9ae64fcbd6147ef33b2899b28
+bgr565be            46e14950534befc7e791f65e66449bdd
+bgr565le            7f53bf9a2d3ab2badf50469e8a8e988e
+bgr8                47b2118262ad932cacf731cb66905ffd
+bgra                66d6e0846990fff0f09a07c43c3add71
+bgra64be            ec0bdef8663dc9d73818a48419cb4764
+bgra64le            9e2def541e51bc6e77fbffbff7fa146a
+gbrap               08a28b79dbd19246d1a94e3466af3624
+gbrap10be           29d46cbf021b233f5f1886e5d5fe21b4
+gbrap10le           4017c5d8c124438eb9aefa107db58d3b
+gbrap12be           e7f471132628b1c034199cc109b84bc2
+gbrap12le           886207e5aa379a0312485b94e5fd5edd
+gbrap16be           eaa0158f27ebc40cde9e3d6eef1e2ba1
+gbrap16le           6cf68992d4fcac2aa025d1014b669d24
+gbrp                838025a3062f7f31e99196ce66961ad7
+gbrp10be            f63c2555ea19fc78b00fd5b3e2b48e8c
+gbrp10le            be64c374ab318235d912372e99a0516a
+gbrp12be            ef164a1c062dc3572c61b9ef10897ca1
+gbrp12le            0527fdb6f75b1cb0d380809eb7a7589a
+gbrp14be            6aff3ad388e2ed97d59b71a75029746d
+gbrp14le            ed9ccbc7a4f3e269a2ec37d210359fd8
+gbrp16be            020eff1626415ea726c55b23162ce59a
+gbrp16le            0ab77b498d4a39905515b6e1f0329ed2
+gbrp9be             170da3a8644cbea61c3caeadc45354c5
+gbrp9le             da5d80e6f12cabaa7081bb85d3b7fd30
+gray                57fd8e6e00f6be8752726005974cce1b
+gray10be            437713f3d081238cddb738e106e5a27d
+gray10le            c749b80049b152f4ba3e66a72c0c5acc
+gray12be            d34c50810b37e6f97dffdf6a8ab958de
+gray12le            cf71b8fee47ce7821f3ae9f9b62ae39a
+gray16be            e1700e056de9917744a7ff4ab2ca63fd
+gray16le            338de7ac5f7d36d5ad5ac2c8d5bbea68
+gray9be             25e50940fa300a8f09edfb6eba4fd250
+gray9le             1146cfc1b92bfd07ed238e65ffcd134f
+monob               2129cc72a484d7e10a44de9117aa9f80
+monow               03d783611d265cae78293f88ea126ea1
+nv12                16f7a46708ef25ebd0b72e47920cc11e
+nv21                7294574037cc7f9373ef5695d8ebe809
+p010be              a0311a09bba7383553267d2b3b9c075e
+p010le              ee09a18aefa3ebe97715b3a7312cb8ff
+pal8                0658c18dcd8d052d59dfbe23f5b368d9
+rgb0                ca3fa6e865b91b3511c7f2bf62830059
+rgb24               25ab271e26a5785be169578d99da5dd0
+rgb444be            a05fabc91e485ec02461be900cd72ef3
+rgb444le            61825e18081a86c96cc407f5e6105f28
+rgb48be             425b90bfe7d2c944921c3d224eb383f2
+rgb48le             33202a1d6baa93c5a29d88eeb47b5f04
+rgb4_byte           d9d8b1fc15960fc0b49edc7dbb1108eb
+rgb555be            ed65d5e935d38d7da789adaeb07a72c8
+rgb555le            c53ba385311e57e75f6919aceb7eb689
+rgb565be            692136248339f1ac903932d48b8f3311
+rgb565le            d0f227a59da3208567485aa79679fe8d
+rgb8                62c3b9e2a171de3d894a8eeb271c85e8
+rgba                ee616262ca6d67b7ecfba4b36c602ce3
+rgba64be            23c8c0edaabe3eaec89ce69633fb0048
+rgba64le            dfdba4de4a7cac9abf08852666c341d3
+uyvy422             1c49e44ab3f060e85fc4a3a9464f045e
+xyz12be             d2fa69ec91d3ed862f2dac3f8e7a3437
+xyz12le             02bccd5e0b6824779a1f848b0ea3e3b5
+ya8                 28cea4f98ed452bd3da9c752e5e3399c
+yuv410p             a85920d6bd26f51306e2ecbe71d1c554
+yuv411p             9106e283d5dbcfba01c611886d58871a
+yuv420p             9ea8ed3c22c31c0354b7face540bb280
+yuv420p10be         c6e76d651b991c0814a3047b2b3a517c
+yuv420p10le         3bf226b758c0b53b893729d97e7bc602
+yuv420p12be         8d63ddea0b9a886e859fec778d72a1ef
+yuv420p12le         f5b6dd8cd8b62fce64deac95aae916ef
+yuv420p14be         dda2c5c09b72b41a19943b3832ddd2d5
+yuv420p14le         e79f827393fb9344190bacacffe9978e
+yuv420p16be         62d08d547f857b254c1d31b5c40b20a6
+yuv420p16le         4ddc458e596c44dfe007ca0c8b211e38
+yuv420p9be          65f8350de025dc8e6608bc21bf50c88f
+yuv420p9le          e9d061aad8e0d07226d41421797e6cbf
+yuv422p             9bd12ab1efe6c3fe6d9f639b97b79c7e
+yuv422p10be         6dd930ff81b89b71f6cadf757e0e8b3e
+yuv422p10le         5e314f06833b5016cc5cd76c611f7a48
+yuv422p12be         71c75f56a518f07be9946cbdb38b1d45
+yuv422p12le         1351d615ca6a97f206d04b9c4bb2d130
+yuv422p14be         d3d1d29966b9737dc8bbc31c6d215c9e
+yuv422p14le         3ba9d5d2a32dc3e0ec025100621e20f9
+yuv422p16be         ed49651e67f96c34649762f4678091de
+yuv422p16le         c7a8ad6f7aded288ca2d16c6e5d73026
+yuv422p9be          cf48ab1346f7fef1b983b8f01b6888b3
+yuv422p9le          b1b7acc0afe050fff93141e2e3c8f040
+yuv440p             5100aaa0d8b30f0eea8825fe9ae20b42
+yuv440p10be         4456a712fbf663d3eb591dfec7c0556d
+yuv440p10le         a71cc3c1b47f6600717421bc88ba1c43
+yuv440p12be         735964fdb80852e971ccb4264ce7d822
+yuv440p12le         a529385f94a4d46fa339746693975d99
+yuv444p             389eda40a7a3bd5d3b280b448e99f27e
+yuv444p10be         80b1cf057149a1f7dfae1da061e00523
+yuv444p10le         cdd8ba90dfc7689e0771dc36a70db433
+yuv444p12be         caaa959ed39a74dcec478f23690f5ffc
+yuv444p12le         a7965a51a2e45723f650d1313f2aa356
+yuv444p14be         18a46dde1fafcc7bbc6ebb3fd6681e7c
+yuv444p14le         90058811cf9c35a4ddfab367bea40c51
+yuv444p16be         1ff6ee64bcc33be585712e86359430d5
+yuv444p16le         9fc18b0a156d20503e3bac4823277adb
+yuv444p9be          e83171709ee786a5859aeab22d8ea4ce
+yuv444p9le          cca7482f37778cfb440f22355e47e9b1
+yuva420p            ebd72004be42de4743ca46fd81947b56
+yuva420p10be        5e000937fce49360850bc10d8083f798
+yuva420p10le        f16bde9ed6d8bd015d59b2e8e248ab31
+yuva420p16be        f29675ea983d3a2a28d648f25d2f79c6
+yuva420p16le        b5f41c7abf5b7baf5754a5ade5a6f055
+yuva420p9be         dbf1a242d3277c87c07fe7b4db993869
+yuva420p9le         00d48d3b1b0383b92ccdb26543cfb7f8
+yuva422p            801bfb0d4c9e7a524d97bfa11f7995fd
+yuva422p10be        a0d743770698deea2be35ceb2bb0eaad
+yuva422p10le        6a0861e5c887f3213dc34d8674611950
+yuva422p16be        c870b697714221ef9168b6984294e501
+yuva422p16le        fef7d5f29dfec9ee36216b7a610b4b39
+yuva422p9be         83ff1ae035bb587dc59acf4121602dac
+yuva422p9le         75baca2a93a8e76b27ea208858213819
+yuva444p            cfbd995b538c34dee9c107ecf875b283
+yuva444p10be        de8b80b4c3a12624412530f09de6dd39
+yuva444p10le        04c93877f724a29b47bc8c0a10a3036b
+yuva444p16be        b10fd7c1b61ac22bdb285f0d91a390f1
+yuva444p16le        cac82ffc36b7052747407663fc5ed510
+yuva444p9be         a6f66d08b3370fdd90987a6143b7b91c
+yuva444p9le         8d0f0b0840096127613920984078ce53
+yuvj411p            0c7caab687fbd33cba04702366b6c401
+yuvj420p            c9bef7e5c1dba1024be992167806ef07
+yuvj422p            ac900a0f9854dc2a0ec2e016ff5487dc
+yuvj440p            6f0d66982a3b96efb341a512314317ca
+yuvj444p            d559f8cf2e68b0cd3abadbb2f3642dd7
+yuyv422             449ca8d4b5a28ccaaa342860b24aeb3c
+yvyu422             6b226a0d4fce5478294d3bd4ecfb46a5
diff --git a/tests/ref/fate/filter-pixfmts-fieldmatch b/tests/ref/fate/filter-pixfmts-fieldmatch
new file mode 100644
index 0000000000..99946c8d1d
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-fieldmatch
@@ -0,0 +1,5 @@
+yuv410p             a6c9b4065e8253d8120772f69be0bf04
+yuv411p             b913e634ad37ce046240252bed8681fb
+yuv420p             a9286560141eb14595e427dbe5829b00
+yuv422p             11ad22ce00c5e8a30d0472f29fb15434
+yuv444p             9350a3f23cd7d95ec441a49f63f55953
diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder
new file mode 100644
index 0000000000..84a9e003c7
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@@ -0,0 +1,108 @@
+0bgr                955efde1695e9f4da276622e462ea9cf
+0rgb                2b0f066cfa0bef378a492875d541de8f
+abgr                832924b5351361db68dbdbb96c60ae55
+argb                80d08e68cb91bc8f2f817516e65f0bd0
+ayuv64le            84ef6260fe02427da946d4a2207fb54c
+bgr0                d2c676224ea80ac3ce01afde325ea1a0
+bgr24               b7fdbcd10f20e6ea2d40aae0f329f80d
+bgr444be            ca5acc0d5315d6d9f4422337c6f20842
+bgr444le            8a82dc31d4305abb60825c54e07c1b09
+bgr48be             b1be092ef916a204e002606cf83240fe
+bgr48le             3e64bd2ad45de53a780b2bf546fd5343
+bgr4_byte           319d0fda198978f05e0318863d10bc01
+bgr555be            686b1f3318a44c48e2ea473c42d7d90a
+bgr555le            113908a73bbef613f68706be3352f404
+bgr565be            b0aca25c2de20dabce53cc0e6e27b8aa
+bgr565le            2e00c326499c8475ffc6aca5476ad422
+bgr8                cfc405aaf0162b4edfe9b3e047c5624d
+bgra                5967b559257dbb6784f93b9d2bef4edd
+bgra64be            64a4ec15bc35ede2018f650b50c2429b
+bgra64le            5029192d0f32383c9f25f8e7da7cb5a0
+gbrap               00afb65d44bea99c31b318fdbeb3be10
+gbrap10be           8b27254a69cd0e25fa55262a743f95e6
+gbrap10le           52278021718ec370903dccc923dc8bf6
+gbrap12be           302b353dff696ec9fd0d85a0cc14802b
+gbrap12le           ae2d6db2c9c825f06d92389de21263d2
+gbrap16be           52c10d8046d123dfc4a478276906467c
+gbrap16le           2317737b8f5140add27d121de8f5ba95
+gbrp                506dea2fe492e985a396d1b11ccd8db3
+gbrp10be            55bbfe2d472780dcbadf3027778caa0e
+gbrp10le            13a39077ab1b2c3b49afd3e250b84a77
+gbrp12be            f1b59334c687a39ba076fe47e6ee9515
+gbrp12le            e64ab4d290eb10476db165054720173f
+gbrp14be            b3806ade527ef7452c29106054946cd1
+gbrp14le            b01b1a05d8de36f51a133d25102fe1f3
+gbrp16be            f82e4bda468275f51becf70f3880be52
+gbrp16le            c7813a905f94aabb2bcade79c9b7e39e
+gbrp9be             b8d294d4bc81ceef1fb529e917c02e48
+gbrp9le             0d42cc9e222d806c33172781b45cb3e3
+gray                d96e0f1c73d3f0b9506d691b5cd36c73
+gray10be            c26c73de96b630f1207ff589b6553ebd
+gray10le            16e4db1d611ec3fa5c9fd8fbdbf1ffcc
+gray12be            1c3285c150e1dddcf0fbee405cfb068e
+gray12le            a57b6199f5690add0ac0150fa95c4988
+gray16be            293a36548ce16543494790f8f7f76a05
+gray16le            84f83f5fcbb5d458efb8395a50a3797e
+gray9be             ec877f5bcf0ea275a6f36c12cc9adf11
+gray9le             fba944fde7923d5089f4f52d12988b9e
+rgb0                2e3d8c91c7a83d451593dfd06607ff39
+rgb24               b82577f8215d3dc2681be60f1da247af
+rgb444be            1c3afc3a0c53c51139c76504f59bb1f4
+rgb444le            afced429728bf94c0617d0c031e356e5
+rgb48be             dd9db831fb640b113bd9531f3f19c226
+rgb48le             ef45b68fddf5e4d2e2ab3c08920dae64
+rgb4_byte           e9804cb4aa572a40ddf3204e9c2c4566
+rgb555be            b4ef7a0ad6f45b329a1ece563617c557
+rgb555le            bcc3bd31b2df8180341fa0e50b70852b
+rgb565be            d9b1e8f52a4044b0019ce56f6bc2242c
+rgb565le            eac5262d84669b2af28e9357660dc912
+rgb8                6deae05ccac5c50bd0d9c9fe8e124557
+rgba                1fdf872a087a32cd35b80cc7be399578
+rgba64be            5598f44514d122b9a57c5c92c20bbc61
+rgba64le            b34e6e30621ae579519a2d91a96a0acf
+uyvy422             75de70e31c435dde878002d3f22b238a
+xyz12be             15f5cda71de5fef9cec5e75e3833b6bc
+xyz12le             7be6c8781f38c21a6b8f602f62ca31e6
+ya8                 055ac5ab5ff8533dd319edc17a398af1
+yuv411p             e4a040e0e786c4dae07d9d3f90a54905
+yuv422p             16ce67249c6ce7ef57a433646ad6dfc1
+yuv422p10be         62ae323dcc41aabf8ff6ecc53b119ce8
+yuv422p10le         60b20ad8c01ad7ea774ce1d74d8932ba
+yuv422p12be         7bcb3e28323dbf566512b5b8a1d33380
+yuv422p12le         5877624df10122dd51c173f814bd5414
+yuv422p14be         8bd7bfb0b35d68000ba57af66958ef2d
+yuv422p14le         471c7528e3da240d0a40f33548cbfbab
+yuv422p16be         8c193a8b6064e2379b2fb211cd2e6e37
+yuv422p16le         c949614bec06baca5ffca840b164eacc
+yuv422p9be          b615f4e767a287e85be97dd52371ba5e
+yuv422p9le          c9faffe2fcb2e30be5d792412b3550b0
+yuv444p             1483374f69c4bbaf9252ce255fc84feb
+yuv444p10be         2e5caee508692869141bd9649cc17f64
+yuv444p10le         c0ceb41ad4c2ddc454f3fdb9cda2d8ad
+yuv444p12be         8729565c21a9d8f1e7a87d81d0aa4a54
+yuv444p12le         d4786cb4b1e79b2af1493e01d685282f
+yuv444p14be         33f1cf5233f57582618390ea337e83c6
+yuv444p14le         7d9fc358232488f671d663d27875f3c1
+yuv444p16be         779ea70979e735d3074fef0466792681
+yuv444p16le         aa893d9b1857b68fd1c5fc42236d7816
+yuv444p9be          fd0ae3b828d40e2638ea0640bb5cc168
+yuv444p9le          9bb3dde9fadb3c03a0ef8305b5f67a7e
+yuva422p            c470da57cde22b452deb8874df710dce
+yuva422p10be        a2ffa080ae661c1033aa38be28002922
+yuva422p10le        a4f5e8006f8ea3f964206605045e0fe0
+yuva422p16be        929ec5d4bcfac13ba8a02f12e3f5fc7f
+yuva422p16le        7155a6036e25719f2e4d2d47212f077d
+yuva422p9be         b1af62d553d790e041e80cf89608efe3
+yuva422p9le         65c80faeb0021deb232ee451f77c89e3
+yuva444p            9ac54882677f1fc5553a97ea558e942d
+yuva444p10be        3326267d176a8dfed2c7511b926962e6
+yuva444p10le        bfe957d1b5fea3585b3942cbfdd529ad
+yuva444p16be        2f80d411847856e1364659dee8b23485
+yuva444p16le        5796be8d66371b60037fc8053c27e900
+yuva444p9be         a83599c0e9fca08f6b7c6e02c2413fcf
+yuva444p9le         390fcd8f72ee407a8c338667944e3f72
+yuvj411p            73fa99cb96d2f7171bff15bc2e43d963
+yuvj422p            d5e67ce1db5347cf3416069286359f57
+yuvj444p            e915da6b5aa0ee5298771ba0ca187cad
+yuyv422             a923c5bd4889bec92d872237f6a578ec
+yvyu422             d7a8697f1f5e6a2a27b0df17811b2613
diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip
index d39b0ca130..875980d892 100644
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@@ -1,42 +1,136 @@
-abgr                7b68405327d7c0862b4e3c1a2e5f8401
-argb                f2d838efb97f9daa035681acf0fd7aa3
-bgr24               6428be12c092356cf9a570b43566b406
-bgr48be             e776e0de8605c9db81380fddb3aa8a16
-bgr48le             eba1836285756b8950981dea2c02be6a
-bgr4_byte           658a71bfc3a2e9271bf60ddda03d138d
-bgr555be            39d9fafcfed4f7c4ebe0a5bdfb202d67
-bgr555le            92f693be95b64dca452221747bab4f70
-bgr565be            3bb3d1918f7a9977ff3998c051159102
-bgr565le            bea2b9a14a24acd7a7443fa4cdc45128
-bgr8                c07a695e1a247f753a24c08de1124eaa
-bgra                2a358c075799b6e4ff56c0d4464d7f9e
-gray                60c5640a7a48454c6a18375ab9c99599
-gray16be            64ba7dcd3478833d2fffd3705ef1123e
-gray16le            d4f370937b499c9b63c31970f409114c
-rgb24               24b18acc43c119f2de1e727b32b550b1
-rgb48be             23ed645ce6c7e4cedd8045130ae07e15
-rgb48le             6918e306925438c92b8100ff9408eec9
-rgb4_byte           2c6929584add1f600e1c87a61d9450c4
-rgb555be            8b4adf81d9c9b9161891229ad79f8b66
-rgb555le            51684ecc7cf0cb11dd87909e0dfd71ac
-rgb565be            d9a4eafb25d103c3dd79c7d6e58e1ce4
-rgb565le            1476f867d8f1f970d51f9dd6cb51307c
-rgb8                b7a090903c6f1d9c9ad6215a8e7b71cc
-rgba                cf8ba075a00d44599a8a49caa37d87f7
-yuv410p             af26db9a0af59863c6643f21259ecc54
-yuv411p             58f0cf9d30c5604fcfe1209d281a9242
-yuv420p             0e86307c56a749cb6009ee1509d709d0
-yuv420p16be         a1e2b231fe1de23fae97cb9d6d5cce2b
-yuv420p16le         c5a2ff8d29e25840dfabc441b4cf733f
-yuv422p             52faae832987874d7cd49bdc76b08762
-yuv422p16be         5001f3a4216e895f84b78e8bfda0cb43
-yuv422p16le         90303bb96430e12d6f45b3d2e90a9dd1
-yuv440p             30da73c35a5862e39d7d43bca3dc70ce
-yuv444p             3b472a790d4db3a5c404cfcc16ea44a6
-yuv444p16be         7efc49abd10868e5bfa2bf4bf5ad9ec0
-yuv444p16le         59140c4d599e80ceb75d8ae803c5f538
-yuva420p            ee3499a2bc030c68f51aa11887b9fa56
-yuvj420p            75344d0547474b9198ffbae2a54c571b
-yuvj422p            3b479c749d6de189735c95fe6b051c13
-yuvj440p            fe56033764fadf849d73ed992a1f9010
-yuvj444p            3068acd925a73222e79a1da31496eb48
+0bgr                823994965cfb2ba4566f878c75eed684
+0rgb                ada57572ee2b35f86edac9b911ce8523
+abgr                d2da6c3ee72e4a89a7cd011dd08566b2
+argb                36cf791c52c5463bfc52a070de54337e
+ayuv64le            4cedbc38b3d4dcb26cdab170ce6d667b
+bgr0                66e9fda4e658d73bfe4fc9d792542271
+bgr24               db074979bd684ca4547e28681ad3f6ab
+bgr444be            63ad2fe7b4e44b11c5ca03b545a941ca
+bgr444le            a742195a606d5c3f1de795b499077f01
+bgr48be             e59efaa40ad1652c74a7c83aba43b4f2
+bgr48le             13c4f904e318356c96ffce911226cf83
+bgr4_byte           8de3494b53a459ab0f748a525e87ad4c
+bgr555be            2b491222a2807a112b404f2924ba0c3e
+bgr555le            533feb969289df2bc628d46816d1db89
+bgr565be            3094c0320e068305b35c57b82476370c
+bgr565le            d20c95743b957cbecd09272a630f22cb
+bgr8                67fb3fd116f0c0eb36d8ed03bdfbb0a6
+bgra                275f05a382bcbc9bc77c06b79e1d8a71
+bgra64be            1cabeafe9c21a4f7ccd976220f22ee5a
+bgra64le            1b15c01c94cf9af89273da1d1f994cff
+gbrap               bf6a2b2f206fbbb332a718fb570d7cb7
+gbrap10be           f188dc23756469cbdd172fe97ad58121
+gbrap10le           262f0501633ea4670020fae8ac6835e2
+gbrap12be           ffe9aa4cbcc42f71757efe18826764ac
+gbrap12le           88a85c1b3c5e19e299fdd209b73ac1ba
+gbrap16be           3117e84b258433a7efb9288bbb8815d4
+gbrap16le           3ad08cf8b49d8eb31a1b356ec4b7b88b
+gbrp                0ecfeca171ba3a1a2ff4e92f572b71cf
+gbrp10be            774398c2f81757a536c094f16cfc541a
+gbrp10le            e9a6434d691be541f789f850963da181
+gbrp12be            13d819d869f8e84aadca57e21883030e
+gbrp12le            22046339442c155fbb9b02ceff5e1c15
+gbrp14be            7e1d2f9d9bb7cc90d88540f36998acd6
+gbrp14le            91bb636f4e1f5d50312b136c185542e9
+gbrp16be            46cf9473646a4b9dbcb05661ade658ec
+gbrp16le            6ce6093b24d09c0edcd55b2d6fec89a0
+gbrp9be             174de037c2a9f2b6fb4d9444ae0ff82f
+gbrp9le             ba7c2631fb2967aa909c66509bd243fe
+gray                8bd4ece1dbf89b20ee785e0515356e07
+gray10be            160dd03e30d33379de92c70ee52c01fd
+gray10le            6baac1da6be3789409b67cd506afe7da
+gray12be            de7b5ef4b513e7e8270c617249d1cbdf
+gray12le            e8d0739ff61649bd82722b3134cbe776
+gray16be            cf7294d9aa23e1b838692ec01ade587b
+gray16le            d91ce41e304419bcf32ac792f01bd64f
+gray9be             ac8d260669479ae720a5b6d4d8639e34
+gray9le             424fc581947bc8c357c9ec5e3c1c04d1
+nv12                801e58f1be5fd0b5bc4bf007c604b0b4
+nv21                9f10dfff8963dc327d3395af21f0554f
+p010be              744b13e44d39e1ff7588983fa03e0101
+p010le              a50b160346ab94f55a425065b57006f0
+pal8                5b7c77d99817b4f52339742a47de7797
+rgb0                0092452f37d73da20193265ace0b7d57
+rgb24               21571104e6091a689feabb7867e513dd
+rgb444be            38d6d0e9aa15ce95f3fffcde8437632d
+rgb444le            4c5bb6590def780c480abbe6a6349b1a
+rgb48be             dc7f3a98c0913a6defa56bf032590ad0
+rgb48le             a813a316f8b5d49340f64990f914e2f7
+rgb4_byte           f28c594e547d38166c2757338948e874
+rgb555be            316c7c1f785d8ba84dbe3eaa20591158
+rgb555le            07f561fec000bbadf6b732a358c6126a
+rgb565be            593c48d6214cb40f6472ebdf9f6ede1a
+rgb565le            ccc896ad1852500b7e72bb858860d747
+rgb8                68a3a575badadd9e4f90226209f11699
+rgba                51961c723ea6707e0a410cd3f21f15d3
+rgba64be            c910444019f4cfbf4d995227af55da8d
+rgba64le            0c810d8b3a6bca10321788e1cb145340
+xyz12be             25f90259ff8a226befdaec3dfe82996e
+xyz12le             926c0791d59aaff61b2778e8ada3316d
+ya8                 4ad5920716de3d2fbbc49f95adb60345
+yuv410p             c49fd0c55c41185b1580aac77211992b
+yuv411p             c416371077dce13d31bf1dc706111ae7
+yuv420p             eb8d9f02db98e10400781428c43e9438
+yuv420p10be         5cd5c8181248b2dbdc7a8669caca3ed7
+yuv420p10le         95a92ee031fdb8812661c019d925fad0
+yuv420p12be         8fe5d344a1576aba7892e855d2790df9
+yuv420p12le         c0897e2b53c1417fcf0cfbdbf9f54163
+yuv420p14be         c5758d8062c61248110485243a75b712
+yuv420p14le         e283871dec73c853421d3aa098f071a7
+yuv420p16be         da4f5b6e537edf9cdea48a60defe520e
+yuv420p16le         4173d444fea2ea27ad03b3f92e982bcd
+yuv420p9be          be69519cbd3f3b9d02b165e6d675b4cf
+yuv420p9le          49eac58088b3e1cac170911382e2bb9d
+yuv422p             5aade4d118cd7243800a08d300033748
+yuv422p10be         a12d0957b703bd54cd569664b821ca3e
+yuv422p10le         8b6ac98276b10b7e540a5f689e5453fa
+yuv422p12be         b5d2142e6ccd9f69dee2c0643b14a741
+yuv422p12le         da75ea80662636c698986cdeab334669
+yuv422p14be         027a593f148a96ff9e37a35e55608818
+yuv422p14le         4c1de1ce4f199ab8e94a28bf79ecedb6
+yuv422p16be         3d4b525c8056b740a4afa5b86cd79cd3
+yuv422p16le         bb93ea91207d118811e2dfd5a48e223d
+yuv422p9be          5b41fff3b17c2934e1db61f0591fdfbc
+yuv422p9le          720ed60d583933c3fb8db6dbb2991dc6
+yuv440p             53fb331a853af01bed7f32504a1e5ff0
+yuv440p10be         38108067cdce71f3a8f51eee25e4ff5d
+yuv440p10le         a369c78eda4f46d71105c38ddc92b976
+yuv440p12be         2d5e61f399ecb12bfb66fdf20b37b4f0
+yuv440p12le         7aecbe06b7cd8c84d98af8cf3bb971e8
+yuv444p             0bd726440d90438ad357172fe1fac9b3
+yuv444p10be         c2e452fbe45f23c70525919154f4b81f
+yuv444p10le         90140d5f930fb2ff750fe18df990d0f3
+yuv444p12be         f858a8f0c55192ab69d356b97e0449bb
+yuv444p12le         22f099dbae63e6564f06e1cc32683a4e
+yuv444p14be         be4727c283bb3af3327f7b9dc57e51b8
+yuv444p14le         289f4d6a3d60ba654e8280683825ee9a
+yuv444p16be         acb6b001d445a628d1d0a2dfbeed078c
+yuv444p16le         cce4770e9e2c6d4104562490d6ffbbaa
+yuv444p9be          e29d58f528e7b36e3d7321e50f6a69d9
+yuv444p9le          587f7bd803aa09109e278fb7aa3e3971
+yuva420p            e910f0f5ed439a17fc3e61b42dec88c2
+yuva420p10be        2c3b83450c3155793a142ecd5d525131
+yuva420p10le        c49ac6b0e89564fa8243e0400adc37de
+yuva420p16be        8fbd18fd0d3b755dd311988856843b80
+yuva420p16le        cd647fd48bf5398a783f6ba6a6332835
+yuva420p9be         3cd29a8e3da6c6ab7538ecf987fb8123
+yuva420p9le         15e6654f50eddf97f852070d8dd8f009
+yuva422p            902dc911ee175d9b1f2addcc03aab9a3
+yuva422p10be        fb927978446e975f7424600495a7acde
+yuva422p10le        1d0b5a5946b824810b1b83a7ce429274
+yuva422p16be        88977e5ddcee9377525c3f251fdeb25e
+yuva422p16le        d6a50a91be5fc720ca97fc2f6fbd3bb2
+yuva422p9be         996d8d73648c602c73c51e2d95b6cf9b
+yuva422p9le         2d64684a8844967e9ffe827c04e3c917
+yuva444p            53247be24822d158c0866cd58d2ceeba
+yuva444p10be        9f3c25c3b9d26787d0bf8da2b15c75c6
+yuva444p10le        1721b843b721629da7a0cd76ac665708
+yuva444p16be        635fb2720470e0042a7c9b70bf908a2c
+yuva444p16le        6d5bd13f8bb804bd1158c1af732a24e1
+yuva444p9be         3d3e7491192aa4e396015bf8e3755a24
+yuva444p9le         31727b34bc3d5ce726681e90557d39e4
+yuvj411p            70a0abb56a538376aff33c275584b61e
+yuvj420p            83af439c504d41f986adc17059b7fda8
+yuvj422p            daf02a72b26d17d1855b977aa04609fb
+yuvj440p            a4af7a9e3cff6cfc1c8924590ae69807
+yuvj444p            f5937e0183439411673d2ebf8df62e2b
diff --git a/tests/ref/fate/filter-pixfmts-histeq b/tests/ref/fate/filter-pixfmts-histeq
new file mode 100644
index 0000000000..a250902dae
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-histeq
@@ -0,0 +1,6 @@
+abgr                a538e1221c94a12fb4e60b47b5358f67
+argb                d0ef008d603d67a6a7d698d2a8f53d6a
+bgr24               9ef3c69a658490c4fbc807272372e73a
+bgra                716e70fdf7413d9a3b83e0365c2b0a99
+rgb24               8423322bbc66bc5050f6b93fdab23433
+rgba                a960c9423bbb3925c3511362348b38e2
diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il
new file mode 100644
index 0000000000..c6885b970e
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-il
@@ -0,0 +1,140 @@
+0bgr                501a8320becc400e2a72dc847003d82d
+0rgb                53efe0182723cd1dedfdbf56357c76f5
+abgr                97603869e6248a8e5d8501563a11b114
+argb                9e50e6ef02c83f28e97865a1f46ddfcd
+ayuv64le            6f45f683e99ddf4180c7c7f47719efcc
+bgr0                590dcd1297d1dd4541eea217381db604
+bgr24               73afe7b447b083a7c2d682abe8dd451a
+bgr444be            4fa078adc981fd07440a7b657c98c4c1
+bgr444le            404c22249a4222f3c086ef9ef79e090f
+bgr48be             6de326fc52d92c6a31d74378534d2fff
+bgr48le             d37e673d846e9ceb06641ba6d480db84
+bgr4_byte           f275df6bc1d33eb037b0f609bfa5a7a8
+bgr555be            e9007cafaf389f2895cf0e45079ecb90
+bgr555le            9d4d4c0c5e85eca0030e74ed873e9538
+bgr565be            bef8c77c32880c9eebe4507ebc3f2a6d
+bgr565le            8190c5275d8b62d997362f999b72be16
+bgr8                ef01593604512621b3d175f8b6c2ec9e
+bgra                e6ae08f06f157297296b319a249dddf5
+bgra64be            de7c036f20fc54d89690239cc6239678
+bgra64le            d1aa975fa03ce226008396b30a653420
+gbrap               575ff1fe5d7585ed82da1db35f106e4c
+gbrap10be           bafa57a2e4331d8a39f6f0087c85d4b1
+gbrap10le           553a1f439d8184dc400432d3f786fbce
+gbrap12be           48609d6b61ff6313939fa2d9c3ebb6d9
+gbrap12le           e3b5342c8e47820f2de7e2dd61872312
+gbrap16be           696c84c8b009c7320cad7f3847bb35da
+gbrap16le           9bacb81fbbe9cdfd04d71eb55a9719d2
+gbrp                dc06edb62e70024a216c8e303b79b328
+gbrp10be            321e7f061d8b9b5801221b6cf3c99666
+gbrp10le            799ed3afca01076439a0b6785b3dc4bb
+gbrp12be            7ca179ad8f7b018de48a48bdb0776965
+gbrp12le            c69843651e7e60e85c5e8a2fe4ecb290
+gbrp14be            5dc5e8131c25125347758e03d15b69e6
+gbrp14le            bf3d5dec9b58cecd4ca1c5d3a4d57c31
+gbrp16be            c8c95027703c680ed8f8f91c725db40a
+gbrp16le            c95c9d7c2b19826b73ff1811d9fe6bdb
+gbrp9be             f029d87fa642f4261160471ad27fd53f
+gbrp9le             b310d3cf37f7b41d706155993f8f0584
+gray                52ae18648161ac43144f5c9cd2127786
+gray10be            8400dec0eefb172849b785d35fc55674
+gray10le            b7d6e49e8d1291f2b0a57d55e9478ef1
+gray12be            c62bc3def5ea217dfb68433905cb9d64
+gray12le            5bd0fef836928e1e19a315782a8c1302
+gray16be            92c3b09f371b610cc1b6a9776034f4d0
+gray16le            1db278d23a554e01910cedacc6c02521
+gray9be             ed7db5bb2ddc09bc26068c8b858db204
+gray9le             2ec9188f0dcfefef76a09f371d7beb8e
+monob               faba75df28033ba7ce3d82ff2a99ee68
+monow               6e9cfb8d3a344c5f0c3e1d5e1297e580
+nv12                3c3ba9b1b4c4dfff09c26f71b51dd146
+nv21                ab586d8781246b5a32d8760a61db9797
+p010be              3df51286ef66b53e3e283dbbab582263
+p010le              eadcd8241e97e35b2b47d5eb2eaea6cd
+rgb0                cfaf68671e43248267d8cd50cae8c13f
+rgb24               88894f608cf33ba310f21996748d77a7
+rgb444be            99d36d814988fb388aacdef575dacfcf
+rgb444le            71b4b1a44e13d1bdb31f81b5f9a75803
+rgb48be             267ac00248129e735a917175b5cf0a82
+rgb48le             15e7d807b7f4ea68ac506dfc2db9146c
+rgb4_byte           9bd11ff523ea914bf0b26f8af7965054
+rgb555be            fd0be5e3f5f6fdb250f8368c2eabe943
+rgb555le            c85a16162ca83496306ba6c888c1a8b7
+rgb565be            046e381ad0be8277f7020420297a8f6b
+rgb565le            9b79220c3c2f23b60a55c2bdf709ffb8
+rgb8                93f9fa5ecf522abe13ed34f21831fdfe
+rgba                625d8f4bd39c4bdbf61eb5e4713aecc9
+rgba64be            db70d33aa6c06f3e0a1c77bd11284261
+rgba64le            a8a2daae04374a27219bc1c890204007
+uyvy422             d6ee3ca43356d08c392382b24b22cda5
+xyz12be             7c7d54c55f136cbbc50b18029f3be0b3
+xyz12le             090ba6b1170baf2b1358b43b971d33b0
+ya8                 a38d6e288f582f1a04310232ed764afc
+yuv410p             dea1ab8843465adf5b8240b2d98fd85b
+yuv411p             8bf73777a5ff43c126be274245aceff1
+yuv420p             f1f4e7e94a76d5320049464bdeac24ed
+yuv420p10be         f7839393b65972595bdcb2485c6bf2a1
+yuv420p10le         cb00b1fc299baff8bc31086d8571fed6
+yuv420p12be         e5bba4d9f2299e98e69c9347234545c8
+yuv420p12le         7110d2862c1da19e0298029383d31dab
+yuv420p14be         240357c01079020ccc3d9287b5821a1b
+yuv420p14le         f7d0f5f5e72455b238897ed87cf67b3c
+yuv420p16be         8195046b708c613b3ca521c95db529ab
+yuv420p16le         0586439ecbd0d2fb8f22f953e6efade8
+yuv420p9be          955faeb6751e2fc39cbe160dc5fd35b6
+yuv420p9le          f8a4a93f98743cdd8d0ebadba2f8028a
+yuv422p             da122be331a53ec389ab6b2064488beb
+yuv422p10be         956f3c496807e62a288501e183fafad0
+yuv422p10le         43f99eb0d8abd1754572f77e430d4c41
+yuv422p12be         9e8e40a95c4c762274e22026d16a4157
+yuv422p12le         28a5b358a919297c005bc491c91b2b15
+yuv422p14be         ccff1e00f5d3adb899f1c266b22c9628
+yuv422p14le         f8a3bcbf8c55b1f570c078ff2f436b1f
+yuv422p16be         7f2363ccb6e69241c70411b6d063a2fe
+yuv422p16le         58c0fabd1042b35346ed8b8ed3f90653
+yuv422p9be          3ecf7f2584fe3f3f567790e3924c153c
+yuv422p9le          a3fe601dcec267ae70db422843d2ce84
+yuv440p             b4261e15f5dc347b873cf19ccaba8123
+yuv440p10be         9c8e626ca9722f872ef0ecc8e3fca74e
+yuv440p10le         8c28978a0ad4d80c588989505a7f0807
+yuv440p12be         6711f322b74edc424230bc973c6afcd6
+yuv440p12le         6f47a23742f5763f3240982e1892e4dc
+yuv444p             bbd70cde098f24097c4cdcd3ad22d9ce
+yuv444p10be         b0de51e143a5bd490c424dc836becfa8
+yuv444p10le         4435dca19253b88dc7cd553928467e79
+yuv444p12be         23f0ce3a810138df7849d4f6b5e50211
+yuv444p12le         0394aeef391e2cc09722ee8e7244f1c3
+yuv444p14be         c712cf9dbf8571fbd31fa747e58993ec
+yuv444p14le         3a0e361e5998f8590dd8ca8ce896cea1
+yuv444p16be         929c50756bfe8cab7c416f56095fbb82
+yuv444p16le         63c3c3bc5d08f701afa3406f7a22018c
+yuv444p9be          b33e6dc5cf08ff7672292b518d352c2f
+yuv444p9le          c9d767579483a2e4bb1424afc5223361
+yuva420p            e72aad3c3cf41445bdc1c9d14b21321f
+yuva420p10be        7cd2e0948f56fb54e8e6856b02561493
+yuva420p10le        5f038e8362ab2f999984a5b7d1536b7d
+yuva420p16be        b98c585e4b9a6cdb86147499d8fe8531
+yuva420p16le        c58b31509a944e5ec6a0676218e43daa
+yuva420p9be         845bc11e88affc3161ae6265008edc84
+yuva420p9le         fbc3300867510900fec84caf718e8601
+yuva422p            6c347a539965cd63cddfeec598858c11
+yuva422p10be        d34bf5f06ac5c67e12409aa111b4e21b
+yuva422p10le        ecb3cc8d77cee05e54d4de60831be159
+yuva422p16be        47a8d3c98492d31bce0ed0d6f74f5131
+yuva422p16le        a950acae1f7ffc47a0951a40e3309b09
+yuva422p9be         0217ba7015245e017ceb0a3eeb39fa56
+yuva422p9le         1bbb5ba2b649bbe47c928012deb4e3ae
+yuva444p            c8153b52159fb0f392459b8be406c294
+yuva444p10be        b0456e5ecdd87c983573e1016db85178
+yuva444p10le        f9b10500666ba220ce42b478a6785dae
+yuva444p16be        97f8cb6ed835c7c5cd2fb112b1e135c7
+yuva444p16le        47170401a8c348d3f05f6530607d066b
+yuva444p9be         d5c0170b41221a9607e6ae586880a383
+yuva444p9le         4948983313f46180666dec85ef30130c
+yuvj411p            91e137f54b2cbbb1c1423c36f031d5f2
+yuvj420p            2b6d8e3b527af5de94963d1bdefe20a9
+yuvj422p            4ce16aa04a5e785b29fd9cdf54bc9ca1
+yuvj440p            36a248ec6f1dc67555ee590651388b15
+yuvj444p            279790fe3c83b07f0a09085d36849c30
+yuyv422             09af5b85deecfeaef2e00e00fbc12a49
+yvyu422             62c62a80939c34fb7890c0e7791a0321
diff --git a/tests/ref/fate/filter-pixfmts-kerndeint b/tests/ref/fate/filter-pixfmts-kerndeint
new file mode 100644
index 0000000000..558e9451bf
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-kerndeint
@@ -0,0 +1,10 @@
+0bgr                7de3240bb5ab40dc9b599f7112990439
+0rgb                09f7b9006720a4b1ba4e2927b441022c
+abgr                4242d4bbfd5e5697a9a1cfe478a0ae46
+argb                48ea8cc401499ffbf0ac34bacdd1146d
+bgr0                e50249e05a9790c56033bffde502d1a2
+bgra                04f4d485067338e181c4c64b4df1246a
+rgb0                898e3d3bd40a14824929ad83d69be24e
+rgba                919e516d3a052401eb1c658412d3584a
+yuv420p             636b260f98ba9f98e304ff9f82d63393
+yuyv422             768afc798f77b3311d7b1a33caef902f
diff --git a/tests/ref/fate/filter-pixfmts-lut b/tests/ref/fate/filter-pixfmts-lut
new file mode 100644
index 0000000000..db3fd417b7
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-lut
@@ -0,0 +1,51 @@
+abgr                0a932e831efd4ec22f68b25278bac402
+argb                4f575be3cd02799389f581df99c4de38
+bgr24               fa43e3b2abfde8d9e60e157a9acc553d
+bgra                4e2e689897ee7a8e42b16234597bab35
+gbrap               0d1eb2c39e291c53c57302cdc653c2fc
+gbrap10le           fed58af6d557a7069a4a39e6d8f5f4e0
+gbrap12le           43fec231bd1d3dd957cdd8478cab9259
+gbrap16le           22ca3644658ae306541116c31e135074
+gbrp                e572d53183f3f2ed3951aa9940d440a1
+gbrp10le            a8fd1ebbc36a477e2b134241fed91687
+gbrp12le            c5a4b89571f7095eb737ad9fd6b1ee08
+gbrp14le            bdfdfd6f36c60497d1cdae791f3cc117
+gbrp16le            df095ef3a20995935cfcaf144afc68b6
+gbrp9le             a8c4e29f4cb627db81ba053e0853e702
+rgb24               a356171207723a580e7d277078072005
+rgb48le             5c7dd8575836d18c91e09f1915cf9aa9
+rgba                7bc854c2698b78af3e9159a19c2d9d21
+rgba64le            3a087ecab583d1930220592731f282b4
+yuv410p             10cf5dbbccb858a9ab51e0b8bf278f6d
+yuv411p             3f0bfa543ba513c6b6d7fff785fbe150
+yuv420p             ad99204ace669a383f8ae03a1ea5b98f
+yuv420p10le         f1e6cc4c2a5e9665dedd7ac0f2a4d551
+yuv420p12le         d9dfe871483b6a26512d427cb048ff65
+yuv420p14le         cd8bb4803f8e99c6cd31149bf848c30c
+yuv420p16le         4bb13820cf2de9b40ca47adeb7fea356
+yuv420p9le          f12c98b599e667fc45126d6dea7f0fd9
+yuv422p             c57e304bb3f4a1d30bf4ced5e829cdc6
+yuv422p10le         9d95b03f75ae5778804279f3c3135837
+yuv422p12le         08e73e233793740ad68a939b9886dd32
+yuv422p14le         bea6b54ec3e33eadfbd317a175b96288
+yuv422p16le         5438e5738ab3e1e5f7fce5faaac036c4
+yuv422p9le          222a699b69ba8d511518a61d77a10c25
+yuv440p             f8105ff9433ecdedf2645f3370a575d8
+yuv440p10le         6e104ac6c33b00185bb6d95b371e1354
+yuv440p12le         636834efcba838d74337b2ebb9dbffb3
+yuv444p             ca662e7bd7a28805650f25b1537d50a2
+yuv444p10le         c301eb2763e0f74fde94388046c437fa
+yuv444p12le         9482b13de4a9fbce176e8344c9332139
+yuv444p14le         fb558c97e59e884fe5ba407df158ebd5
+yuv444p16le         be9b3ce54168159b132746f7ac9088fe
+yuv444p9le          fa4b9bd6b8cac96e10322e613c8e7149
+yuva420p            7284cbf9eacf1ca5ce9e2efebcadf999
+yuva420p16le        b37d34212c2a79e91b675bc87dac6cc6
+yuva422p            5938a7c7588febb069bd0cd4c447305e
+yuva422p16le        c5ccfdc1a0dc6cb130c07ea61df6f727
+yuva444p            fbcbdc3521d17c702ee521b0893098e4
+yuva444p16le        b7142d28d4d069d7eb019dcaf8b323b1
+yuvj420p            65bc88887c7f06a6221155ca7f9cfca4
+yuvj422p            ff5baffefc8ffe4547653092fd7da200
+yuvj440p            ef3f27270e60ac06582e3ac7c2f3e6fa
+yuvj444p            29378d3fd132c760522c51c3378067b8
diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null
index bd16f11075..124dddeacb 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -1,103 +1,141 @@
-abgr                1250387304351fea5cc57b232bc0a5e5
-argb                ee5a1e2e2d4dbd2cd978d6e3bf8dee70
-bgr24               437ea8de747009d73f41af120f0360ad
-bgr444be            0a9b7c91c6f50c0ed2633aebd19d7326
-bgr444le            f032368a3134918e6802922e4cde7baf
-bgr48be             bf24403f14d4085f970475dd17a9edcd
-bgr48le             1db5661da851a44dd5b92f8dd5a0ec84
-bgr4_byte           2bf8e7fbf1179ba0543cb42d2d8a5308
-bgr555be            b8b23bcfa9a850d46850d59662e6eba8
-bgr555le            d72c90906cb4df818abb37fb07a67d01
-bgr565be            0fcba91cb4c55a458271173cb26e649d
-bgr565le            6a0d182c7165103b2613d1805c822f9f
-bgr8                36b9ef72c87da36ac547202d85a5805f
-bgra                56e6e1bfde40aaa27473e01b46345c82
-gbrap               57cb1a02d6f015a4329fe367f3bdfe49
-gbrap12be           df4b550099df0702f602a8b305702a8c
-gbrap12le           f947c43e494ab87410dfb2547e7e22f2
-gbrp                d5f73b5d3ba7f6cadbc9b4ecbc161005
-gbrp10be            eb19bda60ab7f893198364dff21342d6
-gbrp10le            546146efb36ad2605e9f74ee5e4c2a36
-gbrp12be            3a7dd35686a7ca85cc58c44d0c5c4e96
-gbrp12le            654861b1837d312569395f598da1a2a1
-gbrp9be             cbe1bf8ead497a92362a749bd4b0a57e
-gbrp9le             f88c68df5d699a4a7f1b0152df9f25fe
-gray                8c941e9bbf6da5336384c57f15a4a454
-gray12be            aecffce8ea67ab93527dc74c1a523454
-gray12le            eac4b15c8686f04ea73751294f40b8e0
-gray16be            43bda75c197b0d59a9b87ee941553644
-gray16le            a4ea1369ef1efff0e1341a1dc42dbfdf
-monob               e13b2cbfb93d3ed6fdc1f256662ea959
-monow               87a594c125f52af67dc1dd51d800ff31
-nv12                a0b3578ec9b28be3d6e66479df8b1995
-nv21                a9318dc58dc14b9931a00ea6cedea849
-rgb24               fc0c7ce1d5d6be1b89d4471542785508
-rgb444be            cc479f17c73cd50d65475a1644c5053f
-rgb444le            c98bc1811d29a86471357cb2358e5a30
-rgb48be             1e2a176dadf246e376932a20303ca572
-rgb48le             57fd6d93cda99070acc4213b6958fe70
-rgb4_byte           e4dcdc9adddcb3958ddd0ea3b0896140
-rgb555be            8fd499c9a6d98414ab2803ae08698651
-rgb555le            a9b93f8b61e52eac76aca392dc3ebd81
-rgb565be            a8c6c7817f80c8a0cee9918c3748e00c
-rgb565le            510a4ce796d7cb11aba5b25b419cdf3b
-rgb8                2e53d27e93554f874986fbba4f9d6354
-rgba                ed87fc4907951608893b421624716f9b
-uyvy422             deb3625b67a8d2a51c17a322ad2021ba
-yuv410p             dec949ce1d8a5f7bb1aa7640f97e05eb
-yuv411p             fc2f303b20ae610dce86dae4a6671881
-yuv420p             a2117c3c5d4533dca311dc94a3d157bc
-yuv420p10be         7756ef359f79d63ef6f983caeaba5c51
-yuv420p10le         aa8abcc05010b4b0df7d924fd5887291
-yuv420p12be         f93fea0e8e10e9f2d006e8f8be5b8938
-yuv420p12le         5d2810e2112328dd88ffddfb486df060
-yuv420p16be         7a708532d8ac26d598ac7332e38dd2de
-yuv420p16le         6b868d3b0c44c6b04f39415890d6ee0b
-yuv420p9be          11ffb289661f4f55347d60e99dcef632
-yuv420p9le          a0c9608b2be3ca6d4e8cf625714a3833
-yuv422p             b082344038849f5fd444ccf2a30e3f4f
-yuv422p10be         43a6293e138d0ecfd3385df3dcf9b713
-yuv422p10le         74da030a4efb5a20986fcead50018f4d
-yuv422p12be         d60480c872d6723e587199ee4ecfe86d
-yuv422p12le         2cbf87d44e9c897ec6460225d47efbda
-yuv422p16be         f7a0fb9e82805660317d07209e726100
-yuv422p16le         12eeb2f95bb0d655d52e8eed1cfbf771
-yuv422p9be          60daf1a7e61434b244c5a43f4449b617
-yuv422p9le          4c4885c48812f5ac0916a9509ba84345
-yuv440p             12000ce709b38aac3f7b7f59b07847ef
-yuv444p             628c9d1e10c22e0e512b27c0e03b46e6
-yuv444p10be         b60d77db54a592ed088ebf7964e2dd5e
-yuv444p10le         1752a238eb27fb7c746e349536f60686
-yuv444p12be         be54f88f9b9034b5b9bc466132bfba10
-yuv444p12le         714c3c5789897b56cb9ae6a45688e395
-yuv444p16be         8e1e2f04cb2e97f80fdfecbb2c5679a0
-yuv444p16le         5677b2caa63e0c075eac6937b03cf2a6
-yuv444p9be          5ab55576b180b2966e9ed5a1ea55508a
-yuv444p9le          3d9b69b8d6e17f2d25ce92602688bcc8
-yuva420p            9e9889ad7837b0d0dde023bf931ed639
-yuva420p10be        ff20f57da08f79e44e7b603e89b18d74
-yuva420p10le        a2dcfa563602232d999a19b7ae272131
-yuva420p16be        63bd8a57eedfc58e8e6319913ee1064c
-yuva420p16le        797dc4ff3a9a3f36cb84ddd808a1c04a
-yuva420p9be         d2de221d375fea605a9f81c9e0fd3661
-yuva420p9le         0dd82737677f2b604a0aaa638e65f64a
-yuva422p            375465ec39a82221a4a502e92bf0453f
-yuva422p10be        81144a6638bc34bd9e6790977159a754
-yuva422p10le        b30c735f71275004d2d7d78ec647fd5b
-yuva422p16be        b7641ec1896f306065073f0348448f19
-yuva422p16le        3ab82ddf757a78f0184c01aa0259fc42
-yuva422p9be         dd2a4affd2140d945c88c545cbd15794
-yuva422p9le         a7a00cf6c696e8e94ce62576dbb28527
-yuva444p            8031aee1a4a13d679e3fa960b70e27c7
-yuva444p10be        62dc7423df2a90da591e313dea0f72b0
-yuva444p10le        e45e36e79e39e1ed300fc93bc20a2232
-yuva444p16be        c2321be5e7184b874cf4e16fff959179
-yuva444p16le        107836d19b0735f225eb7d97da98fd49
-yuva444p9be         d8ba268bef3cf8d2dbd57a65b49be6db
-yuva444p9le         f4589d40b7514e021ec7096003907ef7
-yuvj420p            9ba65711dfe07d3078b5b874b49240fb
-yuvj422p            05873ba9f14597ded3d4a2f6e1cd7e5c
-yuvj440p            d76a421f62d692c664cbb2d1727e77d2
-yuvj444p            787e53351113065777bd1061ddb04834
-yuyv422             48d652c76bbdebec0bf7842578b39c53
-yvyu422             b0364ee13bd574d01b23a0809e6ddca9
+0bgr                4060279c35dd8810a2f55a021b836557
+0rgb                527ef3d164c8fd0700493733959689c2
+abgr                023ecf6396d324edb113e4a483b79ba2
+argb                f003b555ef429222005d33844cca9325
+ayuv64le            07b9c969dfbe4add4c0626773b151d4f
+bgr0                6fcd67c8e6cec723dab21c70cf53dc16
+bgr24               4cff3814819f02ecf5824edfd768d2b1
+bgr444be            1cd47c1555f947dfcba99192e3429d20
+bgr444le            e1832fdc9b118d4440ba03cea6e30428
+bgr48be             51477f029592ddb6b912980fdf2df7f1
+bgr48le             b34faf404b33c74cd25f5f912ca3274c
+bgr4_byte           7ca99bc8a1c7c831cb955806ac05cb72
+bgr555be            6d32031ad4f52723023e547058a62c71
+bgr555le            823a3b2f2585e537da5cb76c8ce30cf4
+bgr565be            438b0f18fd754280d5dc2f421c376ffb
+bgr565le            acab2b65c0fe5f9618c90f77f70ab3be
+bgr8                898a66734bda0572dfab1edd8239f6a2
+bgra                3934fb81a602dfa7d29420b1a66f0fd8
+bgra64be            c8d3217bf58d34f080ac88c0b0012c77
+bgra64le            b71d75a928aac14cb768403e6f6a9910
+gbrap               98d30987407c51e5620921e11d40a4ff
+gbrap10be           edcffb185e44b6dae5c2ead5505b7125
+gbrap10le           2a7392e14b21b1f9457526a071236a6d
+gbrap12be           0c4c1f8af361571265ca259d5f70f026
+gbrap12le           5f1d8c663d4c28863e687192433b34a4
+gbrap16be           e4edca4361d643794034e5aa9ef290b1
+gbrap16le           9a95b389d2bf556179e8f4b27fb550ab
+gbrp                5fbc319e30110d19d539f5b274eddb6d
+gbrp10be            703a17591a2a5c236675c5101c349bcc
+gbrp10le            ee014153f55c011918df5b2394815780
+gbrp12be            527d337eb5813ebba7cf969ee660d423
+gbrp12le            fd192920b171a0cf88d61e8310e95d81
+gbrp14be            46d502db6dc5eb7e9da3c60016b2df91
+gbrp14le            1607f5c8f13360b53b8186f523996b1b
+gbrp16be            7b6764a504c853b09f5c7d0b2223c5a4
+gbrp16le            fb9323a5bd060282bec7bfd7d38dc230
+gbrp9be             a4dc6f6f9bb051de2dc348b592ad4282
+gbrp9le             699da3a3b324f3fd001a56aee9683384
+gray                188590b1231afd231ea910815aef2b25
+gray10be            d486558ecd2e27afc17930be861f0e4c
+gray10le            917d687103b2adcca7132bfc070ca54a
+gray12be            9685614450f1282be433d2b07234ca1f
+gray12le            2700bd7fb3fea56e54eb03e31d6d4e57
+gray16be            08d997a3faa25a3db9d6be272d282eef
+gray16le            df65eb804360795e3e38a2701fa9641a
+gray9be             6382a14594a8b68f0ec7de25531f9334
+gray9le             4eb1dda58706436e3b69aef29b0089db
+monob               8b04f859fee6a0be856be184acd7a0b5
+monow               54d16d2c01abfd72ecdb5e51e283937c
+nv12                8e24feb2c544dc26a20047a71e4c27aa
+nv21                335d85c9af6110f26ae9e187a82ed2cf
+p010be              7f9842d6015026136bad60d03c035cc3
+p010le              c453421b9f726bdaf2bacf59a492c43b
+pal8                ff5929f5b42075793b2c34cb441bede5
+rgb0                0de71e5a1f97f81fb51397a0435bfa72
+rgb24               f4438057d046e6d98ade4e45294b21be
+rgb444be            115e5259b91f4a416546b09570347633
+rgb444le            f3f66689cb4c810563fba7665c526800
+rgb48be             18127d8ec64aa21619ada80b93514906
+rgb48le             60d0ba0e5a429c947aaa736be54aca87
+rgb4_byte           7d68393a3de6f392cf2ed05ffaec6259
+rgb555be            f76c8109974636b54bd0cb4c36bb883d
+rgb555le            21daf4d05999ccf3eef7d492e73c4d5b
+rgb565be            85711f35f71340ba23e553a07d246656
+rgb565le            e04771e79a8ee8a51e9a325540e6215e
+rgb8                7ac6008c84d622c2fc50581706e17576
+rgba                b6e1b441c365e03b5ffdf9b7b68d9a0c
+rgba64be            ae2ae04b5efedca3505f47c4dd6ea6ea
+rgba64le            b91e1d77f799eb92241a2d2d28437b15
+uyvy422             3bcf3c80047592f2211fae3260b1b65d
+xyz12be             a1ef56bf746d71f59669c28e48fc8450
+xyz12le             831ff03c1ba4ef19374686f16a064d8c
+ya8                 dbb99fbcdc204aaa1a7397ff561f1a67
+yuv410p             5d4d992a7728431aa4e0700f87fb7fd8
+yuv411p             7e1300e89f5bc07939e2c4a6acbdf267
+yuv420p             a014c7eb7a8385d1dd092b7a583f1bff
+yuv420p10be         f9b154364efaa1af376fa6d8eeae6955
+yuv420p10le         15c83294ef560d57f25d16ae6e0fc70c
+yuv420p12be         34da9c4e289124122ba36a9d4fb133fa
+yuv420p12le         c19a477a07fcf88e37ab37b416d064c0
+yuv420p14be         64779858686946fc0e780baf7c1391b6
+yuv420p14le         c1d012a4f9d54fbc8b04fea96d85e903
+yuv420p16be         268b07358d8dc733ee81d0b87990d5af
+yuv420p16le         dae8da9edd4255051e3e546ae7ed9bd3
+yuv420p9be          37f0476e8458a93d3d22db568f617aca
+yuv420p9le          83a6d32c91c15a3bc334bb9abf920654
+yuv422p             74f8006b4482db104f1986f49807a0af
+yuv422p10be         7291903c3c0cf4e5456dd9673a619f1d
+yuv422p10le         14cbaa728e888534359b9dddc5430f08
+yuv422p12be         e9bc7f2da217fade40feb6960dcd894e
+yuv422p12le         8d8184e4d0f1eb50e1834ac0c4af8c33
+yuv422p14be         2617c569ae9659d8fe6a01f96e2c9657
+yuv422p14le         7d01363cf090306cf93337c474cd8827
+yuv422p16be         86147d8bfb795ab1873c899611e2a361
+yuv422p16le         9df47cb7d6d39b335a547ced2865e72e
+yuv422p9be          338dbb97c9f5a12ccea2c61774ddff2e
+yuv422p9le          0822f8af35a269a036ae44878acba87e
+yuv440p             98d0f96fdb3ba415899017adf7d4a4f9
+yuv440p10be         d874167042037c1daf9b9a2f74bffad9
+yuv440p10le         3cfbd921369aa8f1e4977efdb7f44c8c
+yuv440p12be         dc3e6a40c44d5a5f9fd260b270e9037f
+yuv440p12le         2fff7746ae7c07d407075c0e372baf46
+yuv444p             8f90fb3a757878c545a8bfe5d19a9bab
+yuv444p10be         6683d5cb82c708d5f3a2a89d0311f7a4
+yuv444p10le         6d736fa464ff2de2b07e0a56af8444b7
+yuv444p12be         04320ad158450ee158f84a27c6325702
+yuv444p12le         08a81b2ea9c7c8b447e40ef8f4a46a4a
+yuv444p14be         ea3057d469d0c49c24e844256ef7871e
+yuv444p14le         940f5908ccf06e01411f0a7bddb45c6a
+yuv444p16be         aee24ab2e9a4656f889399f1b0d98639
+yuv444p16le         781c22317c02b3dd4225709000bdb847
+yuv444p9be          ac09917e5d2abc82c0d260007f4dfd77
+yuv444p9le          caef947b8aff5b52285385c6ae9b2439
+yuva420p            b227672e56215e184e702c02a771d7f3
+yuva420p10be        f66e7d677625380f7504867fab51305c
+yuva420p10le        01e94ee605714396e69b013c11dda348
+yuva420p16be        76e5e65eae1e7c5681a397a3462f4a9d
+yuva420p16le        b1930ab28ffe031c78ca28d3406311c8
+yuva420p9be         48dfa24cf0ea3864f35285074e8fa888
+yuva420p9le         0e9c9803aaaddc9f38e419de587793c2
+yuva422p            8f6bb778647e5dee62f544d646321171
+yuva422p10be        2f7204c93a1e5bfb04538852f99e4074
+yuva422p10le        c8082548aca999edde77ef2749b1ff4c
+yuva422p16be        427ad55f7464121bb3ce164641772bc6
+yuva422p16le        af6f8df651275de58129e010bb45ffcd
+yuva422p9be         47579cc2cea861ca1461589b80c4720f
+yuva422p9le         aaeab2bfe80a29390e8666103ed8bb40
+yuva444p            459fad5abfd16db9bb6a52761dc74cc1
+yuva444p10be        fa16bae4fc25429deb944ffa9f5b28a0
+yuva444p10le        92f820d3481b7ebcb48b98a73e7b4c90
+yuva444p16be        c80c1899789a6411d0025730efc8f01c
+yuva444p16le        2ed56ea50fafda4d226c9b133755dad8
+yuva444p9be         4903fde22b15d28da90761ac1cfcb1c5
+yuva444p9le         4eeb5988df0740fea720da1e31bbb829
+yuvj411p            e003eefa7e2a20f20d33767775417216
+yuvj420p            8f3d8f1b4577d11082d5ab8a901e048d
+yuvj422p            79d480e99e610112f266c833c6cb3d35
+yuvj440p            f4b18310c7174868fc92579f87460876
+yuvj444p            b161e6d5a941e2a4bb7bc56ef8af623f
+yuyv422             435c92283b538aa3d8fa2a020b0afd49
+yvyu422             8436c2a760291cc979e0dd62ab8cede0
diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad
index a3d455abd3..e777211cd9 100644
--- a/tests/ref/fate/filter-pixfmts-pad
+++ b/tests/ref/fate/filter-pixfmts-pad
@@ -1,17 +1,69 @@
-abgr                3dbc32909d43adc2a00f8dc267f4954c
-argb                f35a99b4c7334d30d8338b5091ff42bb
-bgr24               b946a53a21bee12c6bacf7c9eee0464e
-bgra                c12f833549d02143495031161167130e
-rgb24               203a6870c2e78acdd88594204f48485c
-rgba                3cae5f1cd260be32a588ad9ee00d761b
-yuv410p             f62c12181d4367bcd22a114288f8ab63
-yuv411p             7ed82814854efe8b6ecca1dddfcf2f4f
-yuv420p             776d85a7a7f60f87bae5ac01fbefc8e6
-yuv422p             31de52cc5bc44973397e29e40a72f10b
-yuv440p             87666e1ff40ef0d6145d583dc9e0593c
-yuv444p             1b1e0dde6f5d663ddc80cdf69554327c
-yuva420p            4a36d4bb207e898058e72f8aaf2aa86f
-yuvj420p            4d1ec70f1ba1eb04b16113807c78c534
-yuvj422p            fcf366fe525a5be6e488542448a10e30
-yuvj440p            2315e0d1bcd2ae6493207149abeaf97f
-yuvj444p            6da403666e2d0110161ccf0737fb35aa
+0bgr                7bc6f5a1c44cdd7506174dccf52c68d7
+0rgb                ff12e0f1e576b47a4c962729d5c0b868
+abgr                52738042432893de555e6a3833172806
+argb                2a10108ac524b422b8a2393c064b3eab
+bgr0                32207a2de1b2ac7937e940a8459b97c0
+bgr24               f8b65ad845905c7d0c93ca28dfbb826f
+bgra                929aac15e848038e367c250037575f9f
+gbrap               5f16cccab5a17cb766c882e865995167
+gbrap10le           a677322100409f9b1d22136b14bfb534
+gbrap12le           e0e43f838cfbe98086042ba54b5f70be
+gbrap16le           0f4414db67b84a720106d7a3b2435766
+gbrp                3c94d39256db2409015df913fd330a90
+gbrp10le            5b356737cd8a396f39bbdadb7cb35e06
+gbrp12le            91fdad0d1edf7bfa2805e2041e8da3cd
+gbrp14le            deb2c3af6b48faa52f6a1f6590a0cdf7
+gbrp16le            a6156d1a37e05ee621b2a343fb158bd6
+gbrp9le             9e827f438e081d334a6cae7e282698b0
+gray                ddc663a0491df3959d9c5795dceaa72e
+gray10le            e6559c1c8c05ce89f44b465573db44e7
+gray12le            1e6c6757658c7ae8a1f830432c5b7722
+gray16le            468bda6155bdc7a7a20c34d6e599fd16
+gray9le             f8f3dfe31ca5fcba828285bceefdab9a
+nv12                381574979cb04be10c9168540310afad
+nv21                0fdeb2cdd56cf5a7147dc273456fa217
+rgb0                78d500c8361ab6423a4826a00268c908
+rgb24               17f9e2e0c609009acaf2175c42d4a2a5
+rgba                b157c90191463d34fb3ce77b36c96386
+xyz12le             85abf80b77a9236a76ba0b00fcbdea2d
+ya8                 5fc0f471207ddf7aa01b07027d56b672
+yuv410p             cb871dcc1e84a7ef1d21f9237b88cf6e
+yuv411p             aec2c1740de9a62db0d41f4dda9121b0
+yuv420p             4398e408fc35436ce4b20468946f58b6
+yuv420p10le         74518a7d68457c54da3300e80c683e9c
+yuv420p12le         32086c64c814315aa9253580708a192e
+yuv420p14le         265e9fefb8b92f3cae678eb3cf4e00b4
+yuv420p16le         1ca89e47164d5f2481e39d4ac6eab2ed
+yuv420p9le          59f0209084d1d1dd2861e058d1df63f4
+yuv422p             e43d68568d9f782908ba56bf1e09d5d5
+yuv422p10le         18667cf7f87d8ffe1c4cc3db2100c559
+yuv422p12le         71e32220fa1bbdcac95fb57ba0dbd4f0
+yuv422p14le         a0064be4d29079a811e5a315341da09a
+yuv422p16le         836057e9999c763697c66c21869492b8
+yuv422p9le          3213bed797e7b4cefa4f174dc33bf246
+yuv440p             a7e34de74c96b0224fe1381ec1db2ba7
+yuv440p10le         f91a481e27be7ea4a38a878e5e4330a3
+yuv440p12le         0e9953a09ac09fe5f1523b350cf7cb72
+yuv444p             6bfd89286dc36f2789b77d747ed8fa22
+yuv444p10le         b10afb5fda970dbce8aac5aab981a8cb
+yuv444p12le         8f1b4b0f91d309fdaaec8a1ba6c7107f
+yuv444p14le         2a87a84fa01237de9c08dd7e9ffbf78d
+yuv444p16le         28508867fe7470c3539f8a84e8fb8271
+yuv444p9le          99d39ef897c6037d6c7aa6e7a0398f84
+yuva420p            842c27169ecdcf6de79f2b787367b51c
+yuva420p10le        336fcb42c5b665c2028661e73325b359
+yuva420p16le        ff45de790e7bdd3c25d8aad51289aba9
+yuva420p9le         8ef1f3b3e01b5ce222e4caeec3dec396
+yuva422p            91dcecc4bfdff1f0db9ef8b9b5b9ac2a
+yuva422p10le        1ba292c74c8646fd077a6116142b1bc8
+yuva422p16le        383226550fe9c93d6e8bf0d45d1423d1
+yuva422p9le         0fb76788c905c6d448143aa3c5eae116
+yuva444p            fb60941a57596b277417a3c7c00aa194
+yuva444p10le        251ea4ead8300d752eb355a08cbb0352
+yuva444p16le        5b65287e1862d2d9f1ad2cfdcde94661
+yuva444p9le         e6946c10b94c271e7ea24b3bcff314e1
+yuvj411p            ca967e68759a4956729dd366adc7e7fa
+yuvj420p            c00611cd5f1558047d579d8a7d30e381
+yuvj422p            b3acdf07147a7598836065836ad8420b
+yuvj440p            3446ba4b1d7fdf536c926cee643c2b35
+yuvj444p            3b0f1a185af048b9e0b202d003fc7e62
diff --git a/tests/ref/fate/filter-pixfmts-pullup b/tests/ref/fate/filter-pixfmts-pullup
new file mode 100644
index 0000000000..c6ddb3489a
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-pullup
@@ -0,0 +1,12 @@
+gray                415c928947f83f9b45c24ad15a094bda
+yuv410p             0f29d0b6394871e1e6cde484b4f351f4
+yuv411p             ec059b1992e1acda472b9b2dd3e4506b
+yuv420p             dba6303cd02cc39cb0db7b546793d565
+yuv422p             d7d3224dd900bb1b96608a28a704360d
+yuv440p             d4c5f20701cfceb4bbf7d75cfcc13514
+yuv444p             7e405274037e7f2ab845d7413a71e16d
+yuvj411p            dc602e7bd3449d16e17e695815616b1e
+yuvj420p            b98ec86eeef2d512aeb2fc4d32ffa656
+yuvj422p            f09c3240bb662477b76ce4da34b4feed
+yuvj440p            8d3ab69e2bbbbbd2f9be323c18922533
+yuvj444p            2dc27560eed5d685354796dcccce853c
diff --git a/tests/ref/fate/filter-pixfmts-rotate b/tests/ref/fate/filter-pixfmts-rotate
new file mode 100644
index 0000000000..e4ed81e71a
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-rotate
@@ -0,0 +1,34 @@
+0bgr                4060279c35dd8810a2f55a021b836557
+0rgb                527ef3d164c8fd0700493733959689c2
+abgr                023ecf6396d324edb113e4a483b79ba2
+argb                f003b555ef429222005d33844cca9325
+bgr0                6fcd67c8e6cec723dab21c70cf53dc16
+bgr24               4cff3814819f02ecf5824edfd768d2b1
+bgra                3934fb81a602dfa7d29420b1a66f0fd8
+gbrap               98d30987407c51e5620921e11d40a4ff
+gbrp                5fbc319e30110d19d539f5b274eddb6d
+gray                188590b1231afd231ea910815aef2b25
+rgb0                0de71e5a1f97f81fb51397a0435bfa72
+rgb24               f4438057d046e6d98ade4e45294b21be
+rgba                b6e1b441c365e03b5ffdf9b7b68d9a0c
+yuv410p             5d4d992a7728431aa4e0700f87fb7fd8
+yuv420p             a014c7eb7a8385d1dd092b7a583f1bff
+yuv420p10le         15c83294ef560d57f25d16ae6e0fc70c
+yuv420p12le         c19a477a07fcf88e37ab37b416d064c0
+yuv420p16le         dae8da9edd4255051e3e546ae7ed9bd3
+yuv420p9le          83a6d32c91c15a3bc334bb9abf920654
+yuv444p             8f90fb3a757878c545a8bfe5d19a9bab
+yuv444p10le         6d736fa464ff2de2b07e0a56af8444b7
+yuv444p12le         08a81b2ea9c7c8b447e40ef8f4a46a4a
+yuv444p16le         781c22317c02b3dd4225709000bdb847
+yuv444p9le          caef947b8aff5b52285385c6ae9b2439
+yuva420p            b227672e56215e184e702c02a771d7f3
+yuva420p10le        01e94ee605714396e69b013c11dda348
+yuva420p16le        b1930ab28ffe031c78ca28d3406311c8
+yuva420p9le         0e9c9803aaaddc9f38e419de587793c2
+yuva444p            459fad5abfd16db9bb6a52761dc74cc1
+yuva444p10le        92f820d3481b7ebcb48b98a73e7b4c90
+yuva444p16le        2ed56ea50fafda4d226c9b133755dad8
+yuva444p9le         4eeb5988df0740fea720da1e31bbb829
+yuvj420p            8f3d8f1b4577d11082d5ab8a901e048d
+yuvj444p            b161e6d5a941e2a4bb7bc56ef8af623f
diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale
index e1737f0b20..f43c519428 100644
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@@ -1,103 +1,141 @@
-abgr                d7f91e65b25b81f43e8b4d5076116fb1
-argb                3b1964f62ab059fc8d692c63f1fc450c
-bgr24               dcc565b1ffcdae2f60e9759d4d33f596
-bgr444be            ba5750740f17cb862e56628683b64258
-bgr444le            2c872b0b91347a35ca00cad816ff3f89
-bgr48be             650aaa8f7db84bcf5c6f2b3da86ee803
-bgr48le             90b82c85b88296fff879c60f21182ae6
-bgr4_byte           7b4e4dc6ae1cdf9e18d9eba79a5b7d23
-bgr555be            80fb87c21c07bf833926c9675ebbe01d
-bgr555le            4539913198858f1bc3899aad97ad105a
-bgr565be            ac67f35b6bc7835d1fbfeee3ef89fd59
-bgr565le            34438643c183ff1748cf7d71453f981c
-bgr8                e731ba3dbec294e1daa7313e08e88034
-bgra                6e1f417ae41636f631de1cfe39ce1778
-gbrap               eefdbfd1426765ce5e9790022533db0d
-gbrap12be           af4acb3ad0a6630f6ec4534e4d2e869a
-gbrap12le           90ca5271960dc1ebd6ebe14189223e36
-gbrp                5d14768d2ab6cbf3879966b5d5c6befb
-gbrp10be            4192c246f4a52ec7a37919665190cce9
-gbrp10le            170189b2c2dd46f31165d8fa6cadef0a
-gbrp12be            996265700d1ef082358974f4ad6529f6
-gbrp12le            735061c07442657580577d1cede3a636
-gbrp9be             01c837e1def99abec205b80d21b68bf0
-gbrp9le             dd982d59c3d71c3b201f2d9363d8952c
-gray                4c571fb634a75f177b64cee168fbf3a1
-gray12be            d237d56e08482038ebc5f3943d6ec8d5
-gray12le            dcd15a0ed89bd019cc367b552fc9b1c0
-gray16be            9b57ff7d2090b47e4427bee79dba0d9e
-gray16le            17d2c00c6ffe346dfb632d927ebbf30a
-monob               e28955319a03f1850c467f8fe65b2a22
-monow               69334639f5298173154b262d9054e384
-nv12                e7638156463b059aa75b1d667c89367e
-nv21                adbed0790db2c85c9e777a84acf0c290
-rgb24               6187e90455674633e7d08451a99f17b1
-rgb444be            4ad70310205575f370fa7a9ebee119a2
-rgb444le            db9a9973e41a0d583d9c1b536e7717b3
-rgb48be             ae0836178249743c91867ee057baf7d9
-rgb48le             49564ae5cab04678889064b1132b44b8
-rgb4_byte           62269884de14b7defbdc7fb8044203c3
-rgb555be            3a1c13bbae95358f9cc23f4a138d4867
-rgb555le            fbd6b3d1847ee6c9ba9033fce72ac18e
-rgb565be            fdbb84b9f559b4ba14c1407218c79795
-rgb565le            9cea852347ca6ba09944f577ace89d2b
-rgb8                eeb820691b7fd1cb07a0fa066098f926
-rgba                68a05bdcf4abe3b92353d1e4386c94c9
-uyvy422             1d9946bcceb6d13cf0f0deda322a9868
-yuv410p             2cbf84ef9f283b00aee46883653dab8c
-yuv411p             091777fdfffa2dccbfd75769d1a402c7
-yuv420p             4f0105b3f2008bff284de251fe61ce06
-yuv420p10be         caaee5d071cccf50cc51c70f7a233024
-yuv420p10le         06c47286459599c62b25466e2ee3c91d
-yuv420p12be         b549289c041b852f0fec07d2cca5fb16
-yuv420p12le         df151f2b0a8bb7062d35b515cdffca3b
-yuv420p16be         10ba255f3901b5d47d3ac803fb787bcf
-yuv420p16le         38c42f658cad8546bfc465b72f6312ab
-yuv420p9be          17cd0ca2d12fd972045271e06a14b711
-yuv420p9le          38289963713431c8b4a2e7c08b8564b6
-yuv422p             66f47bfad422275bd07b2881760d09a2
-yuv422p10be         00504b09c67e203fc29cac3ae2aa91db
-yuv422p10le         b8b38a8d1f1eec3915b628c873bf756a
-yuv422p12be         0ab7660a9a52abe41edf8d6b3f75942a
-yuv422p12le         bde450e4b79a13aaaba8233df3c51f4d
-yuv422p16be         2f12b4fb816afcaa77e7359b95f25532
-yuv422p16le         3913bbbd4b0aa8038e8565c7312e25be
-yuv422p9be          f86744d026c3a65d54c737a93e80093f
-yuv422p9le          ad53382760dcf7cce4317247aa0058f7
-yuv440p             4713a7b7ce80dd06923626d13589c098
-yuv444p             fd733672651ad5bbffb046fd67151fee
-yuv444p10be         34b38d54167df70044bdc08518d91009
-yuv444p10le         0812e3371c9589c6621408812f9e7a27
-yuv444p12be         4fdc4bf4036c40ff575f9bc2229bf5d6
-yuv444p12le         4a9ec677190371ef5e342ffac1ace735
-yuv444p16be         e89fe5a4624ed06603580b4a74af9170
-yuv444p16le         6944d11048ff4013c5e60359faf1bd2d
-yuv444p9be          04a950e843d099eb9ade2ddcea494fb3
-yuv444p9le          918015450d5ab87600de64bbb7b33a10
-yuva420p            279eec11fe81f48a6cf2950fe097c51f
-yuva420p10be        b9178665f4ff9512b10552f212157a94
-yuva420p10le        a627c535ced8514f2e1d1b78e73ca046
-yuva420p16be        2ec22c863c67bcba0295e125d0fa9f3e
-yuva420p16le        98725d82a8cc4cf0d2c8673a4e7a7904
-yuva420p9be         44cd32fba1717fc8cf0e11e23a2b601f
-yuva420p9le         bcc9e4b4e78d032e2f7b7ced418ad218
-yuva422p            026c5cdefe5d34892e0bacbd0a59c71e
-yuva422p10be        69926b201407ed64fc84abe878be9778
-yuva422p10le        3a4f9779467d055e85aca502fdec32d0
-yuva422p16be        7cdacc54f1fdcad30a69fffa393280e3
-yuva422p16le        ab4a73cd006559cc8a276f37e481a817
-yuva422p9be         e517391bb53c4b0f8399a5b3155bbbf9
-yuva422p9le         6b66e4543e1fa4583909cfb03bf842a3
-yuva444p            b931c613cf41f29673cecc0d6e8c3ef6
-yuva444p10be        3ae3aca8e9d72905df4db6e48cd1aa28
-yuva444p10le        780a786f9205a40331a6ab4ae1b976f2
-yuva444p16be        48e17ea2342cd07d5c2996610f33e543
-yuva444p16le        c42df24e7389fa3ee44b05dfc973a482
-yuva444p9be         26cb299ae97a75a86df04daea1d0999c
-yuva444p9le         c3e986b78252b413c08d77bcf9da5ab1
-yuvj420p            72ccdc3bd9a363a3b6f1072060df0518
-yuvj422p            278fd54d0e21a3958c46b7f1e680740f
-yuvj440p            413af44fd797db64eb5e72ff448c9ae9
-yuvj444p            9b59dd2345672db000d8baa4a2bc1e20
-yuyv422             dcf49cd849d061a7dcec8bd72adee30f
-yvyu422             c8ef92b4a717f832ff150ea6e78c7e65
+0bgr                0576e427ba28f19e55a856f528e7c282
+0rgb                80a58af8c639743307207ab4b69ca863
+abgr                63f2eaa8712ea6108985f4a0b83587c9
+argb                f0e17c71a40643c33a5bcfb481f6d8f8
+ayuv64le            59fb016f9874062d0be77cb3920ffed2
+bgr0                243d58ca64f97b2f415b4c63cb79f0e1
+bgr24               18744aaab4b8bce065a7144dc0ccf921
+bgr444be            920760bee08c4fa161bf060e21ebba92
+bgr444le            01be36a28ebca1a11eb4d192986cd4e9
+bgr48be             3ae02769c69d2512eaa26fff65763acb
+bgr48le             a6ce2344f07b77438258b6787fe5c24c
+bgr4_byte           01efea74088e5e3343c19ee053b95f31
+bgr555be            ab353278d103d379e1ec86e5cabb645f
+bgr555le            16ccbf59297e4b9ab25fd8af5a84a95d
+bgr565be            3477e19fc11f95285836f30fdff26c1d
+bgr565le            82a81e7c9d4e0431fa22f4df9694afdc
+bgr8                2c57e76ccf04d51de6acafcf35d6fa70
+bgra                d8316272bc3a360ef9dff3ecc84520a3
+bgra64be            4e6a1b9f9c18b881c27d76611d45f737
+bgra64le            efeee0abcc658ebcff049d5e74d74943
+gbrap               4a100f750ac846b34bfeef0d6893c3de
+gbrap10be           6d89abb9248006c3e9017545e9474654
+gbrap10le           cf974e23f485a10740f5de74a5c8c3df
+gbrap12be           1d9b57766ba9c2192403f43967cb9af0
+gbrap12le           bb1ba1c157717db3dd612a76d38a018e
+gbrap16be           c72b935a6e57a8e1c37bff08c2db55b1
+gbrap16le           13eb0e62b1ac9c1c86c81521eaefab5f
+gbrp                dc3387f925f972c61aae7eb23cdc19f0
+gbrp10be            0277d4c3a8498d75e2783fb81379e481
+gbrp10le            f3d70f8ab845c3c9b8f7452e4a6e285a
+gbrp12be            fbd4e149c452c351c6d1c11d6b6e176a
+gbrp12le            c51d51c3b753d735eb22983397262c88
+gbrp14be            cd20808592e62cc439786c18a14b3e70
+gbrp14le            456f7d1ff5990aa6379137d84dd63862
+gbrp16be            5fc826cfabebfc1442cb793c4b6303e2
+gbrp16le            1b3e0b63d47a3e1b6b20931316883bf2
+gbrp9be             d9c88968001e1452ff31fbc8d16b18a0
+gbrp9le             2ccfed0816bf6bd4bb3a5b7591d9603a
+gray                221201cc7cfc4964eacd8b3e426fd276
+gray10be            9452756d0b37f4f5c7cae7635e22d747
+gray10le            37fd2e1ec6b66410212d39a342e864df
+gray12be            950de5d1b6b943a26c51f6a157e19a14
+gray12le            9c3b154a8bb0a73a3b465892dbc23b36
+gray16be            32891cb0928b1119d8d43a6e1bef0e2b
+gray16le            f96cfb5652b090dad52615930f0ce65f
+gray9be             779dec0c6c2df008128b91622a20daf8
+gray9le             fa87a96ca275f82260358635f838b514
+monob               f01cb0b623357387827902d9d0963435
+monow               35c68b86c226d6990b2dcb573a05ff6b
+nv12                b118d24a3653fe66e5d9e079033aef79
+nv21                c74bb1c10dbbdee8a1f682b194486c4d
+p010be              1d6726d94bf1385996a9a9840dd0e878
+p010le              4b316f2b9e18972299beb73511278fa8
+pal8                29e10892009b2cfe431815ec3052ed3b
+rgb0                fbd27e98154efb7535826afed41e9bb0
+rgb24               e022e741451e81f2ecce1c7240b93e87
+rgb444be            db52b9ecdf98479b693e3f4bd9e77bac
+rgb444le            63288425c05f146cde5c82b85bb126e0
+rgb48be             45b25016f10d54cf36eef3479afd8249
+rgb48le             40577b147620ecfb115717473d000697
+rgb4_byte           9e540a2e7193ebcbf1c7f85d192a0c4e
+rgb555be            cb5407a0d40f3d0120155daeaaa9a222
+rgb555le            c15540d1fc887882c35860634009c439
+rgb565be            c69fa7d6e458509de65e911d147629a8
+rgb565le            a4a6ef89cdc10282b428cb1392f2a353
+rgb8                bcdc033b4ef0979d060dbc8893d4db58
+rgba                85bb5d03cea1c6e8002ced3373904336
+rgba64be            ee73e57923af984b31cc7795d13929da
+rgba64le            783d2779adfafe3548bdb671ec0de69e
+uyvy422             aeb4ba4f9f003ae21f6d18089198244f
+xyz12be             c7ba8345998c0141ddc079cdd29b1a40
+xyz12le             95f5d3a0de834cc495c9032a14987cde
+ya8                 0a9db5bb4b009de9197eede5e9d19e16
+yuv410p             e8f49b5fb9335b62c074f7f8bb0234fc
+yuv411p             5af32557c93beb482e26e7af693104c6
+yuv420p             5d3ac239c3712143560b1dfbd48a7ddd
+yuv420p10be         95256d0cefca26429b2f41aabc9bee04
+yuv420p10le         1aae90a2cff18e516f004dae77ac78f7
+yuv420p12be         25a6da0f8045bc7bdeda544e1cf2387b
+yuv420p12le         c6e40a0851e1237281cd6500bef7a1fa
+yuv420p14be         b202fde5a53d529ddaa35c9467ff0b61
+yuv420p14le         36cac5d88b0d566cf835e84da6513e5a
+yuv420p16be         6f307c5b1a5941023f9029cb3a616f5c
+yuv420p16le         11f4bfbd4a058b58aa26dc47a86061f7
+yuv420p9be          aa0d83ca3cdb5770e47dc007cf5f7324
+yuv420p9le          0e6ade4219bdcbce32eceafc80d995d7
+yuv422p             9823e4d6bd1482b0cab3c44dab67f0a7
+yuv422p10be         42b9b936392b4a6a678028ace2cdcd20
+yuv422p10le         4bdc5e9ab3a16409600887335dbb1a66
+yuv422p12be         af6ec8146dd7860b510017c22e8d0c80
+yuv422p12le         d69676f61d2693cfd163b3ce3f79fb56
+yuv422p14be         2a005a86b80b947c953d11ae170551c7
+yuv422p14le         dcbde0634eb70bed62dde097c80a1643
+yuv422p16be         a772b46454e415ce454c0999ebb71486
+yuv422p16le         b4f64306c671ba4aa2eb23732ee02317
+yuv422p9be          8313b67817cd81fe768bdc5c2f3fffb1
+yuv422p9le          39e9236c5005bfee5399c29e379964da
+yuv440p             483b8427cef7ab9c94d6b3f26d0ab094
+yuv440p10be         b93618311430e216a3d6736182fe7c04
+yuv440p10le         ca2c882018398d2a126c1ec65e8336d8
+yuv440p12be         373ab37ba2498cb11de24218d686e0f8
+yuv440p12le         bb9ffc3033fe32b9ce3233524ed5ab70
+yuv444p             098f01e6790e1e6beff8d604120c2664
+yuv444p10be         024ee33cac7b5b7b225d7acb9dc59da3
+yuv444p10le         a085fff2fb81d76753da689aee365b55
+yuv444p12be         a181627b93bd9c4c384b83e17d373a7c
+yuv444p12le         97e47326ff0efe89c295fd9ddb0ca854
+yuv444p14be         3eac31f0d4969210640de74914faf86d
+yuv444p14le         2c362c4cf167b7e2d83f4eb0dfaeb2b9
+yuv444p16be         a60c674411d64cc4b9fbf17039afffb3
+yuv444p16le         0a490fef1f2631367ee362d20a336efe
+yuv444p9be          040bcbb962c19e390482301933622930
+yuv444p9le          16b65bb696a8931c7ab69501a7f93cfd
+yuva420p            05a12916f04859bb2c9a6decf624af74
+yuva420p10be        df8b3acfa7ac6ad96929aac1aa6c0102
+yuva420p10le        a5cc4bfc952ad1bc6f033d136d5a821c
+yuva420p16be        01c74149a6696d0ee71232881622ac3a
+yuva420p16le        c78a814ad6a2cbbab4b422724f0c7ba9
+yuva420p9be         57b730421849f8ccfe7913c664396376
+yuva420p9le         1fdfcde9cf7ef1d41002175b5793435f
+yuva422p            3a80cb3e08782033aabfeff1e8969403
+yuva422p10be        94b13db95ceb970ded9773c095ade7d4
+yuva422p10le        544965627ee94964b9cc57750c385b31
+yuva422p16be        95be33f9599958669f3c1cb24e54a5e5
+yuva422p16le        ed83cc6e8fb70306d0622962504d1fcf
+yuva422p9be         5ff6aeca90b8392133d7b1addfbd639b
+yuva422p9le         451965b076c628b0eabaa4ef33f98ded
+yuva444p            f120326d9d940c9ac5cf5fd160969b82
+yuva444p10be        1838cd61a24fda56a7379c9cd9cb1629
+yuva444p10le        c5c2f602caab63c58954f5a80691436a
+yuva444p16be        39ca2e32aa61b210b6c528855d24a16b
+yuva444p16le        cd2e0a001d8175f2204b2eb411c6a801
+yuva444p9be         58add24afbf43ff0ff7079cc1948fb56
+yuva444p9le         077c8cec2c374163d7f7eae27e797bdb
+yuvj411p            d1076331c75ca66bf62497edbd8384f9
+yuvj420p            10390e6dda9cbb4c61fb88bcbb49fc3c
+yuvj422p            996f6672566a4dcd8d272f48f058d49e
+yuvj440p            3d80c9f67f8ef9b2d8a9ae2d37b464a2
+yuvj444p            9f858b9ca3fe949611147414573a904f
+yuyv422             1704675eff94ad0a03a9a6a3ddf5e0df
+yvyu422             516705a40f43d00e9c41ff47f4f7b802
diff --git a/tests/ref/fate/filter-pixfmts-super2xsai b/tests/ref/fate/filter-pixfmts-super2xsai
new file mode 100644
index 0000000000..3c7e65ab5a
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-super2xsai
@@ -0,0 +1,14 @@
+abgr                e21be14b5fe9d7a29740a418c325b17e
+argb                563489534663cb2b32beed2b41370c37
+bgr24               a933eac9bb53c3ce3c33950b229996b5
+bgr555be            d6d14ec3ae9ffffed3006a253e9b9a9a
+bgr555le            70b819425f79f823356229b90b41cc84
+bgr565be            4ffcc26e740622ffd3314fe251e97804
+bgr565le            6fb9dc50a81b853800ba65d5ec6b8417
+bgra                e9cc6644e2f35103c241094ab4bb8fec
+rgb24               3fd7653f414f350ddb0c0a236ce0c809
+rgb555be            0f34c006142babd10065d90b8c2ce3d6
+rgb555le            53325a20c913826566880eb25d1d2946
+rgb565be            9889faf1a636161f3049b78e92db7d89
+rgb565le            14fe550f449a7539d9f1e99e85cf40f1
+rgba                7041184d35c316e73e849504b64bc4f6
diff --git a/tests/ref/fate/filter-pixfmts-swapuv b/tests/ref/fate/filter-pixfmts-swapuv
new file mode 100644
index 0000000000..e02380988f
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-swapuv
@@ -0,0 +1,66 @@
+yuv410p             c87be6ce12b2d505935893b733e21ee4
+yuv411p             2a8b6b718d437e0bd15b614ea0723a82
+yuv420p             60976c86cb8b9a7ac3a11ba874134f22
+yuv420p10be         84f6ed35268d552fcca83629ab6aa4dd
+yuv420p10le         559e8f10eab594de72d2b081bf9d480d
+yuv420p12be         f4650c64b173a906d33719e49c0cfb9b
+yuv420p12le         26370ea437474d2b53ace1e55ee53faf
+yuv420p14be         970fa43a1470ddedbd874c726a519293
+yuv420p14le         5a18b1d6f439077208556f2d2a80becd
+yuv420p16be         97009aa152a4c6dc383b75c551ffa71c
+yuv420p16le         e7201caa7838647aefee41ae9e098110
+yuv420p9be          1fddc5d7f64f642fe888c5e0a8a4f499
+yuv420p9le          6e111f38dddfeec499e162f17244362d
+yuv422p             80c6bc82f4bc330df1895c8f998e34bf
+yuv422p10be         0aeb0cd5949ee258355fbe4ff2f84a56
+yuv422p10le         1bfff133885efb1c44dfd9191b6f241a
+yuv422p12be         d0b86084ce9330782fa24c4bdb3f6bc1
+yuv422p12le         d46f2dd548a3edc0b1e3870ce112b722
+yuv422p14be         91a75ccb62fd1149069c6b7b26fe195d
+yuv422p14le         dbec6e0152daedafa161437fc931b1e6
+yuv422p16be         c5de1a3fd28f647cb14d293061312f80
+yuv422p16le         56d4e3285312b1a24f299bef44f4dc15
+yuv422p9be          ee90a48d7bbb9973e9152e80d58bfe4d
+yuv422p9le          c6cacd918669ffd24732281bed2e61a6
+yuv440p             563fd94ba1ddde6f3cd34a815ec03165
+yuv440p10be         2aadf346979813cbb336c0a543fe243f
+yuv440p10le         9e34483ca0850e2d701a8a6d8ca9a0f1
+yuv440p12be         287406f4129717ae52d0c443cf42c207
+yuv440p12le         ecbf69ad94f2917251f1ee642c82e8ae
+yuv444p             184ae83da74e478595258db9e6af0827
+yuv444p10be         224d0e8ed36e9e72ed171aeba6483523
+yuv444p10le         b525bc915f533a2a82b3ce525693bb9b
+yuv444p12be         afdf75fe13ae792c4e0fa2cfb9e5bd1e
+yuv444p12le         f161ba8f5c036deac7def77ccbda67b7
+yuv444p14be         c87e248a2c605515f11afd8f1251db67
+yuv444p14le         3085381c2b70642fc95c6bb153d766a1
+yuv444p16be         3d99c4af5cc1ddc3144a10e0b2b75951
+yuv444p16le         56f7022d0aeb4c4f56c6451e431d5390
+yuv444p9be          3d86a8c9cc4af8ecc692578384e01ffe
+yuv444p9le          65b78fabc21cad07cfd209f2c27ae0be
+yuva420p            8afb004ce37ac4d9f881c138b25c414a
+yuva420p10be        7417eee3faa13dd69a2335996fd4ed14
+yuva420p10le        db1e7e8bc49adb2180d8dcef665331b7
+yuva420p16be        949443d63e99f714b2dfcb5b79033d5c
+yuva420p16le        22c6b3317ece86f461aec210179571be
+yuva420p9be         1125f7298fc3f69725ad793d16c2da12
+yuva420p9le         7f445bfa33b6875cc65b47cee24c3154
+yuva422p            a1bd5c90b7bde1d3657025612a6f231e
+yuva422p10be        05bcc2394cfb0406d37b942423f6dbe7
+yuva422p10le        c166994709af82b9cdcebe4a7057348c
+yuva422p16be        9599ed5721f52028c3acfeb7b33ddc87
+yuva422p16le        dbb74e0bb2cf732e39e669f60ec6e1cf
+yuva422p9be         39093fec98b02e83b7e20dab3e5e4cf6
+yuva422p9le         a0a6dd2e62ea01e8a2268c7d88385252
+yuva444p            ff2441de373fbfaed7bc199a7abe5a3e
+yuva444p10be        857043b712213eee329d2fb584d74c3e
+yuva444p10le        c3c451b3605af959a5d80146f4170e9d
+yuva444p16be        356d72791dfd91861b21630e315d40cb
+yuva444p16le        176591ce074ba8befc5fb279446ca1be
+yuva444p9be         675f0ed3e6572b05f06d9e44611bdff5
+yuva444p9le         bf3ea2bf123a3a1ceedf587682b85cb9
+yuvj411p            361c32e086bd27cf3ded194dc00dc9c5
+yuvj420p            553ac1af571391271d9715e2e8a4a5cc
+yuvj422p            39b613d01cacfcdd9eecf9e0d379a393
+yuvj440p            afed4ad98d6accf5811d439f3a687aa1
+yuvj444p            8de64aff4b7b3895d8cedd67cc10722b
diff --git a/tests/ref/fate/filter-pixfmts-tinterlace_cvlpf b/tests/ref/fate/filter-pixfmts-tinterlace_cvlpf
new file mode 100644
index 0000000000..99703fa1af
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-tinterlace_cvlpf
@@ -0,0 +1,25 @@
+gray                9849d71519ae9c584ae8abfa8adb2f8e
+yuv410p             44ee4b74b95c82d6f79ddf53b5e3aa9d
+yuv411p             5fa9d1fba7adfd6f7fa04464332b631a
+yuv420p             ee9591ea3ab06c73be902c4b8868c69e
+yuv420p10le         19b2dcf5e82725b2c9e366d5d3a4b67b
+yuv420p12le         e5b76eb58cab2dfa42738f665d8b8059
+yuv422p             b1be7b55567bde86d655adf80fac1257
+yuv422p10le         66f7433c7423d6289ee20c19c4e8dd90
+yuv422p12le         b4a4b5ed81341b36f685b14b2bb8a798
+yuv440p             ddf6ee697f4ff4f90d501e6869392309
+yuv440p10le         7e44a92d9e47e15f0728b125725ccd41
+yuv440p12le         c2cac82661e10be4917bd9dacb419fce
+yuv444p             7cb5d0c0997c8c2545a16bfc4cb9fd6d
+yuv444p10le         08fb13c69b40229014a6ccf0bdd5498f
+yuv444p12le         796c5559b9f426470eb2997c21be5d14
+yuva420p            ee0761e2f76ec441c545feede77103e4
+yuva420p10le        4bb6b3a1cbf2fd1fe5aefcc11ce8029f
+yuva422p            a8da2806e21a88449079faa7f4303ffa
+yuva422p10le        d2965b5b5a43a7165badaff0718a17d8
+yuva444p            a3f57734d6f72bdf37f8f612ea7cce63
+yuva444p10le        e020512901fd9ac7088898a4e3a8c7c1
+yuvj420p            9f358e311b694bcd01e1a07d1120ade5
+yuvj422p            9a7628a9f1630d35c7176951ddc1b2f6
+yuvj440p            112fe35292c687746ec0c622a42c611b
+yuvj444p            f894438f40950229baa02545daa8812a
diff --git a/tests/ref/fate/filter-pixfmts-tinterlace_merge b/tests/ref/fate/filter-pixfmts-tinterlace_merge
new file mode 100644
index 0000000000..fa6151c272
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-tinterlace_merge
@@ -0,0 +1,25 @@
+gray                fab3a7abc4f076cf926205aeacadbe51
+yuv410p             d4506e49eeb64c7ce714c07597e7dd69
+yuv411p             2e8bb385cb4a53a0f3771815020f7213
+yuv420p             c967d3d5f3200d1b2417b0f2356f12fc
+yuv420p10le         404d90eca9b93f7c0949be23187804c7
+yuv420p12le         eb2ef81b82f1342618e4c9fe8e086592
+yuv422p             febaa84ea2e3246af742a7ed37c030f6
+yuv422p10le         0dc5f3833c0f11a0fcd0422d76508c10
+yuv422p12le         190eb7e76af5fc481588ded472901b58
+yuv440p             13a934b42df65f11e153314ebb4f311e
+yuv440p10le         7fabea51d6e52b718ef3ab919b24f8d2
+yuv440p12le         c7b138374a18f258bdd1a2d21b4421b0
+yuv444p             45d4466f5689942a4effb0fd23e44949
+yuv444p10le         fde95627ba0e66be7ec863386b3e5ca6
+yuv444p12le         c1e15c934ce3bc562a869dd78c75db17
+yuva420p            dc1173a07c3f993b277ea0c94d513e1f
+yuva420p10le        d85972762437105a932759c4bb9759c9
+yuva422p            ca200be80e5bfdb159e1aea57129ed3a
+yuva422p10le        06d4f79ee2ddf31d9fe15af8ca573f46
+yuva444p            9f39c35d6899dcb8b9a9b07c339ca365
+yuva444p10le        b0c54fc3efad73f252d86127407aa1fd
+yuvj420p            844359293bb6ff81549f3fc0090cc587
+yuvj422p            526af049d43974822baa7b48aa1e1098
+yuvj440p            af9285194da8efbc40d93bf8109f9dc5
+yuvj444p            2a3f18b02c17a0c39c6245b8b3639b91
diff --git a/tests/ref/fate/filter-pixfmts-tinterlace_pad b/tests/ref/fate/filter-pixfmts-tinterlace_pad
new file mode 100644
index 0000000000..8f6b1c42e2
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-tinterlace_pad
@@ -0,0 +1,25 @@
+gray                7ef396fecd8d1c9fe32173e4415ba671
+yuv410p             35bc11d0d32efc9e9a969be7d720f4e6
+yuv411p             17ef3cd22a74f7368b5e02f68779f294
+yuv420p             93d5b6a4c44d67e4d4447e8dd0bf3d33
+yuv420p10le         14e754c6e9d41cb048ce3c93512d7d35
+yuv420p12le         ce54a2e38d121a7575dff30542facaad
+yuv422p             3ee40b0b6533b9183764b85c853ec3f9
+yuv422p10le         d4b61a84b93e74b07b7020ceed40e39e
+yuv422p12le         8fd90be12a97307645ecfcd09d576643
+yuv440p             1d3c1258a51d09e778cd8368b1a4126f
+yuv440p10le         29d116cb550a05920e5619ab58284d30
+yuv440p12le         d7518f941a3b2c137f944afe9da816a1
+yuv444p             1093568ad8f479ec20e738d018dd3f8f
+yuv444p10le         c65233e1d8b01f3369c20738f7386801
+yuv444p12le         70dc51a857bfb215b3a81fceb114b74c
+yuva420p            4588aef20c0010e514550c9391219724
+yuva420p10le        3181e84fd7aaed606bb86eecd2e13f20
+yuva422p            3426ed1ac9429202d8c29fa62a04d4c3
+yuva422p10le        c00acd7c437d41755dff09c5ca3642cf
+yuva444p            1b9fc791c7d774b4ba8c9dc836f78cf5
+yuva444p10le        616b42a232c83b8f9e5c5168ec4b5da5
+yuvj420p            9a872e0c1b3c0b6fe856415696b758bd
+yuvj422p            da3c9ef25528a2ee96746ce44e6969f3
+yuvj440p            a9a5495c6b0e2bf6e561998ea1c356a7
+yuvj444p            085214844e83ad47b4f33303db0ebee6
diff --git a/tests/ref/fate/filter-pixfmts-tinterlace_vlpf b/tests/ref/fate/filter-pixfmts-tinterlace_vlpf
new file mode 100644
index 0000000000..5a5f80b115
--- /dev/null
+++ b/tests/ref/fate/filter-pixfmts-tinterlace_vlpf
@@ -0,0 +1,25 @@
+gray                b79791449947c25cd5b36d9d3b9d1831
+yuv410p             5bc03f4cf6b441b421f0fdaeeff1e9ed
+yuv411p             19046df1876c46ed1ef0458680270bd3
+yuv420p             69c743b84996be9430b051a55cfbcb29
+yuv420p10le         85948ad609abded6b50882d459f5a2f8
+yuv420p12le         7cebe45f51bdadc766f66c68db8d347d
+yuv422p             d710ccd1941f6f389c97a09bc977e709
+yuv422p10le         c54873f77dac1d710fb2aa1b0ce2669c
+yuv422p12le         94a527bb787b9d121ffbbcb3a6c545d8
+yuv440p             1a482a23fe5a9b7d02388c299fd0a423
+yuv440p10le         506efa287ecce9c951da2039fa1de2ae
+yuv440p12le         631bcf190f409ccbc5c27b9f0f6ba5e2
+yuv444p             c968a92f4b7ab6706ee9b425eb5345b5
+yuv444p10le         0af437e635d49feccf7dfae201e6dfc5
+yuv444p12le         2e9e9f7caae1fae3b026810246fc6ac1
+yuva420p            3f89a166f309c0cda8b91a9e8a0ce937
+yuva420p10le        79de1cc549c03d4893cf6f1aca86e057
+yuva422p            ef8fdbe910d68e88e98227b0e99fb5a6
+yuva422p10le        257a4aec41f9b5412179272d8a7fb6f7
+yuva444p            3662eadd5f61a6edbc9d715ea8591415
+yuva444p10le        0905cf5b7f42c11be3f0486a66533c71
+yuvj420p            14c4390b319c5d679184503309060ac3
+yuvj422p            bbe00a26526931b72a024febe1cd6b90
+yuvj440p            f654cf28b7879c6a6c950c3cb9612580
+yuvj444p            c162a4fe7a665f4abf257443703f0d72
diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip
index 11a48c7c71..84b9d56858 100644
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@@ -1,103 +1,141 @@
-abgr                d8d94531620310ec8a731af8d7fdb0ff
-argb                8bc98feb8e990e4ff411663deb9aa566
-bgr24               0a56e4b125552a0660f85f9e3169323d
-bgr444be            a4c570c5a6abb38295141fb6f17670c3
-bgr444le            4ed7bb09f3f4f68a12ff2d8e7c837b5a
-bgr48be             9c5191d6db9c7b1abaa9f01b06f02fd4
-bgr48le             31e97c178ad0c4a18ad6690832dbff31
-bgr4_byte           8edfbb2878970f0d44fbf589664c821f
-bgr555be            be4a39677809398b4299c9fbf363290d
-bgr555le            15b938709fffc9348ea50cd46b918541
-bgr565be            3c48959244ef268a37e8b3732023e5aa
-bgr565le            6f98ccb05e608863ef0912b9a6fd960b
-bgr8                1f916a75563e6be42c056e7d973a7356
-bgra                dd8eaea69683884ea45bf2fb635ce415
-gbrap               38e04cbd4dc5566586d58ffed0c6b20d
-gbrap12be           c53126e45593f2e49451c9c9f58cffac
-gbrap12le           6d5b3a8f8aae74f3542a63bcd1179a6c
-gbrp                37954476d089b5b74b06891e64ad6b9e
-gbrp10be            ec01c15ed248a72c42f84a2a8cfec56f
-gbrp10le            be52e72a59d87a43727262bcd90967cd
-gbrp12be            0e1dc666ef119651664062afa3d24aee
-gbrp12le            b7b27715bc9054a93ba81f110cf42ee5
-gbrp9be             2ae8f0d3b079d6550a2b1d4a7c4a6e4b
-gbrp9le             c62df0f386c957cc9cacb3c8014542eb
-gray                684ba667effbbf5983f46a9bea4afaae
-gray12be            e33397832d19ec628f3e887e0a16ccc7
-gray12le            c8a8d7267e2595a0c4ce5d582bea23a1
-gray16be            112077b2f1c85cbd44907ed271901b28
-gray16le            1d7be18af19f4ff847ff4bc7c610c8cc
-monob               0e4946183903fea3ef246c16385e236c
-monow               ba546dd99f6bbc4b7d310961df4d6d98
-nv12                2ca05c89d890eee82e1b37aac179d7d1
-nv21                4b2a85b79266097177314a6e56fd5fb5
-rgb24               fe5e3505a5019379cd0721d80ad62d05
-rgb444be            7adf5b77e454f20a02d2cc9562a21e9b
-rgb444le            3f372c6d95e1299b97ea702adabcea9d
-rgb48be             d8520683529747778d0bd0e9a9f9e285
-rgb48le             c589d81b9787f1144158a0e7f085987e
-rgb4_byte           2b3fe2b3e5f98124e93422721dd03751
-rgb555be            6b82965f2334ce7f43289bbe40697ca8
-rgb555le            cd883c0c198a3e045e351f4857f9846c
-rgb565be            bedff6bc255a9ea87f96117fd2348454
-rgb565le            500bcd27d380a51279ba0e4e64f5f1c7
-rgb8                e6121e248cb50b687451a437156924a6
-rgba                e2cc3906c90ee87d863cb378bd095e18
-uyvy422             87fa53467c7267175c0336c547d8ce90
-yuv410p             a8eb12c5ad15217d81e26c11a477a7c5
-yuv411p             a97d81c8a515965209127cfdc718f899
-yuv420p             daed3fd5e1980ccc4d4409320f16fbf6
-yuv420p10be         f434af8526dcda2988f15a08cdc4bf98
-yuv420p10le         9dcbdb0206713a90fd03b313d99e9ff9
-yuv420p12be         5c3b2cbbb97c38b763f3da61ba5152d2
-yuv420p12le         88e20b45556294e7ca64b323cf115ceb
-yuv420p16be         b8f1a0e4ef98903e2ef8dbce7bc812e2
-yuv420p16le         3be4223322a9d904caa2ad7d4ccf3c6a
-yuv420p9be          34346f74216be11c38cdaeffaba250cc
-yuv420p9le          8248d1c10aa86ef8e4b212a2d9fca937
-yuv422p             5a58e1fe687b71e28f52aeb11b999e46
-yuv422p10be         adaf99408661a1dc3c667cad992c08d7
-yuv422p10le         bc071b965f5a1b3c7349b71bd2b4247c
-yuv422p12be         e1ab3898be486cd95e6332fa81570f63
-yuv422p12le         343a7281c6d30c09ed7b8be86bd6d42f
-yuv422p16be         1ec214fba454c456d83de5220c867ede
-yuv422p16le         9f9316d40597c9fb917d921bfbcd8421
-yuv422p9be          98e7cefa912845b488f85508a7be7e04
-yuv422p9le          54937395dce9518b2d58aadae21ff69d
-yuv440p             fade395d957e1e3b117ac11c09404964
-yuv444p             a3c2a074c3609226bf1a0bc4de5c0e51
-yuv444p10be         b02fac8bc5a564a755567a86dc3ceae0
-yuv444p10le         88860297f729c90526b157b6bf1e2fcf
-yuv444p12be         d8af56e4b09130e14a9449c84a03cab0
-yuv444p12le         0ccfbd671b8000c0f950b9dfae8ea879
-yuv444p16be         26fbffad3c28aa1a6c47f2be6d146173
-yuv444p16le         3d13dcea82caec9eb563a1d7a2e4b339
-yuv444p9be          df39c0778e5b13f306e9928c5b0ddbb2
-yuv444p9le          10fe4d81f58d4630e3a02863bd5071c1
-yuva420p            75d91c2de234468b5c7efd490ce40e0b
-yuva420p10be        718e0f49e010934a1f2b33b691855478
-yuva420p10le        1dac68a355050b96ff8716c168f67746
-yuva420p16be        36128486b2c99d0654e8dee63a47bd5e
-yuva420p16le        277b44d05a5098952c7c1a4cf2c6ff7a
-yuva420p9be         1fa63062315888f0eb8b8777c51a589f
-yuva420p9le         073ebffbc7201649f1c439ecf37f33cc
-yuva422p            7ce9f599a8aecd744fe24f2759623661
-yuva422p10be        980ea8ddfbfc0d52ed197fa506a2435e
-yuva422p10le        9f5c0b3d14679fc92120f556d00e1442
-yuva422p16be        94a4cf6182726a807a0f73b0abbf6e49
-yuva422p16le        5d5d4d216192bfb3e67d19ca61b47ae7
-yuva422p9be         57a62f219df38dc7c8138e3f65c4cf55
-yuva422p9le         bdd8b63f2672315441d9a7ad5bc63021
-yuva444p            49c8ed206ed6381c9595e13ae8500296
-yuva444p10be        055adfd383003ec6ed96ae4388feb0ad
-yuva444p10le        a56fc4d14528637b91699d413b21d87e
-yuva444p16be        d2387f6d3c28dc0c3eb87b9c8e719241
-yuva444p16le        6c971dc2fe9a3044776c1eb0b40d7eb4
-yuva444p9be         6e397f5bb5de593923b317fbf5c8c390
-yuva444p9le         ed156af72e6e18e7b0a27a3aa53df181
-yuvj420p            db95116f6735bc0d6aa1f34479f74842
-yuvj422p            8d947806799c24f9d5a96688b20b6c6a
-yuvj440p            eddaebaa7ab344072364b3507407b9d9
-yuvj444p            779aef4afd317cb44a03ec15011e34f2
-yuyv422             7abd4068b7767b1639f2873c446e09ba
-yvyu422             3b0fa1d775623323dbe4eb935fac37d3
+0bgr                e6f5c50fa0330cd5d5e69ffc09bc085a
+0rgb                76b792f8ce8a72925e04294dc2f25b36
+abgr                8b94f489e68802d76f1e2844688a4911
+argb                3fd6af7ef2364d8aa845d45db289a04a
+ayuv64le            558671dd31d0754cfa6344eaf441df78
+bgr0                7117438cf000254610f23625265769b5
+bgr24               52b2c21cbc166978a38a646c354b6858
+bgr444be            6c6cb3f5a26d5fd00bd04467bb0bbcca
+bgr444le            860b20346d24510c1b3e44067916bb68
+bgr48be             161d37f2f6ba5de48d17f59050804660
+bgr48le             98f471e833021adad925d7d8d45b7c6f
+bgr4_byte           f6296e1a5741531f67f62599ae30bfde
+bgr555be            f5e041ea34e4c084c3531b9fe2d01016
+bgr555le            3b5c5281a7e13a1f757dc5d8eeb77d85
+bgr565be            a567fb6edb4057d44c33c1bad23b9807
+bgr565le            c6f40163bd064760f316a90f4c7885ac
+bgr8                f2e4aabfe9e6039beb1f2b8c43c83e3c
+bgra                0af63cc2ffd61af252df93cc767de358
+bgra64be            31af33833f6d8f2e4a62683288770aa4
+bgra64le            45feb93863055282447d1ff89c5158bf
+gbrap               421c56a25f88d58b9361f5c7bb368e21
+gbrap10be           e8134b72acc090b093b4d9b4d4703c7e
+gbrap10le           43bde7bd6a676c6ac33dbcc4c72762f3
+gbrap12be           16a3d105ba852a9fa23ea5232db51b48
+gbrap12le           6ef8a3ac4129ec23c34aec14ac41f249
+gbrap16be           70b020b6b9e1896b72f890de3570ffda
+gbrap16le           e0cf341cdbaf1f5c40016f181bc9d7d4
+gbrp                413b0f6ea51588d4be5f0c76d43d8796
+gbrp10be            d02bd50db83213667808f5bacefe667c
+gbrp10le            2d4a5ebc773ffc3d857a6ef24afbe10e
+gbrp12be            a668b7dba68817736501386ffe9f3adc
+gbrp12le            299695016c22a4947d94b16f0975536b
+gbrp14be            eeebacfb19c970dd76ad044ef85e8fe5
+gbrp14le            6e93b87047e433995111eb5397751c3f
+gbrp16be            3fef87fe67bf1fd0e2f5056dc0db2ef4
+gbrp16le            f3b2b76fe707f77eb1376640759f5168
+gbrp9be             99c694dd47d12ae48fc8f47a0c410333
+gbrp9le             26e103a4ab99fb3f58667df490997a36
+gray                41811422d5819ed69389357294384c10
+gray10be            52710b3ab3ccf6101d28109f58cd48c4
+gray10le            9c432a163f0cfe9ee2a4b72ae8a7c307
+gray12be            7423ce8a77fbc40c5d4776eb28fec60a
+gray12le            808158633559d7deebc7dac2d79e88f8
+gray16be            29f24ba7cb0fc4fd2ae78963d008f6e6
+gray16le            a37e9c4ea76e8eeddc2af8f600ba2c10
+gray9be             dda11d4ffd62b414012ffc4667fb4971
+gray9le             159bf6482d217b2b8276eb2216cd7a09
+monob               7810c4857822ccfc844d78f5e803269a
+monow               90a947bfcd5f2261e83b577f48ec57b1
+nv12                261ebe585ae2aa4e70d39a10c1679294
+nv21                2909feacd27bebb080c8e0fa41795269
+p010be              06e9354b6e0e38ba41736352cedc0bd5
+p010le              fd18d322bffbf5816902c13102872e22
+pal8                450b0155d0f2d5628bf95a442db5f817
+rgb0                56a7ea69541bcd27bef6a5615784722b
+rgb24               195e6dae1c3a488b9d3ceb7560d25d85
+rgb444be            d30742559618f871ef5543f602e35d04
+rgb444le            8cae7773ce27d959fd7836832ab392a6
+rgb48be             3c519a3f78405a8f2cc05c4846ab6e71
+rgb48le             09218c1dea3d085d435910478d4c4b7a
+rgb4_byte           0e2b561097230e9c72acc645e6806e20
+rgb555be            730f68605d12eb7cd524b63388f69712
+rgb555le            7fec4673ba9025bf492e88754afb51b2
+rgb565be            1f54ab9892bf28e3081ab55c83c86e24
+rgb565le            13255e04237bb16eb22f29f892590182
+rgb8                7df049b6094f8a5e084d74462f6d6cde
+rgba                c1a5908572737f2ae1e5d8218af65f4b
+rgba64be            17e6273323b5779b5f3f775f150c1011
+rgba64le            48f45b10503b7dd140329c3dd0d54c98
+uyvy422             3a237e8376264e0cfa78f8a3fdadec8a
+xyz12be             810644e008deb231850d779aaa27cc7e
+xyz12le             829701db461b43533cf9241e0743bc61
+ya8                 4299c6ca3b470a7d8a420e26eb485b1d
+yuv410p             c7adfe96c8e043a6cb9290c39bf8063c
+yuv411p             3fce29db403a25f81be39e01aaf6ff3a
+yuv420p             d64fae96fac22aefa8fbcf45a09f37c1
+yuv420p10be         63f545453139f38883cfa1210f7b6ac5
+yuv420p10le         925de8b0bf9519c4b841afab4dd6bb25
+yuv420p12be         619425168c3b8bb9da68e7810bf5eacf
+yuv420p12le         403d7d96939fa538b04f7b7b26ac6868
+yuv420p14be         22d2d9fb5883410807ede4066e735426
+yuv420p14le         5cace6a24a1ff5d2a41a3c909c4bc41f
+yuv420p16be         0a6499a1b22230ad030448d3ac95b5c1
+yuv420p16le         2a5c131b060757aab1fe84200528d404
+yuv420p9be          694227c773c3a66e4edeca950f99f6d6
+yuv420p9le          c3ec4bffc19c49edafd769a7dfccd9c1
+yuv422p             54f608c9d8bc56979aeaa7863820f5d3
+yuv422p10be         fbd6329d2decbe318be4d89dc8ade3a3
+yuv422p10le         7d7bdf4f68d8a7698e92722625c59c53
+yuv422p12be         d6ca250820312bab977ce88d2ef65c13
+yuv422p12le         3185b59dddc7ee67251d9829a977130b
+yuv422p14be         3bc3a72c7cf995981bd8eb45f23705b3
+yuv422p14le         5987087bbc03d8cbff4c41bce03451d9
+yuv422p16be         97d95a9cfe8f67fb20a4c983c7fdc215
+yuv422p16le         3b9df52a757a0d1ddb1c9c38f0ed4787
+yuv422p9be          25116f0953ecd26f292101b51ac708df
+yuv422p9le          42615866fe9ab98e28970ed7fbf4b2a0
+yuv440p             fa45ee7329b98fc43c0be460d9a0d6a5
+yuv440p10be         54789b4f66d9a79fc182ff268639dbd0
+yuv440p10le         d06d7c054522ac02ec04f76dfa431676
+yuv440p12be         7b8c9b6688f44282007ae220d52e5ed6
+yuv440p12le         2a3adb4692391171c506cc0899d27511
+yuv444p             7c8c5d138d732f4ca7d864b9ffef3047
+yuv444p10be         faa81f737d465afcacef351818d34772
+yuv444p10le         bfc5036e4ab0ab6da1416df4a462db74
+yuv444p12be         6706d8807b9dd14d331a7e9572fd9c5d
+yuv444p12le         9bba33b2c0dd09f653a4c22d201142c5
+yuv444p14be         cf181f44988d3ddf4cc32b87ca473251
+yuv444p14le         086322cb9a98eb91825c9bb2ad00eac7
+yuv444p16be         ee0721d7fda4a67bc6270a78fa361140
+yuv444p16le         8c4c2511907fd23d9aeefab490a22db7
+yuv444p9be          7ffa40454450cbeec09d57f5a0a3eb8b
+yuv444p9le          a4fb60fbace24757b1e07d5a65f09e64
+yuva420p            3b136bcd7c2ffc3a1849e4814c046954
+yuva420p10be        d045faff818dabb9ecebab6d14bf7b10
+yuva420p10le        becf56ac1e271c04ccc204c68e8e0b5f
+yuva420p16be        eeb7b6b0dba4ca15a1457bf0ff2bc51b
+yuva420p16le        aa0a678ad48815d226888a5053a6fe6e
+yuva420p9be         bcee2f39913b006fdfaa865246fbc122
+yuva420p9le         aec21fa8f1088b7898cd80a30f382224
+yuva422p            39707b0dfdaadeefa20819080365db15
+yuva422p10be        53fbfe6d7eb01e2007003383c5d91850
+yuva422p10le        df1f95630ccd7bf05b95b6b3061cbeef
+yuva422p16be        35ad91fa92b04e13d6b557d2f250ade1
+yuva422p16le        8fb93970118fde962f5dbcd156966722
+yuva422p9be         2b16b2dc102ad688a3023f30e3c6f9d9
+yuva422p9le         6a23d290358691a9d8bab49582265764
+yuva444p            442a690385166bed3e785d9262c1c501
+yuva444p10be        bb6d52902c30f5cc63ddc3fbe3346bf5
+yuva444p10le        6e43f7c44e070fce492dcb1b038de85e
+yuva444p16be        b8801dccf64b3eadc2a5b5db67ae0b0f
+yuva444p16le        8e72ae66754badf5d1eeb094e6bf0ddc
+yuva444p9be         bcd845394351ca6d15e947342802957d
+yuva444p9le         7727a93765ed38dfd25e3d6b7a38fa63
+yuvj411p            260f51b360dc00b2222f4cb39fa05e36
+yuvj420p            fab4394239b08bdb7638215a42d56eaf
+yuvj422p            0309c2b34aa4d74f58048fe320a02b83
+yuvj440p            f5e3a92fa46e57e2c613fc9aaad18e9d
+yuvj444p            ca4b3662259ba15a6297a44ef64414b7
+yuyv422             8f02b2332fe9bb782f88627c99f32ee8
+yvyu422             bd8cb985c2e1f9c32dc6b865bdf20637
diff --git a/tests/ref/fate/filter-pp b/tests/ref/fate/filter-pp
new file mode 100644
index 0000000000..5c0e2994c6
--- /dev/null
+++ b/tests/ref/fate/filter-pp
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+0,          1,          1,        1,   152064, 0x0af8a873
+0,          2,          2,        1,   152064, 0xaeb99897
+0,          3,          3,        1,   152064, 0x8f3712c8
+0,          4,          4,        1,   152064, 0x5bf6a64c
+0,          5,          5,        1,   152064, 0x262de352
diff --git a/tests/ref/fate/filter-pp1 b/tests/ref/fate/filter-pp1
new file mode 100644
index 0000000000..8c6b7ba18e
--- /dev/null
+++ b/tests/ref/fate/filter-pp1
@@ -0,0 +1 @@
+pp1                 1a45041dd20a941e36b7729116950107
diff --git a/tests/ref/fate/filter-pp2 b/tests/ref/fate/filter-pp2
new file mode 100644
index 0000000000..ed5e77322a
--- /dev/null
+++ b/tests/ref/fate/filter-pp2
@@ -0,0 +1 @@
+pp2                 566d48ad25dfa7a9680de933cbdf66d9
diff --git a/tests/ref/fate/filter-pp3 b/tests/ref/fate/filter-pp3
new file mode 100644
index 0000000000..536bf8e9d2
--- /dev/null
+++ b/tests/ref/fate/filter-pp3
@@ -0,0 +1 @@
+pp3                 586fc14a52699540a865c070dd113229
diff --git a/tests/ref/fate/filter-pp4 b/tests/ref/fate/filter-pp4
new file mode 100644
index 0000000000..efa9c8a2f2
--- /dev/null
+++ b/tests/ref/fate/filter-pp4
@@ -0,0 +1 @@
+pp4                 8a072806ae6b5c68c5c3c57197641e4a
diff --git a/tests/ref/fate/filter-pp5 b/tests/ref/fate/filter-pp5
new file mode 100644
index 0000000000..682e8481ff
--- /dev/null
+++ b/tests/ref/fate/filter-pp5
@@ -0,0 +1 @@
+pp5                 5695b8193095a63b9f397fff8343d1a6
diff --git a/tests/ref/fate/filter-pp6 b/tests/ref/fate/filter-pp6
new file mode 100644
index 0000000000..3280a69004
--- /dev/null
+++ b/tests/ref/fate/filter-pp6
@@ -0,0 +1 @@
+pp6                 f823b3330935cd1824d526041b429d9a
diff --git a/tests/ref/fate/filter-qp b/tests/ref/fate/filter-qp
new file mode 100644
index 0000000000..3dd4c95874
--- /dev/null
+++ b/tests/ref/fate/filter-qp
@@ -0,0 +1 @@
+qp                  2d4da13e883e073084d547a6b41ba688
diff --git a/tests/ref/fate/filter-refcmp-psnr-rgb b/tests/ref/fate/filter-refcmp-psnr-rgb
new file mode 100644
index 0000000000..f06db575ac
--- /dev/null
+++ b/tests/ref/fate/filter-refcmp-psnr-rgb
@@ -0,0 +1,45 @@
+frame:0    pts:0       pts_time:0
+lavfi.psnr.mse.r=1381.80
+lavfi.psnr.psnr.r=16.73
+lavfi.psnr.mse.g=896.00
+lavfi.psnr.psnr.g=18.61
+lavfi.psnr.mse.b=277.38
+lavfi.psnr.psnr.b=23.70
+lavfi.psnr.mse_avg=851.73
+lavfi.psnr.psnr_avg=18.83
+frame:1    pts:1       pts_time:1
+lavfi.psnr.mse.r=1380.37
+lavfi.psnr.psnr.r=16.73
+lavfi.psnr.mse.g=975.91
+lavfi.psnr.psnr.g=18.24
+lavfi.psnr.mse.b=435.72
+lavfi.psnr.psnr.b=21.74
+lavfi.psnr.mse_avg=930.67
+lavfi.psnr.psnr_avg=18.44
+frame:2    pts:2       pts_time:2
+lavfi.psnr.mse.r=1403.20
+lavfi.psnr.psnr.r=16.66
+lavfi.psnr.mse.g=954.05
+lavfi.psnr.psnr.g=18.34
+lavfi.psnr.mse.b=494.22
+lavfi.psnr.psnr.b=21.19
+lavfi.psnr.mse_avg=950.49
+lavfi.psnr.psnr_avg=18.35
+frame:3    pts:3       pts_time:3
+lavfi.psnr.mse.r=1452.80
+lavfi.psnr.psnr.r=16.51
+lavfi.psnr.mse.g=1001.02
+lavfi.psnr.psnr.g=18.13
+lavfi.psnr.mse.b=557.39
+lavfi.psnr.psnr.b=20.67
+lavfi.psnr.mse_avg=1003.74
+lavfi.psnr.psnr_avg=18.11
+frame:4    pts:4       pts_time:4
+lavfi.psnr.mse.r=1401.25
+lavfi.psnr.psnr.r=16.67
+lavfi.psnr.mse.g=1009.80
+lavfi.psnr.psnr.g=18.09
+lavfi.psnr.mse.b=602.42
+lavfi.psnr.psnr.b=20.33
+lavfi.psnr.mse_avg=1004.49
+lavfi.psnr.psnr_avg=18.11
diff --git a/tests/ref/fate/filter-refcmp-psnr-yuv b/tests/ref/fate/filter-refcmp-psnr-yuv
new file mode 100644
index 0000000000..0e634ed0e4
--- /dev/null
+++ b/tests/ref/fate/filter-refcmp-psnr-yuv
@@ -0,0 +1,45 @@
+frame:0    pts:0       pts_time:0
+lavfi.psnr.mse.y=222.06
+lavfi.psnr.psnr.y=24.67
+lavfi.psnr.mse.u=339.38
+lavfi.psnr.psnr.u=22.82
+lavfi.psnr.mse.v=705.41
+lavfi.psnr.psnr.v=19.65
+lavfi.psnr.mse_avg=372.23
+lavfi.psnr.psnr_avg=22.42
+frame:1    pts:1       pts_time:1
+lavfi.psnr.mse.y=236.74
+lavfi.psnr.psnr.y=24.39
+lavfi.psnr.mse.u=416.17
+lavfi.psnr.psnr.u=21.94
+lavfi.psnr.mse.v=704.98
+lavfi.psnr.psnr.v=19.65
+lavfi.psnr.mse_avg=398.66
+lavfi.psnr.psnr_avg=22.12
+frame:2    pts:2       pts_time:2
+lavfi.psnr.mse.y=234.79
+lavfi.psnr.psnr.y=24.42
+lavfi.psnr.mse.u=435.72
+lavfi.psnr.psnr.u=21.74
+lavfi.psnr.mse.v=699.60
+lavfi.psnr.psnr.v=19.68
+lavfi.psnr.mse_avg=401.23
+lavfi.psnr.psnr_avg=22.10
+frame:3    pts:3       pts_time:3
+lavfi.psnr.mse.y=250.88
+lavfi.psnr.psnr.y=24.14
+lavfi.psnr.mse.u=479.73
+lavfi.psnr.psnr.u=21.32
+lavfi.psnr.mse.v=707.55
+lavfi.psnr.psnr.v=19.63
+lavfi.psnr.mse_avg=422.26
+lavfi.psnr.psnr_avg=21.88
+frame:4    pts:4       pts_time:4
+lavfi.psnr.mse.y=241.05
+lavfi.psnr.psnr.y=24.31
+lavfi.psnr.mse.u=505.04
+lavfi.psnr.psnr.u=21.10
+lavfi.psnr.mse.v=716.00
+lavfi.psnr.psnr.v=19.58
+lavfi.psnr.mse_avg=425.79
+lavfi.psnr.psnr_avg=21.84
diff --git a/tests/ref/fate/filter-refcmp-ssim-rgb b/tests/ref/fate/filter-refcmp-ssim-rgb
new file mode 100644
index 0000000000..8c23c60b37
--- /dev/null
+++ b/tests/ref/fate/filter-refcmp-ssim-rgb
@@ -0,0 +1,30 @@
+frame:0    pts:0       pts_time:0
+lavfi.ssim.R=0.72
+lavfi.ssim.G=0.76
+lavfi.ssim.B=0.89
+lavfi.ssim.All=0.79
+lavfi.ssim.dB=6.74
+frame:1    pts:1       pts_time:1
+lavfi.ssim.R=0.70
+lavfi.ssim.G=0.74
+lavfi.ssim.B=0.85
+lavfi.ssim.All=0.77
+lavfi.ssim.dB=6.31
+frame:2    pts:2       pts_time:2
+lavfi.ssim.R=0.71
+lavfi.ssim.G=0.75
+lavfi.ssim.B=0.84
+lavfi.ssim.All=0.76
+lavfi.ssim.dB=6.29
+frame:3    pts:3       pts_time:3
+lavfi.ssim.R=0.70
+lavfi.ssim.G=0.73
+lavfi.ssim.B=0.83
+lavfi.ssim.All=0.76
+lavfi.ssim.dB=6.11
+frame:4    pts:4       pts_time:4
+lavfi.ssim.R=0.71
+lavfi.ssim.G=0.74
+lavfi.ssim.B=0.80
+lavfi.ssim.All=0.75
+lavfi.ssim.dB=6.05
diff --git a/tests/ref/fate/filter-refcmp-ssim-yuv b/tests/ref/fate/filter-refcmp-ssim-yuv
new file mode 100644
index 0000000000..5c8ffb9483
--- /dev/null
+++ b/tests/ref/fate/filter-refcmp-ssim-yuv
@@ -0,0 +1,30 @@
+frame:0    pts:0       pts_time:0
+lavfi.ssim.Y=0.80
+lavfi.ssim.U=0.76
+lavfi.ssim.V=0.69
+lavfi.ssim.All=0.76
+lavfi.ssim.dB=6.25
+frame:1    pts:1       pts_time:1
+lavfi.ssim.Y=0.80
+lavfi.ssim.U=0.73
+lavfi.ssim.V=0.68
+lavfi.ssim.All=0.75
+lavfi.ssim.dB=6.08
+frame:2    pts:2       pts_time:2
+lavfi.ssim.Y=0.80
+lavfi.ssim.U=0.73
+lavfi.ssim.V=0.68
+lavfi.ssim.All=0.75
+lavfi.ssim.dB=6.10
+frame:3    pts:3       pts_time:3
+lavfi.ssim.Y=0.79
+lavfi.ssim.U=0.72
+lavfi.ssim.V=0.68
+lavfi.ssim.All=0.75
+lavfi.ssim.dB=5.94
+frame:4    pts:4       pts_time:4
+lavfi.ssim.Y=0.80
+lavfi.ssim.U=0.72
+lavfi.ssim.V=0.68
+lavfi.ssim.All=0.75
+lavfi.ssim.dB=5.97
diff --git a/tests/ref/fate/filter-removegrain-mode-00 b/tests/ref/fate/filter-removegrain-mode-00
new file mode 100644
index 0000000000..b38d3f4a71
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-00
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x05b789ef
diff --git a/tests/ref/fate/filter-removegrain-mode-01 b/tests/ref/fate/filter-removegrain-mode-01
new file mode 100644
index 0000000000..8108ab6b88
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-01
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x4f234e65
diff --git a/tests/ref/fate/filter-removegrain-mode-02 b/tests/ref/fate/filter-removegrain-mode-02
new file mode 100644
index 0000000000..5e12fdf2af
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-02
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xc2dd0535
diff --git a/tests/ref/fate/filter-removegrain-mode-03 b/tests/ref/fate/filter-removegrain-mode-03
new file mode 100644
index 0000000000..61b64f69e2
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-03
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x09dbc38a
diff --git a/tests/ref/fate/filter-removegrain-mode-04 b/tests/ref/fate/filter-removegrain-mode-04
new file mode 100644
index 0000000000..d02989618f
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-04
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x32c6a66e
diff --git a/tests/ref/fate/filter-removegrain-mode-05 b/tests/ref/fate/filter-removegrain-mode-05
new file mode 100644
index 0000000000..8fc5e25129
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-05
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xc3c64ec6
diff --git a/tests/ref/fate/filter-removegrain-mode-06 b/tests/ref/fate/filter-removegrain-mode-06
new file mode 100644
index 0000000000..c000f013f2
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-06
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x38e84065
diff --git a/tests/ref/fate/filter-removegrain-mode-07 b/tests/ref/fate/filter-removegrain-mode-07
new file mode 100644
index 0000000000..c1a9836c1a
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-07
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xfbdeec94
diff --git a/tests/ref/fate/filter-removegrain-mode-08 b/tests/ref/fate/filter-removegrain-mode-08
new file mode 100644
index 0000000000..f382c11914
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-08
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x8f7c85a2
diff --git a/tests/ref/fate/filter-removegrain-mode-09 b/tests/ref/fate/filter-removegrain-mode-09
new file mode 100644
index 0000000000..3bb63fc693
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-09
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x9609a659
diff --git a/tests/ref/fate/filter-removegrain-mode-10 b/tests/ref/fate/filter-removegrain-mode-10
new file mode 100644
index 0000000000..cf72639578
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-10
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x4adb45d6
diff --git a/tests/ref/fate/filter-removegrain-mode-11 b/tests/ref/fate/filter-removegrain-mode-11
new file mode 100644
index 0000000000..aa8793dbc8
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-11
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xd0d891ff
diff --git a/tests/ref/fate/filter-removegrain-mode-12 b/tests/ref/fate/filter-removegrain-mode-12
new file mode 100644
index 0000000000..aa8793dbc8
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-12
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xd0d891ff
diff --git a/tests/ref/fate/filter-removegrain-mode-13 b/tests/ref/fate/filter-removegrain-mode-13
new file mode 100644
index 0000000000..b70b9a107d
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-13
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x09d4da80
diff --git a/tests/ref/fate/filter-removegrain-mode-14 b/tests/ref/fate/filter-removegrain-mode-14
new file mode 100644
index 0000000000..2211372f7a
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-14
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x145f34c8
diff --git a/tests/ref/fate/filter-removegrain-mode-15 b/tests/ref/fate/filter-removegrain-mode-15
new file mode 100644
index 0000000000..fa9b94c488
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-15
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x11eea9b4
diff --git a/tests/ref/fate/filter-removegrain-mode-16 b/tests/ref/fate/filter-removegrain-mode-16
new file mode 100644
index 0000000000..9d81e15afb
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-16
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x8bc800ee
diff --git a/tests/ref/fate/filter-removegrain-mode-17 b/tests/ref/fate/filter-removegrain-mode-17
new file mode 100644
index 0000000000..4f4b758a90
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-17
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x7195b9a7
diff --git a/tests/ref/fate/filter-removegrain-mode-18 b/tests/ref/fate/filter-removegrain-mode-18
new file mode 100644
index 0000000000..a4422a75b4
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-18
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xb47a081c
diff --git a/tests/ref/fate/filter-removegrain-mode-19 b/tests/ref/fate/filter-removegrain-mode-19
new file mode 100644
index 0000000000..9ff361386b
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-19
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x948dc65d
diff --git a/tests/ref/fate/filter-removegrain-mode-20 b/tests/ref/fate/filter-removegrain-mode-20
new file mode 100644
index 0000000000..449ced8aeb
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-20
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x64a388ea
diff --git a/tests/ref/fate/filter-removegrain-mode-21 b/tests/ref/fate/filter-removegrain-mode-21
new file mode 100644
index 0000000000..473b4fc8c4
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-21
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xb7ae17f5
diff --git a/tests/ref/fate/filter-removegrain-mode-22 b/tests/ref/fate/filter-removegrain-mode-22
new file mode 100644
index 0000000000..81857501bd
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-22
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xe5736698
diff --git a/tests/ref/fate/filter-removegrain-mode-23 b/tests/ref/fate/filter-removegrain-mode-23
new file mode 100644
index 0000000000..1e8109d339
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-23
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x8d15a472
diff --git a/tests/ref/fate/filter-removegrain-mode-24 b/tests/ref/fate/filter-removegrain-mode-24
new file mode 100644
index 0000000000..b246312771
--- /dev/null
+++ b/tests/ref/fate/filter-removegrain-mode-24
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x77f6d439
diff --git a/tests/ref/fate/filter-rgbtestsrc b/tests/ref/fate/filter-rgbtestsrc
new file mode 100644
index 0000000000..e18d364fdb
--- /dev/null
+++ b/tests/ref/fate/filter-rgbtestsrc
@@ -0,0 +1,10 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   230400, 0x8c0018bb
+0,          1,          1,        1,   230400, 0x8c0018bb
+0,          2,          2,        1,   230400, 0x8c0018bb
+0,          3,          3,        1,   230400, 0x8c0018bb
+0,          4,          4,        1,   230400, 0x8c0018bb
diff --git a/tests/ref/fate/filter-scale200 b/tests/ref/fate/filter-scale200
index 609a21cb59..7de4fc5002 100644
--- a/tests/ref/fate/filter-scale200
+++ b/tests/ref/fate/filter-scale200
@@ -1 +1 @@
-scale200            6b5797b13531dbfc4b389f2fd89b24e6
+scale200            e7b8419c7de2912f0585b79e99f174c2
diff --git a/tests/ref/fate/filter-scale2ref_keep_aspect b/tests/ref/fate/filter-scale2ref_keep_aspect
new file mode 100644
index 0000000000..8dd0dbb13b
--- /dev/null
+++ b/tests/ref/fate/filter-scale2ref_keep_aspect
@@ -0,0 +1,14 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    57600, 9a19c23dc3a557786840d0098606d5f1
+0,          1,          1,        1,    57600, e6fbdabaf1bb0d28afc648ed4d27e9f0
+0,          2,          2,        1,    57600, 52924ed0a751214c50fb2e7a626c8cc5
+0,          3,          3,        1,    57600, 67d5fd6ee71793f1cf8794d1c27afdce
+0,          4,          4,        1,    57600, 85f7775f7b01afd369fc8919dc759d30
diff --git a/tests/ref/fate/filter-scale500 b/tests/ref/fate/filter-scale500
index bd0836cfc2..2b1b6d2b6b 100644
--- a/tests/ref/fate/filter-scale500
+++ b/tests/ref/fate/filter-scale500
@@ -1 +1 @@
-scale500            9d01a7cb7461c1d2d4d3531bbd7c9b4c
+scale500            e7d6f07710a707e4e5583aee54a8f5ff
diff --git a/tests/ref/fate/filter-scalechroma b/tests/ref/fate/filter-scalechroma
new file mode 100644
index 0000000000..842769c2d5
--- /dev/null
+++ b/tests/ref/fate/filter-scalechroma
@@ -0,0 +1,30 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xdcab783a
+0,          1,          1,        1,   152064, 0x79c7f1f6
+0,          2,          2,        1,   152064, 0x3b810afb
+0,          3,          3,        1,   152064, 0x892aca1d
+0,          4,          4,        1,   152064, 0x52fdd093
+0,          5,          5,        1,   152064, 0xaa643426
+0,          6,          6,        1,   152064, 0x9ad020ed
+0,          7,          7,        1,   152064, 0x5c179057
+0,          8,          8,        1,   152064, 0xa56bf155
+0,          9,          9,        1,   152064, 0x61dcffca
+0,         10,         10,        1,   152064, 0x0d51a1d3
+0,         11,         11,        1,   152064, 0x652f9e8d
+0,         12,         12,        1,   152064, 0xdc0bb4d8
+0,         13,         13,        1,   152064, 0x561437cf
+0,         14,         14,        1,   152064, 0x69ef8e4f
+0,         15,         15,        1,   152064, 0xe7244350
+0,         16,         16,        1,   152064, 0xe65651cf
+0,         17,         17,        1,   152064, 0xfc9ff646
+0,         18,         18,        1,   152064, 0x6ae10bc4
+0,         19,         19,        1,   152064, 0xd3d1898a
+0,         20,         20,        1,   152064, 0xf3f8b139
+0,         21,         21,        1,   152064, 0x68c129be
+0,         22,         22,        1,   152064, 0xc3922593
+0,         23,         23,        1,   152064, 0x2b14d96e
+0,         24,         24,        1,   152064, 0xab119489
diff --git a/tests/ref/fate/filter-select b/tests/ref/fate/filter-select
new file mode 100644
index 0000000000..e0584e9538
--- /dev/null
+++ b/tests/ref/fate/filter-select
@@ -0,0 +1,22 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x432
+#sar 0: 0/1
+0,          1,          1,        1,   152064, 0x7f5f6551
+0,          5,          5,        1,   152064, 0x287da8e6
+0,          7,          7,        1,   152064, 0xe9028bac
+0,         11,         11,        1,   152064, 0xb247fcd5
+0,         13,         13,        1,   152064, 0xb1d6a223
+0,         17,         17,        1,   152064, 0xa3e038c8
+0,         19,         19,        1,   152064, 0x1a0ddbff
+0,         23,         23,        1,   152064, 0x813468ef
+0,         25,         25,        1,   152064, 0x62719936
+0,         29,         29,        1,   152064, 0x2db5650e
+0,         31,         31,        1,   152064, 0x669fc51e
+0,         35,         35,        1,   152064, 0x0db194fb
+0,         37,         37,        1,   152064, 0xac2101f8
+0,         41,         41,        1,   152064, 0xf0c79e08
+0,         43,         43,        1,   152064, 0x5ad420ec
+0,         47,         47,        1,   152064, 0x60afc5c2
+0,         49,         49,        1,   152064, 0x5b29d8ea
diff --git a/tests/ref/fate/filter-select-alternate b/tests/ref/fate/filter-select-alternate
index 0776694278..044189de54 100644
--- a/tests/ref/fate/filter-select-alternate
+++ b/tests/ref/fate/filter-select-alternate
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x05b789ef
 0,          2,          2,        1,   152064, 0x9dddf64a
 0,          4,          4,        1,   152064, 0x4de3b652
diff --git a/tests/ref/fate/filter-separatefields b/tests/ref/fate/filter-separatefields
new file mode 100644
index 0000000000..fb757cc85b
--- /dev/null
+++ b/tests/ref/fate/filter-separatefields
@@ -0,0 +1,105 @@
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x144
+#sar 0: 0/1
+0,          0,          0,        1,    76032, 0x99276ab9
+0,          1,          1,        1,    76032, 0x0b071f36
+0,          2,          2,        1,    76032, 0x8b03b0e8
+0,          3,          3,        1,    76032, 0x3e10b45a
+0,          4,          4,        1,    76032, 0x67a27817
+0,          5,          5,        1,    76032, 0xb3537e33
+0,          6,          6,        1,    76032, 0xc4e78689
+0,          7,          7,        1,    76032, 0x5f11fa18
+0,          8,          8,        1,    76032, 0x7867f720
+0,          9,          9,        1,    76032, 0xb584bf23
+0,         10,         10,        1,    76032, 0x7c4ae6cf
+0,         11,         11,        1,    76032, 0x4b43c208
+0,         12,         12,        1,    76032, 0x974d3882
+0,         13,         13,        1,    76032, 0xfb0543a1
+0,         14,         14,        1,    76032, 0x91da8418
+0,         15,         15,        1,    76032, 0x45260794
+0,         16,         16,        1,    76032, 0xe65397d0
+0,         17,         17,        1,    76032, 0xfa09e847
+0,         18,         18,        1,    76032, 0x3adcfa2c
+0,         19,         19,        1,    76032, 0xa0103eda
+0,         20,         20,        1,    76032, 0xee821b94
+0,         21,         21,        1,    76032, 0xb8cf2bcc
+0,         22,         22,        1,    76032, 0x6e50db83
+0,         23,         23,        1,    76032, 0x2cd12152
+0,         24,         24,        1,    76032, 0x482961d0
+0,         25,         25,        1,    76032, 0x9a304b91
+0,         26,         26,        1,    76032, 0x2591f07b
+0,         27,         27,        1,    76032, 0x1410b199
+0,         28,         28,        1,    76032, 0x1fc9c234
+0,         29,         29,        1,    76032, 0x4a8dcb9a
+0,         30,         30,        1,    76032, 0xda4b81c7
+0,         31,         31,        1,    76032, 0x45ef8d2f
+0,         32,         32,        1,    76032, 0x07fda976
+0,         33,         33,        1,    76032, 0x19cfa493
+0,         34,         34,        1,    76032, 0xdb453b41
+0,         35,         35,        1,    76032, 0xeebefd78
+0,         36,         36,        1,    76032, 0xdb7830bf
+0,         37,         37,        1,    76032, 0x1bc13a0d
+0,         38,         38,        1,    76032, 0xf811e6af
+0,         39,         39,        1,    76032, 0x5bb6f541
+0,         40,         40,        1,    76032, 0xadfc0b2a
+0,         41,         41,        1,    76032, 0x473fea46
+0,         42,         42,        1,    76032, 0xc4541cec
+0,         43,         43,        1,    76032, 0x5e500726
+0,         44,         44,        1,    76032, 0x54df18fa
+0,         45,         45,        1,    76032, 0x6470045f
+0,         46,         46,        1,    76032, 0x01139a0b
+0,         47,         47,        1,    76032, 0x8690ced5
+0,         48,         48,        1,    76032, 0x9796b3f0
+0,         49,         49,        1,    76032, 0x1bee45e6
+0,         50,         50,        1,    76032, 0xacf4c872
+0,         51,         51,        1,    76032, 0x0183d0b5
+0,         52,         52,        1,    76032, 0xeea54bf9
+0,         53,         53,        1,    76032, 0xb42d4abc
+0,         54,         54,        1,    76032, 0x8be07d8b
+0,         55,         55,        1,    76032, 0x9ac75afc
+0,         56,         56,        1,    76032, 0x96bd3717
+0,         57,         57,        1,    76032, 0xbcca6d3e
+0,         58,         58,        1,    76032, 0x3e2edf44
+0,         59,         59,        1,    76032, 0x1b1385bb
+0,         60,         60,        1,    76032, 0xd4c2d759
+0,         61,         61,        1,    76032, 0x67119362
+0,         62,         62,        1,    76032, 0x96327b89
+0,         63,         63,        1,    76032, 0x9b914995
+0,         64,         64,        1,    76032, 0xf1d024b9
+0,         65,         65,        1,    76032, 0xd0e1d7d4
+0,         66,         66,        1,    76032, 0x11e97010
+0,         67,         67,        1,    76032, 0x0ab90a20
+0,         68,         68,        1,    76032, 0xf7ce7e72
+0,         69,         69,        1,    76032, 0x6edec4f7
+0,         70,         70,        1,    76032, 0xbb96a608
+0,         71,         71,        1,    76032, 0x8502eee4
+0,         72,         72,        1,    76032, 0xc27994cb
+0,         73,         73,        1,    76032, 0x6dbba2d1
+0,         74,         74,        1,    76032, 0xe85e04f8
+0,         75,         75,        1,    76032, 0x4bbbfcf1
+0,         76,         76,        1,    76032, 0x8b5a2465
+0,         77,         77,        1,    76032, 0x8a5434e7
+0,         78,         78,        1,    76032, 0xc34578d9
+0,         79,         79,        1,    76032, 0xc2f0d5f5
+0,         80,         80,        1,    76032, 0x90bd2102
+0,         81,         81,        1,    76032, 0xafda3823
+0,         82,         82,        1,    76032, 0x66972a74
+0,         83,         83,        1,    76032, 0xc9d17394
+0,         84,         84,        1,    76032, 0x961cdc22
+0,         85,         85,        1,    76032, 0x6816e378
+0,         86,         86,        1,    76032, 0x4c383925
+0,         87,         87,        1,    76032, 0xf522e7b8
+0,         88,         88,        1,    76032, 0xc1616f33
+0,         89,         89,        1,    76032, 0xad14952f
+0,         90,         90,        1,    76032, 0xe4e11fcd
+0,         91,         91,        1,    76032, 0xca655ea6
+0,         92,         92,        1,    76032, 0x7b18f45f
+0,         93,         93,        1,    76032, 0xb2325f91
+0,         94,         94,        1,    76032, 0xb08d7400
+0,         95,         95,        1,    76032, 0x74ec51c2
+0,         96,         96,        1,    76032, 0xc15a0713
+0,         97,         97,        1,    76032, 0x3838ad70
+0,         98,         98,        1,    76032, 0x74b6bc3f
+0,         99,         99,        1,    76032, 0x29f41cab
diff --git a/tests/ref/fate/filter-setdar b/tests/ref/fate/filter-setdar
new file mode 100644
index 0000000000..14a07f16e4
--- /dev/null
+++ b/tests/ref/fate/filter-setdar
@@ -0,0 +1 @@
+setdar              99036518df5b66d2e64646f3e0c808f2
diff --git a/tests/ref/fate/filter-setpts b/tests/ref/fate/filter-setpts
index 14aa613873..efdcf6a16e 100644
--- a/tests/ref/fate/filter-setpts
+++ b/tests/ref/fate/filter-setpts
@@ -1,51 +1,42 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 0x05b789ef
-0,         28,         28,        0,   152064, 0x4bb46551
-0,         57,         57,        0,   152064, 0x9dddf64a
-0,         86,         86,        0,   152064, 0x2a8380b0
-0,        115,        115,        0,   152064, 0x4de3b652
-0,        144,        144,        0,   152064, 0xedb5a8e6
-0,        172,        172,        0,   152064, 0xe20f7c23
-0,        201,        201,        0,   152064, 0x5ab58bac
-0,        229,        229,        0,   152064, 0x1f1b8026
-0,        258,        258,        0,   152064, 0x91373915
-0,        286,        286,        0,   152064, 0x02344760
-0,        314,        314,        0,   152064, 0x30f5fcd5
-0,        343,        343,        0,   152064, 0xc711ad61
-0,        371,        371,        0,   152064, 0x24eca223
-0,        399,        399,        0,   152064, 0x52a48ddd
-0,        427,        427,        0,   152064, 0xa91c0f05
-0,        456,        456,        0,   152064, 0x8e364e18
-0,        484,        484,        0,   152064, 0xb15d38c8
-0,        512,        512,        0,   152064, 0xf25f6acc
-0,        541,        541,        0,   152064, 0xf34ddbff
-0,        570,        570,        0,   152064, 0xfc7bf570
-0,        598,        598,        0,   152064, 0x9dc72412
-0,        627,        627,        0,   152064, 0x445d1d59
-0,        656,        656,        0,   152064, 0x2f2768ef
-0,        685,        685,        0,   152064, 0xce09f9d6
-0,        714,        714,        0,   152064, 0x95579936
-0,        743,        743,        0,   152064, 0x43d796b5
-0,        772,        772,        0,   152064, 0xd780d887
-0,        800,        800,        0,   152064, 0x76d2a455
-0,        829,        829,        0,   152064, 0x6dc3650e
-0,        858,        858,        0,   152064, 0x0f9d6aca
-0,        887,        887,        0,   152064, 0xe295c51e
-0,        915,        915,        0,   152064, 0xd766fc8d
-0,        944,        944,        0,   152064, 0xe22f7a30
-0,        972,        972,        0,   152064, 0x7fea4378
-0,       1000,       1000,        0,   152064, 0xfa8d94fb
-0,       1029,       1029,        0,   152064, 0x4c9737ab
-0,       1057,       1057,        0,   152064, 0xa50d01f8
-0,       1085,       1085,        0,   152064, 0x0b07594c
-0,       1113,       1113,        0,   152064, 0x88734edd
-0,       1142,       1142,        0,   152064, 0xd2735925
-0,       1170,       1170,        0,   152064, 0xd4e49e08
-0,       1198,       1198,        0,   152064, 0x20cebfa9
-0,       1227,       1227,        0,   152064, 0x575c20ec
-0,       1255,       1255,        0,   152064, 0xfd500471
-0,       1284,       1284,        0,   152064, 0x61b47e73
-0,       1313,       1313,        0,   152064, 0x09ef53ff
-0,       1341,       1341,        0,   152064, 0x6e88c5c2
-0,       1370,       1370,        0,   152064, 0xbb87b483
-0,       1399,       1399,        0,   152064, 0x4bbad8ea
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x05b789ef
+0,          1,          1,        1,   152064, 0x4bb46551
+0,          2,          2,        1,   152064, 0x9dddf64a
+0,          3,          3,        1,   152064, 0x2a8380b0
+0,          4,          4,        1,   152064, 0x4de3b652
+0,          5,          5,        1,   152064, 0xedb5a8e6
+0,          6,          6,        1,   152064, 0x5ab58bac
+0,          7,          7,        1,   152064, 0x1f1b8026
+0,          8,          8,        1,   152064, 0x91373915
+0,          9,          9,        1,   152064, 0x30f5fcd5
+0,         10,         10,        1,   152064, 0xc711ad61
+0,         11,         11,        1,   152064, 0x52a48ddd
+0,         12,         12,        1,   152064, 0xa91c0f05
+0,         13,         13,        1,   152064, 0x8e364e18
+0,         14,         14,        1,   152064, 0xf25f6acc
+0,         15,         15,        1,   152064, 0xf34ddbff
+0,         16,         16,        1,   152064, 0x9dc72412
+0,         17,         17,        1,   152064, 0x445d1d59
+0,         18,         18,        1,   152064, 0x2f2768ef
+0,         19,         19,        1,   152064, 0x95579936
+0,         20,         20,        1,   152064, 0x43d796b5
+0,         21,         21,        1,   152064, 0x76d2a455
+0,         22,         22,        1,   152064, 0x6dc3650e
+0,         23,         23,        1,   152064, 0x0f9d6aca
+0,         24,         24,        1,   152064, 0xd766fc8d
+0,         25,         25,        1,   152064, 0xe22f7a30
+0,         26,         26,        1,   152064, 0xfa8d94fb
+0,         27,         27,        1,   152064, 0x4c9737ab
+0,         28,         28,        1,   152064, 0xa50d01f8
+0,         29,         29,        1,   152064, 0x88734edd
+0,         30,         30,        1,   152064, 0xd2735925
+0,         31,         31,        1,   152064, 0x20cebfa9
+0,         32,         32,        1,   152064, 0x575c20ec
+0,         33,         33,        1,   152064, 0x61b47e73
+0,         34,         34,        1,   152064, 0x09ef53ff
+0,         35,         35,        1,   152064, 0x6e88c5c2
+0,         36,         36,        1,   152064, 0x4bbad8ea
diff --git a/tests/ref/fate/filter-setsar b/tests/ref/fate/filter-setsar
new file mode 100644
index 0000000000..c8199b6edf
--- /dev/null
+++ b/tests/ref/fate/filter-setsar
@@ -0,0 +1 @@
+setsar              99036518df5b66d2e64646f3e0c808f2
diff --git a/tests/ref/fate/filter-showpalette b/tests/ref/fate/filter-showpalette
new file mode 100644
index 0000000000..c5e699a28e
--- /dev/null
+++ b/tests/ref/fate/filter-showpalette
@@ -0,0 +1,320 @@
+#tb 0: 1/35
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 48x48
+#sar 0: 0/1
+0,          0,          0,        1,     9216, 0xc72e034e
+0,          1,          1,        1,     9216, 0xc72e034e
+0,          2,          2,        1,     9216, 0xc72e034e
+0,          3,          3,        1,     9216, 0xc72e034e
+0,          4,          4,        1,     9216, 0xc72e034e
+0,          5,          5,        1,     9216, 0xc72e034e
+0,          6,          6,        1,     9216, 0xc72e034e
+0,          7,          7,        1,     9216, 0xc72e034e
+0,          8,          8,        1,     9216, 0xc72e034e
+0,          9,          9,        1,     9216, 0xc72e034e
+0,         10,         10,        1,     9216, 0xc72e034e
+0,         11,         11,        1,     9216, 0xc72e034e
+0,         12,         12,        1,     9216, 0xc72e034e
+0,         13,         13,        1,     9216, 0xc72e034e
+0,         14,         14,        1,     9216, 0xc72e034e
+0,         15,         15,        1,     9216, 0xc72e034e
+0,         16,         16,        1,     9216, 0xc72e034e
+0,         17,         17,        1,     9216, 0xc72e034e
+0,         18,         18,        1,     9216, 0xc72e034e
+0,         19,         19,        1,     9216, 0xc72e034e
+0,         20,         20,        1,     9216, 0xc72e034e
+0,         21,         21,        1,     9216, 0xc72e034e
+0,         22,         22,        1,     9216, 0xc72e034e
+0,         23,         23,        1,     9216, 0xc72e034e
+0,         24,         24,        1,     9216, 0xc72e034e
+0,         25,         25,        1,     9216, 0xc72e034e
+0,         26,         26,        1,     9216, 0xc72e034e
+0,         27,         27,        1,     9216, 0xc72e034e
+0,         28,         28,        1,     9216, 0xc72e034e
+0,         29,         29,        1,     9216, 0xc72e034e
+0,         30,         30,        1,     9216, 0xc72e034e
+0,         31,         31,        1,     9216, 0xc72e034e
+0,         32,         32,        1,     9216, 0xc72e034e
+0,         33,         33,        1,     9216, 0xc72e034e
+0,         34,         34,        1,     9216, 0xc72e034e
+0,         35,         35,        1,     9216, 0xc72e034e
+0,         36,         36,        1,     9216, 0xc72e034e
+0,         37,         37,        1,     9216, 0xc72e034e
+0,         38,         38,        1,     9216, 0xc72e034e
+0,         39,         39,        1,     9216, 0xc72e034e
+0,         40,         40,        1,     9216, 0xc72e034e
+0,         41,         41,        1,     9216, 0xc72e034e
+0,         42,         42,        1,     9216, 0xc72e034e
+0,         43,         43,        1,     9216, 0xc72e034e
+0,         44,         44,        1,     9216, 0xc72e034e
+0,         45,         45,        1,     9216, 0xc72e034e
+0,         46,         46,        1,     9216, 0xc72e034e
+0,         47,         47,        1,     9216, 0xc72e034e
+0,         48,         48,        1,     9216, 0xc72e034e
+0,         49,         49,        1,     9216, 0xc72e034e
+0,         50,         50,        1,     9216, 0xc72e034e
+0,         51,         51,        1,     9216, 0xc72e034e
+0,         52,         52,        1,     9216, 0xc72e034e
+0,         53,         53,        1,     9216, 0xc72e034e
+0,         54,         54,        1,     9216, 0xc72e034e
+0,         55,         55,        1,     9216, 0xc72e034e
+0,         56,         56,        1,     9216, 0xc72e034e
+0,         57,         57,        1,     9216, 0xc72e034e
+0,         58,         58,        1,     9216, 0xc72e034e
+0,         59,         59,        1,     9216, 0xc72e034e
+0,         60,         60,        1,     9216, 0xc72e034e
+0,         61,         61,        1,     9216, 0xc72e034e
+0,         62,         62,        1,     9216, 0xc72e034e
+0,         63,         63,        1,     9216, 0xc72e034e
+0,         64,         64,        1,     9216, 0xc72e034e
+0,         65,         65,        1,     9216, 0xc72e034e
+0,         66,         66,        1,     9216, 0xc72e034e
+0,         67,         67,        1,     9216, 0xc72e034e
+0,         68,         68,        1,     9216, 0xc72e034e
+0,         69,         69,        1,     9216, 0xc72e034e
+0,         70,         70,        1,     9216, 0xc72e034e
+0,         71,         71,        1,     9216, 0xc72e034e
+0,         72,         72,        1,     9216, 0xc72e034e
+0,         73,         73,        1,     9216, 0xc72e034e
+0,         74,         74,        1,     9216, 0xc72e034e
+0,         75,         75,        1,     9216, 0xc72e034e
+0,         76,         76,        1,     9216, 0xc72e034e
+0,         77,         77,        1,     9216, 0xc72e034e
+0,         78,         78,        1,     9216, 0xc72e034e
+0,         79,         79,        1,     9216, 0xc72e034e
+0,         80,         80,        1,     9216, 0xc72e034e
+0,         81,         81,        1,     9216, 0xc72e034e
+0,         82,         82,        1,     9216, 0xc72e034e
+0,         83,         83,        1,     9216, 0xc72e034e
+0,         84,         84,        1,     9216, 0xc72e034e
+0,         85,         85,        1,     9216, 0xc72e034e
+0,         86,         86,        1,     9216, 0xc72e034e
+0,         87,         87,        1,     9216, 0xc72e034e
+0,         88,         88,        1,     9216, 0xc72e034e
+0,         89,         89,        1,     9216, 0xc72e034e
+0,         90,         90,        1,     9216, 0xf75be32f
+0,         91,         91,        1,     9216, 0xf75be32f
+0,         92,         92,        1,     9216, 0xbb5bc1ae
+0,         93,         93,        1,     9216, 0xbb5bc1ae
+0,         94,         94,        1,     9216, 0x67e4a45c
+0,         95,         95,        1,     9216, 0x67e4a45c
+0,         96,         96,        1,     9216, 0x6a42832c
+0,         97,         97,        1,     9216, 0x6a42832c
+0,         98,         98,        1,     9216, 0x44da649f
+0,         99,         99,        1,     9216, 0x44da649f
+0,        100,        100,        1,     9216, 0x60273f76
+0,        101,        101,        1,     9216, 0x60273f76
+0,        102,        102,        1,     9216, 0x5f0b20aa
+0,        103,        103,        1,     9216, 0x5f0b20aa
+0,        104,        104,        1,     9216, 0xd382ff8f
+0,        105,        105,        1,     9216, 0xd382ff8f
+0,        106,        106,        1,     9216, 0x5a29e2a0
+0,        107,        107,        1,     9216, 0x5a29e2a0
+0,        108,        108,        1,     9216, 0x13ffc143
+0,        109,        109,        1,     9216, 0x93aba0d9
+0,        110,        110,        1,     9216, 0x93aba0d9
+0,        111,        111,        1,     9216, 0x93aba0d9
+0,        112,        112,        1,     9216, 0x93aba0d9
+0,        113,        113,        1,     9216, 0x93aba0d9
+0,        114,        114,        1,     9216, 0x93aba0d9
+0,        115,        115,        1,     9216, 0x93aba0d9
+0,        116,        116,        1,     9216, 0x93aba0d9
+0,        117,        117,        1,     9216, 0x93aba0d9
+0,        118,        118,        1,     9216, 0x93aba0d9
+0,        119,        119,        1,     9216, 0x93aba0d9
+0,        120,        120,        1,     9216, 0x93aba0d9
+0,        121,        121,        1,     9216, 0x93aba0d9
+0,        122,        122,        1,     9216, 0x93aba0d9
+0,        123,        123,        1,     9216, 0x93aba0d9
+0,        124,        124,        1,     9216, 0x93aba0d9
+0,        125,        125,        1,     9216, 0x93aba0d9
+0,        126,        126,        1,     9216, 0x93aba0d9
+0,        127,        127,        1,     9216, 0x93aba0d9
+0,        128,        128,        1,     9216, 0x93aba0d9
+0,        129,        129,        1,     9216, 0x93aba0d9
+0,        130,        130,        1,     9216, 0x93aba0d9
+0,        131,        131,        1,     9216, 0x93aba0d9
+0,        132,        132,        1,     9216, 0x93aba0d9
+0,        133,        133,        1,     9216, 0x93aba0d9
+0,        134,        134,        1,     9216, 0x93aba0d9
+0,        135,        135,        1,     9216, 0x93aba0d9
+0,        136,        136,        1,     9216, 0x93aba0d9
+0,        137,        137,        1,     9216, 0x93aba0d9
+0,        138,        138,        1,     9216, 0x93aba0d9
+0,        139,        139,        1,     9216, 0x93aba0d9
+0,        140,        140,        1,     9216, 0x93aba0d9
+0,        141,        141,        1,     9216, 0x93aba0d9
+0,        142,        142,        1,     9216, 0x93aba0d9
+0,        143,        143,        1,     9216, 0x93aba0d9
+0,        144,        144,        1,     9216, 0x93aba0d9
+0,        145,        145,        1,     9216, 0x93aba0d9
+0,        146,        146,        1,     9216, 0x93aba0d9
+0,        147,        147,        1,     9216, 0x93aba0d9
+0,        148,        148,        1,     9216, 0x93aba0d9
+0,        149,        149,        1,     9216, 0x93aba0d9
+0,        150,        150,        1,     9216, 0x93aba0d9
+0,        151,        151,        1,     9216, 0x93aba0d9
+0,        152,        152,        1,     9216, 0x93aba0d9
+0,        153,        153,        1,     9216, 0x93aba0d9
+0,        154,        154,        1,     9216, 0x93aba0d9
+0,        155,        155,        1,     9216, 0x93aba0d9
+0,        156,        156,        1,     9216, 0x93aba0d9
+0,        157,        157,        1,     9216, 0x93aba0d9
+0,        158,        158,        1,     9216, 0x93aba0d9
+0,        159,        159,        1,     9216, 0x93aba0d9
+0,        160,        160,        1,     9216, 0x93aba0d9
+0,        161,        161,        1,     9216, 0x93aba0d9
+0,        162,        162,        1,     9216, 0x93aba0d9
+0,        163,        163,        1,     9216, 0x93aba0d9
+0,        164,        164,        1,     9216, 0x93aba0d9
+0,        165,        165,        1,     9216, 0x93aba0d9
+0,        166,        166,        1,     9216, 0x93aba0d9
+0,        167,        167,        1,     9216, 0x93aba0d9
+0,        168,        168,        1,     9216, 0x93aba0d9
+0,        169,        169,        1,     9216, 0x93aba0d9
+0,        170,        170,        1,     9216, 0x93aba0d9
+0,        171,        171,        1,     9216, 0x93aba0d9
+0,        172,        172,        1,     9216, 0x93aba0d9
+0,        173,        173,        1,     9216, 0x93aba0d9
+0,        174,        174,        1,     9216, 0x93aba0d9
+0,        175,        175,        1,     9216, 0x93aba0d9
+0,        176,        176,        1,     9216, 0x93aba0d9
+0,        177,        177,        1,     9216, 0x93aba0d9
+0,        178,        178,        1,     9216, 0x93aba0d9
+0,        179,        179,        1,     9216, 0x93aba0d9
+0,        180,        180,        1,     9216, 0x93aba0d9
+0,        181,        181,        1,     9216, 0x93aba0d9
+0,        182,        182,        1,     9216, 0x93aba0d9
+0,        183,        183,        1,     9216, 0x93aba0d9
+0,        184,        184,        1,     9216, 0x93aba0d9
+0,        185,        185,        1,     9216, 0x93aba0d9
+0,        186,        186,        1,     9216, 0x93aba0d9
+0,        187,        187,        1,     9216, 0x93aba0d9
+0,        188,        188,        1,     9216, 0x93aba0d9
+0,        189,        189,        1,     9216, 0x93aba0d9
+0,        190,        190,        1,     9216, 0x93aba0d9
+0,        191,        191,        1,     9216, 0x93aba0d9
+0,        192,        192,        1,     9216, 0x93aba0d9
+0,        193,        193,        1,     9216, 0x93aba0d9
+0,        194,        194,        1,     9216, 0x93aba0d9
+0,        195,        195,        1,     9216, 0x93aba0d9
+0,        196,        196,        1,     9216, 0x93aba0d9
+0,        197,        197,        1,     9216, 0x93aba0d9
+0,        198,        198,        1,     9216, 0x93aba0d9
+0,        199,        199,        1,     9216, 0x93aba0d9
+0,        200,        200,        1,     9216, 0x93aba0d9
+0,        201,        201,        1,     9216, 0x93aba0d9
+0,        202,        202,        1,     9216, 0x93aba0d9
+0,        203,        203,        1,     9216, 0x93aba0d9
+0,        204,        204,        1,     9216, 0x93aba0d9
+0,        205,        205,        1,     9216, 0x93aba0d9
+0,        206,        206,        1,     9216, 0x93aba0d9
+0,        207,        207,        1,     9216, 0x93aba0d9
+0,        208,        208,        1,     9216, 0x93aba0d9
+0,        209,        209,        1,     9216, 0x93aba0d9
+0,        210,        210,        1,     9216, 0xb57cbdda
+0,        211,        211,        1,     9216, 0xfad4d7a8
+0,        212,        212,        1,     9216, 0x4a0bf635
+0,        213,        213,        1,     9216, 0x44880d81
+0,        214,        214,        1,     9216, 0x4de02b90
+0,        215,        215,        1,     9216, 0x2a4f4ac8
+0,        216,        216,        1,     9216, 0x96616376
+0,        217,        217,        1,     9216, 0x65c88629
+0,        218,        218,        1,     9216, 0x3d4a9efb
+0,        219,        219,        1,     9216, 0x85a5bdbe
+0,        220,        220,        1,     9216, 0x653edbd6
+0,        221,        221,        1,     9216, 0x9f28f433
+0,        222,        222,        1,     9216, 0x8f3f13ef
+0,        223,        223,        1,     9216, 0x43e32e56
+0,        224,        224,        1,     9216, 0x780d3969
+0,        225,        225,        1,     9216, 0x780d3969
+0,        226,        226,        1,     9216, 0x780d3969
+0,        227,        227,        1,     9216, 0x780d3969
+0,        228,        228,        1,     9216, 0x780d3969
+0,        229,        229,        1,     9216, 0x780d3969
+0,        230,        230,        1,     9216, 0x780d3969
+0,        231,        231,        1,     9216, 0x780d3969
+0,        232,        232,        1,     9216, 0x780d3969
+0,        233,        233,        1,     9216, 0x780d3969
+0,        234,        234,        1,     9216, 0x780d3969
+0,        235,        235,        1,     9216, 0x780d3969
+0,        236,        236,        1,     9216, 0x780d3969
+0,        237,        237,        1,     9216, 0x780d3969
+0,        238,        238,        1,     9216, 0x780d3969
+0,        239,        239,        1,     9216, 0x780d3969
+0,        240,        240,        1,     9216, 0x780d3969
+0,        241,        241,        1,     9216, 0x780d3969
+0,        242,        242,        1,     9216, 0x780d3969
+0,        243,        243,        1,     9216, 0x780d3969
+0,        244,        244,        1,     9216, 0x780d3969
+0,        245,        245,        1,     9216, 0x780d3969
+0,        246,        246,        1,     9216, 0x780d3969
+0,        247,        247,        1,     9216, 0x780d3969
+0,        248,        248,        1,     9216, 0x780d3969
+0,        249,        249,        1,     9216, 0x780d3969
+0,        250,        250,        1,     9216, 0x780d3969
+0,        251,        251,        1,     9216, 0x780d3969
+0,        252,        252,        1,     9216, 0x780d3969
+0,        253,        253,        1,     9216, 0x780d3969
+0,        254,        254,        1,     9216, 0x780d3969
+0,        255,        255,        1,     9216, 0x780d3969
+0,        256,        256,        1,     9216, 0x780d3969
+0,        257,        257,        1,     9216, 0x780d3969
+0,        258,        258,        1,     9216, 0x780d3969
+0,        259,        259,        1,     9216, 0x780d3969
+0,        260,        260,        1,     9216, 0x780d3969
+0,        261,        261,        1,     9216, 0x780d3969
+0,        262,        262,        1,     9216, 0x780d3969
+0,        263,        263,        1,     9216, 0x780d3969
+0,        264,        264,        1,     9216, 0x780d3969
+0,        265,        265,        1,     9216, 0x780d3969
+0,        266,        266,        1,     9216, 0x780d3969
+0,        267,        267,        1,     9216, 0x780d3969
+0,        268,        268,        1,     9216, 0x780d3969
+0,        269,        269,        1,     9216, 0x780d3969
+0,        270,        270,        1,     9216, 0x780d3969
+0,        271,        271,        1,     9216, 0x780d3969
+0,        272,        272,        1,     9216, 0x780d3969
+0,        273,        273,        1,     9216, 0x780d3969
+0,        274,        274,        1,     9216, 0x780d3969
+0,        275,        275,        1,     9216, 0x780d3969
+0,        276,        276,        1,     9216, 0x780d3969
+0,        277,        277,        1,     9216, 0x780d3969
+0,        278,        278,        1,     9216, 0x780d3969
+0,        279,        279,        1,     9216, 0x780d3969
+0,        280,        280,        1,     9216, 0x780d3969
+0,        281,        281,        1,     9216, 0x780d3969
+0,        282,        282,        1,     9216, 0x780d3969
+0,        283,        283,        1,     9216, 0x780d3969
+0,        284,        284,        1,     9216, 0x780d3969
+0,        285,        285,        1,     9216, 0x780d3969
+0,        286,        286,        1,     9216, 0x780d3969
+0,        287,        287,        1,     9216, 0x780d3969
+0,        288,        288,        1,     9216, 0x780d3969
+0,        289,        289,        1,     9216, 0x780d3969
+0,        290,        290,        1,     9216, 0x780d3969
+0,        291,        291,        1,     9216, 0x780d3969
+0,        292,        292,        1,     9216, 0x780d3969
+0,        293,        293,        1,     9216, 0x780d3969
+0,        294,        294,        1,     9216, 0x780d3969
+0,        295,        295,        1,     9216, 0x780d3969
+0,        296,        296,        1,     9216, 0x780d3969
+0,        297,        297,        1,     9216, 0x780d3969
+0,        298,        298,        1,     9216, 0x780d3969
+0,        299,        299,        1,     9216, 0x780d3969
+0,        300,        300,        1,     9216, 0x780d3969
+0,        301,        301,        1,     9216, 0x780d3969
+0,        302,        302,        1,     9216, 0x780d3969
+0,        303,        303,        1,     9216, 0x780d3969
+0,        304,        304,        1,     9216, 0x780d3969
+0,        305,        305,        1,     9216, 0x780d3969
+0,        306,        306,        1,     9216, 0x780d3969
+0,        307,        307,        1,     9216, 0x780d3969
+0,        308,        308,        1,     9216, 0x780d3969
+0,        309,        309,        1,     9216, 0x780d3969
+0,        310,        310,        1,     9216, 0x780d3969
+0,        311,        311,        1,     9216, 0x780d3969
+0,        312,        312,        1,     9216, 0x780d3969
+0,        313,        313,        1,     9216, 0x780d3969
+0,        314,        314,        1,     9216, 0xc72e034e
diff --git a/tests/ref/fate/filter-shuffleframes b/tests/ref/fate/filter-shuffleframes
new file mode 100644
index 0000000000..58d98540c1
--- /dev/null
+++ b/tests/ref/fate/filter-shuffleframes
@@ -0,0 +1,53 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x9dddf64a
+0,          1,          1,        1,   152064, 0x4bb46551
+0,          2,          2,        1,   152064, 0x05b789ef
+0,          3,          3,        1,   152064, 0xedb5a8e6
+0,          4,          4,        1,   152064, 0x4de3b652
+0,          5,          5,        1,   152064, 0x2a8380b0
+0,          6,          6,        1,   152064, 0x1f1b8026
+0,          7,          7,        1,   152064, 0x5ab58bac
+0,          8,          8,        1,   152064, 0xe20f7c23
+0,          9,          9,        1,   152064, 0x30f5fcd5
+0,         10,         10,        1,   152064, 0x02344760
+0,         11,         11,        1,   152064, 0x91373915
+0,         12,         12,        1,   152064, 0x52a48ddd
+0,         13,         13,        1,   152064, 0x24eca223
+0,         14,         14,        1,   152064, 0xc711ad61
+0,         15,         15,        1,   152064, 0xb15d38c8
+0,         16,         16,        1,   152064, 0x8e364e18
+0,         17,         17,        1,   152064, 0xa91c0f05
+0,         18,         18,        1,   152064, 0xfc7bf570
+0,         19,         19,        1,   152064, 0xf34ddbff
+0,         20,         20,        1,   152064, 0xf25f6acc
+0,         21,         21,        1,   152064, 0x2f2768ef
+0,         22,         22,        1,   152064, 0x445d1d59
+0,         23,         23,        1,   152064, 0x9dc72412
+0,         24,         24,        1,   152064, 0x43d796b5
+0,         25,         25,        1,   152064, 0x95579936
+0,         26,         26,        1,   152064, 0xce09f9d6
+0,         27,         27,        1,   152064, 0x6dc3650e
+0,         28,         28,        1,   152064, 0x76d2a455
+0,         29,         29,        1,   152064, 0xd780d887
+0,         30,         30,        1,   152064, 0xd766fc8d
+0,         31,         31,        1,   152064, 0xe295c51e
+0,         32,         32,        1,   152064, 0x0f9d6aca
+0,         33,         33,        1,   152064, 0xfa8d94fb
+0,         34,         34,        1,   152064, 0x7fea4378
+0,         35,         35,        1,   152064, 0xe22f7a30
+0,         36,         36,        1,   152064, 0x0b07594c
+0,         37,         37,        1,   152064, 0xa50d01f8
+0,         38,         38,        1,   152064, 0x4c9737ab
+0,         39,         39,        1,   152064, 0xd4e49e08
+0,         40,         40,        1,   152064, 0xd2735925
+0,         41,         41,        1,   152064, 0x88734edd
+0,         42,         42,        1,   152064, 0xfd500471
+0,         43,         43,        1,   152064, 0x575c20ec
+0,         44,         44,        1,   152064, 0x20cebfa9
+0,         45,         45,        1,   152064, 0x6e88c5c2
+0,         46,         46,        1,   152064, 0x09ef53ff
+0,         47,         47,        1,   152064, 0x61b47e73
diff --git a/tests/ref/fate/filter-shuffleplanes-dup-luma b/tests/ref/fate/filter-shuffleplanes-dup-luma
index 52041fad22..da111c2374 100644
--- a/tests/ref/fate/filter-shuffleplanes-dup-luma
+++ b/tests/ref/fate/filter-shuffleplanes-dup-luma
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   405504, 0x76625893
 0,          1,          1,        1,   405504, 0x348f0b97
 0,          2,          2,        1,   405504, 0x3de02149
diff --git a/tests/ref/fate/filter-shuffleplanes-swapuv b/tests/ref/fate/filter-shuffleplanes-swapuv
index 95da149ad3..9ff175b1f7 100644
--- a/tests/ref/fate/filter-shuffleplanes-swapuv
+++ b/tests/ref/fate/filter-shuffleplanes-swapuv
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x68b189ef
 0,          1,          1,        1,   152064, 0x5cc66551
 0,          2,          2,        1,   152064, 0x88f0f64a
diff --git a/tests/ref/fate/filter-silenceremove b/tests/ref/fate/filter-silenceremove
new file mode 100644
index 0000000000..81647c60ba
--- /dev/null
+++ b/tests/ref/fate/filter-silenceremove
@@ -0,0 +1,36 @@
+#tb 0: 1/192000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 192000
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,        1,        4, 0x00200008
+0,          1,          1,        1,        4, 0x00180006
+0,          2,          2,        1,        4, 0x001c0007
+0,          3,          3,        1,        4, 0x03250208
+0,          4,          4,        1,        4, 0x03290208
+0,          5,          5,        1,        4, 0x03230207
+0,          6,          6,        1,        4, 0x031f0206
+0,          7,          7,        1,        4, 0x03250208
+0,          8,          8,        1,        4, 0x00220009
+0,          9,          9,        1,        4, 0x00200009
+0,         10,         10,        1,        4, 0x03250208
+0,         11,         11,        1,        4, 0x0335020c
+0,         12,         12,        1,        4, 0x034b0211
+0,         13,         13,        1,        4, 0x034b020f
+0,         14,         14,        1,        4, 0x0343020e
+0,         15,         15,        1,        4, 0x00440011
+0,         16,         16,        1,        4, 0x00400011
+0,         17,         17,        1,        4, 0x003a000f
+0,         18,         18,        1,        4, 0x0339020d
+0,         19,         19,        1,        4, 0x003a000f
+0,         20,         20,        1,        4, 0x0034000d
+0,         21,         21,        1,        4, 0x0034000d
+0,         22,         22,        1,        4, 0x0036000e
+0,         23,         23,        1,        4, 0x03290208
+0,         24,         24,        1,        4, 0x03230204
+0,         25,         25,        1,        4, 0x03170201
+0,         26,         26,        1,        4, 0x030701fd
+0,         27,         27,        1,        4, 0x02fd01fc
+0,         28,         28,        1,        4, 0x00060002
+0,         29,         29,        1,        4, 0x000c0004
diff --git a/tests/ref/fate/filter-smptebars b/tests/ref/fate/filter-smptebars
new file mode 100644
index 0000000000..2242aef576
--- /dev/null
+++ b/tests/ref/fate/filter-smptebars
@@ -0,0 +1,10 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   115200, 0x87d91dc5
+0,          1,          1,        1,   115200, 0x87d91dc5
+0,          2,          2,        1,   115200, 0x87d91dc5
+0,          3,          3,        1,   115200, 0x87d91dc5
+0,          4,          4,        1,   115200, 0x87d91dc5
diff --git a/tests/ref/fate/filter-smptehdbars b/tests/ref/fate/filter-smptehdbars
new file mode 100644
index 0000000000..7a105fb69e
--- /dev/null
+++ b/tests/ref/fate/filter-smptehdbars
@@ -0,0 +1,10 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   230400, 0x85f40706
+0,          1,          1,        1,   230400, 0x85f40706
+0,          2,          2,        1,   230400, 0x85f40706
+0,          3,          3,        1,   230400, 0x85f40706
+0,          4,          4,        1,   230400, 0x85f40706
diff --git a/tests/ref/fate/filter-stereo3d-abr-ml b/tests/ref/fate/filter-stereo3d-abr-ml
new file mode 100644
index 0000000000..07c4cb7dd9
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-abr-ml
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x144
+#sar 0: 0/1
+0,          0,          0,        1,    76032, 0xad4c8a22
+0,          1,          1,        1,    76032, 0x0dfdc6ad
+0,          2,          2,        1,    76032, 0x6341da83
+0,          3,          3,        1,    76032, 0x8dbcb05f
+0,          4,          4,        1,    76032, 0xad87bbee
diff --git a/tests/ref/fate/filter-stereo3d-abr-mr b/tests/ref/fate/filter-stereo3d-abr-mr
new file mode 100644
index 0000000000..4e9edea909
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-abr-mr
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x144
+#sar 0: 0/1
+0,          0,          0,        1,    76032, 0x5d0effbe
+0,          1,          1,        1,    76032, 0x5bb49e95
+0,          2,          2,        1,    76032, 0xb6301bc7
+0,          3,          3,        1,    76032, 0x7cf1d042
+0,          4,          4,        1,    76032, 0x24fafa55
diff --git a/tests/ref/fate/filter-stereo3d-al-sbsl b/tests/ref/fate/filter-stereo3d-al-sbsl
new file mode 100644
index 0000000000..6f42820c93
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-al-sbsl
@@ -0,0 +1,10 @@
+#tb 0: 2/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 704x288
+#sar 0: 0/1
+0,          0,          0,        1,   304128, 0xb9c0ef40
+0,          1,          1,        1,   304128, 0xfa0b7709
+0,          2,          2,        1,   304128, 0x14255f47
+0,          3,          3,        1,   304128, 0xa9da07de
+0,          4,          4,        1,   304128, 0x9d64b93b
diff --git a/tests/ref/fate/filter-stereo3d-ar-abl b/tests/ref/fate/filter-stereo3d-ar-abl
new file mode 100644
index 0000000000..6b5a971d78
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-ar-abl
@@ -0,0 +1,10 @@
+#tb 0: 2/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x576
+#sar 0: 0/1
+0,          0,          0,        1,   304128, 0x7babef40
+0,          1,          1,        1,   304128, 0x287d7709
+0,          2,          2,        1,   304128, 0x385f5f47
+0,          3,          3,        1,   304128, 0x503507de
+0,          4,          4,        1,   304128, 0xb97db93b
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-abl b/tests/ref/fate/filter-stereo3d-sbsl-abl
new file mode 100644
index 0000000000..f0edf34b09
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-abl
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x576
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x2f9389ef
+0,          1,          1,        1,   152064, 0x16c66551
+0,          2,          2,        1,   152064, 0xd779f64a
+0,          3,          3,        1,   152064, 0x7a7c80b0
+0,          4,          4,        1,   152064, 0x0702b652
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-abr b/tests/ref/fate/filter-stereo3d-sbsl-abr
new file mode 100644
index 0000000000..2756d38427
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-abr
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x576
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xd1f489ef
+0,          1,          1,        1,   152064, 0xe4fe6551
+0,          2,          2,        1,   152064, 0xd0d9f64a
+0,          3,          3,        1,   152064, 0xfd3a80b0
+0,          4,          4,        1,   152064, 0x488eb652
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-agmc b/tests/ref/fate/filter-stereo3d-sbsl-agmc
new file mode 100644
index 0000000000..d86a2267ee
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-agmc
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xa950d0d9
+0,          1,          1,        1,   152064, 0x6a6933c3
+0,          2,          2,        1,   152064, 0x66a1da3a
+0,          3,          3,        1,   152064, 0xe591aa12
+0,          4,          4,        1,   152064, 0x42413288
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-agmd b/tests/ref/fate/filter-stereo3d-sbsl-agmd
new file mode 100644
index 0000000000..ab915d601d
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-agmd
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x962d1371
+0,          1,          1,        1,   152064, 0xe7db1d51
+0,          2,          2,        1,   152064, 0x3bb0c409
+0,          3,          3,        1,   152064, 0xcc213557
+0,          4,          4,        1,   152064, 0x913e1048
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-agmg b/tests/ref/fate/filter-stereo3d-sbsl-agmg
new file mode 100644
index 0000000000..4ad85b6820
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-agmg
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x45a6c9a8
+0,          1,          1,        1,   152064, 0xe7ba65fc
+0,          2,          2,        1,   152064, 0x88ab8fcc
+0,          3,          3,        1,   152064, 0x91478b9d
+0,          4,          4,        1,   152064, 0xb7ecc7cf
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-agmh b/tests/ref/fate/filter-stereo3d-sbsl-agmh
new file mode 100644
index 0000000000..b50f5af018
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-agmh
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x96464057
+0,          1,          1,        1,   152064, 0x58c4e280
+0,          2,          2,        1,   152064, 0xaf76fd24
+0,          3,          3,        1,   152064, 0xa4dacf0d
+0,          4,          4,        1,   152064, 0x964a2110
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-al b/tests/ref/fate/filter-stereo3d-sbsl-al
new file mode 100644
index 0000000000..1f9aaa4bcb
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-al
@@ -0,0 +1,10 @@
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,    76032, 0x3ff06515
+0,          1,          1,        1,    76032, 0x00d824da
+0,          2,          2,        1,    76032, 0x64a33c64
+0,          3,          3,        1,    76032, 0xeef328ed
+0,          4,          4,        1,    76032, 0x4bb209cc
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-arbg b/tests/ref/fate/filter-stereo3d-sbsl-arbg
new file mode 100644
index 0000000000..b5e4996b30
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-arbg
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x4d83ea30
+0,          1,          1,        1,   152064, 0xa4a3be5b
+0,          2,          2,        1,   152064, 0x21032989
+0,          3,          3,        1,   152064, 0xa201194b
+0,          4,          4,        1,   152064, 0x9b7980cc
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-arcc b/tests/ref/fate/filter-stereo3d-sbsl-arcc
new file mode 100644
index 0000000000..bcecd8785e
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-arcc
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x2760b14a
+0,          1,          1,        1,   152064, 0xcf94baaf
+0,          2,          2,        1,   152064, 0x9b5e0e0a
+0,          3,          3,        1,   152064, 0x6bfb8127
+0,          4,          4,        1,   152064, 0xa0293fed
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-arcd b/tests/ref/fate/filter-stereo3d-sbsl-arcd
new file mode 100644
index 0000000000..b5f11e278e
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-arcd
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xa0261570
+0,          1,          1,        1,   152064, 0x678403c8
+0,          2,          2,        1,   152064, 0x1087e7b6
+0,          3,          3,        1,   152064, 0xa3909df3
+0,          4,          4,        1,   152064, 0x87e4c4d4
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-arcg b/tests/ref/fate/filter-stereo3d-sbsl-arcg
new file mode 100644
index 0000000000..f5c58450f4
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-arcg
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x70f5c9a8
+0,          1,          1,        1,   152064, 0x56f165fc
+0,          2,          2,        1,   152064, 0xe59f8fcc
+0,          3,          3,        1,   152064, 0xc5df8b9d
+0,          4,          4,        1,   152064, 0xaab2c7cf
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-arch b/tests/ref/fate/filter-stereo3d-sbsl-arch
new file mode 100644
index 0000000000..d6767dfce4
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-arch
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x81ab8dad
+0,          1,          1,        1,   152064, 0x820fd98a
+0,          2,          2,        1,   152064, 0x1ccc712b
+0,          3,          3,        1,   152064, 0x0d278740
+0,          4,          4,        1,   152064, 0x13eaa8e2
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-argg b/tests/ref/fate/filter-stereo3d-sbsl-argg
new file mode 100644
index 0000000000..82fa276704
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-argg
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x2cfbea30
+0,          1,          1,        1,   152064, 0x4c44be5b
+0,          2,          2,        1,   152064, 0x87462989
+0,          3,          3,        1,   152064, 0x1462194b
+0,          4,          4,        1,   152064, 0xe27c80cc
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-aybc b/tests/ref/fate/filter-stereo3d-sbsl-aybc
new file mode 100644
index 0000000000..1c24262006
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-aybc
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xae8c985d
+0,          1,          1,        1,   152064, 0x489e1535
+0,          2,          2,        1,   152064, 0x01a83b2b
+0,          3,          3,        1,   152064, 0x3870ffd6
+0,          4,          4,        1,   152064, 0x3d5b0cc4
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-aybd b/tests/ref/fate/filter-stereo3d-sbsl-aybd
new file mode 100644
index 0000000000..0aa4e8bc2c
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-aybd
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x7dc98468
+0,          1,          1,        1,   152064, 0xf72db6c9
+0,          2,          2,        1,   152064, 0x1630f53f
+0,          3,          3,        1,   152064, 0xc1765599
+0,          4,          4,        1,   152064, 0x12e35db1
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-aybg b/tests/ref/fate/filter-stereo3d-sbsl-aybg
new file mode 100644
index 0000000000..ebd8ba228a
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-aybg
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x1a57c9a8
+0,          1,          1,        1,   152064, 0x789265fc
+0,          2,          2,        1,   152064, 0x2bb78fcc
+0,          3,          3,        1,   152064, 0x5caf8b9d
+0,          4,          4,        1,   152064, 0xc526c7cf
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-aybh b/tests/ref/fate/filter-stereo3d-sbsl-aybh
new file mode 100644
index 0000000000..1b9edebb62
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-aybh
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xf3ee182f
+0,          1,          1,        1,   152064, 0x8b1c25f1
+0,          2,          2,        1,   152064, 0xe78de2ac
+0,          3,          3,        1,   152064, 0x3eb08db6
+0,          4,          4,        1,   152064, 0x852eae5c
diff --git a/tests/ref/fate/filter-stereo3d-sbsl-sbsr b/tests/ref/fate/filter-stereo3d-sbsl-sbsr
new file mode 100644
index 0000000000..9a5da962b4
--- /dev/null
+++ b/tests/ref/fate/filter-stereo3d-sbsl-sbsr
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0xbe2f89ef
+0,          1,          1,        1,   152064, 0x4c806551
+0,          2,          2,        1,   152064, 0x8165f64a
+0,          3,          3,        1,   152064, 0xadf280b0
+0,          4,          4,        1,   152064, 0x6677b652
diff --git a/tests/ref/fate/filter-stereotools b/tests/ref/fate/filter-stereotools
new file mode 100644
index 0000000000..60acaf81b2
--- /dev/null
+++ b/tests/ref/fate/filter-stereotools
@@ -0,0 +1,26 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x48b6d241
+0,       1024,       1024,     1024,     4096, 0xe0c4ca9a
+0,       2048,       2048,     1024,     4096, 0x6dd8e26c
+0,       3072,       3072,     1024,     4096, 0x047cce1c
+0,       4096,       4096,     1024,     4096, 0x0b7bc8e4
+0,       5120,       5120,     1024,     4096, 0xf0c9d037
+0,       6144,       6144,     1024,     4096, 0x6f23c83d
+0,       7168,       7168,     1024,     4096, 0xe6d8c099
+0,       8192,       8192,     1024,     4096, 0xcca3cb25
+0,       9216,       9216,     1024,     4096, 0xefced25b
+0,      10240,      10240,     1024,     4096, 0x8614cdcb
+0,      11264,      11264,     1024,     4096, 0x06d1eb3f
+0,      12288,      12288,     1024,     4096, 0x7afbcffd
+0,      13312,      13312,     1024,     4096, 0x6371dcd8
+0,      14336,      14336,     1024,     4096, 0xdd8f90d9
+0,      15360,      15360,     1024,     4096, 0x448c08f4
+0,      16384,      16384,     1024,     4096, 0x4d9b2d26
+0,      17408,      17408,     1024,     4096, 0x735a05da
+0,      18432,      18432,     1024,     4096, 0x8651bf40
+0,      19456,      19456,     1024,     4096, 0xbf98c4e7
diff --git a/tests/ref/fate/filter-swaprect b/tests/ref/fate/filter-swaprect
new file mode 100644
index 0000000000..5bd686457c
--- /dev/null
+++ b/tests/ref/fate/filter-swaprect
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x4aaf89ef
+0,          1,          1,        1,   152064, 0x1c4e6551
+0,          2,          2,        1,   152064, 0x18b3f64a
+0,          3,          3,        1,   152064, 0xdd7680b0
+0,          4,          4,        1,   152064, 0x9835b652
+0,          5,          5,        1,   152064, 0xd56da8e6
+0,          6,          6,        1,   152064, 0x3d947c23
+0,          7,          7,        1,   152064, 0xe2e98bac
+0,          8,          8,        1,   152064, 0xf7ab8026
+0,          9,          9,        1,   152064, 0x1dcc3915
+0,         10,         10,        1,   152064, 0xf54d4760
+0,         11,         11,        1,   152064, 0x937dfcd5
+0,         12,         12,        1,   152064, 0xc18aad61
+0,         13,         13,        1,   152064, 0x8612a223
+0,         14,         14,        1,   152064, 0xd1fc8ddd
+0,         15,         15,        1,   152064, 0x88030f05
+0,         16,         16,        1,   152064, 0xd17f4e18
+0,         17,         17,        1,   152064, 0x75d838c8
+0,         18,         18,        1,   152064, 0x140e6acc
+0,         19,         19,        1,   152064, 0xaf89dbff
+0,         20,         20,        1,   152064, 0xc2b1f570
+0,         21,         21,        1,   152064, 0x84dc2412
+0,         22,         22,        1,   152064, 0x84951d59
+0,         23,         23,        1,   152064, 0xeb5c68ef
+0,         24,         24,        1,   152064, 0x5f4cf9d6
+0,         25,         25,        1,   152064, 0xb4689936
+0,         26,         26,        1,   152064, 0x9c7096b5
+0,         27,         27,        1,   152064, 0x5142d887
+0,         28,         28,        1,   152064, 0xa4b5a455
+0,         29,         29,        1,   152064, 0xc100650e
+0,         30,         30,        1,   152064, 0x86d86aca
+0,         31,         31,        1,   152064, 0xf1cdc51e
+0,         32,         32,        1,   152064, 0x34f8fc8d
+0,         33,         33,        1,   152064, 0x7eff7a30
+0,         34,         34,        1,   152064, 0x13b44378
+0,         35,         35,        1,   152064, 0x646194fb
+0,         36,         36,        1,   152064, 0x111437ab
+0,         37,         37,        1,   152064, 0x448d01f8
+0,         38,         38,        1,   152064, 0x55e1594c
+0,         39,         39,        1,   152064, 0xd1464edd
+0,         40,         40,        1,   152064, 0xd6165925
+0,         41,         41,        1,   152064, 0x111e9e08
+0,         42,         42,        1,   152064, 0x6c91bfa9
+0,         43,         43,        1,   152064, 0x8fd220ec
+0,         44,         44,        1,   152064, 0xfe480471
+0,         45,         45,        1,   152064, 0xd7687e73
+0,         46,         46,        1,   152064, 0x979b53ff
+0,         47,         47,        1,   152064, 0xeb98c5c2
+0,         48,         48,        1,   152064, 0xc04cb483
+0,         49,         49,        1,   152064, 0x3709d8ea
diff --git a/tests/ref/fate/filter-tblend b/tests/ref/fate/filter-tblend
new file mode 100644
index 0000000000..80fea849f3
--- /dev/null
+++ b/tests/ref/fate/filter-tblend
@@ -0,0 +1,54 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          1,          1,        1,   152064, 0x8e50e5e5
+0,          2,          2,        1,   152064, 0x7187a95e
+0,          3,          3,        1,   152064, 0xbd73863e
+0,          4,          4,        1,   152064, 0xabaefc78
+0,          5,          5,        1,   152064, 0xf080523f
+0,          6,          6,        1,   152064, 0x2ba7c11c
+0,          7,          7,        1,   152064, 0x1bfe0964
+0,          8,          8,        1,   152064, 0xe081d9db
+0,          9,          9,        1,   152064, 0x26eee75b
+0,         10,         10,        1,   152064, 0xcc28e18c
+0,         11,         11,        1,   152064, 0x3d2ed08b
+0,         12,         12,        1,   152064, 0x4567acbe
+0,         13,         13,        1,   152064, 0xa22f09db
+0,         14,         14,        1,   152064, 0xe4438e6f
+0,         15,         15,        1,   152064, 0x34d02799
+0,         16,         16,        1,   152064, 0x4c9230b3
+0,         17,         17,        1,   152064, 0x08e6c23c
+0,         18,         18,        1,   152064, 0xa0a475a5
+0,         19,         19,        1,   152064, 0x47f5d5e9
+0,         20,         20,        1,   152064, 0x0713219a
+0,         21,         21,        1,   152064, 0x9e4434a2
+0,         22,         22,        1,   152064, 0xc06a2482
+0,         23,         23,        1,   152064, 0xba321552
+0,         24,         24,        1,   152064, 0x74070b31
+0,         25,         25,        1,   152064, 0x92188f27
+0,         26,         26,        1,   152064, 0x29cf1fae
+0,         27,         27,        1,   152064, 0x04fd06ea
+0,         28,         28,        1,   152064, 0xcbbded09
+0,         29,         29,        1,   152064, 0x7f731df8
+0,         30,         30,        1,   152064, 0x9fd5b56f
+0,         31,         31,        1,   152064, 0x82217442
+0,         32,         32,        1,   152064, 0x95496106
+0,         33,         33,        1,   152064, 0xb9c50804
+0,         34,         34,        1,   152064, 0xa7051cba
+0,         35,         35,        1,   152064, 0x76bc5e88
+0,         36,         36,        1,   152064, 0x8276cfb2
+0,         37,         37,        1,   152064, 0x88bbf936
+0,         38,         38,        1,   152064, 0x160c5d4e
+0,         39,         39,        1,   152064, 0x0b61942a
+0,         40,         40,        1,   152064, 0x4a4aae9b
+0,         41,         41,        1,   152064, 0x049978fa
+0,         42,         42,        1,   152064, 0x12584f81
+0,         43,         43,        1,   152064, 0xada82b80
+0,         44,         44,        1,   152064, 0x3a4876ef
+0,         45,         45,        1,   152064, 0x7ccb86f2
+0,         46,         46,        1,   152064, 0x11bef54d
+0,         47,         47,        1,   152064, 0xb1714cd0
+0,         48,         48,        1,   152064, 0x950a3388
+0,         49,         49,        1,   152064, 0x1c1cc3ec
diff --git a/tests/ref/fate/filter-telecine b/tests/ref/fate/filter-telecine
new file mode 100644
index 0000000000..6d3545e4d8
--- /dev/null
+++ b/tests/ref/fate/filter-telecine
@@ -0,0 +1,67 @@
+#tb 0: 4/125
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x05b789ef
+0,          1,          1,        1,   152064, 0x4bb46551
+0,          2,          2,        1,   152064, 0x40692c80
+0,          3,          3,        1,   152064, 0xd7ad04cb
+0,          4,          4,        1,   152064, 0x2a8380b0
+0,          5,          5,        1,   152064, 0x4de3b652
+0,          6,          6,        1,   152064, 0xedb5a8e6
+0,          7,          7,        1,   152064, 0x549dfa8a
+0,          8,          8,        1,   152064, 0x447bc7b9
+0,          9,          9,        1,   152064, 0x5ab58bac
+0,         10,         10,        1,   152064, 0x1f1b8026
+0,         11,         11,        1,   152064, 0x91373915
+0,         12,         12,        1,   152064, 0x90895a6e
+0,         13,         13,        1,   152064, 0x793d075e
+0,         14,         14,        1,   152064, 0x30f5fcd5
+0,         15,         15,        1,   152064, 0xc711ad61
+0,         16,         16,        1,   152064, 0x24eca223
+0,         17,         17,        1,   152064, 0x0a4073dc
+0,         18,         18,        1,   152064, 0x06e34d70
+0,         19,         19,        1,   152064, 0xa91c0f05
+0,         20,         20,        1,   152064, 0x8e364e18
+0,         21,         21,        1,   152064, 0xb15d38c8
+0,         22,         22,        1,   152064, 0x6b2b2e46
+0,         23,         23,        1,   152064, 0xbd2320cb
+0,         24,         24,        1,   152064, 0xf34ddbff
+0,         25,         25,        1,   152064, 0xfc7bf570
+0,         26,         26,        1,   152064, 0x9dc72412
+0,         27,         27,        1,   152064, 0xa1242020
+0,         28,         28,        1,   152064, 0x1f939e6a
+0,         29,         29,        1,   152064, 0x2f2768ef
+0,         30,         30,        1,   152064, 0xce09f9d6
+0,         31,         31,        1,   152064, 0x95579936
+0,         32,         32,        1,   152064, 0x41181cbd
+0,         33,         33,        1,   152064, 0xe9cec847
+0,         34,         34,        1,   152064, 0xd780d887
+0,         35,         35,        1,   152064, 0x76d2a455
+0,         36,         36,        1,   152064, 0x6dc3650e
+0,         37,         37,        1,   152064, 0x8d165d23
+0,         38,         38,        1,   152064, 0x64f10efa
+0,         39,         39,        1,   152064, 0xe295c51e
+0,         40,         40,        1,   152064, 0xd766fc8d
+0,         41,         41,        1,   152064, 0xe22f7a30
+0,         42,         42,        1,   152064, 0xd8c68892
+0,         43,         43,        1,   152064, 0x26516b0e
+0,         44,         44,        1,   152064, 0xfa8d94fb
+0,         45,         45,        1,   152064, 0x4c9737ab
+0,         46,         46,        1,   152064, 0xa50d01f8
+0,         47,         47,        1,   152064, 0x82f12165
+0,         48,         48,        1,   152064, 0x113fadc0
+0,         49,         49,        1,   152064, 0x88734edd
+0,         50,         50,        1,   152064, 0xd2735925
+0,         51,         51,        1,   152064, 0xd4e49e08
+0,         52,         52,        1,   152064, 0x8cd54fc5
+0,         53,         53,        1,   152064, 0xae821cac
+0,         54,         54,        1,   152064, 0x575c20ec
+0,         55,         55,        1,   152064, 0xfd500471
+0,         56,         56,        1,   152064, 0x61b47e73
+0,         57,         57,        1,   152064, 0x213d5314
+0,         58,         58,        1,   152064, 0xb4ddd391
+0,         59,         59,        1,   152064, 0x6e88c5c2
+0,         60,         60,        1,   152064, 0xbb87b483
+0,         61,         61,        1,   152064, 0x4bbad8ea
diff --git a/tests/ref/fate/filter-testsrc2-rgb24 b/tests/ref/fate/filter-testsrc2-rgb24
new file mode 100644
index 0000000000..207ddfc61a
--- /dev/null
+++ b/tests/ref/fate/filter-testsrc2-rgb24
@@ -0,0 +1,75 @@
+#tb 0: 1/7
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   230400, 0x1c012312
+0,          1,          1,        1,   230400, 0xf7cf4e81
+0,          2,          2,        1,   230400, 0x29a45e1c
+0,          3,          3,        1,   230400, 0xe73082a7
+0,          4,          4,        1,   230400, 0x7b84c199
+0,          5,          5,        1,   230400, 0xcdfd5b52
+0,          6,          6,        1,   230400, 0xc035ebb8
+0,          7,          7,        1,   230400, 0x8e37afd0
+0,          8,          8,        1,   230400, 0x66386f44
+0,          9,          9,        1,   230400, 0x17fa6b56
+0,         10,         10,        1,   230400, 0x154c5b53
+0,         11,         11,        1,   230400, 0xcaff83ab
+0,         12,         12,        1,   230400, 0x7c3d935d
+0,         13,         13,        1,   230400, 0x8b2a48ef
+0,         14,         14,        1,   230400, 0xb56dc39e
+0,         15,         15,        1,   230400, 0x2f4522e6
+0,         16,         16,        1,   230400, 0x275efedf
+0,         17,         17,        1,   230400, 0x7917108e
+0,         18,         18,        1,   230400, 0x3f631971
+0,         19,         19,        1,   230400, 0xd70bb265
+0,         20,         20,        1,   230400, 0xb918d1e3
+0,         21,         21,        1,   230400, 0xce8d0032
+0,         22,         22,        1,   230400, 0xbbc3bd32
+0,         23,         23,        1,   230400, 0x42103583
+0,         24,         24,        1,   230400, 0x4be88f56
+0,         25,         25,        1,   230400, 0xd32610ea
+0,         26,         26,        1,   230400, 0xcae0a12b
+0,         27,         27,        1,   230400, 0x4256bdf3
+0,         28,         28,        1,   230400, 0x76b59faf
+0,         29,         29,        1,   230400, 0x6cbf7c06
+0,         30,         30,        1,   230400, 0x0625b097
+0,         31,         31,        1,   230400, 0x867c78c3
+0,         32,         32,        1,   230400, 0x767cc08b
+0,         33,         33,        1,   230400, 0x097980b0
+0,         34,         34,        1,   230400, 0xba182417
+0,         35,         35,        1,   230400, 0x08f62b8b
+0,         36,         36,        1,   230400, 0x8fc5e64c
+0,         37,         37,        1,   230400, 0xed020fad
+0,         38,         38,        1,   230400, 0x9b97066b
+0,         39,         39,        1,   230400, 0x1d0b31ff
+0,         40,         40,        1,   230400, 0x6915912f
+0,         41,         41,        1,   230400, 0xb7e6358e
+0,         42,         42,        1,   230400, 0x7a3aa13b
+0,         43,         43,        1,   230400, 0x7317e56a
+0,         44,         44,        1,   230400, 0xf1e1c7f9
+0,         45,         45,        1,   230400, 0xb1d5d5e1
+0,         46,         46,        1,   230400, 0x0bad1208
+0,         47,         47,        1,   230400, 0x2f71275a
+0,         48,         48,        1,   230400, 0x4d79679d
+0,         49,         49,        1,   230400, 0xfa52be03
+0,         50,         50,        1,   230400, 0x17d1d67a
+0,         51,         51,        1,   230400, 0x15844f5b
+0,         52,         52,        1,   230400, 0xd19466c3
+0,         53,         53,        1,   230400, 0xeb80cd8a
+0,         54,         54,        1,   230400, 0x9beee240
+0,         55,         55,        1,   230400, 0x677a13b3
+0,         56,         56,        1,   230400, 0x43abe88f
+0,         57,         57,        1,   230400, 0xa42aafc1
+0,         58,         58,        1,   230400, 0x0a78c290
+0,         59,         59,        1,   230400, 0x3806e07d
+0,         60,         60,        1,   230400, 0xaeef5d61
+0,         61,         61,        1,   230400, 0x0763c77f
+0,         62,         62,        1,   230400, 0xccc17ab1
+0,         63,         63,        1,   230400, 0x9a844893
+0,         64,         64,        1,   230400, 0x8f962741
+0,         65,         65,        1,   230400, 0xe3022980
+0,         66,         66,        1,   230400, 0x896130af
+0,         67,         67,        1,   230400, 0xdf6675fa
+0,         68,         68,        1,   230400, 0xa20c8f9e
+0,         69,         69,        1,   230400, 0x3e402c75
diff --git a/tests/ref/fate/filter-testsrc2-rgba b/tests/ref/fate/filter-testsrc2-rgba
new file mode 100644
index 0000000000..42ecfe571d
--- /dev/null
+++ b/tests/ref/fate/filter-testsrc2-rgba
@@ -0,0 +1,75 @@
+#tb 0: 1/7
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   307200, 0xa2e60897
+0,          1,          1,        1,   307200, 0x67f03406
+0,          2,          2,        1,   307200, 0x683843a1
+0,          3,          3,        1,   307200, 0x285a682c
+0,          4,          4,        1,   307200, 0x7444a71e
+0,          5,          5,        1,   307200, 0xde9e40d7
+0,          6,          6,        1,   307200, 0xc8bbd13d
+0,          7,          7,        1,   307200, 0x6f179555
+0,          8,          8,        1,   307200, 0x274254c9
+0,          9,          9,        1,   307200, 0xb3ee50db
+0,         10,         10,        1,   307200, 0x0ebe40d8
+0,         11,         11,        1,   307200, 0xa8216930
+0,         12,         12,        1,   307200, 0x467778e2
+0,         13,         13,        1,   307200, 0xe6b02e74
+0,         14,         14,        1,   307200, 0x18a5a923
+0,         15,         15,        1,   307200, 0x3ff2086b
+0,         16,         16,        1,   307200, 0x71ebe464
+0,         17,         17,        1,   307200, 0x671cf604
+0,         18,         18,        1,   307200, 0xe55dfee7
+0,         19,         19,        1,   307200, 0xc9c497ea
+0,         20,         20,        1,   307200, 0xb263b768
+0,         21,         21,        1,   307200, 0xd24ee5a8
+0,         22,         22,        1,   307200, 0x9b77a2b7
+0,         23,         23,        1,   307200, 0x729c1b08
+0,         24,         24,        1,   307200, 0x725574db
+0,         25,         25,        1,   307200, 0x413cf660
+0,         26,         26,        1,   307200, 0xe8db86b0
+0,         27,         27,        1,   307200, 0xf538a378
+0,         28,         28,        1,   307200, 0x89638534
+0,         29,         29,        1,   307200, 0x0858618b
+0,         30,         30,        1,   307200, 0x8b5f961c
+0,         31,         31,        1,   307200, 0xddbb5e48
+0,         32,         32,        1,   307200, 0x9352a610
+0,         33,         33,        1,   307200, 0xcf466635
+0,         34,         34,        1,   307200, 0xaf69099c
+0,         35,         35,        1,   307200, 0x18811110
+0,         36,         36,        1,   307200, 0x7b7dcbd1
+0,         37,         37,        1,   307200, 0x27e2f523
+0,         38,         38,        1,   307200, 0x563debe1
+0,         39,         39,        1,   307200, 0x48c71784
+0,         40,         40,        1,   307200, 0x4b6476b4
+0,         41,         41,        1,   307200, 0xa7a21b13
+0,         42,         42,        1,   307200, 0xd14d86c0
+0,         43,         43,        1,   307200, 0x12b1caef
+0,         44,         44,        1,   307200, 0xae58ad7e
+0,         45,         45,        1,   307200, 0x908bbb66
+0,         46,         46,        1,   307200, 0xc6d4f77e
+0,         47,         47,        1,   307200, 0x08a90cdf
+0,         48,         48,        1,   307200, 0x6c344d22
+0,         49,         49,        1,   307200, 0xb351a388
+0,         50,         50,        1,   307200, 0x8209bbff
+0,         51,         51,        1,   307200, 0xfa1e34e0
+0,         52,         52,        1,   307200, 0x76dd4c48
+0,         53,         53,        1,   307200, 0xb01ab30f
+0,         54,         54,        1,   307200, 0x2e2ec7c5
+0,         55,         55,        1,   307200, 0x6382f929
+0,         56,         56,        1,   307200, 0xa5cfce14
+0,         57,         57,        1,   307200, 0xd9339546
+0,         58,         58,        1,   307200, 0xf5b9a815
+0,         59,         59,        1,   307200, 0x99bbc602
+0,         60,         60,        1,   307200, 0x642242e6
+0,         61,         61,        1,   307200, 0x9626ad04
+0,         62,         62,        1,   307200, 0xba276036
+0,         63,         63,        1,   307200, 0x04bb2e18
+0,         64,         64,        1,   307200, 0x57bf0cc6
+0,         65,         65,        1,   307200, 0xce4c0f05
+0,         66,         66,        1,   307200, 0x9fa71634
+0,         67,         67,        1,   307200, 0xb0525b7f
+0,         68,         68,        1,   307200, 0x5a6c7523
+0,         69,         69,        1,   307200, 0x1dfc11fa
diff --git a/tests/ref/fate/filter-testsrc2-yuv420p b/tests/ref/fate/filter-testsrc2-yuv420p
new file mode 100644
index 0000000000..aaf93ba02d
--- /dev/null
+++ b/tests/ref/fate/filter-testsrc2-yuv420p
@@ -0,0 +1,75 @@
+#tb 0: 1/7
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   115200, 0x3744b3ed
+0,          1,          1,        1,   115200, 0x0c1062d6
+0,          2,          2,        1,   115200, 0x201b9db1
+0,          3,          3,        1,   115200, 0x278d887e
+0,          4,          4,        1,   115200, 0x309b9c06
+0,          5,          5,        1,   115200, 0x75e1a17b
+0,          6,          6,        1,   115200, 0xa14e9aca
+0,          7,          7,        1,   115200, 0xb73857e2
+0,          8,          8,        1,   115200, 0x686b77e7
+0,          9,          9,        1,   115200, 0x02b6ab21
+0,         10,         10,        1,   115200, 0x1fc2d693
+0,         11,         11,        1,   115200, 0x296dd4a5
+0,         12,         12,        1,   115200, 0x2d0ba5a4
+0,         13,         13,        1,   115200, 0x59e85f83
+0,         14,         14,        1,   115200, 0xc95a675e
+0,         15,         15,        1,   115200, 0x40426f99
+0,         16,         16,        1,   115200, 0xf040bf35
+0,         17,         17,        1,   115200, 0xc705ccd9
+0,         18,         18,        1,   115200, 0xa76dcd9d
+0,         19,         19,        1,   115200, 0x5635daa5
+0,         20,         20,        1,   115200, 0x3af5d306
+0,         21,         21,        1,   115200, 0x0caf7172
+0,         22,         22,        1,   115200, 0x7161ef8f
+0,         23,         23,        1,   115200, 0xc8ce7fb1
+0,         24,         24,        1,   115200, 0xccf02fed
+0,         25,         25,        1,   115200, 0x81cdf49f
+0,         26,         26,        1,   115200, 0xb9170ee1
+0,         27,         27,        1,   115200, 0x7e7d78d0
+0,         28,         28,        1,   115200, 0xfe4c0185
+0,         29,         29,        1,   115200, 0x9dde4256
+0,         30,         30,        1,   115200, 0x1eb35d69
+0,         31,         31,        1,   115200, 0xad3d2e3f
+0,         32,         32,        1,   115200, 0xf3282aa1
+0,         33,         33,        1,   115200, 0x1cef3c17
+0,         34,         34,        1,   115200, 0x688a442c
+0,         35,         35,        1,   115200, 0x2cdb327a
+0,         36,         36,        1,   115200, 0xe6c16f00
+0,         37,         37,        1,   115200, 0x6f8fac56
+0,         38,         38,        1,   115200, 0x54e8d2a1
+0,         39,         39,        1,   115200, 0x29afc657
+0,         40,         40,        1,   115200, 0xb3138f57
+0,         41,         41,        1,   115200, 0x169041ca
+0,         42,         42,        1,   115200, 0x9e3e4e2b
+0,         43,         43,        1,   115200, 0x192977ac
+0,         44,         44,        1,   115200, 0x4aefe354
+0,         45,         45,        1,   115200, 0xc575c060
+0,         46,         46,        1,   115200, 0xfe3ec033
+0,         47,         47,        1,   115200, 0xab53a3e7
+0,         48,         48,        1,   115200, 0xbe229fcb
+0,         49,         49,        1,   115200, 0x088e58c3
+0,         50,         50,        1,   115200, 0x79eaf2db
+0,         51,         51,        1,   115200, 0xb32489ab
+0,         52,         52,        1,   115200, 0x125d1db7
+0,         53,         53,        1,   115200, 0x81efd887
+0,         54,         54,        1,   115200, 0x0eb22945
+0,         55,         55,        1,   115200, 0x46cca5d0
+0,         56,         56,        1,   115200, 0x636c4203
+0,         57,         57,        1,   115200, 0x3d3074a6
+0,         58,         58,        1,   115200, 0xe92f787e
+0,         59,         59,        1,   115200, 0xd0cd4ecf
+0,         60,         60,        1,   115200, 0xf3ac6472
+0,         61,         61,        1,   115200, 0xac8063b4
+0,         62,         62,        1,   115200, 0x2b0c68f2
+0,         63,         63,        1,   115200, 0xc6173b40
+0,         64,         64,        1,   115200, 0x12c35e41
+0,         65,         65,        1,   115200, 0x57c48fdd
+0,         66,         66,        1,   115200, 0x1079be75
+0,         67,         67,        1,   115200, 0xc8e7d33e
+0,         68,         68,        1,   115200, 0x79cdac12
+0,         69,         69,        1,   115200, 0x8dbe5a5f
diff --git a/tests/ref/fate/filter-testsrc2-yuv444p b/tests/ref/fate/filter-testsrc2-yuv444p
new file mode 100644
index 0000000000..4b60e6afa4
--- /dev/null
+++ b/tests/ref/fate/filter-testsrc2-yuv444p
@@ -0,0 +1,75 @@
+#tb 0: 1/7
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   230400, 0xbfb96366
+0,          1,          1,        1,   230400, 0xe63ca6e9
+0,          2,          2,        1,   230400, 0xc6acccc8
+0,          3,          3,        1,   230400, 0x6ea1b629
+0,          4,          4,        1,   230400, 0x508477ed
+0,          5,          5,        1,   230400, 0x49d4d57c
+0,          6,          6,        1,   230400, 0xd601a939
+0,          7,          7,        1,   230400, 0x0a0288f3
+0,          8,          8,        1,   230400, 0xa6da89f8
+0,          9,          9,        1,   230400, 0x0490ac8e
+0,         10,         10,        1,   230400, 0x1873ccd2
+0,         11,         11,        1,   230400, 0x64ef9885
+0,         12,         12,        1,   230400, 0x6b8fa2f0
+0,         13,         13,        1,   230400, 0x8d9657a4
+0,         14,         14,        1,   230400, 0xb4af4f21
+0,         15,         15,        1,   230400, 0x64137e0e
+0,         16,         16,        1,   230400, 0xb8b26ce2
+0,         17,         17,        1,   230400, 0xee1e7b00
+0,         18,         18,        1,   230400, 0x1c9b25d8
+0,         19,         19,        1,   230400, 0xe0c761ab
+0,         20,         20,        1,   230400, 0xe1cf0c14
+0,         21,         21,        1,   230400, 0xea380055
+0,         22,         22,        1,   230400, 0x6537716f
+0,         23,         23,        1,   230400, 0x8d9b9380
+0,         24,         24,        1,   230400, 0x9a04e333
+0,         25,         25,        1,   230400, 0x78005375
+0,         26,         26,        1,   230400, 0xc1cc9b9e
+0,         27,         27,        1,   230400, 0x84fda020
+0,         28,         28,        1,   230400, 0x711ef4ab
+0,         29,         29,        1,   230400, 0xccd04c02
+0,         30,         30,        1,   230400, 0xcf2a4bbd
+0,         31,         31,        1,   230400, 0x6d0ef0c0
+0,         32,         32,        1,   230400, 0x46141d09
+0,         33,         33,        1,   230400, 0x3a3d3f71
+0,         34,         34,        1,   230400, 0xe9e7f98f
+0,         35,         35,        1,   230400, 0x0f618ebb
+0,         36,         36,        1,   230400, 0x9c7d07b2
+0,         37,         37,        1,   230400, 0x90f8e960
+0,         38,         38,        1,   230400, 0xe3a856aa
+0,         39,         39,        1,   230400, 0xc66dcd53
+0,         40,         40,        1,   230400, 0xe7c1a281
+0,         41,         41,        1,   230400, 0xff484046
+0,         42,         42,        1,   230400, 0x1f56e486
+0,         43,         43,        1,   230400, 0x46bba179
+0,         44,         44,        1,   230400, 0x05a05e03
+0,         45,         45,        1,   230400, 0x552d3d32
+0,         46,         46,        1,   230400, 0x0899531d
+0,         47,         47,        1,   230400, 0x6321c950
+0,         48,         48,        1,   230400, 0xed67b3cc
+0,         49,         49,        1,   230400, 0x37ec807d
+0,         50,         50,        1,   230400, 0xc6af1344
+0,         51,         51,        1,   230400, 0x2bc9132b
+0,         52,         52,        1,   230400, 0x6024e553
+0,         53,         53,        1,   230400, 0xd7cef4f3
+0,         54,         54,        1,   230400, 0xf7f6eb0d
+0,         55,         55,        1,   230400, 0x0a2ed09e
+0,         56,         56,        1,   230400, 0x8c6883aa
+0,         57,         57,        1,   230400, 0x8542f554
+0,         58,         58,        1,   230400, 0xbebf972f
+0,         59,         59,        1,   230400, 0xf6f5f05f
+0,         60,         60,        1,   230400, 0xa4047f4a
+0,         61,         61,        1,   230400, 0x2b3f3d82
+0,         62,         62,        1,   230400, 0x99d9049a
+0,         63,         63,        1,   230400, 0xe74e5520
+0,         64,         64,        1,   230400, 0x04e2cd3d
+0,         65,         65,        1,   230400, 0x2324e05e
+0,         66,         66,        1,   230400, 0x4e4e3400
+0,         67,         67,        1,   230400, 0xdd547c3e
+0,         68,         68,        1,   230400, 0x1c6c13e4
+0,         69,         69,        1,   230400, 0xf7d2d98b
diff --git a/tests/ref/fate/filter-thumbnail b/tests/ref/fate/filter-thumbnail
new file mode 100644
index 0000000000..36f11f297e
--- /dev/null
+++ b/tests/ref/fate/filter-thumbnail
@@ -0,0 +1 @@
+thumbnail           cd429b3d92c33bcc257e8e6a3284dbf7
diff --git a/tests/ref/fate/filter-tile b/tests/ref/fate/filter-tile
new file mode 100644
index 0000000000..03ded41058
--- /dev/null
+++ b/tests/ref/fate/filter-tile
@@ -0,0 +1 @@
+tile                93119209651dc299708c7f31522b991c
diff --git a/tests/ref/fate/filter-transpose b/tests/ref/fate/filter-transpose
index 0f234230f5..2a5151b8ce 100644
--- a/tests/ref/fate/filter-transpose
+++ b/tests/ref/fate/filter-transpose
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 288x352
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xab5889ef
 0,          1,          1,        1,   152064, 0x898b6551
 0,          2,          2,        1,   152064, 0x231bf64a
diff --git a/tests/ref/fate/filter-tremolo b/tests/ref/fate/filter-tremolo
new file mode 100644
index 0000000000..c6cff52c0e
--- /dev/null
+++ b/tests/ref/fate/filter-tremolo
@@ -0,0 +1,26 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1024,     4096, 0x5d3be907
+0,       1024,       1024,     1024,     4096, 0xea151fbe
+0,       2048,       2048,     1024,     4096, 0xa5bc19f4
+0,       3072,       3072,     1024,     4096, 0x8706ec6d
+0,       4096,       4096,     1024,     4096, 0x334ff275
+0,       5120,       5120,     1024,     4096, 0xcd0ff7ad
+0,       6144,       6144,     1024,     4096, 0x29a1e9c9
+0,       7168,       7168,     1024,     4096, 0x1d41e77f
+0,       8192,       8192,     1024,     4096, 0x99e7fe07
+0,       9216,       9216,     1024,     4096, 0x4bbf09ce
+0,      10240,      10240,     1024,     4096, 0x94600236
+0,      11264,      11264,     1024,     4096, 0xc8af0c9e
+0,      12288,      12288,     1024,     4096, 0x70eef88f
+0,      13312,      13312,     1024,     4096, 0xb222ec47
+0,      14336,      14336,     1024,     4096, 0x1071ee27
+0,      15360,      15360,     1024,     4096, 0x7c390bd2
+0,      16384,      16384,     1024,     4096, 0x68bdf655
+0,      17408,      17408,     1024,     4096, 0x810cfacb
+0,      18432,      18432,     1024,     4096, 0x9639e41f
+0,      19456,      19456,     1024,     4096, 0xa30be70f
diff --git a/tests/ref/fate/filter-trim-duration b/tests/ref/fate/filter-trim-duration
index db74add00e..9ba86f8e18 100644
--- a/tests/ref/fate/filter-trim-duration
+++ b/tests/ref/fate/filter-trim-duration
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x432
+#sar 0: 0/1
 0,         10,         10,        1,   152064, 0xb45c4760
diff --git a/tests/ref/fate/filter-trim-frame b/tests/ref/fate/filter-trim-frame
index 1749afd38b..5dbf6b7a96 100644
--- a/tests/ref/fate/filter-trim-frame
+++ b/tests/ref/fate/filter-trim-frame
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x432
+#sar 0: 0/1
 0,          3,          3,        1,   152064, 0xceb080b0
 0,          4,          4,        1,   152064, 0x473db652
 0,          5,          5,        1,   152064, 0x287da8e6
diff --git a/tests/ref/fate/filter-trim-mixed b/tests/ref/fate/filter-trim-mixed
index 5e003f665a..6b1a98c5f3 100644
--- a/tests/ref/fate/filter-trim-mixed
+++ b/tests/ref/fate/filter-trim-mixed
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x432
+#sar 0: 0/1
 0,          1,          1,        1,   152064, 0x7f5f6551
 0,          2,          2,        1,   152064, 0xc566f64a
 0,          3,          3,        1,   152064, 0xceb080b0
diff --git a/tests/ref/fate/filter-trim-time b/tests/ref/fate/filter-trim-time
index 2f860258bd..ce9fac6def 100644
--- a/tests/ref/fate/filter-trim-time
+++ b/tests/ref/fate/filter-trim-time
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x432
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x6e4f89ef
 0,          1,          1,        1,   152064, 0x7f5f6551
diff --git a/tests/ref/fate/filter-unsharp b/tests/ref/fate/filter-unsharp
index 5dcf40fdc4..c128241d7c 100644
--- a/tests/ref/fate/filter-unsharp
+++ b/tests/ref/fate/filter-unsharp
@@ -1,51 +1,55 @@
 #tb 0: 1/25
-0,          0,          0,        1,   152064, 0x19a94798
-0,          1,          1,        1,   152064, 0xc88b24f4
-0,          2,          2,        1,   152064, 0xd027b44b
-0,          3,          3,        1,   152064, 0xa9fb3e54
-0,          4,          4,        1,   152064, 0x2991747d
-0,          5,          5,        1,   152064, 0x1dc267fc
-0,          6,          6,        1,   152064, 0xe9063293
-0,          7,          7,        1,   152064, 0xc23e41a4
-0,          8,          8,        1,   152064, 0xaa433dc5
-0,          9,          9,        1,   152064, 0x22b0f0a3
-0,         10,         10,        1,   152064, 0x796d08d8
-0,         11,         11,        1,   152064, 0xa2babd6b
-0,         12,         12,        1,   152064, 0x531e6a62
-0,         13,         13,        1,   152064, 0xc8fa5b9d
-0,         14,         14,        1,   152064, 0x33e54ae8
-0,         15,         15,        1,   152064, 0x86dfd0b8
-0,         16,         16,        1,   152064, 0x101f1170
-0,         17,         17,        1,   152064, 0x230eef00
-0,         18,         18,        1,   152064, 0xa5ee1c5e
-0,         19,         19,        1,   152064, 0x241893c6
-0,         20,         20,        1,   152064, 0x86a0a883
-0,         21,         21,        1,   152064, 0x12b4d8f7
-0,         22,         22,        1,   152064, 0xb220d497
-0,         23,         23,        1,   152064, 0xbaea200e
-0,         24,         24,        1,   152064, 0x6d96b7f3
-0,         25,         25,        1,   152064, 0xc70d4ebb
-0,         26,         26,        1,   152064, 0x20df50af
-0,         27,         27,        1,   152064, 0xfce89174
-0,         28,         28,        1,   152064, 0x74be5c8e
-0,         29,         29,        1,   152064, 0x51f419a6
-0,         30,         30,        1,   152064, 0x790621e7
-0,         31,         31,        1,   152064, 0x37387da2
-0,         32,         32,        1,   152064, 0x8228baa4
-0,         33,         33,        1,   152064, 0xdd2a42b7
-0,         34,         34,        1,   152064, 0xa28bfc63
-0,         35,         35,        1,   152064, 0xe8284337
-0,         36,         36,        1,   152064, 0xb1dae9fe
-0,         37,         37,        1,   152064, 0x0378c0af
-0,         38,         38,        1,   152064, 0x79c514d4
-0,         39,         39,        1,   152064, 0x043e0347
-0,         40,         40,        1,   152064, 0x4d11131b
-0,         41,         41,        1,   152064, 0xb2a05924
-0,         42,         42,        1,   152064, 0xd0097464
-0,         43,         43,        1,   152064, 0x32dfd8c0
-0,         44,         44,        1,   152064, 0xd9ecbf03
-0,         45,         45,        1,   152064, 0x8dcc403f
-0,         46,         46,        1,   152064, 0x95e81af7
-0,         47,         47,        1,   152064, 0xb8018b25
-0,         48,         48,        1,   152064, 0xeecf7281
-0,         49,         49,        1,   152064, 0x23e49602
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   152064, 0x58100735
+0,          1,          1,        1,   152064, 0x2967e43d
+0,          2,          2,        1,   152064, 0x6f0c786d
+0,          3,          3,        1,   152064, 0xaf1fff7c
+0,          4,          4,        1,   152064, 0xee583651
+0,          5,          5,        1,   152064, 0xf50c280f
+0,          6,          6,        1,   152064, 0x3eeff2e9
+0,          7,          7,        1,   152064, 0xb43c0fc7
+0,          8,          8,        1,   152064, 0x55733232
+0,          9,          9,        1,   152064, 0x78b5b9fe
+0,         10,         10,        1,   152064, 0x8b39c410
+0,         11,         11,        1,   152064, 0x1a2b686f
+0,         12,         12,        1,   152064, 0xee622ce9
+0,         13,         13,        1,   152064, 0x9f8a2f4f
+0,         14,         14,        1,   152064, 0xd6210d42
+0,         15,         15,        1,   152064, 0x598a8e88
+0,         16,         16,        1,   152064, 0xeeaccbfa
+0,         17,         17,        1,   152064, 0xe2a3b094
+0,         18,         18,        1,   152064, 0x2becd63d
+0,         19,         19,        1,   152064, 0x2cfd46c6
+0,         20,         20,        1,   152064, 0x781b616e
+0,         21,         21,        1,   152064, 0x90908f49
+0,         22,         22,        1,   152064, 0x136d8950
+0,         23,         23,        1,   152064, 0xe3b8dfa4
+0,         24,         24,        1,   152064, 0x9a857595
+0,         25,         25,        1,   152064, 0x9d5d16f3
+0,         26,         26,        1,   152064, 0xad0815e6
+0,         27,         27,        1,   152064, 0xbd485852
+0,         28,         28,        1,   152064, 0x379023e0
+0,         29,         29,        1,   152064, 0x47c3e49e
+0,         30,         30,        1,   152064, 0x435eead9
+0,         31,         31,        1,   152064, 0x6ef8445d
+0,         32,         32,        1,   152064, 0x13258191
+0,         33,         33,        1,   152064, 0x09adfa4b
+0,         34,         34,        1,   152064, 0xd67e9f1f
+0,         35,         35,        1,   152064, 0x456e1298
+0,         36,         36,        1,   152064, 0x9998b485
+0,         37,         37,        1,   152064, 0xca1f8859
+0,         38,         38,        1,   152064, 0x9d1ad87c
+0,         39,         39,        1,   152064, 0x37a7cfac
+0,         40,         40,        1,   152064, 0xde3ad5a8
+0,         41,         41,        1,   152064, 0xf40c20d3
+0,         42,         42,        1,   152064, 0x35a23e85
+0,         43,         43,        1,   152064, 0xda1fa02a
+0,         44,         44,        1,   152064, 0xe4ae84e9
+0,         45,         45,        1,   152064, 0x113dfdbb
+0,         46,         46,        1,   152064, 0xe50fd571
+0,         47,         47,        1,   152064, 0xd6a043ef
+0,         48,         48,        1,   152064, 0xabfd3940
+0,         49,         49,        1,   152064, 0xdf085a8d
diff --git a/tests/ref/fate/filter-vectorscope_color b/tests/ref/fate/filter-vectorscope_color
new file mode 100644
index 0000000000..57875ab418
--- /dev/null
+++ b/tests/ref/fate/filter-vectorscope_color
@@ -0,0 +1,8 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 1/1
+0,          0,          0,        1,   196608, 0xf6e3aa30
+0,          1,          1,        1,   196608, 0x5584acf9
+0,          2,          2,        1,   196608, 0xa862775d
diff --git a/tests/ref/fate/filter-vectorscope_color2 b/tests/ref/fate/filter-vectorscope_color2
new file mode 100644
index 0000000000..3b2ad90b9c
--- /dev/null
+++ b/tests/ref/fate/filter-vectorscope_color2
@@ -0,0 +1,8 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 1/1
+0,          0,          0,        1,   196608, 0x5e62fae5
+0,          1,          1,        1,   196608, 0x4c27fcbf
+0,          2,          2,        1,   196608, 0xb7531088
diff --git a/tests/ref/fate/filter-vectorscope_color3 b/tests/ref/fate/filter-vectorscope_color3
new file mode 100644
index 0000000000..4baecca921
--- /dev/null
+++ b/tests/ref/fate/filter-vectorscope_color3
@@ -0,0 +1,8 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 1/1
+0,          0,          0,        1,   196608, 0x83df8770
+0,          1,          1,        1,   196608, 0xa6a674a7
+0,          2,          2,        1,   196608, 0x11757143
diff --git a/tests/ref/fate/filter-vectorscope_color4 b/tests/ref/fate/filter-vectorscope_color4
new file mode 100644
index 0000000000..21d6762ff2
--- /dev/null
+++ b/tests/ref/fate/filter-vectorscope_color4
@@ -0,0 +1,8 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 1/1
+0,          0,          0,        1,   196608, 0x326953c4
+0,          1,          1,        1,   196608, 0x870e1dcc
+0,          2,          2,        1,   196608, 0x87cb8800
diff --git a/tests/ref/fate/filter-vectorscope_gray b/tests/ref/fate/filter-vectorscope_gray
new file mode 100644
index 0000000000..a81fbf8f87
--- /dev/null
+++ b/tests/ref/fate/filter-vectorscope_gray
@@ -0,0 +1,8 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 1/1
+0,          0,          0,        1,   196608, 0x79ba71e2
+0,          1,          1,        1,   196608, 0x909271e2
+0,          2,          2,        1,   196608, 0x143971e2
diff --git a/tests/ref/fate/filter-vectorscope_xy b/tests/ref/fate/filter-vectorscope_xy
new file mode 100644
index 0000000000..83b719468c
--- /dev/null
+++ b/tests/ref/fate/filter-vectorscope_xy
@@ -0,0 +1,8 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 1/1
+0,          0,          0,        1,   196608, 0xa2899af1
+0,          1,          1,        1,   196608, 0x26409af1
+0,          2,          2,        1,   196608, 0xf5209af1
diff --git a/tests/ref/fate/filter-vflip b/tests/ref/fate/filter-vflip
index c0bc8931c3..8850b45e1f 100644
--- a/tests/ref/fate/filter-vflip
+++ b/tests/ref/fate/filter-vflip
@@ -1 +1 @@
-vflip               8f5a94b3d651f24a628ff4465cfea131
+vflip               0de640dff4447bd1b33d23f2b8ad9d4a
diff --git a/tests/ref/fate/filter-vflip_crop b/tests/ref/fate/filter-vflip_crop
index f4e2950fee..9f93ac7a49 100644
--- a/tests/ref/fate/filter-vflip_crop
+++ b/tests/ref/fate/filter-vflip_crop
@@ -1 +1 @@
-vflip_crop          eed36832b2e9a3eea0af6311399c015b
+vflip_crop          f7d5d9ffd815847c3e2089b920bae406
diff --git a/tests/ref/fate/filter-vflip_vflip b/tests/ref/fate/filter-vflip_vflip
index 5899186869..49d3ec0f3d 100644
--- a/tests/ref/fate/filter-vflip_vflip
+++ b/tests/ref/fate/filter-vflip_vflip
@@ -1 +1 @@
-vflip_vflip         7aaf1057c0edf7d5e9700f9c8e510ea9
+vflip_vflip         fcb007249fba9371fe84a61c974fcb00
diff --git a/tests/ref/fate/filter-vstack b/tests/ref/fate/filter-vstack
new file mode 100644
index 0000000000..0c969e7727
--- /dev/null
+++ b/tests/ref/fate/filter-vstack
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x576
+#sar 0: 0/1
+0,          0,          0,        1,   304128, 0x0b6b13ed
+0,          1,          1,        1,   304128, 0x406bcaa2
+0,          2,          2,        1,   304128, 0xb0deeca3
+0,          3,          3,        1,   304128, 0x5781016f
+0,          4,          4,        1,   304128, 0xff6c6cb3
+0,          5,          5,        1,   304128, 0x197151db
+0,          6,          6,        1,   304128, 0xca1cf846
+0,          7,          7,        1,   304128, 0x396e1767
+0,          8,          8,        1,   304128, 0x0215005b
+0,          9,          9,        1,   304128, 0xd9ae722a
+0,         10,         10,        1,   304128, 0xd0f98ec0
+0,         11,         11,        1,   304128, 0x1d0ef9b9
+0,         12,         12,        1,   304128, 0xef005ad1
+0,         13,         13,        1,   304128, 0x00564455
+0,         14,         14,        1,   304128, 0xe3eb1bc9
+0,         15,         15,        1,   304128, 0xd9731e0a
+0,         16,         16,        1,   304128, 0xebf39c30
+0,         17,         17,        1,   304128, 0xada17190
+0,         18,         18,        1,   304128, 0x17add598
+0,         19,         19,        1,   304128, 0xcdebb80d
+0,         20,         20,        1,   304128, 0xb0d5eaef
+0,         21,         21,        1,   304128, 0xd0ed4824
+0,         22,         22,        1,   304128, 0x735c3ab2
+0,         23,         23,        1,   304128, 0x462ed1de
+0,         24,         24,        1,   304128, 0x2825f3bb
+0,         25,         25,        1,   304128, 0x8f55327b
+0,         26,         26,        1,   304128, 0x216e2d79
+0,         27,         27,        1,   304128, 0x2cd4b11d
+0,         28,         28,        1,   304128, 0x9f2248b9
+0,         29,         29,        1,   304128, 0x7353ca1c
+0,         30,         30,        1,   304128, 0x5e89d594
+0,         31,         31,        1,   304128, 0x81368a4b
+0,         32,         32,        1,   304128, 0x1c76f929
+0,         33,         33,        1,   304128, 0x7dd2f460
+0,         34,         34,        1,   304128, 0x85e486f0
+0,         35,         35,        1,   304128, 0x95ac2a05
+0,         36,         36,        1,   304128, 0x0daa6f56
+0,         37,         37,        1,   304128, 0x698e03f0
+0,         38,         38,        1,   304128, 0x2c60b298
+0,         39,         39,        1,   304128, 0x74d59dba
+0,         40,         40,        1,   304128, 0xf28bb24a
+0,         41,         41,        1,   304128, 0x01ba3c1f
+0,         42,         42,        1,   304128, 0x656d7f61
+0,         43,         43,        1,   304128, 0x516341d8
+0,         44,         44,        1,   304128, 0xa06008e2
+0,         45,         45,        1,   304128, 0x0684fce6
+0,         46,         46,        1,   304128, 0x5e99a7fe
+0,         47,         47,        1,   304128, 0xe41d8b93
+0,         48,         48,        1,   304128, 0x0cee6915
+0,         49,         49,        1,   304128, 0x89cdb1e3
diff --git a/tests/ref/fate/filter-w3fdif-complex b/tests/ref/fate/filter-w3fdif-complex
new file mode 100644
index 0000000000..4b334daec1
--- /dev/null
+++ b/tests/ref/fate/filter-w3fdif-complex
@@ -0,0 +1,35 @@
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 16/15
+0,         18,         18,        1,   622080, 0x21d21485
+0,         19,         19,        1,   622080, 0x600a5468
+0,         20,         20,        1,   622080, 0x9526f7b8
+0,         21,         21,        1,   622080, 0x8b3e661f
+0,         22,         22,        1,   622080, 0xff5cb5a9
+0,         23,         23,        1,   622080, 0x7e5e730c
+0,         24,         24,        1,   622080, 0x85219ac6
+0,         25,         25,        1,   622080, 0x2f3465a0
+0,         26,         26,        1,   622080, 0xddbf4da0
+0,         27,         27,        1,   622080, 0xc115d4ee
+0,         28,         28,        1,   622080, 0x7a8a8d72
+0,         29,         29,        1,   622080, 0xbafcd973
+0,         30,         30,        1,   622080, 0xd2c15603
+0,         31,         31,        1,   622080, 0xd7217855
+0,         32,         32,        1,   622080, 0x9a584eca
+0,         33,         33,        1,   622080, 0x9f3e1c40
+0,         34,         34,        1,   622080, 0x6d01efb7
+0,         35,         35,        1,   622080, 0x9ecfcce0
+0,         36,         36,        1,   622080, 0xb355fd7e
+0,         37,         37,        1,   622080, 0xc7784021
+0,         38,         38,        1,   622080, 0x13fe4187
+0,         39,         39,        1,   622080, 0xfa03b613
+0,         40,         40,        1,   622080, 0x2c9ccfcd
+0,         41,         41,        1,   622080, 0xcae6e6c6
+0,         42,         42,        1,   622080, 0x177968f9
+0,         43,         43,        1,   622080, 0xf708de36
+0,         44,         44,        1,   622080, 0x4491870a
+0,         45,         45,        1,   622080, 0x37709f98
+0,         46,         46,        1,   622080, 0x23e8d22f
+0,         47,         47,        1,   622080, 0x25cba876
diff --git a/tests/ref/fate/filter-w3fdif-simple b/tests/ref/fate/filter-w3fdif-simple
new file mode 100644
index 0000000000..62efaae929
--- /dev/null
+++ b/tests/ref/fate/filter-w3fdif-simple
@@ -0,0 +1,35 @@
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 16/15
+0,         18,         18,        1,   622080, 0xc73774f5
+0,         19,         19,        1,   622080, 0x4ea3a400
+0,         20,         20,        1,   622080, 0x95153cda
+0,         21,         21,        1,   622080, 0xec39bf0b
+0,         22,         22,        1,   622080, 0x94b6f836
+0,         23,         23,        1,   622080, 0xc145c3ee
+0,         24,         24,        1,   622080, 0x4d4cdee2
+0,         25,         25,        1,   622080, 0x193ebc7c
+0,         26,         26,        1,   622080, 0xbd728fd8
+0,         27,         27,        1,   622080, 0xf0f3252f
+0,         28,         28,        1,   622080, 0xc012d20a
+0,         29,         29,        1,   622080, 0x7b5831b2
+0,         30,         30,        1,   622080, 0x464e9622
+0,         31,         31,        1,   622080, 0x46e3c6c0
+0,         32,         32,        1,   622080, 0xa6ec908b
+0,         33,         33,        1,   622080, 0x6a257595
+0,         34,         34,        1,   622080, 0xa6552ecc
+0,         35,         35,        1,   622080, 0xdecd1a91
+0,         36,         36,        1,   622080, 0xfaa53e71
+0,         37,         37,        1,   622080, 0xc94a9707
+0,         38,         38,        1,   622080, 0xb5727fd4
+0,         39,         39,        1,   622080, 0x143c018c
+0,         40,         40,        1,   622080, 0x92d110c9
+0,         41,         41,        1,   622080, 0x4f762fc0
+0,         42,         42,        1,   622080, 0x3dd2a7d2
+0,         43,         43,        1,   622080, 0xa5d02dc0
+0,         44,         44,        1,   622080, 0x2223ce3d
+0,         45,         45,        1,   622080, 0xe4a5fc36
+0,         46,         46,        1,   622080, 0x8384159e
+0,         47,         47,        1,   622080, 0x995efa57
diff --git a/tests/ref/fate/filter-waveform_column b/tests/ref/fate/filter-waveform_column
new file mode 100644
index 0000000000..f35fb2471b
--- /dev/null
+++ b/tests/ref/fate/filter-waveform_column
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x256
+#sar 0: 1/1
+0,          0,          0,        1,   270336, 0x3af3cd54
+0,          1,          1,        1,   270336, 0x892ccd54
+0,          2,          2,        1,   270336, 0x2171cd54
+0,          3,          3,        1,   270336, 0xcaedcd54
+0,          4,          4,        1,   270336, 0xe973cd54
+0,          5,          5,        1,   270336, 0x4ad3cd54
+0,          6,          6,        1,   270336, 0xffe6cd54
+0,          7,          7,        1,   270336, 0x93d6cd54
+0,          8,          8,        1,   270336, 0xd75ecd54
+0,          9,          9,        1,   270336, 0xd257cd54
+0,         10,         10,        1,   270336, 0x2a55cd54
+0,         11,         11,        1,   270336, 0x751fcd54
+0,         12,         12,        1,   270336, 0x5041cd54
+0,         13,         13,        1,   270336, 0xaaa8cd54
+0,         14,         14,        1,   270336, 0xe1fccd54
+0,         15,         15,        1,   270336, 0x2f22cd54
+0,         16,         16,        1,   270336, 0xef8acd54
+0,         17,         17,        1,   270336, 0xaab1cd54
+0,         18,         18,        1,   270336, 0x7e77cd54
+0,         19,         19,        1,   270336, 0xe3b9cd54
+0,         20,         20,        1,   270336, 0x0208cd54
+0,         21,         21,        1,   270336, 0xa8bdcd54
+0,         22,         22,        1,   270336, 0x814acd54
+0,         23,         23,        1,   270336, 0x39a2cd54
+0,         24,         24,        1,   270336, 0xb115cd54
+0,         25,         25,        1,   270336, 0xdd07cd54
+0,         26,         26,        1,   270336, 0x08bbcd54
+0,         27,         27,        1,   270336, 0x0e31cd54
+0,         28,         28,        1,   270336, 0xb40bcd54
+0,         29,         29,        1,   270336, 0xfc97cd54
+0,         30,         30,        1,   270336, 0xce92cd54
+0,         31,         31,        1,   270336, 0xcbefcd54
+0,         32,         32,        1,   270336, 0x873dcd54
+0,         33,         33,        1,   270336, 0x010ccd54
+0,         34,         34,        1,   270336, 0x2b1bcd54
+0,         35,         35,        1,   270336, 0xae13cd54
+0,         36,         36,        1,   270336, 0x3473cd54
+0,         37,         37,        1,   270336, 0xedb4cd54
+0,         38,         38,        1,   270336, 0x27f3cd54
+0,         39,         39,        1,   270336, 0xc0c1cd54
+0,         40,         40,        1,   270336, 0xee19cd54
+0,         41,         41,        1,   270336, 0xd2c7cd54
+0,         42,         42,        1,   270336, 0xc976cd54
+0,         43,         43,        1,   270336, 0xcb5bcd54
+0,         44,         44,        1,   270336, 0x373fcd54
+0,         45,         45,        1,   270336, 0xbe11cd54
+0,         46,         46,        1,   270336, 0xa06acd54
+0,         47,         47,        1,   270336, 0x6440cd54
+0,         48,         48,        1,   270336, 0xf60bcd54
+0,         49,         49,        1,   270336, 0xe569cd54
diff --git a/tests/ref/fate/filter-waveform_envelope b/tests/ref/fate/filter-waveform_envelope
new file mode 100644
index 0000000000..13130c4399
--- /dev/null
+++ b/tests/ref/fate/filter-waveform_envelope
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x256
+#sar 0: 1/1
+0,          0,          0,        1,   270336, 0x24a46c67
+0,          1,          1,        1,   270336, 0x622077e7
+0,          2,          2,        1,   270336, 0xb96dd1a1
+0,          3,          3,        1,   270336, 0x180b16d9
+0,          4,          4,        1,   270336, 0x3db34c80
+0,          5,          5,        1,   270336, 0x417444b0
+0,          6,          6,        1,   270336, 0x3c017273
+0,          7,          7,        1,   270336, 0x572e7728
+0,          8,          8,        1,   270336, 0x18e17a61
+0,          9,          9,        1,   270336, 0x8d9f54fa
+0,         10,         10,        1,   270336, 0x01e5837b
+0,         11,         11,        1,   270336, 0x72ae7f4d
+0,         12,         12,        1,   270336, 0xb6ab9cbc
+0,         13,         13,        1,   270336, 0x28c5c525
+0,         14,         14,        1,   270336, 0x6d89daab
+0,         15,         15,        1,   270336, 0x761ff261
+0,         16,         16,        1,   270336, 0xae200837
+0,         17,         17,        1,   270336, 0x09fe102f
+0,         18,         18,        1,   270336, 0x4999133b
+0,         19,         19,        1,   270336, 0xbc2d12b9
+0,         20,         20,        1,   270336, 0x35f8021a
+0,         21,         21,        1,   270336, 0x5a8605b2
+0,         22,         22,        1,   270336, 0xb25703c8
+0,         23,         23,        1,   270336, 0x641909ae
+0,         24,         24,        1,   270336, 0x8a6e1160
+0,         25,         25,        1,   270336, 0xce181598
+0,         26,         26,        1,   270336, 0xc0ea1336
+0,         27,         27,        1,   270336, 0x941d0ffd
+0,         28,         28,        1,   270336, 0xf94a0fe9
+0,         29,         29,        1,   270336, 0x591d0fcb
+0,         30,         30,        1,   270336, 0x84fb1be7
+0,         31,         31,        1,   270336, 0xda8016f6
+0,         32,         32,        1,   270336, 0x8736150c
+0,         33,         33,        1,   270336, 0xf5931a7a
+0,         34,         34,        1,   270336, 0x582b14d5
+0,         35,         35,        1,   270336, 0x85ce0a53
+0,         36,         36,        1,   270336, 0xf1c106fc
+0,         37,         37,        1,   270336, 0xd023ff6d
+0,         38,         38,        1,   270336, 0xe398f0c2
+0,         39,         39,        1,   270336, 0x5c910959
+0,         40,         40,        1,   270336, 0xfbec13a9
+0,         41,         41,        1,   270336, 0x3f1e16f1
+0,         42,         42,        1,   270336, 0x6c1a1e08
+0,         43,         43,        1,   270336, 0x15091ba6
+0,         44,         44,        1,   270336, 0x82721c7d
+0,         45,         45,        1,   270336, 0x69a91697
+0,         46,         46,        1,   270336, 0xdcbb1b6a
+0,         47,         47,        1,   270336, 0x7cfa19ad
+0,         48,         48,        1,   270336, 0x65ba1ad4
+0,         49,         49,        1,   270336, 0xca65231c
diff --git a/tests/ref/fate/filter-waveform_row b/tests/ref/fate/filter-waveform_row
new file mode 100644
index 0000000000..b436be5108
--- /dev/null
+++ b/tests/ref/fate/filter-waveform_row
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x288
+#sar 0: 1/1
+0,          0,          0,        1,   221184, 0x2a1149a3
+0,          1,          1,        1,   221184, 0x698c49a3
+0,          2,          2,        1,   221184, 0x9fc949a3
+0,          3,          3,        1,   221184, 0x461b49a3
+0,          4,          4,        1,   221184, 0xfbf849a3
+0,          5,          5,        1,   221184, 0x416149a3
+0,          6,          6,        1,   221184, 0xcb5149a3
+0,          7,          7,        1,   221184, 0x1c8149a3
+0,          8,          8,        1,   221184, 0x16e149a3
+0,          9,          9,        1,   221184, 0x3edb49a3
+0,         10,         10,        1,   221184, 0x6e5e49a3
+0,         11,         11,        1,   221184, 0x674f49a3
+0,         12,         12,        1,   221184, 0x373749a3
+0,         13,         13,        1,   221184, 0x3e0449a3
+0,         14,         14,        1,   221184, 0x185d49a3
+0,         15,         15,        1,   221184, 0x420749a3
+0,         16,         16,        1,   221184, 0xdfa149a3
+0,         17,         17,        1,   221184, 0x431b49a3
+0,         18,         18,        1,   221184, 0x3e9e49a3
+0,         19,         19,        1,   221184, 0xf79749a3
+0,         20,         20,        1,   221184, 0xf7ad49a3
+0,         21,         21,        1,   221184, 0x0bd749a3
+0,         22,         22,        1,   221184, 0x823f49a3
+0,         23,         23,        1,   221184, 0x87dc49a3
+0,         24,         24,        1,   221184, 0x6ec049a3
+0,         25,         25,        1,   221184, 0x4a8549a3
+0,         26,         26,        1,   221184, 0xde3f49a3
+0,         27,         27,        1,   221184, 0x9fbb49a3
+0,         28,         28,        1,   221184, 0x8d4c49a3
+0,         29,         29,        1,   221184, 0xb35049a3
+0,         30,         30,        1,   221184, 0xab2f49a3
+0,         31,         31,        1,   221184, 0x2d6349a3
+0,         32,         32,        1,   221184, 0x518c49a3
+0,         33,         33,        1,   221184, 0x692949a3
+0,         34,         34,        1,   221184, 0xde5849a3
+0,         35,         35,        1,   221184, 0x9ebb49a3
+0,         36,         36,        1,   221184, 0xb5a749a3
+0,         37,         37,        1,   221184, 0x640449a3
+0,         38,         38,        1,   221184, 0x871549a3
+0,         39,         39,        1,   221184, 0xda6849a3
+0,         40,         40,        1,   221184, 0x0ef249a3
+0,         41,         41,        1,   221184, 0x61c249a3
+0,         42,         42,        1,   221184, 0x1ca849a3
+0,         43,         43,        1,   221184, 0xf61149a3
+0,         44,         44,        1,   221184, 0x672249a3
+0,         45,         45,        1,   221184, 0x71b249a3
+0,         46,         46,        1,   221184, 0xc82349a3
+0,         47,         47,        1,   221184, 0x151949a3
+0,         48,         48,        1,   221184, 0x8d7c49a3
+0,         49,         49,        1,   221184, 0xebf649a3
diff --git a/tests/ref/fate/filter-waveform_uv b/tests/ref/fate/filter-waveform_uv
new file mode 100644
index 0000000000..8cb3bc81f8
--- /dev/null
+++ b/tests/ref/fate/filter-waveform_uv
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x512
+#sar 0: 1/1
+0,          0,          0,        1,   540672, 0x8a2521d6
+0,          1,          1,        1,   540672, 0xb9a321d6
+0,          2,          2,        1,   540672, 0x325421d6
+0,          3,          3,        1,   540672, 0xafee21d2
+0,          4,          4,        1,   540672, 0x172121d6
+0,          5,          5,        1,   540672, 0x24d121d6
+0,          6,          6,        1,   540672, 0x7fec21d6
+0,          7,          7,        1,   540672, 0xa8a021d6
+0,          8,          8,        1,   540672, 0x29fd21d6
+0,          9,          9,        1,   540672, 0x6dfe21d6
+0,         10,         10,        1,   540672, 0xe39821d6
+0,         11,         11,        1,   540672, 0x83f521d6
+0,         12,         12,        1,   540672, 0x57aa21d6
+0,         13,         13,        1,   540672, 0x67b221d6
+0,         14,         14,        1,   540672, 0x535821d6
+0,         15,         15,        1,   540672, 0xb8ac21d6
+0,         16,         16,        1,   540672, 0x27f621d6
+0,         17,         17,        1,   540672, 0x775221d6
+0,         18,         18,        1,   540672, 0x8e6621d6
+0,         19,         19,        1,   540672, 0x74c921d6
+0,         20,         20,        1,   540672, 0x04cd21d6
+0,         21,         21,        1,   540672, 0xccd421d6
+0,         22,         22,        1,   540672, 0x317221d6
+0,         23,         23,        1,   540672, 0xd79321d6
+0,         24,         24,        1,   540672, 0xa2ac21d6
+0,         25,         25,        1,   540672, 0x7f0a21d6
+0,         26,         26,        1,   540672, 0x483521d6
+0,         27,         27,        1,   540672, 0xb65721d6
+0,         28,         28,        1,   540672, 0xb77021d6
+0,         29,         29,        1,   540672, 0x9fd521d6
+0,         30,         30,        1,   540672, 0xb72121d6
+0,         31,         31,        1,   540672, 0x540221d6
+0,         32,         32,        1,   540672, 0xa34121d6
+0,         33,         33,        1,   540672, 0xe01421d6
+0,         34,         34,        1,   540672, 0x6fc721d6
+0,         35,         35,        1,   540672, 0x7fa621d6
+0,         36,         36,        1,   540672, 0xc48c21d6
+0,         37,         37,        1,   540672, 0x40f021d6
+0,         38,         38,        1,   540672, 0xdf3f21d6
+0,         39,         39,        1,   540672, 0xb04321d6
+0,         40,         40,        1,   540672, 0x222821d6
+0,         41,         41,        1,   540672, 0x2a5521d6
+0,         42,         42,        1,   540672, 0x6a4621be
+0,         43,         43,        1,   540672, 0xed7f21d6
+0,         44,         44,        1,   540672, 0xb16521d6
+0,         45,         45,        1,   540672, 0x9f5621d6
+0,         46,         46,        1,   540672, 0x204321d6
+0,         47,         47,        1,   540672, 0xc26e21d6
+0,         48,         48,        1,   540672, 0x3e8321d6
+0,         49,         49,        1,   540672, 0xaaee21d6
diff --git a/tests/ref/fate/filter-weave b/tests/ref/fate/filter-weave
new file mode 100644
index 0000000000..428fc3a8e2
--- /dev/null
+++ b/tests/ref/fate/filter-weave
@@ -0,0 +1,30 @@
+#tb 0: 2/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x576
+#sar 0: 0/1
+0,          0,          0,        1,   304128, 0x4f96ef40
+0,          1,          1,        1,   304128, 0xbd857709
+0,          2,          2,        1,   304128, 0x37d05f47
+0,          3,          3,        1,   304128, 0x867807de
+0,          4,          4,        1,   304128, 0x1838b93b
+0,          5,          5,        1,   304128, 0x97fa4444
+0,          6,          6,        1,   304128, 0x55854f93
+0,          7,          7,        1,   304128, 0xe6d39ce2
+0,          8,          8,        1,   304128, 0x51ec86e0
+0,          9,          9,        1,   304128, 0xcb5346da
+0,         10,         10,        1,   304128, 0xc5de1991
+0,         11,         11,        1,   304128, 0x71168648
+0,         12,         12,        1,   304128, 0x500a931b
+0,         13,         13,        1,   304128, 0xeb3e6f4b
+0,         14,         14,        1,   304128, 0xf8600972
+0,         15,         15,        1,   304128, 0x2d8d2ff7
+0,         16,         16,        1,   304128, 0x136676cc
+0,         17,         17,        1,   304128, 0xd73cd873
+0,         18,         18,        1,   304128, 0xd19339a3
+0,         19,         19,        1,   304128, 0x63e8a829
+0,         20,         20,        1,   304128, 0x45e6f72d
+0,         21,         21,        1,   304128, 0x0ae6e095
+0,         22,         22,        1,   304128, 0xd89d82e4
+0,         23,         23,        1,   304128, 0x9c0819d0
+0,         24,         24,        1,   304128, 0x65a48d7c
diff --git a/tests/ref/fate/filter-yadif-mode0 b/tests/ref/fate/filter-yadif-mode0
index d2c14d39b8..2c6346bd43 100644
--- a/tests/ref/fate/filter-yadif-mode0
+++ b/tests/ref/fate/filter-yadif-mode0
@@ -1,32 +1,35 @@
-#tb 0: 1/180000
-0,      64800,      64800,        0,   622080, 0x6331caee
-0,      72000,      72000,        0,   622080, 0xa459e690
-0,      79200,      79200,        0,   622080, 0x6429c648
-0,      86400,      86400,        0,   622080, 0xa49891ca
-0,      93600,      93600,        0,   622080, 0x2a887404
-0,     100800,     100800,        0,   622080, 0xe8d49705
-0,     108000,     108000,        0,   622080, 0x1b627835
-0,     115200,     115200,        0,   622080, 0x686858fd
-0,     122400,     122400,        0,   622080, 0x2675174f
-0,     129600,     129600,        0,   622080, 0x78470e7f
-0,     136800,     136800,        0,   622080, 0xffb366ec
-0,     144000,     144000,        0,   622080, 0xd575da72
-0,     151200,     151200,        0,   622080, 0x5fb297f7
-0,     158400,     158400,        0,   622080, 0xbac77ca0
-0,     165600,     165600,        0,   622080, 0x3276ed72
-0,     172800,     172800,        0,   622080, 0x264092b2
-0,     180000,     180000,        0,   622080, 0x20ba1094
-0,     187200,     187200,        0,   622080, 0x76cc3139
-0,     194400,     194400,        0,   622080, 0x469a4902
-0,     201600,     201600,        0,   622080, 0x0ed7b8f5
-0,     208800,     208800,        0,   622080, 0xdc51aeac
-0,     216000,     216000,        0,   622080, 0xee06aa36
-0,     223200,     223200,        0,   622080, 0x7372405f
-0,     230400,     230400,        0,   622080, 0x9e0ee776
-0,     237600,     237600,        0,   622080, 0x39e6d8c9
-0,     244800,     244800,        0,   622080, 0x51d9ac9a
-0,     252000,     252000,        0,   622080, 0x2b63441d
-0,     259200,     259200,        0,   622080, 0x58afbd5e
-0,     266400,     266400,        0,   622080, 0xb972f716
-0,     273600,     273600,        0,   622080, 0x6a6df129
-0,     280800,     280800,        0,   622080, 0x28b1373d
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 16/15
+0,          9,          9,        1,   622080, 0x6331caee
+0,         10,         10,        1,   622080, 0xa459e690
+0,         11,         11,        1,   622080, 0x6429c648
+0,         12,         12,        1,   622080, 0xa49891ca
+0,         13,         13,        1,   622080, 0x2a887404
+0,         14,         14,        1,   622080, 0xe8d49705
+0,         15,         15,        1,   622080, 0x1b627835
+0,         16,         16,        1,   622080, 0x686858fd
+0,         17,         17,        1,   622080, 0x2675174f
+0,         18,         18,        1,   622080, 0x78470e7f
+0,         19,         19,        1,   622080, 0xffb366ec
+0,         20,         20,        1,   622080, 0xd575da72
+0,         21,         21,        1,   622080, 0x5fb297f7
+0,         22,         22,        1,   622080, 0xbac77ca0
+0,         23,         23,        1,   622080, 0x3276ed72
+0,         24,         24,        1,   622080, 0x264092b2
+0,         25,         25,        1,   622080, 0x20ba1094
+0,         26,         26,        1,   622080, 0x76cc3139
+0,         27,         27,        1,   622080, 0x469a4902
+0,         28,         28,        1,   622080, 0x0ed7b8f5
+0,         29,         29,        1,   622080, 0xdc51aeac
+0,         30,         30,        1,   622080, 0xee06aa36
+0,         31,         31,        1,   622080, 0x7372405f
+0,         32,         32,        1,   622080, 0x9e0ee776
+0,         33,         33,        1,   622080, 0x39e6d8c9
+0,         34,         34,        1,   622080, 0x51d9ac9a
+0,         35,         35,        1,   622080, 0x2b63441d
+0,         36,         36,        1,   622080, 0x58afbd5e
+0,         37,         37,        1,   622080, 0xb972f716
+0,         38,         38,        1,   622080, 0x6a6df129
diff --git a/tests/ref/fate/filter-yadif-mode1 b/tests/ref/fate/filter-yadif-mode1
index ca5f290ee9..e2d14d5605 100644
--- a/tests/ref/fate/filter-yadif-mode1
+++ b/tests/ref/fate/filter-yadif-mode1
@@ -1,63 +1,64 @@
-#tb 0: 1/180000
-0,      64800,      64800,        0,   622080, 0x6331caee
-0,      68400,      68400,        0,   622080, 0x625da883
-0,      72000,      72000,        0,   622080, 0xa459e690
-0,      75600,      75600,        0,   622080, 0xce5d891e
-0,      79200,      79200,        0,   622080, 0x6429c648
-0,      82800,      82800,        0,   622080, 0x608cc0ba
-0,      86400,      86400,        0,   622080, 0xa49891ca
-0,      90000,      90000,        0,   622080, 0x9721987f
-0,      93600,      93600,        0,   622080, 0x2a887404
-0,      97200,      97200,        0,   622080, 0x60d71d47
-0,     100800,     100800,        0,   622080, 0xe8d49705
-0,     104400,     104400,        0,   622080, 0x821e13cb
-0,     108000,     108000,        0,   622080, 0x1b627835
-0,     111600,     111600,        0,   622080, 0x1806c5f4
-0,     115200,     115200,        0,   622080, 0x686858fd
-0,     118800,     118800,        0,   622080, 0xab865773
-0,     122400,     122400,        0,   622080, 0x2675174f
-0,     126000,     126000,        0,   622080, 0x43a61a14
-0,     129600,     129600,        0,   622080, 0x78470e7f
-0,     133200,     133200,        0,   622080, 0xeb877bc6
-0,     136800,     136800,        0,   622080, 0xffb366ec
-0,     140400,     140400,        0,   622080, 0xda0906e7
-0,     144000,     144000,        0,   622080, 0xd575da72
-0,     147600,     147600,        0,   622080, 0x23ae25a4
-0,     151200,     151200,        0,   622080, 0x5fb297f7
-0,     154800,     154800,        0,   622080, 0x99b32978
-0,     158400,     158400,        0,   622080, 0xbac77ca0
-0,     162000,     162000,        0,   622080, 0xc1cdcbf9
-0,     165600,     165600,        0,   622080, 0x3276ed72
-0,     169200,     169200,        0,   622080, 0x4061f5ab
-0,     172800,     172800,        0,   622080, 0x264092b2
-0,     176400,     176400,        0,   622080, 0xa4e2039e
-0,     180000,     180000,        0,   622080, 0x20ba1094
-0,     183600,     183600,        0,   622080, 0x984e906e
-0,     187200,     187200,        0,   622080, 0x76cc3139
-0,     190800,     190800,        0,   622080, 0xf70e2cf6
-0,     194400,     194400,        0,   622080, 0x469a4902
-0,     198000,     198000,        0,   622080, 0x235312e6
-0,     201600,     201600,        0,   622080, 0x0ed7b8f5
-0,     205200,     205200,        0,   622080, 0xd0269cc3
-0,     208800,     208800,        0,   622080, 0xdc51aeac
-0,     212400,     212400,        0,   622080, 0x1aa5f76e
-0,     216000,     216000,        0,   622080, 0xee06aa36
-0,     219600,     219600,        0,   622080, 0xa7103230
-0,     223200,     223200,        0,   622080, 0x7372405f
-0,     226800,     226800,        0,   622080, 0x8d7a44b5
-0,     230400,     230400,        0,   622080, 0x9e0ee776
-0,     234000,     234000,        0,   622080, 0xd41e8560
-0,     237600,     237600,        0,   622080, 0x39e6d8c9
-0,     241200,     241200,        0,   622080, 0x7a23d70c
-0,     244800,     244800,        0,   622080, 0x51d9ac9a
-0,     248400,     248400,        0,   622080, 0x8eacf7f2
-0,     252000,     252000,        0,   622080, 0x2b63441d
-0,     255600,     255600,        0,   622080, 0x9f71b742
-0,     259200,     259200,        0,   622080, 0x58afbd5e
-0,     262800,     262800,        0,   622080, 0x4d645292
-0,     266400,     266400,        0,   622080, 0xb972f716
-0,     270000,     270000,        0,   622080, 0xbb5d01a2
-0,     273600,     273600,        0,   622080, 0x6a6df129
-0,     277200,     277200,        0,   622080, 0x9e45371e
-0,     280800,     280800,        0,   622080, 0x28b1373d
-0,     284400,     284400,        0,   622080, 0xa1cdb1f2
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 16/15
+0,         18,         18,        1,   622080, 0x6331caee
+0,         19,         19,        1,   622080, 0x625da883
+0,         20,         20,        1,   622080, 0xa459e690
+0,         21,         21,        1,   622080, 0xce5d891e
+0,         22,         22,        1,   622080, 0x6429c648
+0,         23,         23,        1,   622080, 0x608cc0ba
+0,         24,         24,        1,   622080, 0xa49891ca
+0,         25,         25,        1,   622080, 0x9721987f
+0,         26,         26,        1,   622080, 0x2a887404
+0,         27,         27,        1,   622080, 0x60d71d47
+0,         28,         28,        1,   622080, 0xe8d49705
+0,         29,         29,        1,   622080, 0x821e13cb
+0,         30,         30,        1,   622080, 0x1b627835
+0,         31,         31,        1,   622080, 0x1806c5f4
+0,         32,         32,        1,   622080, 0x686858fd
+0,         33,         33,        1,   622080, 0xab865773
+0,         34,         34,        1,   622080, 0x2675174f
+0,         35,         35,        1,   622080, 0x43a61a14
+0,         36,         36,        1,   622080, 0x78470e7f
+0,         37,         37,        1,   622080, 0xeb877bc6
+0,         38,         38,        1,   622080, 0xffb366ec
+0,         39,         39,        1,   622080, 0xda0906e7
+0,         40,         40,        1,   622080, 0xd575da72
+0,         41,         41,        1,   622080, 0x23ae25a4
+0,         42,         42,        1,   622080, 0x5fb297f7
+0,         43,         43,        1,   622080, 0x99b32978
+0,         44,         44,        1,   622080, 0xbac77ca0
+0,         45,         45,        1,   622080, 0xc1cdcbf9
+0,         46,         46,        1,   622080, 0x3276ed72
+0,         47,         47,        1,   622080, 0x4061f5ab
+0,         48,         48,        1,   622080, 0x264092b2
+0,         49,         49,        1,   622080, 0xa4e2039e
+0,         50,         50,        1,   622080, 0x20ba1094
+0,         51,         51,        1,   622080, 0x984e906e
+0,         52,         52,        1,   622080, 0x76cc3139
+0,         53,         53,        1,   622080, 0xf70e2cf6
+0,         54,         54,        1,   622080, 0x469a4902
+0,         55,         55,        1,   622080, 0x235312e6
+0,         56,         56,        1,   622080, 0x0ed7b8f5
+0,         57,         57,        1,   622080, 0xd0269cc3
+0,         58,         58,        1,   622080, 0xdc51aeac
+0,         59,         59,        1,   622080, 0x1aa5f76e
+0,         60,         60,        1,   622080, 0xee06aa36
+0,         61,         61,        1,   622080, 0xa7103230
+0,         62,         62,        1,   622080, 0x7372405f
+0,         63,         63,        1,   622080, 0x8d7a44b5
+0,         64,         64,        1,   622080, 0x9e0ee776
+0,         65,         65,        1,   622080, 0xd41e8560
+0,         66,         66,        1,   622080, 0x39e6d8c9
+0,         67,         67,        1,   622080, 0x7a23d70c
+0,         68,         68,        1,   622080, 0x51d9ac9a
+0,         69,         69,        1,   622080, 0x8eacf7f2
+0,         70,         70,        1,   622080, 0x2b63441d
+0,         71,         71,        1,   622080, 0x9f71b742
+0,         72,         72,        1,   622080, 0x58afbd5e
+0,         73,         73,        1,   622080, 0x4d645292
+0,         74,         74,        1,   622080, 0xb972f716
+0,         75,         75,        1,   622080, 0xbb5d01a2
+0,         76,         76,        1,   622080, 0x6a6df129
diff --git a/tests/ref/fate/filter-yadif10 b/tests/ref/fate/filter-yadif10
new file mode 100644
index 0000000000..09ab7458bb
--- /dev/null
+++ b/tests/ref/fate/filter-yadif10
@@ -0,0 +1,35 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 16/15
+0,          9,          9,        1,  1244160, 0x5b49e0c0
+0,         10,         10,        1,  1244160, 0x76ba6bab
+0,         11,         11,        1,  1244160, 0x0298cb8d
+0,         12,         12,        1,  1244160, 0x9c81759a
+0,         13,         13,        1,  1244160, 0xa239d1ae
+0,         14,         14,        1,  1244160, 0x3e95ada9
+0,         15,         15,        1,  1244160, 0x8b87e8f8
+0,         16,         16,        1,  1244160, 0x64f89653
+0,         17,         17,        1,  1244160, 0x58e5d12e
+0,         18,         18,        1,  1244160, 0x38b4003a
+0,         19,         19,        1,  1244160, 0xc005c29c
+0,         20,         20,        1,  1244160, 0x10c0c60d
+0,         21,         21,        1,  1244160, 0x1b550998
+0,         22,         22,        1,  1244160, 0x7aacf6ab
+0,         23,         23,        1,  1244160, 0xeb205d98
+0,         24,         24,        1,  1244160, 0x6ad2134c
+0,         25,         25,        1,  1244160, 0x8aea4e56
+0,         26,         26,        1,  1244160, 0x0d910a6b
+0,         27,         27,        1,  1244160, 0x749ae307
+0,         28,         28,        1,  1244160, 0x8ff7af3c
+0,         29,         29,        1,  1244160, 0x9ba51b91
+0,         30,         30,        1,  1244160, 0xad476514
+0,         31,         31,        1,  1244160, 0x674481d6
+0,         32,         32,        1,  1244160, 0x0937e677
+0,         33,         33,        1,  1244160, 0x6c2c53ee
+0,         34,         34,        1,  1244160, 0x524a164e
+0,         35,         35,        1,  1244160, 0x77a405ab
+0,         36,         36,        1,  1244160, 0xaa6b47c4
+0,         37,         37,        1,  1244160, 0x0b5ab556
+0,         38,         38,        1,  1244160, 0xbe1edab9
diff --git a/tests/ref/fate/filter-yadif16 b/tests/ref/fate/filter-yadif16
new file mode 100644
index 0000000000..3386b026c9
--- /dev/null
+++ b/tests/ref/fate/filter-yadif16
@@ -0,0 +1,35 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 16/15
+0,          9,          9,        1,  1244160, 0xfb65caee
+0,         10,         10,        1,  1244160, 0x6222e690
+0,         11,         11,        1,  1244160, 0x020ac648
+0,         12,         12,        1,  1244160, 0xb76691ca
+0,         13,         13,        1,  1244160, 0xe0fd7404
+0,         14,         14,        1,  1244160, 0x3ab29705
+0,         15,         15,        1,  1244160, 0xbe807835
+0,         16,         16,        1,  1244160, 0x77d358fd
+0,         17,         17,        1,  1244160, 0x359b174f
+0,         18,         18,        1,  1244160, 0xe20f0e7f
+0,         19,         19,        1,  1244160, 0x988966ec
+0,         20,         20,        1,  1244160, 0xd078da72
+0,         21,         21,        1,  1244160, 0x276d97f7
+0,         22,         22,        1,  1244160, 0xf8ee7ca0
+0,         23,         23,        1,  1244160, 0x776bed72
+0,         24,         24,        1,  1244160, 0xb9bf92b2
+0,         25,         25,        1,  1244160, 0x30e01094
+0,         26,         26,        1,  1244160, 0xbc5f3139
+0,         27,         27,        1,  1244160, 0x44324902
+0,         28,         28,        1,  1244160, 0x64aab8f5
+0,         29,         29,        1,  1244160, 0x0a05aeac
+0,         30,         30,        1,  1244160, 0x31e5aa36
+0,         31,         31,        1,  1244160, 0xa685405f
+0,         32,         32,        1,  1244160, 0x54a6e776
+0,         33,         33,        1,  1244160, 0x9af4d8c9
+0,         34,         34,        1,  1244160, 0xf709ac9a
+0,         35,         35,        1,  1244160, 0x12a9441d
+0,         36,         36,        1,  1244160, 0xf3f1bd5e
+0,         37,         37,        1,  1244160, 0x7bcef716
+0,         38,         38,        1,  1244160, 0xe3a2f129
diff --git a/tests/ref/fate/filter-yuvtestsrc-yuv444p b/tests/ref/fate/filter-yuvtestsrc-yuv444p
new file mode 100644
index 0000000000..44fcf08441
--- /dev/null
+++ b/tests/ref/fate/filter-yuvtestsrc-yuv444p
@@ -0,0 +1,10 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   230400, 0x0e1e2a4f
+0,          1,          1,        1,   230400, 0x0e1e2a4f
+0,          2,          2,        1,   230400, 0x0e1e2a4f
+0,          3,          3,        1,   230400, 0x0e1e2a4f
+0,          4,          4,        1,   230400, 0x0e1e2a4f
diff --git a/tests/ref/fate/filter-yuvtestsrc-yuv444p12 b/tests/ref/fate/filter-yuvtestsrc-yuv444p12
new file mode 100644
index 0000000000..8abac6f9d9
--- /dev/null
+++ b/tests/ref/fate/filter-yuvtestsrc-yuv444p12
@@ -0,0 +1,10 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   460800, 0x3ec49be7
+0,          1,          1,        1,   460800, 0x3ec49be7
+0,          2,          2,        1,   460800, 0x3ec49be7
+0,          3,          3,        1,   460800, 0x3ec49be7
+0,          4,          4,        1,   460800, 0x3ec49be7
diff --git a/tests/ref/fate/fits-demux b/tests/ref/fate/fits-demux
new file mode 100644
index 0000000000..85605ab11a
--- /dev/null
+++ b/tests/ref/fate/fits-demux
@@ -0,0 +1,10 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: fits
+#dimensions 0: 72x36
+#sar 0: 0/1
+0,          0,          0,        1,    14320, 0x0ecf72e0
+0,          1,          1,        1,    14320, 0xd94af6eb
+0,          2,          2,        1,    14320, 0x15c21892
+0,          3,          3,        1,    14320, 0xb18adc01
+0,          4,          4,        1,    14320, 0xc2be706d
diff --git a/tests/ref/fate/fitsdec-bitpix-32 b/tests/ref/fate/fitsdec-bitpix-32
new file mode 100644
index 0000000000..9bce361555
--- /dev/null
+++ b/tests/ref/fate/fitsdec-bitpix-32
@@ -0,0 +1,6 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 102x109
+#sar 0: 0/1
+0,          0,          0,        1,    22236, 0x34490902
diff --git a/tests/ref/fate/fitsdec-bitpix-64 b/tests/ref/fate/fitsdec-bitpix-64
new file mode 100644
index 0000000000..9febdd68f4
--- /dev/null
+++ b/tests/ref/fate/fitsdec-bitpix-64
@@ -0,0 +1,6 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 77x173
+#sar 0: 0/1
+0,          0,          0,        1,    26642, 0x0ad2a46a
diff --git a/tests/ref/fate/fitsdec-blank_bitpix32 b/tests/ref/fate/fitsdec-blank_bitpix32
new file mode 100644
index 0000000000..184fd41c59
--- /dev/null
+++ b/tests/ref/fate/fitsdec-blank_bitpix32
@@ -0,0 +1,6 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 0/1
+0,          0,          0,        1,   131072, 0x7fb22427
diff --git a/tests/ref/fate/fitsdec-ext_data_min_max b/tests/ref/fate/fitsdec-ext_data_min_max
new file mode 100644
index 0000000000..9009a4efb3
--- /dev/null
+++ b/tests/ref/fate/fitsdec-ext_data_min_max
@@ -0,0 +1,6 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x512
+#sar 0: 0/1
+0,          0,          0,        1,   524288, 0xc327ed23
diff --git a/tests/ref/fate/fitsdec-gbrap16 b/tests/ref/fate/fitsdec-gbrap16
new file mode 100644
index 0000000000..78abb5cde7
--- /dev/null
+++ b/tests/ref/fate/fitsdec-gbrap16
@@ -0,0 +1,6 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,   131072, 0x487894b2
diff --git a/tests/ref/fate/fitsdec-gbrp b/tests/ref/fate/fitsdec-gbrp
new file mode 100644
index 0000000000..8767b6715f
--- /dev/null
+++ b/tests/ref/fate/fitsdec-gbrp
@@ -0,0 +1,6 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0x565c3dee
diff --git a/tests/ref/fate/fitsdec-gbrp16 b/tests/ref/fate/fitsdec-gbrp16
new file mode 100644
index 0000000000..f6368f2c02
--- /dev/null
+++ b/tests/ref/fate/fitsdec-gbrp16
@@ -0,0 +1,6 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    98304, 0x1b917bdc
diff --git a/tests/ref/fate/fitsdec-gray b/tests/ref/fate/fitsdec-gray
new file mode 100644
index 0000000000..425b31fc0f
--- /dev/null
+++ b/tests/ref/fate/fitsdec-gray
@@ -0,0 +1,6 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    16384, 0xd788a2d2
diff --git a/tests/ref/fate/fitsdec-multi b/tests/ref/fate/fitsdec-multi
new file mode 100644
index 0000000000..f24f0adaab
--- /dev/null
+++ b/tests/ref/fate/fitsdec-multi
@@ -0,0 +1,10 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 72x36
+#sar 0: 0/1
+0,          0,          0,        1,    10368, 0xb4490cc8
+0,          1,          1,        1,    10368, 0x37198e4f
+0,          2,          2,        1,    10368, 0x1e89afe7
+0,          3,          3,        1,    10368, 0x80127365
+0,          4,          4,        1,    10368, 0xfd2d07d1
diff --git a/tests/ref/fate/fitsenc-gbrap b/tests/ref/fate/fitsenc-gbrap
new file mode 100644
index 0000000000..3e32fc687e
--- /dev/null
+++ b/tests/ref/fate/fitsenc-gbrap
@@ -0,0 +1,10 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: fits
+#dimensions 0: 72x36
+#sar 0: 0/1
+0,          0,          0,        1,    11520, 0xeb0a0cc8
+0,          1,          1,        1,    11520, 0x9d7d8e4f
+0,          2,          2,        1,    11520, 0xd9e6afe7
+0,          3,          3,        1,    11520, 0x75bd7365
+0,          4,          4,        1,    11520, 0x86f107d1
diff --git a/tests/ref/fate/fitsenc-gbrap16be b/tests/ref/fate/fitsenc-gbrap16be
new file mode 100644
index 0000000000..1f74f4e750
--- /dev/null
+++ b/tests/ref/fate/fitsenc-gbrap16be
@@ -0,0 +1,10 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: fits
+#dimensions 0: 72x36
+#sar 0: 0/1
+0,          0,          0,        1,    23040, 0xfa4ff4f0
+0,          1,          1,        1,    23040, 0xf57102d4
+0,          2,          2,        1,    23040, 0x58e0294d
+0,          3,          3,        1,    23040, 0x8097502a
+0,          4,          4,        1,    23040, 0x65fd7b54
diff --git a/tests/ref/fate/fitsenc-gbrp b/tests/ref/fate/fitsenc-gbrp
new file mode 100644
index 0000000000..4101a0e452
--- /dev/null
+++ b/tests/ref/fate/fitsenc-gbrp
@@ -0,0 +1,10 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: fits
+#dimensions 0: 72x36
+#sar 0: 0/1
+0,          0,          0,        1,     8640, 0xf6b9f643
+0,          1,          1,        1,     8640, 0x250d77d9
+0,          2,          2,        1,     8640, 0x652595e5
+0,          3,          3,        1,     8640, 0x4b8e5963
+0,          4,          4,        1,     8640, 0xd8d611ab
diff --git a/tests/ref/fate/fitsenc-gbrp16be b/tests/ref/fate/fitsenc-gbrp16be
new file mode 100644
index 0000000000..d4b043ffe6
--- /dev/null
+++ b/tests/ref/fate/fitsenc-gbrp16be
@@ -0,0 +1,10 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: fits
+#dimensions 0: 72x36
+#sar 0: 0/1
+0,          0,          0,        1,    17280, 0x6b87eec5
+0,          1,          1,        1,    17280, 0x1bf0fc9a
+0,          2,          2,        1,    17280, 0xaf071b1e
+0,          3,          3,        1,    17280, 0xfbe941fb
+0,          4,          4,        1,    17280, 0xbbc26d01
diff --git a/tests/ref/fate/fitsenc-gray b/tests/ref/fate/fitsenc-gray
new file mode 100644
index 0000000000..46eb76c43b
--- /dev/null
+++ b/tests/ref/fate/fitsenc-gray
@@ -0,0 +1,10 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: fits
+#dimensions 0: 72x36
+#sar 0: 0/1
+0,          0,          0,        1,     2880, 0xd2d83752
+0,          1,          1,        1,     2880, 0x77246e79
+0,          2,          2,        1,     2880, 0xdf480c1f
+0,          3,          3,        1,     2880, 0x559247a9
+0,          4,          4,        1,     2880, 0xc3df2cc4
diff --git a/tests/ref/fate/fitsenc-gray16be b/tests/ref/fate/fitsenc-gray16be
new file mode 100644
index 0000000000..ec4e0efd3c
--- /dev/null
+++ b/tests/ref/fate/fitsenc-gray16be
@@ -0,0 +1,10 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: fits
+#dimensions 0: 72x36
+#sar 0: 0/1
+0,          0,          0,        1,     5760, 0x317ba180
+0,          1,          1,        1,     5760, 0x439c9e40
+0,          2,          2,        1,     5760, 0x6136ff8f
+0,          3,          3,        1,     5760, 0x2c331324
+0,          4,          4,        1,     5760, 0x2f0816c1
diff --git a/tests/ref/fate/flcl1905 b/tests/ref/fate/flcl1905
new file mode 100644
index 0000000000..de42921863
--- /dev/null
+++ b/tests/ref/fate/flcl1905
@@ -0,0 +1,193 @@
+packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=56|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=0|pkt_dts_time=0.000000|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=56|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=22528|pts_time=0.510839|dts=22528|dts_time=0.510839|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=4148|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=22528|pkt_pts_time=0.510839|pkt_dts=22528|pkt_dts_time=0.510839|best_effort_timestamp=22528|best_effort_timestamp_time=0.510839|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=4148|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=4148|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=4148|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=4148|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=4148|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=4148|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=4148|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=4148|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=4148|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=4148|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=4148|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=45056|pts_time=1.021678|dts=45056|dts_time=1.021678|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=8240|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=45056|pkt_pts_time=1.021678|pkt_dts=45056|pkt_dts_time=1.021678|best_effort_timestamp=45056|best_effort_timestamp_time=1.021678|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=8240|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=8240|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=8240|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=8240|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=8240|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=8240|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=8240|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=8240|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=8240|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=8240|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=8240|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=67584|pts_time=1.532517|dts=67584|dts_time=1.532517|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=12332|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=67584|pkt_pts_time=1.532517|pkt_dts=67584|pkt_dts_time=1.532517|best_effort_timestamp=67584|best_effort_timestamp_time=1.532517|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=12332|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=12332|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=12332|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=12332|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=12332|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=12332|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=12332|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=12332|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=12332|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=12332|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=12332|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=90112|pts_time=2.043356|dts=90112|dts_time=2.043356|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=16424|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=90112|pkt_pts_time=2.043356|pkt_dts=90112|pkt_dts_time=2.043356|best_effort_timestamp=90112|best_effort_timestamp_time=2.043356|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=16424|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=16424|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=16424|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=16424|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=16424|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=16424|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=16424|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=16424|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=16424|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=16424|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=16424|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=112640|pts_time=2.554195|dts=112640|dts_time=2.554195|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=20516|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=112640|pkt_pts_time=2.554195|pkt_dts=112640|pkt_dts_time=2.554195|best_effort_timestamp=112640|best_effort_timestamp_time=2.554195|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=20516|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=20516|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=20516|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=20516|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=20516|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=20516|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=20516|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=20516|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=20516|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=20516|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=20516|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=135168|pts_time=3.065034|dts=135168|dts_time=3.065034|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=24608|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=135168|pkt_pts_time=3.065034|pkt_dts=135168|pkt_dts_time=3.065034|best_effort_timestamp=135168|best_effort_timestamp_time=3.065034|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=24608|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=24608|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=24608|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=24608|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=24608|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=24608|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=24608|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=24608|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=24608|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=24608|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=24608|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=157696|pts_time=3.575873|dts=157696|dts_time=3.575873|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=28700|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=157696|pkt_pts_time=3.575873|pkt_dts=157696|pkt_dts_time=3.575873|best_effort_timestamp=157696|best_effort_timestamp_time=3.575873|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=28700|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=28700|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=28700|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=28700|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=28700|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=28700|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=28700|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=28700|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=28700|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=28700|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=28700|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=180224|pts_time=4.086712|dts=180224|dts_time=4.086712|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=32792|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=180224|pkt_pts_time=4.086712|pkt_dts=180224|pkt_dts_time=4.086712|best_effort_timestamp=180224|best_effort_timestamp_time=4.086712|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=32792|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=32792|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=32792|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=32792|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=32792|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=32792|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=32792|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=32792|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=32792|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=32792|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=32792|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=202752|pts_time=4.597551|dts=202752|dts_time=4.597551|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=36884|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=202752|pkt_pts_time=4.597551|pkt_dts=202752|pkt_dts_time=4.597551|best_effort_timestamp=202752|best_effort_timestamp_time=4.597551|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=36884|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=36884|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=36884|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=36884|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=36884|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=36884|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=36884|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=36884|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=36884|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=36884|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=36884|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=225280|pts_time=5.108390|dts=225280|dts_time=5.108390|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=40976|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=225280|pkt_pts_time=5.108390|pkt_dts=225280|pkt_dts_time=5.108390|best_effort_timestamp=225280|best_effort_timestamp_time=5.108390|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=40976|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=40976|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=40976|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=40976|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=40976|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=40976|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=40976|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=40976|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=40976|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=40976|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=40976|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=247808|pts_time=5.619229|dts=247808|dts_time=5.619229|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=45068|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=247808|pkt_pts_time=5.619229|pkt_dts=247808|pkt_dts_time=5.619229|best_effort_timestamp=247808|best_effort_timestamp_time=5.619229|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=45068|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=45068|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=45068|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=45068|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=45068|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=45068|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=45068|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=45068|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=45068|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=45068|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=45068|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=270336|pts_time=6.130068|dts=270336|dts_time=6.130068|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=49160|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=270336|pkt_pts_time=6.130068|pkt_dts=270336|pkt_dts_time=6.130068|best_effort_timestamp=270336|best_effort_timestamp_time=6.130068|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=49160|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=49160|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=49160|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=49160|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=49160|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=49160|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=49160|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=49160|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=49160|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=49160|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=49160|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=292864|pts_time=6.640907|dts=292864|dts_time=6.640907|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=53252|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=292864|pkt_pts_time=6.640907|pkt_dts=292864|pkt_dts_time=6.640907|best_effort_timestamp=292864|best_effort_timestamp_time=6.640907|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=53252|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=53252|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=53252|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=53252|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=53252|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=53252|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=53252|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=53252|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=53252|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=53252|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=53252|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=315392|pts_time=7.151746|dts=315392|dts_time=7.151746|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=57344|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=315392|pkt_pts_time=7.151746|pkt_dts=315392|pkt_dts_time=7.151746|best_effort_timestamp=315392|best_effort_timestamp_time=7.151746|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=57344|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=57344|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=57344|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=57344|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=57344|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=57344|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=57344|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=57344|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=57344|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=57344|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=57344|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=337920|pts_time=7.662585|dts=337920|dts_time=7.662585|duration=22528|duration_time=0.510839|convergence_duration=N/A|convergence_duration_time=N/A|size=4092|pos=61436|flags=K_
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=337920|pkt_pts_time=7.662585|pkt_dts=337920|pkt_dts_time=7.662585|best_effort_timestamp=337920|best_effort_timestamp_time=7.662585|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=4092|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=3720|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=3348|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=2976|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=2604|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=2232|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=1860|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=1488|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=1116|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=744|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+frame|media_type=audio|stream_index=0|key_frame=1|pkt_pts=N/A|pkt_pts_time=N/A|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=N/A|best_effort_timestamp_time=N/A|pkt_duration=22528|pkt_duration_time=0.510839|pkt_pos=61436|pkt_size=372|sample_fmt=fltp|nb_samples=2048|channels=2|channel_layout=unknown
+packet|codec_type=audio|stream_index=0|pts=360448|pts_time=8.173424|dts=360448|dts_time=8.173424|duration=44|duration_time=0.000998|convergence_duration=N/A|convergence_duration_time=N/A|size=8|pos=65528|flags=K_
diff --git a/tests/ref/fate/flic-af11-palette-change b/tests/ref/fate/flic-af11-palette-change
index 61e6c1d8a0..acf000412a 100644
--- a/tests/ref/fate/flic-af11-palette-change
+++ b/tests/ref/fate/flic-af11-palette-change
@@ -1,117 +1,121 @@
 #tb 0: 1/35
-0,          0,          0,        1,   192000, 0x64da83e8
-0,          1,          1,        1,   192000, 0xf59ccccc
-0,          2,          2,        1,   192000, 0xaaa06c5c
-0,          3,          3,        1,   192000, 0xa98f82c0
-0,          4,          4,        1,   192000, 0x164fbbdc
-0,          5,          5,        1,   192000, 0x0b3abc0c
-0,          6,          6,        1,   192000, 0x47661943
-0,          7,          7,        1,   192000, 0x30711074
-0,          8,          8,        1,   192000, 0x67684a84
-0,          9,          9,        1,   192000, 0x1d9afa70
-0,         10,         10,        1,   192000, 0x4fd28e78
-0,         11,         11,        1,   192000, 0x9bc5c8cc
-0,         12,         12,        1,   192000, 0xcf268b6c
-0,         13,         13,        1,   192000, 0xdfe65fd4
-0,         14,         14,        1,   192000, 0x47e75404
-0,         15,         15,        1,   192000, 0xb3b5b448
-0,         16,         16,        1,   192000, 0x826c94b4
-0,         17,         17,        1,   192000, 0x158e95f8
-0,         18,         18,        1,   192000, 0x576f031f
-0,         19,         19,        1,   192000, 0xea3399e8
-0,         20,         20,        1,   192000, 0x76b1e224
-0,         21,         21,        1,   192000, 0x290073db
-0,         22,         22,        1,   192000, 0x83741abf
-0,         23,         23,        1,   192000, 0x50f9c4ec
-0,         24,         24,        1,   192000, 0x6d8fdac0
-0,         25,         25,        1,   192000, 0xe26e2600
-0,         26,         26,        1,   192000, 0xbeb0e11c
-0,         27,         27,        1,   192000, 0x38282fd4
-0,         28,         28,        1,   192000, 0x13d0b790
-0,         29,         29,        1,   192000, 0x0cf8fca9
-0,         30,         30,        1,   192000, 0x64da83e8
-0,         31,         31,        1,   192000, 0xf59ccccc
-0,         32,         32,        1,   192000, 0xaaa06c5c
-0,         33,         33,        1,   192000, 0xa98f82c0
-0,         34,         34,        1,   192000, 0x164fbbdc
-0,         35,         35,        1,   192000, 0x0b3abc0c
-0,         36,         36,        1,   192000, 0x47661943
-0,         37,         37,        1,   192000, 0x30711074
-0,         38,         38,        1,   192000, 0x67684a84
-0,         39,         39,        1,   192000, 0x1d9afa70
-0,         40,         40,        1,   192000, 0x4fd28e78
-0,         41,         41,        1,   192000, 0x9bc5c8cc
-0,         42,         42,        1,   192000, 0xcf268b6c
-0,         43,         43,        1,   192000, 0xdfe65fd4
-0,         44,         44,        1,   192000, 0x47e75404
-0,         45,         45,        1,   192000, 0xb3b5b448
-0,         46,         46,        1,   192000, 0x826c94b4
-0,         47,         47,        1,   192000, 0x158e95f8
-0,         48,         48,        1,   192000, 0x576f031f
-0,         49,         49,        1,   192000, 0xea3399e8
-0,         50,         50,        1,   192000, 0x76b1e224
-0,         51,         51,        1,   192000, 0x290073db
-0,         52,         52,        1,   192000, 0x83741abf
-0,         53,         53,        1,   192000, 0x50f9c4ec
-0,         54,         54,        1,   192000, 0x6d8fdac0
-0,         55,         55,        1,   192000, 0xe26e2600
-0,         56,         56,        1,   192000, 0xbeb0e11c
-0,         57,         57,        1,   192000, 0x38282fd4
-0,         58,         58,        1,   192000, 0x13d0b790
-0,         59,         59,        1,   192000, 0x0cf8fca9
-0,         60,         60,        1,   192000, 0x64da83e8
-0,         61,         61,        1,   192000, 0xf59ccccc
-0,         62,         62,        1,   192000, 0xaaa06c5c
-0,         63,         63,        1,   192000, 0xa98f82c0
-0,         64,         64,        1,   192000, 0x164fbbdc
-0,         65,         65,        1,   192000, 0x0b3abc0c
-0,         66,         66,        1,   192000, 0x47661943
-0,         67,         67,        1,   192000, 0x30711074
-0,         68,         68,        1,   192000, 0x67684a84
-0,         69,         69,        1,   192000, 0x1d9afa70
-0,         70,         70,        1,   192000, 0x4fd28e78
-0,         71,         71,        1,   192000, 0x9bc5c8cc
-0,         72,         72,        1,   192000, 0xcf268b6c
-0,         73,         73,        1,   192000, 0xdfe65fd4
-0,         74,         74,        1,   192000, 0x47e75404
-0,         75,         75,        1,   192000, 0xb3b5b448
-0,         76,         76,        1,   192000, 0x826c94b4
-0,         77,         77,        1,   192000, 0x158e95f8
-0,         78,         78,        1,   192000, 0x576f031f
-0,         79,         79,        1,   192000, 0xea3399e8
-0,         80,         80,        1,   192000, 0x76b1e224
-0,         81,         81,        1,   192000, 0x290073db
-0,         82,         82,        1,   192000, 0x83741abf
-0,         83,         83,        1,   192000, 0x50f9c4ec
-0,         84,         84,        1,   192000, 0x6d8fdac0
-0,         85,         85,        1,   192000, 0xe26e2600
-0,         86,         86,        1,   192000, 0xbeb0e11c
-0,         87,         87,        1,   192000, 0x38282fd4
-0,         88,         88,        1,   192000, 0x13d0b790
-0,         89,         89,        1,   192000, 0x0cf8fca9
-0,         90,         90,        1,   192000, 0xfcb10883
-0,         91,         91,        1,   192000, 0xfcb10883
-0,         92,         92,        1,   192000, 0xd0ba80c4
-0,         93,         93,        1,   192000, 0xd0ba80c4
-0,         94,         94,        1,   192000, 0x690520d9
-0,         95,         95,        1,   192000, 0x690520d9
-0,         96,         96,        1,   192000, 0x5b621c3f
-0,         97,         97,        1,   192000, 0x5b621c3f
-0,         98,         98,        1,   192000, 0x689e231f
-0,         99,         99,        1,   192000, 0x689e231f
-0,        100,        100,        1,   192000, 0x20653ff2
-0,        101,        101,        1,   192000, 0x20653ff2
-0,        102,        102,        1,   192000, 0xc18b3231
-0,        103,        103,        1,   192000, 0xc18b3231
-0,        104,        104,        1,   192000, 0x6d87ec3d
-0,        105,        105,        1,   192000, 0x6d87ec3d
-0,        106,        106,        1,   192000, 0x1c5b53d6
-0,        107,        107,        1,   192000, 0x1c5b53d6
-0,        108,        108,        1,   192000, 0x152fdf12
-0,        109,        109,        1,   192000, 0xde187291
-0,        110,        110,        1,   192000, 0x167617a5
-0,        111,        111,        1,   192000, 0x5067b8de
-0,        112,        112,        1,   192000, 0xd02ae54e
-0,        113,        113,        1,   192000, 0x0d6e9402
-0,        114,        114,        1,   192000, 0xa8e98616
-0,        115,        115,        1,   192000, 0x04762d1a
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
+0,          0,          0,        1,   192000, 0x508ff8ac
+0,          1,          1,        1,   192000, 0xef0d4274
+0,          2,          2,        1,   192000, 0x0d50e0dd
+0,          3,          3,        1,   192000, 0xf638f782
+0,          4,          4,        1,   192000, 0x40e4314b
+0,          5,          5,        1,   192000, 0x0ce5318f
+0,          6,          6,        1,   192000, 0x14848fa9
+0,          7,          7,        1,   192000, 0x676f83e1
+0,          8,          8,        1,   192000, 0x5b98bea9
+0,          9,          9,        1,   192000, 0xf5cc709d
+0,         10,         10,        1,   192000, 0x719a0373
+0,         11,         11,        1,   192000, 0xba5a3e74
+0,         12,         12,        1,   192000, 0x34e10051
+0,         13,         13,        1,   192000, 0xb66dd42d
+0,         14,         14,        1,   192000, 0xfb58c833
+0,         15,         15,        1,   192000, 0xa28029a4
+0,         16,         16,        1,   192000, 0x28fa09b3
+0,         17,         17,        1,   192000, 0x676f0b08
+0,         18,         18,        1,   192000, 0x7af97965
+0,         19,         19,        1,   192000, 0x436f0f03
+0,         20,         20,        1,   192000, 0xbaca5814
+0,         21,         21,        1,   192000, 0xca97eb51
+0,         22,         22,        1,   192000, 0x1fc89137
+0,         23,         23,        1,   192000, 0x8af63a74
+0,         24,         24,        1,   192000, 0xca015077
+0,         25,         25,        1,   192000, 0x761599ad
+0,         26,         26,        1,   192000, 0x1ca1570c
+0,         27,         27,        1,   192000, 0x1209a3ac
+0,         28,         28,        1,   192000, 0xf7d92d01
+0,         29,         29,        1,   192000, 0x970d6fea
+0,         30,         30,        1,   192000, 0x508ff8ac
+0,         31,         31,        1,   192000, 0xef0d4274
+0,         32,         32,        1,   192000, 0x0d50e0dd
+0,         33,         33,        1,   192000, 0xf638f782
+0,         34,         34,        1,   192000, 0x40e4314b
+0,         35,         35,        1,   192000, 0x0ce5318f
+0,         36,         36,        1,   192000, 0x14848fa9
+0,         37,         37,        1,   192000, 0x676f83e1
+0,         38,         38,        1,   192000, 0x5b98bea9
+0,         39,         39,        1,   192000, 0xf5cc709d
+0,         40,         40,        1,   192000, 0x719a0373
+0,         41,         41,        1,   192000, 0xba5a3e74
+0,         42,         42,        1,   192000, 0x34e10051
+0,         43,         43,        1,   192000, 0xb66dd42d
+0,         44,         44,        1,   192000, 0xfb58c833
+0,         45,         45,        1,   192000, 0xa28029a4
+0,         46,         46,        1,   192000, 0x28fa09b3
+0,         47,         47,        1,   192000, 0x676f0b08
+0,         48,         48,        1,   192000, 0x7af97965
+0,         49,         49,        1,   192000, 0x436f0f03
+0,         50,         50,        1,   192000, 0xbaca5814
+0,         51,         51,        1,   192000, 0xca97eb51
+0,         52,         52,        1,   192000, 0x1fc89137
+0,         53,         53,        1,   192000, 0x8af63a74
+0,         54,         54,        1,   192000, 0xca015077
+0,         55,         55,        1,   192000, 0x761599ad
+0,         56,         56,        1,   192000, 0x1ca1570c
+0,         57,         57,        1,   192000, 0x1209a3ac
+0,         58,         58,        1,   192000, 0xf7d92d01
+0,         59,         59,        1,   192000, 0x970d6fea
+0,         60,         60,        1,   192000, 0x508ff8ac
+0,         61,         61,        1,   192000, 0xef0d4274
+0,         62,         62,        1,   192000, 0x0d50e0dd
+0,         63,         63,        1,   192000, 0xf638f782
+0,         64,         64,        1,   192000, 0x40e4314b
+0,         65,         65,        1,   192000, 0x0ce5318f
+0,         66,         66,        1,   192000, 0x14848fa9
+0,         67,         67,        1,   192000, 0x676f83e1
+0,         68,         68,        1,   192000, 0x5b98bea9
+0,         69,         69,        1,   192000, 0xf5cc709d
+0,         70,         70,        1,   192000, 0x719a0373
+0,         71,         71,        1,   192000, 0xba5a3e74
+0,         72,         72,        1,   192000, 0x34e10051
+0,         73,         73,        1,   192000, 0xb66dd42d
+0,         74,         74,        1,   192000, 0xfb58c833
+0,         75,         75,        1,   192000, 0xa28029a4
+0,         76,         76,        1,   192000, 0x28fa09b3
+0,         77,         77,        1,   192000, 0x676f0b08
+0,         78,         78,        1,   192000, 0x7af97965
+0,         79,         79,        1,   192000, 0x436f0f03
+0,         80,         80,        1,   192000, 0xbaca5814
+0,         81,         81,        1,   192000, 0xca97eb51
+0,         82,         82,        1,   192000, 0x1fc89137
+0,         83,         83,        1,   192000, 0x8af63a74
+0,         84,         84,        1,   192000, 0xca015077
+0,         85,         85,        1,   192000, 0x761599ad
+0,         86,         86,        1,   192000, 0x1ca1570c
+0,         87,         87,        1,   192000, 0x1209a3ac
+0,         88,         88,        1,   192000, 0xf7d92d01
+0,         89,         89,        1,   192000, 0x970d6fea
+0,         90,         90,        1,   192000, 0x1ff28298
+0,         91,         91,        1,   192000, 0x1ff28298
+0,         92,         92,        1,   192000, 0x407d09ca
+0,         93,         93,        1,   192000, 0x407d09ca
+0,         94,         94,        1,   192000, 0xc743a475
+0,         95,         95,        1,   192000, 0xc743a475
+0,         96,         96,        1,   192000, 0x46bf9f7d
+0,         97,         97,        1,   192000, 0x46bf9f7d
+0,         98,         98,        1,   192000, 0x57ecb2c1
+0,         99,         99,        1,   192000, 0x57ecb2c1
+0,        100,        100,        1,   192000, 0x680fd3bf
+0,        101,        101,        1,   192000, 0x680fd3bf
+0,        102,        102,        1,   192000, 0x8772ca19
+0,        103,        103,        1,   192000, 0x8772ca19
+0,        104,        104,        1,   192000, 0x3cc29bbf
+0,        105,        105,        1,   192000, 0x3cc29bbf
+0,        106,        106,        1,   192000, 0xe745fb3c
+0,        107,        107,        1,   192000, 0xe745fb3c
+0,        108,        108,        1,   192000, 0xc5279397
+0,        109,        109,        1,   192000, 0xcc902b35
+0,        110,        110,        1,   192000, 0x50a7cf32
+0,        111,        111,        1,   192000, 0x23fd6f51
+0,        112,        112,        1,   192000, 0x14fe9c4d
+0,        113,        113,        1,   192000, 0x703249f9
+0,        114,        114,        1,   192000, 0x47b73bce
+0,        115,        115,        1,   192000, 0x13bce1c9
diff --git a/tests/ref/fate/flic-af12 b/tests/ref/fate/flic-af12
index 227f26a4fd..46833467bd 100644
--- a/tests/ref/fate/flic-af12
+++ b/tests/ref/fate/flic-af12
@@ -1,4 +1,8 @@
 #tb 0: 9/125
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   921600, 0x50a87396
 0,          1,          1,        1,   921600, 0xa6e65d9e
 0,          2,          2,        1,   921600, 0x05956f62
diff --git a/tests/ref/fate/flic-magiccarpet b/tests/ref/fate/flic-magiccarpet
index f0faf1dd41..b8d3fc2bd3 100644
--- a/tests/ref/fate/flic-magiccarpet
+++ b/tests/ref/fate/flic-magiccarpet
@@ -1,43 +1,47 @@
 #tb 0: 1/14
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
 0,          0,          0,        1,   192000, 0x00000000
-0,          1,          1,        1,   192000, 0x9c057d9c
-0,          2,          2,        1,   192000, 0xab1aacaf
-0,          3,          3,        1,   192000, 0x49a1dccd
-0,          4,          4,        1,   192000, 0xebb7e245
-0,          5,          5,        1,   192000, 0x6287759e
-0,          6,          6,        1,   192000, 0xbf007410
-0,          7,          7,        1,   192000, 0x6c72b247
-0,          8,          8,        1,   192000, 0x4c26a8c3
-0,          9,          9,        1,   192000, 0x99f06050
-0,         10,         10,        1,   192000, 0x663f2d23
-0,         11,         11,        1,   192000, 0x813c3a1f
-0,         12,         12,        1,   192000, 0x6d6cfbe7
-0,         13,         13,        1,   192000, 0x7b04163a
-0,         14,         14,        1,   192000, 0x6792e679
-0,         15,         15,        1,   192000, 0x939ac626
-0,         16,         16,        1,   192000, 0xc7a139c0
-0,         17,         17,        1,   192000, 0xcac7ef0c
-0,         18,         18,        1,   192000, 0xf4ec59e0
-0,         19,         19,        1,   192000, 0x56060f59
-0,         20,         20,        1,   192000, 0xf45ecb3b
-0,         21,         21,        1,   192000, 0xe7e634ff
-0,         22,         22,        1,   192000, 0x7ac04aa4
-0,         23,         23,        1,   192000, 0x4eaba5a1
-0,         24,         24,        1,   192000, 0x89b84e25
-0,         25,         25,        1,   192000, 0xc368ec1e
-0,         26,         26,        1,   192000, 0xeeafb59e
-0,         27,         27,        1,   192000, 0x0b630619
-0,         28,         28,        1,   192000, 0x59cb8954
-0,         29,         29,        1,   192000, 0x16b2875f
-0,         30,         30,        1,   192000, 0x524e32bd
-0,         31,         31,        1,   192000, 0x96000ba2
-0,         32,         32,        1,   192000, 0x18ec28af
-0,         33,         33,        1,   192000, 0x2609c56c
-0,         34,         34,        1,   192000, 0xff25bb5a
-0,         35,         35,        1,   192000, 0xb19a8819
-0,         36,         36,        1,   192000, 0xa5ff8727
-0,         37,         37,        1,   192000, 0xe83f6289
-0,         38,         38,        1,   192000, 0xc6cb4903
-0,         39,         39,        1,   192000, 0xa4d93eb5
-0,         40,         40,        1,   192000, 0xec84ef6c
+0,          1,          1,        1,   192000, 0x03567eeb
+0,          2,          2,        1,   192000, 0xe73db12c
+0,          3,          3,        1,   192000, 0x7cefe740
+0,          4,          4,        1,   192000, 0xb769f827
+0,          5,          5,        1,   192000, 0x71669dea
+0,          6,          6,        1,   192000, 0xc203b934
+0,          7,          7,        1,   192000, 0x30671ee2
+0,          8,          8,        1,   192000, 0xaea33a1b
+0,          9,          9,        1,   192000, 0x50f220c3
+0,         10,         10,        1,   192000, 0x1ddd090f
+0,         11,         11,        1,   192000, 0x17ac22a4
+0,         12,         12,        1,   192000, 0x19f9f412
+0,         13,         13,        1,   192000, 0xa2df0e55
+0,         14,         14,        1,   192000, 0x5abcd663
+0,         15,         15,        1,   192000, 0x5b09b38d
+0,         16,         16,        1,   192000, 0x894d1f43
+0,         17,         17,        1,   192000, 0xbc95caaf
+0,         18,         18,        1,   192000, 0xeaca27fc
+0,         19,         19,        1,   192000, 0x49c5ccb4
+0,         20,         20,        1,   192000, 0x8b3e78b0
+0,         21,         21,        1,   192000, 0x1645d3ae
+0,         22,         22,        1,   192000, 0x4407da0f
+0,         23,         23,        1,   192000, 0x7d0826ac
+0,         24,         24,        1,   192000, 0xc17ec1b8
+0,         25,         25,        1,   192000, 0x4a82520d
+0,         26,         26,        1,   192000, 0xa89f0e2f
+0,         27,         27,        1,   192000, 0xd58b537a
+0,         28,         28,        1,   192000, 0x7123dafe
+0,         29,         29,        1,   192000, 0x15d1d065
+0,         30,         30,        1,   192000, 0xa86873f6
+0,         31,         31,        1,   192000, 0x32704a91
+0,         32,         32,        1,   192000, 0xbf2b63d7
+0,         33,         33,        1,   192000, 0xb98e0126
+0,         34,         34,        1,   192000, 0x412a03ee
+0,         35,         35,        1,   192000, 0x601ad161
+0,         36,         36,        1,   192000, 0x01ead407
+0,         37,         37,        1,   192000, 0x75a7bbe5
+0,         38,         38,        1,   192000, 0x155ea759
+0,         39,         39,        1,   192000, 0xe3a0a6aa
+0,         40,         40,        1,   192000, 0x2b5a5770
 0,         41,         41,        1,   192000, 0x00000000
diff --git a/tests/ref/fate/flv-add_keyframe_index b/tests/ref/fate/flv-add_keyframe_index
new file mode 100644
index 0000000000..1c4da65d90
--- /dev/null
+++ b/tests/ref/fate/flv-add_keyframe_index
@@ -0,0 +1,12 @@
+;FFMETADATA1
+hasVideo=true
+hasKeyframes=true
+hasAudio=false
+hasMetadata=true
+canSeekToEnd=true
+datasize=629776
+videosize=629381
+audiosize=0
+lasttimestamp=20
+lastkeyframetimestamp=19
+lastkeyframelocation=597963
diff --git a/tests/ref/fate/flv-demux b/tests/ref/fate/flv-demux
new file mode 100644
index 0000000000..4a791754cb
--- /dev/null
+++ b/tests/ref/fate/flv-demux
@@ -0,0 +1,616 @@
+#extradata 0:       39, 0xf8aa0d44
+#extradata 1:        2, 0x00b600a3
+#tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: h264
+#dimensions 0: 426x240
+#sar 0: 1/1
+#tb 1: 1/1000
+#media_type 1: audio
+#codec_id 1: aac
+#sample_rate 1: 22050
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,          0,          0,       33,      135, 0x78b33078, S=1,       39, 0xf8aa0d44
+1,          0,          0,       46,        9, 0x07bc01b8, S=1,        2, 0x00b600a3
+0,         33,         33,       33,       92, 0x0d891dd0, F=0x0
+1,         46,         46,       46,        9, 0x07bc01b8
+0,         67,         67,       33,       14, 0x0f0f0310, F=0x0
+1,         93,         93,       46,        9, 0x08bc01d8
+0,        100,        100,       33,       14, 0x0f460317, F=0x0
+0,        133,        133,       33,      117, 0xb0db33b7, F=0x0
+1,        139,        139,       46,       89, 0x6d552ac1
+0,        167,        167,       33,       14, 0x0eb202ee, F=0x0
+1,        186,        186,       46,      155, 0x1a5a5037
+0,        200,        200,       33,       14, 0x0eea02f6, F=0x0
+1,        232,        232,       46,      281, 0xb40082f9
+0,        234,        234,       33,      117, 0xf3673453, F=0x0
+0,        267,        267,       33,       14, 0x0f790309, F=0x0
+1,        279,        279,       46,      548, 0x9b031e86
+0,        300,        300,       33,       14, 0x0fb10311, F=0x0
+1,        325,        325,       46,      472, 0xee3def63
+0,        334,        334,       33,      117, 0xff73346f, F=0x0
+0,        367,        367,       33,       14, 0x10410325, F=0x0
+1,        372,        372,       46,      489, 0xfa45f463
+0,        400,        400,       33,       14, 0x1079032d, F=0x0
+1,        418,        418,       46,      357, 0x7b01ae7d
+0,        434,        434,       33,      207, 0x19755ca1, F=0x0
+1,        464,        464,       46,      262, 0x19db8399
+0,        467,        467,       33,       14, 0x110a0342, F=0x0
+0,        501,        501,       33,       14, 0x1142034a, F=0x0
+1,        511,        511,       46,      294, 0x047897e0
+0,        534,        534,       33,      179, 0xedd45a40, F=0x0
+1,        557,        557,       46,      204, 0x719961d0
+0,        567,        567,       33,       14, 0x11d1035d, F=0x0
+0,        601,        601,       33,       14, 0x120a0366, F=0x0
+1,        604,        604,       46,      275, 0xca758590
+0,        634,        634,       33,       32, 0xcee90e8b, F=0x0
+1,        650,        650,       46,      309, 0x2e799850
+0,        667,        667,       33,       30, 0xc2d20eeb, F=0x0
+1,        697,        697,       46,      280, 0xdc2b8064
+0,        701,        701,       33,       16, 0x23150504, F=0x0
+0,        734,        734,       33,       33, 0xcccf0d2d, F=0x0
+1,        743,        743,       46,      106, 0xd4cf30df
+0,        767,        767,       33,       16, 0x2385050c, F=0x0
+1,        789,        789,       46,      133, 0xcd964165
+0,        801,        801,       33,       16, 0x23f50518, F=0x0
+0,        834,        834,       33,       22, 0x4ff5086a, F=0x0
+1,        836,        836,       46,      380, 0x4c6bbc27
+0,        868,        868,       33,       14, 0x14aa03c2, F=0x0
+1,        882,        882,       46,      378, 0x2b58b2d6
+0,        901,        901,       33,       14, 0x14e103c9, F=0x0
+1,        929,        929,       46,      108, 0x1998392e
+0,        934,        934,       33,       55, 0xb6ef1b85, F=0x0
+0,        968,        968,       33,       14, 0x153a03da, F=0x0
+1,        975,        975,       46,      279, 0x67a488cb
+0,       1001,       1001,       33,       14, 0x14bd035f, F=0x0
+1,       1022,       1022,       46,      134, 0x228c4193
+0,       1034,       1034,       33,       58, 0xe2911ae2, F=0x0
+0,       1068,       1068,       33,       39, 0x1cff1129, F=0x0
+1,       1068,       1068,       46,      162, 0x67ea49c7
+0,       1101,       1101,       33,       48, 0xaa11138a, F=0x0
+1,       1115,       1115,       46,       46, 0x40f91737
+0,       1134,       1134,       33,      319, 0x7be7a0d8, F=0x0
+1,       1161,       1161,       46,      150, 0x6be143fc
+0,       1168,       1168,       33,      204, 0x23f56562, F=0x0
+0,       1201,       1201,       33,      240, 0xd3d372e2, F=0x0
+1,       1207,       1207,       46,      427, 0xc078d716
+0,       1235,       1235,       33,      305, 0x34199655, F=0x0
+1,       1254,       1254,       46,      616, 0x5f013db0
+0,       1268,       1268,       33,      217, 0x31416760, F=0x0
+1,       1300,       1300,       46,      736, 0x16978a5f
+0,       1301,       1301,       33,      236, 0x150379fd, F=0x0
+0,       1335,       1335,       33,      222, 0xf71472b6, F=0x0
+1,       1347,       1347,       46,      708, 0x0d9f6e16
+0,       1368,       1368,       33,     1295, 0x2c78860b
+1,       1393,       1393,       46,      717, 0xa2737c00
+0,       1401,       1401,       33,      653, 0x9aaf3eeb, F=0x0
+0,       1435,       1435,       33,      335, 0x5c24a7f2, F=0x0
+1,       1440,       1440,       46,      730, 0x0fc07b4f
+0,       1468,       1468,       33,      765, 0xa7ee7d86, F=0x0
+1,       1486,       1486,       46,      756, 0xeb2d987b
+0,       1502,       1502,       33,      213, 0x67c6696e, F=0x0
+1,       1533,       1533,       46,      664, 0x1c684d9f
+0,       1535,       1535,       33,      464, 0x7043ec2c, F=0x0
+0,       1568,       1568,       33,      561, 0x0080105c, F=0x0
+1,       1579,       1579,       46,      751, 0xc1878274
+0,       1602,       1602,       33,      876, 0x14e3b309, F=0x0
+1,       1625,       1625,       46,      780, 0x72de91f8
+0,       1635,       1635,       33,      473, 0x3af6e71a, F=0x0
+0,       1668,       1668,       33,      272, 0x2f577eb7, F=0x0
+1,       1672,       1672,       46,      404, 0x7cadbec3
+0,       1702,       1702,       33,      281, 0xa8988539, F=0x0
+1,       1718,       1718,       46,      326, 0x15afa178
+0,       1735,       1735,       33,      315, 0xa3ed9945, F=0x0
+1,       1765,       1765,       46,       77, 0x3c7021fb
+0,       1768,       1768,       33,      653, 0x143d49a0, F=0x0
+0,       1802,       1802,       33,      228, 0x81036d0c, F=0x0
+1,       1811,       1811,       46,      132, 0xc1094091
+0,       1835,       1835,       33,      265, 0x5c2481af, F=0x0
+1,       1858,       1858,       46,      266, 0x16848764
+0,       1869,       1869,       33,      362, 0xe6a4b15f, F=0x0
+0,       1902,       1902,       33,      362, 0x7e75af89, F=0x0
+1,       1904,       1904,       46,      297, 0x4ab19f82
+0,       1935,       1935,       33,      297, 0xe07e8bd9, F=0x0
+1,       1950,       1950,       46,        9, 0x13c503df
+0,       1969,       1969,       33,      395, 0xa7f8ba2e, F=0x0
+1,       1997,       1997,       46,        9, 0x0abc0218
+0,       2002,       2002,       33,      149, 0xbc114287, F=0x0
+0,       2035,       2035,       33,      141, 0x644342c1, F=0x0
+1,       2043,       2043,       46,        9, 0x07bc01b8
+0,       2069,       2069,       33,      317, 0x59bb9bbb, F=0x0
+1,       2090,       2090,       46,        9, 0x07bc01b8
+0,       2102,       2102,       33,      170, 0x97464bff, F=0x0
+0,       2135,       2135,       33,      443, 0x4ff1e517, F=0x0
+1,       2136,       2136,       46,        9, 0x07bc01b8
+0,       2169,       2169,       33,      224, 0xc64e6a1b, F=0x0
+1,       2183,       2183,       46,        9, 0x07bc01b8
+0,       2202,       2202,       33,      472, 0xadd9e8af, F=0x0
+1,       2229,       2229,       46,        9, 0x07bc01b8
+0,       2236,       2236,       33,      188, 0xac6a570f, F=0x0
+0,       2269,       2269,       33,      302, 0xaff49847, F=0x0
+1,       2276,       2276,       46,        9, 0x07bc01b8
+0,       2302,       2302,       33,      125, 0x01bf3c0c, F=0x0
+1,       2322,       2322,       46,        9, 0x07bc01b8
+0,       2336,       2336,       33,      810, 0x5c048b9a, F=0x0
+1,       2368,       2368,       46,      304, 0x5c7a9945
+0,       2369,       2369,       33,      158, 0x53d450f5, F=0x0
+0,       2402,       2402,       33,      561, 0x65a7233a, F=0x0
+1,       2415,       2415,       46,      683, 0xff1f50c3
+0,       2436,       2436,       33,      383, 0xced8b27f, F=0x0
+1,       2461,       2461,       46,      681, 0xa9d462e5
+0,       2469,       2469,       33,      218, 0x10c86819, F=0x0
+0,       2503,       2503,       33,      270, 0x81a886fb, F=0x0
+1,       2508,       2508,       46,      663, 0xede65a46
+0,       2536,       2536,       33,      182, 0xfa7b5cba, F=0x0
+1,       2554,       2554,       46,      671, 0x7c3859ed
+0,       2569,       2569,       33,     1063, 0x3498fd03
+1,       2601,       2601,       46,      682, 0xdce263f2
+0,       2603,       2603,       33,     3687, 0x7b022d91, F=0x0
+0,       2636,       2636,       33,      280, 0x4de69154, F=0x0
+1,       2647,       2647,       46,      698, 0x78076903
+0,       2669,       2669,       33,      475, 0x426cdeaa, F=0x0
+1,       2694,       2694,       46,      697, 0xfac9612a
+0,       2703,       2703,       33,      488, 0x03dcf37e, F=0x0
+0,       2736,       2736,       33,      532, 0xb2c70c7b, F=0x0
+1,       2740,       2740,       46,      674, 0x3de15e5a
+0,       2769,       2769,       33,      590, 0x674d2283, F=0x0
+1,       2786,       2786,       46,      651, 0xa4c75606
+0,       2803,       2803,       33,      683, 0x38c54334, F=0x0
+1,       2833,       2833,       46,      672, 0xc8c34e54
+0,       2836,       2836,       33,      836, 0xabb49ab2, F=0x0
+0,       2870,       2870,       33,      676, 0x03124fc9, F=0x0
+1,       2879,       2879,       46,      665, 0x928f5897
+0,       2903,       2903,       33,      731, 0x98aa5ca4, F=0x0
+1,       2926,       2926,       46,      734, 0xf0e9626f
+0,       2936,       2936,       33,      839, 0xd4a69b32, F=0x0
+0,       2970,       2970,       33,      787, 0x86867c4f, F=0x0
+1,       2972,       2972,       46,      732, 0x6561709d
+0,       3003,       3003,       33,     1039, 0x071b0fa8, F=0x0
+1,       3019,       3019,       46,      742, 0x700d7d86
+0,       3036,       3036,       33,      851, 0x600fafab, F=0x0
+1,       3065,       3065,       46,      748, 0xfd026ad1
+0,       3070,       3070,       33,      928, 0x8ea9cb74, F=0x0
+0,       3103,       3103,       33,      840, 0x8b41a170, F=0x0
+1,       3111,       3111,       46,      671, 0xbfa75606
+0,       3136,       3136,       33,      889, 0x2dd8ae89, F=0x0
+1,       3158,       3158,       46,      645, 0x2b4c50bd
+0,       3170,       3170,       33,      789, 0x27af87cb, F=0x0
+0,       3203,       3203,       33,     1037, 0x6e71063c, F=0x0
+1,       3204,       3204,       46,      724, 0xaaa77c18
+0,       3237,       3237,       33,     1201, 0xbfbc5455, F=0x0
+1,       3251,       3251,       46,      757, 0xce638153
+0,       3270,       3270,       33,      934, 0x7be8d884, F=0x0
+1,       3297,       3297,       46,      710, 0x427b6cf9
+0,       3303,       3303,       33,     1028, 0xfa9af5d0, F=0x0
+0,       3337,       3337,       33,     1007, 0xb40b0013, F=0x0
+1,       3344,       3344,       46,      705, 0xdb9d5e6b
+0,       3370,       3370,       33,      944, 0xdba1d534, F=0x0
+1,       3390,       3390,       46,      693, 0x84b562bc
+0,       3403,       3403,       33,     1121, 0x18f61f5a, F=0x0
+0,       3437,       3437,       33,     1321, 0x28cb9aa8, F=0x0
+1,       3437,       3437,       46,      683, 0x0ba85781
+0,       3470,       3470,       33,     1229, 0x2d6f62ef, F=0x0
+1,       3483,       3483,       46,      668, 0x96454b35
+0,       3504,       3504,       33,     1166, 0xc3b141b9, F=0x0
+1,       3529,       3529,       46,      624, 0x89672d22
+0,       3537,       3537,       33,     1055, 0xc53e0e48, F=0x0
+0,       3570,       3570,       33,      947, 0x4faecfa6, F=0x0
+1,       3576,       3576,       46,      570, 0xe1da1fc2
+0,       3604,       3604,       33,     1117, 0xb8fa31d9, F=0x0
+1,       3622,       3622,       46,      579, 0xd091239c
+0,       3637,       3637,       33,     1397, 0xb228be1a, F=0x0
+1,       3669,       3669,       46,      558, 0xdb951ae5
+0,       3670,       3670,       33,     1097, 0x955227ea, F=0x0
+0,       3704,       3704,       33,     1207, 0x5ba850c0, F=0x0
+1,       3715,       3715,       46,      510, 0x33d5069a
+0,       3737,       3737,       33,     1109, 0x577d2fcd, F=0x0
+1,       3762,       3762,       46,      518, 0x21e4fc96
+0,       3770,       3770,       33,      994, 0xf3daf299, F=0x0
+0,       3804,       3804,       33,     1144, 0x3d574b78, F=0x0
+1,       3808,       3808,       46,      481, 0x7d7deda0
+0,       3837,       3837,       33,     1409, 0xf148c4bb, F=0x0
+1,       3855,       3855,       46,      443, 0xc9bbe042
+0,       3871,       3871,       33,     1205, 0xaada4f06, F=0x0
+1,       3901,       3901,       46,      413, 0xb428ca8a
+0,       3904,       3904,       33,     1159, 0x3bf83010, F=0x0
+0,       3937,       3937,       33,     1207, 0x2a6457c1, F=0x0
+1,       3947,       3947,       46,      398, 0x7369c402
+0,       3971,       3971,       33,     1084, 0x77271e1d, F=0x0
+1,       3994,       3994,       46,      377, 0x8e1db9a9
+0,       4004,       4004,       33,     1539, 0xb1a9fade, F=0x0
+0,       4037,       4037,       33,     1409, 0xdcf7b97d, F=0x0
+1,       4040,       4040,       46,      364, 0xa399a9c2
+0,       4071,       4071,       33,     1275, 0x993b7ef9, F=0x0
+1,       4087,       4087,       46,      374, 0x8a30ad84
+0,       4104,       4104,       33,     1317, 0xf2f29754, F=0x0
+1,       4133,       4133,       46,      355, 0x7ad6aaa1
+0,       4137,       4137,       33,     1146, 0xae633238, F=0x0
+0,       4171,       4171,       33,     1166, 0x89be313d, F=0x0
+1,       4180,       4180,       46,      341, 0x3e549a7b
+0,       4204,       4204,       33,     1272, 0x75e07674, F=0x0
+1,       4226,       4226,       46,      364, 0xb134a056
+0,       4238,       4238,       33,     1550, 0x6630039d, F=0x0
+0,       4271,       4271,       33,     1353, 0x51f6ad16, F=0x0
+1,       4272,       4272,       46,      350, 0x1f6a9ee2
+0,       4304,       4304,       33,     1251, 0x05046828, F=0x0
+1,       4319,       4319,       46,      356, 0x2aa5ad2c
+0,       4338,       4338,       33,     1339, 0x44e78a57, F=0x0
+1,       4365,       4365,       46,      365, 0x26e7a5eb
+0,       4371,       4371,       33,     1216, 0x2fb55067, F=0x0
+0,       4404,       4404,       33,     1222, 0xd051743c, F=0x0
+1,       4412,       4412,       46,      352, 0x89ffa564
+0,       4438,       4438,       33,     1665, 0x5a6a41dd, F=0x0
+1,       4458,       4458,       46,      374, 0x8333b502
+0,       4471,       4471,       33,     1372, 0x3abca4f1, F=0x0
+0,       4505,       4505,       33,     1611, 0x99ad11fe, F=0x0
+1,       4505,       4505,       46,      375, 0x22e4b95a
+0,       4538,       4538,       33,     7010, 0x7a699d02
+1,       4551,       4551,       46,      375, 0xfb95adce
+0,       4571,       4571,       33,      549, 0x0ae5102e, F=0x0
+1,       4598,       4598,       46,      376, 0xa910b02a
+0,       4605,       4605,       33,     1021, 0xe53aea67, F=0x0
+0,       4638,       4638,       33,     1281, 0x53808ad5, F=0x0
+1,       4644,       4644,       46,      372, 0x5d84a2e6
+0,       4671,       4671,       33,     1267, 0x2a3c6a6d, F=0x0
+1,       4690,       4690,       46,      371, 0x6849a7b1
+0,       4705,       4705,       33,     1140, 0xe2a436ad, F=0x0
+1,       4737,       4737,       46,      365, 0xb0eaa876
+0,       4738,       4738,       33,     1289, 0xa1227538, F=0x0
+0,       4771,       4771,       33,     1127, 0xe2ad2de9, F=0x0
+1,       4783,       4783,       46,      385, 0xbea3ba29
+0,       4805,       4805,       33,     1196, 0xa16f445e, F=0x0
+1,       4830,       4830,       46,      362, 0xd20da339
+0,       4838,       4838,       33,     1520, 0x4a72f136, F=0x0
+0,       4872,       4872,       33,     1370, 0xdd6e9bda, F=0x0
+1,       4876,       4876,       46,      370, 0xf774b39b
+0,       4905,       4905,       33,     1232, 0x928f6640, F=0x0
+1,       4923,       4923,       46,      369, 0x7381aca3
+0,       4938,       4938,       33,     1159, 0x9de43e90, F=0x0
+1,       4969,       4969,       46,      341, 0xbfd5ac4c
+0,       4972,       4972,       33,     1183, 0xc36251d9, F=0x0
+0,       5005,       5005,       33,     1469, 0xb2b1f147, F=0x0
+1,       5016,       5016,       46,      351, 0xd044a810
+0,       5038,       5038,       33,     1468, 0xb985dd18, F=0x0
+1,       5062,       5062,       46,      365, 0xdc80af91
+0,       5072,       5072,       33,     1355, 0xf58c9413, F=0x0
+0,       5105,       5105,       33,     1303, 0x14157d32, F=0x0
+1,       5108,       5108,       46,      358, 0xd6c8b0b0
+0,       5138,       5138,       33,     1316, 0x3fc89532, F=0x0
+1,       5155,       5155,       46,      373, 0xafa1ad7e
+0,       5172,       5172,       33,     1196, 0x869a529d, F=0x0
+1,       5201,       5201,       46,      367, 0x7361ad07
+0,       5205,       5205,       33,     1283, 0xd7717841, F=0x0
+0,       5239,       5239,       33,     1489, 0x13abed4a, F=0x0
+1,       5248,       5248,       46,      364, 0x2103ac58
+0,       5272,       5272,       33,     1507, 0xdbaee51a, F=0x0
+1,       5294,       5294,       46,      346, 0x01d59dbe
+0,       5305,       5305,       33,     1237, 0x81b8669f, F=0x0
+0,       5339,       5339,       33,     1217, 0x3f3f6661, F=0x0
+1,       5341,       5341,       46,      362, 0xe11fad7f
+0,       5372,       5372,       33,     1224, 0xe0e8653c, F=0x0
+1,       5387,       5387,       46,      360, 0x63b5a7a5
+0,       5405,       5405,       33,     1554, 0x88bf1cbc, F=0x0
+1,       5433,       5433,       46,      356, 0xce49acce
+0,       5439,       5439,       33,     1465, 0xf42ddd75, F=0x0
+0,       5472,       5472,       33,     1862, 0x423c930e, F=0x0
+1,       5480,       5480,       46,      364, 0x5e1eaebb
+0,       5506,       5506,       33,     1604, 0xb4e22b5d, F=0x0
+1,       5526,       5526,       46,      365, 0x3f92aad4
+0,       5539,       5539,       33,     1541, 0x1e52dd7b, F=0x0
+0,       5572,       5572,       33,     1534, 0x96adf8bb, F=0x0
+1,       5573,       5573,       46,      357, 0x8492abda
+0,       5606,       5606,       33,     1336, 0x0aaa91dd, F=0x0
+1,       5619,       5619,       46,      367, 0x5524aafb
+0,       5639,       5639,       33,     1761, 0xde4b6b31, F=0x0
+1,       5666,       5666,       46,      361, 0xfcc4b013
+0,       5672,       5672,       33,     1722, 0xa29a5aaf, F=0x0
+0,       5706,       5706,       33,     1442, 0xea0ce0a5, F=0x0
+1,       5712,       5712,       46,      367, 0x07d7a469
+0,       5739,       5739,       33,     1313, 0x28f889e1, F=0x0
+1,       5759,       5759,       46,      375, 0xd7d1b2cc
+0,       5772,       5772,       33,     1436, 0x5464d32b, F=0x0
+1,       5805,       5805,       46,      357, 0x3e05a67b
+0,       5806,       5806,       33,     1689, 0x812d4d33, F=0x0
+0,       5839,       5839,       33,     1472, 0x63f8cee6, F=0x0
+1,       5851,       5851,       46,      379, 0x968bad9d
+0,       5873,       5873,       33,     1730, 0xae13704c, F=0x0
+1,       5898,       5898,       46,      361, 0xa40aac26
+0,       5906,       5906,       33,     1555, 0xfe7011be, F=0x0
+0,       5939,       5939,       33,     1486, 0x6dccd60b, F=0x0
+1,       5944,       5944,       46,      350, 0x4261a2a7
+0,       5973,       5973,       33,     1311, 0x4a64822b, F=0x0
+1,       5991,       5991,       46,      339, 0x030da15f
+0,       6006,       6006,       33,     1700, 0x42583def, F=0x0
+1,       6037,       6037,       46,      336, 0x2bb699db
+0,       6039,       6039,       33,     1647, 0x97a53e7d, F=0x0
+0,       6073,       6073,       33,     1663, 0x72363852, F=0x0
+1,       6084,       6084,       46,      331, 0xc3b19edc
+0,       6106,       6106,       33,     1512, 0xda11e80a, F=0x0
+1,       6130,       6130,       46,      335, 0xda6e9891
+0,       6139,       6139,       33,     1370, 0x2618a927, F=0x0
+0,       6173,       6173,       33,     1440, 0xadd7baf0, F=0x0
+1,       6177,       6177,       46,      323, 0xdcd9943f
+0,       6206,       6206,       33,     1574, 0xa2e305e8, F=0x0
+1,       6223,       6223,       46,      333, 0x34f69630
+0,       6240,       6240,       33,     1328, 0x53baa035, F=0x0
+1,       6269,       6269,       46,      335, 0x2ed79dab
+0,       6273,       6273,       33,     1802, 0xc91782aa, F=0x0
+0,       6306,       6306,       33,     1619, 0x443c3ae6, F=0x0
+1,       6316,       6316,       46,      334, 0x2b0e9704
+0,       6340,       6340,       33,     1471, 0xe3a8defc, F=0x0
+1,       6362,       6362,       46,      342, 0xf47f9c97
+0,       6373,       6373,       33,     1226, 0xfd2f5b3b, F=0x0
+0,       6406,       6406,       33,     1485, 0xed8be011, F=0x0
+1,       6409,       6409,       46,      358, 0xd6a6aad9
+0,       6440,       6440,       33,     1786, 0xf98572ee, F=0x0
+1,       6455,       6455,       46,      360, 0xbf5ea460
+0,       6473,       6473,       33,     1345, 0xc7d39a6a, F=0x0
+1,       6502,       6502,       46,      357, 0xe5bba75c
+0,       6507,       6507,       33,     8275, 0x7a7115f7
+0,       6540,       6540,       33,      698, 0x45955de0, F=0x0
+1,       6548,       6548,       46,      336, 0x9da89baf
+0,       6573,       6573,       33,     1298, 0x382a8e39, F=0x0
+1,       6594,       6594,       46,      343, 0x0f749ed3
+0,       6607,       6607,       33,     1454, 0xb6e4c8c1, F=0x0
+0,       6640,       6640,       33,     1352, 0x39738c55, F=0x0
+1,       6641,       6641,       46,      324, 0x63989376
+0,       6673,       6673,       33,     1609, 0xaf601cb7, F=0x0
+1,       6687,       6687,       46,      322, 0x5c429514
+0,       6707,       6707,       33,     1476, 0xc020de0c, F=0x0
+1,       6734,       6734,       46,      328, 0xad669039
+0,       6740,       6740,       33,     1391, 0xd45baf0c, F=0x0
+0,       6773,       6773,       33,     1203, 0x22855ed0, F=0x0
+1,       6780,       6780,       46,      332, 0x21fb9787
+0,       6807,       6807,       33,     1489, 0x1ce4e3d6, F=0x0
+1,       6827,       6827,       46,      343, 0x663c9d7a
+0,       6840,       6840,       33,     1655, 0x0f5c30f1, F=0x0
+1,       6873,       6873,       46,      343, 0xea86a902
+0,       6874,       6874,       33,     1363, 0x97b7ad8e, F=0x0
+0,       6907,       6907,       33,     1492, 0x177eed5d, F=0x0
+1,       6920,       6920,       46,      327, 0xc3659486
+0,       6940,       6940,       33,     1397, 0xff57bf4b, F=0x0
+1,       6966,       6966,       46,      326, 0x3245a088
+0,       6974,       6974,       33,     1251, 0x1bcd7221, F=0x0
+0,       7007,       7007,       33,     1586, 0xe8d102ac, F=0x0
+1,       7012,       7012,       46,      324, 0x3f9a8f1d
+0,       7040,       7040,       33,     1333, 0x2bf0a1da, F=0x0
+1,       7059,       7059,       46,      312, 0xbc969286
+0,       7074,       7074,       33,     2723, 0x576f3ace, F=0x0
+1,       7105,       7105,       46,      308, 0xbc0a8c96
+0,       7107,       7107,       33,      632, 0xe9253efd, F=0x0
+0,       7140,       7140,       33,      444, 0x701ed924, F=0x0
+1,       7152,       7152,       46,      308, 0xfda38345
+0,       7174,       7174,       33,     1013, 0xd27f0123, F=0x0
+1,       7198,       7198,       46,      318, 0x469893ad
+0,       7207,       7207,       33,     1357, 0x46979205, F=0x0
+0,       7241,       7241,       33,     1586, 0x3e9824f8, F=0x0
+1,       7245,       7245,       46,      331, 0x2d629ee2
+0,       7274,       7274,       33,     2514, 0x4329eb3d, F=0x0
+1,       7291,       7291,       46,      329, 0x6361948e
+0,       7307,       7307,       33,      450, 0xa710e3d3, F=0x0
+1,       7338,       7338,       46,      333, 0x6e169a21
+0,       7341,       7341,       33,      423, 0xb239c6cf, F=0x0
+0,       7374,       7374,       33,     1161, 0x2e813244, F=0x0
+1,       7384,       7384,       46,      314, 0x37e78615
+0,       7407,       7407,       33,     1366, 0xc85eab74, F=0x0
+1,       7430,       7430,       46,      304, 0x580d9236
+0,       7441,       7441,       33,     1325, 0x53938a95, F=0x0
+0,       7474,       7474,       33,     2687, 0x40383547, F=0x0
+1,       7477,       7477,       46,      299, 0x3e41899a
+0,       7508,       7508,       33,      678, 0x0c56575d, F=0x0
+1,       7523,       7523,       46,      311, 0xf62f881b
+0,       7541,       7541,       33,      491, 0xdafef05e, F=0x0
+1,       7570,       7570,       46,      323, 0x68a09353
+0,       7574,       7574,       33,     1056, 0x3e5616fc, F=0x0
+0,       7608,       7608,       33,     1549, 0x5dcb04c7, F=0x0
+1,       7616,       7616,       46,      317, 0xf9f88de8
+0,       7641,       7641,       33,     2502, 0x1c21dd6b, F=0x0
+1,       7663,       7663,       46,      322, 0x204a970f
+0,       7674,       7674,       33,      539, 0xef1d0e8d, F=0x0
+0,       7708,       7708,       33,      594, 0x15f324d6, F=0x0
+1,       7709,       7709,       46,      329, 0x1c4c9ee8
+0,       7741,       7741,       33,     1254, 0xe49078cb, F=0x0
+1,       7755,       7755,       46,      342, 0xc825aa35
+0,       7774,       7774,       33,     1341, 0xfb789386, F=0x0
+1,       7802,       7802,       46,      331, 0x6d1c9c33
+0,       7808,       7808,       33,     1358, 0x5a7194ad, F=0x0
+0,       7841,       7841,       33,     2336, 0x538f8a16, F=0x0
+1,       7848,       7848,       46,      343, 0x577ca504
+0,       7875,       7875,       33,      339, 0x9935a5f9, F=0x0
+1,       7895,       7895,       46,      327, 0xafb79bfe
+0,       7908,       7908,       33,     2159, 0x20654dbc, F=0x0
+0,       7941,       7941,       33,      390, 0xe6c8bd90, F=0x0
+1,       7941,       7941,       46,      317, 0x773e8778
+0,       7975,       7975,       33,      479, 0xefbaf020, F=0x0
+1,       7988,       7988,       46,      313, 0x357d93ad
+0,       8008,       8008,       33,     2157, 0x5cc5398b, F=0x0
+1,       8034,       8034,       46,      312, 0xaa978945
+0,       8041,       8041,       33,      429, 0x5dbecb52, F=0x0
+0,       8075,       8075,       33,     1953, 0xdb55d429, F=0x0
+1,       8081,       8081,       46,      318, 0x7a0d8c19
+0,       8108,       8108,       33,      379, 0x1d62ba4e, F=0x0
+1,       8127,       8127,       46,      325, 0x577a9868
+0,       8141,       8141,       33,     1817, 0x44fa8996, F=0x0
+1,       8173,       8173,       46,      317, 0x8ef994a7
+0,       8175,       8175,       33,      372, 0x023db80e, F=0x0
+0,       8208,       8208,       33,     1664, 0xd2d14b3f, F=0x0
+1,       8220,       8220,       46,      308, 0x0fbd8e91
+0,       8242,       8242,       33,      340, 0xc537aa42, F=0x0
+1,       8266,       8266,       46,      309, 0x31c28f1d
+0,       8275,       8275,       33,     1955, 0x76f8cdb3, F=0x0
+0,       8308,       8308,       33,      485, 0x5b05f1d6, F=0x0
+1,       8313,       8313,       46,      315, 0xc27f8cbb
+0,       8342,       8342,       33,     1705, 0x18385a59, F=0x0
+1,       8359,       8359,       46,      340, 0x21b3a33f
+0,       8375,       8375,       33,      411, 0x70d7cae5, F=0x0
+1,       8406,       8406,       46,      326, 0xc4fd90f3
+0,       8408,       8408,       33,     1818, 0x9d6381eb, F=0x0
+0,       8442,       8442,       33,      304, 0x7825921f, F=0x0
+1,       8452,       8452,       46,      333, 0xe874961c
+0,       8475,       8475,       33,     6302, 0x016c66ef
+1,       8499,       8499,       46,      340, 0x342c9ce8
+0,       8509,       8509,       33,     1498, 0x42b4ef91, F=0x0
+0,       8542,       8542,       33,      434, 0xa285db46, F=0x0
+1,       8545,       8545,       46,      338, 0x204b9c1d
+0,       8575,       8575,       33,     1643, 0xe0d322b1, F=0x0
+1,       8591,       8591,       46,      357, 0xa4b09fab
+0,       8609,       8609,       33,      213, 0xfc1b64b4, F=0x0
+1,       8638,       8638,       46,      340, 0x7bfa9f7d
+0,       8642,       8642,       33,     1820, 0x612577a5, F=0x0
+0,       8675,       8675,       33,      264, 0x1b3b7d63, F=0x0
+1,       8684,       8684,       46,      335, 0x965e9ca0
+0,       8709,       8709,       33,     1461, 0x6392d1d0, F=0x0
+1,       8731,       8731,       46,      322, 0x278791b7
+0,       8742,       8742,       33,      239, 0x34206e81, F=0x0
+0,       8775,       8775,       33,     1581, 0xa53714ca, F=0x0
+1,       8777,       8777,       46,      318, 0xac96910c
+0,       8809,       8809,       33,      212, 0x356e6502, F=0x0
+1,       8824,       8824,       46,      326, 0xdb2897c6
+0,       8842,       8842,       33,     1351, 0x42f5bb96, F=0x0
+1,       8870,       8870,       46,      341, 0x6e00a7ba
+0,       8876,       8876,       33,      448, 0x82afd887, F=0x0
+0,       8909,       8909,       33,     1403, 0x461cc0fa, F=0x0
+1,       8916,       8916,       46,      319, 0xfe8d8f11
+0,       8942,       8942,       33,      491, 0xcc36f0ac, F=0x0
+1,       8963,       8963,       46,      303, 0xa81c8418
+0,       8976,       8976,       33,     1606, 0xe6572381, F=0x0
+0,       9009,       9009,       33,      304, 0x17d49e7b, F=0x0
+1,       9009,       9009,       46,      291, 0x931a88a8
+0,       9042,       9042,       33,     1537, 0x2506027c, F=0x0
+1,       9056,       9056,       46,      307, 0xd06c8de9
+0,       9076,       9076,       33,      342, 0x27c1a7d7, F=0x0
+1,       9102,       9102,       46,      335, 0xc4449e94
+0,       9109,       9109,       33,     1405, 0x2fbbcb89, F=0x0
+0,       9142,       9142,       33,      351, 0x5529b047, F=0x0
+1,       9149,       9149,       46,      348, 0xb347a000
+0,       9176,       9176,       33,     1451, 0x9455d96b, F=0x0
+1,       9195,       9195,       46,      346, 0xb36ea5a2
+0,       9209,       9209,       33,      490, 0xda00f1ab, F=0x0
+1,       9242,       9242,       46,      333, 0xfec69e56
+0,       9243,       9243,       33,     1524, 0x7752edff, F=0x0
+0,       9276,       9276,       33,      556, 0xea4f0e24, F=0x0
+1,       9288,       9288,       46,      338, 0x24a694c0
+0,       9309,       9309,       33,     1414, 0x780ecb26, F=0x0
+1,       9334,       9334,       46,      328, 0xbf0498ea
+0,       9343,       9343,       33,      808, 0xe60b85d4, F=0x0
+0,       9376,       9376,       33,      871, 0xc49ab01a, F=0x0
+1,       9381,       9381,       46,      334, 0x725b97da
+0,       9409,       9409,       33,      562, 0x5bf11537, F=0x0
+1,       9427,       9427,       46,      364, 0x44089f50
+0,       9443,       9443,       33,      711, 0x41db5a9a, F=0x0
+1,       9474,       9474,       46,      350, 0xedeb9e1d
+0,       9476,       9476,       33,     1209, 0x977c4e31, F=0x0
+0,       9510,       9510,       33,      483, 0xd883e689, F=0x0
+1,       9520,       9520,       46,      348, 0x5dd39c4a
+0,       9543,       9543,       33,      422, 0xf7e3d366, F=0x0
+1,       9567,       9567,       46,      354, 0x202d9eff
+0,       9576,       9576,       33,      533, 0x7da70555, F=0x0
+0,       9610,       9610,       33,      490, 0xb209e261, F=0x0
+1,       9613,       9613,       46,      358, 0xdd3ea998
+0,       9643,       9643,       33,      972, 0x0cf2e4b0, F=0x0
+1,       9660,       9660,       46,      361, 0xa7b6a4c6
+0,       9676,       9676,       33,      370, 0x75bfafd5, F=0x0
+1,       9706,       9706,       46,      354, 0xa20aa059
+0,       9710,       9710,       33,      348, 0xf094a48a, F=0x0
+0,       9743,       9743,       33,      449, 0xa08de29e, F=0x0
+1,       9752,       9752,       46,      369, 0x81c9af74
+0,       9776,       9776,       33,      447, 0x9392d7bf, F=0x0
+1,       9799,       9799,       46,      359, 0xbbd4b06e
+0,       9810,       9810,       33,      414, 0xcc62c97e, F=0x0
+0,       9843,       9843,       33,      467, 0x37a5e9e0, F=0x0
+1,       9845,       9845,       46,      348, 0x1f2ba0bb
+0,       9877,       9877,       33,      890, 0x107fb1a3, F=0x0
+1,       9892,       9892,       46,      346, 0x0ad5a08c
+0,       9910,       9910,       33,      387, 0x876ec0ab, F=0x0
+1,       9938,       9938,       46,      350, 0x9802a830
+0,       9943,       9943,       33,      351, 0x2ed7a355, F=0x0
+0,       9977,       9977,       33,      720, 0x153d6916, F=0x0
+1,       9985,       9985,       46,      359, 0xce55a942
+0,      10010,      10010,       33,      855, 0xc2f4a51e, F=0x0
+1,      10031,      10031,       46,      355, 0xa31ca014
+0,      10043,      10043,       33,      742, 0xc13b6868, F=0x0
+0,      10077,      10077,       33,      835, 0x5c80a1fd, F=0x0
+1,      10077,      10077,       46,      320, 0xb71b8f6a
+0,      10110,      10110,       33,     1610, 0xba612dab, F=0x0
+1,      10124,      10124,       46,      348, 0x221b9e6d
+0,      10143,      10143,       33,      637, 0xc25a3725, F=0x0
+1,      10170,      10170,       46,      370, 0xe989a4ed
+0,      10177,      10177,       33,      614, 0xb7922aa2, F=0x0
+0,      10210,      10210,       33,     1143, 0x576a3cac, F=0x0
+1,      10217,      10217,       46,      353, 0x3e11a44b
+0,      10244,      10244,       33,     1262, 0xa7f475fb, F=0x0
+1,      10263,      10263,       46,      367, 0x9644abd4
+0,      10277,      10277,       33,     1618, 0x36443ddd, F=0x0
+0,      10310,      10310,       33,     2345, 0x25ad71dc, F=0x0
+1,      10310,      10310,       46,      350, 0xa088a836
+0,      10344,      10344,       33,     1029, 0x597303d7, F=0x0
+1,      10356,      10356,       46,      353, 0x7d9fa7d0
+0,      10377,      10377,       33,      932, 0x064bcca7, F=0x0
+1,      10403,      10403,       46,      336, 0x397398a2
+0,      10410,      10410,       33,     1688, 0x5ed257c1, F=0x0
+0,      10444,      10444,       33,     4159, 0x897c3370
+1,      10449,      10449,       46,      334, 0xa321a038
+0,      10477,      10477,       33,     2039, 0x930cfb12, F=0x0
+1,      10495,      10495,       46,      358, 0x61e2a2c5
+0,      10511,      10511,       33,      614, 0x1edc250b, F=0x0
+1,      10542,      10542,       46,      344, 0xa7189dd0
+0,      10544,      10544,       33,     1749, 0x79655b63, F=0x0
+0,      10577,      10577,       33,     2609, 0x834f110a, F=0x0
+1,      10588,      10588,       46,      344, 0x85739a8f
+0,      10611,      10611,       33,      689, 0x47c85a40, F=0x0
+1,      10635,      10635,       46,      356, 0x54b4a63b
+0,      10644,      10644,       33,     2259, 0xfbef6b65, F=0x0
+0,      10677,      10677,       33,     2494, 0x3f5fc8d0, F=0x0
+1,      10681,      10681,       46,      354, 0x1528aa5c
+0,      10711,      10711,       33,     2457, 0xc427c17e, F=0x0
+1,      10728,      10728,       46,      330, 0xe44f959b
+0,      10744,      10744,       33,     2476, 0x8bbbd064, F=0x0
+1,      10774,      10774,       46,      328, 0x0b70968c
+0,      10777,      10777,       33,     2560, 0x0b04f7d7, F=0x0
+0,      10811,      10811,       33,     2679, 0x02d74002, F=0x0
+1,      10820,      10820,       46,      351, 0xcef29fe7
+0,      10844,      10844,       33,     2795, 0x6a166090, F=0x0
+1,      10867,      10867,       46,      364, 0xe542aed9
+0,      10878,      10878,       33,     2927, 0xfdb899de, F=0x0
+0,      10911,      10911,       33,     2437, 0x5ac9ba9b, F=0x0
+1,      10913,      10913,       46,      365, 0x3697a967
+0,      10944,      10944,       33,     2663, 0xa4412f2e, F=0x0
+1,      10960,      10960,       46,      341, 0xe1a59f5c
+0,      10978,      10978,       33,     2688, 0x48db425f, F=0x0
+1,      11006,      11006,       46,      330, 0x96fb8da1
+0,      11011,      11011,       33,     2727, 0x12db4729, F=0x0
+0,      11044,      11044,       33,     2747, 0xc3945324, F=0x0
+1,      11053,      11053,       46,      358, 0x89eca01e
+0,      11078,      11078,       33,     3602, 0x32bd0c05, F=0x0
+1,      11099,      11099,       46,      367, 0x77f2b3d3
+0,      11111,      11111,       33,     1334, 0x1cdfa159, F=0x0
+0,      11144,      11144,       33,     2562, 0x4985e43f, F=0x0
+1,      11146,      11146,       46,      353, 0x73499f01
+0,      11178,      11178,       33,     2917, 0x7b999fc2, F=0x0
+1,      11192,      11192,       46,      336, 0xb8b9a2a0
+0,      11211,      11211,       33,     2788, 0x94a75a97, F=0x0
+1,      11238,      11238,       46,      329, 0xb80a8e3f
+0,      11245,      11245,       33,     2876, 0x4da3a1e2, F=0x0
+0,      11278,      11278,       33,     2782, 0x0018739c, F=0x0
+1,      11285,      11285,       46,      323, 0x36929c3b
+0,      11311,      11311,       33,     2393, 0xd5d6b66d, F=0x0
+1,      11331,      11331,       46,      328, 0xc22b9604
+0,      11345,      11345,       33,     2773, 0x969452e3, F=0x0
+0,      11378,      11378,       33,     2972, 0xcf93d2ca, F=0x0
+1,      11378,      11378,       46,      345, 0x76eda9c7
+0,      11411,      11411,       33,     3480, 0x7000d659, F=0x0
+1,      11424,      11424,       46,      345, 0xd34da6bb
+0,      11445,      11445,       33,     1078, 0xd89b1b88, F=0x0
+1,      11471,      11471,       46,      349, 0xa7a1a1a9
+0,      11478,      11478,       33,     3385, 0xb57695e3, F=0x0
+0,      11512,      11512,       33,     1408, 0xe155b5f3, F=0x0
+1,      11517,      11517,       46,      340, 0x5ae5942f
+0,      11545,      11545,       33,     2543, 0x77d5eee5, F=0x0
+1,      11564,      11564,       46,      352, 0xf105a26a
+0,      11578,      11578,       33,     3609, 0x3a02f82d, F=0x0
+1,      11610,      11610,       46,      345, 0xf6a29dda
+0,      11612,      11612,       33,     1078, 0x501d1c72, F=0x0
+0,      11645,      11645,       33,     2600, 0xdf370d24, F=0x0
+1,      11656,      11656,       46,      346, 0x8899a188
+0,      11678,      11678,       33,     1190, 0xdc1e4c99, F=0x0
diff --git a/tests/ref/fate/fmvc-type1 b/tests/ref/fate/fmvc-type1
index 821866da7d..d59de047e7 100644
--- a/tests/ref/fate/fmvc-type1
+++ b/tests/ref/fate/fmvc-type1
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 664x382
+#sar 0: 0/1
 0,          0,          0,        1,   760944, 0x2feb1453
 0,          1,          1,        1,   760944, 0x9677ebf8
 0,          2,          2,        1,   760944, 0x83d2ed49
diff --git a/tests/ref/fate/fmvc-type2 b/tests/ref/fate/fmvc-type2
index 32a307ea4f..60c630803a 100644
--- a/tests/ref/fate/fmvc-type2
+++ b/tests/ref/fate/fmvc-type2
@@ -1,4 +1,8 @@
 #tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 768x576
+#sar 0: 0/1
 0,          0,          0,        1,  1327104, 0xa73c232d
 0,          1,          1,        1,  1327104, 0xa73c232d
 0,          2,          2,        1,  1327104, 0xa73c232d
diff --git a/tests/ref/fate/force_key_frames b/tests/ref/fate/force_key_frames
new file mode 100644
index 0000000000..26de0905e8
--- /dev/null
+++ b/tests/ref/fate/force_key_frames
@@ -0,0 +1,4 @@
+07567b9528b8de523faaf49e4e1e0fc6 *tests/data/fate/force_key_frames.avi
+113312 tests/data/fate/force_key_frames.avi
+b2e92b97bac0243242281d71108ffdbd *tests/data/fate/force_key_frames.out.framecrc
+stddev:34612.83 PSNR:  5.54 MAXDIFF:61408 bytes:  7603200/      264
diff --git a/tests/ref/fate/fraps-v0 b/tests/ref/fate/fraps-v0
index 3cba8312b7..97ada1317e 100644
--- a/tests/ref/fate/fraps-v0
+++ b/tests/ref/fate/fraps-v0
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 312x216
+#sar 0: 0/1
 0,          0,          0,        1,   101088, 0x7bf448f8
 0,          1,          1,        1,   101088, 0x1ba749ec
 0,          2,          2,        1,   101088, 0x94eb4dc4
diff --git a/tests/ref/fate/fraps-v1 b/tests/ref/fate/fraps-v1
index 29c7e37df3..36fb7d8d4d 100644
--- a/tests/ref/fate/fraps-v1
+++ b/tests/ref/fate/fraps-v1
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   230400, 0x23c29d17
diff --git a/tests/ref/fate/fraps-v2 b/tests/ref/fate/fraps-v2
index 1ebfb7c281..3d85333823 100644
--- a/tests/ref/fate/fraps-v2
+++ b/tests/ref/fate/fraps-v2
@@ -1,11 +1,7 @@
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1024x768
+#sar 0: 0/1
 0,          0,          0,        1,  1179648, 0x99f80436
-0,          1,          1,        1,  1179648, 0x99f80436
-0,          2,          2,        1,  1179648, 0x99f80436
-0,          3,          3,        1,  1179648, 0x99f80436
-0,          4,          4,        1,  1179648, 0x99f80436
 0,          5,          5,        1,  1179648, 0xe8ae7a30
-0,          6,          6,        1,  1179648, 0xe8ae7a30
-0,          7,          7,        1,  1179648, 0xe8ae7a30
-0,          8,          8,        1,  1179648, 0xe8ae7a30
-0,          9,          9,        1,  1179648, 0xe8ae7a30
diff --git a/tests/ref/fate/fraps-v3 b/tests/ref/fate/fraps-v3
index ac8b701767..93286d17ca 100644
--- a/tests/ref/fate/fraps-v3
+++ b/tests/ref/fate/fraps-v3
@@ -1,10 +1,12 @@
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x384
+#sar 0: 0/1
 0,          0,          0,        1,   589824, 0x0b181bbf
 0,          1,          1,        1,   589824, 0xcd740f79
 0,          2,          2,        1,   589824, 0x16f8f90e
 0,          3,          3,        1,   589824, 0x1aaaceba
-0,          4,          4,        1,   589824, 0x1aaaceba
 0,          5,          5,        1,   589824, 0x902e8fe4
 0,          6,          6,        1,   589824, 0x019a4443
-0,          7,          7,        1,   589824, 0x019a4443
 0,          8,          8,        1,   589824, 0x04eff6c6
diff --git a/tests/ref/fate/fraps-v4 b/tests/ref/fate/fraps-v4
index 007916dc9d..c97f29b46a 100644
--- a/tests/ref/fate/fraps-v4
+++ b/tests/ref/fate/fraps-v4
@@ -1,4 +1,8 @@
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x512
+#sar 0: 0/1
 0,          0,          0,        1,   491520, 0x68ff12c0
 0,          1,          1,        1,   491520, 0x22d36f0d
 0,          2,          2,        1,   491520, 0xce6f877d
diff --git a/tests/ref/fate/fraps-v5 b/tests/ref/fate/fraps-v5
index 599683a8a3..c0628e9ac4 100644
--- a/tests/ref/fate/fraps-v5
+++ b/tests/ref/fate/fraps-v5
@@ -1,4 +1,8 @@
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 288x168
+#sar 0: 0/1
 0,          0,          0,        1,   145152, 0x8458d4cb
 0,          1,          1,        1,   145152, 0xa694d7c7
 0,          2,          2,        1,   145152, 0x2bd4bfc9
diff --git a/tests/ref/fate/frwu b/tests/ref/fate/frwu
index 32eaa6f029..918ef6c448 100644
--- a/tests/ref/fate/frwu
+++ b/tests/ref/fate/frwu
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
 0,          0,          0,        1,   153600, 0x050422c0
 0,          1,          1,        1,   153600, 0x0cf35359
 0,          2,          2,        1,   153600, 0x2ae95db0
diff --git a/tests/ref/fate/g2m2 b/tests/ref/fate/g2m2
index 710dbd145f..42b7b6f2e1 100644
--- a/tests/ref/fate/g2m2
+++ b/tests/ref/fate/g2m2
@@ -1,4 +1,8 @@
 #tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1024x768
+#sar 0: 0/1
 0,         47,         47,        0,  2359296, 0xb4434e4f
 0,         62,         62,        0,  2359296, 0x59cb5027
 0,         78,         78,        0,  2359296, 0xe9bc578d
diff --git a/tests/ref/fate/g2m3 b/tests/ref/fate/g2m3
index 5a6ff648f6..b665d567b5 100644
--- a/tests/ref/fate/g2m3
+++ b/tests/ref/fate/g2m3
@@ -1,21 +1,25 @@
-#tb 0: 1/1000
-0,          0,          0,        0,  3824640, 0x9a253d29
-0,        499,        499,        0,  3824640, 0xcb232b06
-0,        624,        624,        0,  3824640, 0xb03c288c
-0,        625,        625,        0,  3824640, 0x260b284e
-0,        626,        626,        0,  3824640, 0x6f391ceb
-0,        627,        627,        0,  3824640, 0x03252465
-0,        628,        628,        0,  3824640, 0x5a392138
-0,        749,        749,        0,  3824640, 0x53ed2f30
-0,        750,        750,        0,  3824640, 0x00af334d
-0,        751,        751,        0,  3824640, 0x2e8b29fb
-0,        752,        752,        0,  3824640, 0x700a3870
-0,        753,        753,        0,  3824640, 0x5a873a09
-0,        754,        754,        0,  3824640, 0x9cd62d80
-0,        874,        874,        0,  3824640, 0x35ba3ef7
-0,        875,        875,        0,  3824640, 0x05c24e9a
-0,        876,        876,        0,  3824640, 0x47b35e8b
-0,        877,        877,        0,  3824640, 0x8d806478
-0,        878,        878,        0,  3824640, 0x16b4643f
-0,        879,        879,        0,  3824640, 0x6c556423
-0,        880,        880,        0,  3824640, 0x3c126423
+#tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x996
+#sar 0: 0/1
+0,          0,          0,        1,  3824640, 0x9a253d29
+0,         12,         12,        1,  3824640, 0xcb232b06
+0,         15,         15,        1,  3824640, 0xb03c288c
+0,         16,         16,        1,  3824640, 0x260b284e
+0,         18,         18,        1,  3824640, 0x53ed2f30
+0,         19,         19,        1,  3824640, 0x00af334d
+0,         21,         21,        1,  3824640, 0x35ba3ef7
+0,         22,         22,        1,  3824640, 0x05c24e9a
+0,         24,         24,        1,  3824640, 0x03846423
+0,         25,         25,        1,  3824640, 0x0bcf6423
+0,         30,         30,        1,  3824640, 0x96446423
+0,         33,         33,        1,  3824640, 0x9e8f6423
+0,         34,         34,        1,  3824640, 0x22bc6423
+0,         36,         36,        1,  3824640, 0x714a6423
+0,         37,         37,        1,  3824640, 0x060d6423
+0,         39,         39,        1,  3824640, 0x5bf96423
+0,         40,         40,        1,  3824640, 0xb3476423
+0,        123,        123,        1,  3824640, 0xbf056423
+0,        124,        124,        1,  3824640, 0x30746423
+0,        126,        126,        1,  3824640, 0xea6f6423
diff --git a/tests/ref/fate/g2m4 b/tests/ref/fate/g2m4
index c2e8f61b7d..d5ecaebbbd 100644
--- a/tests/ref/fate/g2m4
+++ b/tests/ref/fate/g2m4
@@ -1,29 +1,30 @@
-#tb 0: 1/1000
-0,          0,          0,        0,  3932160, 0x109148ee
-0,         29,         29,        0,  3932160, 0xa87b7bff
-0,        129,        129,        0,  3932160, 0x00e14d16
-0,        239,        239,        0,  3932160, 0xbf8d7871
-0,        240,        240,        0,  3932160, 0x998ded98
-0,        339,        339,        0,  3932160, 0x9fcfeaaa
-0,        439,        439,        0,  3932160, 0xe0d1328f
-0,        440,        440,        0,  3932160, 0xde7e69a0
-0,        539,        539,        0,  3932160, 0xdbec5d90
-0,        540,        540,        0,  3932160, 0x5355cde3
-0,        649,        649,        0,  3932160, 0x4b3c6b11
-0,        739,        739,        0,  3932160, 0xcf5692b1
-0,        740,        740,        0,  3932160, 0x19d8366f
-0,        949,        949,        0,  3932160, 0xf80f3663
-0,       1439,       1439,        0,  3932160, 0xe2dc1cc7
-0,       3049,       3049,        0,  3932160, 0x3ae51cc7
-0,       3050,       3050,        0,  3932160, 0x10ecd14c
-0,       3149,       3149,        0,  3932160, 0xda0f1d1f
-0,       3150,       3150,        0,  3932160, 0x50bd3602
-0,       3449,       3449,        0,  3932160, 0xad2083ba
-0,       3450,       3450,        0,  3932160, 0xa5b388bd
-0,       3549,       3549,        0,  3932160, 0x37ae6d4f
-0,       3550,       3550,        0,  3932160, 0x436ee825
-0,       3749,       3749,        0,  3932160, 0x6c2ec178
-0,       3849,       3849,        0,  3932160, 0x6c3f389b
-0,       3850,       3850,        0,  3932160, 0x3c0421c1
-0,       3949,       3949,        0,  3932160, 0x861b0449
-0,       4049,       4049,        0,  3932160, 0x41640723
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x1024
+#sar 0: 0/1
+0,          0,          0,        1,  3932160, 0x109148ee
+0,          1,          1,        1,  3932160, 0xa87b7bff
+0,          2,          2,        1,  3932160, 0x00e14d16
+0,          3,          3,        1,  3932160, 0xbf8d7871
+0,          4,          4,        1,  3932160, 0x998ded98
+0,          5,          5,        1,  3932160, 0xe0d1328f
+0,          6,          6,        1,  3932160, 0xde7e69a0
+0,          7,          7,        1,  3932160, 0x5355cde3
+0,          8,          8,        1,  3932160, 0x4b3c6b11
+0,          9,          9,        1,  3932160, 0x19d8366f
+0,         10,         10,        1,  3932160, 0xf80f3663
+0,         14,         14,        1,  3932160, 0xe2dc1cc7
+0,         30,         30,        1,  3932160, 0x3ae51cc7
+0,         31,         31,        1,  3932160, 0x10ecd14c
+0,         32,         32,        1,  3932160, 0xda0f1d1f
+0,         33,         33,        1,  3932160, 0x50bd3602
+0,         34,         34,        1,  3932160, 0xad2083ba
+0,         35,         35,        1,  3932160, 0xa5b388bd
+0,         36,         36,        1,  3932160, 0x37ae6d4f
+0,         37,         37,        1,  3932160, 0x436ee825
+0,         38,         38,        1,  3932160, 0x6c2ec178
+0,         39,         39,        1,  3932160, 0x6c3f389b
+0,         40,         40,        1,  3932160, 0x3c0421c1
+0,         41,         41,        1,  3932160, 0x861b0449
+0,         42,         42,        1,  3932160, 0x41640723
diff --git a/tests/ref/fate/g722-encode b/tests/ref/fate/g722-encode
index c7198cf83c..d84d62701c 100644
--- a/tests/ref/fate/g722-encode
+++ b/tests/ref/fate/g722-encode
@@ -1 +1,22 @@
-MD5=7106189574186051c0497b287e2e5f19
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/16000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 16000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     8192,    16384, 1dd9c285eb608038f3257d1a8e02eb75
+0,       8192,       8192,     8192,    16384, f7459334cbe70c06bc0897edfe64e840
+0,      16384,      16384,     8192,    16384, 486e7d07c8879ccd304689ad61911e5d
+0,      24576,      24576,     8192,    16384, 5178262fdeff11dc025c72a2678e420d
+0,      32768,      32768,     8192,    16384, 913f8208615dcd643edafda7db1eb943
+0,      40960,      40960,     8192,    16384, 0b8dc719670feac586db87bf3a92cc2a
+0,      49152,      49152,     8192,    16384, 075dc5022f5e9f1cb2fcd066e590fed1
+0,      57344,      57344,     8192,    16384, a6494307ecb1359ff42d6e05cf40ca4c
+0,      65536,      65536,     8192,    16384, 5b28d3b0d6d2bfe7100daeefcb3010ec
+0,      73728,      73728,     8192,    16384, b3cf1952b8a0d2e6a2741867e9fa8e24
+0,      81920,      81920,     8192,    16384, f0981f8fa28bbc0ba6a527b041468951
+0,      90112,      90112,     5888,    11776, 1e3d1b3d0da71aa2cdc00175cc47433a
diff --git a/tests/ref/fate/g722dec-1 b/tests/ref/fate/g722dec-1
index e94c3e6a11..a97fc81fb0 100644
--- a/tests/ref/fate/g722dec-1
+++ b/tests/ref/fate/g722dec-1
@@ -1,4 +1,9 @@
 #tb 0: 1/16000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 16000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,     2048,     4096, 0x4f9228b3
 0,       2048,       2048,     2048,     4096, 0xfab58157
 0,       4096,       4096,     2048,     4096, 0x0b641c78
diff --git a/tests/ref/fate/g723_1-dec-1 b/tests/ref/fate/g723_1-dec-1
index a3a7f67b44..f7daad1b49 100644
--- a/tests/ref/fate/g723_1-dec-1
+++ b/tests/ref/fate/g723_1-dec-1
@@ -1,3 +1,8 @@
 #tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0x7f6f3970
 0,        240,        240,      240,      480, 0x1105a0d3
diff --git a/tests/ref/fate/g723_1-dec-2 b/tests/ref/fate/g723_1-dec-2
index e7fc9b2059..a403e565d0 100644
--- a/tests/ref/fate/g723_1-dec-2
+++ b/tests/ref/fate/g723_1-dec-2
@@ -1,4 +1,9 @@
 #tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0x5d9d9091
 0,        240,        240,      240,      480, 0x425095b7
 0,        480,        480,      240,      480, 0xe7b6a1a7
diff --git a/tests/ref/fate/g723_1-dec-3 b/tests/ref/fate/g723_1-dec-3
index d1a29464e9..e3d3978138 100644
--- a/tests/ref/fate/g723_1-dec-3
+++ b/tests/ref/fate/g723_1-dec-3
@@ -1,4 +1,9 @@
 #tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0xce908869
 0,        240,        240,      240,      480, 0xfa63588e
 0,        480,        480,      240,      480, 0x11ce850c
diff --git a/tests/ref/fate/g723_1-dec-4 b/tests/ref/fate/g723_1-dec-4
index 792899d38c..309b3afea5 100644
--- a/tests/ref/fate/g723_1-dec-4
+++ b/tests/ref/fate/g723_1-dec-4
@@ -1,4 +1,9 @@
 #tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0xa697b314
 0,        240,        240,      240,      480, 0x43c5dc5a
 0,        480,        480,      240,      480, 0xd2438147
diff --git a/tests/ref/fate/g723_1-dec-5 b/tests/ref/fate/g723_1-dec-5
index bdc2982740..9e37c861a2 100644
--- a/tests/ref/fate/g723_1-dec-5
+++ b/tests/ref/fate/g723_1-dec-5
@@ -1,4 +1,9 @@
 #tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0x4dce9773
 0,        240,        240,      240,      480, 0xe6367ab8
 0,        480,        480,      240,      480, 0xf36a589d
diff --git a/tests/ref/fate/g723_1-dec-6 b/tests/ref/fate/g723_1-dec-6
index eb0e4fa12c..a51e8df9c8 100644
--- a/tests/ref/fate/g723_1-dec-6
+++ b/tests/ref/fate/g723_1-dec-6
@@ -1,4 +1,9 @@
 #tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0x4fa1aed9
 0,        240,        240,      240,      480, 0x6d7ef391
 0,        480,        480,      240,      480, 0xaecaf2c1
diff --git a/tests/ref/fate/g723_1-dec-7 b/tests/ref/fate/g723_1-dec-7
index cc301873cb..db0ceb85ef 100644
--- a/tests/ref/fate/g723_1-dec-7
+++ b/tests/ref/fate/g723_1-dec-7
@@ -1,4 +1,9 @@
 #tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0x35e4a1fd
 0,        240,        240,      240,      480, 0x2f7bdd60
 0,        480,        480,      240,      480, 0x0407e499
diff --git a/tests/ref/fate/g723_1-dec-8 b/tests/ref/fate/g723_1-dec-8
index fc4d9f3977..740ed2b4c7 100644
--- a/tests/ref/fate/g723_1-dec-8
+++ b/tests/ref/fate/g723_1-dec-8
@@ -1,4 +1,9 @@
 #tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      240,      480, 0x17930e0f
 0,        240,        240,      240,      480, 0x7c7f4247
 0,        480,        480,      240,      480, 0xbf3489e5
diff --git a/tests/ref/fate/g726-encode-2bit b/tests/ref/fate/g726-encode-2bit
index 26a12190fc..4a83c95760 100644
--- a/tests/ref/fate/g726-encode-2bit
+++ b/tests/ref/fate/g726-encode-2bit
@@ -1 +1,13 @@
-MD5=215eaef5778a16e2bf4f3725a557f355
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,    16384,    32768, b28b116d2315323aeba6b66b58b7f4ed
+0,      16384,      16384,    16384,    32768, e9cfbebe99490bd4987341ee748291c4
+0,      32768,      32768,    15232,    30464, f890e7f29bc76ca6c214fac0cedd7a49
diff --git a/tests/ref/fate/g726-encode-3bit b/tests/ref/fate/g726-encode-3bit
index f9c6940217..c551ae608f 100644
--- a/tests/ref/fate/g726-encode-3bit
+++ b/tests/ref/fate/g726-encode-3bit
@@ -1 +1,15 @@
-MD5=0bebd949dfd5ac0ae3f2c3ceb2e3fac1
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,    10920,    21840, 517dd6d1ce566b998251f0d215fa69c0
+0,      10920,      10920,    10920,    21840, b0268e2bcc67acb524753790123c65fd
+0,      21840,      21840,    10920,    21840, a072a222a4910642f12e127b95a4d640
+0,      32760,      32760,    10920,    21840, 83bcd3c91cc3b57afdab0cb79a83d7b7
+0,      43680,      43680,     4320,     8640, 0125e504113997ac7bcc027616edad55
diff --git a/tests/ref/fate/g726-encode-4bit b/tests/ref/fate/g726-encode-4bit
index 6d03517164..ea277e12c5 100644
--- a/tests/ref/fate/g726-encode-4bit
+++ b/tests/ref/fate/g726-encode-4bit
@@ -1 +1,16 @@
-MD5=a21cfea116ab2179eabe5d84b6bfc09a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     8192,    16384, a0cf3a0953adce1a1032a4fd2da00a52
+0,       8192,       8192,     8192,    16384, c750c1b76a203556dd60d73d261529e9
+0,      16384,      16384,     8192,    16384, 4c116836487c05f259168f63883d6496
+0,      24576,      24576,     8192,    16384, 3e4f96c06d4c33c97829f962a5b4b443
+0,      32768,      32768,     8192,    16384, 55d73226120bcd01e4c0ea22a360e2ef
+0,      40960,      40960,     7040,    14080, de8f12a49e673ce923c2512b36e0ce8f
diff --git a/tests/ref/fate/g726-encode-5bit b/tests/ref/fate/g726-encode-5bit
index 459ebb39f2..30c456e864 100644
--- a/tests/ref/fate/g726-encode-5bit
+++ b/tests/ref/fate/g726-encode-5bit
@@ -1 +1,18 @@
-MD5=9cad98cf5205bf76d6e9d1241e56141a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,     6552,    13104, 6fe3f75df1262c5f956887de9c32df40
+0,       6552,       6552,     6552,    13104, f955518de6f61f94253280d11d64d68b
+0,      13104,      13104,     6552,    13104, a3f2db5d35e0d923787b71aa352466de
+0,      19656,      19656,     6552,    13104, 90c41dc1338579e2e19edb811f8d58a9
+0,      26208,      26208,     6552,    13104, 4fbcd13f77e8cc0e61a7c9010e42adf1
+0,      32760,      32760,     6552,    13104, 82ef661e2afc2a1d6996005f17c1618c
+0,      39312,      39312,     6552,    13104, 1f5e9875ddcf88063e4adf910a8f0fa6
+0,      45864,      45864,     2136,     4272, 9a1cdf7ec6b06762047cdb1320d9d32e
diff --git a/tests/ref/fate/g729-0 b/tests/ref/fate/g729-0
new file mode 100644
index 0000000000..36c6634fab
--- /dev/null
+++ b/tests/ref/fate/g729-0
@@ -0,0 +1,1000 @@
+0, 0, 160, 0xbb6d5aa0
+0, 900, 160, 0x91563d8d
+0, 1800, 160, 0x10a7535b
+0, 2700, 160, 0xa4f35594
+0, 3600, 160, 0x7f8e54e0
+0, 4500, 160, 0x85275000
+0, 5400, 160, 0x00734c7b
+0, 6300, 160, 0x8a2d544d
+0, 7200, 160, 0x97dc533c
+0, 8100, 160, 0xa7064ec4
+0, 9000, 160, 0xb7984a3c
+0, 9900, 160, 0x28334db6
+0, 10800, 160, 0x5838521f
+0, 11700, 160, 0x2337502c
+0, 12600, 160, 0x4a1e4599
+0, 13500, 160, 0x0d3858a8
+0, 14400, 160, 0xa0974b46
+0, 15300, 160, 0xc3254b93
+0, 16200, 160, 0x42b75231
+0, 17100, 160, 0x93634662
+0, 18000, 160, 0x11674fa1
+0, 18900, 160, 0xf2da5414
+0, 19800, 160, 0x97754dbc
+0, 20700, 160, 0x40a24d94
+0, 21600, 160, 0x26b34ebf
+0, 22500, 160, 0x7730542f
+0, 23400, 160, 0xb45254aa
+0, 24300, 160, 0xd8d752c3
+0, 25200, 160, 0x655c4a81
+0, 26100, 160, 0xa5da4f35
+0, 27000, 160, 0xd43551a1
+0, 27900, 160, 0x72a74e7d
+0, 28800, 160, 0xdb2150b3
+0, 29700, 160, 0x972852a1
+0, 30600, 160, 0xbae14c07
+0, 31500, 160, 0x23b54d57
+0, 32400, 160, 0x2d9650a5
+0, 33300, 160, 0xaf755107
+0, 34200, 160, 0xdb054f0e
+0, 35100, 160, 0x9f084cc0
+0, 36000, 160, 0x64ca5760
+0, 36900, 160, 0x3ea24be2
+0, 37800, 160, 0x93ea503b
+0, 38700, 160, 0xb6694afa
+0, 39600, 160, 0xf94c52e7
+0, 40500, 160, 0x2b7156b8
+0, 41400, 160, 0xbbdf414c
+0, 42300, 160, 0x10cd4ac8
+0, 43200, 160, 0x39885453
+0, 44100, 160, 0xa1505568
+0, 45000, 160, 0x86124ec1
+0, 45900, 160, 0xe2ab5489
+0, 46800, 160, 0x406254bc
+0, 47700, 160, 0x09044629
+0, 48600, 160, 0xb2ed5702
+0, 49500, 160, 0xd9ee5188
+0, 50400, 160, 0x59f7592a
+0, 51300, 160, 0x8f144c08
+0, 52200, 160, 0x90394e61
+0, 53100, 160, 0x79524df7
+0, 54000, 160, 0x58044674
+0, 54900, 160, 0x73b24d90
+0, 55800, 160, 0x80e257a1
+0, 56700, 160, 0xe8ff4caf
+0, 57600, 160, 0x1db84e3e
+0, 58500, 160, 0xd7db59d9
+0, 59400, 160, 0x43244c15
+0, 60300, 160, 0x1f63558f
+0, 61200, 160, 0xf0d851c6
+0, 62100, 160, 0x76484f3a
+0, 63000, 160, 0x5746551e
+0, 63900, 160, 0x83b54cd7
+0, 64800, 160, 0x97f550a1
+0, 65700, 160, 0x77c45340
+0, 66600, 160, 0xfd7b520a
+0, 67500, 160, 0x989a4e13
+0, 68400, 160, 0x9a8551c0
+0, 69300, 160, 0xa0cb4f93
+0, 70200, 160, 0xc568536f
+0, 71100, 160, 0x6fa74a95
+0, 72000, 160, 0xd550568b
+0, 72900, 160, 0xf88f4de5
+0, 73800, 160, 0x91285517
+0, 74700, 160, 0xdb675270
+0, 75600, 160, 0x606c53f9
+0, 76500, 160, 0x43f64601
+0, 77400, 160, 0x28b94b45
+0, 78300, 160, 0x7f2347f5
+0, 79200, 160, 0x84ba55db
+0, 80100, 160, 0x3ca3477c
+0, 81000, 160, 0x57d158ba
+0, 81900, 160, 0x2c3c506d
+0, 82800, 160, 0x59b34e5f
+0, 83700, 160, 0x014f530a
+0, 84600, 160, 0x877f4f76
+0, 85500, 160, 0x97a65c5f
+0, 86400, 160, 0xf643516d
+0, 87300, 160, 0x6ccc5242
+0, 88200, 160, 0x895450bd
+0, 89100, 160, 0xe246570e
+0, 90000, 160, 0xbb9f4a0c
+0, 90900, 160, 0x60e646fe
+0, 91800, 160, 0x546f515b
+0, 92700, 160, 0xc59254f0
+0, 93600, 160, 0xcad6551f
+0, 94500, 160, 0x14e14fac
+0, 95400, 160, 0x3cf94c52
+0, 96300, 160, 0x99b14f45
+0, 97200, 160, 0xfdb14dc7
+0, 98100, 160, 0x48f359e7
+0, 99000, 160, 0x186153e3
+0, 99900, 160, 0x047d4a78
+0, 100800, 160, 0x992f462b
+0, 101700, 160, 0x4a0e504d
+0, 102600, 160, 0x1f245275
+0, 103500, 160, 0x026959a9
+0, 104400, 160, 0x648846e7
+0, 105300, 160, 0xcac94cb3
+0, 106200, 160, 0x55e551a4
+0, 107100, 160, 0x767a5315
+0, 108000, 160, 0xbfde4d2b
+0, 108900, 160, 0x29bf4613
+0, 109800, 160, 0x8a8d5394
+0, 110700, 160, 0x36f94dae
+0, 111600, 160, 0x4cbf50ba
+0, 112500, 160, 0x9af44d8b
+0, 113400, 160, 0x6e8a519e
+0, 114300, 160, 0x496348b7
+0, 115200, 160, 0x95324eb2
+0, 116100, 160, 0x5bfe5118
+0, 117000, 160, 0xa1ff4c88
+0, 117900, 160, 0x86c2500a
+0, 118800, 160, 0xc53353c5
+0, 119700, 160, 0x062f52ee
+0, 120600, 160, 0x11cf522d
+0, 121500, 160, 0x054f5855
+0, 122400, 160, 0x8c4e44e9
+0, 123300, 160, 0x4d514fda
+0, 124200, 160, 0x5726568e
+0, 125100, 160, 0x281859ad
+0, 126000, 160, 0x3f3344f8
+0, 126900, 160, 0x2cbb3ee5
+0, 127800, 160, 0xa075551c
+0, 128700, 160, 0xafb25528
+0, 129600, 160, 0x9221478a
+0, 130500, 160, 0x6cb15634
+0, 131400, 160, 0xb5cf4523
+0, 132300, 160, 0x8a7a4f2c
+0, 133200, 160, 0x278e553d
+0, 134100, 160, 0x49054ad3
+0, 135000, 160, 0x5d7449bb
+0, 135900, 160, 0x67c346a0
+0, 136800, 160, 0x5d915bf8
+0, 137700, 160, 0x671355b2
+0, 138600, 160, 0xdfa84ee6
+0, 139500, 160, 0x4c3552d0
+0, 140400, 160, 0x63a1483c
+0, 141300, 160, 0x14c151ba
+0, 142200, 160, 0xf7434d78
+0, 143100, 160, 0x1c3652c9
+0, 144000, 160, 0x035b51da
+0, 144900, 160, 0x2bf6496b
+0, 145800, 160, 0x50a14f14
+0, 146700, 160, 0x518948f8
+0, 147600, 160, 0x7e784331
+0, 148500, 160, 0x73384dce
+0, 149400, 160, 0x11015066
+0, 150300, 160, 0xacc5525c
+0, 151200, 160, 0xf75a5431
+0, 152100, 160, 0xa78e4b8a
+0, 153000, 160, 0xd07955b0
+0, 153900, 160, 0x63164a03
+0, 154800, 160, 0x952f519e
+0, 155700, 160, 0xe5764f77
+0, 156600, 160, 0xa9255738
+0, 157500, 160, 0x65d64ce5
+0, 158400, 160, 0x8ab7507c
+0, 159300, 160, 0xf5265251
+0, 160200, 160, 0xa6a84d74
+0, 161100, 160, 0xc2594fee
+0, 162000, 160, 0xdfae5056
+0, 162900, 160, 0xa5a74c11
+0, 163800, 160, 0x5fdf4a21
+0, 164700, 160, 0x11014f8d
+0, 165600, 160, 0x08d0553f
+0, 166500, 160, 0x3036520e
+0, 167400, 160, 0xee3a464e
+0, 168300, 160, 0xbfd94949
+0, 169200, 160, 0x21625176
+0, 170100, 160, 0x6c714e8d
+0, 171000, 160, 0x055a4c05
+0, 171900, 160, 0xc7f35347
+0, 172800, 160, 0x82344b60
+0, 173700, 160, 0x99854ce4
+0, 174600, 160, 0x95504ec3
+0, 175500, 160, 0xe245502a
+0, 176400, 160, 0xb0e14a4c
+0, 177300, 160, 0x09835b86
+0, 178200, 160, 0xe9495220
+0, 179100, 160, 0xce9b514f
+0, 180000, 160, 0xbaf85695
+0, 180900, 160, 0x69aa3f1d
+0, 181800, 160, 0xd6a551b8
+0, 182700, 160, 0x4eb956e6
+0, 183600, 160, 0xdd6d4e58
+0, 184500, 160, 0xba1f4814
+0, 185400, 160, 0x4a604f48
+0, 186300, 160, 0xa8995890
+0, 187200, 160, 0x3a80616b
+0, 188100, 160, 0xfb796013
+0, 189000, 160, 0x8eba5c12
+0, 189900, 160, 0xd37859b9
+0, 190800, 160, 0x19a857c8
+0, 191700, 160, 0xec0e5a16
+0, 192600, 160, 0xd5335159
+0, 193500, 160, 0x560f4de7
+0, 194400, 160, 0x06d354c8
+0, 195300, 160, 0xdade5860
+0, 196200, 160, 0x093a512c
+0, 197100, 160, 0xb37b5098
+0, 198000, 160, 0x3eea537c
+0, 198900, 160, 0xf5c94f06
+0, 199800, 160, 0x552c4bb2
+0, 200700, 160, 0xea9a5a79
+0, 201600, 160, 0xd2645494
+0, 202500, 160, 0x5ba958ea
+0, 203400, 160, 0x54b559cf
+0, 204300, 160, 0x86bf5bba
+0, 205200, 160, 0xb89b6149
+0, 206100, 160, 0x1e825314
+0, 207000, 160, 0xf0d250cc
+0, 207900, 160, 0xc7ad53ba
+0, 208800, 160, 0x320c552f
+0, 209700, 160, 0xc62756f7
+0, 210600, 160, 0xa41351f7
+0, 211500, 160, 0x27ed4e78
+0, 212400, 160, 0x8d6047bc
+0, 213300, 160, 0xa45c48d0
+0, 214200, 160, 0x14da5400
+0, 215100, 160, 0x48514dd2
+0, 216000, 160, 0xec395318
+0, 216900, 160, 0xf3c85e4a
+0, 217800, 160, 0x657a63ed
+0, 218700, 160, 0xcc975c4d
+0, 219600, 160, 0x86125dd4
+0, 220500, 160, 0x6a3f6019
+0, 221400, 160, 0x84c05aeb
+0, 222300, 160, 0xe68561f7
+0, 223200, 160, 0x7ec763ae
+0, 224100, 160, 0x91bd5792
+0, 225000, 160, 0xb9365c8e
+0, 225900, 160, 0x42d7587a
+0, 226800, 160, 0x80a45453
+0, 227700, 160, 0x9ecf50c2
+0, 228600, 160, 0xc8de5173
+0, 229500, 160, 0x776952f7
+0, 230400, 160, 0x45f856c0
+0, 231300, 160, 0x729c4d73
+0, 232200, 160, 0xfd364a18
+0, 233100, 160, 0x709e587d
+0, 234000, 160, 0x288240e5
+0, 234900, 160, 0x16a6493f
+0, 235800, 160, 0x76db596f
+0, 236700, 160, 0x16c24a51
+0, 237600, 160, 0xc55b5a8f
+0, 238500, 160, 0x19024a2e
+0, 239400, 160, 0x16514d1b
+0, 240300, 160, 0x48bb5b82
+0, 241200, 160, 0x5a6e4d80
+0, 242100, 160, 0x6d404b0f
+0, 243000, 160, 0x57bc4e4a
+0, 243900, 160, 0xc10c5381
+0, 244800, 160, 0x34bd51d9
+0, 245700, 160, 0x5dcf52b7
+0, 246600, 160, 0xf61f57a7
+0, 247500, 160, 0x4e204934
+0, 248400, 160, 0xe18b4a3f
+0, 249300, 160, 0xb81256e3
+0, 250200, 160, 0x294047b2
+0, 251100, 160, 0x3ad559df
+0, 252000, 160, 0xd28d4d86
+0, 252900, 160, 0x67b75895
+0, 253800, 160, 0x191357b0
+0, 254700, 160, 0x8016556f
+0, 255600, 160, 0x62475c86
+0, 256500, 160, 0x0c975bc9
+0, 257400, 160, 0x901c5909
+0, 258300, 160, 0x9909567d
+0, 259200, 160, 0xce715b99
+0, 260100, 160, 0xae5062b1
+0, 261000, 160, 0x5bd056d6
+0, 261900, 160, 0xe3d3555a
+0, 262800, 160, 0xc4b1555c
+0, 263700, 160, 0x39c95649
+0, 264600, 160, 0x50145d11
+0, 265500, 160, 0xc0ba5307
+0, 266400, 160, 0x182455a3
+0, 267300, 160, 0x36c24e98
+0, 268200, 160, 0x1b5b52d0
+0, 269100, 160, 0xd38352d1
+0, 270000, 160, 0x6a1d5d2a
+0, 270900, 160, 0x50f05c44
+0, 271800, 160, 0xb2365dc1
+0, 272700, 160, 0x10825934
+0, 273600, 160, 0xcb4c61c2
+0, 274500, 160, 0x578252ab
+0, 275400, 160, 0xed99596c
+0, 276300, 160, 0xdfec6305
+0, 277200, 160, 0x97e2550a
+0, 278100, 160, 0xd60a56e1
+0, 279000, 160, 0xb6c4535e
+0, 279900, 160, 0x4d2e536c
+0, 280800, 160, 0xdef85cc7
+0, 281700, 160, 0xee985a98
+0, 282600, 160, 0x006a4cdb
+0, 283500, 160, 0xd06652ad
+0, 284400, 160, 0xeeee4ed6
+0, 285300, 160, 0xcb8b586d
+0, 286200, 160, 0x2ee4556e
+0, 287100, 160, 0x6d924c01
+0, 288000, 160, 0x7ff257cc
+0, 288900, 160, 0x67df5710
+0, 289800, 160, 0x0f704f29
+0, 290700, 160, 0x19dc53a7
+0, 291600, 160, 0xfbf44bc0
+0, 292500, 160, 0x640b5718
+0, 293400, 160, 0x2bfd4b91
+0, 294300, 160, 0xaae049bf
+0, 295200, 160, 0xca3154f6
+0, 296100, 160, 0x36064f2c
+0, 297000, 160, 0x28404919
+0, 297900, 160, 0x9c944fe3
+0, 298800, 160, 0xb4214c82
+0, 299700, 160, 0x442c514d
+0, 300600, 160, 0x44434ea5
+0, 301500, 160, 0x82a05aae
+0, 302400, 160, 0x4b86510d
+0, 303300, 160, 0x46844eab
+0, 304200, 160, 0xe5455deb
+0, 305100, 160, 0x60826550
+0, 306000, 160, 0x3c5a5448
+0, 306900, 160, 0x2db860c9
+0, 307800, 160, 0x4d845b78
+0, 308700, 160, 0x81dc5e23
+0, 309600, 160, 0x78c95932
+0, 310500, 160, 0xb5be57cd
+0, 311400, 160, 0x6fa45c65
+0, 312300, 160, 0x4e085e2a
+0, 313200, 160, 0x50ee530c
+0, 314100, 160, 0x2bb85587
+0, 315000, 160, 0x6d58614e
+0, 315900, 160, 0xcf4c5d69
+0, 316800, 160, 0x3cbf5ffb
+0, 317700, 160, 0x452157d3
+0, 318600, 160, 0x3cb55cd8
+0, 319500, 160, 0x2bba5735
+0, 320400, 160, 0x36a45670
+0, 321300, 160, 0x23b85b8a
+0, 322200, 160, 0x9a255457
+0, 323100, 160, 0x4e6956f3
+0, 324000, 160, 0xa0714edc
+0, 324900, 160, 0x7dee4a3d
+0, 325800, 160, 0x86404bc9
+0, 326700, 160, 0x358c50cd
+0, 327600, 160, 0x9eda47e8
+0, 328500, 160, 0x3cfe522e
+0, 329400, 160, 0xddb95758
+0, 330300, 160, 0x1a434a83
+0, 331200, 160, 0xa8a450bb
+0, 332100, 160, 0x44e7530e
+0, 333000, 160, 0x59b5555a
+0, 333900, 160, 0x65404db1
+0, 334800, 160, 0xcac15945
+0, 335700, 160, 0x38864f17
+0, 336600, 160, 0x61114f30
+0, 337500, 160, 0x195542d8
+0, 338400, 160, 0xacbb4c69
+0, 339300, 160, 0xd0da4ab9
+0, 340200, 160, 0x563d4eb6
+0, 341100, 160, 0xd0ce503c
+0, 342000, 160, 0x8b684e15
+0, 342900, 160, 0x711541d3
+0, 343800, 160, 0xb28b5b9b
+0, 344700, 160, 0x48b145e4
+0, 345600, 160, 0x908f5606
+0, 346500, 160, 0x22c74f02
+0, 347400, 160, 0x87274716
+0, 348300, 160, 0xaa2351e6
+0, 349200, 160, 0x2df5505a
+0, 350100, 160, 0x7999525c
+0, 351000, 160, 0x728a4b73
+0, 351900, 160, 0xa67447ff
+0, 352800, 160, 0x28884a20
+0, 353700, 160, 0x3ffa5840
+0, 354600, 160, 0xd6265047
+0, 355500, 160, 0x2f1553a8
+0, 356400, 160, 0xac0653ec
+0, 357300, 160, 0x35844368
+0, 358200, 160, 0x6e1553ba
+0, 359100, 160, 0xb62a4c88
+0, 360000, 160, 0x88a04ffc
+0, 360900, 160, 0x947e525e
+0, 361800, 160, 0x3dd24f98
+0, 362700, 160, 0x942e542e
+0, 363600, 160, 0xdb985211
+0, 364500, 160, 0x615a5022
+0, 365400, 160, 0x71c04569
+0, 366300, 160, 0xbbbe4f41
+0, 367200, 160, 0x62074e0b
+0, 368100, 160, 0x2c5d56c7
+0, 369000, 160, 0x34344c18
+0, 369900, 160, 0xc57d4c22
+0, 370800, 160, 0xb273560d
+0, 371700, 160, 0x7e985229
+0, 372600, 160, 0x2dd3542d
+0, 373500, 160, 0x39645000
+0, 374400, 160, 0x1b3f4d9e
+0, 375300, 160, 0x0bbf5ed2
+0, 376200, 160, 0xc81f5608
+0, 377100, 160, 0xe82e569e
+0, 378000, 160, 0x34df537d
+0, 378900, 160, 0x53175837
+0, 379800, 160, 0xbb76517f
+0, 380700, 160, 0xd5a25737
+0, 381600, 160, 0x58eb4f3d
+0, 382500, 160, 0x8f6e51d3
+0, 383400, 160, 0x1fd85602
+0, 384300, 160, 0xef2a4ee7
+0, 385200, 160, 0x0e6e58f4
+0, 386100, 160, 0x80345497
+0, 387000, 160, 0x710150a1
+0, 387900, 160, 0x32fb51db
+0, 388800, 160, 0x7efd564c
+0, 389700, 160, 0xf6604f26
+0, 390600, 160, 0xc0954d7e
+0, 391500, 160, 0x27705072
+0, 392400, 160, 0xd26f5958
+0, 393300, 160, 0x2c2552cd
+0, 394200, 160, 0xd14056b1
+0, 395100, 160, 0x11f356d2
+0, 396000, 160, 0x93b35efd
+0, 396900, 160, 0xa6d65ae7
+0, 397800, 160, 0x95015177
+0, 398700, 160, 0x2e6157e8
+0, 399600, 160, 0xb90c5021
+0, 400500, 160, 0xf39155c9
+0, 401400, 160, 0xd6ad544b
+0, 402300, 160, 0x4b8a5b98
+0, 403200, 160, 0x90a94f2d
+0, 404100, 160, 0x46a04f3f
+0, 405000, 160, 0x542b5cd1
+0, 405900, 160, 0xebaa5710
+0, 406800, 160, 0x504854a0
+0, 407700, 160, 0xbd9d53b5
+0, 408600, 160, 0x91524fed
+0, 409500, 160, 0x9b7a582d
+0, 410400, 160, 0xa4f258cf
+0, 411300, 160, 0x46274dda
+0, 412200, 160, 0xc0335ba9
+0, 413100, 160, 0xe59c5c74
+0, 414000, 160, 0xc2ee5ab0
+0, 414900, 160, 0x3e035996
+0, 415800, 160, 0x63e25521
+0, 416700, 160, 0xc09851af
+0, 417600, 160, 0xb8225715
+0, 418500, 160, 0x74355bfb
+0, 419400, 160, 0xf4c75adf
+0, 420300, 160, 0x2f8b56cd
+0, 421200, 160, 0xb4705795
+0, 422100, 160, 0xb4b25506
+0, 423000, 160, 0xaadb54f8
+0, 423900, 160, 0xe6d158aa
+0, 424800, 160, 0xed64614f
+0, 425700, 160, 0x80195732
+0, 426600, 160, 0xa8995f0e
+0, 427500, 160, 0xdc4a520d
+0, 428400, 160, 0x071a5bae
+0, 429300, 160, 0xce1b5ae9
+0, 430200, 160, 0x85e25804
+0, 431100, 160, 0x435e555f
+0, 432000, 160, 0xe4154ef4
+0, 432900, 160, 0xeff857b4
+0, 433800, 160, 0xc9e25868
+0, 434700, 160, 0x6e6961eb
+0, 435600, 160, 0x361e45e6
+0, 436500, 160, 0xf8a94988
+0, 437400, 160, 0x9de758b3
+0, 438300, 160, 0x2e65533e
+0, 439200, 160, 0x3f89422d
+0, 440100, 160, 0x77fd56a5
+0, 441000, 160, 0x91104845
+0, 441900, 160, 0x2eeb5491
+0, 442800, 160, 0x6a5348c4
+0, 443700, 160, 0xe0954882
+0, 444600, 160, 0x7e915761
+0, 445500, 160, 0x2cb5531f
+0, 446400, 160, 0xe1dc4ecd
+0, 447300, 160, 0xbf6b4e61
+0, 448200, 160, 0x3d6b5746
+0, 449100, 160, 0xe8bd5077
+0, 450000, 160, 0xd38d5921
+0, 450900, 160, 0xfc534e38
+0, 451800, 160, 0xd361475b
+0, 452700, 160, 0x4d5152c7
+0, 453600, 160, 0xb6684d11
+0, 454500, 160, 0xd2e25864
+0, 455400, 160, 0x02ec536a
+0, 456300, 160, 0x27ac550e
+0, 457200, 160, 0xe8d44e2d
+0, 458100, 160, 0x520152c8
+0, 459000, 160, 0xace747ea
+0, 459900, 160, 0x773a4ee3
+0, 460800, 160, 0x7dd1559f
+0, 461700, 160, 0x124453a8
+0, 462600, 160, 0x04154991
+0, 463500, 160, 0x3c794d98
+0, 464400, 160, 0x309f4e47
+0, 465300, 160, 0x98c74a48
+0, 466200, 160, 0xd0c34bcc
+0, 467100, 160, 0xfa304e19
+0, 468000, 160, 0x69505201
+0, 468900, 160, 0x2e714ac7
+0, 469800, 160, 0x076654a3
+0, 470700, 160, 0xc6674e27
+0, 471600, 160, 0x1adf4dd9
+0, 472500, 160, 0x4408507e
+0, 473400, 160, 0xd2654d94
+0, 474300, 160, 0x97a65cc0
+0, 475200, 160, 0xb53251f9
+0, 476100, 160, 0xd498584b
+0, 477000, 160, 0x46a058c8
+0, 477900, 160, 0xa2f85cbd
+0, 478800, 160, 0x43b856fb
+0, 479700, 160, 0xdeb957ba
+0, 480600, 160, 0x3064580a
+0, 481500, 160, 0xe86357a5
+0, 482400, 160, 0x9b974d00
+0, 483300, 160, 0x66ee4ff3
+0, 484200, 160, 0x0b9958f7
+0, 485100, 160, 0xc3754d0a
+0, 486000, 160, 0x42314c33
+0, 486900, 160, 0x4550555f
+0, 487800, 160, 0x0f064e4c
+0, 488700, 160, 0xe569596d
+0, 489600, 160, 0x056c4751
+0, 490500, 160, 0xdc1049fc
+0, 491400, 160, 0x63c54a1e
+0, 492300, 160, 0xb402518e
+0, 493200, 160, 0xaf0d4b19
+0, 494100, 160, 0xa22b4c5b
+0, 495000, 160, 0x28084bbf
+0, 495900, 160, 0x10495224
+0, 496800, 160, 0x4cb94993
+0, 497700, 160, 0x17c15457
+0, 498600, 160, 0xbd834d6d
+0, 499500, 160, 0x6ca25235
+0, 500400, 160, 0x84b74f89
+0, 501300, 160, 0xdeef4e76
+0, 502200, 160, 0x6ab05188
+0, 503100, 160, 0xa91c4646
+0, 504000, 160, 0xad574e7d
+0, 504900, 160, 0xba264d69
+0, 505800, 160, 0xd8734dd0
+0, 506700, 160, 0x69f25581
+0, 507600, 160, 0x3b8e4ae9
+0, 508500, 160, 0xb1124607
+0, 509400, 160, 0xd78e4e4f
+0, 510300, 160, 0x05a1504f
+0, 511200, 160, 0x3e705270
+0, 512100, 160, 0x1e144b3b
+0, 513000, 160, 0xbb0b5416
+0, 513900, 160, 0xc26f5b45
+0, 514800, 160, 0x14224ab9
+0, 515700, 160, 0x2bbd4837
+0, 516600, 160, 0xd2bf4e60
+0, 517500, 160, 0xbeec506c
+0, 518400, 160, 0x2cd34d3a
+0, 519300, 160, 0x85134fc6
+0, 520200, 160, 0xdb9a4ac2
+0, 521100, 160, 0x92715256
+0, 522000, 160, 0xff395098
+0, 522900, 160, 0xa5ec560c
+0, 523800, 160, 0xce95534b
+0, 524700, 160, 0xe36f46f1
+0, 525600, 160, 0x45f74a58
+0, 526500, 160, 0x02d05440
+0, 527400, 160, 0xa005529f
+0, 528300, 160, 0xae0f3f22
+0, 529200, 160, 0x3f984eb0
+0, 530100, 160, 0xc5bd5015
+0, 531000, 160, 0xf4504c53
+0, 531900, 160, 0x7f4044c5
+0, 532800, 160, 0x82dd4bab
+0, 533700, 160, 0x7a0d5122
+0, 534600, 160, 0xd0da5271
+0, 535500, 160, 0x67d14e3e
+0, 536400, 160, 0x54564f42
+0, 537300, 160, 0x77df4e0a
+0, 538200, 160, 0x0c4a4f70
+0, 539100, 160, 0xb2944f40
+0, 540000, 160, 0xe57a52de
+0, 540900, 160, 0x7d994ed1
+0, 541800, 160, 0x9dc35763
+0, 542700, 160, 0x8d0a4da9
+0, 543600, 160, 0x0c6449a4
+0, 544500, 160, 0xc73c503a
+0, 545400, 160, 0x52904cbe
+0, 546300, 160, 0x49824c2e
+0, 547200, 160, 0xb7e14e0b
+0, 548100, 160, 0x9745548e
+0, 549000, 160, 0xdafb4c20
+0, 549900, 160, 0x1aa84d67
+0, 550800, 160, 0x64bc5033
+0, 551700, 160, 0x9e2e5a05
+0, 552600, 160, 0x69144bc5
+0, 553500, 160, 0xce1253fa
+0, 554400, 160, 0x359f4c15
+0, 555300, 160, 0xdba74ed0
+0, 556200, 160, 0xea1453b8
+0, 557100, 160, 0xccdf49d3
+0, 558000, 160, 0xeb324750
+0, 558900, 160, 0x62b14ad4
+0, 559800, 160, 0x446e50c0
+0, 560700, 160, 0x111e5151
+0, 561600, 160, 0x6be84f3a
+0, 562500, 160, 0xf5cf4e42
+0, 563400, 160, 0xcc995459
+0, 564300, 160, 0x0faf5172
+0, 565200, 160, 0x31334f66
+0, 566100, 160, 0x20ba52c0
+0, 567000, 160, 0xc7cc4975
+0, 567900, 160, 0x9e7a51ba
+0, 568800, 160, 0x52884ff1
+0, 569700, 160, 0xc7a84cfd
+0, 570600, 160, 0x5ae64c22
+0, 571500, 160, 0x68125a92
+0, 572400, 160, 0x39ed54f1
+0, 573300, 160, 0xfa0a4ad1
+0, 574200, 160, 0xe8c8590c
+0, 575100, 160, 0x5f555576
+0, 576000, 160, 0xaf7a57a1
+0, 576900, 160, 0x858257e9
+0, 577800, 160, 0x1223523e
+0, 578700, 160, 0x446954a1
+0, 579600, 160, 0xfbe952d9
+0, 580500, 160, 0xd56259ff
+0, 581400, 160, 0xc4fa4f44
+0, 582300, 160, 0x77cc57f6
+0, 583200, 160, 0x53d3573d
+0, 584100, 160, 0x085e4ff9
+0, 585000, 160, 0x7a4e5410
+0, 585900, 160, 0xb4ad5794
+0, 586800, 160, 0x71255738
+0, 587700, 160, 0x36724918
+0, 588600, 160, 0x370e5974
+0, 589500, 160, 0xb709596c
+0, 590400, 160, 0x89b05052
+0, 591300, 160, 0x74e550ce
+0, 592200, 160, 0x6e2c5a49
+0, 593100, 160, 0x4dfa5b50
+0, 594000, 160, 0x80764c70
+0, 594900, 160, 0xc1d14fc6
+0, 595800, 160, 0x53e746b3
+0, 596700, 160, 0x728350c0
+0, 597600, 160, 0x9aa6500e
+0, 598500, 160, 0x60985454
+0, 599400, 160, 0xa0c54b6f
+0, 600300, 160, 0xe3b157ea
+0, 601200, 160, 0xce86573b
+0, 602100, 160, 0x9dad5535
+0, 603000, 160, 0xb3094af9
+0, 603900, 160, 0x2d1456ed
+0, 604800, 160, 0x328248b9
+0, 605700, 160, 0x4ffb4f52
+0, 606600, 160, 0x71fe53de
+0, 607500, 160, 0x0d114e92
+0, 608400, 160, 0x37065510
+0, 609300, 160, 0x426c4c07
+0, 610200, 160, 0x58e3528b
+0, 611100, 160, 0x71674484
+0, 612000, 160, 0x45934ee1
+0, 612900, 160, 0x4e914b31
+0, 613800, 160, 0x525b4ec2
+0, 614700, 160, 0x4393563d
+0, 615600, 160, 0xb10154e9
+0, 616500, 160, 0x23b15a4d
+0, 617400, 160, 0x6d995220
+0, 618300, 160, 0xcd2949fd
+0, 619200, 160, 0x67234f75
+0, 620100, 160, 0x00cc4cdb
+0, 621000, 160, 0x97c35574
+0, 621900, 160, 0xc0855753
+0, 622800, 160, 0xf4e650a5
+0, 623700, 160, 0x95b14bc2
+0, 624600, 160, 0x04d948dc
+0, 625500, 160, 0x284d4d02
+0, 626400, 160, 0xfb0d4cd9
+0, 627300, 160, 0x0e515126
+0, 628200, 160, 0xb4055a86
+0, 629100, 160, 0x0bbe4f68
+0, 630000, 160, 0xf1b848af
+0, 630900, 160, 0x7d154853
+0, 631800, 160, 0x78225418
+0, 632700, 160, 0xfb2f523e
+0, 633600, 160, 0xa6d34ea6
+0, 634500, 160, 0xe4264e30
+0, 635400, 160, 0x113750aa
+0, 636300, 160, 0x4073529b
+0, 637200, 160, 0xd1754dda
+0, 638100, 160, 0x1b495413
+0, 639000, 160, 0x29f94cd8
+0, 639900, 160, 0x49004a53
+0, 640800, 160, 0x1fec4de4
+0, 641700, 160, 0x7d6b4670
+0, 642600, 160, 0x626c4c9f
+0, 643500, 160, 0x79265234
+0, 644400, 160, 0xab765b86
+0, 645300, 160, 0xe9ae4d26
+0, 646200, 160, 0xeee1481f
+0, 647100, 160, 0x289d5287
+0, 648000, 160, 0xb5524e8b
+0, 648900, 160, 0x7e715764
+0, 649800, 160, 0xb1b25091
+0, 650700, 160, 0xf1a946f6
+0, 651600, 160, 0x57dc51bd
+0, 652500, 160, 0x4c0b4f14
+0, 653400, 160, 0xdc1f4930
+0, 654300, 160, 0x79d75057
+0, 655200, 160, 0x22bd52df
+0, 656100, 160, 0x963a5562
+0, 657000, 160, 0x7e475303
+0, 657900, 160, 0x2c065494
+0, 658800, 160, 0xb0514720
+0, 659700, 160, 0xbc734849
+0, 660600, 160, 0xf4924e4d
+0, 661500, 160, 0xe50f44c9
+0, 662400, 160, 0x978c4ce8
+0, 663300, 160, 0x302e51c2
+0, 664200, 160, 0x262b4a60
+0, 665100, 160, 0xf95f4e99
+0, 666000, 160, 0x7465504a
+0, 666900, 160, 0xab0e5108
+0, 667800, 160, 0xbec15395
+0, 668700, 160, 0x4f2c5139
+0, 669600, 160, 0x26444deb
+0, 670500, 160, 0xee4c4b15
+0, 671400, 160, 0x8bc350e1
+0, 672300, 160, 0xd0744a5a
+0, 673200, 160, 0xfee64d9d
+0, 674100, 160, 0x234c50b6
+0, 675000, 160, 0x8592482c
+0, 675900, 160, 0x5e8b5308
+0, 676800, 160, 0x4f9848c7
+0, 677700, 160, 0x939d4faa
+0, 678600, 160, 0x797654f1
+0, 679500, 160, 0x15d24d9b
+0, 680400, 160, 0xa6e54bd2
+0, 681300, 160, 0x755e4c90
+0, 682200, 160, 0xcd334bce
+0, 683100, 160, 0xfc1746e9
+0, 684000, 160, 0x81f04dd5
+0, 684900, 160, 0x44b35080
+0, 685800, 160, 0x91e65217
+0, 686700, 160, 0x492150af
+0, 687600, 160, 0xf73e58ec
+0, 688500, 160, 0xf988538a
+0, 689400, 160, 0x0dee4c10
+0, 690300, 160, 0x2c9f4c23
+0, 691200, 160, 0x8c1e4e08
+0, 692100, 160, 0x25bb5286
+0, 693000, 160, 0xd0ed469b
+0, 693900, 160, 0x71eb50e8
+0, 694800, 160, 0x249f4d26
+0, 695700, 160, 0x9662498f
+0, 696600, 160, 0x49ee55e2
+0, 697500, 160, 0x54d9491b
+0, 698400, 160, 0x4c675649
+0, 699300, 160, 0x0e4b4b34
+0, 700200, 160, 0x776f4995
+0, 701100, 160, 0x722656b2
+0, 702000, 160, 0x081d4b6f
+0, 702900, 160, 0xf70746fe
+0, 703800, 160, 0x08b151da
+0, 704700, 160, 0x6b255328
+0, 705600, 160, 0xeb2b586a
+0, 706500, 160, 0x812b4444
+0, 707400, 160, 0x1e16533f
+0, 708300, 160, 0xc1244760
+0, 709200, 160, 0x67584d87
+0, 710100, 160, 0xde8b5726
+0, 711000, 160, 0xe96d4e3e
+0, 711900, 160, 0x41174c98
+0, 712800, 160, 0x4cdd4cd8
+0, 713700, 160, 0xfb724b64
+0, 714600, 160, 0x78f154df
+0, 715500, 160, 0x97e1476d
+0, 716400, 160, 0x6f034e7f
+0, 717300, 160, 0x93b240df
+0, 718200, 160, 0xc4d040e6
+0, 719100, 160, 0xe47744a4
+0, 720000, 160, 0x87a950ff
+0, 720900, 160, 0x7079491b
+0, 721800, 160, 0x89f0491a
+0, 722700, 160, 0x70b8467e
+0, 723600, 160, 0x20945294
+0, 724500, 160, 0x2d5c4919
+0, 725400, 160, 0x1ed44c78
+0, 726300, 160, 0x93d74a5f
+0, 727200, 160, 0x300e490e
+0, 728100, 160, 0x8249558d
+0, 729000, 160, 0x630a4f57
+0, 729900, 160, 0xdd6e475f
+0, 730800, 160, 0xf50941e5
+0, 731700, 160, 0x1fe44bea
+0, 732600, 160, 0x03be5469
+0, 733500, 160, 0x7ece4f4c
+0, 734400, 160, 0x31f953dd
+0, 735300, 160, 0x22a44b7d
+0, 736200, 160, 0x1f5e5562
+0, 737100, 160, 0x771b5688
+0, 738000, 160, 0x7d1c4d45
+0, 738900, 160, 0x6bc45cd0
+0, 739800, 160, 0x8f714c36
+0, 740700, 160, 0xfb1f4c87
+0, 741600, 160, 0x1f8a4b36
+0, 742500, 160, 0xee5c451a
+0, 743400, 160, 0xd56950ac
+0, 744300, 160, 0x529057f6
+0, 745200, 160, 0x336641fd
+0, 746100, 160, 0xa0dd5a66
+0, 747000, 160, 0x5f4b5248
+0, 747900, 160, 0xb6ef49a3
+0, 748800, 160, 0x07705f19
+0, 749700, 160, 0x3fce4bbb
+0, 750600, 160, 0xda395511
+0, 751500, 160, 0x1ecf5145
+0, 752400, 160, 0x88a547ab
+0, 753300, 160, 0x6c6849be
+0, 754200, 160, 0x979c4e97
+0, 755100, 160, 0x171854b3
+0, 756000, 160, 0x9a715283
+0, 756900, 160, 0x064e50ac
+0, 757800, 160, 0xc2fb4e94
+0, 758700, 160, 0x708146f5
+0, 759600, 160, 0x1ca45198
+0, 760500, 160, 0x332d4869
+0, 761400, 160, 0xc2ff4656
+0, 762300, 160, 0x0747552e
+0, 763200, 160, 0x0c3d4ba8
+0, 764100, 160, 0x72934dab
+0, 765000, 160, 0xbb1e5860
+0, 765900, 160, 0x526d4cea
+0, 766800, 160, 0xa4c445d6
+0, 767700, 160, 0x70cd49ba
+0, 768600, 160, 0x008c53a7
+0, 769500, 160, 0xf7174bca
+0, 770400, 160, 0x0bab4936
+0, 771300, 160, 0x59e5564d
+0, 772200, 160, 0x33045087
+0, 773100, 160, 0xde7454f0
+0, 774000, 160, 0x31184cc3
+0, 774900, 160, 0x37984bb3
+0, 775800, 160, 0xf5e052d4
+0, 776700, 160, 0x23ca4b42
+0, 777600, 160, 0xbe2a572b
+0, 778500, 160, 0x9a91538d
+0, 779400, 160, 0x8a994c40
+0, 780300, 160, 0x5dea51ee
+0, 781200, 160, 0x1b53524c
+0, 782100, 160, 0xd9e75227
+0, 783000, 160, 0x58384c3b
+0, 783900, 160, 0x4a1b53b2
+0, 784800, 160, 0xc2a3458a
+0, 785700, 160, 0x7f68502d
+0, 786600, 160, 0x85475559
+0, 787500, 160, 0xd0d25472
+0, 788400, 160, 0x4c0d4bbf
+0, 789300, 160, 0xcad352df
+0, 790200, 160, 0x17904c97
+0, 791100, 160, 0x4e774b8e
+0, 792000, 160, 0x21905952
+0, 792900, 160, 0xc2d950cd
+0, 793800, 160, 0xfdea55e6
+0, 794700, 160, 0x22ca4e37
+0, 795600, 160, 0x1143562a
+0, 796500, 160, 0xe83c583e
+0, 797400, 160, 0xba544b27
+0, 798300, 160, 0x1e8c50e4
+0, 799200, 160, 0xf7ca4d2a
+0, 800100, 160, 0x67764579
+0, 801000, 160, 0x40d74f42
+0, 801900, 160, 0x88e35360
+0, 802800, 160, 0xda3f4f5b
+0, 803700, 160, 0x19c1522f
+0, 804600, 160, 0x93ce4f78
+0, 805500, 160, 0xf65447ba
+0, 806400, 160, 0xc0bc4e5a
+0, 807300, 160, 0x4915572b
+0, 808200, 160, 0x1651460b
+0, 809100, 160, 0xffe552a5
+0, 810000, 160, 0x5bd351ab
+0, 810900, 160, 0xbbd85034
+0, 811800, 160, 0xb9ff505f
+0, 812700, 160, 0xfc104eaf
+0, 813600, 160, 0xdaa74d6c
+0, 814500, 160, 0x34b04d78
+0, 815400, 160, 0x1e924f70
+0, 816300, 160, 0x0d46512d
+0, 817200, 160, 0x0d115950
+0, 818100, 160, 0x62de55a4
+0, 819000, 160, 0x58d652ab
+0, 819900, 160, 0x1776584e
+0, 820800, 160, 0x60175a2b
+0, 821700, 160, 0x4d714c82
+0, 822600, 160, 0xe13c4ce0
+0, 823500, 160, 0x7cd15464
+0, 824400, 160, 0x6c87571a
+0, 825300, 160, 0x1abe4f07
+0, 826200, 160, 0x039d5661
+0, 827100, 160, 0x0eba5909
+0, 828000, 160, 0xa46e51ec
+0, 828900, 160, 0x9be44eb7
+0, 829800, 160, 0xe0634aad
+0, 830700, 160, 0xcd53530b
+0, 831600, 160, 0x12cd482c
+0, 832500, 160, 0x71884634
+0, 833400, 160, 0xd5845743
+0, 834300, 160, 0xacd1502c
+0, 835200, 160, 0x04795031
+0, 836100, 160, 0xf0df54b9
+0, 837000, 160, 0x43aa5155
+0, 837900, 160, 0x316a4988
+0, 838800, 160, 0xfbc64f8a
+0, 839700, 160, 0xda084e8e
+0, 840600, 160, 0x3cc34ce2
+0, 841500, 160, 0xbfc055d8
+0, 842400, 160, 0x20ef4876
+0, 843300, 160, 0x035a5660
+0, 844200, 160, 0xbc7255be
+0, 845100, 160, 0xba514f44
+0, 846000, 160, 0x868c4c9c
+0, 846900, 160, 0x83494f04
+0, 847800, 160, 0xa452521a
+0, 848700, 160, 0x2ed04f65
+0, 849600, 160, 0x2e3e592d
+0, 850500, 160, 0x82bc4763
+0, 851400, 160, 0x339950db
+0, 852300, 160, 0x5bb64eff
+0, 853200, 160, 0x347c4d85
+0, 854100, 160, 0x25e949a3
+0, 855000, 160, 0xbdf649a8
+0, 855900, 160, 0x498650f3
+0, 856800, 160, 0x2a6f4e60
+0, 857700, 160, 0x661e5697
+0, 858600, 160, 0x5d6150ca
+0, 859500, 160, 0xe7c74b8f
+0, 860400, 160, 0x1ae148da
+0, 861300, 160, 0xaeef485d
+0, 862200, 160, 0x105650c6
+0, 863100, 160, 0xc1c45376
+0, 864000, 160, 0x83c55011
+0, 864900, 160, 0x77025597
+0, 865800, 160, 0x324250b7
+0, 866700, 160, 0x5cdc570f
+0, 867600, 160, 0x292e52a1
+0, 868500, 160, 0x8d7a5090
+0, 869400, 160, 0x32fc54e4
+0, 870300, 160, 0x50984e8b
+0, 871200, 160, 0x07f442a0
+0, 872100, 160, 0xc91c4fc3
+0, 873000, 160, 0x06cf53d7
+0, 873900, 160, 0xa66c5923
+0, 874800, 160, 0xc2015120
+0, 875700, 160, 0xedfa50c4
+0, 876600, 160, 0xe4c85fb5
+0, 877500, 160, 0xcd7b4c65
+0, 878400, 160, 0xb22353c1
+0, 879300, 160, 0x298c5996
+0, 880200, 160, 0xefce51db
+0, 881100, 160, 0x6df74ee3
+0, 882000, 160, 0x7c46496b
+0, 882900, 160, 0x910a48a4
+0, 883800, 160, 0xbf504b1e
+0, 884700, 160, 0x096947e8
+0, 885600, 160, 0x4a07629d
+0, 886500, 160, 0x577b43c1
+0, 887400, 160, 0x939e4d6d
+0, 888300, 160, 0x486e48ac
+0, 889200, 160, 0x50064871
+0, 890100, 160, 0x4a255534
+0, 891000, 160, 0xc80d4618
+0, 891900, 160, 0xf18a4780
+0, 892800, 160, 0x1c274dd4
+0, 893700, 160, 0x2f3e4f7c
+0, 894600, 160, 0x44b24cc2
+0, 895500, 160, 0x89b451f4
+0, 896400, 160, 0x06515b65
+0, 897300, 160, 0xc5b857ce
+0, 898200, 160, 0xa47b47a7
+0, 899100, 160, 0xfb375448
diff --git a/tests/ref/fate/g729-1 b/tests/ref/fate/g729-1
new file mode 100644
index 0000000000..6bf05c5efd
--- /dev/null
+++ b/tests/ref/fate/g729-1
@@ -0,0 +1,1000 @@
+0, 0, 160, 0xf7e550f0
+0, 900, 160, 0x42794ea8
+0, 1800, 160, 0xfe023e42
+0, 2700, 160, 0xc1ae40e3
+0, 3600, 160, 0xee6d4bf1
+0, 4500, 160, 0x107451d7
+0, 5400, 160, 0x40cb4ba4
+0, 6300, 160, 0x90504e5e
+0, 7200, 160, 0xf6f3531d
+0, 8100, 160, 0x48664ea0
+0, 9000, 160, 0xa30458e1
+0, 9900, 160, 0x00b74aa2
+0, 10800, 160, 0x95234e49
+0, 11700, 160, 0x9cf24a94
+0, 12600, 160, 0x4f2952f4
+0, 13500, 160, 0x658353db
+0, 14400, 160, 0x98ef4d79
+0, 15300, 160, 0x765d5472
+0, 16200, 160, 0xc6e25262
+0, 17100, 160, 0x33334993
+0, 18000, 160, 0xfa104dc5
+0, 18900, 160, 0x03ee5530
+0, 19800, 160, 0x52c54e0e
+0, 20700, 160, 0xbd744638
+0, 21600, 160, 0x7775519f
+0, 22500, 160, 0xd22f499e
+0, 23400, 160, 0x26af4eec
+0, 24300, 160, 0x37474ed9
+0, 25200, 160, 0x6b19548d
+0, 26100, 160, 0x4a3449b7
+0, 27000, 160, 0x2bed5231
+0, 27900, 160, 0x556d5349
+0, 28800, 160, 0xbb6c5227
+0, 29700, 160, 0xea354b4d
+0, 30600, 160, 0xf35f4b7d
+0, 31500, 160, 0x9dcb4e9d
+0, 32400, 160, 0xc81f5ac2
+0, 33300, 160, 0xfa054cfd
+0, 34200, 160, 0x0c554e62
+0, 35100, 160, 0x7ffa5250
+0, 36000, 160, 0x7e5148ec
+0, 36900, 160, 0x95bc4d69
+0, 37800, 160, 0xf34a5644
+0, 38700, 160, 0xcaa3493d
+0, 39600, 160, 0xa44745dc
+0, 40500, 160, 0x320355c0
+0, 41400, 160, 0xbd1e5670
+0, 42300, 160, 0xfe3250cd
+0, 43200, 160, 0xce7a574c
+0, 44100, 160, 0x09b04f6e
+0, 45000, 160, 0x035759c8
+0, 45900, 160, 0x713458c7
+0, 46800, 160, 0x9a75494b
+0, 47700, 160, 0x99114fef
+0, 48600, 160, 0x129251f0
+0, 49500, 160, 0x4eb845f2
+0, 50400, 160, 0x5d064da5
+0, 51300, 160, 0x5a8e4a34
+0, 52200, 160, 0x5b784608
+0, 53100, 160, 0x1ca7546a
+0, 54000, 160, 0x327e5cbf
+0, 54900, 160, 0xd7ae4bc3
+0, 55800, 160, 0xba3f55b4
+0, 56700, 160, 0x09fe4ca7
+0, 57600, 160, 0x347248ba
+0, 58500, 160, 0xf0bf52ff
+0, 59400, 160, 0x3500507e
+0, 60300, 160, 0x30e65135
+0, 61200, 160, 0x390a5201
+0, 62100, 160, 0xf0dc5bca
+0, 63000, 160, 0x69b94f64
+0, 63900, 160, 0x6ac04cf6
+0, 64800, 160, 0xbc014cf4
+0, 65700, 160, 0x4b564eca
+0, 66600, 160, 0x33e44e85
+0, 67500, 160, 0xe39e5343
+0, 68400, 160, 0xebf64c80
+0, 69300, 160, 0x5a92562b
+0, 70200, 160, 0xe0075c88
+0, 71100, 160, 0x59bd55e8
+0, 72000, 160, 0xe6ca4ef2
+0, 72900, 160, 0xea9a4df2
+0, 73800, 160, 0xf53c4bf6
+0, 74700, 160, 0x977a4f32
+0, 75600, 160, 0xe5894eb2
+0, 76500, 160, 0x956c4c28
+0, 77400, 160, 0xdff74c3d
+0, 78300, 160, 0xace74db7
+0, 79200, 160, 0x00e74ef5
+0, 80100, 160, 0x6633560a
+0, 81000, 160, 0xd63647c5
+0, 81900, 160, 0xff144eef
+0, 82800, 160, 0xc5fe4d51
+0, 83700, 160, 0x5c244c7c
+0, 84600, 160, 0x95be50f1
+0, 85500, 160, 0x74d84b77
+0, 86400, 160, 0x1e965711
+0, 87300, 160, 0x7ae45ad7
+0, 88200, 160, 0xf9cd5920
+0, 89100, 160, 0xf0064ea9
+0, 90000, 160, 0xec645244
+0, 90900, 160, 0x8330539a
+0, 91800, 160, 0x4a5d5023
+0, 92700, 160, 0x706153d7
+0, 93600, 160, 0xd6e0520f
+0, 94500, 160, 0x0bd9586f
+0, 95400, 160, 0xc1554dec
+0, 96300, 160, 0x89be4bde
+0, 97200, 160, 0x0c2a49c0
+0, 98100, 160, 0xc18d498a
+0, 99000, 160, 0xc36147e1
+0, 99900, 160, 0x99de4d4b
+0, 100800, 160, 0x2b9d542b
+0, 101700, 160, 0x062b52c9
+0, 102600, 160, 0x9dcf542e
+0, 103500, 160, 0x641f58b9
+0, 104400, 160, 0x114c51ff
+0, 105300, 160, 0x78e04b0e
+0, 106200, 160, 0xfec74535
+0, 107100, 160, 0x71d54cd3
+0, 108000, 160, 0xee9e5289
+0, 108900, 160, 0x142354d9
+0, 109800, 160, 0x051e4ddc
+0, 110700, 160, 0x358146b8
+0, 111600, 160, 0x4dec58eb
+0, 112500, 160, 0xd0944f04
+0, 113400, 160, 0xdc025a99
+0, 114300, 160, 0x6b355402
+0, 115200, 160, 0x1c0b5a6d
+0, 116100, 160, 0xa3b34bc8
+0, 117000, 160, 0x92604eb7
+0, 117900, 160, 0x6f2f5465
+0, 118800, 160, 0xcb565361
+0, 119700, 160, 0x8bfb50a3
+0, 120600, 160, 0xf9114e99
+0, 121500, 160, 0x11065580
+0, 122400, 160, 0x903550c8
+0, 123300, 160, 0xe7aa3da8
+0, 124200, 160, 0x13f34e01
+0, 125100, 160, 0x4c3b4c0a
+0, 126000, 160, 0x08e64c60
+0, 126900, 160, 0xffcd6176
+0, 127800, 160, 0x09684f13
+0, 128700, 160, 0xd8a646b5
+0, 129600, 160, 0xc07355f0
+0, 130500, 160, 0xe836515b
+0, 131400, 160, 0x935741a5
+0, 132300, 160, 0x68f85160
+0, 133200, 160, 0x669a4ed0
+0, 134100, 160, 0xce9f4883
+0, 135000, 160, 0xd94c42de
+0, 135900, 160, 0xf1874b54
+0, 136800, 160, 0x42da46ce
+0, 137700, 160, 0xe99a4da5
+0, 138600, 160, 0x94934f16
+0, 139500, 160, 0x8571437f
+0, 140400, 160, 0xe4774dc2
+0, 141300, 160, 0x743f4f89
+0, 142200, 160, 0x3b3e50ba
+0, 143100, 160, 0x439355e9
+0, 144000, 160, 0x3e4d5178
+0, 144900, 160, 0x64595524
+0, 145800, 160, 0x42d14702
+0, 146700, 160, 0x051e4b1d
+0, 147600, 160, 0x5db84cee
+0, 148500, 160, 0x4d875136
+0, 149400, 160, 0x33b75996
+0, 150300, 160, 0xd5094d76
+0, 151200, 160, 0x6a7052b7
+0, 152100, 160, 0x77264c8f
+0, 153000, 160, 0xcf7e4ccf
+0, 153900, 160, 0x5f7c568b
+0, 154800, 160, 0x8886578b
+0, 155700, 160, 0xd33a4e52
+0, 156600, 160, 0xeefe5c23
+0, 157500, 160, 0xa9c94e38
+0, 158400, 160, 0x67845aa0
+0, 159300, 160, 0xbe91498f
+0, 160200, 160, 0x843d46e3
+0, 161100, 160, 0xbd215999
+0, 162000, 160, 0x1a2e5f2c
+0, 162900, 160, 0x6a344a63
+0, 163800, 160, 0xd80d5743
+0, 164700, 160, 0x80964879
+0, 165600, 160, 0xaafb5e35
+0, 166500, 160, 0x3b855ff3
+0, 167400, 160, 0x770b51d0
+0, 168300, 160, 0x623a5312
+0, 169200, 160, 0x0c235b56
+0, 170100, 160, 0xc8c25724
+0, 171000, 160, 0xb44650e2
+0, 171900, 160, 0xab964d47
+0, 172800, 160, 0x7aa35107
+0, 173700, 160, 0xf12d4780
+0, 174600, 160, 0x77e64f92
+0, 175500, 160, 0x34ee4fa0
+0, 176400, 160, 0x6701466b
+0, 177300, 160, 0xa79d4b4c
+0, 178200, 160, 0xbb7f557b
+0, 179100, 160, 0xaeb253c4
+0, 180000, 160, 0xe7255029
+0, 180900, 160, 0xa5f1505c
+0, 181800, 160, 0x4ae54f09
+0, 182700, 160, 0x6a2b4bc9
+0, 183600, 160, 0xf8724ea5
+0, 184500, 160, 0x4ab35317
+0, 185400, 160, 0xc8d350fb
+0, 186300, 160, 0x73a74994
+0, 187200, 160, 0x9cd1596d
+0, 188100, 160, 0x5ba16005
+0, 189000, 160, 0xb17e4fcc
+0, 189900, 160, 0x8ac958cd
+0, 190800, 160, 0x7919557f
+0, 191700, 160, 0x0be35121
+0, 192600, 160, 0xf8f752f2
+0, 193500, 160, 0xae894d40
+0, 194400, 160, 0x03d94c10
+0, 195300, 160, 0xf12c4917
+0, 196200, 160, 0x3c94534e
+0, 197100, 160, 0x111d51c3
+0, 198000, 160, 0x0a285304
+0, 198900, 160, 0xc3ac4ab1
+0, 199800, 160, 0x5576579d
+0, 200700, 160, 0x9cd04f10
+0, 201600, 160, 0x38a04bf9
+0, 202500, 160, 0xbd0d4d6d
+0, 203400, 160, 0x4db24510
+0, 204300, 160, 0x968753de
+0, 205200, 160, 0x1fa35c67
+0, 206100, 160, 0xc9c048bc
+0, 207000, 160, 0x221d629e
+0, 207900, 160, 0xbb864b0e
+0, 208800, 160, 0xe2964bcd
+0, 209700, 160, 0x20ff4b23
+0, 210600, 160, 0x01dc53e7
+0, 211500, 160, 0x522b56aa
+0, 212400, 160, 0x1e6a495a
+0, 213300, 160, 0x0dcf5731
+0, 214200, 160, 0x241f448d
+0, 215100, 160, 0xdafa55b6
+0, 216000, 160, 0x40584e43
+0, 216900, 160, 0xb73850ab
+0, 217800, 160, 0x7cff593a
+0, 218700, 160, 0x2796515a
+0, 219600, 160, 0x872c5454
+0, 220500, 160, 0xa13058e7
+0, 221400, 160, 0xd8a65261
+0, 222300, 160, 0x48a75601
+0, 223200, 160, 0xb1e7584c
+0, 224100, 160, 0x29cd53fa
+0, 225000, 160, 0xba514d84
+0, 225900, 160, 0x747f4f99
+0, 226800, 160, 0x5819526e
+0, 227700, 160, 0x10185413
+0, 228600, 160, 0x4d084cdc
+0, 229500, 160, 0x8313530b
+0, 230400, 160, 0xd26c5583
+0, 231300, 160, 0x76d749f9
+0, 232200, 160, 0x7cf847a5
+0, 233100, 160, 0xa642590c
+0, 234000, 160, 0x7fef56f2
+0, 234900, 160, 0xf6ea49b9
+0, 235800, 160, 0x6c654e89
+0, 236700, 160, 0x164f56e9
+0, 237600, 160, 0x84cf6139
+0, 238500, 160, 0x20c753ef
+0, 239400, 160, 0x3f3a485f
+0, 240300, 160, 0xee0c5f4b
+0, 241200, 160, 0x706b5313
+0, 242100, 160, 0x47da5af3
+0, 243000, 160, 0x05504b25
+0, 243900, 160, 0x584e59d8
+0, 244800, 160, 0xe9cc4e37
+0, 245700, 160, 0xf33b518a
+0, 246600, 160, 0xb9ac58b7
+0, 247500, 160, 0xed5c57f0
+0, 248400, 160, 0x4cf1579d
+0, 249300, 160, 0x96f94792
+0, 250200, 160, 0x7c455836
+0, 251100, 160, 0xad6652ce
+0, 252000, 160, 0x1ba95cab
+0, 252900, 160, 0xd86755bb
+0, 253800, 160, 0x2f9e51b4
+0, 254700, 160, 0x084e5119
+0, 255600, 160, 0x54ad5449
+0, 256500, 160, 0xff7c5b86
+0, 257400, 160, 0x29a94fff
+0, 258300, 160, 0x679c55ff
+0, 259200, 160, 0x9a415b81
+0, 260100, 160, 0x3ea5528a
+0, 261000, 160, 0x54e15d3f
+0, 261900, 160, 0x122b5c28
+0, 262800, 160, 0xdc0f4e7f
+0, 263700, 160, 0xdc304acd
+0, 264600, 160, 0xe55e5407
+0, 265500, 160, 0x8d07485f
+0, 266400, 160, 0xdc0b5333
+0, 267300, 160, 0xfaed4a90
+0, 268200, 160, 0xb0625538
+0, 269100, 160, 0x1ef3526b
+0, 270000, 160, 0xb48c48e9
+0, 270900, 160, 0x8c945190
+0, 271800, 160, 0x7f9a58b3
+0, 272700, 160, 0x55735499
+0, 273600, 160, 0xeba34a71
+0, 274500, 160, 0xbaa94a6d
+0, 275400, 160, 0x15ab484f
+0, 276300, 160, 0xdc675509
+0, 277200, 160, 0xc2e94f0e
+0, 278100, 160, 0xd7f348ac
+0, 279000, 160, 0x14884e8f
+0, 279900, 160, 0x2d274a97
+0, 280800, 160, 0x578c5834
+0, 281700, 160, 0x12074dab
+0, 282600, 160, 0x74c55067
+0, 283500, 160, 0x7c904e0f
+0, 284400, 160, 0x81d45735
+0, 285300, 160, 0x766f4d71
+0, 286200, 160, 0x9c915273
+0, 287100, 160, 0xf37f4d04
+0, 288000, 160, 0x1ac74d66
+0, 288900, 160, 0xf9b253ab
+0, 289800, 160, 0x6e0c5bb2
+0, 290700, 160, 0x603d629e
+0, 291600, 160, 0xbb674faf
+0, 292500, 160, 0x5d8d51c6
+0, 293400, 160, 0xae7350b9
+0, 294300, 160, 0xfde859ec
+0, 295200, 160, 0x900d50a4
+0, 296100, 160, 0x003551b2
+0, 297000, 160, 0xf8ae4c9d
+0, 297900, 160, 0x66ea508f
+0, 298800, 160, 0xd45b4c51
+0, 299700, 160, 0xb64451a3
+0, 300600, 160, 0x6d2a5621
+0, 301500, 160, 0x71db4d36
+0, 302400, 160, 0x06704647
+0, 303300, 160, 0x1f124cf9
+0, 304200, 160, 0x10d14b46
+0, 305100, 160, 0x421b59d8
+0, 306000, 160, 0x84ba4cae
+0, 306900, 160, 0x4fba48e1
+0, 307800, 160, 0xec294a6b
+0, 308700, 160, 0x2f1752a7
+0, 309600, 160, 0x8d665570
+0, 310500, 160, 0x586e537d
+0, 311400, 160, 0x18d54a49
+0, 312300, 160, 0xa895566d
+0, 313200, 160, 0xb9b35255
+0, 314100, 160, 0x2e194e1f
+0, 315000, 160, 0x4810594b
+0, 315900, 160, 0xb82557ee
+0, 316800, 160, 0x35d84d67
+0, 317700, 160, 0x5ee95128
+0, 318600, 160, 0x24f05747
+0, 319500, 160, 0x434d53f6
+0, 320400, 160, 0x3c894f3e
+0, 321300, 160, 0x81c34896
+0, 322200, 160, 0x7540543c
+0, 323100, 160, 0x35bc5504
+0, 324000, 160, 0x546943dc
+0, 324900, 160, 0x084d46e9
+0, 325800, 160, 0x983852ba
+0, 326700, 160, 0xefac4e15
+0, 327600, 160, 0xc9294430
+0, 328500, 160, 0xe9e74de1
+0, 329400, 160, 0x4ca1516a
+0, 330300, 160, 0x44014ceb
+0, 331200, 160, 0x1dbc5ad1
+0, 332100, 160, 0x98be4efd
+0, 333000, 160, 0x2dc75c7a
+0, 333900, 160, 0x46275852
+0, 334800, 160, 0x61c15d30
+0, 335700, 160, 0x1f605adc
+0, 336600, 160, 0xf08659ac
+0, 337500, 160, 0xb7656021
+0, 338400, 160, 0x1f4a5a72
+0, 339300, 160, 0xf8175275
+0, 340200, 160, 0xbbf4564d
+0, 341100, 160, 0x6fdc5a7d
+0, 342000, 160, 0x082f5250
+0, 342900, 160, 0x84cb55b5
+0, 343800, 160, 0x0e1a51ba
+0, 344700, 160, 0xa84e52fc
+0, 345600, 160, 0xcb5a55c9
+0, 346500, 160, 0x9ce6570d
+0, 347400, 160, 0x82b253cc
+0, 348300, 160, 0x34c4594b
+0, 349200, 160, 0xff5c5854
+0, 350100, 160, 0xd5da4ea0
+0, 351000, 160, 0xc86e5553
+0, 351900, 160, 0x7ecb55c6
+0, 352800, 160, 0xb08b5338
+0, 353700, 160, 0xd601573c
+0, 354600, 160, 0x93305092
+0, 355500, 160, 0x352d4912
+0, 356400, 160, 0xddba4d29
+0, 357300, 160, 0xc79c50b7
+0, 358200, 160, 0xe67d4e8e
+0, 359100, 160, 0xdbfd4bbc
+0, 360000, 160, 0xb2f746fb
+0, 360900, 160, 0x835b5539
+0, 361800, 160, 0x612049e9
+0, 362700, 160, 0x91a6503c
+0, 363600, 160, 0x762e4f0e
+0, 364500, 160, 0x2b2153f9
+0, 365400, 160, 0xdcfe5804
+0, 366300, 160, 0x79144cae
+0, 367200, 160, 0xd6394d99
+0, 368100, 160, 0x22395292
+0, 369000, 160, 0x50b04fa0
+0, 369900, 160, 0x846b49a5
+0, 370800, 160, 0x1f554dff
+0, 371700, 160, 0x0aa458dd
+0, 372600, 160, 0x62154dde
+0, 373500, 160, 0xe69847ac
+0, 374400, 160, 0x75855425
+0, 375300, 160, 0x49125665
+0, 376200, 160, 0xa8605945
+0, 377100, 160, 0xc02a5083
+0, 378000, 160, 0x6198537c
+0, 378900, 160, 0x90f25711
+0, 379800, 160, 0x32da51f1
+0, 380700, 160, 0x96c3474d
+0, 381600, 160, 0x82ae4579
+0, 382500, 160, 0xbabf5919
+0, 383400, 160, 0x78095772
+0, 384300, 160, 0x46964abb
+0, 385200, 160, 0x5fcb5ba3
+0, 386100, 160, 0x4a775585
+0, 387000, 160, 0xc41f53af
+0, 387900, 160, 0x457251bc
+0, 388800, 160, 0x8f864fb3
+0, 389700, 160, 0x439d526c
+0, 390600, 160, 0x5cf6503f
+0, 391500, 160, 0x90b7534f
+0, 392400, 160, 0xecc45253
+0, 393300, 160, 0x533b4ee3
+0, 394200, 160, 0x4cc44f27
+0, 395100, 160, 0x6ff35096
+0, 396000, 160, 0x141e4a80
+0, 396900, 160, 0x9e075461
+0, 397800, 160, 0xc4b55791
+0, 398700, 160, 0x40955666
+0, 399600, 160, 0x6255462f
+0, 400500, 160, 0x2cec55d6
+0, 401400, 160, 0xd71652e9
+0, 402300, 160, 0xe65e530c
+0, 403200, 160, 0xeeb9556d
+0, 404100, 160, 0x558f523e
+0, 405000, 160, 0x76e14b00
+0, 405900, 160, 0x3f9f4e9b
+0, 406800, 160, 0x0d7b492a
+0, 407700, 160, 0xdd6e51bd
+0, 408600, 160, 0x5ab353b9
+0, 409500, 160, 0x5b934f33
+0, 410400, 160, 0x36bb57a0
+0, 411300, 160, 0x455d54d3
+0, 412200, 160, 0x7e6853d7
+0, 413100, 160, 0xdcb85ed4
+0, 414000, 160, 0x3a8d5860
+0, 414900, 160, 0x5c90558f
+0, 415800, 160, 0x25504d46
+0, 416700, 160, 0x0fc55413
+0, 417600, 160, 0x98545409
+0, 418500, 160, 0x963b550e
+0, 419400, 160, 0x544a569c
+0, 420300, 160, 0x7ab65f77
+0, 421200, 160, 0x14c257e2
+0, 422100, 160, 0x6cac6262
+0, 423000, 160, 0x2f7f5091
+0, 423900, 160, 0xc2655462
+0, 424800, 160, 0xbb4b4744
+0, 425700, 160, 0x4c5f54db
+0, 426600, 160, 0x9e694ab5
+0, 427500, 160, 0xc2c95173
+0, 428400, 160, 0xf4ae553f
+0, 429300, 160, 0xb4c04ed1
+0, 430200, 160, 0xf3095128
+0, 431100, 160, 0x73b04de1
+0, 432000, 160, 0xff4951c7
+0, 432900, 160, 0x28c156bd
+0, 433800, 160, 0x17b652aa
+0, 434700, 160, 0xb9ce528b
+0, 435600, 160, 0x3cc558be
+0, 436500, 160, 0xdf385905
+0, 437400, 160, 0xe2de4fe2
+0, 438300, 160, 0xc2a6582d
+0, 439200, 160, 0xe5715bc9
+0, 440100, 160, 0x741b6416
+0, 441000, 160, 0xf9b1544f
+0, 441900, 160, 0x012e5f01
+0, 442800, 160, 0x5ab65a49
+0, 443700, 160, 0xfe1e5b1a
+0, 444600, 160, 0x370056ef
+0, 445500, 160, 0xfde45ed4
+0, 446400, 160, 0xa34f6053
+0, 447300, 160, 0x31755604
+0, 448200, 160, 0xc3415bfe
+0, 449100, 160, 0xe5dd5b58
+0, 450000, 160, 0xb6cf5295
+0, 450900, 160, 0x3d81538b
+0, 451800, 160, 0xc00255d2
+0, 452700, 160, 0xb0714f71
+0, 453600, 160, 0x9c9756ac
+0, 454500, 160, 0x4de053a0
+0, 455400, 160, 0x6706500c
+0, 456300, 160, 0x34e4511d
+0, 457200, 160, 0xe4224e3e
+0, 458100, 160, 0xdf695529
+0, 459000, 160, 0xeb1f54e0
+0, 459900, 160, 0x2870550e
+0, 460800, 160, 0x08465464
+0, 461700, 160, 0xe34150e6
+0, 462600, 160, 0xb77556e0
+0, 463500, 160, 0xb23e46ab
+0, 464400, 160, 0x83884a7b
+0, 465300, 160, 0xa0284b16
+0, 466200, 160, 0x87b749e1
+0, 467100, 160, 0x4b276444
+0, 468000, 160, 0x92f95091
+0, 468900, 160, 0x2b1056c2
+0, 469800, 160, 0xd5d5590a
+0, 470700, 160, 0x5a454fac
+0, 471600, 160, 0x0ab05b13
+0, 472500, 160, 0xd98e56ca
+0, 473400, 160, 0x183d5892
+0, 474300, 160, 0x8ba951e4
+0, 475200, 160, 0x487054ff
+0, 476100, 160, 0xc0d05562
+0, 477000, 160, 0x166c590f
+0, 477900, 160, 0x3e254cc0
+0, 478800, 160, 0xd2784ab4
+0, 479700, 160, 0x9f7b4ef6
+0, 480600, 160, 0xdd7653b6
+0, 481500, 160, 0x7ae453b7
+0, 482400, 160, 0xff6c50ec
+0, 483300, 160, 0xfa0d51a9
+0, 484200, 160, 0x29ab583b
+0, 485100, 160, 0x671d5437
+0, 486000, 160, 0x6867569f
+0, 486900, 160, 0xdd775e05
+0, 487800, 160, 0xbafa65ed
+0, 488700, 160, 0xd33f5aea
+0, 489600, 160, 0x851455a8
+0, 490500, 160, 0x044c4d45
+0, 491400, 160, 0xcd7c5d84
+0, 492300, 160, 0xd6565e61
+0, 493200, 160, 0x2f345a92
+0, 494100, 160, 0x50e05530
+0, 495000, 160, 0x787f516a
+0, 495900, 160, 0x75cd5ade
+0, 496800, 160, 0x55b558ad
+0, 497700, 160, 0x55255b01
+0, 498600, 160, 0xfc5b5945
+0, 499500, 160, 0x33914e05
+0, 500400, 160, 0x1f4a5c31
+0, 501300, 160, 0x542f4bf2
+0, 502200, 160, 0xd8b2573f
+0, 503100, 160, 0x127758b0
+0, 504000, 160, 0x18dd5a30
+0, 504900, 160, 0xe8ce61c4
+0, 505800, 160, 0x9a225b47
+0, 506700, 160, 0xd4436314
+0, 507600, 160, 0x2bf06310
+0, 508500, 160, 0x0de35e82
+0, 509400, 160, 0x76cb56f2
+0, 510300, 160, 0x65bc569b
+0, 511200, 160, 0x00a45461
+0, 512100, 160, 0xb5c55019
+0, 513000, 160, 0x5eb04b4d
+0, 513900, 160, 0xf1224c39
+0, 514800, 160, 0x4d135288
+0, 515700, 160, 0x9bc34ba7
+0, 516600, 160, 0xbde3510e
+0, 517500, 160, 0xefaf4fa4
+0, 518400, 160, 0x584950e2
+0, 519300, 160, 0x1e844e27
+0, 520200, 160, 0x38634315
+0, 521100, 160, 0x6b9b4a0b
+0, 522000, 160, 0xd491512a
+0, 522900, 160, 0x8624478c
+0, 523800, 160, 0x67ab45c7
+0, 524700, 160, 0xf78e4c53
+0, 525600, 160, 0xb1654f0d
+0, 526500, 160, 0x17bb4e96
+0, 527400, 160, 0xf3165e7c
+0, 528300, 160, 0xf7914633
+0, 529200, 160, 0x3421530f
+0, 530100, 160, 0x492e572c
+0, 531000, 160, 0xa3185319
+0, 531900, 160, 0x92d054c0
+0, 532800, 160, 0x1cc24ce1
+0, 533700, 160, 0x2ebc519e
+0, 534600, 160, 0x946b53e7
+0, 535500, 160, 0xf85c4fe6
+0, 536400, 160, 0x2974534c
+0, 537300, 160, 0xef7e4a28
+0, 538200, 160, 0x01a74c6e
+0, 539100, 160, 0x2a865674
+0, 540000, 160, 0x70474faf
+0, 540900, 160, 0x2df75014
+0, 541800, 160, 0xf1f3574e
+0, 542700, 160, 0x741b5308
+0, 543600, 160, 0xcb34513e
+0, 544500, 160, 0x7b5e50c7
+0, 545400, 160, 0x0165553b
+0, 546300, 160, 0x04b85450
+0, 547200, 160, 0x795d5873
+0, 548100, 160, 0x508859fb
+0, 549000, 160, 0xca09587d
+0, 549900, 160, 0x86a65ac8
+0, 550800, 160, 0x447353fe
+0, 551700, 160, 0x48ca54a5
+0, 552600, 160, 0x1b3e5f3e
+0, 553500, 160, 0x270a5aa2
+0, 554400, 160, 0x48a45c29
+0, 555300, 160, 0xfbf75a0b
+0, 556200, 160, 0xe65161e5
+0, 557100, 160, 0xf47c6701
+0, 558000, 160, 0xc12058bc
+0, 558900, 160, 0xdb17520c
+0, 559800, 160, 0x860455bd
+0, 560700, 160, 0xa02d56de
+0, 561600, 160, 0xf5574c7d
+0, 562500, 160, 0x500e59b3
+0, 563400, 160, 0xf0b75894
+0, 564300, 160, 0x9d454a04
+0, 565200, 160, 0x0b0554a4
+0, 566100, 160, 0x3fc34d98
+0, 567000, 160, 0x538550b8
+0, 567900, 160, 0xd84e495e
+0, 568800, 160, 0x736c4e17
+0, 569700, 160, 0xa59e5607
+0, 570600, 160, 0xe7485609
+0, 571500, 160, 0x20185a67
+0, 572400, 160, 0x9aa5576f
+0, 573300, 160, 0xed8c5d11
+0, 574200, 160, 0xecef5494
+0, 575100, 160, 0x76f75a5c
+0, 576000, 160, 0xa8fa5322
+0, 576900, 160, 0xd1945734
+0, 577800, 160, 0x817f5c82
+0, 578700, 160, 0x40756063
+0, 579600, 160, 0x524454c7
+0, 580500, 160, 0x5a776106
+0, 581400, 160, 0xd16e5d9d
+0, 582300, 160, 0x8522524c
+0, 583200, 160, 0x4a115bb9
+0, 584100, 160, 0xbf5c5c27
+0, 585000, 160, 0x48905da4
+0, 585900, 160, 0x58735040
+0, 586800, 160, 0x48635631
+0, 587700, 160, 0xf1305eaf
+0, 588600, 160, 0xd34451bd
+0, 589500, 160, 0x1a244fcf
+0, 590400, 160, 0xdb995ca0
+0, 591300, 160, 0xe38e52bb
+0, 592200, 160, 0x00715069
+0, 593100, 160, 0x72a95190
+0, 594000, 160, 0xea7d50b7
+0, 594900, 160, 0xb4094a9c
+0, 595800, 160, 0xd5284d79
+0, 596700, 160, 0x3c4349e5
+0, 597600, 160, 0x65d34e92
+0, 598500, 160, 0x67805756
+0, 599400, 160, 0x1b96502f
+0, 600300, 160, 0x395250ae
+0, 601200, 160, 0x4dc74976
+0, 602100, 160, 0x2666486e
+0, 603000, 160, 0x41924d01
+0, 603900, 160, 0x94a845f5
+0, 604800, 160, 0x1b264cf9
+0, 605700, 160, 0x63ea4aab
+0, 606600, 160, 0x9c0d4a82
+0, 607500, 160, 0x02ba4cf6
+0, 608400, 160, 0x9cd54b87
+0, 609300, 160, 0x24624c5b
+0, 610200, 160, 0x14cf54b1
+0, 611100, 160, 0xce54544b
+0, 612000, 160, 0x459b4fc9
+0, 612900, 160, 0xcc2453f1
+0, 613800, 160, 0xa4ab53bc
+0, 614700, 160, 0x92235013
+0, 615600, 160, 0xbfa257b3
+0, 616500, 160, 0xd32d51f5
+0, 617400, 160, 0x7d5d47e6
+0, 618300, 160, 0xe23d43ed
+0, 619200, 160, 0x51d8514f
+0, 620100, 160, 0x0fa04240
+0, 621000, 160, 0x233c4dce
+0, 621900, 160, 0xcd30466f
+0, 622800, 160, 0x4435546a
+0, 623700, 160, 0x3eb6445b
+0, 624600, 160, 0xcaed4ef9
+0, 625500, 160, 0xf0174da8
+0, 626400, 160, 0x60e756a0
+0, 627300, 160, 0x72ba457d
+0, 628200, 160, 0x84ce4f0f
+0, 629100, 160, 0x660d45ae
+0, 630000, 160, 0xac8446e2
+0, 630900, 160, 0xeeb153b4
+0, 631800, 160, 0x6a634c23
+0, 632700, 160, 0x890f4af8
+0, 633600, 160, 0x1d3743a7
+0, 634500, 160, 0xa37e4ee8
+0, 635400, 160, 0xb9334d56
+0, 636300, 160, 0xc1384bef
+0, 637200, 160, 0x52964f6e
+0, 638100, 160, 0xe36e57e2
+0, 639000, 160, 0x62114a53
+0, 639900, 160, 0xb1f855bb
+0, 640800, 160, 0xf0934da0
+0, 641700, 160, 0xb454494a
+0, 642600, 160, 0xb6e04b15
+0, 643500, 160, 0x933e488e
+0, 644400, 160, 0x762d5ce8
+0, 645300, 160, 0x1c4a4f85
+0, 646200, 160, 0xaaa25313
+0, 647100, 160, 0xd3655979
+0, 648000, 160, 0x8ff149e5
+0, 648900, 160, 0x5d5e51fb
+0, 649800, 160, 0x0a354c51
+0, 650700, 160, 0x79ea52ee
+0, 651600, 160, 0x306e5365
+0, 652500, 160, 0x7e03546a
+0, 653400, 160, 0x71575ddf
+0, 654300, 160, 0x08da523d
+0, 655200, 160, 0x2a2152b2
+0, 656100, 160, 0x50e55447
+0, 657000, 160, 0xf3b55758
+0, 657900, 160, 0xc29d5f12
+0, 658800, 160, 0x0c0b5778
+0, 659700, 160, 0x1b07593a
+0, 660600, 160, 0x946f562d
+0, 661500, 160, 0xcdc85636
+0, 662400, 160, 0x2421589b
+0, 663300, 160, 0x8e3b5451
+0, 664200, 160, 0xd565536a
+0, 665100, 160, 0x8d225557
+0, 666000, 160, 0xa0084e44
+0, 666900, 160, 0x85bd5413
+0, 667800, 160, 0xa4be4c3b
+0, 668700, 160, 0x332957c8
+0, 669600, 160, 0x60505225
+0, 670500, 160, 0x3d154eb3
+0, 671400, 160, 0xd85359f4
+0, 672300, 160, 0xf95b4f6b
+0, 673200, 160, 0x8bea5846
+0, 674100, 160, 0x43835a02
+0, 675000, 160, 0x340b5732
+0, 675900, 160, 0x8b6d5005
+0, 676800, 160, 0xa4995aca
+0, 677700, 160, 0x88d34efc
+0, 678600, 160, 0x078e5003
+0, 679500, 160, 0x09964b19
+0, 680400, 160, 0x2eaf5120
+0, 681300, 160, 0x52514d52
+0, 682200, 160, 0x08f84d4c
+0, 683100, 160, 0x4a9b4cc7
+0, 684000, 160, 0x947f4ca6
+0, 684900, 160, 0x086a4f32
+0, 685800, 160, 0x0e0857a6
+0, 686700, 160, 0x38145bf7
+0, 687600, 160, 0xc6e156bf
+0, 688500, 160, 0xb07853b2
+0, 689400, 160, 0xaeda5172
+0, 690300, 160, 0xc4e54d07
+0, 691200, 160, 0x0b075a61
+0, 692100, 160, 0x09f05c1f
+0, 693000, 160, 0xf5415796
+0, 693900, 160, 0xe3be584e
+0, 694800, 160, 0x6e1656f9
+0, 695700, 160, 0xd6d85599
+0, 696600, 160, 0xd9b4502e
+0, 697500, 160, 0x1186598c
+0, 698400, 160, 0x879c543d
+0, 699300, 160, 0x5b2551a3
+0, 700200, 160, 0xcf50528d
+0, 701100, 160, 0x95d059b2
+0, 702000, 160, 0x34ba5515
+0, 702900, 160, 0x7a014ba8
+0, 703800, 160, 0x27725169
+0, 704700, 160, 0x2fd14ca4
+0, 705600, 160, 0xd5ad542a
+0, 706500, 160, 0xddc24d2e
+0, 707400, 160, 0x8a4b48b4
+0, 708300, 160, 0x915e4a29
+0, 709200, 160, 0xd56d4cae
+0, 710100, 160, 0x59594eea
+0, 711000, 160, 0x87085338
+0, 711900, 160, 0xa5ee538f
+0, 712800, 160, 0xf34e5030
+0, 713700, 160, 0x6bef4da7
+0, 714600, 160, 0x05a14c52
+0, 715500, 160, 0x67bc49ce
+0, 716400, 160, 0xb18f4cff
+0, 717300, 160, 0x5d744e6d
+0, 718200, 160, 0xcb7c5973
+0, 719100, 160, 0x6df056f0
+0, 720000, 160, 0xd62c4e00
+0, 720900, 160, 0xa54d4d1e
+0, 721800, 160, 0xdaa250b0
+0, 722700, 160, 0x350e475f
+0, 723600, 160, 0x0e454bb2
+0, 724500, 160, 0xe37949ca
+0, 725400, 160, 0x551453bf
+0, 726300, 160, 0x35d04c27
+0, 727200, 160, 0x6749469d
+0, 728100, 160, 0x544752e9
+0, 729000, 160, 0xf23b4888
+0, 729900, 160, 0x6f0a5519
+0, 730800, 160, 0x808a58df
+0, 731700, 160, 0x8e674c88
+0, 732600, 160, 0xd3ab51f7
+0, 733500, 160, 0x985d500f
+0, 734400, 160, 0x734e52d8
+0, 735300, 160, 0xb0da5227
+0, 736200, 160, 0xcc7d4a21
+0, 737100, 160, 0xb1354baf
+0, 738000, 160, 0xfc8d4f9a
+0, 738900, 160, 0x6f044d82
+0, 739800, 160, 0x41e7546b
+0, 740700, 160, 0x67014682
+0, 741600, 160, 0x5516575b
+0, 742500, 160, 0x26254693
+0, 743400, 160, 0x81ce4af5
+0, 744300, 160, 0x77f152a0
+0, 745200, 160, 0x995a5096
+0, 746100, 160, 0x6114532e
+0, 747000, 160, 0x4df457f3
+0, 747900, 160, 0xbcd94804
+0, 748800, 160, 0x1e544fd2
+0, 749700, 160, 0xa70b5954
+0, 750600, 160, 0x1c77484c
+0, 751500, 160, 0xb07f4c42
+0, 752400, 160, 0x62074f1f
+0, 753300, 160, 0xf3b656a1
+0, 754200, 160, 0x65734ac0
+0, 755100, 160, 0x2a9752cd
+0, 756000, 160, 0x15ff4ef0
+0, 756900, 160, 0xabd4532c
+0, 757800, 160, 0x8a44503a
+0, 758700, 160, 0xbf4250f3
+0, 759600, 160, 0x17594ac5
+0, 760500, 160, 0x7b5e4b24
+0, 761400, 160, 0x24684cb5
+0, 762300, 160, 0xc4d54b42
+0, 763200, 160, 0xd48f58af
+0, 764100, 160, 0x0374593a
+0, 765000, 160, 0x398a5b0d
+0, 765900, 160, 0xf60855e6
+0, 766800, 160, 0x6fbb5587
+0, 767700, 160, 0x44405c2b
+0, 768600, 160, 0xa6345d70
+0, 769500, 160, 0x464557d5
+0, 770400, 160, 0x0c3153ca
+0, 771300, 160, 0x15ec50c4
+0, 772200, 160, 0xd5e559da
+0, 773100, 160, 0x999757b9
+0, 774000, 160, 0x7a5d5754
+0, 774900, 160, 0xf85b5f18
+0, 775800, 160, 0xa66d5c72
+0, 776700, 160, 0xd8f55981
+0, 777600, 160, 0xe6364f64
+0, 778500, 160, 0x528a5785
+0, 779400, 160, 0xdefe5332
+0, 780300, 160, 0x4bc4532e
+0, 781200, 160, 0x505a4eb3
+0, 782100, 160, 0xa28d589d
+0, 783000, 160, 0x092d511f
+0, 783900, 160, 0x3079591e
+0, 784800, 160, 0x2b1d5339
+0, 785700, 160, 0xf8d849d1
+0, 786600, 160, 0xadb056a6
+0, 787500, 160, 0x2ee74c4f
+0, 788400, 160, 0x35c34c9f
+0, 789300, 160, 0xb6ae53d3
+0, 790200, 160, 0x7258534e
+0, 791100, 160, 0xb76d4b1b
+0, 792000, 160, 0x99a14a0f
+0, 792900, 160, 0x88365944
+0, 793800, 160, 0x97cf4aed
+0, 794700, 160, 0x444b56f6
+0, 795600, 160, 0x1d1f4b01
+0, 796500, 160, 0x3dcd417e
+0, 797400, 160, 0xa4985140
+0, 798300, 160, 0x86f94c4d
+0, 799200, 160, 0xc3635436
+0, 800100, 160, 0x198b432b
+0, 801000, 160, 0xae5253e4
+0, 801900, 160, 0x248c4f1a
+0, 802800, 160, 0x787a45df
+0, 803700, 160, 0x5fd44cad
+0, 804600, 160, 0x68be581c
+0, 805500, 160, 0x5ff5531b
+0, 806400, 160, 0x2bcd4aa1
+0, 807300, 160, 0x0d134a7c
+0, 808200, 160, 0x28af5885
+0, 809100, 160, 0xc09f4d65
+0, 810000, 160, 0x7468552d
+0, 810900, 160, 0x82df49ac
+0, 811800, 160, 0xe3725fdc
+0, 812700, 160, 0x0ec74d11
+0, 813600, 160, 0xfc2a5355
+0, 814500, 160, 0x41df4d4f
+0, 815400, 160, 0x4ebe473d
+0, 816300, 160, 0xd8734bf2
+0, 817200, 160, 0x4acd5056
+0, 818100, 160, 0x47805700
+0, 819000, 160, 0xe4f25135
+0, 819900, 160, 0x9f195649
+0, 820800, 160, 0x8b055f64
+0, 821700, 160, 0xc4b751c8
+0, 822600, 160, 0x95e55ba4
+0, 823500, 160, 0xf0955494
+0, 824400, 160, 0xca1a47b9
+0, 825300, 160, 0x9d025711
+0, 826200, 160, 0xf6cb4a0a
+0, 827100, 160, 0xd8385b4d
+0, 828000, 160, 0x7b2852b6
+0, 828900, 160, 0x90a35643
+0, 829800, 160, 0x63105d0a
+0, 830700, 160, 0x55414083
+0, 831600, 160, 0xc94554a9
+0, 832500, 160, 0xa88f4a36
+0, 833400, 160, 0xda5d52bc
+0, 834300, 160, 0x5b3943da
+0, 835200, 160, 0xd2314755
+0, 836100, 160, 0x743c4cdc
+0, 837000, 160, 0x7c3e4dc2
+0, 837900, 160, 0x12644715
+0, 838800, 160, 0x1050480b
+0, 839700, 160, 0x73645906
+0, 840600, 160, 0x28ef4a9e
+0, 841500, 160, 0xf72440bc
+0, 842400, 160, 0x41964bda
+0, 843300, 160, 0x2afb4d9b
+0, 844200, 160, 0xf74b4c5a
+0, 845100, 160, 0xcf165e2e
+0, 846000, 160, 0x3dbb4d06
+0, 846900, 160, 0xbd9755f9
+0, 847800, 160, 0x3248581d
+0, 848700, 160, 0xc00c559d
+0, 849600, 160, 0xff6c4b0a
+0, 850500, 160, 0x154157e3
+0, 851400, 160, 0xb996499c
+0, 852300, 160, 0xe1a059ba
+0, 853200, 160, 0x98015946
+0, 854100, 160, 0x168b4ceb
+0, 855000, 160, 0x567b4f83
+0, 855900, 160, 0x903e52f8
+0, 856800, 160, 0xc0a252dc
+0, 857700, 160, 0x08cb4b70
+0, 858600, 160, 0x3d9a5be6
+0, 859500, 160, 0x904b4907
+0, 860400, 160, 0x738847b1
+0, 861300, 160, 0x10405c19
+0, 862200, 160, 0x8c134f27
+0, 863100, 160, 0xdfe34d7f
+0, 864000, 160, 0x9d0948a8
+0, 864900, 160, 0x67755611
+0, 865800, 160, 0x46734258
+0, 866700, 160, 0x76f449fa
+0, 867600, 160, 0xfad64d30
+0, 868500, 160, 0x7f4357f4
+0, 869400, 160, 0xd20e5079
+0, 870300, 160, 0xdf7857ec
+0, 871200, 160, 0x46ff4891
+0, 872100, 160, 0x1b724ffc
+0, 873000, 160, 0xdf20545a
+0, 873900, 160, 0xeb5254e0
+0, 874800, 160, 0x794b4a96
+0, 875700, 160, 0x86a15147
+0, 876600, 160, 0x30f75504
+0, 877500, 160, 0x39575354
+0, 878400, 160, 0xb6a35351
+0, 879300, 160, 0x9da34c3a
+0, 880200, 160, 0xcf2d5386
+0, 881100, 160, 0xa7f353f6
+0, 882000, 160, 0xa6e34e95
+0, 882900, 160, 0x98174400
+0, 883800, 160, 0x13685641
+0, 884700, 160, 0x99215154
+0, 885600, 160, 0x5be75237
+0, 886500, 160, 0x4cb64942
+0, 887400, 160, 0x15de4e03
+0, 888300, 160, 0x613a4fd5
+0, 889200, 160, 0xc97c4821
+0, 890100, 160, 0xbf1558f2
+0, 891000, 160, 0x651d4cf4
+0, 891900, 160, 0xbee44a56
+0, 892800, 160, 0x6cbd4c20
+0, 893700, 160, 0xcf45493d
+0, 894600, 160, 0x73e74d2a
+0, 895500, 160, 0x6a3256e4
+0, 896400, 160, 0x89ac4a68
+0, 897300, 160, 0x0d2652aa
+0, 898200, 160, 0x56ce4b78
+0, 899100, 160, 0xb7b24bcb
diff --git a/tests/ref/fate/gapless-mp3 b/tests/ref/fate/gapless-mp3
new file mode 100644
index 0000000000..ab4f1a0456
--- /dev/null
+++ b/tests/ref/fate/gapless-mp3
@@ -0,0 +1,5 @@
+44b42cc3a898b45507d856d0813f4f26 *tests/data/fate/gapless-mp3.out-1
+c96c3ae7bd3300fd2f4debac222de5b7
+ec876434ed65e338e07234e54d136caf *tests/data/fate/gapless-mp3.out-2
+c96c3ae7bd3300fd2f4debac222de5b7
+806fd80eba887b46a1eba1eeff63df28 *tests/data/fate/gapless-mp3.out-3
diff --git a/tests/ref/fate/gaplessenc-itunes-to-ipod-aac b/tests/ref/fate/gaplessenc-itunes-to-ipod-aac
new file mode 100644
index 0000000000..76cbf22358
--- /dev/null
+++ b/tests/ref/fate/gaplessenc-itunes-to-ipod-aac
@@ -0,0 +1,43 @@
+[STREAM]
+index=0
+start_pts=0
+duration_ts=103326
+[/STREAM]
+[FORMAT]
+start_time=0.000000
+duration=2.367000
+[/FORMAT]
+packet|pts=-1024|dts=-1024|duration=1024|flags=KDside_data|
+
+packet|pts=0|dts=0|duration=1024|flags=K_
+packet|pts=1024|dts=1024|duration=1024|flags=K_
+packet|pts=2048|dts=2048|duration=1024|flags=K_
+packet|pts=3072|dts=3072|duration=1024|flags=K_
+packet|pts=4096|dts=4096|duration=1024|flags=K_
+packet|pts=5120|dts=5120|duration=1024|flags=K_
+packet|pts=95232|dts=95232|duration=1024|flags=K_
+packet|pts=96256|dts=96256|duration=1024|flags=K_
+packet|pts=97280|dts=97280|duration=1024|flags=K_
+packet|pts=98304|dts=98304|duration=1024|flags=K_
+packet|pts=99328|dts=99328|duration=1024|flags=K_
+packet|pts=100352|dts=100352|duration=1024|flags=K_
+packet|pts=101376|dts=101376|duration=1024|flags=K_
+packet|pts=102400|dts=102400|duration=926|flags=K_
+stream|nb_read_packets=102
+frame|pkt_pts=0|pkt_dts=0|best_effort_timestamp=0|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=1024|pkt_dts=1024|best_effort_timestamp=1024|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=2048|pkt_dts=2048|best_effort_timestamp=2048|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=3072|pkt_dts=3072|best_effort_timestamp=3072|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=4096|pkt_dts=4096|best_effort_timestamp=4096|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=5120|pkt_dts=5120|best_effort_timestamp=5120|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=6144|pkt_dts=6144|best_effort_timestamp=6144|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=7168|pkt_dts=7168|best_effort_timestamp=7168|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=95232|pkt_dts=95232|best_effort_timestamp=95232|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=96256|pkt_dts=96256|best_effort_timestamp=96256|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=97280|pkt_dts=97280|best_effort_timestamp=97280|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=98304|pkt_dts=98304|best_effort_timestamp=98304|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=99328|pkt_dts=99328|best_effort_timestamp=99328|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=100352|pkt_dts=100352|best_effort_timestamp=100352|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=101376|pkt_dts=101376|best_effort_timestamp=101376|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=102400|pkt_dts=102400|best_effort_timestamp=102400|pkt_duration=926|nb_samples=1024
+stream|nb_read_frames=101
diff --git a/tests/ref/fate/gaplessenc-pcm-to-mov-aac b/tests/ref/fate/gaplessenc-pcm-to-mov-aac
new file mode 100644
index 0000000000..2b17956e2b
--- /dev/null
+++ b/tests/ref/fate/gaplessenc-pcm-to-mov-aac
@@ -0,0 +1,43 @@
+[STREAM]
+index=0
+start_pts=0
+duration_ts=529200
+[/STREAM]
+[FORMAT]
+start_time=0.000000
+duration=12.024000
+[/FORMAT]
+packet|pts=-1024|dts=-1024|duration=1024|flags=KDside_data|
+
+packet|pts=0|dts=0|duration=1024|flags=K_
+packet|pts=1024|dts=1024|duration=1024|flags=K_
+packet|pts=2048|dts=2048|duration=1024|flags=K_
+packet|pts=3072|dts=3072|duration=1024|flags=K_
+packet|pts=4096|dts=4096|duration=1024|flags=K_
+packet|pts=5120|dts=5120|duration=1024|flags=K_
+packet|pts=521216|dts=521216|duration=1024|flags=K_
+packet|pts=522240|dts=522240|duration=1024|flags=K_
+packet|pts=523264|dts=523264|duration=1024|flags=K_
+packet|pts=524288|dts=524288|duration=1024|flags=K_
+packet|pts=525312|dts=525312|duration=1024|flags=K_
+packet|pts=526336|dts=526336|duration=1024|flags=K_
+packet|pts=527360|dts=527360|duration=1024|flags=K_
+packet|pts=528384|dts=528384|duration=816|flags=K_
+stream|nb_read_packets=518
+frame|pkt_pts=0|pkt_dts=0|best_effort_timestamp=0|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=1024|pkt_dts=1024|best_effort_timestamp=1024|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=2048|pkt_dts=2048|best_effort_timestamp=2048|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=3072|pkt_dts=3072|best_effort_timestamp=3072|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=4096|pkt_dts=4096|best_effort_timestamp=4096|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=5120|pkt_dts=5120|best_effort_timestamp=5120|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=6144|pkt_dts=6144|best_effort_timestamp=6144|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=7168|pkt_dts=7168|best_effort_timestamp=7168|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=521216|pkt_dts=521216|best_effort_timestamp=521216|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=522240|pkt_dts=522240|best_effort_timestamp=522240|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=523264|pkt_dts=523264|best_effort_timestamp=523264|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=524288|pkt_dts=524288|best_effort_timestamp=524288|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=525312|pkt_dts=525312|best_effort_timestamp=525312|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=526336|pkt_dts=526336|best_effort_timestamp=526336|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=527360|pkt_dts=527360|best_effort_timestamp=527360|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=528384|pkt_dts=528384|best_effort_timestamp=528384|pkt_duration=816|nb_samples=1024
+stream|nb_read_frames=517
diff --git a/tests/ref/fate/gaplessinfo-itunes1 b/tests/ref/fate/gaplessinfo-itunes1
new file mode 100644
index 0000000000..bb5c09ad34
--- /dev/null
+++ b/tests/ref/fate/gaplessinfo-itunes1
@@ -0,0 +1,43 @@
+[STREAM]
+index=0
+start_pts=2112
+duration_ts=1294336
+[/STREAM]
+[FORMAT]
+start_time=0.047889
+duration=29.350023
+[/FORMAT]
+packet|pts=0|dts=0|duration=1024|flags=K_side_data|
+
+packet|pts=1024|dts=1024|duration=1024|flags=K_
+packet|pts=2048|dts=2048|duration=1024|flags=K_
+packet|pts=3072|dts=3072|duration=1024|flags=K_
+packet|pts=4096|dts=4096|duration=1024|flags=K_
+packet|pts=5120|dts=5120|duration=1024|flags=K_
+packet|pts=6144|dts=6144|duration=1024|flags=K_
+packet|pts=1286144|dts=1286144|duration=1024|flags=K_
+packet|pts=1287168|dts=1287168|duration=1024|flags=K_
+packet|pts=1288192|dts=1288192|duration=1024|flags=K_
+packet|pts=1289216|dts=1289216|duration=1024|flags=K_
+packet|pts=1290240|dts=1290240|duration=1024|flags=K_
+packet|pts=1291264|dts=1291264|duration=1024|flags=K_
+packet|pts=1292288|dts=1292288|duration=1024|flags=K_
+packet|pts=1293312|dts=1293312|duration=1024|flags=K_
+stream|nb_read_packets=1264
+frame|pkt_pts=2112|pkt_dts=2112|best_effort_timestamp=2048|pkt_duration=960|nb_samples=960
+frame|pkt_pts=3072|pkt_dts=3072|best_effort_timestamp=3072|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=4096|pkt_dts=4096|best_effort_timestamp=4096|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=5120|pkt_dts=5120|best_effort_timestamp=5120|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=6144|pkt_dts=6144|best_effort_timestamp=6144|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=7168|pkt_dts=7168|best_effort_timestamp=7168|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=8192|pkt_dts=8192|best_effort_timestamp=8192|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=9216|pkt_dts=9216|best_effort_timestamp=9216|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=1286144|pkt_dts=1286144|best_effort_timestamp=1286144|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=1287168|pkt_dts=1287168|best_effort_timestamp=1287168|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=1288192|pkt_dts=1288192|best_effort_timestamp=1288192|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=1289216|pkt_dts=1289216|best_effort_timestamp=1289216|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=1290240|pkt_dts=1290240|best_effort_timestamp=1290240|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=1291264|pkt_dts=1291264|best_effort_timestamp=1291264|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=1292288|pkt_dts=1292288|best_effort_timestamp=1292288|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=1293312|pkt_dts=1293312|best_effort_timestamp=1293312|pkt_duration=1024|nb_samples=1024
+stream|nb_read_frames=1262
diff --git a/tests/ref/fate/gaplessinfo-itunes2 b/tests/ref/fate/gaplessinfo-itunes2
new file mode 100644
index 0000000000..0603ba8bf2
--- /dev/null
+++ b/tests/ref/fate/gaplessinfo-itunes2
@@ -0,0 +1,43 @@
+[STREAM]
+index=0
+start_pts=2112
+duration_ts=105472
+[/STREAM]
+[FORMAT]
+start_time=0.047891
+duration=2.391655
+[/FORMAT]
+packet|pts=0|dts=0|duration=1024|flags=K_side_data|
+
+packet|pts=1024|dts=1024|duration=1024|flags=K_
+packet|pts=2048|dts=2048|duration=1024|flags=K_
+packet|pts=3072|dts=3072|duration=1024|flags=K_
+packet|pts=4096|dts=4096|duration=1024|flags=K_
+packet|pts=5120|dts=5120|duration=1024|flags=K_
+packet|pts=6144|dts=6144|duration=1024|flags=K_
+packet|pts=97280|dts=97280|duration=1024|flags=K_
+packet|pts=98304|dts=98304|duration=1024|flags=K_
+packet|pts=99328|dts=99328|duration=1024|flags=K_
+packet|pts=100352|dts=100352|duration=1024|flags=K_
+packet|pts=101376|dts=101376|duration=1024|flags=K_
+packet|pts=102400|dts=102400|duration=1024|flags=K_
+packet|pts=103424|dts=103424|duration=1024|flags=K_
+packet|pts=104448|dts=104448|duration=1024|flags=K_
+stream|nb_read_packets=103
+frame|pkt_pts=2112|pkt_dts=2112|best_effort_timestamp=2048|pkt_duration=960|nb_samples=960
+frame|pkt_pts=3072|pkt_dts=3072|best_effort_timestamp=3072|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=4096|pkt_dts=4096|best_effort_timestamp=4096|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=5120|pkt_dts=5120|best_effort_timestamp=5120|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=6144|pkt_dts=6144|best_effort_timestamp=6144|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=7168|pkt_dts=7168|best_effort_timestamp=7168|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=8192|pkt_dts=8192|best_effort_timestamp=8192|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=9216|pkt_dts=9216|best_effort_timestamp=9216|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=97280|pkt_dts=97280|best_effort_timestamp=97280|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=98304|pkt_dts=98304|best_effort_timestamp=98304|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=99328|pkt_dts=99328|best_effort_timestamp=99328|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=100352|pkt_dts=100352|best_effort_timestamp=100352|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=101376|pkt_dts=101376|best_effort_timestamp=101376|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=102400|pkt_dts=102400|best_effort_timestamp=102400|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=103424|pkt_dts=103424|best_effort_timestamp=103424|pkt_duration=1024|nb_samples=1024
+frame|pkt_pts=104448|pkt_dts=104448|best_effort_timestamp=104448|pkt_duration=1024|nb_samples=1024
+stream|nb_read_frames=101
diff --git a/tests/ref/fate/gif-color b/tests/ref/fate/gif-color
new file mode 100644
index 0000000000..c88a05deee
--- /dev/null
+++ b/tests/ref/fate/gif-color
@@ -0,0 +1,178 @@
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 217x217
+#sar 0: 0/1
+0,          0,          0,        1,   188356, 0xf0944065
+0,          1,          1,        1,   188356, 0x146ed4c4
+0,          2,          2,        1,   188356, 0x96866a6f
+0,          3,          3,        1,   188356, 0xe15e1f1c
+0,          4,          4,        1,   188356, 0x0662c1d0
+0,          5,          5,        1,   188356, 0x88fa6cc4
+0,          6,          6,        1,   188356, 0x3cce2f71
+0,          7,          7,        1,   188356, 0x1510f9f3
+0,          8,          8,        1,   188356, 0xf27e9fa8
+0,          9,          9,        1,   188356, 0x0f4b64a2
+0,         10,         10,        1,   188356, 0x3d2714a5
+0,         11,         11,        1,   188356, 0x392ce45d
+0,         12,         12,        1,   188356, 0x2eadb79f
+0,         13,         13,        1,   188356, 0x68109314
+0,         14,         14,        1,   188356, 0x4eca71ac
+0,         15,         15,        1,   188356, 0xa9aa5907
+0,         16,         16,        1,   188356, 0x2a5d08c0
+0,         17,         17,        1,   188356, 0x942bba84
+0,         18,         18,        1,   188356, 0xbee38983
+0,         19,         19,        1,   188356, 0xa0d65a5a
+0,         20,         20,        1,   188356, 0x47270bee
+0,         21,         21,        1,   188356, 0xc020dc40
+0,         22,         22,        1,   188356, 0x978dbc8f
+0,         23,         23,        1,   188356, 0x6b1e9f1b
+0,         24,         24,        1,   188356, 0xd8078bf4
+0,         25,         25,        1,   188356, 0x94ca7bd7
+0,         26,         26,        1,   188356, 0xac745e77
+0,         27,         27,        1,   188356, 0x73154f2c
+0,         28,         28,        1,   188356, 0x31200601
+0,         29,         29,        1,   188356, 0x6525dd42
+0,         30,         30,        1,   188356, 0xa29b985a
+0,         31,         31,        1,   188356, 0xe3e074d8
+0,         32,         32,        1,   188356, 0xb87b3222
+0,         33,         33,        1,   188356, 0x5b9a11f2
+0,         34,         34,        1,   188356, 0x25f7f8c9
+0,         35,         35,        1,   188356, 0x0235e93c
+0,         36,         36,        1,   188356, 0x2a42d643
+0,         37,         37,        1,   188356, 0xfb7acddb
+0,         38,         38,        1,   188356, 0xecbbbf5e
+0,         39,         39,        1,   188356, 0xeba4bc9a
+0,         40,         40,        1,   188356, 0x4317b36b
+0,         41,         41,        1,   188356, 0x7316ae1a
+0,         42,         42,        1,   188356, 0xb5ccad05
+0,         43,         43,        1,   188356, 0x38afb0dc
+0,         44,         44,        1,   188356, 0xf11cad55
+0,         45,         45,        1,   188356, 0x3d77b400
+0,         46,         46,        1,   188356, 0xf084b9b9
+0,         47,         47,        1,   188356, 0x02a4c584
+0,         48,         48,        1,   188356, 0x14f4d52e
+0,         49,         49,        1,   188356, 0x55118432
+0,         50,         50,        1,   188356, 0x4ad82e9f
+0,         51,         51,        1,   188356, 0xc6eafc52
+0,         52,         52,        1,   188356, 0xf4bdc575
+0,         53,         53,        1,   188356, 0x8429689e
+0,         54,         54,        1,   188356, 0xaa23019e
+0,         55,         55,        1,   188356, 0xaf52c3a5
+0,         56,         56,        1,   188356, 0x1d387c32
+0,         57,         57,        1,   188356, 0x543d5cd2
+0,         58,         58,        1,   188356, 0x8cdb399c
+0,         59,         59,        1,   188356, 0xcceb292f
+0,         60,         60,        1,   188356, 0xa87115e8
+0,         61,         61,        1,   188356, 0x9665ec8f
+0,         62,         62,        1,   188356, 0xad99baf4
+0,         63,         63,        1,   188356, 0xc6e5a2b5
+0,         64,         64,        1,   188356, 0xe2a48359
+0,         65,         65,        1,   188356, 0x3a270df0
+0,         66,         66,        1,   188356, 0xcc34826b
+0,         67,         67,        1,   188356, 0x15ec2dcc
+0,         68,         68,        1,   188356, 0x8874c5f9
+0,         69,         69,        1,   188356, 0x829966e8
+0,         70,         70,        1,   188356, 0x691f1ebb
+0,         71,         71,        1,   188356, 0x00e3e184
+0,         72,         72,        1,   188356, 0x97739332
+0,         73,         73,        1,   188356, 0x507769aa
+0,         74,         74,        1,   188356, 0xddfb3069
+0,         75,         75,        1,   188356, 0x7296f749
+0,         76,         76,        1,   188356, 0x0555ca32
+0,         77,         77,        1,   188356, 0x4554c683
+0,         78,         78,        1,   188356, 0x2398c10f
+0,         79,         79,        1,   188356, 0x1c5ccfa0
+0,         80,         80,        1,   188356, 0xa580f3c8
+0,         81,         81,        1,   188356, 0x4fadea78
+0,         82,         82,        1,   188356, 0x4a57db38
+0,         83,         83,        1,   188356, 0x9e98df6d
+0,         84,         84,        1,   188356, 0xfeb3dec9
+0,         85,         85,        1,   188356, 0xbf16ef7a
+0,         86,         86,        1,   188356, 0xdc23fc48
+0,         87,         87,        1,   188356, 0x3bf2e401
+0,         88,         88,        1,   188356, 0xc832bcf4
+0,         89,         89,        1,   188356, 0x977db44f
+0,         90,         90,        1,   188356, 0x18d39d96
+0,         91,         91,        1,   188356, 0x9adf60d8
+0,         92,         92,        1,   188356, 0x567b667a
+0,         93,         93,        1,   188356, 0xd4a45e8e
+0,         94,         94,        1,   188356, 0x94a24cc7
+0,         95,         95,        1,   188356, 0x086f0a53
+0,         96,         96,        1,   188356, 0xcbf3ebcb
+0,         97,         97,        1,   188356, 0x1a40a7b9
+0,         98,         98,        1,   188356, 0xe16d8964
+0,         99,         99,        1,   188356, 0x3edd7dfa
+0,        100,        100,        1,   188356, 0xba417fa5
+0,        101,        101,        1,   188356, 0x734a7611
+0,        102,        102,        1,   188356, 0xfa1e7b1e
+0,        103,        103,        1,   188356, 0x1af23355
+0,        104,        104,        1,   188356, 0x28d41390
+0,        105,        105,        1,   188356, 0x2838c58d
+0,        106,        106,        1,   188356, 0x4e2ba2a8
+0,        107,        107,        1,   188356, 0xcedc99ae
+0,        108,        108,        1,   188356, 0xb06ba12d
+0,        109,        109,        1,   188356, 0x38c997b6
+0,        110,        110,        1,   188356, 0x12dba0dc
+0,        111,        111,        1,   188356, 0x5f86496a
+0,        112,        112,        1,   188356, 0x0b74216d
+0,        113,        113,        1,   188356, 0xdbddbada
+0,        114,        114,        1,   188356, 0x7d168af2
+0,        115,        115,        1,   188356, 0x22d4462b
+0,        116,        116,        1,   188356, 0xc248265d
+0,        117,        117,        1,   188356, 0x37a41b0d
+0,        118,        118,        1,   188356, 0x9ebd24f1
+0,        119,        119,        1,   188356, 0xf21f1633
+0,        120,        120,        1,   188356, 0x1db62004
+0,        121,        121,        1,   188356, 0xcc241ac1
+0,        122,        122,        1,   188356, 0x224d2637
+0,        123,        123,        1,   188356, 0x1bd8390c
+0,        124,        124,        1,   188356, 0xd8e64966
+0,        125,        125,        1,   188356, 0x96e66287
+0,        126,        126,        1,   188356, 0xa83c9a32
+0,        127,        127,        1,   188356, 0x3a5faeba
+0,        128,        128,        1,   188356, 0x8200cd87
+0,        129,        129,        1,   188356, 0x6326e591
+0,        130,        130,        1,   188356, 0xb5d70993
+0,        131,        131,        1,   188356, 0x954d5da2
+0,        132,        132,        1,   188356, 0x38b1788b
+0,        133,        133,        1,   188356, 0x4aafa131
+0,        134,        134,        1,   188356, 0xaff2be78
+0,        135,        135,        1,   188356, 0x9bd7eb69
+0,        136,        136,        1,   188356, 0x0d2b17c9
+0,        137,        137,        1,   188356, 0xf5d8a764
+0,        138,        138,        1,   188356, 0xa302dfb2
+0,        139,        139,        1,   188356, 0xe8a32ac1
+0,        140,        140,        1,   188356, 0x50a8470d
+0,        141,        141,        1,   188356, 0x52826061
+0,        142,        142,        1,   188356, 0x26e88798
+0,        143,        143,        1,   188356, 0x1448acb8
+0,        144,        144,        1,   188356, 0xfb380972
+0,        145,        145,        1,   188356, 0x184976e8
+0,        146,        146,        1,   188356, 0xa349a871
+0,        147,        147,        1,   188356, 0x617ed8b1
+0,        148,        148,        1,   188356, 0xb6bc1425
+0,        149,        149,        1,   188356, 0xafe74efd
+0,        150,        150,        1,   188356, 0x0b8b61e5
+0,        151,        151,        1,   188356, 0xc6ad67a7
+0,        152,        152,        1,   188356, 0x4da186fe
+0,        153,        153,        1,   188356, 0xe08f9975
+0,        154,        154,        1,   188356, 0xa43f8ba4
+0,        155,        155,        1,   188356, 0xcad4b6b5
+0,        156,        156,        1,   188356, 0x7e70d51e
+0,        157,        157,        1,   188356, 0x429b0b5b
+0,        158,        158,        1,   188356, 0xea92350d
+0,        159,        159,        1,   188356, 0x9a7440f8
+0,        160,        160,        1,   188356, 0x63a2be6e
+0,        161,        161,        1,   188356, 0x59b64b50
+0,        162,        162,        1,   188356, 0x63c4a10e
+0,        163,        163,        1,   188356, 0x6146e5e0
+0,        164,        164,        1,   188356, 0x603b2ae5
+0,        165,        165,        1,   188356, 0x818bc774
+0,        166,        166,        1,   188356, 0xa5ce278f
+0,        167,        167,        1,   188356, 0x4d85684d
+0,        168,        168,        1,   188356, 0xbbda9cad
+0,        169,        169,        1,   188356, 0xfee2e78e
+0,        170,        170,        1,   188356, 0x681d2635
+0,        171,        171,        1,   188356, 0x05354903
+0,        172,        172,        1,   188356, 0x8eecac99
diff --git a/tests/ref/fate/gif-deal b/tests/ref/fate/gif-deal
new file mode 100644
index 0000000000..96b7723c1d
--- /dev/null
+++ b/tests/ref/fate/gif-deal
@@ -0,0 +1,31 @@
+#tb 0: 12/109
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 430x181
+#sar 0: 0/1
+0,          0,          0,        1,   311320, 0x71905396
+0,          1,          1,        1,   311320, 0xed46b01e
+0,          2,          2,        1,   311320, 0xcbb56aa8
+0,          3,          3,        1,   311320, 0xafaab599
+0,          4,          4,        1,   311320, 0x43133abf
+0,          5,          5,        1,   311320, 0xd9677d13
+0,          6,          6,        1,   311320, 0x78abea28
+0,          7,          7,        1,   311320, 0xcb6ca011
+0,          8,          8,        1,   311320, 0x8fd40670
+0,          9,          9,        1,   311320, 0x8fd40670
+0,         10,         10,        1,   311320, 0x8fd40670
+0,         11,         11,        1,   311320, 0x8fd40670
+0,         12,         12,        1,   311320, 0x8fd40670
+0,         13,         13,        1,   311320, 0x8fd40670
+0,         14,         14,        1,   311320, 0x8fd40670
+0,         15,         15,        1,   311320, 0x8fd40670
+0,         16,         16,        1,   311320, 0x8fd40670
+0,         17,         17,        1,   311320, 0x8fd40670
+0,         18,         18,        1,   311320, 0x8fd40670
+0,         19,         19,        1,   311320, 0x8fd40670
+0,         20,         20,        1,   311320, 0x8fd40670
+0,         21,         21,        1,   311320, 0x8fd40670
+0,         22,         22,        1,   311320, 0x8fd40670
+0,         23,         23,        1,   311320, 0x8fd40670
+0,         24,         24,        1,   311320, 0x8fd40670
+0,         25,         25,        1,   311320, 0x8fd40670
diff --git a/tests/ref/fate/gif-demux b/tests/ref/fate/gif-demux
new file mode 100644
index 0000000000..3d46441d8e
--- /dev/null
+++ b/tests/ref/fate/gif-demux
@@ -0,0 +1,41 @@
+#tb 0: 1/100
+#media_type 0: video
+#codec_id 0: gif
+#dimensions 0: 480x360
+#sar 0: 0/1
+0,          0,          0,        5,    74699, 0xef7e91c8
+0,          5,          5,        2,    10079, 0x2892d9e2, F=0x0
+0,          7,          7,        2,    12369, 0xd7d73286, F=0x0
+0,          9,          9,        2,     8868, 0x4bb59b6d, F=0x0
+0,         11,         11,        2,     8249, 0x23d5d174, F=0x0
+0,         13,         13,        2,     8381, 0x10acf0cd, F=0x0
+0,         15,         15,        2,     8579, 0xdfe108b2, F=0x0
+0,         17,         17,        2,     8200, 0x46ec6c55, F=0x0
+0,         19,         19,        2,     7261, 0xaf328999, F=0x0
+0,         21,         21,        4,     7047, 0xab3d2bd0, F=0x0
+0,         25,         25,        2,     6486, 0xa1629769, F=0x0
+0,         27,         27,        2,     7278, 0x4c55b7ce, F=0x0
+0,         29,         29,        2,     7761, 0x54368171, F=0x0
+0,         31,         31,        2,     7794, 0xbde2dbcd, F=0x0
+0,         33,         33,        2,     7935, 0xe6202c65, F=0x0
+0,         35,         35,        2,     8499, 0x1d5ceb7e, F=0x0
+0,         37,         37,        2,     8841, 0xc962be37, F=0x0
+0,         39,         39,        2,     9281, 0x7ec29c31, F=0x0
+0,         41,         41,        5,     9606, 0x3de06d48, F=0x0
+0,         46,         46,        2,     6319, 0xb3e94478, F=0x0
+0,         48,         48,        2,     5521, 0xc8157edc, F=0x0
+0,         50,         50,        2,     5052, 0x23e8ea7c, F=0x0
+0,         52,         52,        2,     4651, 0xa73f25c9, F=0x0
+0,         54,         54,        2,     4477, 0x1ddcc2c3, F=0x0
+0,         56,         56,        2,     4736, 0x6ead0d5e, F=0x0
+0,         58,         58,        2,     4609, 0x8bc7faa3, F=0x0
+0,         60,         60,        2,     4474, 0x3926975e, F=0x0
+0,         62,         62,        4,     4381, 0x28c392d5, F=0x0
+0,         66,         66,        2,     4443, 0x9c33b143, F=0x0
+0,         68,         68,        2,     4540, 0xb1d1c8b9, F=0x0
+0,         70,         70,        2,     4530, 0x773bc617, F=0x0
+0,         72,         72,        2,     4558, 0xa1e8cdf3, F=0x0
+0,         74,         74,        2,     4633, 0x8f64fda7, F=0x0
+0,         76,         76,        2,     4700, 0x45f40805, F=0x0
+0,         78,         78,        2,     5117, 0x4eb4c5fb, F=0x0
+0,         80,         80,        2,     5370, 0xb10c6910, F=0x0
diff --git a/tests/ref/fate/gif-disposal-background b/tests/ref/fate/gif-disposal-background
new file mode 100644
index 0000000000..cd0d827b46
--- /dev/null
+++ b/tests/ref/fate/gif-disposal-background
@@ -0,0 +1,10 @@
+#tb 0: 1/2
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 72x36
+#sar 0: 0/1
+0,          0,          0,        1,    10368, 0x8b200cc8
+0,          1,          1,        1,    10368, 0x4e208e4f
+0,          2,          2,        1,    10368, 0x044dba8b
+0,          3,          3,        1,    10368, 0x1d617e09
+0,          4,          4,        1,    10368, 0xae38a6d2
diff --git a/tests/ref/fate/gif-disposal-restore b/tests/ref/fate/gif-disposal-restore
new file mode 100644
index 0000000000..b1282f61de
--- /dev/null
+++ b/tests/ref/fate/gif-disposal-restore
@@ -0,0 +1,8 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 468x60
+#sar 0: 0/1
+0,          0,          0,        1,   112320, 0xb8afe429
+0,          1,          1,        1,   112320, 0xae588a4b
+0,          3,          3,        1,   112320, 0xccdd27b7
diff --git a/tests/ref/fate/gif-gray b/tests/ref/fate/gif-gray
new file mode 100644
index 0000000000..18705d01fe
--- /dev/null
+++ b/tests/ref/fate/gif-gray
@@ -0,0 +1,41 @@
+#tb 0: 1/100
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 480x360
+#sar 0: 0/1
+0,          0,          0,        1,   691200, 0xef6c0f3d
+0,          5,          5,        1,   691200, 0xc18b32de
+0,          7,          7,        1,   691200, 0x2395a3d7
+0,          9,          9,        1,   691200, 0x81dc3cf2
+0,         11,         11,        1,   691200, 0xabe2390e
+0,         13,         13,        1,   691200, 0xb2955c2a
+0,         15,         15,        1,   691200, 0x868d9ca2
+0,         17,         17,        1,   691200, 0x3016c2b6
+0,         19,         19,        1,   691200, 0x4501cffa
+0,         21,         21,        1,   691200, 0x8661d79e
+0,         25,         25,        1,   691200, 0xbc96d02e
+0,         27,         27,        1,   691200, 0x5f90bf5e
+0,         29,         29,        1,   691200, 0xf18da09a
+0,         31,         31,        1,   691200, 0x540467ce
+0,         33,         33,        1,   691200, 0x60d24012
+0,         35,         35,        1,   691200, 0x24323d36
+0,         37,         37,        1,   691200, 0x9e07c84b
+0,         39,         39,        1,   691200, 0xc18b32de
+0,         41,         41,        1,   691200, 0xef6c0f3d
+0,         46,         46,        1,   691200, 0xc9461045
+0,         48,         48,        1,   691200, 0x23ed4b99
+0,         50,         50,        1,   691200, 0x7e351d69
+0,         52,         52,        1,   691200, 0x0513e0aa
+0,         54,         54,        1,   691200, 0x28a4b6f2
+0,         56,         56,        1,   691200, 0xce10a94e
+0,         58,         58,        1,   691200, 0x63929d4e
+0,         60,         60,        1,   691200, 0xd26c9bb6
+0,         62,         62,        1,   691200, 0xb2a29842
+0,         66,         66,        1,   691200, 0x9fd69a16
+0,         68,         68,        1,   691200, 0x10f99e46
+0,         70,         70,        1,   691200, 0xea95a9fa
+0,         72,         72,        1,   691200, 0x97dbb9d6
+0,         74,         74,        1,   691200, 0xf4e9e2d6
+0,         76,         76,        1,   691200, 0x46b1230d
+0,         78,         78,        1,   691200, 0xb4a54ccd
+0,         80,         80,        1,   691200, 0x40cc103d
diff --git a/tests/ref/fate/gifenc-bgr4_byte b/tests/ref/fate/gifenc-bgr4_byte
new file mode 100644
index 0000000000..3495a8bbed
--- /dev/null
+++ b/tests/ref/fate/gifenc-bgr4_byte
@@ -0,0 +1,178 @@
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: gif
+#dimensions 0: 217x217
+#sar 0: 0/1
+0,          0,          0,        1,      508, 0xa1b80fc0
+0,          1,          1,        1,      213, 0x4f554bd7, S=1,     1024, 0xb6327c81
+0,          2,          2,        1,      131, 0x283b2988, S=1,     1024, 0xae3a7c81
+0,          3,          3,        1,      384, 0xc4fea72a, S=1,     1024, 0xb6327c81
+0,          4,          4,        1,      381, 0x050ba2b8, S=1,     1024, 0x9e4a7c81
+0,          5,          5,        1,      430, 0x00cfb2ae, S=1,     1024, 0x9e4a7c81
+0,          6,          6,        1,      518, 0xc8e5d827, S=1,     1024, 0x9e4a7c81
+0,          7,          7,        1,      535, 0x326ce62a, S=1,     1024, 0x9e4a7c81
+0,          8,          8,        1,      438, 0x34d6b7c0, S=1,     1024, 0xb6327c81
+0,          9,          9,        1,      923, 0x9fb1a37c, S=1,     1024, 0xb6327c81
+0,         10,         10,        1,      694, 0xf20449a5, S=1,     1024, 0xb6327c81
+0,         11,         11,        1,     1194, 0x67cd2ab5, S=1,     1024, 0xb6327c81
+0,         12,         12,        1,     1291, 0x1d23539d, S=1,     1024, 0xb6327c81
+0,         13,         13,        1,     1245, 0x065f32e6, S=1,     1024, 0xb6327c81
+0,         14,         14,        1,     1330, 0x83ec51a4, S=1,     1024, 0xb6327c81
+0,         15,         15,        1,     1276, 0x2acf38dc, S=1,     1024, 0xb6327c81
+0,         16,         16,        1,     1475, 0x4cd197ef, S=1,     1024, 0xb6327c81
+0,         17,         17,        1,     1784, 0xd1e84ae6, S=1,     1024, 0xde0a7c81
+0,         18,         18,        1,     1675, 0x092dfa86, S=1,     1024, 0xde0a7c81
+0,         19,         19,        1,     1509, 0x639aaa00, S=1,     1024, 0xde0a7c81
+0,         20,         20,        1,     1705, 0xfd3719d5, S=1,     1024, 0xde0a7c81
+0,         21,         21,        1,     1745, 0x8a761db4, S=1,     1024, 0xde0a7c81
+0,         22,         22,        1,     1642, 0x18830245, S=1,     1024, 0xde0a7c81
+0,         23,         23,        1,     1718, 0x3c8d1ebe, S=1,     1024, 0xde0a7c81
+0,         24,         24,        1,     1900, 0x2ea879d1, S=1,     1024, 0xde0a7c81
+0,         25,         25,        1,     1807, 0x02b35230, S=1,     1024, 0xde0a7c81
+0,         26,         26,        1,     1915, 0x22d48344, S=1,     1024, 0xde0a7c81
+0,         27,         27,        1,     2100, 0x55fcd063, S=1,     1024, 0xde0a7c81
+0,         28,         28,        1,     2700, 0x7cc5f08b, S=1,     1024, 0xde0a7c81
+0,         29,         29,        1,     2673, 0xb997a80d, S=1,     1024, 0xde0a7c81
+0,         30,         30,        1,     2895, 0xab69484d, S=1,     1024, 0xde0a7c81
+0,         31,         31,        1,     3257, 0xf753cf24, S=1,     1024, 0xde0a7c81
+0,         32,         32,        1,     3179, 0x34f2c13b, S=1,     1024, 0xde0a7c81
+0,         33,         33,        1,     3296, 0x7c06e72f, S=1,     1024, 0xde0a7c81
+0,         34,         34,        1,     3600, 0x4ca67634, S=1,     1024, 0xde0a7c81
+0,         35,         35,        1,     3699, 0xabe89fe3, S=1,     1024, 0xde0a7c81
+0,         36,         36,        1,     3814, 0x1869d3f4, S=1,     1024, 0xde0a7c81
+0,         37,         37,        1,     3627, 0x19bd7da7, S=1,     1024, 0xde0a7c81
+0,         38,         38,        1,     2950, 0x048a6055, S=1,     1024, 0xde0a7c81
+0,         39,         39,        1,     3086, 0x64ec8fc2, S=1,     1024, 0xde0a7c81
+0,         40,         40,        1,     3094, 0x1a388553, S=1,     1024, 0xde0a7c81
+0,         41,         41,        1,     3456, 0x01432c82, S=1,     1024, 0xde0a7c81
+0,         42,         42,        1,     4108, 0xf9505c66, S=1,     1024, 0xde0a7c81
+0,         43,         43,        1,     4217, 0x7f985ba4, S=1,     1024, 0xde0a7c81
+0,         44,         44,        1,     3613, 0xd0684d83, S=1,     1024, 0xde0a7c81
+0,         45,         45,        1,     3910, 0x0070e692, S=1,     1024, 0xde0a7c81
+0,         46,         46,        1,     4461, 0x5cc9e33d, S=1,     1024, 0xde0a7c81
+0,         47,         47,        1,     4593, 0x33a32dd1, S=1,     1024, 0xde0a7c81
+0,         48,         48,        1,     4822, 0x59549883, S=1,     1024, 0xde0a7c81
+0,         49,         49,        1,     5398, 0xb7bac31e, S=1,     1024, 0xde0a7c81
+0,         50,         50,        1,     5266, 0x21c695aa, S=1,     1024, 0xde0a7c81
+0,         51,         51,        1,     5416, 0xf305e3ed, S=1,     1024, 0xde0a7c81
+0,         52,         52,        1,     5519, 0x857d071f, S=1,     1024, 0xde0a7c81
+0,         53,         53,        1,     5701, 0x8f885c9c, S=1,     1024, 0xde0a7c81
+0,         54,         54,        1,     6160, 0x48523e83, S=1,     1024, 0xde0a7c81
+0,         55,         55,        1,     6233, 0x8fd2511e, S=1,     1024, 0xde0a7c81
+0,         56,         56,        1,     5911, 0x92d4c516, S=1,     1024, 0xde0a7c81
+0,         57,         57,        1,     5997, 0xbd7cfa15, S=1,     1024, 0xde0a7c81
+0,         58,         58,        1,     5946, 0x8f5fedff, S=1,     1024, 0xde0a7c81
+0,         59,         59,        1,     6468, 0x45c0cb8c, S=1,     1024, 0xde0a7c81
+0,         60,         60,        1,     6737, 0x4e1e39ac, S=1,     1024, 0xde0a7c81
+0,         61,         61,        1,     6275, 0x1d5e8f4c, S=1,     1024, 0xde0a7c81
+0,         62,         62,        1,     6641, 0x844b3aad, S=1,     1024, 0xde0a7c81
+0,         63,         63,        1,     6378, 0x52568640, S=1,     1024, 0xde0a7c81
+0,         64,         64,        1,     6257, 0xfabc585f, S=1,     1024, 0xde0a7c81
+0,         65,         65,        1,     6908, 0xf261701c, S=1,     1024, 0xde0a7c81
+0,         66,         66,        1,     7230, 0xb4f524ce, S=1,     1024, 0xde0a7c81
+0,         67,         67,        1,     7556, 0x89c1a712, S=1,     1024, 0xde0a7c81
+0,         68,         68,        1,     7413, 0x553970a4, S=1,     1024, 0xde0a7c81
+0,         69,         69,        1,     7476, 0x24d2a761, S=1,     1024, 0xde0a7c81
+0,         70,         70,        1,     7596, 0xf072e431, S=1,     1024, 0xde0a7c81
+0,         71,         71,        1,     7756, 0x131205c0, S=1,     1024, 0xde0a7c81
+0,         72,         72,        1,     8015, 0xf4536a7f, S=1,     1024, 0xde0a7c81
+0,         73,         73,        1,     8128, 0xba80be2b, S=1,     1024, 0xde0a7c81
+0,         74,         74,        1,     8101, 0x44ceb3a2, S=1,     1024, 0xde0a7c81
+0,         75,         75,        1,     7863, 0x55043dfd, S=1,     1024, 0xde0a7c81
+0,         76,         76,        1,     7960, 0x38399182, S=1,     1024, 0xde0a7c81
+0,         77,         77,        1,     8238, 0x1d52ecf3, S=1,     1024, 0xde0a7c81
+0,         78,         78,        1,     8321, 0xd8d24a5c, S=1,     1024, 0xde0a7c81
+0,         79,         79,        1,     8562, 0x4a0cc02b, S=1,     1024, 0xde0a7c81
+0,         80,         80,        1,     8746, 0x2db40da7, S=1,     1024, 0xde0a7c81
+0,         81,         81,        1,     8578, 0x46f9a4c1, S=1,     1024, 0xde0a7c81
+0,         82,         82,        1,     8878, 0xf58d5a19, S=1,     1024, 0xde0a7c81
+0,         83,         83,        1,     9077, 0x78de57f6, S=1,     1024, 0xde0a7c81
+0,         84,         84,        1,     9310, 0x8c10f77a, S=1,     1024, 0xde0a7c81
+0,         85,         85,        1,     9394, 0x741f431e, S=1,     1024, 0xde0a7c81
+0,         86,         86,        1,     9161, 0x6f499587, S=1,     1024, 0xde0a7c81
+0,         87,         87,        1,     9462, 0x628936c3, S=1,     1024, 0xde0a7c81
+0,         88,         88,        1,     9650, 0x4cb4936e, S=1,     1024, 0xde0a7c81
+0,         89,         89,        1,     9701, 0x5e069c40, S=1,     1024, 0xde0a7c81
+0,         90,         90,        1,     9523, 0x66a13c83, S=1,     1024, 0xde0a7c81
+0,         91,         91,        1,     9891, 0x43ea0e93, S=1,     1024, 0xde0a7c81
+0,         92,         92,        1,    10005, 0x96a849e7, S=1,     1024, 0xde0a7c81
+0,         93,         93,        1,    10038, 0x68032d25, S=1,     1024, 0xde0a7c81
+0,         94,         94,        1,    10086, 0xef59458d, S=1,     1024, 0xde0a7c81
+0,         95,         95,        1,    10438, 0x3466fed0, S=1,     1024, 0xde0a7c81
+0,         96,         96,        1,    10583, 0x8bdd5477, S=1,     1024, 0xde0a7c81
+0,         97,         97,        1,    10581, 0x69d27fee, S=1,     1024, 0xde0a7c81
+0,         98,         98,        1,    10807, 0xde62d6e3, S=1,     1024, 0xde0a7c81
+0,         99,         99,        1,    11111, 0x34eb4c13, S=1,     1024, 0xde0a7c81
+0,        100,        100,        1,    11194, 0x584f6b73, S=1,     1024, 0xde0a7c81
+0,        101,        101,        1,    11240, 0xc90ba13f, S=1,     1024, 0xde0a7c81
+0,        102,        102,        1,    11483, 0x59c4f3c5, S=1,     1024, 0xde0a7c81
+0,        103,        103,        1,    11680, 0xc62c5bc1, S=1,     1024, 0xde0a7c81
+0,        104,        104,        1,    11785, 0xc9bab793, S=1,     1024, 0xde0a7c81
+0,        105,        105,        1,    11436, 0xc9c40809, S=1,     1024, 0xde0a7c81
+0,        106,        106,        1,    11928, 0x4b77c9a7, S=1,     1024, 0xde0a7c81
+0,        107,        107,        1,    11932, 0x722abcbe, S=1,     1024, 0xde0a7c81
+0,        108,        108,        1,    12281, 0x0d136f53, S=1,     1024, 0xde0a7c81
+0,        109,        109,        1,    12334, 0x04a47f78, S=1,     1024, 0xde0a7c81
+0,        110,        110,        1,    12452, 0xa02db188, S=1,     1024, 0xde0a7c81
+0,        111,        111,        1,    12695, 0x1a813b2e, S=1,     1024, 0xde0a7c81
+0,        112,        112,        1,    12668, 0x81b24f79, S=1,     1024, 0xde0a7c81
+0,        113,        113,        1,    12957, 0x4da59f8c, S=1,     1024, 0xde0a7c81
+0,        114,        114,        1,    13054, 0x7abedf5a, S=1,     1024, 0xde0a7c81
+0,        115,        115,        1,    13147, 0x138f2bbd, S=1,     1024, 0xde0a7c81
+0,        116,        116,        1,    13171, 0x43c1195f, S=1,     1024, 0xde0a7c81
+0,        117,        117,        1,    13198, 0x2c8d58d4, S=1,     1024, 0xde0a7c81
+0,        118,        118,        1,    13211, 0x12c36193, S=1,     1024, 0xde0a7c81
+0,        119,        119,        1,    13210, 0xfe496107, S=1,     1024, 0xde0a7c81
+0,        120,        120,        1,    13467, 0x4d8ea128, S=1,     1024, 0xde0a7c81
+0,        121,        121,        1,    13665, 0x94caddde, S=1,     1024, 0xde0a7c81
+0,        122,        122,        1,    13692, 0xe38febd9, S=1,     1024, 0xde0a7c81
+0,        123,        123,        1,    13821, 0xee592e62, S=1,     1024, 0xde0a7c81
+0,        124,        124,        1,    13946, 0xceb09235, S=1,     1024, 0xde0a7c81
+0,        125,        125,        1,    14063, 0x7361d2f5, S=1,     1024, 0xde0a7c81
+0,        126,        126,        1,    14124, 0x226bcac1, S=1,     1024, 0xde0a7c81
+0,        127,        127,        1,    14331, 0x0649512b, S=1,     1024, 0xde0a7c81
+0,        128,        128,        1,    14469, 0x0d7da45b, S=1,     1024, 0xde0a7c81
+0,        129,        129,        1,    14536, 0x73cca242, S=1,     1024, 0xde0a7c81
+0,        130,        130,        1,    14608, 0x1f3dd14e, S=1,     1024, 0xde0a7c81
+0,        131,        131,        1,    14898, 0xd13d258e, S=1,     1024, 0xde0a7c81
+0,        132,        132,        1,    14978, 0xfa049fea, S=1,     1024, 0xde0a7c81
+0,        133,        133,        1,    15142, 0x1dfad60c, S=1,     1024, 0xde0a7c81
+0,        134,        134,        1,    15129, 0x5962bae7, S=1,     1024, 0xde0a7c81
+0,        135,        135,        1,    15243, 0x2c2c113b, S=1,     1024, 0xde0a7c81
+0,        136,        136,        1,    15337, 0x3cab623b, S=1,     1024, 0xde0a7c81
+0,        137,        137,        1,    15638, 0xbff3a100, S=1,     1024, 0xde0a7c81
+0,        138,        138,        1,    15912, 0x13bf1fb2, S=1,     1024, 0xde0a7c81
+0,        139,        139,        1,    16041, 0x01134246, S=1,     1024, 0xde0a7c81
+0,        140,        140,        1,    16228, 0xe2f80035, S=1,     1024, 0xde0a7c81
+0,        141,        141,        1,    16262, 0xc8d3ea51, S=1,     1024, 0xde0a7c81
+0,        142,        142,        1,    16371, 0xe7da07f2, S=1,     1024, 0xde0a7c81
+0,        143,        143,        1,    16661, 0x10ada592, S=1,     1024, 0xde0a7c81
+0,        144,        144,        1,    16917, 0xbfb717e5, S=1,     1024, 0xde0a7c81
+0,        145,        145,        1,    17149, 0x4074ca41, S=1,     1024, 0xde0a7c81
+0,        146,        146,        1,    17172, 0xf749b49f, S=1,     1024, 0xde0a7c81
+0,        147,        147,        1,    17315, 0x2abea8a0, S=1,     1024, 0xde0a7c81
+0,        148,        148,        1,    17397, 0x14f71122, S=1,     1024, 0xde0a7c81
+0,        149,        149,        1,    17431, 0xce49f2d3, S=1,     1024, 0xde0a7c81
+0,        150,        150,        1,    17576, 0x7c6552ad, S=1,     1024, 0xde0a7c81
+0,        151,        151,        1,    17764, 0x1d198d60, S=1,     1024, 0xde0a7c81
+0,        152,        152,        1,    17826, 0xe1727f57, S=1,     1024, 0xde0a7c81
+0,        153,        153,        1,    17918, 0xb78d9b9f, S=1,     1024, 0xde0a7c81
+0,        154,        154,        1,    17823, 0xc9fabf19, S=1,     1024, 0xde0a7c81
+0,        155,        155,        1,    18142, 0xeb5b21a9, S=1,     1024, 0xde0a7c81
+0,        156,        156,        1,    18257, 0x7b38822c, S=1,     1024, 0xde0a7c81
+0,        157,        157,        1,    18337, 0xd395c279, S=1,     1024, 0xde0a7c81
+0,        158,        158,        1,    18293, 0x6c3b3766, S=1,     1024, 0xde0a7c81
+0,        159,        159,        1,    18418, 0x2abcbcf8, S=1,     1024, 0xde0a7c81
+0,        160,        160,        1,    18607, 0x79424730, S=1,     1024, 0xde0a7c81
+0,        161,        161,        1,    18916, 0x8707bbc6, S=1,     1024, 0xde0a7c81
+0,        162,        162,        1,    19073, 0xd82c03f6, S=1,     1024, 0xde0a7c81
+0,        163,        163,        1,    19168, 0xb7d6fe27, S=1,     1024, 0xde0a7c81
+0,        164,        164,        1,    19210, 0x79f301eb, S=1,     1024, 0xde0a7c81
+0,        165,        165,        1,    19398, 0x0a5663c6, S=1,     1024, 0xde0a7c81
+0,        166,        166,        1,    19480, 0x4fe09e5b, S=1,     1024, 0xde0a7c81
+0,        167,        167,        1,    19659, 0xab971088, S=1,     1024, 0xde0a7c81
+0,        168,        168,        1,    19672, 0x2e331553, S=1,     1024, 0xde0a7c81
+0,        169,        169,        1,    19936, 0x2eea628a, S=1,     1024, 0xde0a7c81
+0,        170,        170,        1,    19975, 0xd6bb9ab2, S=1,     1024, 0xde0a7c81
+0,        171,        171,        1,    20021, 0xf7e98dc5, S=1,     1024, 0xde0a7c81
+0,        172,        172,        1,    20060, 0x20017807, S=1,     1024, 0xde0a7c81
diff --git a/tests/ref/fate/gifenc-bgr8 b/tests/ref/fate/gifenc-bgr8
new file mode 100644
index 0000000000..0a4e5d48cd
--- /dev/null
+++ b/tests/ref/fate/gifenc-bgr8
@@ -0,0 +1,178 @@
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: gif
+#dimensions 0: 217x217
+#sar 0: 0/1
+0,          0,          0,        1,      552, 0x271a2dd3
+0,          1,          1,        1,      297, 0x90168a95, S=1,     1024, 0xf351799f
+0,          2,          2,        1,      438, 0x91efce1b, S=1,     1024, 0xf351799f
+0,          3,          3,        1,      450, 0x7c2dcfad, S=1,     1024, 0xf351799f
+0,          4,          4,        1,      547, 0xc131fd3b, S=1,     1024, 0xf351799f
+0,          5,          5,        1,      614, 0x68182006, S=1,     1024, 0xf351799f
+0,          6,          6,        1,      642, 0x78bb1f5f, S=1,     1024, 0xf351799f
+0,          7,          7,        1,      660, 0x35c033a2, S=1,     1024, 0xf351799f
+0,          8,          8,        1,      821, 0xaf30790b, S=1,     1024, 0xf351799f
+0,          9,          9,        1,     1157, 0x741c2da1, S=1,     1024, 0xf351799f
+0,         10,         10,        1,      179, 0x3a27517c, S=1,     1024, 0xf351799f
+0,         11,         11,        1,     1333, 0x5ee76f3c, S=1,     1024, 0xf351799f
+0,         12,         12,        1,     1638, 0x5f640e86, S=1,     1024, 0xf351799f
+0,         13,         13,        1,     1531, 0xccb8e437, S=1,     1024, 0xf351799f
+0,         14,         14,        1,     1720, 0xc95d45ec, S=1,     1024, 0xf351799f
+0,         15,         15,        1,     1910, 0x56cc831e, S=1,     1024, 0xf351799f
+0,         16,         16,        1,     2124, 0x9cc8e130, S=1,     1024, 0xf351799f
+0,         17,         17,        1,     2248, 0x05a325b1, S=1,     1024, 0xf351799f
+0,         18,         18,        1,     2311, 0xdc633703, S=1,     1024, 0xf351799f
+0,         19,         19,        1,     2408, 0x91c26f3e, S=1,     1024, 0xf351799f
+0,         20,         20,        1,     2601, 0x8cf3c157, S=1,     1024, 0xf351799f
+0,         21,         21,        1,     2687, 0x8f6400e6, S=1,     1024, 0xf351799f
+0,         22,         22,        1,     2784, 0xaa880e55, S=1,     1024, 0xf351799f
+0,         23,         23,        1,     2884, 0x46f546f6, S=1,     1024, 0xf351799f
+0,         24,         24,        1,     2982, 0x807c7ad5, S=1,     1024, 0xf351799f
+0,         25,         25,        1,     3101, 0xbcc89bec, S=1,     1024, 0xf351799f
+0,         26,         26,        1,     3253, 0xd032f3fa, S=1,     1024, 0xf351799f
+0,         27,         27,        1,     3329, 0xe4d42430, S=1,     1024, 0xf351799f
+0,         28,         28,        1,     3572, 0xf8058aa0, S=1,     1024, 0xf351799f
+0,         29,         29,        1,     3807, 0x3d2af9f3, S=1,     1024, 0xf351799f
+0,         30,         30,        1,     2750, 0x814d1c33, S=1,     1024, 0xf351799f
+0,         31,         31,        1,     4031, 0x3b077006, S=1,     1024, 0xf351799f
+0,         32,         32,        1,     3025, 0x86729c1c, S=1,     1024, 0xf351799f
+0,         33,         33,        1,     4295, 0xf71b0b38, S=1,     1024, 0xf351799f
+0,         34,         34,        1,     2044, 0x5adcb93b, S=1,     1024, 0xf351799f
+0,         35,         35,        1,     3212, 0xcf79eeed, S=1,     1024, 0xf351799f
+0,         36,         36,        1,     2292, 0xb4386334, S=1,     1024, 0xf351799f
+0,         37,         37,        1,     3633, 0x0010992f, S=1,     1024, 0xf351799f
+0,         38,         38,        1,     3552, 0x23697490, S=1,     1024, 0xf351799f
+0,         39,         39,        1,     3690, 0x62afdbb8, S=1,     1024, 0xf351799f
+0,         40,         40,        1,     1559, 0x5baef54a, S=1,     1024, 0xf351799f
+0,         41,         41,        1,      954, 0xca75ca79, S=1,     1024, 0xf351799f
+0,         42,         42,        1,      273, 0x3687799b, S=1,     1024, 0xf351799f
+0,         43,         43,        1,      930, 0x29f3b0c4, S=1,     1024, 0xf351799f
+0,         44,         44,        1,      271, 0x305e8094, S=1,     1024, 0xf351799f
+0,         45,         45,        1,      196, 0xf5ab51ee, S=1,     1024, 0xf351799f
+0,         46,         46,        1,     4299, 0x67ec0d55, S=1,     1024, 0xf351799f
+0,         47,         47,        1,     4895, 0xb394406c, S=1,     1024, 0xf351799f
+0,         48,         48,        1,     4928, 0x233919d7, S=1,     1024, 0xf351799f
+0,         49,         49,        1,     4941, 0x58a357da, S=1,     1024, 0xf351799f
+0,         50,         50,        1,     4154, 0x21f2ac33, S=1,     1024, 0xf351799f
+0,         51,         51,        1,     4678, 0xab3cc050, S=1,     1024, 0xf351799f
+0,         52,         52,        1,     4741, 0x1974b581, S=1,     1024, 0xf351799f
+0,         53,         53,        1,     4982, 0x891456d5, S=1,     1024, 0xf351799f
+0,         54,         54,        1,     5179, 0x860fc6a1, S=1,     1024, 0xf351799f
+0,         55,         55,        1,     5046, 0xce9183d3, S=1,     1024, 0xf351799f
+0,         56,         56,        1,     5140, 0xa6d7b9af, S=1,     1024, 0xf351799f
+0,         57,         57,        1,     4301, 0x03b6ef3f, S=1,     1024, 0xf351799f
+0,         58,         58,        1,     5079, 0xa8d59e01, S=1,     1024, 0xf351799f
+0,         59,         59,        1,     5284, 0xea34e3b3, S=1,     1024, 0xf351799f
+0,         60,         60,        1,     5426, 0x556a15cd, S=1,     1024, 0xf351799f
+0,         61,         61,        1,     4645, 0x061e8936, S=1,     1024, 0xf351799f
+0,         62,         62,        1,     5263, 0x7536cf7d, S=1,     1024, 0xf351799f
+0,         63,         63,        1,     5221, 0x9fbac3ca, S=1,     1024, 0xf351799f
+0,         64,         64,        1,     5217, 0x02269bd2, S=1,     1024, 0xf351799f
+0,         65,         65,        1,     5395, 0x120fff66, S=1,     1024, 0xf351799f
+0,         66,         66,        1,     5220, 0x77cedcc5, S=1,     1024, 0xf351799f
+0,         67,         67,        1,     5704, 0xba42dd96, S=1,     1024, 0xf351799f
+0,         68,         68,        1,     5636, 0xcb91a25b, S=1,     1024, 0xf351799f
+0,         69,         69,        1,     5818, 0x8dc0df92, S=1,     1024, 0xf351799f
+0,         70,         70,        1,     5763, 0x51d5d5f0, S=1,     1024, 0xf351799f
+0,         71,         71,        1,     6116, 0x09558b48, S=1,     1024, 0xf351799f
+0,         72,         72,        1,     6069, 0x41926817, S=1,     1024, 0xf351799f
+0,         73,         73,        1,     5796, 0x7fbeda44, S=1,     1024, 0xf351799f
+0,         74,         74,        1,     5999, 0xe07d3770, S=1,     1024, 0xf351799f
+0,         75,         75,        1,     6220, 0x6607b06f, S=1,     1024, 0xf351799f
+0,         76,         76,        1,     6374, 0x7628e533, S=1,     1024, 0xf351799f
+0,         77,         77,        1,     6465, 0xfe956b15, S=1,     1024, 0xf351799f
+0,         78,         78,        1,     7019, 0x6c9a1aef, S=1,     1024, 0xf351799f
+0,         79,         79,        1,     7255, 0x5fa5c1bf, S=1,     1024, 0xf351799f
+0,         80,         80,        1,     8197, 0xf11d6ef2, S=1,     1024, 0xf351799f
+0,         81,         81,        1,     8358, 0x027279e8, S=1,     1024, 0xf351799f
+0,         82,         82,        1,     7708, 0x607f8e8b, S=1,     1024, 0xf351799f
+0,         83,         83,        1,     7412, 0x6bb2105f, S=1,     1024, 0xf351799f
+0,         84,         84,        1,     7541, 0xfdc02154, S=1,     1024, 0xf351799f
+0,         85,         85,        1,     7948, 0x916ecd8b, S=1,     1024, 0xf351799f
+0,         86,         86,        1,     8408, 0x1f97d414, S=1,     1024, 0xf351799f
+0,         87,         87,        1,     8056, 0x9cbf159c, S=1,     1024, 0xf351799f
+0,         88,         88,        1,     7401, 0x2625addb, S=1,     1024, 0xf351799f
+0,         89,         89,        1,     7494, 0x2877eacb, S=1,     1024, 0xf351799f
+0,         90,         90,        1,     7806, 0xe32574a3, S=1,     1024, 0xf351799f
+0,         91,         91,        1,     7768, 0x25ed7ee7, S=1,     1024, 0xf351799f
+0,         92,         92,        1,     7749, 0x6d8e978e, S=1,     1024, 0xf351799f
+0,         93,         93,        1,     8047, 0xec4b150c, S=1,     1024, 0xf351799f
+0,         94,         94,        1,     7618, 0x88cf30d5, S=1,     1024, 0xf351799f
+0,         95,         95,        1,     7979, 0x0eb1cf2a, S=1,     1024, 0xf351799f
+0,         96,         96,        1,    12062, 0xb49d9125, S=1,     1024, 0xf351799f
+0,         97,         97,        1,    12317, 0x2d8fd6e9, S=1,     1024, 0xf351799f
+0,         98,         98,        1,    12217, 0x9b3be549, S=1,     1024, 0xf351799f
+0,         99,         99,        1,    11227, 0x067e9118, S=1,     1024, 0xf351799f
+0,        100,        100,        1,    11108, 0x5e5b0afd, S=1,     1024, 0xf351799f
+0,        101,        101,        1,    11366, 0xb38e8d15, S=1,     1024, 0xf351799f
+0,        102,        102,        1,    11896, 0xeb3e35ca, S=1,     1024, 0xf351799f
+0,        103,        103,        1,    11479, 0xbf7581e9, S=1,     1024, 0xf351799f
+0,        104,        104,        1,    13395, 0x415b38d8, S=1,     1024, 0xf351799f
+0,        105,        105,        1,    12913, 0x61544631, S=1,     1024, 0xf351799f
+0,        106,        106,        1,    13864, 0xd39fe768, S=1,     1024, 0xf351799f
+0,        107,        107,        1,    13551, 0x76c167d1, S=1,     1024, 0xf351799f
+0,        108,        108,        1,    14041, 0x2f206888, S=1,     1024, 0xf351799f
+0,        109,        109,        1,    14144, 0x9ec030d3, S=1,     1024, 0xf351799f
+0,        110,        110,        1,    14277, 0xa84b3a9b, S=1,     1024, 0xf351799f
+0,        111,        111,        1,    14424, 0xf5f1e06e, S=1,     1024, 0xf351799f
+0,        112,        112,        1,    14689, 0xbca0adb5, S=1,     1024, 0xf351799f
+0,        113,        113,        1,    14598, 0xc1d45745, S=1,     1024, 0xf351799f
+0,        114,        114,        1,    15213, 0x8f3080fc, S=1,     1024, 0xf351799f
+0,        115,        115,        1,    15425, 0xb0aa8f59, S=1,     1024, 0xf351799f
+0,        116,        116,        1,    15595, 0x1406e5d5, S=1,     1024, 0xf351799f
+0,        117,        117,        1,    15598, 0x48ec7d08, S=1,     1024, 0xf351799f
+0,        118,        118,        1,    15863, 0x5381db7b, S=1,     1024, 0xf351799f
+0,        119,        119,        1,    15717, 0xb87a1b87, S=1,     1024, 0xf351799f
+0,        120,        120,        1,    16078, 0x5bab2453, S=1,     1024, 0xf351799f
+0,        121,        121,        1,    16225, 0xa1f88113, S=1,     1024, 0xf351799f
+0,        122,        122,        1,    16135, 0x6af2f4e1, S=1,     1024, 0xf351799f
+0,        123,        123,        1,    16661, 0xf02a3343, S=1,     1024, 0xf351799f
+0,        124,        124,        1,    16619, 0xc71935a4, S=1,     1024, 0xf351799f
+0,        125,        125,        1,    16829, 0x29849844, S=1,     1024, 0xf351799f
+0,        126,        126,        1,    16944, 0x3423ae77, S=1,     1024, 0xf351799f
+0,        127,        127,        1,    17119, 0x609b4409, S=1,     1024, 0xf351799f
+0,        128,        128,        1,    17150, 0xf85dfd31, S=1,     1024, 0xf351799f
+0,        129,        129,        1,    17321, 0x38eccb10, S=1,     1024, 0xf351799f
+0,        130,        130,        1,    17395, 0x0ba08b85, S=1,     1024, 0xf351799f
+0,        131,        131,        1,    17666, 0x6fbc0264, S=1,     1024, 0xf351799f
+0,        132,        132,        1,    17730, 0x3dcc64a6, S=1,     1024, 0xf351799f
+0,        133,        133,        1,    17934, 0xb539974b, S=1,     1024, 0xf351799f
+0,        134,        134,        1,    17944, 0x2214ec94, S=1,     1024, 0xf351799f
+0,        135,        135,        1,    18238, 0x70f9ff1d, S=1,     1024, 0xf351799f
+0,        136,        136,        1,    18391, 0x4b149209, S=1,     1024, 0xf351799f
+0,        137,        137,        1,    18543, 0x45a1c02f, S=1,     1024, 0xf351799f
+0,        138,        138,        1,    18939, 0x2789a88c, S=1,     1024, 0xf351799f
+0,        139,        139,        1,    19145, 0x5daafd7a, S=1,     1024, 0xf351799f
+0,        140,        140,        1,    19120, 0x565f80e6, S=1,     1024, 0xf351799f
+0,        141,        141,        1,    19130, 0xff70cc21, S=1,     1024, 0xf351799f
+0,        142,        142,        1,    19494, 0xbfa284db, S=1,     1024, 0xf351799f
+0,        143,        143,        1,    19534, 0x3d40743b, S=1,     1024, 0xf351799f
+0,        144,        144,        1,    19747, 0x33c9b108, S=1,     1024, 0xf351799f
+0,        145,        145,        1,    20114, 0x9d223e36, S=1,     1024, 0xf351799f
+0,        146,        146,        1,    20257, 0xe7bdaf43, S=1,     1024, 0xf351799f
+0,        147,        147,        1,    20370, 0x0c5f1970, S=1,     1024, 0xf351799f
+0,        148,        148,        1,    20292, 0x6986d20e, S=1,     1024, 0xf351799f
+0,        149,        149,        1,    20491, 0xd88e4c08, S=1,     1024, 0xf351799f
+0,        150,        150,        1,    20647, 0x1aefaffc, S=1,     1024, 0xf351799f
+0,        151,        151,        1,    20666, 0x43e4aaaa, S=1,     1024, 0xf351799f
+0,        152,        152,        1,    21007, 0xa7ca3ef0, S=1,     1024, 0xf351799f
+0,        153,        153,        1,    21058, 0x06814351, S=1,     1024, 0xf351799f
+0,        154,        154,        1,    21153, 0x3c852b10, S=1,     1024, 0xf351799f
+0,        155,        155,        1,    21078, 0x8df15855, S=1,     1024, 0xf351799f
+0,        156,        156,        1,    21458, 0xd3a531d6, S=1,     1024, 0xf351799f
+0,        157,        157,        1,    21669, 0x88baca53, S=1,     1024, 0xf351799f
+0,        158,        158,        1,    21581, 0xd692fa1f, S=1,     1024, 0xf351799f
+0,        159,        159,        1,    21654, 0x30fb9061, S=1,     1024, 0xf351799f
+0,        160,        160,        1,    21987, 0xe7646d8b, S=1,     1024, 0xf351799f
+0,        161,        161,        1,    22205, 0x0fc55b6a, S=1,     1024, 0xf351799f
+0,        162,        162,        1,    22475, 0x4bc4c032, S=1,     1024, 0xf351799f
+0,        163,        163,        1,    22490, 0x58ca23f6, S=1,     1024, 0xf351799f
+0,        164,        164,        1,    22460, 0xf9ceb0ac, S=1,     1024, 0xf351799f
+0,        165,        165,        1,    22861, 0xb05f0f84, S=1,     1024, 0xf351799f
+0,        166,        166,        1,    22746, 0x0df23a5c, S=1,     1024, 0xf351799f
+0,        167,        167,        1,    23165, 0xbd7147ad, S=1,     1024, 0xf351799f
+0,        168,        168,        1,    23273, 0x9781a34f, S=1,     1024, 0xf351799f
+0,        169,        169,        1,    23211, 0x69c7606b, S=1,     1024, 0xf351799f
+0,        170,        170,        1,    23648, 0xdafde037, S=1,     1024, 0xf351799f
+0,        171,        171,        1,    23675, 0x2a2147ed, S=1,     1024, 0xf351799f
+0,        172,        172,        1,    23874, 0x12c184b6, S=1,     1024, 0xf351799f
diff --git a/tests/ref/fate/gifenc-gray b/tests/ref/fate/gifenc-gray
new file mode 100644
index 0000000000..81cdd1888e
--- /dev/null
+++ b/tests/ref/fate/gifenc-gray
@@ -0,0 +1,178 @@
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: gif
+#dimensions 0: 217x217
+#sar 0: 0/1
+0,          0,          0,        1,      579, 0x0d0e3ab8
+0,          1,          1,        1,      150, 0x178b3a8c, S=1,     1024, 0xc2f67c9f
+0,          2,          2,        1,      155, 0x941743f5, S=1,     1024, 0xc2f67c9f
+0,          3,          3,        1,      144, 0x68c73711, S=1,     1024, 0xc2f67c9f
+0,          4,          4,        1,      152, 0xaf9a3f2e, S=1,     1024, 0xc2f67c9f
+0,          5,          5,        1,      136, 0x68593d85, S=1,     1024, 0xc2f67c9f
+0,          6,          6,        1,      134, 0x0dcb373f, S=1,     1024, 0xc2f67c9f
+0,          7,          7,        1,      129, 0x3baf3279, S=1,     1024, 0xc2f67c9f
+0,          8,          8,        1,      123, 0x9c963148, S=1,     1024, 0xc2f67c9f
+0,          9,          9,        1,      123, 0x5c272d6b, S=1,     1024, 0xc2f67c9f
+0,         10,         10,        1,      150, 0x5f8d41aa, S=1,     1024, 0xc2f67c9f
+0,         11,         11,        1,      134, 0x6f582fee, S=1,     1024, 0xc2f67c9f
+0,         12,         12,        1,      134, 0x85d53038, S=1,     1024, 0xc2f67c9f
+0,         13,         13,        1,      123, 0x6d2a2cb2, S=1,     1024, 0xc2f67c9f
+0,         14,         14,        1,      127, 0x1e78327b, S=1,     1024, 0xc2f67c9f
+0,         15,         15,        1,      119, 0xbafc2c31, S=1,     1024, 0xc2f67c9f
+0,         16,         16,        1,      138, 0x57553638, S=1,     1024, 0xc2f67c9f
+0,         17,         17,        1,      140, 0xf7423adb, S=1,     1024, 0xc2f67c9f
+0,         18,         18,        1,      122, 0x7e592f8b, S=1,     1024, 0xc2f67c9f
+0,         19,         19,        1,      123, 0xaa7d313c, S=1,     1024, 0xc2f67c9f
+0,         20,         20,        1,      140, 0x4fd63b34, S=1,     1024, 0xc2f67c9f
+0,         21,         21,        1,      123, 0x67753163, S=1,     1024, 0xc2f67c9f
+0,         22,         22,        1,      123, 0x02193147, S=1,     1024, 0xc2f67c9f
+0,         23,         23,        1,      124, 0xa85131e9, S=1,     1024, 0xc2f67c9f
+0,         24,         24,        1,      122, 0xef8731e2, S=1,     1024, 0xc2f67c9f
+0,         25,         25,        1,      122, 0x06d432c9, S=1,     1024, 0xc2f67c9f
+0,         26,         26,        1,      123, 0xcc8831cd, S=1,     1024, 0xc2f67c9f
+0,         27,         27,        1,      118, 0xa1d33166, S=1,     1024, 0xc2f67c9f
+0,         28,         28,        1,      159, 0xcc8c454c, S=1,     1024, 0xc2f67c9f
+0,         29,         29,        1,      140, 0x8a0231ad, S=1,     1024, 0xc2f67c9f
+0,         30,         30,        1,      163, 0xe78248d2, S=1,     1024, 0xc2f67c9f
+0,         31,         31,        1,      142, 0x3b293489, S=1,     1024, 0xc2f67c9f
+0,         32,         32,        1,      170, 0x5f504b12, S=1,     1024, 0xc2f67c9f
+0,         33,         33,        1,      146, 0x38a53693, S=1,     1024, 0xc2f67c9f
+0,         34,         34,        1,      132, 0xb18a3499, S=1,     1024, 0xc2f67c9f
+0,         35,         35,        1,      113, 0x55182bda, S=1,     1024, 0xc2f67c9f
+0,         36,         36,        1,      132, 0xaced3333, S=1,     1024, 0xc2f67c9f
+0,         37,         37,        1,      120, 0x9ffe2e4f, S=1,     1024, 0xc2f67c9f
+0,         38,         38,        1,      135, 0x6223351e, S=1,     1024, 0xc2f67c9f
+0,         39,         39,        1,      123, 0x269b3058, S=1,     1024, 0xc2f67c9f
+0,         40,         40,        1,      119, 0x17052def, S=1,     1024, 0xc2f67c9f
+0,         41,         41,        1,      119, 0x36da2ee2, S=1,     1024, 0xc2f67c9f
+0,         42,         42,        1,      120, 0x984e31be, S=1,     1024, 0xc2f67c9f
+0,         43,         43,        1,      114, 0xfd382c9d, S=1,     1024, 0xc2f67c9f
+0,         44,         44,        1,      125, 0x926a36c6, S=1,     1024, 0xc2f67c9f
+0,         45,         45,        1,      117, 0xbceb3183, S=1,     1024, 0xc2f67c9f
+0,         46,         46,        1,      116, 0xf4c72d82, S=1,     1024, 0xc2f67c9f
+0,         47,         47,        1,      124, 0x0c19343c, S=1,     1024, 0xc2f67c9f
+0,         48,         48,        1,      117, 0x1f032eb1, S=1,     1024, 0xc2f67c9f
+0,         49,         49,        1,      135, 0x31a437e6, S=1,     1024, 0xc2f67c9f
+0,         50,         50,        1,      131, 0x4c1735fe, S=1,     1024, 0xc2f67c9f
+0,         51,         51,        1,      122, 0xb7603463, S=1,     1024, 0xc2f67c9f
+0,         52,         52,        1,      122, 0x7f5e34e1, S=1,     1024, 0xc2f67c9f
+0,         53,         53,        1,      124, 0x9562350f, S=1,     1024, 0xc2f67c9f
+0,         54,         54,        1,      126, 0x18b33759, S=1,     1024, 0xc2f67c9f
+0,         55,         55,        1,      117, 0x748f3243, S=1,     1024, 0xc2f67c9f
+0,         56,         56,        1,      109, 0x72832fe7, S=1,     1024, 0xc2f67c9f
+0,         57,         57,        1,      120, 0x748a2e38, S=1,     1024, 0xc2f67c9f
+0,         58,         58,        1,      120, 0x61f82fb2, S=1,     1024, 0xc2f67c9f
+0,         59,         59,        1,      122, 0x2a6b3282, S=1,     1024, 0xc2f67c9f
+0,         60,         60,        1,      116, 0x8b542de6, S=1,     1024, 0xc2f67c9f
+0,         61,         61,        1,      119, 0xf33c318e, S=1,     1024, 0xc2f67c9f
+0,         62,         62,        1,      116, 0xff182f36, S=1,     1024, 0xc2f67c9f
+0,         63,         63,        1,      119, 0xeb9e2fcc, S=1,     1024, 0xc2f67c9f
+0,         64,         64,        1,      118, 0xe82d304e, S=1,     1024, 0xc2f67c9f
+0,         65,         65,        1,      137, 0x98303d30, S=1,     1024, 0xc2f67c9f
+0,         66,         66,        1,      149, 0x01123fff, S=1,     1024, 0xc2f67c9f
+0,         67,         67,        1,      115, 0x4ca92f75, S=1,     1024, 0xc2f67c9f
+0,         68,         68,        1,      131, 0xf4193bc0, S=1,     1024, 0xc2f67c9f
+0,         69,         69,        1,      115, 0xda5e2f30, S=1,     1024, 0xc2f67c9f
+0,         70,         70,        1,      100, 0x9ba32a58, S=1,     1024, 0xc2f67c9f
+0,         71,         71,        1,      109, 0xa47e2c91, S=1,     1024, 0xc2f67c9f
+0,         72,         72,        1,      120, 0x22452fd6, S=1,     1024, 0xc2f67c9f
+0,         73,         73,        1,      116, 0xd3c52c26, S=1,     1024, 0xc2f67c9f
+0,         74,         74,        1,      106, 0x95b42c9f, S=1,     1024, 0xc2f67c9f
+0,         75,         75,        1,       96, 0xfdc12639, S=1,     1024, 0xc2f67c9f
+0,         76,         76,        1,       99, 0x210f251b, S=1,     1024, 0xc2f67c9f
+0,         77,         77,        1,      119, 0x173b341c, S=1,     1024, 0xc2f67c9f
+0,         78,         78,        1,      119, 0x3bca2f29, S=1,     1024, 0xc2f67c9f
+0,         79,         79,        1,      213, 0x9e905d4c, S=1,     1024, 0xc2f67c9f
+0,         80,         80,        1,      209, 0xa0015e94, S=1,     1024, 0xc2f67c9f
+0,         81,         81,        1,      120, 0x36762bd4, S=1,     1024, 0xc2f67c9f
+0,         82,         82,        1,      119, 0x019b2edc, S=1,     1024, 0xc2f67c9f
+0,         83,         83,        1,      124, 0x211d30e7, S=1,     1024, 0xc2f67c9f
+0,         84,         84,        1,      125, 0x538732ff, S=1,     1024, 0xc2f67c9f
+0,         85,         85,        1,      123, 0x2887308a, S=1,     1024, 0xc2f67c9f
+0,         86,         86,        1,      119, 0x7ff930f4, S=1,     1024, 0xc2f67c9f
+0,         87,         87,        1,      119, 0xa50c2e16, S=1,     1024, 0xc2f67c9f
+0,         88,         88,        1,      107, 0x9ed02cea, S=1,     1024, 0xc2f67c9f
+0,         89,         89,        1,      119, 0xc234332a, S=1,     1024, 0xc2f67c9f
+0,         90,         90,        1,      115, 0x38353092, S=1,     1024, 0xc2f67c9f
+0,         91,         91,        1,      162, 0x6cda4644, S=1,     1024, 0xc2f67c9f
+0,         92,         92,        1,      124, 0x2f683081, S=1,     1024, 0xc2f67c9f
+0,         93,         93,        1,      116, 0x72952d04, S=1,     1024, 0xc2f67c9f
+0,         94,         94,        1,       84, 0x1a532301, S=1,     1024, 0xc2f67c9f
+0,         95,         95,        1,      176, 0xfb3c5400, S=1,     1024, 0xc2f67c9f
+0,         96,         96,        1,      137, 0x253132d1, S=1,     1024, 0xc2f67c9f
+0,         97,         97,        1,      179, 0x2b38528b, S=1,     1024, 0xc2f67c9f
+0,         98,         98,        1,      150, 0xbe413cbe, S=1,     1024, 0xc2f67c9f
+0,         99,         99,        1,      140, 0x9e93392a, S=1,     1024, 0xc2f67c9f
+0,        100,        100,        1,      129, 0x577e331e, S=1,     1024, 0xc2f67c9f
+0,        101,        101,        1,      146, 0x16ff3924, S=1,     1024, 0xc2f67c9f
+0,        102,        102,        1,      133, 0x756a3163, S=1,     1024, 0xc2f67c9f
+0,        103,        103,        1,      190, 0x3e865b77, S=1,     1024, 0xc2f67c9f
+0,        104,        104,        1,      159, 0xdf393fc8, S=1,     1024, 0xc2f67c9f
+0,        105,        105,        1,      188, 0x84be5168, S=1,     1024, 0xc2f67c9f
+0,        106,        106,        1,      163, 0x4c0e41f0, S=1,     1024, 0xc2f67c9f
+0,        107,        107,        1,      144, 0x5fda3792, S=1,     1024, 0xc2f67c9f
+0,        108,        108,        1,      136, 0x028c3800, S=1,     1024, 0xc2f67c9f
+0,        109,        109,        1,      150, 0x75d43a8d, S=1,     1024, 0xc2f67c9f
+0,        110,        110,        1,      134, 0x81123999, S=1,     1024, 0xc2f67c9f
+0,        111,        111,        1,      198, 0x0a875baa, S=1,     1024, 0xc2f67c9f
+0,        112,        112,        1,      169, 0xfdd7458c, S=1,     1024, 0xc2f67c9f
+0,        113,        113,        1,      210, 0x9b195be4, S=1,     1024, 0xc2f67c9f
+0,        114,        114,        1,      174, 0x0a424a76, S=1,     1024, 0xc2f67c9f
+0,        115,        115,        1,      137, 0xb1b535fd, S=1,     1024, 0xc2f67c9f
+0,        116,        116,        1,      122, 0x4d3f327b, S=1,     1024, 0xc2f67c9f
+0,        117,        117,        1,      152, 0x5e423b0c, S=1,     1024, 0xc2f67c9f
+0,        118,        118,        1,      137, 0xd13a39f7, S=1,     1024, 0xc2f67c9f
+0,        119,        119,        1,      156, 0x40864321, S=1,     1024, 0xc2f67c9f
+0,        120,        120,        1,      140, 0xbe1e393c, S=1,     1024, 0xc2f67c9f
+0,        121,        121,        1,      179, 0xaf204635, S=1,     1024, 0xc2f67c9f
+0,        122,        122,        1,      116, 0x5ac83123, S=1,     1024, 0xc2f67c9f
+0,        123,        123,        1,      118, 0x22bc2ec5, S=1,     1024, 0xc2f67c9f
+0,        124,        124,        1,      123, 0xc9b5302d, S=1,     1024, 0xc2f67c9f
+0,        125,        125,        1,      125, 0x5cee3077, S=1,     1024, 0xc2f67c9f
+0,        126,        126,        1,      194, 0xccc159ca, S=1,     1024, 0xc2f67c9f
+0,        127,        127,        1,      122, 0x4d243229, S=1,     1024, 0xc2f67c9f
+0,        128,        128,        1,      124, 0x948f330b, S=1,     1024, 0xc2f67c9f
+0,        129,        129,        1,      133, 0xd53c35ca, S=1,     1024, 0xc2f67c9f
+0,        130,        130,        1,      126, 0xc5543710, S=1,     1024, 0xc2f67c9f
+0,        131,        131,        1,      208, 0x6cf15ea2, S=1,     1024, 0xc2f67c9f
+0,        132,        132,        1,      131, 0xa8d33505, S=1,     1024, 0xc2f67c9f
+0,        133,        133,        1,      114, 0x0ae53001, S=1,     1024, 0xc2f67c9f
+0,        134,        134,        1,      129, 0xe9ff37c4, S=1,     1024, 0xc2f67c9f
+0,        135,        135,        1,      120, 0x02623359, S=1,     1024, 0xc2f67c9f
+0,        136,        136,        1,      164, 0x9dc545e5, S=1,     1024, 0xc2f67c9f
+0,        137,        137,        1,      245, 0xc170715a, S=1,     1024, 0xc2f67c9f
+0,        138,        138,        1,      215, 0xc93d5fbe, S=1,     1024, 0xc2f67c9f
+0,        139,        139,        1,      225, 0x14866349, S=1,     1024, 0xc2f67c9f
+0,        140,        140,        1,      123, 0x70cd2b64, S=1,     1024, 0xc2f67c9f
+0,        141,        141,        1,      124, 0xe9002fb5, S=1,     1024, 0xc2f67c9f
+0,        142,        142,        1,      125, 0x106e309b, S=1,     1024, 0xc2f67c9f
+0,        143,        143,        1,      122, 0x050e32b0, S=1,     1024, 0xc2f67c9f
+0,        144,        144,        1,      224, 0xf548614f, S=1,     1024, 0xc2f67c9f
+0,        145,        145,        1,      239, 0x125c6ade, S=1,     1024, 0xc2f67c9f
+0,        146,        146,        1,      127, 0x398734b6, S=1,     1024, 0xc2f67c9f
+0,        147,        147,        1,      126, 0x2ff431e5, S=1,     1024, 0xc2f67c9f
+0,        148,        148,        1,      124, 0x9583313b, S=1,     1024, 0xc2f67c9f
+0,        149,        149,        1,      126, 0xc1fc3692, S=1,     1024, 0xc2f67c9f
+0,        150,        150,        1,      123, 0xd0bf3170, S=1,     1024, 0xc2f67c9f
+0,        151,        151,        1,      117, 0x651f3032, S=1,     1024, 0xc2f67c9f
+0,        152,        152,        1,      119, 0x268a3078, S=1,     1024, 0xc2f67c9f
+0,        153,        153,        1,      117, 0x9e4d3283, S=1,     1024, 0xc2f67c9f
+0,        154,        154,        1,      149, 0x8f1043ba, S=1,     1024, 0xc2f67c9f
+0,        155,        155,        1,      127, 0x352338bc, S=1,     1024, 0xc2f67c9f
+0,        156,        156,        1,      113, 0xf877314e, S=1,     1024, 0xc2f67c9f
+0,        157,        157,        1,      128, 0x88103a62, S=1,     1024, 0xc2f67c9f
+0,        158,        158,        1,      111, 0xbf0630d9, S=1,     1024, 0xc2f67c9f
+0,        159,        159,        1,      146, 0x159c44f7, S=1,     1024, 0xc2f67c9f
+0,        160,        160,        1,      237, 0x4e45662e, S=1,     1024, 0xc2f67c9f
+0,        161,        161,        1,      233, 0x8f9e6354, S=1,     1024, 0xc2f67c9f
+0,        162,        162,        1,      160, 0x9c3f431f, S=1,     1024, 0xc2f67c9f
+0,        163,        163,        1,      125, 0xbd2b33c6, S=1,     1024, 0xc2f67c9f
+0,        164,        164,        1,      131, 0x3ecd3ba5, S=1,     1024, 0xc2f67c9f
+0,        165,        165,        1,      231, 0xdf286db6, S=1,     1024, 0xc2f67c9f
+0,        166,        166,        1,      153, 0xb6da408d, S=1,     1024, 0xc2f67c9f
+0,        167,        167,        1,      126, 0x6741365e, S=1,     1024, 0xc2f67c9f
+0,        168,        168,        1,      113, 0x658f2c90, S=1,     1024, 0xc2f67c9f
+0,        169,        169,        1,      125, 0xc0033320, S=1,     1024, 0xc2f67c9f
+0,        170,        170,        1,      122, 0xe38a2db1, S=1,     1024, 0xc2f67c9f
+0,        171,        171,        1,      145, 0x29d63e83, S=1,     1024, 0xc2f67c9f
+0,        172,        172,        1,      171, 0xc0e44b70, S=1,     1024, 0xc2f67c9f
diff --git a/tests/ref/fate/gifenc-pal8 b/tests/ref/fate/gifenc-pal8
new file mode 100644
index 0000000000..a6d5741992
--- /dev/null
+++ b/tests/ref/fate/gifenc-pal8
@@ -0,0 +1,178 @@
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: gif
+#dimensions 0: 217x217
+#sar 0: 0/1
+0,          0,          0,        1,      552, 0x271a2dd3, S=1,     1024, 0xec907a9e
+0,          1,          1,        1,      297, 0x90168a95, S=1,     1024, 0xf351799f
+0,          2,          2,        1,      438, 0x91efce1b, S=1,     1024, 0xf351799f
+0,          3,          3,        1,      450, 0x7c2dcfad, S=1,     1024, 0xf351799f
+0,          4,          4,        1,      547, 0xc131fd3b, S=1,     1024, 0xf351799f
+0,          5,          5,        1,      614, 0x68182006, S=1,     1024, 0xf351799f
+0,          6,          6,        1,      642, 0x78bb1f5f, S=1,     1024, 0xf351799f
+0,          7,          7,        1,      660, 0x35c033a2, S=1,     1024, 0xf351799f
+0,          8,          8,        1,      821, 0xaf30790b, S=1,     1024, 0xf351799f
+0,          9,          9,        1,     1157, 0x741c2da1, S=1,     1024, 0xf351799f
+0,         10,         10,        1,      179, 0x3a27517c, S=1,     1024, 0xf351799f
+0,         11,         11,        1,     1333, 0x5ee76f3c, S=1,     1024, 0xf351799f
+0,         12,         12,        1,     1638, 0x5f640e86, S=1,     1024, 0xf351799f
+0,         13,         13,        1,     1531, 0xccb8e437, S=1,     1024, 0xf351799f
+0,         14,         14,        1,     1720, 0xc95d45ec, S=1,     1024, 0xf351799f
+0,         15,         15,        1,     1910, 0x56cc831e, S=1,     1024, 0xf351799f
+0,         16,         16,        1,     2124, 0x9cc8e130, S=1,     1024, 0xf351799f
+0,         17,         17,        1,     2248, 0x05a325b1, S=1,     1024, 0xf351799f
+0,         18,         18,        1,     2311, 0xdc633703, S=1,     1024, 0xf351799f
+0,         19,         19,        1,     2408, 0x91c26f3e, S=1,     1024, 0xf351799f
+0,         20,         20,        1,     2601, 0x8cf3c157, S=1,     1024, 0xf351799f
+0,         21,         21,        1,     2687, 0x8f6400e6, S=1,     1024, 0xf351799f
+0,         22,         22,        1,     2784, 0xaa880e55, S=1,     1024, 0xf351799f
+0,         23,         23,        1,     2884, 0x46f546f6, S=1,     1024, 0xf351799f
+0,         24,         24,        1,     2982, 0x807c7ad5, S=1,     1024, 0xf351799f
+0,         25,         25,        1,     3101, 0xbcc89bec, S=1,     1024, 0xf351799f
+0,         26,         26,        1,     3253, 0xd032f3fa, S=1,     1024, 0xf351799f
+0,         27,         27,        1,     3329, 0xe4d42430, S=1,     1024, 0xf351799f
+0,         28,         28,        1,     3572, 0xf8058aa0, S=1,     1024, 0xf351799f
+0,         29,         29,        1,     3807, 0x3d2af9f3, S=1,     1024, 0xf351799f
+0,         30,         30,        1,     2750, 0x814d1c33, S=1,     1024, 0xf351799f
+0,         31,         31,        1,     4031, 0x3b077006, S=1,     1024, 0xf351799f
+0,         32,         32,        1,     3025, 0x86729c1c, S=1,     1024, 0xf351799f
+0,         33,         33,        1,     4295, 0xf71b0b38, S=1,     1024, 0xf351799f
+0,         34,         34,        1,     2044, 0x5adcb93b, S=1,     1024, 0xf351799f
+0,         35,         35,        1,     3212, 0xcf79eeed, S=1,     1024, 0xf351799f
+0,         36,         36,        1,     2292, 0xb4386334, S=1,     1024, 0xf351799f
+0,         37,         37,        1,     3633, 0x0010992f, S=1,     1024, 0xf351799f
+0,         38,         38,        1,     3552, 0x23697490, S=1,     1024, 0xf351799f
+0,         39,         39,        1,     3690, 0x62afdbb8, S=1,     1024, 0xf351799f
+0,         40,         40,        1,     1559, 0x5baef54a, S=1,     1024, 0xf351799f
+0,         41,         41,        1,      954, 0xca75ca79, S=1,     1024, 0xf351799f
+0,         42,         42,        1,      273, 0x3687799b, S=1,     1024, 0xf351799f
+0,         43,         43,        1,      930, 0x29f3b0c4, S=1,     1024, 0xf351799f
+0,         44,         44,        1,      271, 0x305e8094, S=1,     1024, 0xf351799f
+0,         45,         45,        1,      196, 0xf5ab51ee, S=1,     1024, 0xf351799f
+0,         46,         46,        1,     4299, 0x67ec0d55, S=1,     1024, 0xf351799f
+0,         47,         47,        1,     4895, 0xb394406c, S=1,     1024, 0xf351799f
+0,         48,         48,        1,     4928, 0x233919d7, S=1,     1024, 0xf351799f
+0,         49,         49,        1,     4941, 0x58a357da, S=1,     1024, 0xf351799f
+0,         50,         50,        1,     4154, 0x21f2ac33, S=1,     1024, 0xf351799f
+0,         51,         51,        1,     4678, 0xab3cc050, S=1,     1024, 0xf351799f
+0,         52,         52,        1,     4741, 0x1974b581, S=1,     1024, 0xf351799f
+0,         53,         53,        1,     4982, 0x891456d5, S=1,     1024, 0xf351799f
+0,         54,         54,        1,     5179, 0x860fc6a1, S=1,     1024, 0xf351799f
+0,         55,         55,        1,     5046, 0xce9183d3, S=1,     1024, 0xf351799f
+0,         56,         56,        1,     5140, 0xa6d7b9af, S=1,     1024, 0xf351799f
+0,         57,         57,        1,     4301, 0x03b6ef3f, S=1,     1024, 0xf351799f
+0,         58,         58,        1,     5079, 0xa8d59e01, S=1,     1024, 0xf351799f
+0,         59,         59,        1,     5284, 0xea34e3b3, S=1,     1024, 0xf351799f
+0,         60,         60,        1,     5426, 0x556a15cd, S=1,     1024, 0xf351799f
+0,         61,         61,        1,     4645, 0x061e8936, S=1,     1024, 0xf351799f
+0,         62,         62,        1,     5263, 0x7536cf7d, S=1,     1024, 0xf351799f
+0,         63,         63,        1,     5221, 0x9fbac3ca, S=1,     1024, 0xf351799f
+0,         64,         64,        1,     5217, 0x02269bd2, S=1,     1024, 0xf351799f
+0,         65,         65,        1,     5395, 0x120fff66, S=1,     1024, 0xf351799f
+0,         66,         66,        1,     5220, 0x77cedcc5, S=1,     1024, 0xf351799f
+0,         67,         67,        1,     5704, 0xba42dd96, S=1,     1024, 0xf351799f
+0,         68,         68,        1,     5636, 0xcb91a25b, S=1,     1024, 0xf351799f
+0,         69,         69,        1,     5818, 0x8dc0df92, S=1,     1024, 0xf351799f
+0,         70,         70,        1,     5763, 0x51d5d5f0, S=1,     1024, 0xf351799f
+0,         71,         71,        1,     6116, 0x09558b48, S=1,     1024, 0xf351799f
+0,         72,         72,        1,     6069, 0x41926817, S=1,     1024, 0xf351799f
+0,         73,         73,        1,     5796, 0x7fbeda44, S=1,     1024, 0xf351799f
+0,         74,         74,        1,     5999, 0xe07d3770, S=1,     1024, 0xf351799f
+0,         75,         75,        1,     6220, 0x6607b06f, S=1,     1024, 0xf351799f
+0,         76,         76,        1,     6374, 0x7628e533, S=1,     1024, 0xf351799f
+0,         77,         77,        1,     6465, 0xfe956b15, S=1,     1024, 0xf351799f
+0,         78,         78,        1,     7019, 0x6c9a1aef, S=1,     1024, 0xf351799f
+0,         79,         79,        1,     7255, 0x5fa5c1bf, S=1,     1024, 0xf351799f
+0,         80,         80,        1,     8197, 0xf11d6ef2, S=1,     1024, 0xf351799f
+0,         81,         81,        1,     8358, 0x027279e8, S=1,     1024, 0xf351799f
+0,         82,         82,        1,     7708, 0x607f8e8b, S=1,     1024, 0xf351799f
+0,         83,         83,        1,     7412, 0x6bb2105f, S=1,     1024, 0xf351799f
+0,         84,         84,        1,     7541, 0xfdc02154, S=1,     1024, 0xf351799f
+0,         85,         85,        1,     7948, 0x916ecd8b, S=1,     1024, 0xf351799f
+0,         86,         86,        1,     8408, 0x1f97d414, S=1,     1024, 0xf351799f
+0,         87,         87,        1,     8056, 0x9cbf159c, S=1,     1024, 0xf351799f
+0,         88,         88,        1,     7401, 0x2625addb, S=1,     1024, 0xf351799f
+0,         89,         89,        1,     7494, 0x2877eacb, S=1,     1024, 0xf351799f
+0,         90,         90,        1,     7806, 0xe32574a3, S=1,     1024, 0xf351799f
+0,         91,         91,        1,     7768, 0x25ed7ee7, S=1,     1024, 0xf351799f
+0,         92,         92,        1,     7749, 0x6d8e978e, S=1,     1024, 0xf351799f
+0,         93,         93,        1,     8047, 0xec4b150c, S=1,     1024, 0xf351799f
+0,         94,         94,        1,     7618, 0x88cf30d5, S=1,     1024, 0xf351799f
+0,         95,         95,        1,     7979, 0x0eb1cf2a, S=1,     1024, 0xf351799f
+0,         96,         96,        1,    12062, 0xb49d9125, S=1,     1024, 0xf351799f
+0,         97,         97,        1,    12317, 0x2d8fd6e9, S=1,     1024, 0xf351799f
+0,         98,         98,        1,    12217, 0x9b3be549, S=1,     1024, 0xf351799f
+0,         99,         99,        1,    11227, 0x067e9118, S=1,     1024, 0xf351799f
+0,        100,        100,        1,    11108, 0x5e5b0afd, S=1,     1024, 0xf351799f
+0,        101,        101,        1,    11366, 0xb38e8d15, S=1,     1024, 0xf351799f
+0,        102,        102,        1,    11896, 0xeb3e35ca, S=1,     1024, 0xf351799f
+0,        103,        103,        1,    11479, 0xbf7581e9, S=1,     1024, 0xf351799f
+0,        104,        104,        1,    13395, 0x415b38d8, S=1,     1024, 0xf351799f
+0,        105,        105,        1,    12913, 0x61544631, S=1,     1024, 0xf351799f
+0,        106,        106,        1,    13864, 0xd39fe768, S=1,     1024, 0xf351799f
+0,        107,        107,        1,    13551, 0x76c167d1, S=1,     1024, 0xf351799f
+0,        108,        108,        1,    14041, 0x2f206888, S=1,     1024, 0xf351799f
+0,        109,        109,        1,    14144, 0x9ec030d3, S=1,     1024, 0xf351799f
+0,        110,        110,        1,    14277, 0xa84b3a9b, S=1,     1024, 0xf351799f
+0,        111,        111,        1,    14424, 0xf5f1e06e, S=1,     1024, 0xf351799f
+0,        112,        112,        1,    14689, 0xbca0adb5, S=1,     1024, 0xf351799f
+0,        113,        113,        1,    14598, 0xc1d45745, S=1,     1024, 0xf351799f
+0,        114,        114,        1,    15213, 0x8f3080fc, S=1,     1024, 0xf351799f
+0,        115,        115,        1,    15425, 0xb0aa8f59, S=1,     1024, 0xf351799f
+0,        116,        116,        1,    15595, 0x1406e5d5, S=1,     1024, 0xf351799f
+0,        117,        117,        1,    15598, 0x48ec7d08, S=1,     1024, 0xf351799f
+0,        118,        118,        1,    15863, 0x5381db7b, S=1,     1024, 0xf351799f
+0,        119,        119,        1,    15717, 0xb87a1b87, S=1,     1024, 0xf351799f
+0,        120,        120,        1,    16078, 0x5bab2453, S=1,     1024, 0xf351799f
+0,        121,        121,        1,    16225, 0xa1f88113, S=1,     1024, 0xf351799f
+0,        122,        122,        1,    16135, 0x6af2f4e1, S=1,     1024, 0xf351799f
+0,        123,        123,        1,    16661, 0xf02a3343, S=1,     1024, 0xf351799f
+0,        124,        124,        1,    16619, 0xc71935a4, S=1,     1024, 0xf351799f
+0,        125,        125,        1,    16829, 0x29849844, S=1,     1024, 0xf351799f
+0,        126,        126,        1,    16944, 0x3423ae77, S=1,     1024, 0xf351799f
+0,        127,        127,        1,    17119, 0x609b4409, S=1,     1024, 0xf351799f
+0,        128,        128,        1,    17150, 0xf85dfd31, S=1,     1024, 0xf351799f
+0,        129,        129,        1,    17321, 0x38eccb10, S=1,     1024, 0xf351799f
+0,        130,        130,        1,    17395, 0x0ba08b85, S=1,     1024, 0xf351799f
+0,        131,        131,        1,    17666, 0x6fbc0264, S=1,     1024, 0xf351799f
+0,        132,        132,        1,    17730, 0x3dcc64a6, S=1,     1024, 0xf351799f
+0,        133,        133,        1,    17934, 0xb539974b, S=1,     1024, 0xf351799f
+0,        134,        134,        1,    17944, 0x2214ec94, S=1,     1024, 0xf351799f
+0,        135,        135,        1,    18238, 0x70f9ff1d, S=1,     1024, 0xf351799f
+0,        136,        136,        1,    18391, 0x4b149209, S=1,     1024, 0xf351799f
+0,        137,        137,        1,    18543, 0x45a1c02f, S=1,     1024, 0xf351799f
+0,        138,        138,        1,    18939, 0x2789a88c, S=1,     1024, 0xf351799f
+0,        139,        139,        1,    19145, 0x5daafd7a, S=1,     1024, 0xf351799f
+0,        140,        140,        1,    19120, 0x565f80e6, S=1,     1024, 0xf351799f
+0,        141,        141,        1,    19130, 0xff70cc21, S=1,     1024, 0xf351799f
+0,        142,        142,        1,    19494, 0xbfa284db, S=1,     1024, 0xf351799f
+0,        143,        143,        1,    19534, 0x3d40743b, S=1,     1024, 0xf351799f
+0,        144,        144,        1,    19747, 0x33c9b108, S=1,     1024, 0xf351799f
+0,        145,        145,        1,    20114, 0x9d223e36, S=1,     1024, 0xf351799f
+0,        146,        146,        1,    20257, 0xe7bdaf43, S=1,     1024, 0xf351799f
+0,        147,        147,        1,    20370, 0x0c5f1970, S=1,     1024, 0xf351799f
+0,        148,        148,        1,    20292, 0x6986d20e, S=1,     1024, 0xf351799f
+0,        149,        149,        1,    20491, 0xd88e4c08, S=1,     1024, 0xf351799f
+0,        150,        150,        1,    20647, 0x1aefaffc, S=1,     1024, 0xf351799f
+0,        151,        151,        1,    20666, 0x43e4aaaa, S=1,     1024, 0xf351799f
+0,        152,        152,        1,    21007, 0xa7ca3ef0, S=1,     1024, 0xf351799f
+0,        153,        153,        1,    21058, 0x06814351, S=1,     1024, 0xf351799f
+0,        154,        154,        1,    21153, 0x3c852b10, S=1,     1024, 0xf351799f
+0,        155,        155,        1,    21078, 0x8df15855, S=1,     1024, 0xf351799f
+0,        156,        156,        1,    21458, 0xd3a531d6, S=1,     1024, 0xf351799f
+0,        157,        157,        1,    21669, 0x88baca53, S=1,     1024, 0xf351799f
+0,        158,        158,        1,    21581, 0xd692fa1f, S=1,     1024, 0xf351799f
+0,        159,        159,        1,    21654, 0x30fb9061, S=1,     1024, 0xf351799f
+0,        160,        160,        1,    21987, 0xe7646d8b, S=1,     1024, 0xf351799f
+0,        161,        161,        1,    22205, 0x0fc55b6a, S=1,     1024, 0xf351799f
+0,        162,        162,        1,    22475, 0x4bc4c032, S=1,     1024, 0xf351799f
+0,        163,        163,        1,    22490, 0x58ca23f6, S=1,     1024, 0xf351799f
+0,        164,        164,        1,    22460, 0xf9ceb0ac, S=1,     1024, 0xf351799f
+0,        165,        165,        1,    22861, 0xb05f0f84, S=1,     1024, 0xf351799f
+0,        166,        166,        1,    22746, 0x0df23a5c, S=1,     1024, 0xf351799f
+0,        167,        167,        1,    23165, 0xbd7147ad, S=1,     1024, 0xf351799f
+0,        168,        168,        1,    23273, 0x9781a34f, S=1,     1024, 0xf351799f
+0,        169,        169,        1,    23211, 0x69c7606b, S=1,     1024, 0xf351799f
+0,        170,        170,        1,    23648, 0xdafde037, S=1,     1024, 0xf351799f
+0,        171,        171,        1,    23675, 0x2a2147ed, S=1,     1024, 0xf351799f
+0,        172,        172,        1,    23874, 0x12c184b6, S=1,     1024, 0xf351799f
diff --git a/tests/ref/fate/gifenc-rgb4_byte b/tests/ref/fate/gifenc-rgb4_byte
new file mode 100644
index 0000000000..067accd694
--- /dev/null
+++ b/tests/ref/fate/gifenc-rgb4_byte
@@ -0,0 +1,178 @@
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: gif
+#dimensions 0: 217x217
+#sar 0: 0/1
+0,          0,          0,        1,      508, 0xf04a113b
+0,          1,          1,        1,      213, 0x23c24d3d, S=1,     1024, 0xf7700427
+0,          2,          2,        1,      131, 0x56d22a39, S=1,     1024, 0x03730427
+0,          3,          3,        1,      384, 0xb1d8a4bd, S=1,     1024, 0xf7700427
+0,          4,          4,        1,      381, 0x37a3a2c9, S=1,     1024, 0xf3740427
+0,          5,          5,        1,      430, 0x162bb3d3, S=1,     1024, 0xf3740427
+0,          6,          6,        1,      518, 0x195bd738, S=1,     1024, 0xf3740427
+0,          7,          7,        1,      535, 0x12cde6b7, S=1,     1024, 0xf3740427
+0,          8,          8,        1,      438, 0xa653b946, S=1,     1024, 0x0b6b0427
+0,          9,          9,        1,      923, 0xd2e2a35f, S=1,     1024, 0x0b6b0427
+0,         10,         10,        1,      694, 0xe1cf4a1f, S=1,     1024, 0x0b6b0427
+0,         11,         11,        1,     1194, 0xa6152c8a, S=1,     1024, 0x0b6b0427
+0,         12,         12,        1,     1291, 0x94d25581, S=1,     1024, 0x0b6b0427
+0,         13,         13,        1,     1245, 0x5b483525, S=1,     1024, 0x0b6b0427
+0,         14,         14,        1,     1330, 0xfb5351c8, S=1,     1024, 0x0b6b0427
+0,         15,         15,        1,     1276, 0x6f403914, S=1,     1024, 0x0b6b0427
+0,         16,         16,        1,     1475, 0xbf459755, S=1,     1024, 0x0b6b0427
+0,         17,         17,        1,     1784, 0xe9954aa7, S=1,     1024, 0xecb30526
+0,         18,         18,        1,     1675, 0x219dfaf8, S=1,     1024, 0xecb30526
+0,         19,         19,        1,     1509, 0xd7f5abbe, S=1,     1024, 0xecb30526
+0,         20,         20,        1,     1705, 0x44a01729, S=1,     1024, 0xecb30526
+0,         21,         21,        1,     1745, 0x31ff1f89, S=1,     1024, 0xecb30526
+0,         22,         22,        1,     1642, 0x55420147, S=1,     1024, 0xecb30526
+0,         23,         23,        1,     1718, 0x68ef1cb8, S=1,     1024, 0xecb30526
+0,         24,         24,        1,     1900, 0xd7737a09, S=1,     1024, 0xecb30526
+0,         25,         25,        1,     1807, 0x4f6c5140, S=1,     1024, 0xecb30526
+0,         26,         26,        1,     1915, 0x976d80e6, S=1,     1024, 0xecb30526
+0,         27,         27,        1,     2100, 0x0ae6d1ce, S=1,     1024, 0xecb30526
+0,         28,         28,        1,     2700, 0x7a89f104, S=1,     1024, 0xecb30526
+0,         29,         29,        1,     2673, 0xf6b6a71d, S=1,     1024, 0xecb30526
+0,         30,         30,        1,     2895, 0x9079484b, S=1,     1024, 0xecb30526
+0,         31,         31,        1,     3257, 0x0b0cd125, S=1,     1024, 0xecb30526
+0,         32,         32,        1,     3179, 0x3ee2c161, S=1,     1024, 0xecb30526
+0,         33,         33,        1,     3296, 0x6230e506, S=1,     1024, 0xecb30526
+0,         34,         34,        1,     3600, 0x021775d7, S=1,     1024, 0xecb30526
+0,         35,         35,        1,     3699, 0xfb03a043, S=1,     1024, 0xecb30526
+0,         36,         36,        1,     3814, 0x96a8d57e, S=1,     1024, 0xecb30526
+0,         37,         37,        1,     3627, 0x33a37f8f, S=1,     1024, 0xecb30526
+0,         38,         38,        1,     2950, 0x50806197, S=1,     1024, 0xecb30526
+0,         39,         39,        1,     3086, 0x72068d4c, S=1,     1024, 0xecb30526
+0,         40,         40,        1,     3094, 0x2880861f, S=1,     1024, 0xecb30526
+0,         41,         41,        1,     3456, 0x6d232a96, S=1,     1024, 0xecb30526
+0,         42,         42,        1,     4108, 0x46d75ebb, S=1,     1024, 0xecb30526
+0,         43,         43,        1,     4217, 0x04a258f4, S=1,     1024, 0xecb30526
+0,         44,         44,        1,     3613, 0x667f4ff8, S=1,     1024, 0xecb30526
+0,         45,         45,        1,     3910, 0x8f37e73e, S=1,     1024, 0xecb30526
+0,         46,         46,        1,     4461, 0x5db9e0bf, S=1,     1024, 0xecb30526
+0,         47,         47,        1,     4593, 0x883f2f49, S=1,     1024, 0xecb30526
+0,         48,         48,        1,     4822, 0x03d99b73, S=1,     1024, 0xecb30526
+0,         49,         49,        1,     5398, 0x39f7bff4, S=1,     1024, 0xecb30526
+0,         50,         50,        1,     5266, 0xd5ab9630, S=1,     1024, 0xecb30526
+0,         51,         51,        1,     5416, 0x5876e16f, S=1,     1024, 0xecb30526
+0,         52,         52,        1,     5519, 0x30ed05d8, S=1,     1024, 0xecb30526
+0,         53,         53,        1,     5701, 0x5bae5af7, S=1,     1024, 0xecb30526
+0,         54,         54,        1,     6160, 0x98364177, S=1,     1024, 0xecb30526
+0,         55,         55,        1,     6233, 0x52a05075, S=1,     1024, 0xecb30526
+0,         56,         56,        1,     5911, 0x04bfc46a, S=1,     1024, 0xecb30526
+0,         57,         57,        1,     5997, 0xf1e6f586, S=1,     1024, 0xecb30526
+0,         58,         58,        1,     5946, 0xe6f3f055, S=1,     1024, 0xecb30526
+0,         59,         59,        1,     6468, 0xc8a3cf61, S=1,     1024, 0xecb30526
+0,         60,         60,        1,     6737, 0xc27b3b79, S=1,     1024, 0xecb30526
+0,         61,         61,        1,     6275, 0x84d88e2b, S=1,     1024, 0xecb30526
+0,         62,         62,        1,     6641, 0xb44b3534, S=1,     1024, 0xecb30526
+0,         63,         63,        1,     6378, 0x3965888b, S=1,     1024, 0xecb30526
+0,         64,         64,        1,     6257, 0x12115750, S=1,     1024, 0xecb30526
+0,         65,         65,        1,     6908, 0x57137217, S=1,     1024, 0xecb30526
+0,         66,         66,        1,     7230, 0xbacc24ee, S=1,     1024, 0xecb30526
+0,         67,         67,        1,     7556, 0x1aa2a694, S=1,     1024, 0xecb30526
+0,         68,         68,        1,     7413, 0xbc9e7718, S=1,     1024, 0xecb30526
+0,         69,         69,        1,     7476, 0xb2a1aba0, S=1,     1024, 0xecb30526
+0,         70,         70,        1,     7596, 0x3301e56d, S=1,     1024, 0xecb30526
+0,         71,         71,        1,     7756, 0x8f2504f8, S=1,     1024, 0xecb30526
+0,         72,         72,        1,     8015, 0xd4146c80, S=1,     1024, 0xecb30526
+0,         73,         73,        1,     8128, 0x11b2bf4c, S=1,     1024, 0xecb30526
+0,         74,         74,        1,     8101, 0xc627adbe, S=1,     1024, 0xecb30526
+0,         75,         75,        1,     7863, 0xe99f3f3b, S=1,     1024, 0xecb30526
+0,         76,         76,        1,     7960, 0x4bc091b8, S=1,     1024, 0xecb30526
+0,         77,         77,        1,     8238, 0x1086ea8a, S=1,     1024, 0xecb30526
+0,         78,         78,        1,     8321, 0x3a404791, S=1,     1024, 0xecb30526
+0,         79,         79,        1,     8562, 0xcbdcc01e, S=1,     1024, 0xecb30526
+0,         80,         80,        1,     8746, 0xec190b22, S=1,     1024, 0xecb30526
+0,         81,         81,        1,     8578, 0x12e7a4e8, S=1,     1024, 0xecb30526
+0,         82,         82,        1,     8878, 0x51c05771, S=1,     1024, 0xecb30526
+0,         83,         83,        1,     9077, 0xe12b589b, S=1,     1024, 0xecb30526
+0,         84,         84,        1,     9310, 0xde3bf881, S=1,     1024, 0xecb30526
+0,         85,         85,        1,     9394, 0x1eba46cc, S=1,     1024, 0xecb30526
+0,         86,         86,        1,     9161, 0x7c359911, S=1,     1024, 0xecb30526
+0,         87,         87,        1,     9462, 0xccda3664, S=1,     1024, 0xecb30526
+0,         88,         88,        1,     9650, 0x6e6292fc, S=1,     1024, 0xecb30526
+0,         89,         89,        1,     9701, 0x08909b95, S=1,     1024, 0xecb30526
+0,         90,         90,        1,     9523, 0xe61b38bb, S=1,     1024, 0xecb30526
+0,         91,         91,        1,     9891, 0x96b90b98, S=1,     1024, 0xecb30526
+0,         92,         92,        1,    10005, 0x2db84c80, S=1,     1024, 0xecb30526
+0,         93,         93,        1,    10038, 0x37e52a72, S=1,     1024, 0xecb30526
+0,         94,         94,        1,    10086, 0x135a43e4, S=1,     1024, 0xecb30526
+0,         95,         95,        1,    10438, 0x472c0372, S=1,     1024, 0xecb30526
+0,         96,         96,        1,    10583, 0xcf4c5862, S=1,     1024, 0xecb30526
+0,         97,         97,        1,    10581, 0xce658137, S=1,     1024, 0xecb30526
+0,         98,         98,        1,    10807, 0x3954dad9, S=1,     1024, 0xecb30526
+0,         99,         99,        1,    11111, 0x5f8d504f, S=1,     1024, 0xecb30526
+0,        100,        100,        1,    11194, 0x3c7e6a77, S=1,     1024, 0xecb30526
+0,        101,        101,        1,    11240, 0x5112a0a3, S=1,     1024, 0xecb30526
+0,        102,        102,        1,    11483, 0xaf10f4fa, S=1,     1024, 0xecb30526
+0,        103,        103,        1,    11680, 0x44a25971, S=1,     1024, 0xecb30526
+0,        104,        104,        1,    11785, 0x7350b5db, S=1,     1024, 0xecb30526
+0,        105,        105,        1,    11436, 0xe3170ad5, S=1,     1024, 0xecb30526
+0,        106,        106,        1,    11928, 0x13d8c885, S=1,     1024, 0xecb30526
+0,        107,        107,        1,    11932, 0xecb5bdf7, S=1,     1024, 0xecb30526
+0,        108,        108,        1,    12281, 0x18bb76d5, S=1,     1024, 0xecb30526
+0,        109,        109,        1,    12334, 0x16147fc3, S=1,     1024, 0xecb30526
+0,        110,        110,        1,    12452, 0x61a8b3d7, S=1,     1024, 0xecb30526
+0,        111,        111,        1,    12695, 0x8b703e74, S=1,     1024, 0xecb30526
+0,        112,        112,        1,    12668, 0x19505176, S=1,     1024, 0xecb30526
+0,        113,        113,        1,    12957, 0x3b839f0d, S=1,     1024, 0xecb30526
+0,        114,        114,        1,    13054, 0xb8a5e3db, S=1,     1024, 0xecb30526
+0,        115,        115,        1,    13147, 0xdf5c2e68, S=1,     1024, 0xecb30526
+0,        116,        116,        1,    13171, 0x15961ca2, S=1,     1024, 0xecb30526
+0,        117,        117,        1,    13198, 0xfd855718, S=1,     1024, 0xecb30526
+0,        118,        118,        1,    13211, 0x1a625e31, S=1,     1024, 0xecb30526
+0,        119,        119,        1,    13210, 0x246661c9, S=1,     1024, 0xecb30526
+0,        120,        120,        1,    13467, 0xfcaaa461, S=1,     1024, 0xecb30526
+0,        121,        121,        1,    13665, 0x8100dbf2, S=1,     1024, 0xecb30526
+0,        122,        122,        1,    13692, 0xddd1eab9, S=1,     1024, 0xecb30526
+0,        123,        123,        1,    13821, 0xc70e2af0, S=1,     1024, 0xecb30526
+0,        124,        124,        1,    13946, 0xe15d9134, S=1,     1024, 0xecb30526
+0,        125,        125,        1,    14063, 0xf652d232, S=1,     1024, 0xecb30526
+0,        126,        126,        1,    14124, 0x756ccc81, S=1,     1024, 0xecb30526
+0,        127,        127,        1,    14331, 0x56d64fe8, S=1,     1024, 0xecb30526
+0,        128,        128,        1,    14469, 0x4c3faa7f, S=1,     1024, 0xecb30526
+0,        129,        129,        1,    14536, 0xad02a19b, S=1,     1024, 0xecb30526
+0,        130,        130,        1,    14608, 0x0971d168, S=1,     1024, 0xecb30526
+0,        131,        131,        1,    14898, 0x1a6827b3, S=1,     1024, 0xecb30526
+0,        132,        132,        1,    14978, 0xf9709fef, S=1,     1024, 0xecb30526
+0,        133,        133,        1,    15142, 0x3598da63, S=1,     1024, 0xecb30526
+0,        134,        134,        1,    15129, 0x062fb976, S=1,     1024, 0xecb30526
+0,        135,        135,        1,    15243, 0x0a6a12f9, S=1,     1024, 0xecb30526
+0,        136,        136,        1,    15337, 0x0f9a65d6, S=1,     1024, 0xecb30526
+0,        137,        137,        1,    15638, 0xf7bc9ef5, S=1,     1024, 0xecb30526
+0,        138,        138,        1,    15912, 0x2d5b26bb, S=1,     1024, 0xecb30526
+0,        139,        139,        1,    16041, 0xbfaf4857, S=1,     1024, 0xecb30526
+0,        140,        140,        1,    16228, 0xdac701f0, S=1,     1024, 0xecb30526
+0,        141,        141,        1,    16262, 0xcd0ae5e4, S=1,     1024, 0xecb30526
+0,        142,        142,        1,    16371, 0x9d4f0e73, S=1,     1024, 0xecb30526
+0,        143,        143,        1,    16661, 0xd37ba990, S=1,     1024, 0xecb30526
+0,        144,        144,        1,    16917, 0xd5b01774, S=1,     1024, 0xecb30526
+0,        145,        145,        1,    17149, 0x435ecdd4, S=1,     1024, 0xecb30526
+0,        146,        146,        1,    17172, 0x045fb234, S=1,     1024, 0xecb30526
+0,        147,        147,        1,    17315, 0xc5ddadab, S=1,     1024, 0xecb30526
+0,        148,        148,        1,    17397, 0xff8e15b6, S=1,     1024, 0xecb30526
+0,        149,        149,        1,    17431, 0x6832f8c0, S=1,     1024, 0xecb30526
+0,        150,        150,        1,    17576, 0x5c2a5445, S=1,     1024, 0xecb30526
+0,        151,        151,        1,    17764, 0x609f8c3b, S=1,     1024, 0xecb30526
+0,        152,        152,        1,    17826, 0x538c8532, S=1,     1024, 0xecb30526
+0,        153,        153,        1,    17918, 0x84fc9a95, S=1,     1024, 0xecb30526
+0,        154,        154,        1,    17823, 0x788fbada, S=1,     1024, 0xecb30526
+0,        155,        155,        1,    18142, 0x56881e47, S=1,     1024, 0xecb30526
+0,        156,        156,        1,    18257, 0xa35b86cf, S=1,     1024, 0xecb30526
+0,        157,        157,        1,    18337, 0x82ddbc21, S=1,     1024, 0xecb30526
+0,        158,        158,        1,    18293, 0xf0d838d6, S=1,     1024, 0xecb30526
+0,        159,        159,        1,    18418, 0x7ed8bba6, S=1,     1024, 0xecb30526
+0,        160,        160,        1,    18607, 0xccea47f6, S=1,     1024, 0xecb30526
+0,        161,        161,        1,    18916, 0x880ebd63, S=1,     1024, 0xecb30526
+0,        162,        162,        1,    19073, 0x055f02e3, S=1,     1024, 0xecb30526
+0,        163,        163,        1,    19168, 0xcc2c02d7, S=1,     1024, 0xecb30526
+0,        164,        164,        1,    19210, 0xa538ffc1, S=1,     1024, 0xecb30526
+0,        165,        165,        1,    19398, 0x4777644d, S=1,     1024, 0xecb30526
+0,        166,        166,        1,    19480, 0xcb2aa0fa, S=1,     1024, 0xecb30526
+0,        167,        167,        1,    19659, 0xe3c1122d, S=1,     1024, 0xecb30526
+0,        168,        168,        1,    19672, 0x1d1e193f, S=1,     1024, 0xecb30526
+0,        169,        169,        1,    19936, 0xcd036346, S=1,     1024, 0xecb30526
+0,        170,        170,        1,    19975, 0x96529b21, S=1,     1024, 0xecb30526
+0,        171,        171,        1,    20021, 0xcdaf8bb5, S=1,     1024, 0xecb30526
+0,        172,        172,        1,    20060, 0x1cea7784, S=1,     1024, 0xecb30526
diff --git a/tests/ref/fate/gifenc-rgb8 b/tests/ref/fate/gifenc-rgb8
new file mode 100644
index 0000000000..490e4d0b19
--- /dev/null
+++ b/tests/ref/fate/gifenc-rgb8
@@ -0,0 +1,178 @@
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: gif
+#dimensions 0: 217x217
+#sar 0: 0/1
+0,          0,          0,        1,      552, 0x47602c6c
+0,          1,          1,        1,      297, 0x49dd8847, S=1,     1024, 0xcfc8799f
+0,          2,          2,        1,      438, 0x4776d352, S=1,     1024, 0xcfc8799f
+0,          3,          3,        1,      450, 0x2254d187, S=1,     1024, 0xcfc8799f
+0,          4,          4,        1,      547, 0xe16104bc, S=1,     1024, 0xcfc8799f
+0,          5,          5,        1,      614, 0x0fdc2027, S=1,     1024, 0xcfc8799f
+0,          6,          6,        1,      642, 0xa0af1edf, S=1,     1024, 0xcfc8799f
+0,          7,          7,        1,      660, 0xd0763931, S=1,     1024, 0xcfc8799f
+0,          8,          8,        1,      821, 0xc38f7fac, S=1,     1024, 0xcfc8799f
+0,          9,          9,        1,     1157, 0x4c112ecd, S=1,     1024, 0xcfc8799f
+0,         10,         10,        1,      179, 0x0690541c, S=1,     1024, 0xcfc8799f
+0,         11,         11,        1,     1333, 0x216f70a7, S=1,     1024, 0xcfc8799f
+0,         12,         12,        1,     1638, 0x901c093d, S=1,     1024, 0xcfc8799f
+0,         13,         13,        1,     1531, 0xc9bae5ff, S=1,     1024, 0xcfc8799f
+0,         14,         14,        1,     1720, 0xce854743, S=1,     1024, 0xcfc8799f
+0,         15,         15,        1,     1910, 0x2690866d, S=1,     1024, 0xcfc8799f
+0,         16,         16,        1,     2124, 0xa586dad0, S=1,     1024, 0xcfc8799f
+0,         17,         17,        1,     2248, 0x9ddc2a88, S=1,     1024, 0xcfc8799f
+0,         18,         18,        1,     2311, 0xd64235af, S=1,     1024, 0xcfc8799f
+0,         19,         19,        1,     2408, 0xe2a66cc9, S=1,     1024, 0xcfc8799f
+0,         20,         20,        1,     2601, 0xeab6c267, S=1,     1024, 0xcfc8799f
+0,         21,         21,        1,     2687, 0xfe1d0311, S=1,     1024, 0xcfc8799f
+0,         22,         22,        1,     2784, 0xca600dee, S=1,     1024, 0xcfc8799f
+0,         23,         23,        1,     2884, 0xc7134b99, S=1,     1024, 0xcfc8799f
+0,         24,         24,        1,     2982, 0x0b1e7825, S=1,     1024, 0xcfc8799f
+0,         25,         25,        1,     3101, 0x3e029e0e, S=1,     1024, 0xcfc8799f
+0,         26,         26,        1,     3253, 0x846af678, S=1,     1024, 0xcfc8799f
+0,         27,         27,        1,     3329, 0x29a81b71, S=1,     1024, 0xcfc8799f
+0,         28,         28,        1,     3572, 0xa3e08a52, S=1,     1024, 0xcfc8799f
+0,         29,         29,        1,     3807, 0x18e1fed2, S=1,     1024, 0xcfc8799f
+0,         30,         30,        1,     2750, 0xff6e1f9e, S=1,     1024, 0xcfc8799f
+0,         31,         31,        1,     4031, 0x6d4f7329, S=1,     1024, 0xcfc8799f
+0,         32,         32,        1,     3025, 0xb43c9e94, S=1,     1024, 0xcfc8799f
+0,         33,         33,        1,     4295, 0xc1850a80, S=1,     1024, 0xcfc8799f
+0,         34,         34,        1,     2044, 0x0440c072, S=1,     1024, 0xcfc8799f
+0,         35,         35,        1,     3212, 0xe91af08f, S=1,     1024, 0xcfc8799f
+0,         36,         36,        1,     2292, 0x6765633e, S=1,     1024, 0xcfc8799f
+0,         37,         37,        1,     3633, 0xac779aa3, S=1,     1024, 0xcfc8799f
+0,         38,         38,        1,     3552, 0xed2c75b2, S=1,     1024, 0xcfc8799f
+0,         39,         39,        1,     3690, 0x2020dd0d, S=1,     1024, 0xcfc8799f
+0,         40,         40,        1,     1559, 0x596ef330, S=1,     1024, 0xcfc8799f
+0,         41,         41,        1,      954, 0xac12c9c5, S=1,     1024, 0xcfc8799f
+0,         42,         42,        1,      273, 0x138c7831, S=1,     1024, 0xcfc8799f
+0,         43,         43,        1,      930, 0xf1c3ae3f, S=1,     1024, 0xcfc8799f
+0,         44,         44,        1,      271, 0x921a80af, S=1,     1024, 0xcfc8799f
+0,         45,         45,        1,      196, 0xa5de5322, S=1,     1024, 0xcfc8799f
+0,         46,         46,        1,     4299, 0x5bac0d86, S=1,     1024, 0xcfc8799f
+0,         47,         47,        1,     4895, 0xc43639a6, S=1,     1024, 0xcfc8799f
+0,         48,         48,        1,     4928, 0xf17d13e8, S=1,     1024, 0xcfc8799f
+0,         49,         49,        1,     4941, 0x71915520, S=1,     1024, 0xcfc8799f
+0,         50,         50,        1,     4154, 0xc860b8a6, S=1,     1024, 0xcfc8799f
+0,         51,         51,        1,     4678, 0x2651c339, S=1,     1024, 0xcfc8799f
+0,         52,         52,        1,     4741, 0xffd6bb45, S=1,     1024, 0xcfc8799f
+0,         53,         53,        1,     4982, 0x132c5977, S=1,     1024, 0xcfc8799f
+0,         54,         54,        1,     5179, 0x97aac3a1, S=1,     1024, 0xcfc8799f
+0,         55,         55,        1,     5046, 0x836a80cd, S=1,     1024, 0xcfc8799f
+0,         56,         56,        1,     5140, 0xa725c1e7, S=1,     1024, 0xcfc8799f
+0,         57,         57,        1,     4301, 0x0203f239, S=1,     1024, 0xcfc8799f
+0,         58,         58,        1,     5079, 0xb2e7a2de, S=1,     1024, 0xcfc8799f
+0,         59,         59,        1,     5284, 0xb757dfe1, S=1,     1024, 0xcfc8799f
+0,         60,         60,        1,     5426, 0xf9f11e57, S=1,     1024, 0xcfc8799f
+0,         61,         61,        1,     4645, 0xf0f289e1, S=1,     1024, 0xcfc8799f
+0,         62,         62,        1,     5263, 0x8617d7e9, S=1,     1024, 0xcfc8799f
+0,         63,         63,        1,     5221, 0x26e3ca43, S=1,     1024, 0xcfc8799f
+0,         64,         64,        1,     5217, 0x90989cfb, S=1,     1024, 0xcfc8799f
+0,         65,         65,        1,     5395, 0xe29a01cb, S=1,     1024, 0xcfc8799f
+0,         66,         66,        1,     5220, 0xe2dee355, S=1,     1024, 0xcfc8799f
+0,         67,         67,        1,     5704, 0xcfbcd55e, S=1,     1024, 0xcfc8799f
+0,         68,         68,        1,     5636, 0x7fc2a1e5, S=1,     1024, 0xcfc8799f
+0,         69,         69,        1,     5818, 0x6090ebbd, S=1,     1024, 0xcfc8799f
+0,         70,         70,        1,     5763, 0xc110c791, S=1,     1024, 0xcfc8799f
+0,         71,         71,        1,     6116, 0xb4ee8e30, S=1,     1024, 0xcfc8799f
+0,         72,         72,        1,     6069, 0x21b263db, S=1,     1024, 0xcfc8799f
+0,         73,         73,        1,     5796, 0x2514df52, S=1,     1024, 0xcfc8799f
+0,         74,         74,        1,     5999, 0x1c3c3701, S=1,     1024, 0xcfc8799f
+0,         75,         75,        1,     6220, 0x8340b150, S=1,     1024, 0xcfc8799f
+0,         76,         76,        1,     6374, 0x00d8eaa5, S=1,     1024, 0xcfc8799f
+0,         77,         77,        1,     6465, 0x74c4778a, S=1,     1024, 0xcfc8799f
+0,         78,         78,        1,     7019, 0xdb1a28a3, S=1,     1024, 0xcfc8799f
+0,         79,         79,        1,     7255, 0x1e19b76e, S=1,     1024, 0xcfc8799f
+0,         80,         80,        1,     8197, 0x26bc6a79, S=1,     1024, 0xcfc8799f
+0,         81,         81,        1,     8358, 0x118781e0, S=1,     1024, 0xcfc8799f
+0,         82,         82,        1,     7708, 0xfc0c963d, S=1,     1024, 0xcfc8799f
+0,         83,         83,        1,     7412, 0xdcc311ee, S=1,     1024, 0xcfc8799f
+0,         84,         84,        1,     7541, 0x4d2819c1, S=1,     1024, 0xcfc8799f
+0,         85,         85,        1,     7948, 0xf12eca3d, S=1,     1024, 0xcfc8799f
+0,         86,         86,        1,     8408, 0x43add468, S=1,     1024, 0xcfc8799f
+0,         87,         87,        1,     8056, 0x2d162377, S=1,     1024, 0xcfc8799f
+0,         88,         88,        1,     7401, 0x26ebb649, S=1,     1024, 0xcfc8799f
+0,         89,         89,        1,     7494, 0x35fcf9ae, S=1,     1024, 0xcfc8799f
+0,         90,         90,        1,     7806, 0x4238723d, S=1,     1024, 0xcfc8799f
+0,         91,         91,        1,     7768, 0xb01e795a, S=1,     1024, 0xcfc8799f
+0,         92,         92,        1,     7749, 0x6ab39c12, S=1,     1024, 0xcfc8799f
+0,         93,         93,        1,     8047, 0x0e5f24aa, S=1,     1024, 0xcfc8799f
+0,         94,         94,        1,     7618, 0xd787340f, S=1,     1024, 0xcfc8799f
+0,         95,         95,        1,     7979, 0x0824c4df, S=1,     1024, 0xcfc8799f
+0,         96,         96,        1,    12062, 0xc46d9d92, S=1,     1024, 0xcfc8799f
+0,         97,         97,        1,    12317, 0x1314dc0c, S=1,     1024, 0xcfc8799f
+0,         98,         98,        1,    12217, 0x78c2ed30, S=1,     1024, 0xcfc8799f
+0,         99,         99,        1,    11227, 0x2a578eb9, S=1,     1024, 0xcfc8799f
+0,        100,        100,        1,    11108, 0x4eaa068c, S=1,     1024, 0xcfc8799f
+0,        101,        101,        1,    11366, 0x48f8993f, S=1,     1024, 0xcfc8799f
+0,        102,        102,        1,    11896, 0x32414841, S=1,     1024, 0xcfc8799f
+0,        103,        103,        1,    11479, 0xeaa38225, S=1,     1024, 0xcfc8799f
+0,        104,        104,        1,    13395, 0xaa9d4c72, S=1,     1024, 0xcfc8799f
+0,        105,        105,        1,    12913, 0x28854353, S=1,     1024, 0xcfc8799f
+0,        106,        106,        1,    13864, 0x663df630, S=1,     1024, 0xcfc8799f
+0,        107,        107,        1,    13551, 0xf7ba7be7, S=1,     1024, 0xcfc8799f
+0,        108,        108,        1,    14041, 0x2dc071b9, S=1,     1024, 0xcfc8799f
+0,        109,        109,        1,    14144, 0x33a03d1d, S=1,     1024, 0xcfc8799f
+0,        110,        110,        1,    14277, 0x6bda5935, S=1,     1024, 0xcfc8799f
+0,        111,        111,        1,    14424, 0xa696efd8, S=1,     1024, 0xcfc8799f
+0,        112,        112,        1,    14689, 0x8e3ad12c, S=1,     1024, 0xcfc8799f
+0,        113,        113,        1,    14598, 0x544668b4, S=1,     1024, 0xcfc8799f
+0,        114,        114,        1,    15213, 0x60009558, S=1,     1024, 0xcfc8799f
+0,        115,        115,        1,    15425, 0x86e5adf4, S=1,     1024, 0xcfc8799f
+0,        116,        116,        1,    15595, 0x878d09b9, S=1,     1024, 0xcfc8799f
+0,        117,        117,        1,    15598, 0x10daabc4, S=1,     1024, 0xcfc8799f
+0,        118,        118,        1,    15863, 0x2462016c, S=1,     1024, 0xcfc8799f
+0,        119,        119,        1,    15717, 0xe05041c4, S=1,     1024, 0xcfc8799f
+0,        120,        120,        1,    16078, 0x7c8f3a8c, S=1,     1024, 0xcfc8799f
+0,        121,        121,        1,    16225, 0x9771a52e, S=1,     1024, 0xcfc8799f
+0,        122,        122,        1,    16135, 0x2dfc1692, S=1,     1024, 0xcfc8799f
+0,        123,        123,        1,    16661, 0x09c96d7e, S=1,     1024, 0xcfc8799f
+0,        124,        124,        1,    16619, 0xc4735b56, S=1,     1024, 0xcfc8799f
+0,        125,        125,        1,    16829, 0x589dc13f, S=1,     1024, 0xcfc8799f
+0,        126,        126,        1,    16944, 0x997cd18f, S=1,     1024, 0xcfc8799f
+0,        127,        127,        1,    17119, 0x6c396b60, S=1,     1024, 0xcfc8799f
+0,        128,        128,        1,    17150, 0x8e603d31, S=1,     1024, 0xcfc8799f
+0,        129,        129,        1,    17321, 0x0bbcee5a, S=1,     1024, 0xcfc8799f
+0,        130,        130,        1,    17395, 0x99f0c974, S=1,     1024, 0xcfc8799f
+0,        131,        131,        1,    17666, 0x37184223, S=1,     1024, 0xcfc8799f
+0,        132,        132,        1,    17730, 0xa0d385b3, S=1,     1024, 0xcfc8799f
+0,        133,        133,        1,    17934, 0xb22cc97d, S=1,     1024, 0xcfc8799f
+0,        134,        134,        1,    17944, 0x0cd309c6, S=1,     1024, 0xcfc8799f
+0,        135,        135,        1,    18238, 0x6b7e3237, S=1,     1024, 0xcfc8799f
+0,        136,        136,        1,    18391, 0x4df3c48a, S=1,     1024, 0xcfc8799f
+0,        137,        137,        1,    18543, 0x90a2f238, S=1,     1024, 0xcfc8799f
+0,        138,        138,        1,    18939, 0xc57dda5b, S=1,     1024, 0xcfc8799f
+0,        139,        139,        1,    19145, 0x1267294a, S=1,     1024, 0xcfc8799f
+0,        140,        140,        1,    19120, 0xeac6a9c3, S=1,     1024, 0xcfc8799f
+0,        141,        141,        1,    19130, 0x31f3edbc, S=1,     1024, 0xcfc8799f
+0,        142,        142,        1,    19494, 0x3259a2f3, S=1,     1024, 0xcfc8799f
+0,        143,        143,        1,    19534, 0xda22a752, S=1,     1024, 0xcfc8799f
+0,        144,        144,        1,    19747, 0x8805c379, S=1,     1024, 0xcfc8799f
+0,        145,        145,        1,    20114, 0xaaf96864, S=1,     1024, 0xcfc8799f
+0,        146,        146,        1,    20257, 0x7223da26, S=1,     1024, 0xcfc8799f
+0,        147,        147,        1,    20370, 0x08ef382a, S=1,     1024, 0xcfc8799f
+0,        148,        148,        1,    20292, 0x4b47f207, S=1,     1024, 0xcfc8799f
+0,        149,        149,        1,    20491, 0xeedd6d1c, S=1,     1024, 0xcfc8799f
+0,        150,        150,        1,    20647, 0xb0d1dd45, S=1,     1024, 0xcfc8799f
+0,        151,        151,        1,    20666, 0x382cc8a4, S=1,     1024, 0xcfc8799f
+0,        152,        152,        1,    21007, 0x398f4f7d, S=1,     1024, 0xcfc8799f
+0,        153,        153,        1,    21058, 0xd6616a9d, S=1,     1024, 0xcfc8799f
+0,        154,        154,        1,    21153, 0x988749db, S=1,     1024, 0xcfc8799f
+0,        155,        155,        1,    21078, 0x1b328059, S=1,     1024, 0xcfc8799f
+0,        156,        156,        1,    21458, 0x6348529c, S=1,     1024, 0xcfc8799f
+0,        157,        157,        1,    21669, 0xcf63e2de, S=1,     1024, 0xcfc8799f
+0,        158,        158,        1,    21581, 0x1fc021af, S=1,     1024, 0xcfc8799f
+0,        159,        159,        1,    21654, 0x899dab18, S=1,     1024, 0xcfc8799f
+0,        160,        160,        1,    21987, 0x634086fe, S=1,     1024, 0xcfc8799f
+0,        161,        161,        1,    22205, 0x617a7335, S=1,     1024, 0xcfc8799f
+0,        162,        162,        1,    22475, 0x9fa2e01c, S=1,     1024, 0xcfc8799f
+0,        163,        163,        1,    22490, 0x7dc5376c, S=1,     1024, 0xcfc8799f
+0,        164,        164,        1,    22460, 0x33e6bbfe, S=1,     1024, 0xcfc8799f
+0,        165,        165,        1,    22861, 0x18993510, S=1,     1024, 0xcfc8799f
+0,        166,        166,        1,    22746, 0xdff85615, S=1,     1024, 0xcfc8799f
+0,        167,        167,        1,    23165, 0xf0ac66a3, S=1,     1024, 0xcfc8799f
+0,        168,        168,        1,    23273, 0x13869ad9, S=1,     1024, 0xcfc8799f
+0,        169,        169,        1,    23211, 0xd30b6205, S=1,     1024, 0xcfc8799f
+0,        170,        170,        1,    23648, 0xa0cef01b, S=1,     1024, 0xcfc8799f
+0,        171,        171,        1,    23675, 0x760460b9, S=1,     1024, 0xcfc8799f
+0,        172,        172,        1,    23874, 0xacf998c5, S=1,     1024, 0xcfc8799f
diff --git a/tests/ref/fate/gsm-ms b/tests/ref/fate/gsm-ms
index 6d15cb8f3f..0acf9f6e69 100644
--- a/tests/ref/fate/gsm-ms
+++ b/tests/ref/fate/gsm-ms
@@ -1,4 +1,9 @@
 #tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      320,      640, 0xf79c59ee
 0,        320,        320,      320,      640, 0x6e6248be
 0,        640,        640,      320,      640, 0x2a5b3aed
diff --git a/tests/ref/fate/gsm-toast b/tests/ref/fate/gsm-toast
index 721e4e41d5..df5e824408 100644
--- a/tests/ref/fate/gsm-toast
+++ b/tests/ref/fate/gsm-toast
@@ -1,501 +1,507 @@
 #tb 0: 1/8000
-0,          0,          0,      160,      320, 0x4c32ab06
-0,        160,        160,      160,      320, 0x2052a4e7
-0,        320,        320,      160,      320, 0xe9aeafca
-0,        480,        480,      160,      320, 0xde83b450
-0,        640,        640,      160,      320, 0x06a6a80e
-0,        800,        800,      160,      320, 0xf6aeb1e2
-0,        960,        960,      160,      320, 0x2623b40c
-0,       1120,       1120,      160,      320, 0x8ec69f25
-0,       1280,       1280,      160,      320, 0xddaaac88
-0,       1440,       1440,      160,      320, 0x9e60b713
-0,       1600,       1600,      160,      320, 0xb738ab30
-0,       1760,       1760,      160,      320, 0xdb4bbb92
-0,       1920,       1920,      160,      320, 0x0370ae8b
-0,       2080,       2080,      160,      320, 0xb611a3fb
-0,       2240,       2240,      160,      320, 0x07ee8e3b
-0,       2400,       2400,      160,      320, 0xdb1ec628
-0,       2560,       2560,      160,      320, 0xd5f1bda2
-0,       2720,       2720,      160,      320, 0xcabb9a9c
-0,       2880,       2880,      160,      320, 0x16c8ad61
-0,       3040,       3040,      160,      320, 0xf76fc25e
-0,       3200,       3200,      160,      320, 0x7118a10d
-0,       3360,       3360,      160,      320, 0x29f9a0db
-0,       3520,       3520,      160,      320, 0x41f2a4ef
-0,       3680,       3680,      160,      320, 0x36dfb231
-0,       3840,       3840,      160,      320, 0xc5399eda
-0,       4000,       4000,      160,      320, 0x17d4b9e0
-0,       4160,       4160,      160,      320, 0x2b5797ac
-0,       4320,       4320,      160,      320, 0x0128c5e7
-0,       4480,       4480,      160,      320, 0xf4f38037
-0,       4640,       4640,      160,      320, 0x77d6b5f2
-0,       4800,       4800,      160,      320, 0xd94a93e0
-0,       4960,       4960,      160,      320, 0x968daae3
-0,       5120,       5120,      160,      320, 0xda5ba0ec
-0,       5280,       5280,      160,      320, 0x316da1ec
-0,       5440,       5440,      160,      320, 0x3a35b2d2
-0,       5600,       5600,      160,      320, 0xca0b988f
-0,       5760,       5760,      160,      320, 0x1295b0b1
-0,       5920,       5920,      160,      320, 0xe121ae72
-0,       6080,       6080,      160,      320, 0x7da7ad43
-0,       6240,       6240,      160,      320, 0x96a49cfe
-0,       6400,       6400,      160,      320, 0x70c2b1de
-0,       6560,       6560,      160,      320, 0x668d88c0
-0,       6720,       6720,      160,      320, 0x5460b5a8
-0,       6880,       6880,      160,      320, 0x6ac78eab
-0,       7040,       7040,      160,      320, 0x0d8dab87
-0,       7200,       7200,      160,      320, 0xe2be94af
-0,       7360,       7360,      160,      320, 0x3487acdc
-0,       7520,       7520,      160,      320, 0x5048955a
-0,       7680,       7680,      160,      320, 0x2ef4ae0d
-0,       7840,       7840,      160,      320, 0xc765b773
-0,       8000,       8000,      160,      320, 0xad96a486
-0,       8160,       8160,      160,      320, 0xb9fdbf1f
-0,       8320,       8320,      160,      320, 0xf26c9ecf
-0,       8480,       8480,      160,      320, 0xbcadb535
-0,       8640,       8640,      160,      320, 0xa8c897bc
-0,       8800,       8800,      160,      320, 0xaa58b520
-0,       8960,       8960,      160,      320, 0xcb48a716
-0,       9120,       9120,      160,      320, 0x4d5da564
-0,       9280,       9280,      160,      320, 0x9809ae28
-0,       9440,       9440,      160,      320, 0x5baeb1e4
-0,       9600,       9600,      160,      320, 0x6a719b63
-0,       9760,       9760,      160,      320, 0xc27d92f0
-0,       9920,       9920,      160,      320, 0x0e9b9fe9
-0,      10080,      10080,      160,      320, 0xbf9d9bf7
-0,      10240,      10240,      160,      320, 0xf35aa64d
-0,      10400,      10400,      160,      320, 0x26449ce8
-0,      10560,      10560,      160,      320, 0x58f4a997
-0,      10720,      10720,      160,      320, 0x155da289
-0,      10880,      10880,      160,      320, 0x63b19a5c
-0,      11040,      11040,      160,      320, 0xe01aad38
-0,      11200,      11200,      160,      320, 0x4e0f9c43
-0,      11360,      11360,      160,      320, 0x9447a284
-0,      11520,      11520,      160,      320, 0xdb36a433
-0,      11680,      11680,      160,      320, 0x799a9b2c
-0,      11840,      11840,      160,      320, 0x1526a162
-0,      12000,      12000,      160,      320, 0x0a4ea140
-0,      12160,      12160,      160,      320, 0xb08f9ed7
-0,      12320,      12320,      160,      320, 0x221bab76
-0,      12480,      12480,      160,      320, 0x4befacf0
-0,      12640,      12640,      160,      320, 0xac489509
-0,      12800,      12800,      160,      320, 0x57a1a5b4
-0,      12960,      12960,      160,      320, 0x81e8ab97
-0,      13120,      13120,      160,      320, 0xc6ada4d6
-0,      13280,      13280,      160,      320, 0x12489975
-0,      13440,      13440,      160,      320, 0x1da59ba9
-0,      13600,      13600,      160,      320, 0xf225ac62
-0,      13760,      13760,      160,      320, 0x8c8e9eab
-0,      13920,      13920,      160,      320, 0x10599dec
-0,      14080,      14080,      160,      320, 0x06c39fa5
-0,      14240,      14240,      160,      320, 0xb0efa3c4
-0,      14400,      14400,      160,      320, 0x72caadab
-0,      14560,      14560,      160,      320, 0xe4619ff0
-0,      14720,      14720,      160,      320, 0x49bca017
-0,      14880,      14880,      160,      320, 0x413f9fbe
-0,      15040,      15040,      160,      320, 0x6eaed0ee
-0,      15200,      15200,      160,      320, 0x27e4b1eb
-0,      15360,      15360,      160,      320, 0x8c42a30f
-0,      15520,      15520,      160,      320, 0x0afaa0f4
-0,      15680,      15680,      160,      320, 0x0f74b76b
-0,      15840,      15840,      160,      320, 0xa9a2b9d5
-0,      16000,      16000,      160,      320, 0xde2a8712
-0,      16160,      16160,      160,      320, 0xcfc8b3a2
-0,      16320,      16320,      160,      320, 0x768cadce
-0,      16480,      16480,      160,      320, 0x3a8a97f1
-0,      16640,      16640,      160,      320, 0x502fa59b
-0,      16800,      16800,      160,      320, 0x4c3e9b0f
-0,      16960,      16960,      160,      320, 0x1cd2b111
-0,      17120,      17120,      160,      320, 0xa845a5a3
-0,      17280,      17280,      160,      320, 0xa6b8b982
-0,      17440,      17440,      160,      320, 0x4d5caab9
-0,      17600,      17600,      160,      320, 0x7993b604
-0,      17760,      17760,      160,      320, 0x8d19b37b
-0,      17920,      17920,      160,      320, 0xbe48adb6
-0,      18080,      18080,      160,      320, 0x7d68ab8e
-0,      18240,      18240,      160,      320, 0xbfffb0e2
-0,      18400,      18400,      160,      320, 0x90b5b7e3
-0,      18560,      18560,      160,      320, 0x9fa1b016
-0,      18720,      18720,      160,      320, 0x70abafc9
-0,      18880,      18880,      160,      320, 0x82cfad9c
-0,      19040,      19040,      160,      320, 0x05f6aa2c
-0,      19200,      19200,      160,      320, 0x511cbb5b
-0,      19360,      19360,      160,      320, 0xd27caaa6
-0,      19520,      19520,      160,      320, 0x781ca481
-0,      19680,      19680,      160,      320, 0x12e9ad1a
-0,      19840,      19840,      160,      320, 0xe46b989d
-0,      20000,      20000,      160,      320, 0x76dbb0a7
-0,      20160,      20160,      160,      320, 0x10eba486
-0,      20320,      20320,      160,      320, 0x2269a7c8
-0,      20480,      20480,      160,      320, 0x084a9c7e
-0,      20640,      20640,      160,      320, 0x84eda891
-0,      20800,      20800,      160,      320, 0x2ef9a639
-0,      20960,      20960,      160,      320, 0x8bb2a0dd
-0,      21120,      21120,      160,      320, 0x47e5a169
-0,      21280,      21280,      160,      320, 0x98faae42
-0,      21440,      21440,      160,      320, 0x81d2aba4
-0,      21600,      21600,      160,      320, 0x5af8bb33
-0,      21760,      21760,      160,      320, 0x331e8d9f
-0,      21920,      21920,      160,      320, 0xd9b0c09a
-0,      22080,      22080,      160,      320, 0xbaf9bfcf
-0,      22240,      22240,      160,      320, 0x54e89ab5
-0,      22400,      22400,      160,      320, 0x1d62c1d2
-0,      22560,      22560,      160,      320, 0xead6b436
-0,      22720,      22720,      160,      320, 0x465f98bc
-0,      22880,      22880,      160,      320, 0xe707a346
-0,      23040,      23040,      160,      320, 0xf66cb1c2
-0,      23200,      23200,      160,      320, 0xcfc89ae6
-0,      23360,      23360,      160,      320, 0x0b10b796
-0,      23520,      23520,      160,      320, 0xb29caf2c
-0,      23680,      23680,      160,      320, 0x0284a9d1
-0,      23840,      23840,      160,      320, 0xb966b5fc
-0,      24000,      24000,      160,      320, 0x2defa630
-0,      24160,      24160,      160,      320, 0xcdcd8ef3
-0,      24320,      24320,      160,      320, 0xa81bba2b
-0,      24480,      24480,      160,      320, 0x6bc0aeb1
-0,      24640,      24640,      160,      320, 0x38d8ac82
-0,      24800,      24800,      160,      320, 0xeb66a865
-0,      24960,      24960,      160,      320, 0x4fff9cd9
-0,      25120,      25120,      160,      320, 0x6819a19b
-0,      25280,      25280,      160,      320, 0xfd7c93ce
-0,      25440,      25440,      160,      320, 0xa7419f63
-0,      25600,      25600,      160,      320, 0x572caacb
-0,      25760,      25760,      160,      320, 0x918fb1de
-0,      25920,      25920,      160,      320, 0x0088a675
-0,      26080,      26080,      160,      320, 0x19229cf7
-0,      26240,      26240,      160,      320, 0x827ea812
-0,      26400,      26400,      160,      320, 0x6c258ef7
-0,      26560,      26560,      160,      320, 0x6a89b8fe
-0,      26720,      26720,      160,      320, 0x166c9ce0
-0,      26880,      26880,      160,      320, 0x68b39db7
-0,      27040,      27040,      160,      320, 0x3d5aa8ec
-0,      27200,      27200,      160,      320, 0x25e09ff3
-0,      27360,      27360,      160,      320, 0x759aa4ce
-0,      27520,      27520,      160,      320, 0xe5aab0ea
-0,      27680,      27680,      160,      320, 0xf0359e9a
-0,      27840,      27840,      160,      320, 0x51199fff
-0,      28000,      28000,      160,      320, 0xb04aa236
-0,      28160,      28160,      160,      320, 0xe09da0e3
-0,      28320,      28320,      160,      320, 0x144f98a9
-0,      28480,      28480,      160,      320, 0x0b4e9f8d
-0,      28640,      28640,      160,      320, 0xbb69a090
-0,      28800,      28800,      160,      320, 0xec6e9b5b
-0,      28960,      28960,      160,      320, 0x4f86a477
-0,      29120,      29120,      160,      320, 0x4a179d04
-0,      29280,      29280,      160,      320, 0x9682a375
-0,      29440,      29440,      160,      320, 0x3c6ba55e
-0,      29600,      29600,      160,      320, 0x50c0ab50
-0,      29760,      29760,      160,      320, 0xe58ea907
-0,      29920,      29920,      160,      320, 0xc5eaa021
-0,      30080,      30080,      160,      320, 0x38859f01
-0,      30240,      30240,      160,      320, 0x73f8a540
-0,      30400,      30400,      160,      320, 0x395da234
-0,      30560,      30560,      160,      320, 0x7f50b144
-0,      30720,      30720,      160,      320, 0x45568ceb
-0,      30880,      30880,      160,      320, 0xd0508dec
-0,      31040,      31040,      160,      320, 0x60aba7e4
-0,      31200,      31200,      160,      320, 0x4b24b15f
-0,      31360,      31360,      160,      320, 0xbfc9afd6
-0,      31520,      31520,      160,      320, 0xf0f2ad49
-0,      31680,      31680,      160,      320, 0xeea0a426
-0,      31840,      31840,      160,      320, 0xff07a7c9
-0,      32000,      32000,      160,      320, 0xce1fc788
-0,      32160,      32160,      160,      320, 0xc074ae9b
-0,      32320,      32320,      160,      320, 0x51649696
-0,      32480,      32480,      160,      320, 0x24399744
-0,      32640,      32640,      160,      320, 0xfb0eb920
-0,      32800,      32800,      160,      320, 0x3bf8af5c
-0,      32960,      32960,      160,      320, 0xeab69ee0
-0,      33120,      33120,      160,      320, 0x182696bb
-0,      33280,      33280,      160,      320, 0x36e6af72
-0,      33440,      33440,      160,      320, 0x48cc9ecc
-0,      33600,      33600,      160,      320, 0xfb3ca7b8
-0,      33760,      33760,      160,      320, 0xe01aa4b4
-0,      33920,      33920,      160,      320, 0x5c6dac8c
-0,      34080,      34080,      160,      320, 0x072fbd93
-0,      34240,      34240,      160,      320, 0xc8899ccc
-0,      34400,      34400,      160,      320, 0xdcc990ac
-0,      34560,      34560,      160,      320, 0x28e0a9d0
-0,      34720,      34720,      160,      320, 0x0cdbaa11
-0,      34880,      34880,      160,      320, 0x8f4ca093
-0,      35040,      35040,      160,      320, 0x7ee79ea9
-0,      35200,      35200,      160,      320, 0xa762b695
-0,      35360,      35360,      160,      320, 0x9af0b5da
-0,      35520,      35520,      160,      320, 0x1f2cb0e7
-0,      35680,      35680,      160,      320, 0x6029b8bb
-0,      35840,      35840,      160,      320, 0xf2f7acec
-0,      36000,      36000,      160,      320, 0xb3e5b5be
-0,      36160,      36160,      160,      320, 0x266ba8a6
-0,      36320,      36320,      160,      320, 0x4ff59296
-0,      36480,      36480,      160,      320, 0x11d1b9ac
-0,      36640,      36640,      160,      320, 0x749197f7
-0,      36800,      36800,      160,      320, 0x8192b517
-0,      36960,      36960,      160,      320, 0xde129dbe
-0,      37120,      37120,      160,      320, 0x85e4a096
-0,      37280,      37280,      160,      320, 0xdebf9182
-0,      37440,      37440,      160,      320, 0x7a4ba0bf
-0,      37600,      37600,      160,      320, 0x55fe9fcd
-0,      37760,      37760,      160,      320, 0xd242adec
-0,      37920,      37920,      160,      320, 0xeaf5b159
-0,      38080,      38080,      160,      320, 0xfcb1a571
-0,      38240,      38240,      160,      320, 0x62fabda0
-0,      38400,      38400,      160,      320, 0x45a9abcc
-0,      38560,      38560,      160,      320, 0x07af974b
-0,      38720,      38720,      160,      320, 0xc2a0b4fd
-0,      38880,      38880,      160,      320, 0xc30abccd
-0,      39040,      39040,      160,      320, 0xd33ca61c
-0,      39200,      39200,      160,      320, 0x3c33d11a
-0,      39360,      39360,      160,      320, 0x9c2ca0ac
-0,      39520,      39520,      160,      320, 0xa5d69777
-0,      39680,      39680,      160,      320, 0xb7d2c6b8
-0,      39840,      39840,      160,      320, 0x34bbaab9
-0,      40000,      40000,      160,      320, 0x3e7baccb
-0,      40160,      40160,      160,      320, 0x92c6b7e6
-0,      40320,      40320,      160,      320, 0xc810a18a
-0,      40480,      40480,      160,      320, 0x06a09f56
-0,      40640,      40640,      160,      320, 0x8804a504
-0,      40800,      40800,      160,      320, 0x783ba7d5
-0,      40960,      40960,      160,      320, 0x24dcada6
-0,      41120,      41120,      160,      320, 0x4af796be
-0,      41280,      41280,      160,      320, 0x1454b19c
-0,      41440,      41440,      160,      320, 0x0ad0a56e
-0,      41600,      41600,      160,      320, 0x8944a44e
-0,      41760,      41760,      160,      320, 0x31069ebd
-0,      41920,      41920,      160,      320, 0x19cb9812
-0,      42080,      42080,      160,      320, 0xac75abe2
-0,      42240,      42240,      160,      320, 0x0162a200
-0,      42400,      42400,      160,      320, 0xa2d7a4b2
-0,      42560,      42560,      160,      320, 0x078ca611
-0,      42720,      42720,      160,      320, 0x0ec39b40
-0,      42880,      42880,      160,      320, 0xe8f794b2
-0,      43040,      43040,      160,      320, 0xc2cfb258
-0,      43200,      43200,      160,      320, 0xe4759061
-0,      43360,      43360,      160,      320, 0xb1b6aea4
-0,      43520,      43520,      160,      320, 0x9bfb96df
-0,      43680,      43680,      160,      320, 0xcc61b5d3
-0,      43840,      43840,      160,      320, 0xd14e8df9
-0,      44000,      44000,      160,      320, 0xd9d5bbf5
-0,      44160,      44160,      160,      320, 0x4d9fa9b0
-0,      44320,      44320,      160,      320, 0xf606abfc
-0,      44480,      44480,      160,      320, 0x720baa19
-0,      44640,      44640,      160,      320, 0x7f7cac49
-0,      44800,      44800,      160,      320, 0xceab9b54
-0,      44960,      44960,      160,      320, 0x645fa70a
-0,      45120,      45120,      160,      320, 0xa081a40f
-0,      45280,      45280,      160,      320, 0x21d78f8c
-0,      45440,      45440,      160,      320, 0xedf3abc6
-0,      45600,      45600,      160,      320, 0x17679637
-0,      45760,      45760,      160,      320, 0x1cb1ae04
-0,      45920,      45920,      160,      320, 0x17cd9f62
-0,      46080,      46080,      160,      320, 0xf4bca3ab
-0,      46240,      46240,      160,      320, 0xb3bd9152
-0,      46400,      46400,      160,      320, 0x4e1e9825
-0,      46560,      46560,      160,      320, 0x037e9a56
-0,      46720,      46720,      160,      320, 0xd7589fcc
-0,      46880,      46880,      160,      320, 0x5f949e90
-0,      47040,      47040,      160,      320, 0xe133a495
-0,      47200,      47200,      160,      320, 0x7cb7a52c
-0,      47360,      47360,      160,      320, 0xb8b29d95
-0,      47520,      47520,      160,      320, 0x01bca472
-0,      47680,      47680,      160,      320, 0xbcc69895
-0,      47840,      47840,      160,      320, 0xabffa0ee
-0,      48000,      48000,      160,      320, 0xe6629eca
-0,      48160,      48160,      160,      320, 0x572da7cd
-0,      48320,      48320,      160,      320, 0x3017972d
-0,      48480,      48480,      160,      320, 0xac4e9c78
-0,      48640,      48640,      160,      320, 0x112f9c45
-0,      48800,      48800,      160,      320, 0x05e9a64d
-0,      48960,      48960,      160,      320, 0x8f7394d4
-0,      49120,      49120,      160,      320, 0xbaeea07e
-0,      49280,      49280,      160,      320, 0xd757c00e
-0,      49440,      49440,      160,      320, 0x8aa09783
-0,      49600,      49600,      160,      320, 0x31d4ae7a
-0,      49760,      49760,      160,      320, 0x221493e8
-0,      49920,      49920,      160,      320, 0x92f4a3a7
-0,      50080,      50080,      160,      320, 0xbd5bafd9
-0,      50240,      50240,      160,      320, 0x1895b760
-0,      50400,      50400,      160,      320, 0x7a4eacdd
-0,      50560,      50560,      160,      320, 0xc9f7a1c3
-0,      50720,      50720,      160,      320, 0xd750be06
-0,      50880,      50880,      160,      320, 0x641d9a6f
-0,      51040,      51040,      160,      320, 0x70d6b6ff
-0,      51200,      51200,      160,      320, 0x1fd3a546
-0,      51360,      51360,      160,      320, 0x72cfaabe
-0,      51520,      51520,      160,      320, 0x2e61b6ce
-0,      51680,      51680,      160,      320, 0x4813a091
-0,      51840,      51840,      160,      320, 0xbfe7bc0f
-0,      52000,      52000,      160,      320, 0x8c759c1f
-0,      52160,      52160,      160,      320, 0xf4c1c952
-0,      52320,      52320,      160,      320, 0x00fdaa79
-0,      52480,      52480,      160,      320, 0x2ffda252
-0,      52640,      52640,      160,      320, 0x841aa523
-0,      52800,      52800,      160,      320, 0x8c079e5e
-0,      52960,      52960,      160,      320, 0x96e9a83f
-0,      53120,      53120,      160,      320, 0x5926a639
-0,      53280,      53280,      160,      320, 0x02e1a07b
-0,      53440,      53440,      160,      320, 0x2972a999
-0,      53600,      53600,      160,      320, 0x30c89c62
-0,      53760,      53760,      160,      320, 0x83f5a263
-0,      53920,      53920,      160,      320, 0xa3909667
-0,      54080,      54080,      160,      320, 0xd5309fd4
-0,      54240,      54240,      160,      320, 0x3154a571
-0,      54400,      54400,      160,      320, 0x51039a5e
-0,      54560,      54560,      160,      320, 0xf167a344
-0,      54720,      54720,      160,      320, 0x8e709d7d
-0,      54880,      54880,      160,      320, 0x936fa0fd
-0,      55040,      55040,      160,      320, 0x024b9e3c
-0,      55200,      55200,      160,      320, 0x2ea1aa75
-0,      55360,      55360,      160,      320, 0x33f0a2bb
-0,      55520,      55520,      160,      320, 0xbf079d2d
-0,      55680,      55680,      160,      320, 0x847ba2c8
-0,      55840,      55840,      160,      320, 0x37e1a767
-0,      56000,      56000,      160,      320, 0xb607acbb
-0,      56160,      56160,      160,      320, 0x1288ac6d
-0,      56320,      56320,      160,      320, 0xf60e98b3
-0,      56480,      56480,      160,      320, 0xc6b5abdd
-0,      56640,      56640,      160,      320, 0x7feaa710
-0,      56800,      56800,      160,      320, 0x77329fcd
-0,      56960,      56960,      160,      320, 0x91a6a715
-0,      57120,      57120,      160,      320, 0xd0e99f24
-0,      57280,      57280,      160,      320, 0x07089f61
-0,      57440,      57440,      160,      320, 0x2bbda900
-0,      57600,      57600,      160,      320, 0xad3da0d5
-0,      57760,      57760,      160,      320, 0x997ba6d2
-0,      57920,      57920,      160,      320, 0xb15b9dcb
-0,      58080,      58080,      160,      320, 0x17cea82f
-0,      58240,      58240,      160,      320, 0xab51a73e
-0,      58400,      58400,      160,      320, 0x77a1abd6
-0,      58560,      58560,      160,      320, 0x0bddacad
-0,      58720,      58720,      160,      320, 0x43b3bdc4
-0,      58880,      58880,      160,      320, 0xefe0a9ba
-0,      59040,      59040,      160,      320, 0x8eb4bc2f
-0,      59200,      59200,      160,      320, 0x39cdc190
-0,      59360,      59360,      160,      320, 0x1ef3baff
-0,      59520,      59520,      160,      320, 0x1a6ab7e2
-0,      59680,      59680,      160,      320, 0x444ccc69
-0,      59840,      59840,      160,      320, 0x05ebb598
-0,      60000,      60000,      160,      320, 0x4ac5b0ad
-0,      60160,      60160,      160,      320, 0x0ee5ba52
-0,      60320,      60320,      160,      320, 0x501d9fa0
-0,      60480,      60480,      160,      320, 0x2038a9f4
-0,      60640,      60640,      160,      320, 0xa61cb8b3
-0,      60800,      60800,      160,      320, 0xdd009777
-0,      60960,      60960,      160,      320, 0x2a2db86d
-0,      61120,      61120,      160,      320, 0xe9bab3bc
-0,      61280,      61280,      160,      320, 0xf7f8a056
-0,      61440,      61440,      160,      320, 0x514caf14
-0,      61600,      61600,      160,      320, 0xa220b149
-0,      61760,      61760,      160,      320, 0xbf7ea183
-0,      61920,      61920,      160,      320, 0x1d8dc5c6
-0,      62080,      62080,      160,      320, 0x9182a8ea
-0,      62240,      62240,      160,      320, 0x31eba026
-0,      62400,      62400,      160,      320, 0xcfbcc3df
-0,      62560,      62560,      160,      320, 0x3d8cb7ae
-0,      62720,      62720,      160,      320, 0xbe39aec0
-0,      62880,      62880,      160,      320, 0xd236bf71
-0,      63040,      63040,      160,      320, 0x9377b0b2
-0,      63200,      63200,      160,      320, 0xb5e6b2df
-0,      63360,      63360,      160,      320, 0xa3b9bbce
-0,      63520,      63520,      160,      320, 0xa7bda251
-0,      63680,      63680,      160,      320, 0xbf9ab162
-0,      63840,      63840,      160,      320, 0x6928b9cb
-0,      64000,      64000,      160,      320, 0xf5cca209
-0,      64160,      64160,      160,      320, 0xfdf4afad
-0,      64320,      64320,      160,      320, 0xe7e7c216
-0,      64480,      64480,      160,      320, 0x0c5797c6
-0,      64640,      64640,      160,      320, 0x66c1a9ca
-0,      64800,      64800,      160,      320, 0x6b5ca48d
-0,      64960,      64960,      160,      320, 0xec04968a
-0,      65120,      65120,      160,      320, 0xaaada691
-0,      65280,      65280,      160,      320, 0x77c3a624
-0,      65440,      65440,      160,      320, 0xaed9a5d5
-0,      65600,      65600,      160,      320, 0x360fac41
-0,      65760,      65760,      160,      320, 0xa05ea727
-0,      65920,      65920,      160,      320, 0x9f7b9f83
-0,      66080,      66080,      160,      320, 0x474bc4c2
-0,      66240,      66240,      160,      320, 0xb6078d3b
-0,      66400,      66400,      160,      320, 0x8e15a8f9
-0,      66560,      66560,      160,      320, 0x7dc7d4a8
-0,      66720,      66720,      160,      320, 0x55ceab6b
-0,      66880,      66880,      160,      320, 0x982cc94f
-0,      67040,      67040,      160,      320, 0x6153948f
-0,      67200,      67200,      160,      320, 0x5338c621
-0,      67360,      67360,      160,      320, 0x2e2db6e8
-0,      67520,      67520,      160,      320, 0x28e3a9c3
-0,      67680,      67680,      160,      320, 0x74d7b435
-0,      67840,      67840,      160,      320, 0xcf17a10c
-0,      68000,      68000,      160,      320, 0xf1f9ac8c
-0,      68160,      68160,      160,      320, 0x35e0b480
-0,      68320,      68320,      160,      320, 0x5e60b3a4
-0,      68480,      68480,      160,      320, 0x20579b26
-0,      68640,      68640,      160,      320, 0x3e27b89b
-0,      68800,      68800,      160,      320, 0x02e4af94
-0,      68960,      68960,      160,      320, 0x6d6897f1
-0,      69120,      69120,      160,      320, 0x1582b267
-0,      69280,      69280,      160,      320, 0x33ba9eb3
-0,      69440,      69440,      160,      320, 0xb6acad7d
-0,      69600,      69600,      160,      320, 0x1969a6c2
-0,      69760,      69760,      160,      320, 0x363fa350
-0,      69920,      69920,      160,      320, 0xae50bf65
-0,      70080,      70080,      160,      320, 0x0877a50f
-0,      70240,      70240,      160,      320, 0x66e2a42f
-0,      70400,      70400,      160,      320, 0x0b0abcb3
-0,      70560,      70560,      160,      320, 0x23a9afaa
-0,      70720,      70720,      160,      320, 0xc3729b40
-0,      70880,      70880,      160,      320, 0xdd3fc7e2
-0,      71040,      71040,      160,      320, 0x7e0494af
-0,      71200,      71200,      160,      320, 0xcbd096fb
-0,      71360,      71360,      160,      320, 0x5d71b303
-0,      71520,      71520,      160,      320, 0xeedca04a
-0,      71680,      71680,      160,      320, 0x2836a47d
-0,      71840,      71840,      160,      320, 0x7237c2a0
-0,      72000,      72000,      160,      320, 0x7c009bc0
-0,      72160,      72160,      160,      320, 0xc9dcb366
-0,      72320,      72320,      160,      320, 0x4993aac8
-0,      72480,      72480,      160,      320, 0x05ec9954
-0,      72640,      72640,      160,      320, 0xa955bd5c
-0,      72800,      72800,      160,      320, 0x9018aea3
-0,      72960,      72960,      160,      320, 0x780cca52
-0,      73120,      73120,      160,      320, 0x9b8f95f6
-0,      73280,      73280,      160,      320, 0xcd7bb178
-0,      73440,      73440,      160,      320, 0xfec6b443
-0,      73600,      73600,      160,      320, 0xe214abb6
-0,      73760,      73760,      160,      320, 0xdcbebb38
-0,      73920,      73920,      160,      320, 0xe683a30d
-0,      74080,      74080,      160,      320, 0xe4cdb197
-0,      74240,      74240,      160,      320, 0xa426c432
-0,      74400,      74400,      160,      320, 0x761ba6cc
-0,      74560,      74560,      160,      320, 0xcc9aa6aa
-0,      74720,      74720,      160,      320, 0x742bd03d
-0,      74880,      74880,      160,      320, 0x61d9a511
-0,      75040,      75040,      160,      320, 0x3021a4dd
-0,      75200,      75200,      160,      320, 0x6970bbc0
-0,      75360,      75360,      160,      320, 0x76f5a037
-0,      75520,      75520,      160,      320, 0x758d91f2
-0,      75680,      75680,      160,      320, 0xe854a2f1
-0,      75840,      75840,      160,      320, 0xf994a6f8
-0,      76000,      76000,      160,      320, 0x31ebaf40
-0,      76160,      76160,      160,      320, 0x24699970
-0,      76320,      76320,      160,      320, 0x37dda53e
-0,      76480,      76480,      160,      320, 0xa857a752
-0,      76640,      76640,      160,      320, 0xc483ad1d
-0,      76800,      76800,      160,      320, 0x5966add9
-0,      76960,      76960,      160,      320, 0x4dbab89c
-0,      77120,      77120,      160,      320, 0x2f0bb0e6
-0,      77280,      77280,      160,      320, 0x913aaa88
-0,      77440,      77440,      160,      320, 0x245dc1c3
-0,      77600,      77600,      160,      320, 0xb085c5ad
-0,      77760,      77760,      160,      320, 0x9cf1b0fa
-0,      77920,      77920,      160,      320, 0x6887b543
-0,      78080,      78080,      160,      320, 0xcad69feb
-0,      78240,      78240,      160,      320, 0xc12a8ddb
-0,      78400,      78400,      160,      320, 0x01d1bc5a
-0,      78560,      78560,      160,      320, 0x3018b7e8
-0,      78720,      78720,      160,      320, 0x6431b0ef
-0,      78880,      78880,      160,      320, 0x3a53998e
-0,      79040,      79040,      160,      320, 0x1c80a6c6
-0,      79200,      79200,      160,      320, 0x6639adc5
-0,      79360,      79360,      160,      320, 0x92489f9a
-0,      79520,      79520,      160,      320, 0x8cafad00
-0,      79680,      79680,      160,      320, 0xca0392e1
-0,      79840,      79840,      160,      320, 0x30a9ae88
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+0,          0,          0,       64,      128, 0x3ef33f6f
+0,         64,         64,      160,      320, 0x2052a4e7
+0,        224,        224,      160,      320, 0xe9aeafca
+0,        384,        384,      160,      320, 0xde83b450
+0,        544,        544,      160,      320, 0x06a6a80e
+0,        704,        704,      160,      320, 0xf6aeb1e2
+0,        864,        864,      160,      320, 0x2623b40c
+0,       1024,       1024,      160,      320, 0x8ec69f25
+0,       1184,       1184,      160,      320, 0xddaaac88
+0,       1344,       1344,      160,      320, 0x9e60b713
+0,       1504,       1504,      160,      320, 0xb738ab30
+0,       1664,       1664,      160,      320, 0xdb4bbb92
+0,       1824,       1824,      160,      320, 0x0370ae8b
+0,       1984,       1984,      160,      320, 0xb611a3fb
+0,       2144,       2144,      160,      320, 0x07ee8e3b
+0,       2304,       2304,      160,      320, 0xdb1ec628
+0,       2464,       2464,      160,      320, 0xd5f1bda2
+0,       2624,       2624,      160,      320, 0xcabb9a9c
+0,       2784,       2784,      160,      320, 0x16c8ad61
+0,       2944,       2944,      160,      320, 0xf76fc25e
+0,       3104,       3104,      160,      320, 0x7118a10d
+0,       3264,       3264,      160,      320, 0x29f9a0db
+0,       3424,       3424,      160,      320, 0x41f2a4ef
+0,       3584,       3584,      160,      320, 0x36dfb231
+0,       3744,       3744,      160,      320, 0xc5399eda
+0,       3904,       3904,      160,      320, 0x17d4b9e0
+0,       4064,       4064,      160,      320, 0x2b5797ac
+0,       4224,       4224,      160,      320, 0x0128c5e7
+0,       4384,       4384,      160,      320, 0xf4f38037
+0,       4544,       4544,      160,      320, 0x77d6b5f2
+0,       4704,       4704,      160,      320, 0xd94a93e0
+0,       4864,       4864,      160,      320, 0x968daae3
+0,       5024,       5024,      160,      320, 0xda5ba0ec
+0,       5184,       5184,      160,      320, 0x316da1ec
+0,       5344,       5344,      160,      320, 0x3a35b2d2
+0,       5504,       5504,      160,      320, 0xca0b988f
+0,       5664,       5664,      160,      320, 0x1295b0b1
+0,       5824,       5824,      160,      320, 0xe121ae72
+0,       5984,       5984,      160,      320, 0x7da7ad43
+0,       6144,       6144,      160,      320, 0x96a49cfe
+0,       6304,       6304,      160,      320, 0x70c2b1de
+0,       6464,       6464,      160,      320, 0x668d88c0
+0,       6624,       6624,      160,      320, 0x5460b5a8
+0,       6784,       6784,      160,      320, 0x6ac78eab
+0,       6944,       6944,      160,      320, 0x0d8dab87
+0,       7104,       7104,      160,      320, 0xe2be94af
+0,       7264,       7264,      160,      320, 0x3487acdc
+0,       7424,       7424,      160,      320, 0x5048955a
+0,       7584,       7584,      160,      320, 0x2ef4ae0d
+0,       7744,       7744,      160,      320, 0xc765b773
+0,       7904,       7904,      160,      320, 0xad96a486
+0,       8064,       8064,      160,      320, 0xb9fdbf1f
+0,       8224,       8224,      160,      320, 0xf26c9ecf
+0,       8384,       8384,      160,      320, 0xbcadb535
+0,       8544,       8544,      160,      320, 0xa8c897bc
+0,       8704,       8704,      160,      320, 0xaa58b520
+0,       8864,       8864,      160,      320, 0xcb48a716
+0,       9024,       9024,      160,      320, 0x4d5da564
+0,       9184,       9184,      160,      320, 0x9809ae28
+0,       9344,       9344,      160,      320, 0x5baeb1e4
+0,       9504,       9504,      160,      320, 0x6a719b63
+0,       9664,       9664,      160,      320, 0xc27d92f0
+0,       9824,       9824,      160,      320, 0x0e9b9fe9
+0,       9984,       9984,      160,      320, 0xbf9d9bf7
+0,      10144,      10144,      160,      320, 0xf35aa64d
+0,      10304,      10304,      160,      320, 0x26449ce8
+0,      10464,      10464,      160,      320, 0x58f4a997
+0,      10624,      10624,      160,      320, 0x155da289
+0,      10784,      10784,      160,      320, 0x63b19a5c
+0,      10944,      10944,      160,      320, 0xe01aad38
+0,      11104,      11104,      160,      320, 0x4e0f9c43
+0,      11264,      11264,      160,      320, 0x9447a284
+0,      11424,      11424,      160,      320, 0xdb36a433
+0,      11584,      11584,      160,      320, 0x799a9b2c
+0,      11744,      11744,      160,      320, 0x1526a162
+0,      11904,      11904,      160,      320, 0x0a4ea140
+0,      12064,      12064,      160,      320, 0xb08f9ed7
+0,      12224,      12224,      160,      320, 0x221bab76
+0,      12384,      12384,      160,      320, 0x4befacf0
+0,      12544,      12544,      160,      320, 0xac489509
+0,      12704,      12704,      160,      320, 0x57a1a5b4
+0,      12864,      12864,      160,      320, 0x81e8ab97
+0,      13024,      13024,      160,      320, 0xc6ada4d6
+0,      13184,      13184,      160,      320, 0x12489975
+0,      13344,      13344,      160,      320, 0x1da59ba9
+0,      13504,      13504,      160,      320, 0xf225ac62
+0,      13664,      13664,      160,      320, 0x8c8e9eab
+0,      13824,      13824,      160,      320, 0x10599dec
+0,      13984,      13984,      160,      320, 0x06c39fa5
+0,      14144,      14144,      160,      320, 0xb0efa3c4
+0,      14304,      14304,      160,      320, 0x72caadab
+0,      14464,      14464,      160,      320, 0xe4619ff0
+0,      14624,      14624,      160,      320, 0x49bca017
+0,      14784,      14784,      160,      320, 0x413f9fbe
+0,      14944,      14944,      160,      320, 0x6eaed0ee
+0,      15104,      15104,      160,      320, 0x27e4b1eb
+0,      15264,      15264,      160,      320, 0x8c42a30f
+0,      15424,      15424,      160,      320, 0x0afaa0f4
+0,      15584,      15584,      160,      320, 0x0f74b76b
+0,      15744,      15744,      160,      320, 0xa9a2b9d5
+0,      15904,      15904,      160,      320, 0xde2a8712
+0,      16064,      16064,      160,      320, 0xcfc8b3a2
+0,      16224,      16224,      160,      320, 0x768cadce
+0,      16384,      16384,      160,      320, 0x3a8a97f1
+0,      16544,      16544,      160,      320, 0x502fa59b
+0,      16704,      16704,      160,      320, 0x4c3e9b0f
+0,      16864,      16864,      160,      320, 0x1cd2b111
+0,      17024,      17024,      160,      320, 0xa845a5a3
+0,      17184,      17184,      160,      320, 0xa6b8b982
+0,      17344,      17344,      160,      320, 0x4d5caab9
+0,      17504,      17504,      160,      320, 0x7993b604
+0,      17664,      17664,      160,      320, 0x8d19b37b
+0,      17824,      17824,      160,      320, 0xbe48adb6
+0,      17984,      17984,      160,      320, 0x7d68ab8e
+0,      18144,      18144,      160,      320, 0xbfffb0e2
+0,      18304,      18304,      160,      320, 0x90b5b7e3
+0,      18464,      18464,      160,      320, 0x9fa1b016
+0,      18624,      18624,      160,      320, 0x70abafc9
+0,      18784,      18784,      160,      320, 0x82cfad9c
+0,      18944,      18944,      160,      320, 0x05f6aa2c
+0,      19104,      19104,      160,      320, 0x511cbb5b
+0,      19264,      19264,      160,      320, 0xd27caaa6
+0,      19424,      19424,      160,      320, 0x781ca481
+0,      19584,      19584,      160,      320, 0x12e9ad1a
+0,      19744,      19744,      160,      320, 0xe46b989d
+0,      19904,      19904,      160,      320, 0x76dbb0a7
+0,      20064,      20064,      160,      320, 0x10eba486
+0,      20224,      20224,      160,      320, 0x2269a7c8
+0,      20384,      20384,      160,      320, 0x084a9c7e
+0,      20544,      20544,      160,      320, 0x84eda891
+0,      20704,      20704,      160,      320, 0x2ef9a639
+0,      20864,      20864,      160,      320, 0x8bb2a0dd
+0,      21024,      21024,      160,      320, 0x47e5a169
+0,      21184,      21184,      160,      320, 0x98faae42
+0,      21344,      21344,      160,      320, 0x81d2aba4
+0,      21504,      21504,      160,      320, 0x5af8bb33
+0,      21664,      21664,      160,      320, 0x331e8d9f
+0,      21824,      21824,      160,      320, 0xd9b0c09a
+0,      21984,      21984,      160,      320, 0xbaf9bfcf
+0,      22144,      22144,      160,      320, 0x54e89ab5
+0,      22304,      22304,      160,      320, 0x1d62c1d2
+0,      22464,      22464,      160,      320, 0xead6b436
+0,      22624,      22624,      160,      320, 0x465f98bc
+0,      22784,      22784,      160,      320, 0xe707a346
+0,      22944,      22944,      160,      320, 0xf66cb1c2
+0,      23104,      23104,      160,      320, 0xcfc89ae6
+0,      23264,      23264,      160,      320, 0x0b10b796
+0,      23424,      23424,      160,      320, 0xb29caf2c
+0,      23584,      23584,      160,      320, 0x0284a9d1
+0,      23744,      23744,      160,      320, 0xb966b5fc
+0,      23904,      23904,      160,      320, 0x2defa630
+0,      24064,      24064,      160,      320, 0xcdcd8ef3
+0,      24224,      24224,      160,      320, 0xa81bba2b
+0,      24384,      24384,      160,      320, 0x6bc0aeb1
+0,      24544,      24544,      160,      320, 0x38d8ac82
+0,      24704,      24704,      160,      320, 0xeb66a865
+0,      24864,      24864,      160,      320, 0x4fff9cd9
+0,      25024,      25024,      160,      320, 0x6819a19b
+0,      25184,      25184,      160,      320, 0xfd7c93ce
+0,      25344,      25344,      160,      320, 0xa7419f63
+0,      25504,      25504,      160,      320, 0x572caacb
+0,      25664,      25664,      160,      320, 0x918fb1de
+0,      25824,      25824,      160,      320, 0x0088a675
+0,      25984,      25984,      160,      320, 0x19229cf7
+0,      26144,      26144,      160,      320, 0x827ea812
+0,      26304,      26304,      160,      320, 0x6c258ef7
+0,      26464,      26464,      160,      320, 0x6a89b8fe
+0,      26624,      26624,      160,      320, 0x166c9ce0
+0,      26784,      26784,      160,      320, 0x68b39db7
+0,      26944,      26944,      160,      320, 0x3d5aa8ec
+0,      27104,      27104,      160,      320, 0x25e09ff3
+0,      27264,      27264,      160,      320, 0x759aa4ce
+0,      27424,      27424,      160,      320, 0xe5aab0ea
+0,      27584,      27584,      160,      320, 0xf0359e9a
+0,      27744,      27744,      160,      320, 0x51199fff
+0,      27904,      27904,      160,      320, 0xb04aa236
+0,      28064,      28064,      160,      320, 0xe09da0e3
+0,      28224,      28224,      160,      320, 0x144f98a9
+0,      28384,      28384,      160,      320, 0x0b4e9f8d
+0,      28544,      28544,      160,      320, 0xbb69a090
+0,      28704,      28704,      160,      320, 0xec6e9b5b
+0,      28864,      28864,      160,      320, 0x4f86a477
+0,      29024,      29024,      160,      320, 0x4a179d04
+0,      29184,      29184,      160,      320, 0x9682a375
+0,      29344,      29344,      160,      320, 0x3c6ba55e
+0,      29504,      29504,      160,      320, 0x50c0ab50
+0,      29664,      29664,      160,      320, 0xe58ea907
+0,      29824,      29824,      160,      320, 0xc5eaa021
+0,      29984,      29984,      160,      320, 0x38859f01
+0,      30144,      30144,      160,      320, 0x73f8a540
+0,      30304,      30304,      160,      320, 0x395da234
+0,      30464,      30464,      160,      320, 0x7f50b144
+0,      30624,      30624,      160,      320, 0x45568ceb
+0,      30784,      30784,      160,      320, 0xd0508dec
+0,      30944,      30944,      160,      320, 0x60aba7e4
+0,      31104,      31104,      160,      320, 0x4b24b15f
+0,      31264,      31264,      160,      320, 0xbfc9afd6
+0,      31424,      31424,      160,      320, 0xf0f2ad49
+0,      31584,      31584,      160,      320, 0xeea0a426
+0,      31744,      31744,      160,      320, 0xff07a7c9
+0,      31904,      31904,      160,      320, 0xce1fc788
+0,      32064,      32064,      160,      320, 0xc074ae9b
+0,      32224,      32224,      160,      320, 0x51649696
+0,      32384,      32384,      160,      320, 0x24399744
+0,      32544,      32544,      160,      320, 0xfb0eb920
+0,      32704,      32704,      160,      320, 0x3bf8af5c
+0,      32864,      32864,      160,      320, 0xeab69ee0
+0,      33024,      33024,      160,      320, 0x182696bb
+0,      33184,      33184,      160,      320, 0x36e6af72
+0,      33344,      33344,      160,      320, 0x48cc9ecc
+0,      33504,      33504,      160,      320, 0xfb3ca7b8
+0,      33664,      33664,      160,      320, 0xe01aa4b4
+0,      33824,      33824,      160,      320, 0x5c6dac8c
+0,      33984,      33984,      160,      320, 0x072fbd93
+0,      34144,      34144,      160,      320, 0xc8899ccc
+0,      34304,      34304,      160,      320, 0xdcc990ac
+0,      34464,      34464,      160,      320, 0x28e0a9d0
+0,      34624,      34624,      160,      320, 0x0cdbaa11
+0,      34784,      34784,      160,      320, 0x8f4ca093
+0,      34944,      34944,      160,      320, 0x7ee79ea9
+0,      35104,      35104,      160,      320, 0xa762b695
+0,      35264,      35264,      160,      320, 0x9af0b5da
+0,      35424,      35424,      160,      320, 0x1f2cb0e7
+0,      35584,      35584,      160,      320, 0x6029b8bb
+0,      35744,      35744,      160,      320, 0xf2f7acec
+0,      35904,      35904,      160,      320, 0xb3e5b5be
+0,      36064,      36064,      160,      320, 0x266ba8a6
+0,      36224,      36224,      160,      320, 0x4ff59296
+0,      36384,      36384,      160,      320, 0x11d1b9ac
+0,      36544,      36544,      160,      320, 0x749197f7
+0,      36704,      36704,      160,      320, 0x8192b517
+0,      36864,      36864,      160,      320, 0xde129dbe
+0,      37024,      37024,      160,      320, 0x85e4a096
+0,      37184,      37184,      160,      320, 0xdebf9182
+0,      37344,      37344,      160,      320, 0x7a4ba0bf
+0,      37504,      37504,      160,      320, 0x55fe9fcd
+0,      37664,      37664,      160,      320, 0xd242adec
+0,      37824,      37824,      160,      320, 0xeaf5b159
+0,      37984,      37984,      160,      320, 0xfcb1a571
+0,      38144,      38144,      160,      320, 0x62fabda0
+0,      38304,      38304,      160,      320, 0x45a9abcc
+0,      38464,      38464,      160,      320, 0x07af974b
+0,      38624,      38624,      160,      320, 0xc2a0b4fd
+0,      38784,      38784,      160,      320, 0xc30abccd
+0,      38944,      38944,      160,      320, 0xd33ca61c
+0,      39104,      39104,      160,      320, 0x3c33d11a
+0,      39264,      39264,      160,      320, 0x9c2ca0ac
+0,      39424,      39424,      160,      320, 0xa5d69777
+0,      39584,      39584,      160,      320, 0xb7d2c6b8
+0,      39744,      39744,      160,      320, 0x34bbaab9
+0,      39904,      39904,      160,      320, 0x3e7baccb
+0,      40064,      40064,      160,      320, 0x92c6b7e6
+0,      40224,      40224,      160,      320, 0xc810a18a
+0,      40384,      40384,      160,      320, 0x06a09f56
+0,      40544,      40544,      160,      320, 0x8804a504
+0,      40704,      40704,      160,      320, 0x783ba7d5
+0,      40864,      40864,      160,      320, 0x24dcada6
+0,      41024,      41024,      160,      320, 0x4af796be
+0,      41184,      41184,      160,      320, 0x1454b19c
+0,      41344,      41344,      160,      320, 0x0ad0a56e
+0,      41504,      41504,      160,      320, 0x8944a44e
+0,      41664,      41664,      160,      320, 0x31069ebd
+0,      41824,      41824,      160,      320, 0x19cb9812
+0,      41984,      41984,      160,      320, 0xac75abe2
+0,      42144,      42144,      160,      320, 0x0162a200
+0,      42304,      42304,      160,      320, 0xa2d7a4b2
+0,      42464,      42464,      160,      320, 0x078ca611
+0,      42624,      42624,      160,      320, 0x0ec39b40
+0,      42784,      42784,      160,      320, 0xe8f794b2
+0,      42944,      42944,      160,      320, 0xc2cfb258
+0,      43104,      43104,      160,      320, 0xe4759061
+0,      43264,      43264,      160,      320, 0xb1b6aea4
+0,      43424,      43424,      160,      320, 0x9bfb96df
+0,      43584,      43584,      160,      320, 0xcc61b5d3
+0,      43744,      43744,      160,      320, 0xd14e8df9
+0,      43904,      43904,      160,      320, 0xd9d5bbf5
+0,      44064,      44064,      160,      320, 0x4d9fa9b0
+0,      44224,      44224,      160,      320, 0xf606abfc
+0,      44384,      44384,      160,      320, 0x720baa19
+0,      44544,      44544,      160,      320, 0x7f7cac49
+0,      44704,      44704,      160,      320, 0xceab9b54
+0,      44864,      44864,      160,      320, 0x645fa70a
+0,      45024,      45024,      160,      320, 0xa081a40f
+0,      45184,      45184,      160,      320, 0x21d78f8c
+0,      45344,      45344,      160,      320, 0xedf3abc6
+0,      45504,      45504,      160,      320, 0x17679637
+0,      45664,      45664,      160,      320, 0x1cb1ae04
+0,      45824,      45824,      160,      320, 0x17cd9f62
+0,      45984,      45984,      160,      320, 0xf4bca3ab
+0,      46144,      46144,      160,      320, 0xb3bd9152
+0,      46304,      46304,      160,      320, 0x4e1e9825
+0,      46464,      46464,      160,      320, 0x037e9a56
+0,      46624,      46624,      160,      320, 0xd7589fcc
+0,      46784,      46784,      160,      320, 0x5f949e90
+0,      46944,      46944,      160,      320, 0xe133a495
+0,      47104,      47104,      160,      320, 0x7cb7a52c
+0,      47264,      47264,      160,      320, 0xb8b29d95
+0,      47424,      47424,      160,      320, 0x01bca472
+0,      47584,      47584,      160,      320, 0xbcc69895
+0,      47744,      47744,      160,      320, 0xabffa0ee
+0,      47904,      47904,      160,      320, 0xe6629eca
+0,      48064,      48064,      160,      320, 0x572da7cd
+0,      48224,      48224,      160,      320, 0x3017972d
+0,      48384,      48384,      160,      320, 0xac4e9c78
+0,      48544,      48544,      160,      320, 0x112f9c45
+0,      48704,      48704,      160,      320, 0x05e9a64d
+0,      48864,      48864,      160,      320, 0x8f7394d4
+0,      49024,      49024,      160,      320, 0xbaeea07e
+0,      49184,      49184,      160,      320, 0xd757c00e
+0,      49344,      49344,      160,      320, 0x8aa09783
+0,      49504,      49504,      160,      320, 0x31d4ae7a
+0,      49664,      49664,      160,      320, 0x221493e8
+0,      49824,      49824,      160,      320, 0x92f4a3a7
+0,      49984,      49984,      160,      320, 0xbd5bafd9
+0,      50144,      50144,      160,      320, 0x1895b760
+0,      50304,      50304,      160,      320, 0x7a4eacdd
+0,      50464,      50464,      160,      320, 0xc9f7a1c3
+0,      50624,      50624,      160,      320, 0xd750be06
+0,      50784,      50784,      160,      320, 0x641d9a6f
+0,      50944,      50944,      160,      320, 0x70d6b6ff
+0,      51104,      51104,      160,      320, 0x1fd3a546
+0,      51264,      51264,      160,      320, 0x72cfaabe
+0,      51424,      51424,      160,      320, 0x2e61b6ce
+0,      51584,      51584,      160,      320, 0x4813a091
+0,      51744,      51744,      160,      320, 0xbfe7bc0f
+0,      51904,      51904,      160,      320, 0x8c759c1f
+0,      52064,      52064,      160,      320, 0xf4c1c952
+0,      52224,      52224,      160,      320, 0x00fdaa79
+0,      52384,      52384,      160,      320, 0x2ffda252
+0,      52544,      52544,      160,      320, 0x841aa523
+0,      52704,      52704,      160,      320, 0x8c079e5e
+0,      52864,      52864,      160,      320, 0x96e9a83f
+0,      53024,      53024,      160,      320, 0x5926a639
+0,      53184,      53184,      160,      320, 0x02e1a07b
+0,      53344,      53344,      160,      320, 0x2972a999
+0,      53504,      53504,      160,      320, 0x30c89c62
+0,      53664,      53664,      160,      320, 0x83f5a263
+0,      53824,      53824,      160,      320, 0xa3909667
+0,      53984,      53984,      160,      320, 0xd5309fd4
+0,      54144,      54144,      160,      320, 0x3154a571
+0,      54304,      54304,      160,      320, 0x51039a5e
+0,      54464,      54464,      160,      320, 0xf167a344
+0,      54624,      54624,      160,      320, 0x8e709d7d
+0,      54784,      54784,      160,      320, 0x936fa0fd
+0,      54944,      54944,      160,      320, 0x024b9e3c
+0,      55104,      55104,      160,      320, 0x2ea1aa75
+0,      55264,      55264,      160,      320, 0x33f0a2bb
+0,      55424,      55424,      160,      320, 0xbf079d2d
+0,      55584,      55584,      160,      320, 0x847ba2c8
+0,      55744,      55744,      160,      320, 0x37e1a767
+0,      55904,      55904,      160,      320, 0xb607acbb
+0,      56064,      56064,      160,      320, 0x1288ac6d
+0,      56224,      56224,      160,      320, 0xf60e98b3
+0,      56384,      56384,      160,      320, 0xc6b5abdd
+0,      56544,      56544,      160,      320, 0x7feaa710
+0,      56704,      56704,      160,      320, 0x77329fcd
+0,      56864,      56864,      160,      320, 0x91a6a715
+0,      57024,      57024,      160,      320, 0xd0e99f24
+0,      57184,      57184,      160,      320, 0x07089f61
+0,      57344,      57344,      160,      320, 0x2bbda900
+0,      57504,      57504,      160,      320, 0xad3da0d5
+0,      57664,      57664,      160,      320, 0x997ba6d2
+0,      57824,      57824,      160,      320, 0xb15b9dcb
+0,      57984,      57984,      160,      320, 0x17cea82f
+0,      58144,      58144,      160,      320, 0xab51a73e
+0,      58304,      58304,      160,      320, 0x77a1abd6
+0,      58464,      58464,      160,      320, 0x0bddacad
+0,      58624,      58624,      160,      320, 0x43b3bdc4
+0,      58784,      58784,      160,      320, 0xefe0a9ba
+0,      58944,      58944,      160,      320, 0x8eb4bc2f
+0,      59104,      59104,      160,      320, 0x39cdc190
+0,      59264,      59264,      160,      320, 0x1ef3baff
+0,      59424,      59424,      160,      320, 0x1a6ab7e2
+0,      59584,      59584,      160,      320, 0x444ccc69
+0,      59744,      59744,      160,      320, 0x05ebb598
+0,      59904,      59904,      160,      320, 0x4ac5b0ad
+0,      60064,      60064,      160,      320, 0x0ee5ba52
+0,      60224,      60224,      160,      320, 0x501d9fa0
+0,      60384,      60384,      160,      320, 0x2038a9f4
+0,      60544,      60544,      160,      320, 0xa61cb8b3
+0,      60704,      60704,      160,      320, 0xdd009777
+0,      60864,      60864,      160,      320, 0x2a2db86d
+0,      61024,      61024,      160,      320, 0xe9bab3bc
+0,      61184,      61184,      160,      320, 0xf7f8a056
+0,      61344,      61344,      160,      320, 0x514caf14
+0,      61504,      61504,      160,      320, 0xa220b149
+0,      61664,      61664,      160,      320, 0xbf7ea183
+0,      61824,      61824,      160,      320, 0x1d8dc5c6
+0,      61984,      61984,      160,      320, 0x9182a8ea
+0,      62144,      62144,      160,      320, 0x31eba026
+0,      62304,      62304,      160,      320, 0xcfbcc3df
+0,      62464,      62464,      160,      320, 0x3d8cb7ae
+0,      62624,      62624,      160,      320, 0xbe39aec0
+0,      62784,      62784,      160,      320, 0xd236bf71
+0,      62944,      62944,      160,      320, 0x9377b0b2
+0,      63104,      63104,      160,      320, 0xb5e6b2df
+0,      63264,      63264,      160,      320, 0xa3b9bbce
+0,      63424,      63424,      160,      320, 0xa7bda251
+0,      63584,      63584,      160,      320, 0xbf9ab162
+0,      63744,      63744,      160,      320, 0x6928b9cb
+0,      63904,      63904,      160,      320, 0xf5cca209
+0,      64064,      64064,      160,      320, 0xfdf4afad
+0,      64224,      64224,      160,      320, 0xe7e7c216
+0,      64384,      64384,      160,      320, 0x0c5797c6
+0,      64544,      64544,      160,      320, 0x66c1a9ca
+0,      64704,      64704,      160,      320, 0x6b5ca48d
+0,      64864,      64864,      160,      320, 0xec04968a
+0,      65024,      65024,      160,      320, 0xaaada691
+0,      65184,      65184,      160,      320, 0x77c3a624
+0,      65344,      65344,      160,      320, 0xaed9a5d5
+0,      65504,      65504,      160,      320, 0x360fac41
+0,      65664,      65664,      160,      320, 0xa05ea727
+0,      65824,      65824,      160,      320, 0x9f7b9f83
+0,      65984,      65984,      160,      320, 0x474bc4c2
+0,      66144,      66144,      160,      320, 0xb6078d3b
+0,      66304,      66304,      160,      320, 0x8e15a8f9
+0,      66464,      66464,      160,      320, 0x7dc7d4a8
+0,      66624,      66624,      160,      320, 0x55ceab6b
+0,      66784,      66784,      160,      320, 0x982cc94f
+0,      66944,      66944,      160,      320, 0x6153948f
+0,      67104,      67104,      160,      320, 0x5338c621
+0,      67264,      67264,      160,      320, 0x2e2db6e8
+0,      67424,      67424,      160,      320, 0x28e3a9c3
+0,      67584,      67584,      160,      320, 0x74d7b435
+0,      67744,      67744,      160,      320, 0xcf17a10c
+0,      67904,      67904,      160,      320, 0xf1f9ac8c
+0,      68064,      68064,      160,      320, 0x35e0b480
+0,      68224,      68224,      160,      320, 0x5e60b3a4
+0,      68384,      68384,      160,      320, 0x20579b26
+0,      68544,      68544,      160,      320, 0x3e27b89b
+0,      68704,      68704,      160,      320, 0x02e4af94
+0,      68864,      68864,      160,      320, 0x6d6897f1
+0,      69024,      69024,      160,      320, 0x1582b267
+0,      69184,      69184,      160,      320, 0x33ba9eb3
+0,      69344,      69344,      160,      320, 0xb6acad7d
+0,      69504,      69504,      160,      320, 0x1969a6c2
+0,      69664,      69664,      160,      320, 0x363fa350
+0,      69824,      69824,      160,      320, 0xae50bf65
+0,      69984,      69984,      160,      320, 0x0877a50f
+0,      70144,      70144,      160,      320, 0x66e2a42f
+0,      70304,      70304,      160,      320, 0x0b0abcb3
+0,      70464,      70464,      160,      320, 0x23a9afaa
+0,      70624,      70624,      160,      320, 0xc3729b40
+0,      70784,      70784,      160,      320, 0xdd3fc7e2
+0,      70944,      70944,      160,      320, 0x7e0494af
+0,      71104,      71104,      160,      320, 0xcbd096fb
+0,      71264,      71264,      160,      320, 0x5d71b303
+0,      71424,      71424,      160,      320, 0xeedca04a
+0,      71584,      71584,      160,      320, 0x2836a47d
+0,      71744,      71744,      160,      320, 0x7237c2a0
+0,      71904,      71904,      160,      320, 0x7c009bc0
+0,      72064,      72064,      160,      320, 0xc9dcb366
+0,      72224,      72224,      160,      320, 0x4993aac8
+0,      72384,      72384,      160,      320, 0x05ec9954
+0,      72544,      72544,      160,      320, 0xa955bd5c
+0,      72704,      72704,      160,      320, 0x9018aea3
+0,      72864,      72864,      160,      320, 0x780cca52
+0,      73024,      73024,      160,      320, 0x9b8f95f6
+0,      73184,      73184,      160,      320, 0xcd7bb178
+0,      73344,      73344,      160,      320, 0xfec6b443
+0,      73504,      73504,      160,      320, 0xe214abb6
+0,      73664,      73664,      160,      320, 0xdcbebb38
+0,      73824,      73824,      160,      320, 0xe683a30d
+0,      73984,      73984,      160,      320, 0xe4cdb197
+0,      74144,      74144,      160,      320, 0xa426c432
+0,      74304,      74304,      160,      320, 0x761ba6cc
+0,      74464,      74464,      160,      320, 0xcc9aa6aa
+0,      74624,      74624,      160,      320, 0x742bd03d
+0,      74784,      74784,      160,      320, 0x61d9a511
+0,      74944,      74944,      160,      320, 0x3021a4dd
+0,      75104,      75104,      160,      320, 0x6970bbc0
+0,      75264,      75264,      160,      320, 0x76f5a037
+0,      75424,      75424,      160,      320, 0x758d91f2
+0,      75584,      75584,      160,      320, 0xe854a2f1
+0,      75744,      75744,      160,      320, 0xf994a6f8
+0,      75904,      75904,      160,      320, 0x31ebaf40
+0,      76064,      76064,      160,      320, 0x24699970
+0,      76224,      76224,      160,      320, 0x37dda53e
+0,      76384,      76384,      160,      320, 0xa857a752
+0,      76544,      76544,      160,      320, 0xc483ad1d
+0,      76704,      76704,      160,      320, 0x5966add9
+0,      76864,      76864,      160,      320, 0x4dbab89c
+0,      77024,      77024,      160,      320, 0x2f0bb0e6
+0,      77184,      77184,      160,      320, 0x913aaa88
+0,      77344,      77344,      160,      320, 0x245dc1c3
+0,      77504,      77504,      160,      320, 0xb085c5ad
+0,      77664,      77664,      160,      320, 0x9cf1b0fa
+0,      77824,      77824,      160,      320, 0x6887b543
+0,      77984,      77984,      160,      320, 0xcad69feb
+0,      78144,      78144,      160,      320, 0xc12a8ddb
+0,      78304,      78304,      160,      320, 0x01d1bc5a
+0,      78464,      78464,      160,      320, 0x3018b7e8
+0,      78624,      78624,      160,      320, 0x6431b0ef
+0,      78784,      78784,      160,      320, 0x3a53998e
+0,      78944,      78944,      160,      320, 0x1c80a6c6
+0,      79104,      79104,      160,      320, 0x6639adc5
+0,      79264,      79264,      160,      320, 0x92489f9a
+0,      79424,      79424,      160,      320, 0x8cafad00
+0,      79584,      79584,      160,      320, 0xca0392e1
+0,      79744,      79744,      160,      320, 0x30a9ae88
+0,      79904,      79904,       96,      192, 0x68b76a75
diff --git a/tests/ref/fate/h264-3386 b/tests/ref/fate/h264-3386
new file mode 100644
index 0000000000..421581f8c6
--- /dev/null
+++ b/tests/ref/fate/h264-3386
@@ -0,0 +1,52 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1440x1080
+#sar 0: 4/3
+0,          3,          3,        1,  2332800, 0xa9dcb2ac
+0,          4,          4,        1,  2332800, 0x9b17af27
+0,          5,          5,        1,  2332800, 0x02da3196
+0,          6,          6,        1,  2332800, 0x9c78ed62
+0,          7,          7,        1,  2332800, 0xa6e926a0
+0,          8,          8,        1,  2332800, 0x324e51d2
+0,          9,          9,        1,  2332800, 0xd8289620
+0,         10,         10,        1,  2332800, 0xfc3619f9
+0,         11,         11,        1,  2332800, 0x6b8d2560
+0,         12,         12,        1,  2332800, 0x5714dca0
+0,         13,         13,        1,  2332800, 0x246e2842
+0,         14,         14,        1,  2332800, 0x59bc0b2e
+0,         15,         15,        1,  2332800, 0x24fe5cfa
+0,         16,         16,        1,  2332800, 0xb9607c3e
+0,         17,         17,        1,  2332800, 0x663669c9
+0,         19,         19,        1,  2332800, 0xd37fd62f
+0,         20,         20,        1,  2332800, 0x2d7db904
+0,         21,         21,        1,  2332800, 0x79a53eba
+0,         22,         22,        1,  2332800, 0x3b0c7e19
+0,         23,         23,        1,  2332800, 0xd12f64c5
+0,         24,         24,        1,  2332800, 0xacdb407f
+0,         25,         25,        1,  2332800, 0x829d7e61
+0,         26,         26,        1,  2332800, 0x7932b82f
+0,         27,         27,        1,  2332800, 0x61f81627
+0,         28,         28,        1,  2332800, 0xa1a2e000
+0,         29,         29,        1,  2332800, 0x93aad5e9
+0,         30,         30,        1,  2332800, 0x9993b5b5
+0,         31,         31,        1,  2332800, 0x6ac48232
+0,         32,         32,        1,  2332800, 0x5738f9c0
+0,         33,         33,        1,  2332800, 0x82a59d01
+0,         34,         34,        1,  2332800, 0xc4664862
+0,         35,         35,        1,  2332800, 0xf0e6222d
+0,         36,         36,        1,  2332800, 0xd29e7100
+0,         37,         37,        1,  2332800, 0xe093ef85
+0,         38,         38,        1,  2332800, 0x28c68a65
+0,         39,         39,        1,  2332800, 0x49a6b21e
+0,         40,         40,        1,  2332800, 0xfb28a097
+0,         41,         41,        1,  2332800, 0xade1e336
+0,         42,         42,        1,  2332800, 0xe5118412
+0,         43,         43,        1,  2332800, 0x58750176
+0,         44,         44,        1,  2332800, 0xacb99939
+0,         45,         45,        1,  2332800, 0x80b968d3
+0,         46,         46,        1,  2332800, 0xa45f4e6f
+0,         47,         47,        1,  2332800, 0xe0fcbade
+0,         48,         48,        1,  2332800, 0x19568f4d
+0,         49,         49,        1,  2332800, 0x33c53f59
+0,         50,         50,        1,  2332800, 0xbdbe8fbf
diff --git a/tests/ref/fate/h264-attachment-631 b/tests/ref/fate/h264-attachment-631
new file mode 100644
index 0000000000..ebb5eb4fcd
--- /dev/null
+++ b/tests/ref/fate/h264-attachment-631
@@ -0,0 +1,20 @@
+#tb 0: 1/60
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 8/9
+0,        598,        598,        1,   518400, 0xc3c0f1cf
+0,        603,        603,        1,   518400, 0x21a5df80
+0,        607,        607,        1,   518400, 0x5b8e115b
+0,        611,        611,        1,   518400, 0x7ce09331
+0,        615,        615,        1,   518400, 0x30ff1f1f
+0,        619,        619,        1,   518400, 0x64f091ed
+0,        623,        623,        1,   518400, 0xb3c117a2
+0,        627,        627,        1,   518400, 0x0fbe146d
+0,        631,        631,        1,   518400, 0x75209293
+0,        635,        635,        1,   518400, 0xa3030208
+0,        639,        639,        1,   518400, 0x8cea6941
+0,        643,        643,        1,   518400, 0xf41d1dbd
+0,        647,        647,        1,   518400, 0xcc9fe95e
+0,        651,        651,        1,   518400, 0xa2a60dbc
+0,        655,        655,        1,   518400, 0x3f5eecdb
diff --git a/tests/ref/fate/h264-brokensps-2580 b/tests/ref/fate/h264-brokensps-2580
new file mode 100644
index 0000000000..0bdb1dab16
--- /dev/null
+++ b/tests/ref/fate/h264-brokensps-2580
@@ -0,0 +1,84 @@
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x144
+#sar 0: 0/1
+0,          0,          0,        1,    41472, 0x89c63720
+0,          2,          2,        1,    41472, 0x4605aca8
+0,          4,          4,        1,    41472, 0xc1c6fdf7
+0,          6,          6,        1,    41472, 0x09f7f4c9
+0,          8,          8,        1,    41472, 0x823abdcb
+0,         10,         10,        1,    41472, 0xc338b5e3
+0,         12,         12,        1,    41472, 0xb961599b
+0,         14,         14,        1,    41472, 0x871b59ea
+0,         16,         16,        1,    41472, 0x949a2948
+0,         18,         18,        1,    41472, 0x32561424
+0,         20,         20,        1,    41472, 0x54920aec
+0,         22,         22,        1,    41472, 0x14d6ec9d
+0,         24,         24,        1,    41472, 0x2a30e4ba
+0,         26,         26,        1,    41472, 0x8774de8b
+0,         28,         28,        1,    41472, 0xf33cd23f
+0,         32,         32,        1,    41472, 0x41059fc9
+0,         34,         34,        1,    41472, 0x65a3a3b9
+0,         36,         36,        1,    41472, 0xbf28a6bc
+0,         38,         38,        1,    41472, 0xc69bab99
+0,         40,         40,        1,    41472, 0xc5f4ae3f
+0,         42,         42,        1,    41472, 0x4c98b28e
+0,         44,         44,        1,    41472, 0x81d8afa5
+0,         46,         46,        1,    41472, 0x5293b73c
+0,         48,         48,        1,    41472, 0x5ba2bb28
+0,         50,         50,        1,    41472, 0x7fcfc16d
+0,         52,         52,        1,    41472, 0x86a4bd93
+0,         54,         54,        1,    41472, 0x7337bd9f
+0,         56,         56,        1,    41472, 0x6f84bfa0
+0,         58,         58,        1,    41472, 0x4868c1fe
+0,         60,         60,        1,    41472, 0x38d8ada8
+0,         62,         62,        1,    41472, 0x4bb988aa
+0,         64,         64,        1,    41472, 0x33a67dc5
+0,         66,         66,        1,    41472, 0xaf187be9
+0,         68,         68,        1,    41472, 0xf7d27ca8
+0,         70,         70,        1,    41472, 0xf9807fb3
+0,         72,         72,        1,    41472, 0x14447ee3
+0,         74,         74,        1,    41472, 0xf66285e9
+0,         76,         76,        1,    41472, 0x10b38fa5
+0,         78,         78,        1,    41472, 0x335d916d
+0,         80,         80,        1,    41472, 0xe82e93be
+0,         82,         82,        1,    41472, 0x2b3393d5
+0,         84,         84,        1,    41472, 0x95239770
+0,         86,         86,        1,    41472, 0xe3989676
+0,         88,         88,        1,    41472, 0x627398fd
+0,         90,         90,        1,    41472, 0xd2639c33
+0,         92,         92,        1,    41472, 0x361fa861
+0,         94,         94,        1,    41472, 0x0bf6a938
+0,         96,         96,        1,    41472, 0xf2caab81
+0,         98,         98,        1,    41472, 0xae2aab1b
+0,        100,        100,        1,    41472, 0x1c54a705
+0,        102,        102,        1,    41472, 0xe681a95f
+0,        104,        104,        1,    41472, 0x4ee7abc6
+0,        125,        125,        1,    41472, 0x68a45a04
+0,        131,        131,        1,    41472, 0xf41a4071
+0,        133,        133,        1,    41472, 0xa269adab
+0,        135,        135,        1,    41472, 0xaa1eb23d
+0,        137,        137,        1,    41472, 0xae605bff
+0,        139,        139,        1,    41472, 0xabc75beb
+0,        141,        141,        1,    41472, 0x3f988c08
+0,        143,        143,        1,    41472, 0xc2968ef7
+0,        145,        145,        1,    41472, 0x90d75ca9
+0,        147,        147,        1,    41472, 0x57096134
+0,        149,        149,        1,    41472, 0x32398f58
+0,        151,        151,        1,    41472, 0xde0c8b4c
+0,        153,        153,        1,    41472, 0x7c489797
+0,        155,        155,        1,    41472, 0xaa4e9f12
+0,        157,        157,        1,    41472, 0x9c29a032
+0,        159,        159,        1,    41472, 0x75154e97
+0,        161,        161,        1,    41472, 0x090ba403
+0,        163,        163,        1,    41472, 0xefbfa8bd
+0,        165,        165,        1,    41472, 0x7ce0289a
+0,        167,        167,        1,    41472, 0x48cc318b
+0,        169,        169,        1,    41472, 0xaf6fae87
+0,        171,        171,        1,    41472, 0xf7bab36b
+0,        173,        173,        1,    41472, 0x4a5b38cd
+0,        175,        175,        1,    41472, 0x73de3c81
+0,        177,        177,        1,    41472, 0x46e2aba0
+0,        179,        179,        1,    41472, 0xe75eb500
+0,        181,        181,        1,    41472, 0xfaf40d50
diff --git a/tests/ref/fate/h264-conformance-aud_mw_e b/tests/ref/fate/h264-conformance-aud_mw_e
index 83c6faeeb7..890c7ff3fe 100644
--- a/tests/ref/fate/h264-conformance-aud_mw_e
+++ b/tests/ref/fate/h264-conformance-aud_mw_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xa6d63b2e
 0,          1,          1,        1,    38016, 0x28bae101
 0,          2,          2,        1,    38016, 0x139f9b29
diff --git a/tests/ref/fate/h264-conformance-ba1_ft_c b/tests/ref/fate/h264-conformance-ba1_ft_c
index 9f6bc2344f..0b8f66e50f 100644
--- a/tests/ref/fate/h264-conformance-ba1_ft_c
+++ b/tests/ref/fate/h264-conformance-ba1_ft_c
@@ -1,4 +1,8 @@
-#tb 0: 1/25
+#tb 0: 1/19
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xa6f9b2a8
 0,          1,          1,        1,   152064, 0x936a8ed6
 0,          2,          2,        1,   152064, 0xa9f47652
diff --git a/tests/ref/fate/h264-conformance-ba1_sony_d b/tests/ref/fate/h264-conformance-ba1_sony_d
index b0145cdbb4..c64462f758 100644
--- a/tests/ref/fate/h264-conformance-ba1_sony_d
+++ b/tests/ref/fate/h264-conformance-ba1_sony_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xb3883478
 0,          1,          1,        1,    38016, 0x99e1fe60
 0,          2,          2,        1,    38016, 0x65eace24
diff --git a/tests/ref/fate/h264-conformance-ba2_sony_f b/tests/ref/fate/h264-conformance-ba2_sony_f
index 13a6462c67..86b2df3aed 100644
--- a/tests/ref/fate/h264-conformance-ba2_sony_f
+++ b/tests/ref/fate/h264-conformance-ba2_sony_f
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xb3883478
 0,          1,          1,        1,    38016, 0x47b90d4b
 0,          2,          2,        1,    38016, 0x3e99dfcf
diff --git a/tests/ref/fate/h264-conformance-ba3_sva_c b/tests/ref/fate/h264-conformance-ba3_sva_c
index cb775db75a..52d6bb0638 100644
--- a/tests/ref/fate/h264-conformance-ba3_sva_c
+++ b/tests/ref/fate/h264-conformance-ba3_sva_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xbf5f1df5
 0,          1,          1,        1,    38016, 0x8de61f39
 0,          2,          2,        1,    38016, 0xaeec0a18
diff --git a/tests/ref/fate/h264-conformance-ba_mw_d b/tests/ref/fate/h264-conformance-ba_mw_d
index 18a6717451..e237b58b1a 100644
--- a/tests/ref/fate/h264-conformance-ba_mw_d
+++ b/tests/ref/fate/h264-conformance-ba_mw_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x3ae838ee
 0,          1,          1,        1,    38016, 0x9ed7e141
 0,          2,          2,        1,    38016, 0x393097f9
diff --git a/tests/ref/fate/h264-conformance-bamq1_jvc_c b/tests/ref/fate/h264-conformance-bamq1_jvc_c
index 4a3066cfa7..a62ef085d6 100644
--- a/tests/ref/fate/h264-conformance-bamq1_jvc_c
+++ b/tests/ref/fate/h264-conformance-bamq1_jvc_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x6951213f
 0,          1,          1,        1,    38016, 0x82ddf39d
 0,          2,          2,        1,    38016, 0x3f81c6b1
diff --git a/tests/ref/fate/h264-conformance-bamq2_jvc_c b/tests/ref/fate/h264-conformance-bamq2_jvc_c
index 3308f770ce..ef6d7bdc7d 100644
--- a/tests/ref/fate/h264-conformance-bamq2_jvc_c
+++ b/tests/ref/fate/h264-conformance-bamq2_jvc_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x6951213f
 0,          1,          1,        1,    38016, 0xd1bbf830
 0,          2,          2,        1,    38016, 0x79dcc8cb
diff --git a/tests/ref/fate/h264-conformance-banm_mw_d b/tests/ref/fate/h264-conformance-banm_mw_d
index 6108ca3a2c..00b27bb1bc 100644
--- a/tests/ref/fate/h264-conformance-banm_mw_d
+++ b/tests/ref/fate/h264-conformance-banm_mw_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x3ae838ee
 0,          1,          1,        1,    38016, 0x9ed7e141
 0,          2,          2,        1,    38016, 0xaf9d9753
diff --git a/tests/ref/fate/h264-conformance-basqp1_sony_c b/tests/ref/fate/h264-conformance-basqp1_sony_c
index a5038e415d..24074314f5 100644
--- a/tests/ref/fate/h264-conformance-basqp1_sony_c
+++ b/tests/ref/fate/h264-conformance-basqp1_sony_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xe2d73230
 0,          1,          1,        1,    38016, 0xda4dfc8e
 0,          2,          2,        1,    38016, 0x7334cb99
diff --git a/tests/ref/fate/h264-conformance-caba1_sony_d b/tests/ref/fate/h264-conformance-caba1_sony_d
index 35798202d6..dcd5976319 100644
--- a/tests/ref/fate/h264-conformance-caba1_sony_d
+++ b/tests/ref/fate/h264-conformance-caba1_sony_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xb3883478
 0,          1,          1,        1,    38016, 0x99e1fe60
 0,          2,          2,        1,    38016, 0x65eace24
diff --git a/tests/ref/fate/h264-conformance-caba1_sva_b b/tests/ref/fate/h264-conformance-caba1_sva_b
index 8b255bc2f3..19daf44652 100644
--- a/tests/ref/fate/h264-conformance-caba1_sva_b
+++ b/tests/ref/fate/h264-conformance-caba1_sva_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xee831fe4
 0,          1,          1,        1,    38016, 0x1098ff23
 0,          2,          2,        1,    38016, 0x8fc3e078
diff --git a/tests/ref/fate/h264-conformance-caba2_sony_e b/tests/ref/fate/h264-conformance-caba2_sony_e
index c30083c5e8..acfc842420 100644
--- a/tests/ref/fate/h264-conformance-caba2_sony_e
+++ b/tests/ref/fate/h264-conformance-caba2_sony_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xb3883478
 0,          1,          1,        1,    38016, 0x23a30e47
 0,          2,          2,        1,    38016, 0xa0b7df0f
diff --git a/tests/ref/fate/h264-conformance-caba2_sva_b b/tests/ref/fate/h264-conformance-caba2_sva_b
index ca89226f41..8c77add756 100644
--- a/tests/ref/fate/h264-conformance-caba2_sva_b
+++ b/tests/ref/fate/h264-conformance-caba2_sva_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xee831fe4
 0,          1,          1,        1,    38016, 0xd9130e19
 0,          2,          2,        1,    38016, 0x8ad70cae
diff --git a/tests/ref/fate/h264-conformance-caba3_sony_c b/tests/ref/fate/h264-conformance-caba3_sony_c
index c7aee37319..4e3593092f 100644
--- a/tests/ref/fate/h264-conformance-caba3_sony_c
+++ b/tests/ref/fate/h264-conformance-caba3_sony_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xb3883478
 0,          1,          1,        1,    38016, 0xb6261cdd
 0,          2,          2,        1,    38016, 0x42ecede9
diff --git a/tests/ref/fate/h264-conformance-caba3_sva_b b/tests/ref/fate/h264-conformance-caba3_sva_b
index 7bdb3f8636..cfa3c164ff 100644
--- a/tests/ref/fate/h264-conformance-caba3_sva_b
+++ b/tests/ref/fate/h264-conformance-caba3_sva_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x0e091175
 0,          1,          1,        1,    38016, 0xe8f81506
 0,          2,          2,        1,    38016, 0xf706f5cd
diff --git a/tests/ref/fate/h264-conformance-caba3_toshiba_e b/tests/ref/fate/h264-conformance-caba3_toshiba_e
index b31efe1564..7c6c4c3fd4 100644
--- a/tests/ref/fate/h264-conformance-caba3_toshiba_e
+++ b/tests/ref/fate/h264-conformance-caba3_toshiba_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x72723ce4
 0,          1,          1,        1,    38016, 0x347219d7
 0,          2,          2,        1,    38016, 0x813ff182
diff --git a/tests/ref/fate/h264-conformance-cabac_mot_fld0_full b/tests/ref/fate/h264-conformance-cabac_mot_fld0_full
index b131cdaa26..8778fef98e 100644
--- a/tests/ref/fate/h264-conformance-cabac_mot_fld0_full
+++ b/tests/ref/fate/h264-conformance-cabac_mot_fld0_full
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xbf168f4e
 0,          1,          1,        1,   518400, 0xeda5e54f
 0,          2,          2,        1,   518400, 0xef496d43
diff --git a/tests/ref/fate/h264-conformance-cabac_mot_frm0_full b/tests/ref/fate/h264-conformance-cabac_mot_frm0_full
index 58949e2442..3774cfdbbf 100644
--- a/tests/ref/fate/h264-conformance-cabac_mot_frm0_full
+++ b/tests/ref/fate/h264-conformance-cabac_mot_frm0_full
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x40c7e2d9
 0,          1,          1,        1,   518400, 0xb16701a5
 0,          2,          2,        1,   518400, 0x12c2f5b1
diff --git a/tests/ref/fate/h264-conformance-cabac_mot_mbaff0_full b/tests/ref/fate/h264-conformance-cabac_mot_mbaff0_full
index 1e9313e00e..120871f2b9 100644
--- a/tests/ref/fate/h264-conformance-cabac_mot_mbaff0_full
+++ b/tests/ref/fate/h264-conformance-cabac_mot_mbaff0_full
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x8336b7db
 0,          1,          1,        1,   518400, 0x9818c309
 0,          2,          2,        1,   518400, 0x5417b6f9
diff --git a/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full b/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full
index 484025e576..5651e4b57c 100644
--- a/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full
+++ b/tests/ref/fate/h264-conformance-cabac_mot_picaff0_full
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xd8b58a23
 0,          1,          1,        1,   518400, 0xe53b4aba
 0,          2,          2,        1,   518400, 0x6cbca47a
diff --git a/tests/ref/fate/h264-conformance-cabaci3_sony_b b/tests/ref/fate/h264-conformance-cabaci3_sony_b
index 9dc4884fae..bcfce03230 100644
--- a/tests/ref/fate/h264-conformance-cabaci3_sony_b
+++ b/tests/ref/fate/h264-conformance-cabaci3_sony_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x705f2f41
 0,          1,          1,        1,    38016, 0xa76d1766
 0,          2,          2,        1,    38016, 0xf367e6f4
diff --git a/tests/ref/fate/h264-conformance-cabast3_sony_e b/tests/ref/fate/h264-conformance-cabast3_sony_e
index 00519ef968..38da464a64 100644
--- a/tests/ref/fate/h264-conformance-cabast3_sony_e
+++ b/tests/ref/fate/h264-conformance-cabast3_sony_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x96ebb3a2
 0,          1,          1,        1,   152064, 0x5184d912
 0,          2,          2,        1,   152064, 0xfa0c9abe
diff --git a/tests/ref/fate/h264-conformance-cabastbr3_sony_b b/tests/ref/fate/h264-conformance-cabastbr3_sony_b
index 765f53f632..0a3525039a 100644
--- a/tests/ref/fate/h264-conformance-cabastbr3_sony_b
+++ b/tests/ref/fate/h264-conformance-cabastbr3_sony_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x96ebb3a2
 0,          1,          1,        1,   152064, 0x5184d912
 0,          2,          2,        1,   152064, 0xb7b5ba68
diff --git a/tests/ref/fate/h264-conformance-cabref3_sand_d b/tests/ref/fate/h264-conformance-cabref3_sand_d
index 9e555f6ee6..d5cd445879 100644
--- a/tests/ref/fate/h264-conformance-cabref3_sand_d
+++ b/tests/ref/fate/h264-conformance-cabref3_sand_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x2061bbd0
 0,          1,          1,        1,   152064, 0x41adb750
 0,          2,          2,        1,   152064, 0x6e889e90
diff --git a/tests/ref/fate/h264-conformance-cacqp3_sony_d b/tests/ref/fate/h264-conformance-cacqp3_sony_d
index c3685296fb..788a0a52a1 100644
--- a/tests/ref/fate/h264-conformance-cacqp3_sony_d
+++ b/tests/ref/fate/h264-conformance-cacqp3_sony_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x295a375c
 0,          1,          1,        1,    38016, 0xd0da1f37
 0,          2,          2,        1,    38016, 0x0e5ed514
diff --git a/tests/ref/fate/h264-conformance-cafi1_sva_c b/tests/ref/fate/h264-conformance-cafi1_sva_c
index 180adf186b..11d958fd4c 100644
--- a/tests/ref/fate/h264-conformance-cafi1_sva_c
+++ b/tests/ref/fate/h264-conformance-cafi1_sva_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x47bd73fa
 0,          1,          1,        1,   518400, 0xfe3ea7cc
 0,          2,          2,        1,   518400, 0x9bc549ae
diff --git a/tests/ref/fate/h264-conformance-cama1_sony_c b/tests/ref/fate/h264-conformance-cama1_sony_c
index 66852165d4..9a29e30245 100644
--- a/tests/ref/fate/h264-conformance-cama1_sony_c
+++ b/tests/ref/fate/h264-conformance-cama1_sony_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x75701511
 0,          1,          1,        1,   518400, 0xa7eeaa16
 0,          2,          2,        1,   518400, 0xe0f32e35
diff --git a/tests/ref/fate/h264-conformance-cama1_toshiba_b b/tests/ref/fate/h264-conformance-cama1_toshiba_b
index ab2da4a736..6e854f2c31 100644
--- a/tests/ref/fate/h264-conformance-cama1_toshiba_b
+++ b/tests/ref/fate/h264-conformance-cama1_toshiba_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x9a9ce366
 0,          1,          1,        1,   152064, 0xf4639828
 0,          2,          2,        1,   152064, 0x625024a3
diff --git a/tests/ref/fate/h264-conformance-cama1_vtc_c b/tests/ref/fate/h264-conformance-cama1_vtc_c
index eeb66b0e1c..bb863048fe 100644
--- a/tests/ref/fate/h264-conformance-cama1_vtc_c
+++ b/tests/ref/fate/h264-conformance-cama1_vtc_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x41c2ce17
 0,          1,          1,        1,   518400, 0x39f217da
 0,          2,          2,        1,   518400, 0x5a108db9
diff --git a/tests/ref/fate/h264-conformance-cama2_vtc_b b/tests/ref/fate/h264-conformance-cama2_vtc_b
index 0dfe6a9ac3..c5c58a61a0 100644
--- a/tests/ref/fate/h264-conformance-cama2_vtc_b
+++ b/tests/ref/fate/h264-conformance-cama2_vtc_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 0/1
 0,          0,          0,        1,   622080, 0x004bb93f
 0,          1,          1,        1,   622080, 0xe70e193c
 0,          2,          2,        1,   622080, 0xd394cf17
diff --git a/tests/ref/fate/h264-conformance-cama3_sand_e b/tests/ref/fate/h264-conformance-cama3_sand_e
index f89bc40d1f..e1e9784775 100644
--- a/tests/ref/fate/h264-conformance-cama3_sand_e
+++ b/tests/ref/fate/h264-conformance-cama3_sand_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xf772f152
 0,          1,          1,        1,   152064, 0x7c501772
 0,          2,          2,        1,   152064, 0x98ed0a07
diff --git a/tests/ref/fate/h264-conformance-cama3_vtc_b b/tests/ref/fate/h264-conformance-cama3_vtc_b
index 46821c1798..288ddd1961 100644
--- a/tests/ref/fate/h264-conformance-cama3_vtc_b
+++ b/tests/ref/fate/h264-conformance-cama3_vtc_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 0/1
 0,          0,          0,        1,   622080, 0xf3f0bf86
 0,          1,          1,        1,   622080, 0x6aaf3d42
 0,          2,          2,        1,   622080, 0xe53bcd5d
diff --git a/tests/ref/fate/h264-conformance-camaci3_sony_c b/tests/ref/fate/h264-conformance-camaci3_sony_c
index 5896460fe0..9d75d00e4a 100644
--- a/tests/ref/fate/h264-conformance-camaci3_sony_c
+++ b/tests/ref/fate/h264-conformance-camaci3_sony_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x128
+#sar 0: 0/1
 0,          0,          0,        1,    36864, 0x9b5dcf28
 0,          1,          1,        1,    36864, 0xb13d4fee
 0,          2,          2,        1,    36864, 0x11c512ac
diff --git a/tests/ref/fate/h264-conformance-camanl1_toshiba_b b/tests/ref/fate/h264-conformance-camanl1_toshiba_b
index 2c3c557071..a62f917631 100644
--- a/tests/ref/fate/h264-conformance-camanl1_toshiba_b
+++ b/tests/ref/fate/h264-conformance-camanl1_toshiba_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xb1edd842
 0,          1,          1,        1,   152064, 0x551f8f45
 0,          2,          2,        1,   152064, 0xb4931cb2
diff --git a/tests/ref/fate/h264-conformance-camanl2_toshiba_b b/tests/ref/fate/h264-conformance-camanl2_toshiba_b
index 066c57fd30..6a2f321167 100644
--- a/tests/ref/fate/h264-conformance-camanl2_toshiba_b
+++ b/tests/ref/fate/h264-conformance-camanl2_toshiba_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xb1edd842
 0,          1,          1,        1,   152064, 0x551f8f45
 0,          2,          2,        1,   152064, 0xb4931cb2
diff --git a/tests/ref/fate/h264-conformance-camanl3_sand_e b/tests/ref/fate/h264-conformance-camanl3_sand_e
index a76170c757..901e4d0237 100644
--- a/tests/ref/fate/h264-conformance-camanl3_sand_e
+++ b/tests/ref/fate/h264-conformance-camanl3_sand_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x6c1ff6a7
 0,          1,          1,        1,   152064, 0x17f1ff3a
 0,          2,          2,        1,   152064, 0xf7ddcda8
diff --git a/tests/ref/fate/h264-conformance-camasl3_sony_b b/tests/ref/fate/h264-conformance-camasl3_sony_b
index 0cb41e194a..5bb38ab783 100644
--- a/tests/ref/fate/h264-conformance-camasl3_sony_b
+++ b/tests/ref/fate/h264-conformance-camasl3_sony_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x128
+#sar 0: 0/1
 0,          0,          0,        1,    36864, 0xfe2ad849
 0,          1,          1,        1,    36864, 0x37954ba1
 0,          2,          2,        1,    36864, 0xaf0e0877
diff --git a/tests/ref/fate/h264-conformance-camp_mot_mbaff_l30 b/tests/ref/fate/h264-conformance-camp_mot_mbaff_l30
index c4f2782db6..ab02c2b761 100644
--- a/tests/ref/fate/h264-conformance-camp_mot_mbaff_l30
+++ b/tests/ref/fate/h264-conformance-camp_mot_mbaff_l30
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x672279df
 0,          1,          1,        1,   518400, 0xb248a762
 0,          2,          2,        1,   518400, 0x4399de88
diff --git a/tests/ref/fate/h264-conformance-camp_mot_mbaff_l31 b/tests/ref/fate/h264-conformance-camp_mot_mbaff_l31
index 1bee03729a..dc82250f58 100644
--- a/tests/ref/fate/h264-conformance-camp_mot_mbaff_l31
+++ b/tests/ref/fate/h264-conformance-camp_mot_mbaff_l31
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x077637bf
 0,          1,          1,        1,   518400, 0xbd096d55
 0,          2,          2,        1,   518400, 0x58b58820
diff --git a/tests/ref/fate/h264-conformance-canl1_sony_e b/tests/ref/fate/h264-conformance-canl1_sony_e
index d90e95758c..849ccefda5 100644
--- a/tests/ref/fate/h264-conformance-canl1_sony_e
+++ b/tests/ref/fate/h264-conformance-canl1_sony_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xc805351d
 0,          1,          1,        1,    38016, 0x3809fec3
 0,          2,          2,        1,    38016, 0xf698ce3c
diff --git a/tests/ref/fate/h264-conformance-canl1_sva_b b/tests/ref/fate/h264-conformance-canl1_sva_b
index 0436f43ceb..42ed8d74e1 100644
--- a/tests/ref/fate/h264-conformance-canl1_sva_b
+++ b/tests/ref/fate/h264-conformance-canl1_sva_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x0bd22424
 0,          1,          1,        1,    38016, 0x4eb601f0
 0,          2,          2,        1,    38016, 0xe16de459
diff --git a/tests/ref/fate/h264-conformance-canl1_toshiba_g b/tests/ref/fate/h264-conformance-canl1_toshiba_g
index ced4c927e5..73e6b7ebbf 100644
--- a/tests/ref/fate/h264-conformance-canl1_toshiba_g
+++ b/tests/ref/fate/h264-conformance-canl1_toshiba_g
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x58892149
 0,          1,          1,        1,    38016, 0xda2ded74
 0,          2,          2,        1,    38016, 0x2661cdb0
diff --git a/tests/ref/fate/h264-conformance-canl2_sony_e b/tests/ref/fate/h264-conformance-canl2_sony_e
index 9a3b48fa2c..567e35f48b 100644
--- a/tests/ref/fate/h264-conformance-canl2_sony_e
+++ b/tests/ref/fate/h264-conformance-canl2_sony_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xc805351d
 0,          1,          1,        1,    38016, 0x3017107e
 0,          2,          2,        1,    38016, 0xe172e2d2
diff --git a/tests/ref/fate/h264-conformance-canl2_sva_b b/tests/ref/fate/h264-conformance-canl2_sva_b
index 0436f43ceb..42ed8d74e1 100644
--- a/tests/ref/fate/h264-conformance-canl2_sva_b
+++ b/tests/ref/fate/h264-conformance-canl2_sva_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x0bd22424
 0,          1,          1,        1,    38016, 0x4eb601f0
 0,          2,          2,        1,    38016, 0xe16de459
diff --git a/tests/ref/fate/h264-conformance-canl3_sony_c b/tests/ref/fate/h264-conformance-canl3_sony_c
index 2e726cfd71..80d802970f 100644
--- a/tests/ref/fate/h264-conformance-canl3_sony_c
+++ b/tests/ref/fate/h264-conformance-canl3_sony_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xc805351d
 0,          1,          1,        1,    38016, 0xa0b41fef
 0,          2,          2,        1,    38016, 0x965cf070
diff --git a/tests/ref/fate/h264-conformance-canl3_sva_b b/tests/ref/fate/h264-conformance-canl3_sva_b
index dd56a43987..775550ac80 100644
--- a/tests/ref/fate/h264-conformance-canl3_sva_b
+++ b/tests/ref/fate/h264-conformance-canl3_sva_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x0bd22424
 0,          1,          1,        1,    38016, 0xc45d1947
 0,          2,          2,        1,    38016, 0x9d3d1218
diff --git a/tests/ref/fate/h264-conformance-canl4_sva_b b/tests/ref/fate/h264-conformance-canl4_sva_b
index a9a2dd39f4..9945b0bd5b 100644
--- a/tests/ref/fate/h264-conformance-canl4_sva_b
+++ b/tests/ref/fate/h264-conformance-canl4_sva_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x5d9514e3
 0,          1,          1,        1,    38016, 0xf5e8155c
 0,          2,          2,        1,    38016, 0xc0a5f88b
diff --git a/tests/ref/fate/h264-conformance-canlma2_sony_c b/tests/ref/fate/h264-conformance-canlma2_sony_c
index b6a759a73e..ba3e6bd472 100644
--- a/tests/ref/fate/h264-conformance-canlma2_sony_c
+++ b/tests/ref/fate/h264-conformance-canlma2_sony_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xfbca00c6
 0,          1,          1,        1,   518400, 0x82b80adf
 0,          2,          2,        1,   518400, 0x87ecdf4a
diff --git a/tests/ref/fate/h264-conformance-canlma3_sony_c b/tests/ref/fate/h264-conformance-canlma3_sony_c
index 87ce78608d..57dda521b5 100644
--- a/tests/ref/fate/h264-conformance-canlma3_sony_c
+++ b/tests/ref/fate/h264-conformance-canlma3_sony_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xfbca00c6
 0,          1,          1,        1,   518400, 0x82b80adf
 0,          2,          2,        1,   518400, 0x4874c24c
diff --git a/tests/ref/fate/h264-conformance-capa1_toshiba_b b/tests/ref/fate/h264-conformance-capa1_toshiba_b
index a0336f82e5..c88dc547ea 100644
--- a/tests/ref/fate/h264-conformance-capa1_toshiba_b
+++ b/tests/ref/fate/h264-conformance-capa1_toshiba_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x4040d2fc
 0,          1,          1,        1,   152064, 0x0d8f9897
 0,          2,          2,        1,   152064, 0xc23321cd
diff --git a/tests/ref/fate/h264-conformance-capama3_sand_f b/tests/ref/fate/h264-conformance-capama3_sand_f
index b621b8138d..b847b9a2b9 100644
--- a/tests/ref/fate/h264-conformance-capama3_sand_f
+++ b/tests/ref/fate/h264-conformance-capama3_sand_f
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xf772f152
 0,          1,          1,        1,   152064, 0xc416d300
 0,          2,          2,        1,   152064, 0xc2275c94
diff --git a/tests/ref/fate/h264-conformance-capcm1_sand_e b/tests/ref/fate/h264-conformance-capcm1_sand_e
index 392e8b45d3..2987c74403 100644
--- a/tests/ref/fate/h264-conformance-capcm1_sand_e
+++ b/tests/ref/fate/h264-conformance-capcm1_sand_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x9989b588
 0,          1,          1,        1,   152064, 0x7cbf85d4
 0,          2,          2,        1,   152064, 0x72615cf1
diff --git a/tests/ref/fate/h264-conformance-capcmnl1_sand_e b/tests/ref/fate/h264-conformance-capcmnl1_sand_e
index baee0ae12d..d738158192 100644
--- a/tests/ref/fate/h264-conformance-capcmnl1_sand_e
+++ b/tests/ref/fate/h264-conformance-capcmnl1_sand_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xf973b384
 0,          1,          1,        1,   152064, 0x84418532
 0,          2,          2,        1,   152064, 0x63165bc0
diff --git a/tests/ref/fate/h264-conformance-capm3_sony_d b/tests/ref/fate/h264-conformance-capm3_sony_d
index ab2b280c21..72f1e35658 100644
--- a/tests/ref/fate/h264-conformance-capm3_sony_d
+++ b/tests/ref/fate/h264-conformance-capm3_sony_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xa3b72d2f
 0,          1,          1,        1,    38016, 0x77d918ae
 0,          2,          2,        1,    38016, 0x181ad684
diff --git a/tests/ref/fate/h264-conformance-caqp1_sony_b b/tests/ref/fate/h264-conformance-caqp1_sony_b
index beca1c5006..874d6ebc21 100644
--- a/tests/ref/fate/h264-conformance-caqp1_sony_b
+++ b/tests/ref/fate/h264-conformance-caqp1_sony_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x25f92b0e
 0,          1,          1,        1,    38016, 0x2ecbe752
 0,          2,          2,        1,    38016, 0x3432e744
diff --git a/tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b b/tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b
index f80c3be2e5..0ee9a397f5 100644
--- a/tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b
+++ b/tests/ref/fate/h264-conformance-cavlc_mot_fld0_full_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x99d0df36
 0,          1,          1,        1,   518400, 0xa8601c1a
 0,          2,          2,        1,   518400, 0x4a17d235
diff --git a/tests/ref/fate/h264-conformance-cavlc_mot_frm0_full_b b/tests/ref/fate/h264-conformance-cavlc_mot_frm0_full_b
index edee4bfd9b..611ffcd4a8 100644
--- a/tests/ref/fate/h264-conformance-cavlc_mot_frm0_full_b
+++ b/tests/ref/fate/h264-conformance-cavlc_mot_frm0_full_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x21baedbf
 0,          1,          1,        1,   518400, 0x6003273c
 0,          2,          2,        1,   518400, 0x935d45d7
diff --git a/tests/ref/fate/h264-conformance-cavlc_mot_mbaff0_full_b b/tests/ref/fate/h264-conformance-cavlc_mot_mbaff0_full_b
index 7d3ae3ee56..5915f98cdd 100644
--- a/tests/ref/fate/h264-conformance-cavlc_mot_mbaff0_full_b
+++ b/tests/ref/fate/h264-conformance-cavlc_mot_mbaff0_full_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x4cecc821
 0,          1,          1,        1,   518400, 0xee49ea81
 0,          2,          2,        1,   518400, 0x78b0d65f
diff --git a/tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b b/tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b
index ed5e02eee6..c0f6a5ed12 100644
--- a/tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b
+++ b/tests/ref/fate/h264-conformance-cavlc_mot_picaff0_full_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xf6b83a0e
 0,          1,          1,        1,   518400, 0xc5e8b8ee
 0,          2,          2,        1,   518400, 0xb3bc6e43
diff --git a/tests/ref/fate/h264-conformance-cawp1_toshiba_e b/tests/ref/fate/h264-conformance-cawp1_toshiba_e
index e5a6944010..111b2281b7 100644
--- a/tests/ref/fate/h264-conformance-cawp1_toshiba_e
+++ b/tests/ref/fate/h264-conformance-cawp1_toshiba_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xabf9ae05
 0,          1,          1,        1,   152064, 0x20418b16
 0,          2,          2,        1,   152064, 0xc26760ae
diff --git a/tests/ref/fate/h264-conformance-cawp5_toshiba_e b/tests/ref/fate/h264-conformance-cawp5_toshiba_e
index 5b48f8f428..2b055c2723 100644
--- a/tests/ref/fate/h264-conformance-cawp5_toshiba_e
+++ b/tests/ref/fate/h264-conformance-cawp5_toshiba_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xabf9ae05
 0,          1,          1,        1,   152064, 0x20418b16
 0,          2,          2,        1,   152064, 0x20f72775
diff --git a/tests/ref/fate/h264-conformance-ci1_ft_b b/tests/ref/fate/h264-conformance-ci1_ft_b
index 08e40f499d..650d5b5294 100644
--- a/tests/ref/fate/h264-conformance-ci1_ft_b
+++ b/tests/ref/fate/h264-conformance-ci1_ft_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xb291a678
 0,          1,          1,        1,   152064, 0x913c5a5d
 0,          2,          2,        1,   152064, 0x9558a372
diff --git a/tests/ref/fate/h264-conformance-ci_mw_d b/tests/ref/fate/h264-conformance-ci_mw_d
index 7b5a7dc521..275affab24 100644
--- a/tests/ref/fate/h264-conformance-ci_mw_d
+++ b/tests/ref/fate/h264-conformance-ci_mw_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x3ae838ee
 0,          1,          1,        1,    38016, 0x8523e136
 0,          2,          2,        1,    38016, 0xcffc99dd
diff --git a/tests/ref/fate/h264-conformance-cvbs3_sony_c b/tests/ref/fate/h264-conformance-cvbs3_sony_c
index ad7485a80e..7c3ec2657e 100644
--- a/tests/ref/fate/h264-conformance-cvbs3_sony_c
+++ b/tests/ref/fate/h264-conformance-cvbs3_sony_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xb3883478
 0,          1,          1,        1,    38016, 0xddf01d9d
 0,          2,          2,        1,    38016, 0xb177ece2
diff --git a/tests/ref/fate/h264-conformance-cvcanlma2_sony_c b/tests/ref/fate/h264-conformance-cvcanlma2_sony_c
index b6a759a73e..ba3e6bd472 100644
--- a/tests/ref/fate/h264-conformance-cvcanlma2_sony_c
+++ b/tests/ref/fate/h264-conformance-cvcanlma2_sony_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xfbca00c6
 0,          1,          1,        1,   518400, 0x82b80adf
 0,          2,          2,        1,   518400, 0x87ecdf4a
diff --git a/tests/ref/fate/h264-conformance-cvfc1_sony_c b/tests/ref/fate/h264-conformance-cvfc1_sony_c
index 1abe67f3b3..541432d2ef 100644
--- a/tests/ref/fate/h264-conformance-cvfc1_sony_c
+++ b/tests/ref/fate/h264-conformance-cvfc1_sony_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 300x168
+#sar 0: 0/1
 0,          0,          0,        1,    75600, 0x6f6a8c48
 0,          1,          1,        1,    75600, 0x4b7ac558
 0,          2,          2,        1,    75600, 0x907feda3
diff --git a/tests/ref/fate/h264-conformance-cvfi1_sony_d b/tests/ref/fate/h264-conformance-cvfi1_sony_d
index 195c7d6c96..bf998bcf8a 100644
--- a/tests/ref/fate/h264-conformance-cvfi1_sony_d
+++ b/tests/ref/fate/h264-conformance-cvfi1_sony_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xd9444d71
 0,          1,          1,        1,   518400, 0x5d8928cd
 0,          2,          2,        1,   518400, 0xea5bc08b
diff --git a/tests/ref/fate/h264-conformance-cvfi1_sva_c b/tests/ref/fate/h264-conformance-cvfi1_sva_c
index c19bc0d338..55628842f5 100644
--- a/tests/ref/fate/h264-conformance-cvfi1_sva_c
+++ b/tests/ref/fate/h264-conformance-cvfi1_sva_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x8f022263
 0,          1,          1,        1,   518400, 0x02692654
 0,          2,          2,        1,   518400, 0x55eff579
diff --git a/tests/ref/fate/h264-conformance-cvfi2_sony_h b/tests/ref/fate/h264-conformance-cvfi2_sony_h
index 0914e22951..deb9b38ad8 100644
--- a/tests/ref/fate/h264-conformance-cvfi2_sony_h
+++ b/tests/ref/fate/h264-conformance-cvfi2_sony_h
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xd9444d71
 0,          1,          1,        1,   518400, 0x491faf75
 0,          2,          2,        1,   518400, 0xf8b4d15c
diff --git a/tests/ref/fate/h264-conformance-cvfi2_sva_c b/tests/ref/fate/h264-conformance-cvfi2_sva_c
index 7c3162a7e0..e2a0b6da78 100644
--- a/tests/ref/fate/h264-conformance-cvfi2_sva_c
+++ b/tests/ref/fate/h264-conformance-cvfi2_sva_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x4073cc0b
 0,          1,          1,        1,   518400, 0x5f599a48
 0,          2,          2,        1,   518400, 0xc6fe555a
diff --git a/tests/ref/fate/h264-conformance-cvma1_sony_d b/tests/ref/fate/h264-conformance-cvma1_sony_d
index 66852165d4..9a29e30245 100644
--- a/tests/ref/fate/h264-conformance-cvma1_sony_d
+++ b/tests/ref/fate/h264-conformance-cvma1_sony_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x75701511
 0,          1,          1,        1,   518400, 0xa7eeaa16
 0,          2,          2,        1,   518400, 0xe0f32e35
diff --git a/tests/ref/fate/h264-conformance-cvma1_toshiba_b b/tests/ref/fate/h264-conformance-cvma1_toshiba_b
index ab2da4a736..6e854f2c31 100644
--- a/tests/ref/fate/h264-conformance-cvma1_toshiba_b
+++ b/tests/ref/fate/h264-conformance-cvma1_toshiba_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x9a9ce366
 0,          1,          1,        1,   152064, 0xf4639828
 0,          2,          2,        1,   152064, 0x625024a3
diff --git a/tests/ref/fate/h264-conformance-cvmanl1_toshiba_b b/tests/ref/fate/h264-conformance-cvmanl1_toshiba_b
index 2c3c557071..a62f917631 100644
--- a/tests/ref/fate/h264-conformance-cvmanl1_toshiba_b
+++ b/tests/ref/fate/h264-conformance-cvmanl1_toshiba_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xb1edd842
 0,          1,          1,        1,   152064, 0x551f8f45
 0,          2,          2,        1,   152064, 0xb4931cb2
diff --git a/tests/ref/fate/h264-conformance-cvmanl2_toshiba_b b/tests/ref/fate/h264-conformance-cvmanl2_toshiba_b
index 066c57fd30..6a2f321167 100644
--- a/tests/ref/fate/h264-conformance-cvmanl2_toshiba_b
+++ b/tests/ref/fate/h264-conformance-cvmanl2_toshiba_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xb1edd842
 0,          1,          1,        1,   152064, 0x551f8f45
 0,          2,          2,        1,   152064, 0xb4931cb2
diff --git a/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e b/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e
index 094fc9848f..8cc81e62ac 100644
--- a/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e
+++ b/tests/ref/fate/h264-conformance-cvmapaqp3_sony_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x80dffda2
 0,          1,          1,        1,   518400, 0x9450183b
 0,          2,          2,        1,   518400, 0x85d429a7
diff --git a/tests/ref/fate/h264-conformance-cvmaqp2_sony_g b/tests/ref/fate/h264-conformance-cvmaqp2_sony_g
index 886ea4cd3f..a7f3e29887 100644
--- a/tests/ref/fate/h264-conformance-cvmaqp2_sony_g
+++ b/tests/ref/fate/h264-conformance-cvmaqp2_sony_g
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x128
+#sar 0: 0/1
 0,          0,          0,        1,    36864, 0xdee3d4e3
 0,          1,          1,        1,    36864, 0xaa1a67ca
 0,          2,          2,        1,    36864, 0xe00e0dec
diff --git a/tests/ref/fate/h264-conformance-cvmaqp3_sony_d b/tests/ref/fate/h264-conformance-cvmaqp3_sony_d
index 7c3d96dc94..073422c3f9 100644
--- a/tests/ref/fate/h264-conformance-cvmaqp3_sony_d
+++ b/tests/ref/fate/h264-conformance-cvmaqp3_sony_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x128
+#sar 0: 0/1
 0,          0,          0,        1,    36864, 0xdee3d4e3
 0,          1,          1,        1,    36864, 0xabec8d44
 0,          2,          2,        1,    36864, 0x95d029fe
diff --git a/tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b b/tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b
index 57fa2f7690..94d4dff0b1 100644
--- a/tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b
+++ b/tests/ref/fate/h264-conformance-cvmp_mot_fld_l30_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xe9c7643e
 0,          1,          1,        1,   518400, 0xba7456ec
 0,          2,          2,        1,   518400, 0xdeb96749
diff --git a/tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b b/tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b
index bc7e81e36d..fc6b1b7d5e 100644
--- a/tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b
+++ b/tests/ref/fate/h264-conformance-cvmp_mot_frm_l31_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x7b2475e3
 0,          1,          1,        1,   518400, 0xda786a87
 0,          2,          2,        1,   518400, 0xb1dd8108
diff --git a/tests/ref/fate/h264-conformance-cvnlfi1_sony_c b/tests/ref/fate/h264-conformance-cvnlfi1_sony_c
index aa3c220fca..02a6b53752 100644
--- a/tests/ref/fate/h264-conformance-cvnlfi1_sony_c
+++ b/tests/ref/fate/h264-conformance-cvnlfi1_sony_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x0fbb4e71
 0,          1,          1,        1,   518400, 0x4b816734
 0,          2,          2,        1,   518400, 0x0c350f19
diff --git a/tests/ref/fate/h264-conformance-cvnlfi2_sony_h b/tests/ref/fate/h264-conformance-cvnlfi2_sony_h
index fe2e4d14db..c7128ba336 100644
--- a/tests/ref/fate/h264-conformance-cvnlfi2_sony_h
+++ b/tests/ref/fate/h264-conformance-cvnlfi2_sony_h
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x0fbb4e71
 0,          1,          1,        1,   518400, 0xc46bec04
 0,          2,          2,        1,   518400, 0xc50ffc1d
diff --git a/tests/ref/fate/h264-conformance-cvpa1_toshiba_b b/tests/ref/fate/h264-conformance-cvpa1_toshiba_b
index fd0911bb5f..6bf9ee3934 100644
--- a/tests/ref/fate/h264-conformance-cvpa1_toshiba_b
+++ b/tests/ref/fate/h264-conformance-cvpa1_toshiba_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x128cd77a
 0,          1,          1,        1,   152064, 0x565b9fc1
 0,          2,          2,        1,   152064, 0xbe322679
diff --git a/tests/ref/fate/h264-conformance-cvpcmnl1_sva_c b/tests/ref/fate/h264-conformance-cvpcmnl1_sva_c
index 95c99038ae..528d2a5947 100644
--- a/tests/ref/fate/h264-conformance-cvpcmnl1_sva_c
+++ b/tests/ref/fate/h264-conformance-cvpcmnl1_sva_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x19b8407d
 0,          1,          1,        1,   152064, 0xab8bede6
 0,          2,          2,        1,   152064, 0xf59acd09
diff --git a/tests/ref/fate/h264-conformance-cvpcmnl2_sva_c b/tests/ref/fate/h264-conformance-cvpcmnl2_sva_c
index 4f92eab5a3..0303bc24e6 100644
--- a/tests/ref/fate/h264-conformance-cvpcmnl2_sva_c
+++ b/tests/ref/fate/h264-conformance-cvpcmnl2_sva_c
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  1382400, 0xccbe6bf8
 0,          1,          1,        1,  1382400, 0x49c0cfd7
diff --git a/tests/ref/fate/h264-conformance-cvwp1_toshiba_e b/tests/ref/fate/h264-conformance-cvwp1_toshiba_e
index b184c847c7..e7e6ec30c1 100644
--- a/tests/ref/fate/h264-conformance-cvwp1_toshiba_e
+++ b/tests/ref/fate/h264-conformance-cvwp1_toshiba_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xabf9ae05
 0,          1,          1,        1,   152064, 0x20418b16
 0,          2,          2,        1,   152064, 0xe941572f
diff --git a/tests/ref/fate/h264-conformance-cvwp2_toshiba_e b/tests/ref/fate/h264-conformance-cvwp2_toshiba_e
index 627f4b8f24..cd93fbc52d 100644
--- a/tests/ref/fate/h264-conformance-cvwp2_toshiba_e
+++ b/tests/ref/fate/h264-conformance-cvwp2_toshiba_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xf503fb79
 0,          1,          1,        1,   152064, 0xeaa4ba5d
 0,          2,          2,        1,   152064, 0x50865a33
diff --git a/tests/ref/fate/h264-conformance-cvwp3_toshiba_e b/tests/ref/fate/h264-conformance-cvwp3_toshiba_e
index ca3b7b8461..285892ef7a 100644
--- a/tests/ref/fate/h264-conformance-cvwp3_toshiba_e
+++ b/tests/ref/fate/h264-conformance-cvwp3_toshiba_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x3b3ffd31
 0,          1,          1,        1,   152064, 0x14e0b899
 0,          2,          2,        1,   152064, 0x50865a33
diff --git a/tests/ref/fate/h264-conformance-cvwp5_toshiba_e b/tests/ref/fate/h264-conformance-cvwp5_toshiba_e
index 5b48f8f428..2b055c2723 100644
--- a/tests/ref/fate/h264-conformance-cvwp5_toshiba_e
+++ b/tests/ref/fate/h264-conformance-cvwp5_toshiba_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xabf9ae05
 0,          1,          1,        1,   152064, 0x20418b16
 0,          2,          2,        1,   152064, 0x20f72775
diff --git a/tests/ref/fate/h264-conformance-fi1_sony_e b/tests/ref/fate/h264-conformance-fi1_sony_e
index 6b5e0dbd52..c48306679c 100644
--- a/tests/ref/fate/h264-conformance-fi1_sony_e
+++ b/tests/ref/fate/h264-conformance-fi1_sony_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x128
+#sar 0: 0/1
 0,          0,          0,        1,    36864, 0x3d54d3e3
 0,          1,          1,        1,    36864, 0xa9573ef0
 0,          2,          2,        1,    36864, 0x0ea5f263
diff --git a/tests/ref/fate/h264-conformance-frext-alphaconformanceg b/tests/ref/fate/h264-conformance-frext-alphaconformanceg
index dee1c424ff..1e894cfd4b 100644
--- a/tests/ref/fate/h264-conformance-frext-alphaconformanceg
+++ b/tests/ref/fate/h264-conformance-frext-alphaconformanceg
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 960x544
+#sar 0: 0/1
 0,          0,          0,        1,   783360, 0xbc458a9a
 0,          1,          1,        1,   783360, 0xc2b4a765
 0,          2,          2,        1,   783360, 0x40a8ca87
diff --git a/tests/ref/fate/h264-conformance-frext-bcrm_freh10 b/tests/ref/fate/h264-conformance-frext-bcrm_freh10
index 272a4aa235..7592f6c516 100644
--- a/tests/ref/fate/h264-conformance-frext-bcrm_freh10
+++ b/tests/ref/fate/h264-conformance-frext-bcrm_freh10
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xbdc2b880
 0,          1,          1,        1,   152064, 0x4ebf93fe
 0,          2,          2,        1,   152064, 0xe30d6871
diff --git a/tests/ref/fate/h264-conformance-frext-brcm_freh11 b/tests/ref/fate/h264-conformance-frext-brcm_freh11
index 3183c4dd0e..5bb9aa447e 100644
--- a/tests/ref/fate/h264-conformance-frext-brcm_freh11
+++ b/tests/ref/fate/h264-conformance-frext-brcm_freh11
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x9744ac59
 0,          1,          1,        1,   152064, 0x3eba88bf
 0,          2,          2,        1,   152064, 0xd4105c5a
diff --git a/tests/ref/fate/h264-conformance-frext-brcm_freh3 b/tests/ref/fate/h264-conformance-frext-brcm_freh3
index 9a40148572..932354ff47 100644
--- a/tests/ref/fate/h264-conformance-frext-brcm_freh3
+++ b/tests/ref/fate/h264-conformance-frext-brcm_freh3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x9f9caf3c
 0,          1,          1,        1,   152064, 0x4e8e9dc4
 0,          2,          2,        1,   152064, 0x7eab62be
diff --git a/tests/ref/fate/h264-conformance-frext-brcm_freh4 b/tests/ref/fate/h264-conformance-frext-brcm_freh4
index ad3a3ec775..9898def9fd 100644
--- a/tests/ref/fate/h264-conformance-frext-brcm_freh4
+++ b/tests/ref/fate/h264-conformance-frext-brcm_freh4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x9744ac59
 0,          1,          1,        1,   152064, 0xe1c69d97
 0,          2,          2,        1,   152064, 0x9ae85f93
diff --git a/tests/ref/fate/h264-conformance-frext-brcm_freh5 b/tests/ref/fate/h264-conformance-frext-brcm_freh5
index 9057c82fca..10ff8d0c23 100644
--- a/tests/ref/fate/h264-conformance-frext-brcm_freh5
+++ b/tests/ref/fate/h264-conformance-frext-brcm_freh5
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xd816ae9a
 0,          1,          1,        1,   152064, 0x970e9c33
 0,          2,          2,        1,   152064, 0xbdd14635
diff --git a/tests/ref/fate/h264-conformance-frext-brcm_freh8 b/tests/ref/fate/h264-conformance-frext-brcm_freh8
index 4cc7f0e120..552d5e8cec 100644
--- a/tests/ref/fate/h264-conformance-frext-brcm_freh8
+++ b/tests/ref/fate/h264-conformance-frext-brcm_freh8
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xdcc4ac76
 0,          1,          1,        1,   152064, 0xfde6871a
 0,          2,          2,        1,   152064, 0xe8a351b5
diff --git a/tests/ref/fate/h264-conformance-frext-brcm_freh9 b/tests/ref/fate/h264-conformance-frext-brcm_freh9
index 44d5d1a410..77737107d7 100644
--- a/tests/ref/fate/h264-conformance-frext-brcm_freh9
+++ b/tests/ref/fate/h264-conformance-frext-brcm_freh9
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x9f9caf3c
 0,          1,          1,        1,   152064, 0x68f285b1
 0,          2,          2,        1,   152064, 0x28bd4987
diff --git a/tests/ref/fate/h264-conformance-frext-freh12_b b/tests/ref/fate/h264-conformance-frext-freh12_b
index 9455cc2294..e32839f1bd 100644
--- a/tests/ref/fate/h264-conformance-frext-freh12_b
+++ b/tests/ref/fate/h264-conformance-frext-freh12_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x9f9caf3c
 0,          1,          1,        1,   152064, 0x0ff688a6
 0,          2,          2,        1,   152064, 0x247d4215
diff --git a/tests/ref/fate/h264-conformance-frext-freh1_b b/tests/ref/fate/h264-conformance-frext-freh1_b
index c5c0b253a5..8bf4b58c45 100644
--- a/tests/ref/fate/h264-conformance-frext-freh1_b
+++ b/tests/ref/fate/h264-conformance-frext-freh1_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x42a3d9ce
 0,          1,          1,        1,   152064, 0xa95cc2ed
 0,          2,          2,        1,   152064, 0xc48f8fdc
diff --git a/tests/ref/fate/h264-conformance-frext-freh2_b b/tests/ref/fate/h264-conformance-frext-freh2_b
index ff12025d6a..9ba128e973 100644
--- a/tests/ref/fate/h264-conformance-frext-freh2_b
+++ b/tests/ref/fate/h264-conformance-frext-freh2_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x1668b41a
 0,          1,          1,        1,   152064, 0x953ca7fb
 0,          2,          2,        1,   152064, 0x3e38bc6e
diff --git a/tests/ref/fate/h264-conformance-frext-freh6 b/tests/ref/fate/h264-conformance-frext-freh6
index c769038cfd..57ac261800 100644
--- a/tests/ref/fate/h264-conformance-frext-freh6
+++ b/tests/ref/fate/h264-conformance-frext-freh6
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x3b21d6cd
 0,          1,          1,        1,   152064, 0xc32088c6
 0,          2,          2,        1,   152064, 0x65a64cee
diff --git a/tests/ref/fate/h264-conformance-frext-freh7_b b/tests/ref/fate/h264-conformance-frext-freh7_b
index 519c34676e..b078cf1b35 100644
--- a/tests/ref/fate/h264-conformance-frext-freh7_b
+++ b/tests/ref/fate/h264-conformance-frext-freh7_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x89f2e8d5
 0,          1,          1,        1,   152064, 0x35b99397
 0,          2,          2,        1,   152064, 0x6ef46744
diff --git a/tests/ref/fate/h264-conformance-frext-frext01_jvc_d b/tests/ref/fate/h264-conformance-frext-frext01_jvc_d
index b82151e4be..ac992a8c86 100644
--- a/tests/ref/fate/h264-conformance-frext-frext01_jvc_d
+++ b/tests/ref/fate/h264-conformance-frext-frext01_jvc_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x31bc935e
 0,          1,          1,        1,   152064, 0x501ea92a
 0,          2,          2,        1,   152064, 0x8b2f6ead
diff --git a/tests/ref/fate/h264-conformance-frext-frext02_jvc_c b/tests/ref/fate/h264-conformance-frext-frext02_jvc_c
index b82151e4be..ac992a8c86 100644
--- a/tests/ref/fate/h264-conformance-frext-frext02_jvc_c
+++ b/tests/ref/fate/h264-conformance-frext-frext02_jvc_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x31bc935e
 0,          1,          1,        1,   152064, 0x501ea92a
 0,          2,          2,        1,   152064, 0x8b2f6ead
diff --git a/tests/ref/fate/h264-conformance-frext-frext1_panasonic_c b/tests/ref/fate/h264-conformance-frext-frext1_panasonic_c
index 81748f700b..7f3992d967 100644
--- a/tests/ref/fate/h264-conformance-frext-frext1_panasonic_c
+++ b/tests/ref/fate/h264-conformance-frext-frext1_panasonic_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xf9c30518
 0,          1,          1,        1,   152064, 0x509dd18f
 0,          2,          2,        1,   152064, 0x7f5c8f07
diff --git a/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b b/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
index 7c53b5c9ee..76e4d26cf8 100644
--- a/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
+++ b/tests/ref/fate/h264-conformance-frext-frext2_panasonic_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x0147a2a9
 0,          1,          1,        1,   152064, 0xe2365351
 0,          2,          2,        1,   152064, 0xb5f9daee
diff --git a/tests/ref/fate/h264-conformance-frext-frext3_panasonic_d b/tests/ref/fate/h264-conformance-frext-frext3_panasonic_d
index 71b743e576..80ee19ff50 100644
--- a/tests/ref/fate/h264-conformance-frext-frext3_panasonic_d
+++ b/tests/ref/fate/h264-conformance-frext-frext3_panasonic_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xdd346292
 0,          1,          1,        1,   152064, 0xb07e6efd
 0,          2,          2,        1,   152064, 0x81b4d540
diff --git a/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a b/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
index c0886e446d..5640228a26 100644
--- a/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-frext4_panasonic_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xd604d440
 0,          1,          1,        1,   152064, 0x08ef262c
 0,          2,          2,        1,   152064, 0x992fca8e
diff --git a/tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b b/tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b
index a964a38a15..dc783785a5 100644
--- a/tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b
+++ b/tests/ref/fate/h264-conformance-frext-frext_mmco4_sony_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x24846654
 0,          1,          1,        1,   152064, 0xd33945be
 0,          2,          2,        1,   152064, 0x961cbbfb
diff --git a/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b b/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b
index eb41d46955..67badb6c2b 100644
--- a/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b
+++ b/tests/ref/fate/h264-conformance-frext-hcaff1_hhi_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xb055a9bd
 0,          1,          1,        1,   152064, 0x9e1eadb6
 0,          2,          2,        1,   152064, 0x48f117d2
diff --git a/tests/ref/fate/h264-conformance-frext-hcafr1_hhi_c b/tests/ref/fate/h264-conformance-frext-hcafr1_hhi_c
index 285f05760d..7035983a03 100644
--- a/tests/ref/fate/h264-conformance-frext-hcafr1_hhi_c
+++ b/tests/ref/fate/h264-conformance-frext-hcafr1_hhi_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xd48c87b3
 0,          1,          1,        1,   152064, 0xb7a67f8f
 0,          2,          2,        1,   152064, 0x3c3f3c11
diff --git a/tests/ref/fate/h264-conformance-frext-hcafr2_hhi_a b/tests/ref/fate/h264-conformance-frext-hcafr2_hhi_a
index 7149850a7b..4bc95d9032 100644
--- a/tests/ref/fate/h264-conformance-frext-hcafr2_hhi_a
+++ b/tests/ref/fate/h264-conformance-frext-hcafr2_hhi_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xd5448f0e
 0,          1,          1,        1,   152064, 0x93d022ba
 0,          2,          2,        1,   152064, 0x1eaed76e
diff --git a/tests/ref/fate/h264-conformance-frext-hcafr3_hhi_a b/tests/ref/fate/h264-conformance-frext-hcafr3_hhi_a
index 2ec9dce1ad..4fc2d99520 100644
--- a/tests/ref/fate/h264-conformance-frext-hcafr3_hhi_a
+++ b/tests/ref/fate/h264-conformance-frext-hcafr3_hhi_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xd5448f0e
 0,          1,          1,        1,   152064, 0x665e33b5
 0,          2,          2,        1,   152064, 0x6648e99d
diff --git a/tests/ref/fate/h264-conformance-frext-hcafr4_hhi_a b/tests/ref/fate/h264-conformance-frext-hcafr4_hhi_a
index 00af8ff6d3..08146546ff 100644
--- a/tests/ref/fate/h264-conformance-frext-hcafr4_hhi_a
+++ b/tests/ref/fate/h264-conformance-frext-hcafr4_hhi_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xc7d8832d
 0,          1,          1,        1,   152064, 0x8d9ffc59
 0,          2,          2,        1,   152064, 0xaf3ea0d1
diff --git a/tests/ref/fate/h264-conformance-frext-hcamff1_hhi_b b/tests/ref/fate/h264-conformance-frext-hcamff1_hhi_b
index df85212861..a56d7e2931 100644
--- a/tests/ref/fate/h264-conformance-frext-hcamff1_hhi_b
+++ b/tests/ref/fate/h264-conformance-frext-hcamff1_hhi_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x18f494ec
 0,          1,          1,        1,   152064, 0x7515e6d7
 0,          2,          2,        1,   152064, 0xaa8ee665
diff --git a/tests/ref/fate/h264-conformance-frext-hi422fr10_sony_b b/tests/ref/fate/h264-conformance-frext-hi422fr10_sony_b
new file mode 100644
index 0000000000..15dfc4b8db
--- /dev/null
+++ b/tests/ref/fate/h264-conformance-frext-hi422fr10_sony_b
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   202752, 0xffa1c502
+0,          1,          1,        1,   202752, 0x51752f3c
+0,          2,          2,        1,   202752, 0xe683991d
+0,          3,          3,        1,   202752, 0xf70200a4
+0,          4,          4,        1,   202752, 0x1a4d63ef
diff --git a/tests/ref/fate/h264-conformance-frext-hi422fr13_sony_b b/tests/ref/fate/h264-conformance-frext-hi422fr13_sony_b
new file mode 100644
index 0000000000..8758bf5c96
--- /dev/null
+++ b/tests/ref/fate/h264-conformance-frext-hi422fr13_sony_b
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   405504, 0xe0f40e71
+0,          1,          1,        1,   405504, 0x9bdb5900
+0,          2,          2,        1,   405504, 0x527003ca
+0,          3,          3,        1,   405504, 0x1fbf8ba6
+0,          4,          4,        1,   405504, 0x455e2a4e
diff --git a/tests/ref/fate/h264-conformance-frext-hi422fr1_sony_a b/tests/ref/fate/h264-conformance-frext-hi422fr1_sony_a
new file mode 100644
index 0000000000..7db8672bc5
--- /dev/null
+++ b/tests/ref/fate/h264-conformance-frext-hi422fr1_sony_a
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   202752, 0xd5a1e49f
+0,          1,          1,        1,   202752, 0x08352d61
+0,          2,          2,        1,   202752, 0x43f78f47
+0,          3,          3,        1,   202752, 0xfb5910f4
+0,          4,          4,        1,   202752, 0xd98e8739
diff --git a/tests/ref/fate/h264-conformance-frext-hi422fr6_sony_a b/tests/ref/fate/h264-conformance-frext-hi422fr6_sony_a
new file mode 100644
index 0000000000..6d26ee4ff7
--- /dev/null
+++ b/tests/ref/fate/h264-conformance-frext-hi422fr6_sony_a
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+0,          0,          0,        1,   405504, 0x049ab58e
+0,          1,          1,        1,   405504, 0x4f6226cb
+0,          2,          2,        1,   405504, 0xaa5fcb44
+0,          3,          3,        1,   405504, 0xbfc09965
+0,          4,          4,        1,   405504, 0xa30acb90
diff --git a/tests/ref/fate/h264-conformance-frext-hpca_brcm_c b/tests/ref/fate/h264-conformance-frext-hpca_brcm_c
index d608d8950a..2d0cd5ff1d 100644
--- a/tests/ref/fate/h264-conformance-frext-hpca_brcm_c
+++ b/tests/ref/fate/h264-conformance-frext-hpca_brcm_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x995bb4bd
 0,          1,          1,        1,   152064, 0xad287357
 0,          2,          2,        1,   152064, 0x38fa4661
diff --git a/tests/ref/fate/h264-conformance-frext-hpcadq_brcm_b b/tests/ref/fate/h264-conformance-frext-hpcadq_brcm_b
index 49249b3703..0d5794a24b 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcadq_brcm_b
+++ b/tests/ref/fate/h264-conformance-frext-hpcadq_brcm_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xf3c68dea
 0,          1,          1,        1,   152064, 0xf52d483f
 0,          2,          2,        1,   152064, 0x612f1792
diff --git a/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c b/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c
index dbfec436bd..0febed6d6f 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c
+++ b/tests/ref/fate/h264-conformance-frext-hpcafl_bcrm_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x502ec077
 0,          1,          1,        1,   152064, 0x84807243
 0,          2,          2,        1,   152064, 0xd7474a6e
diff --git a/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c b/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c
index 65a366e0cb..9958f1616f 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c
+++ b/tests/ref/fate/h264-conformance-frext-hpcaflnl_bcrm_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x3e39c08b
 0,          1,          1,        1,   152064, 0xabc67990
 0,          2,          2,        1,   152064, 0x19614e74
diff --git a/tests/ref/fate/h264-conformance-frext-hpcalq_brcm_b b/tests/ref/fate/h264-conformance-frext-hpcalq_brcm_b
index 49249b3703..0d5794a24b 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcalq_brcm_b
+++ b/tests/ref/fate/h264-conformance-frext-hpcalq_brcm_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xf3c68dea
 0,          1,          1,        1,   152064, 0xf52d483f
 0,          2,          2,        1,   152064, 0x612f1792
diff --git a/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b b/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b
index a81e91fef8..1b03e88a1f 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b
+++ b/tests/ref/fate/h264-conformance-frext-hpcamapalq_bcrm_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xf8248ceb
 0,          1,          1,        1,   152064, 0xb6204c81
 0,          2,          2,        1,   152064, 0x22fb1737
diff --git a/tests/ref/fate/h264-conformance-frext-hpcamolq_brcm_b b/tests/ref/fate/h264-conformance-frext-hpcamolq_brcm_b
index 00f04fdf61..33e0688491 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcamolq_brcm_b
+++ b/tests/ref/fate/h264-conformance-frext-hpcamolq_brcm_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xac83f54f
 0,          1,          1,        1,   152064, 0x4d673b43
 0,          2,          2,        1,   152064, 0x9050731f
diff --git a/tests/ref/fate/h264-conformance-frext-hpcanl_brcm_c b/tests/ref/fate/h264-conformance-frext-hpcanl_brcm_c
index 23ad267a2d..f3edba19ea 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcanl_brcm_c
+++ b/tests/ref/fate/h264-conformance-frext-hpcanl_brcm_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x2744afa1
 0,          1,          1,        1,   152064, 0x17246583
 0,          2,          2,        1,   152064, 0x501836ed
diff --git a/tests/ref/fate/h264-conformance-frext-hpcaq2lq_brcm_b b/tests/ref/fate/h264-conformance-frext-hpcaq2lq_brcm_b
index 460f86ccac..b0412db847 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcaq2lq_brcm_b
+++ b/tests/ref/fate/h264-conformance-frext-hpcaq2lq_brcm_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x712a2ad3
 0,          1,          1,        1,   152064, 0x83420c9d
 0,          2,          2,        1,   152064, 0xf3d77f46
diff --git a/tests/ref/fate/h264-conformance-frext-hpcv_brcm_a b/tests/ref/fate/h264-conformance-frext-hpcv_brcm_a
index d608d8950a..2d0cd5ff1d 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcv_brcm_a
+++ b/tests/ref/fate/h264-conformance-frext-hpcv_brcm_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x995bb4bd
 0,          1,          1,        1,   152064, 0xad287357
 0,          2,          2,        1,   152064, 0x38fa4661
diff --git a/tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a b/tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a
index dbfec436bd..0febed6d6f 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a
+++ b/tests/ref/fate/h264-conformance-frext-hpcvfl_bcrm_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x502ec077
 0,          1,          1,        1,   152064, 0x84807243
 0,          2,          2,        1,   152064, 0xd7474a6e
diff --git a/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a b/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a
index 65a366e0cb..9958f1616f 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a
+++ b/tests/ref/fate/h264-conformance-frext-hpcvflnl_bcrm_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x3e39c08b
 0,          1,          1,        1,   152064, 0xabc67990
 0,          2,          2,        1,   152064, 0x19614e74
diff --git a/tests/ref/fate/h264-conformance-frext-hpcvmolq_brcm_b b/tests/ref/fate/h264-conformance-frext-hpcvmolq_brcm_b
index 4179ace45f..f7223885df 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcvmolq_brcm_b
+++ b/tests/ref/fate/h264-conformance-frext-hpcvmolq_brcm_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xa18cfb97
 0,          1,          1,        1,   152064, 0x509b54d2
 0,          2,          2,        1,   152064, 0x1ba0fb8e
diff --git a/tests/ref/fate/h264-conformance-frext-hpcvnl_brcm_a b/tests/ref/fate/h264-conformance-frext-hpcvnl_brcm_a
index 23ad267a2d..f3edba19ea 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcvnl_brcm_a
+++ b/tests/ref/fate/h264-conformance-frext-hpcvnl_brcm_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0x2744afa1
 0,          1,          1,        1,   152064, 0x17246583
 0,          2,          2,        1,   152064, 0x501836ed
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i1_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i1_panasonic_a
index 91e343623e..ccd932807a 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i1_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i1_panasonic_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  2764800, 0xcc4df07d
 0,          1,          1,        1,  2764800, 0x85f9e6d4
 0,          2,          2,        1,  2764800, 0x23ffe90d
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i2_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i2_panasonic_a
index 1d6d4b590d..835c495a14 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i2_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i2_panasonic_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  2764800, 0x4f710132
 0,          1,          1,        1,  2764800, 0x57e5b713
 0,          2,          2,        1,  2764800, 0xcca01477
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i3_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i3_panasonic_a
index a09e3973b7..f46dfaa798 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i3_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i3_panasonic_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  2764800, 0xda69f69e
 0,          1,          1,        1,  2764800, 0x29ed832f
 0,          2,          2,        1,  2764800, 0xb3244cc4
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i4_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i4_panasonic_a
index adec6644da..c7dfa8e760 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i4_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i4_panasonic_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  6220800, 0xca2a2a5e
 0,          1,          1,        1,  6220800, 0x8009a65e
 0,          2,          2,        1,  6220800, 0x63e72b3b
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i5_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i5_panasonic_a
index a4751979f5..52b3d242ba 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i5_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i5_panasonic_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  6220800, 0x1df58ce9
 0,          1,          1,        1,  6220800, 0x8f2859ce
 0,          2,          2,        1,  6220800, 0x229cc7ff
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i6_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i6_panasonic_a
index 25d0eec539..d1eaf65e64 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i6_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i6_panasonic_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  6220800, 0x408daf70
 0,          1,          1,        1,  6220800, 0x59b254a3
 0,          2,          2,        1,  6220800, 0x4cf4279c
diff --git a/tests/ref/fate/h264-conformance-frext-pph10i7_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph10i7_panasonic_a
index 1090b49f24..7d55719cf6 100644
--- a/tests/ref/fate/h264-conformance-frext-pph10i7_panasonic_a
+++ b/tests/ref/fate/h264-conformance-frext-pph10i7_panasonic_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  6220800, 0xf81873fe
 0,          1,          1,        1,  6220800, 0x7b96fbdc
 0,          2,          2,        1,  6220800, 0x75dbafc4
diff --git a/tests/ref/fate/h264-conformance-frext-pph422i1_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i1_panasonic_a
new file mode 100644
index 0000000000..3163089a54
--- /dev/null
+++ b/tests/ref/fate/h264-conformance-frext-pph422i1_panasonic_a
@@ -0,0 +1,15 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
+0,          0,          0,        1,  3686400, 0x1f9b5bee
+0,          1,          1,        1,  3686400, 0x657c3609
+0,          2,          2,        1,  3686400, 0x75753934
+0,          3,          3,        1,  3686400, 0xf434d8e1
+0,          4,          4,        1,  3686400, 0x40679c77
+0,          5,          5,        1,  3686400, 0x5734d8db
+0,          6,          6,        1,  3686400, 0x4a3d8269
+0,          7,          7,        1,  3686400, 0xd20b6cf6
+0,          8,          8,        1,  3686400, 0x31956bca
+0,          9,          9,        1,  3686400, 0xd28d9758
diff --git a/tests/ref/fate/h264-conformance-frext-pph422i2_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i2_panasonic_a
new file mode 100644
index 0000000000..faa75cae80
--- /dev/null
+++ b/tests/ref/fate/h264-conformance-frext-pph422i2_panasonic_a
@@ -0,0 +1,15 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
+0,          0,          0,        1,  3686400, 0x8b3ff360
+0,          1,          1,        1,  3686400, 0x422dead1
+0,          2,          2,        1,  3686400, 0xbdd0e431
+0,          3,          3,        1,  3686400, 0x1e3cc216
+0,          4,          4,        1,  3686400, 0x1a80b718
+0,          5,          5,        1,  3686400, 0xc7e3c0a2
+0,          6,          6,        1,  3686400, 0xffc99142
+0,          7,          7,        1,  3686400, 0x8b3bdf1e
+0,          8,          8,        1,  3686400, 0xff1bccfb
+0,          9,          9,        1,  3686400, 0x781fc45b
diff --git a/tests/ref/fate/h264-conformance-frext-pph422i3_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i3_panasonic_a
new file mode 100644
index 0000000000..a9befbda4f
--- /dev/null
+++ b/tests/ref/fate/h264-conformance-frext-pph422i3_panasonic_a
@@ -0,0 +1,15 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
+0,          0,          0,        1,  3686400, 0x97c36ae3
+0,          1,          1,        1,  3686400, 0x6a0aa629
+0,          2,          2,        1,  3686400, 0xc658d722
+0,          3,          3,        1,  3686400, 0x713bc774
+0,          4,          4,        1,  3686400, 0x8d0b3afe
+0,          5,          5,        1,  3686400, 0x62bf24cd
+0,          6,          6,        1,  3686400, 0x77e80436
+0,          7,          7,        1,  3686400, 0x4f258e07
+0,          8,          8,        1,  3686400, 0x8426bc53
+0,          9,          9,        1,  3686400, 0xd33b58c8
diff --git a/tests/ref/fate/h264-conformance-frext-pph422i4_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i4_panasonic_a
new file mode 100644
index 0000000000..6289caa3c8
--- /dev/null
+++ b/tests/ref/fate/h264-conformance-frext-pph422i4_panasonic_a
@@ -0,0 +1,15 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0xf50992f3
+0,          1,          1,        1,  8294400, 0xd34cdf98
+0,          2,          2,        1,  8294400, 0x76bced00
+0,          3,          3,        1,  8294400, 0xf9ffd9b1
+0,          4,          4,        1,  8294400, 0x303231aa
+0,          5,          5,        1,  8294400, 0x0ca57c6a
+0,          6,          6,        1,  8294400, 0xaa056bd5
+0,          7,          7,        1,  8294400, 0x785c9a12
+0,          8,          8,        1,  8294400, 0xe535750e
+0,          9,          9,        1,  8294400, 0x78fd76bb
diff --git a/tests/ref/fate/h264-conformance-frext-pph422i5_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i5_panasonic_a
new file mode 100644
index 0000000000..b187532c47
--- /dev/null
+++ b/tests/ref/fate/h264-conformance-frext-pph422i5_panasonic_a
@@ -0,0 +1,15 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0x96d051a1
+0,          1,          1,        1,  8294400, 0xf3c2974e
+0,          2,          2,        1,  8294400, 0xb18f3ed0
+0,          3,          3,        1,  8294400, 0xb5ba9998
+0,          4,          4,        1,  8294400, 0x96327a34
+0,          5,          5,        1,  8294400, 0xe24d7b61
+0,          6,          6,        1,  8294400, 0xc45d5a16
+0,          7,          7,        1,  8294400, 0x13b4a537
+0,          8,          8,        1,  8294400, 0xa81dae90
+0,          9,          9,        1,  8294400, 0x2820bbe9
diff --git a/tests/ref/fate/h264-conformance-frext-pph422i6_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i6_panasonic_a
new file mode 100644
index 0000000000..817bc9c989
--- /dev/null
+++ b/tests/ref/fate/h264-conformance-frext-pph422i6_panasonic_a
@@ -0,0 +1,15 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0x1b2f1079
+0,          1,          1,        1,  8294400, 0x6646f91c
+0,          2,          2,        1,  8294400, 0x17dc9f51
+0,          3,          3,        1,  8294400, 0x4aad9b3a
+0,          4,          4,        1,  8294400, 0x8a422d34
+0,          5,          5,        1,  8294400, 0x8fd76d87
+0,          6,          6,        1,  8294400, 0xc7c75f18
+0,          7,          7,        1,  8294400, 0x4a1c2643
+0,          8,          8,        1,  8294400, 0xfe225709
+0,          9,          9,        1,  8294400, 0x032ad2e5
diff --git a/tests/ref/fate/h264-conformance-frext-pph422i7_panasonic_a b/tests/ref/fate/h264-conformance-frext-pph422i7_panasonic_a
new file mode 100644
index 0000000000..3219da0ca5
--- /dev/null
+++ b/tests/ref/fate/h264-conformance-frext-pph422i7_panasonic_a
@@ -0,0 +1,15 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0xaa37ceea
+0,          1,          1,        1,  8294400, 0xa7546d5c
+0,          2,          2,        1,  8294400, 0xf2abaace
+0,          3,          3,        1,  8294400, 0x36f4d47e
+0,          4,          4,        1,  8294400, 0x1cdf917d
+0,          5,          5,        1,  8294400, 0xa9377ba3
+0,          6,          6,        1,  8294400, 0x21c9db51
+0,          7,          7,        1,  8294400, 0x07d7936e
+0,          8,          8,        1,  8294400, 0x7878ab94
+0,          9,          9,        1,  8294400, 0x77e40921
diff --git a/tests/ref/fate/h264-conformance-hcbp2_hhi_a b/tests/ref/fate/h264-conformance-hcbp2_hhi_a
index 977107e913..36d39c9cfe 100644
--- a/tests/ref/fate/h264-conformance-hcbp2_hhi_a
+++ b/tests/ref/fate/h264-conformance-hcbp2_hhi_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xf9deb95a
 0,          1,          1,        1,   152064, 0xdce9c541
 0,          2,          2,        1,   152064, 0xc45a8a77
diff --git a/tests/ref/fate/h264-conformance-hcmp1_hhi_a b/tests/ref/fate/h264-conformance-hcmp1_hhi_a
index be619dad71..578f98db14 100644
--- a/tests/ref/fate/h264-conformance-hcmp1_hhi_a
+++ b/tests/ref/fate/h264-conformance-hcmp1_hhi_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   152064, 0xda244f3f
 0,          1,          1,        1,   152064, 0x35a1cb02
 0,          2,          2,        1,   152064, 0xa729d9ca
diff --git a/tests/ref/fate/h264-conformance-ls_sva_d b/tests/ref/fate/h264-conformance-ls_sva_d
index 9d1d219049..d3826abd81 100644
--- a/tests/ref/fate/h264-conformance-ls_sva_d
+++ b/tests/ref/fate/h264-conformance-ls_sva_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x85d20fc6
 0,          1,          1,        1,    38016, 0xc0432c21
 0,          2,          2,        1,    38016, 0x1450168f
diff --git a/tests/ref/fate/h264-conformance-midr_mw_d b/tests/ref/fate/h264-conformance-midr_mw_d
index 51b7c0eed0..3afa65fa48 100644
--- a/tests/ref/fate/h264-conformance-midr_mw_d
+++ b/tests/ref/fate/h264-conformance-midr_mw_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x3ae838ee
 0,          1,          1,        1,    38016, 0x9ed7e141
 0,          2,          2,        1,    38016, 0x393097f9
diff --git a/tests/ref/fate/h264-conformance-mps_mw_a b/tests/ref/fate/h264-conformance-mps_mw_a
index 959a0ae681..ae38cfc31c 100644
--- a/tests/ref/fate/h264-conformance-mps_mw_a
+++ b/tests/ref/fate/h264-conformance-mps_mw_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x06150e88
 0,          1,          1,        1,    38016, 0x32d90103
 0,          2,          2,        1,    38016, 0x5b5f2fae
diff --git a/tests/ref/fate/h264-conformance-mr1_bt_a b/tests/ref/fate/h264-conformance-mr1_bt_a
index 11eb5903fe..273ee0859a 100644
--- a/tests/ref/fate/h264-conformance-mr1_bt_a
+++ b/tests/ref/fate/h264-conformance-mr1_bt_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xc6658719
 0,          1,          1,        1,    38016, 0x8a7c7423
 0,          2,          2,        1,    38016, 0x97e99b66
diff --git a/tests/ref/fate/h264-conformance-mr1_mw_a b/tests/ref/fate/h264-conformance-mr1_mw_a
index da7631d930..7b154ba342 100644
--- a/tests/ref/fate/h264-conformance-mr1_mw_a
+++ b/tests/ref/fate/h264-conformance-mr1_mw_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xc8981780
 0,          1,          1,        1,    38016, 0xf089d880
 0,          2,          2,        1,    38016, 0x5eee0731
diff --git a/tests/ref/fate/h264-conformance-mr2_mw_a b/tests/ref/fate/h264-conformance-mr2_mw_a
index fd4b5d9086..833cea9e44 100644
--- a/tests/ref/fate/h264-conformance-mr2_mw_a
+++ b/tests/ref/fate/h264-conformance-mr2_mw_a
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x06150e88
 0,          1,          1,        1,    38016, 0x32d90103
 0,          2,          2,        1,    38016, 0xb32d338f
diff --git a/tests/ref/fate/h264-conformance-mr2_tandberg_e b/tests/ref/fate/h264-conformance-mr2_tandberg_e
index 8fbac9f652..c0e1d83d09 100644
--- a/tests/ref/fate/h264-conformance-mr2_tandberg_e
+++ b/tests/ref/fate/h264-conformance-mr2_tandberg_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xb96f1feb
 0,          1,          1,        1,    38016, 0xca461abd
 0,          2,          2,        1,    38016, 0x578a0c87
diff --git a/tests/ref/fate/h264-conformance-mr3_tandberg_b b/tests/ref/fate/h264-conformance-mr3_tandberg_b
index ee8014ef36..b0948448cd 100644
--- a/tests/ref/fate/h264-conformance-mr3_tandberg_b
+++ b/tests/ref/fate/h264-conformance-mr3_tandberg_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xb96f1feb
 0,          1,          1,        1,    38016, 0xca461abd
 0,          2,          2,        1,    38016, 0x578a0c87
diff --git a/tests/ref/fate/h264-conformance-mr4_tandberg_c b/tests/ref/fate/h264-conformance-mr4_tandberg_c
index 0d5f646a20..87bcaa42c2 100644
--- a/tests/ref/fate/h264-conformance-mr4_tandberg_c
+++ b/tests/ref/fate/h264-conformance-mr4_tandberg_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xb96f1feb
 0,          1,          1,        1,    38016, 0x0ff111f0
 0,          2,          2,        1,    38016, 0xbac70271
diff --git a/tests/ref/fate/h264-conformance-mr5_tandberg_c b/tests/ref/fate/h264-conformance-mr5_tandberg_c
index 0d5f646a20..87bcaa42c2 100644
--- a/tests/ref/fate/h264-conformance-mr5_tandberg_c
+++ b/tests/ref/fate/h264-conformance-mr5_tandberg_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xb96f1feb
 0,          1,          1,        1,    38016, 0x0ff111f0
 0,          2,          2,        1,    38016, 0xbac70271
diff --git a/tests/ref/fate/h264-conformance-mr6_bt_b b/tests/ref/fate/h264-conformance-mr6_bt_b
index 3b02506562..34aa8bfd46 100644
--- a/tests/ref/fate/h264-conformance-mr6_bt_b
+++ b/tests/ref/fate/h264-conformance-mr6_bt_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x128
+#sar 0: 0/1
 0,          0,          0,        1,    36864, 0x954464be
 0,          1,          1,        1,    36864, 0xace1d90b
 0,          2,          2,        1,    36864, 0x8f149f03
diff --git a/tests/ref/fate/h264-conformance-mr7_bt_b b/tests/ref/fate/h264-conformance-mr7_bt_b
index 25b7054fa8..551767ce1d 100644
--- a/tests/ref/fate/h264-conformance-mr7_bt_b
+++ b/tests/ref/fate/h264-conformance-mr7_bt_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x128
+#sar 0: 0/1
 0,          0,          0,        1,    36864, 0x579e6274
 0,          1,          1,        1,    36864, 0x8650c61c
 0,          2,          2,        1,    36864, 0xbc359647
diff --git a/tests/ref/fate/h264-conformance-mr8_bt_b b/tests/ref/fate/h264-conformance-mr8_bt_b
index 220acf1e5f..7981c42245 100644
--- a/tests/ref/fate/h264-conformance-mr8_bt_b
+++ b/tests/ref/fate/h264-conformance-mr8_bt_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x128
+#sar 0: 0/1
 0,          0,          0,        1,    36864, 0x36df68f4
 0,          1,          1,        1,    36864, 0x52d4c6d9
 0,          2,          2,        1,    36864, 0xad16b0be
diff --git a/tests/ref/fate/h264-conformance-mr9_bt_b b/tests/ref/fate/h264-conformance-mr9_bt_b
index 3744802a6a..bbd90e67f9 100644
--- a/tests/ref/fate/h264-conformance-mr9_bt_b
+++ b/tests/ref/fate/h264-conformance-mr9_bt_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x128
+#sar 0: 0/1
 0,          0,          0,        1,    36864, 0xb4c5642e
 0,          1,          1,        1,    36864, 0x929fd05f
 0,          2,          2,        1,    36864, 0x447c9b69
diff --git a/tests/ref/fate/h264-conformance-mv1_brcm_d b/tests/ref/fate/h264-conformance-mv1_brcm_d
index 47517ee3c6..a3ab27b08f 100644
--- a/tests/ref/fate/h264-conformance-mv1_brcm_d
+++ b/tests/ref/fate/h264-conformance-mv1_brcm_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0x230d7aa6
 0,          1,          1,        1,   518400, 0x9fc976e0
 0,          2,          2,        1,   518400, 0x51052db9
diff --git a/tests/ref/fate/h264-conformance-nl1_sony_d b/tests/ref/fate/h264-conformance-nl1_sony_d
index 98a56737bc..d6e0df92a6 100644
--- a/tests/ref/fate/h264-conformance-nl1_sony_d
+++ b/tests/ref/fate/h264-conformance-nl1_sony_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xc805351d
 0,          1,          1,        1,    38016, 0x3809fec3
 0,          2,          2,        1,    38016, 0xf698ce3c
diff --git a/tests/ref/fate/h264-conformance-nl2_sony_h b/tests/ref/fate/h264-conformance-nl2_sony_h
index 73eb8581ea..1e7bfb3dff 100644
--- a/tests/ref/fate/h264-conformance-nl2_sony_h
+++ b/tests/ref/fate/h264-conformance-nl2_sony_h
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xc805351d
 0,          1,          1,        1,    38016, 0x320510a8
 0,          2,          2,        1,    38016, 0x3ef6e4c6
diff --git a/tests/ref/fate/h264-conformance-nl3_sva_e b/tests/ref/fate/h264-conformance-nl3_sva_e
index a4d6db670a..a09e083308 100644
--- a/tests/ref/fate/h264-conformance-nl3_sva_e
+++ b/tests/ref/fate/h264-conformance-nl3_sva_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x2fad15e2
 0,          1,          1,        1,    38016, 0x7e391566
 0,          2,          2,        1,    38016, 0x954001d4
diff --git a/tests/ref/fate/h264-conformance-nlmq1_jvc_c b/tests/ref/fate/h264-conformance-nlmq1_jvc_c
index 30301256f9..dbcdcdf388 100644
--- a/tests/ref/fate/h264-conformance-nlmq1_jvc_c
+++ b/tests/ref/fate/h264-conformance-nlmq1_jvc_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xde1a2194
 0,          1,          1,        1,    38016, 0x2957f3e5
 0,          2,          2,        1,    38016, 0x9df4c6cf
diff --git a/tests/ref/fate/h264-conformance-nlmq2_jvc_c b/tests/ref/fate/h264-conformance-nlmq2_jvc_c
index 5258eb2646..8dc6285a87 100644
--- a/tests/ref/fate/h264-conformance-nlmq2_jvc_c
+++ b/tests/ref/fate/h264-conformance-nlmq2_jvc_c
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xde1a2194
 0,          1,          1,        1,    38016, 0x8b6cf842
 0,          2,          2,        1,    38016, 0x6dc7c88b
diff --git a/tests/ref/fate/h264-conformance-nrf_mw_e b/tests/ref/fate/h264-conformance-nrf_mw_e
index ee5f7193a0..b68a6a79f4 100644
--- a/tests/ref/fate/h264-conformance-nrf_mw_e
+++ b/tests/ref/fate/h264-conformance-nrf_mw_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x3ae838ee
 0,          1,          1,        1,    38016, 0x9ed7e141
 0,          2,          2,        1,    38016, 0x354e83ed
diff --git a/tests/ref/fate/h264-conformance-sharp_mp_field_1_b b/tests/ref/fate/h264-conformance-sharp_mp_field_1_b
index 8512102bb3..cdabcceca6 100644
--- a/tests/ref/fate/h264-conformance-sharp_mp_field_1_b
+++ b/tests/ref/fate/h264-conformance-sharp_mp_field_1_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xc93c7c47
 0,          1,          1,        1,   518400, 0xa3f2e502
 0,          2,          2,        1,   518400, 0xb98920a4
diff --git a/tests/ref/fate/h264-conformance-sharp_mp_field_2_b b/tests/ref/fate/h264-conformance-sharp_mp_field_2_b
index 5808141891..0574f8ff87 100644
--- a/tests/ref/fate/h264-conformance-sharp_mp_field_2_b
+++ b/tests/ref/fate/h264-conformance-sharp_mp_field_2_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xc93c7c47
 0,          1,          1,        1,   518400, 0xf0c4b44a
 0,          2,          2,        1,   518400, 0x3f5dc91c
diff --git a/tests/ref/fate/h264-conformance-sharp_mp_field_3_b b/tests/ref/fate/h264-conformance-sharp_mp_field_3_b
index a572030f02..6a92245f2f 100644
--- a/tests/ref/fate/h264-conformance-sharp_mp_field_3_b
+++ b/tests/ref/fate/h264-conformance-sharp_mp_field_3_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xc93c7c47
 0,          1,          1,        1,   518400, 0x7112ac25
 0,          2,          2,        1,   518400, 0x28bc28d2
diff --git a/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2 b/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2
index d1a347ff26..8a7aa249f6 100644
--- a/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2
+++ b/tests/ref/fate/h264-conformance-sharp_mp_paff_1r2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xc93c7c47
 0,          1,          1,        1,   518400, 0xfb452a9c
 0,          2,          2,        1,   518400, 0x2f7a35bd
diff --git a/tests/ref/fate/h264-conformance-sharp_mp_paff_2r b/tests/ref/fate/h264-conformance-sharp_mp_paff_2r
index f2bf06f6ff..ded91a9bed 100644
--- a/tests/ref/fate/h264-conformance-sharp_mp_paff_2r
+++ b/tests/ref/fate/h264-conformance-sharp_mp_paff_2r
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,   518400, 0xc93c7c47
 0,          1,          1,        1,   518400, 0xfb452a9c
 0,          2,          2,        1,   518400, 0x2f7a35bd
diff --git a/tests/ref/fate/h264-conformance-sl1_sva_b b/tests/ref/fate/h264-conformance-sl1_sva_b
index a2f16b4b6e..572d5a0f8e 100644
--- a/tests/ref/fate/h264-conformance-sl1_sva_b
+++ b/tests/ref/fate/h264-conformance-sl1_sva_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x666c110c
 0,          1,          1,        1,    38016, 0xc87421f6
 0,          2,          2,        1,    38016, 0x1b74033d
diff --git a/tests/ref/fate/h264-conformance-sva_ba1_b b/tests/ref/fate/h264-conformance-sva_ba1_b
index cc55ac9dbb..6b383486b9 100644
--- a/tests/ref/fate/h264-conformance-sva_ba1_b
+++ b/tests/ref/fate/h264-conformance-sva_ba1_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x359316a1
 0,          1,          1,        1,    38016, 0xd5fafa54
 0,          2,          2,        1,    38016, 0xea99e9be
diff --git a/tests/ref/fate/h264-conformance-sva_ba2_d b/tests/ref/fate/h264-conformance-sva_ba2_d
index b94086f9e4..7c5ec98bca 100644
--- a/tests/ref/fate/h264-conformance-sva_ba2_d
+++ b/tests/ref/fate/h264-conformance-sva_ba2_d
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x359316a1
 0,          1,          1,        1,    38016, 0xd7bb1285
 0,          2,          2,        1,    38016, 0x3c36059f
diff --git a/tests/ref/fate/h264-conformance-sva_base_b b/tests/ref/fate/h264-conformance-sva_base_b
index 30663ff4e7..3ed51fd685 100644
--- a/tests/ref/fate/h264-conformance-sva_base_b
+++ b/tests/ref/fate/h264-conformance-sva_base_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x1c131302
 0,          1,          1,        1,    38016, 0xbbca0c4f
 0,          2,          2,        1,    38016, 0x81f5fd7b
diff --git a/tests/ref/fate/h264-conformance-sva_cl1_e b/tests/ref/fate/h264-conformance-sva_cl1_e
index 27cba6d9be..2f32114eb5 100644
--- a/tests/ref/fate/h264-conformance-sva_cl1_e
+++ b/tests/ref/fate/h264-conformance-sva_cl1_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x6811161f
 0,          1,          1,        1,    38016, 0x243a0d4e
 0,          2,          2,        1,    38016, 0x0bc700de
diff --git a/tests/ref/fate/h264-conformance-sva_fm1_e b/tests/ref/fate/h264-conformance-sva_fm1_e
index 0e5f3e0082..52ed49baf8 100644
--- a/tests/ref/fate/h264-conformance-sva_fm1_e
+++ b/tests/ref/fate/h264-conformance-sva_fm1_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0x1c131302
 0,          1,          1,        1,    38016, 0x89dd0c15
 0,          2,          2,        1,    38016, 0xaf7700bd
diff --git a/tests/ref/fate/h264-conformance-sva_nl1_b b/tests/ref/fate/h264-conformance-sva_nl1_b
index f2033d8693..c59aa2c885 100644
--- a/tests/ref/fate/h264-conformance-sva_nl1_b
+++ b/tests/ref/fate/h264-conformance-sva_nl1_b
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xb9ac19bd
 0,          1,          1,        1,    38016, 0x3898fc35
 0,          2,          2,        1,    38016, 0xf6f4ed19
diff --git a/tests/ref/fate/h264-conformance-sva_nl2_e b/tests/ref/fate/h264-conformance-sva_nl2_e
index 1770eff2db..5f8006b937 100644
--- a/tests/ref/fate/h264-conformance-sva_nl2_e
+++ b/tests/ref/fate/h264-conformance-sva_nl2_e
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    38016, 0xb9ac19bd
 0,          1,          1,        1,    38016, 0x53c91566
 0,          2,          2,        1,    38016, 0xb5bd089f
diff --git a/tests/ref/fate/h264-crop-to-container b/tests/ref/fate/h264-crop-to-container
index 5dfa44157c..855c93dd8b 100644
--- a/tests/ref/fate/h264-crop-to-container
+++ b/tests/ref/fate/h264-crop-to-container
@@ -1,2 +1,10 @@
-#tb 0: 1/30000
-0,          0,          0,        0,  3110400, 43a312e1eebc7dca1bd23456302a44e3
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,  3110400, 43a312e1eebc7dca1bd23456302a44e3
diff --git a/tests/ref/fate/h264-direct-bff b/tests/ref/fate/h264-direct-bff
index c61fd0ca4e..802733ebad 100644
--- a/tests/ref/fate/h264-direct-bff
+++ b/tests/ref/fate/h264-direct-bff
@@ -1,12 +1,16 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   522720, 0x1ccad503
-0,         33,         33,        0,   522720, 0xd266d6e8
-0,         67,         67,        0,   522720, 0x535473b3
-0,        100,        100,        0,   522720, 0xf8b53c53
-0,        133,        133,        0,   522720, 0x4e4cc04b
-0,        167,        167,        0,   522720, 0x20ea3515
-0,        200,        200,        0,   522720, 0xb9c67e30
-0,        233,        233,        0,   522720, 0x03d2e35a
-0,        267,        267,        0,   522720, 0xae2e7896
-0,        300,        300,        0,   522720, 0x6da37f41
-0,        400,        400,        0,   522720, 0x7caf4954
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x484
+#sar 0: 1/1
+0,          0,          0,        1,   522720, 0x1ccad503
+0,          1,          1,        1,   522720, 0xd266d6e8
+0,          2,          2,        1,   522720, 0x535473b3
+0,          3,          3,        1,   522720, 0xf8b53c53
+0,          4,          4,        1,   522720, 0x4e4cc04b
+0,          5,          5,        1,   522720, 0x20ea3515
+0,          6,          6,        1,   522720, 0xb9c67e30
+0,          7,          7,        1,   522720, 0x03d2e35a
+0,          8,          8,        1,   522720, 0xae2e7896
+0,          9,          9,        1,   522720, 0x6da37f41
+0,         12,         12,        1,   522720, 0x7caf4954
diff --git a/tests/ref/fate/h264-dts_5frames b/tests/ref/fate/h264-dts_5frames
new file mode 100644
index 0000000000..6049b9ff32
--- /dev/null
+++ b/tests/ref/fate/h264-dts_5frames
@@ -0,0 +1,150 @@
+[FRAME]
+media_type=video
+stream_index=0
+key_frame=1
+pkt_pts=0
+pkt_pts_time=0.000000
+pkt_dts=0
+pkt_dts_time=0.000000
+best_effort_timestamp=0
+best_effort_timestamp_time=0.000000
+pkt_duration=166
+pkt_duration_time=0.166000
+pkt_pos=651
+pkt_size=14428
+width=512
+height=256
+pix_fmt=yuv420p
+sample_aspect_ratio=1:1
+pict_type=I
+coded_picture_number=0
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=left
+[/FRAME]
+[FRAME]
+media_type=video
+stream_index=0
+key_frame=0
+pkt_pts=167
+pkt_pts_time=0.167000
+pkt_dts=167
+pkt_dts_time=0.167000
+best_effort_timestamp=167
+best_effort_timestamp_time=0.167000
+pkt_duration=166
+pkt_duration_time=0.166000
+pkt_pos=15085
+pkt_size=11
+width=512
+height=256
+pix_fmt=yuv420p
+sample_aspect_ratio=1:1
+pict_type=P
+coded_picture_number=1
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=left
+[/FRAME]
+[FRAME]
+media_type=video
+stream_index=0
+key_frame=0
+pkt_pts=333
+pkt_pts_time=0.333000
+pkt_dts=333
+pkt_dts_time=0.333000
+best_effort_timestamp=333
+best_effort_timestamp_time=0.333000
+pkt_duration=166
+pkt_duration_time=0.166000
+pkt_pos=15102
+pkt_size=11
+width=512
+height=256
+pix_fmt=yuv420p
+sample_aspect_ratio=1:1
+pict_type=P
+coded_picture_number=2
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=left
+[/FRAME]
+[FRAME]
+media_type=video
+stream_index=0
+key_frame=0
+pkt_pts=500
+pkt_pts_time=0.500000
+pkt_dts=500
+pkt_dts_time=0.500000
+best_effort_timestamp=500
+best_effort_timestamp_time=0.500000
+pkt_duration=166
+pkt_duration_time=0.166000
+pkt_pos=15119
+pkt_size=11
+width=512
+height=256
+pix_fmt=yuv420p
+sample_aspect_ratio=1:1
+pict_type=P
+coded_picture_number=3
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=left
+[/FRAME]
+[FRAME]
+media_type=video
+stream_index=0
+key_frame=0
+pkt_pts=667
+pkt_pts_time=0.667000
+pkt_dts=667
+pkt_dts_time=0.667000
+best_effort_timestamp=667
+best_effort_timestamp_time=0.667000
+pkt_duration=166
+pkt_duration_time=0.166000
+pkt_pos=15136
+pkt_size=11
+width=512
+height=256
+pix_fmt=yuv420p
+sample_aspect_ratio=1:1
+pict_type=P
+coded_picture_number=4
+display_picture_number=0
+interlaced_frame=0
+top_field_first=0
+repeat_pict=0
+color_range=unknown
+color_space=unknown
+color_primaries=unknown
+color_transfer=unknown
+chroma_location=left
+[/FRAME]
diff --git a/tests/ref/fate/h264-extradata-reload b/tests/ref/fate/h264-extradata-reload
index 53e47aa296..c70f805687 100644
--- a/tests/ref/fate/h264-extradata-reload
+++ b/tests/ref/fate/h264-extradata-reload
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x128
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    49152, ae09c88e87e3ea0aa8ad267ee91222e5
 0,          1,          1,        1,    49152, 7ccd8321a6e23ae1f82bd323c8376524
 0,          2,          2,        1,    49152, 8ed93ab585ff9848801cc28b75b5e12d
diff --git a/tests/ref/fate/h264-extreme-plane-pred b/tests/ref/fate/h264-extreme-plane-pred
index db85e99bbb..2940ec00c9 100644
--- a/tests/ref/fate/h264-extreme-plane-pred
+++ b/tests/ref/fate/h264-extreme-plane-pred
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,   152064, 1e857d2dfeea75297e090ffe9e37a249
 0,          1,          1,        1,   152064, 29d8336b4e9b77298025074dbad641d1
 0,          2,          2,        1,   152064, 3f1a87d2088a7708f4ed06890c8cd018
diff --git a/tests/ref/fate/h264-interlace-crop b/tests/ref/fate/h264-interlace-crop
index 81b979ca39..8dc73084c3 100644
--- a/tests/ref/fate/h264-interlace-crop
+++ b/tests/ref/fate/h264-interlace-crop
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x360
+#sar 0: 1/1
 0,          0,          0,        1,   345600, 0xa9cb7e5a
 0,          1,          1,        1,   345600, 0x73e47555
 0,          2,          2,        1,   345600, 0x87aac593
diff --git a/tests/ref/fate/h264-intra-refresh-recovery b/tests/ref/fate/h264-intra-refresh-recovery
index 4803900bbb..e85fe7bae8 100644
--- a/tests/ref/fate/h264-intra-refresh-recovery
+++ b/tests/ref/fate/h264-intra-refresh-recovery
@@ -1,11 +1,15 @@
 #tb 0: 1/25
-0,          0,          0,        1,   115200, 0x5825f1b3
-0,          1,          1,        1,   115200, 0xa6e2f328
-0,          2,          2,        1,   115200, 0xcd88e49e
-0,          3,          3,        1,   115200, 0x4a17d50b
-0,          4,          4,        1,   115200, 0x1283d05b
-0,          5,          5,        1,   115200, 0x2747c650
-0,          6,          6,        1,   115200, 0xba23c933
-0,          7,          7,        1,   115200, 0x8a96c54b
-0,          8,          8,        1,   115200, 0x748ac6d3
-0,          9,          9,        1,   115200, 0x719ca491
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+0,         57,         57,        1,   115200, 0x4a17d50b
+0,         58,         58,        1,   115200, 0x1283d05b
+0,         59,         59,        1,   115200, 0x2747c650
+0,         60,         60,        1,   115200, 0xba23c933
+0,         61,         61,        1,   115200, 0x8a96c54b
+0,         62,         62,        1,   115200, 0x748ac6d3
+0,         63,         63,        1,   115200, 0x719ca491
+0,         64,         64,        1,   115200, 0x3d259d4d
+0,         65,         65,        1,   115200, 0xe3599aa8
+0,         66,         66,        1,   115200, 0x6fd4affe
diff --git a/tests/ref/fate/h264-invalid-ref-mod b/tests/ref/fate/h264-invalid-ref-mod
index 75bd2296e8..520cb10ad4 100644
--- a/tests/ref/fate/h264-invalid-ref-mod
+++ b/tests/ref/fate/h264-invalid-ref-mod
@@ -1,11 +1,15 @@
-#tb 0: 1/24000
-0,        519,        519,        0,  6220800, 0x89daa15e
-0,       1520,       1520,        0,  6220800, 0xcf52e254
-0,       2521,       2521,        0,  6220800, 0x91132c13
-0,       3522,       3522,        0,  6220800, 0x37b8be91
-0,       4523,       4523,        0,  6220800, 0x2b09bafa
-0,       5524,       5524,        0,  6220800, 0x06d79d8d
-0,       6525,       6525,        0,  6220800, 0x8e793c1d
-0,       7526,       7526,        0,  6220800, 0xea0fd885
-0,       8527,       8527,        0,  6220800, 0x7786a2ad
-0,       9528,       9528,        0,  6220800, 0xed4f9dd9
+#tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
+0,          0,          0,        1,  6220800, 0x89daa15e
+0,          1,          1,        1,  6220800, 0xcf52e254
+0,          2,          2,        1,  6220800, 0x91132c13
+0,          3,          3,        1,  6220800, 0x37b8be91
+0,          4,          4,        1,  6220800, 0x2b09bafa
+0,          5,          5,        1,  6220800, 0x06d79d8d
+0,          6,          6,        1,  6220800, 0x8e793c1d
+0,          7,          7,        1,  6220800, 0xea0fd885
+0,          8,          8,        1,  6220800, 0x7786a2ad
+0,          9,          9,        1,  6220800, 0xed4f9dd9
diff --git a/tests/ref/fate/h264-lossless b/tests/ref/fate/h264-lossless
index 11cc4d0898..9c86db8ccd 100644
--- a/tests/ref/fate/h264-lossless
+++ b/tests/ref/fate/h264-lossless
@@ -1,11 +1,15 @@
-#tb 0: 1/25
+#tb 0: 83333/5000000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   460800, 0x7731dd2f
-0,          1,          1,        1,   460800, 0x944b8c64
-0,          2,          2,        1,   460800, 0xbe833041
-0,          3,          3,        1,   460800, 0xbe95d96a
-0,          4,          4,        1,   460800, 0xfe7ea5e6
-0,          5,          5,        1,   460800, 0x381743c7
-0,          6,          6,        1,   460800, 0x63fcc2e9
-0,          7,          7,        1,   460800, 0x79574960
-0,          8,          8,        1,   460800, 0xdab9e18a
-0,          9,          9,        1,   460800, 0xd88e8fe8
+0,          2,          2,        1,   460800, 0x944b8c64
+0,          3,          3,        1,   460800, 0xbe833041
+0,          4,          4,        1,   460800, 0xbe95d96a
+0,          5,          5,        1,   460800, 0xfe7ea5e6
+0,          6,          6,        1,   460800, 0x381743c7
+0,          7,          7,        1,   460800, 0x63fcc2e9
+0,          8,          8,        1,   460800, 0x79574960
+0,          9,          9,        1,   460800, 0xdab9e18a
+0,         10,         10,        1,   460800, 0xd88e8fe8
diff --git a/tests/ref/fate/h264-missing-frame b/tests/ref/fate/h264-missing-frame
index 61c5f2fab5..04d229913d 100644
--- a/tests/ref/fate/h264-missing-frame
+++ b/tests/ref/fate/h264-missing-frame
@@ -1,4 +1,8 @@
-#tb 0: 1/25
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1440x1080
+#sar 0: 1/1
 0,          0,          0,        1,  2332800, 0x009dacb8
 0,          1,          1,        1,  2332800, 0xb1e50764
 0,          2,          2,        1,  2332800, 0xe29481e0
diff --git a/tests/ref/fate/h264-mixed-nal-coding b/tests/ref/fate/h264-mixed-nal-coding
index 6bebce6b6a..24b6b4cb56 100644
--- a/tests/ref/fate/h264-mixed-nal-coding
+++ b/tests/ref/fate/h264-mixed-nal-coding
@@ -1,6 +1,10 @@
-#tb 0: 1/30000
-0,          0,          0,        0,   518400, 0x8f882e4d
-0,       1001,       1001,        0,   518400, 0xc5694144
-0,       2002,       2002,        0,   518400, 0xcf0e9e3a
-0,       3003,       3003,        0,   518400, 0xf620e459
-0,       4004,       4004,        0,   518400, 0x4566453e
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 40/33
+0,          0,          0,        1,   518400, 0x8f882e4d
+0,          1,          1,        1,   518400, 0xc5694144
+0,          2,          2,        1,   518400, 0xcf0e9e3a
+0,          3,          3,        1,   518400, 0xf620e459
+0,          4,          4,        1,   518400, 0x4566453e
diff --git a/tests/ref/fate/h264-reinit-large_420_8-to-small_420_8 b/tests/ref/fate/h264-reinit-large_420_8-to-small_420_8
index 85188558ea..2c28386f93 100644
--- a/tests/ref/fate/h264-reinit-large_420_8-to-small_420_8
+++ b/tests/ref/fate/h264-reinit-large_420_8-to-small_420_8
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   608256, 0x65574c43
 0,          1,          1,        1,   608256, 0x5e5a1aa4
 0,          2,          2,        1,   608256, 0xa9a5cbc5
diff --git a/tests/ref/fate/h264-reinit-small_420_8-to-large_444_10 b/tests/ref/fate/h264-reinit-small_420_8-to-large_444_10
index 7e7631ae1e..e727d07f79 100644
--- a/tests/ref/fate/h264-reinit-small_420_8-to-large_444_10
+++ b/tests/ref/fate/h264-reinit-small_420_8-to-large_444_10
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   608256, 0x27a069a3
 0,          1,          1,        1,   608256, 0x22a5ff96
 0,          2,          2,        1,   608256, 0x29ad753f
diff --git a/tests/ref/fate/h264-reinit-small_420_9-to-small_420_8 b/tests/ref/fate/h264-reinit-small_420_9-to-small_420_8
index 662db29258..9b3d114c3c 100644
--- a/tests/ref/fate/h264-reinit-small_420_9-to-small_420_8
+++ b/tests/ref/fate/h264-reinit-small_420_9-to-small_420_8
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   608256, 0xee06377f
 0,          1,          1,        1,   608256, 0x9c22c5ee
 0,          2,          2,        1,   608256, 0x322abee2
diff --git a/tests/ref/fate/h264-reinit-small_422_9-to-small_420_9 b/tests/ref/fate/h264-reinit-small_422_9-to-small_420_9
index b5a95052ab..15115b627b 100644
--- a/tests/ref/fate/h264-reinit-small_422_9-to-small_420_9
+++ b/tests/ref/fate/h264-reinit-small_422_9-to-small_420_9
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
 0,          0,          0,        1,   608256, 0x3aef31f3
 0,          1,          1,        1,   608256, 0x05afe4e8
 0,          2,          2,        1,   608256, 0x9d7dc9b1
diff --git a/tests/ref/fate/h264-skip-nointra b/tests/ref/fate/h264-skip-nointra
new file mode 100644
index 0000000000..0259902927
--- /dev/null
+++ b/tests/ref/fate/h264-skip-nointra
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
+#tb 1: 1/48000
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+1,          0,          0,     1152,     4608, 0x00000000
+1,       1152,       1152,     1152,     4608, 0x00000000
+1,       2304,       2304,     1152,     4608, 0x00000000
+1,       3456,       3456,     1152,     4608, 0x00000000
+1,       4608,       4608,     1152,     4608, 0x00000000
+1,       5760,       5760,     1152,     4608, 0x00000000
+1,       6912,       6912,     1152,     4608, 0x00000000
+1,       8064,       8064,     1152,     4608, 0x00000000
+1,       9216,       9216,     1152,     4608, 0x00000000
+1,      10368,      10368,     1152,     4608, 0x00000000
+1,      11520,      11520,     1152,     4608, 0x00000000
+1,      12672,      12672,     1152,     4608, 0x00000000
+1,      13824,      13824,     1152,     4608, 0x00000000
+1,      14976,      14976,     1152,     4608, 0x00000000
+1,      16128,      16128,     1152,     4608, 0x00000000
+1,      17280,      17280,     1152,     4608, 0x00000000
+1,      18432,      18432,     1152,     4608, 0x00000000
+1,      19584,      19584,     1152,     4608, 0x00000000
+1,      20736,      20736,     1152,     4608, 0x00000000
+1,      21888,      21888,     1152,     4608, 0x00000000
+1,      23040,      23040,     1152,     4608, 0x00000000
+1,      24192,      24192,     1152,     4608, 0x00000000
+1,      25344,      25344,     1152,     4608, 0x00000000
+1,      26496,      26496,     1152,     4608, 0x00000000
+1,      27648,      27648,     1152,     4608, 0x00000000
+1,      28800,      28800,     1152,     4608, 0x00000000
+1,      29952,      29952,     1152,     4608, 0x00000000
+1,      31104,      31104,     1152,     4608, 0x00000000
+1,      32256,      32256,     1152,     4608, 0x00000000
+1,      33408,      33408,     1152,     4608, 0x00000000
+1,      34560,      34560,     1152,     4608, 0x00000000
+1,      35712,      35712,     1152,     4608, 0x00000000
+1,      36864,      36864,     1152,     4608, 0x00000000
+1,      38016,      38016,     1152,     4608, 0x00000000
+1,      39168,      39168,     1152,     4608, 0x00000000
+1,      40320,      40320,     1152,     4608, 0x00000000
+1,      41472,      41472,     1152,     4608, 0x00000000
+1,      42624,      42624,     1152,     4608, 0x00000000
+1,      43776,      43776,     1152,     4608, 0x00000000
+1,      44928,      44928,     1152,     4608, 0x00000000
+1,      46080,      46080,     1152,     4608, 0x00000000
+1,      47232,      47232,     1152,     4608, 0x00000000
+1,      48384,      48384,     1152,     4608, 0x9eca8b7c
+0,         45,         45,        1,  3110400, 0xa426f15d
diff --git a/tests/ref/fate/h264-skip-nokey b/tests/ref/fate/h264-skip-nokey
new file mode 100644
index 0000000000..0259902927
--- /dev/null
+++ b/tests/ref/fate/h264-skip-nokey
@@ -0,0 +1,55 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
+#tb 1: 1/48000
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+1,          0,          0,     1152,     4608, 0x00000000
+1,       1152,       1152,     1152,     4608, 0x00000000
+1,       2304,       2304,     1152,     4608, 0x00000000
+1,       3456,       3456,     1152,     4608, 0x00000000
+1,       4608,       4608,     1152,     4608, 0x00000000
+1,       5760,       5760,     1152,     4608, 0x00000000
+1,       6912,       6912,     1152,     4608, 0x00000000
+1,       8064,       8064,     1152,     4608, 0x00000000
+1,       9216,       9216,     1152,     4608, 0x00000000
+1,      10368,      10368,     1152,     4608, 0x00000000
+1,      11520,      11520,     1152,     4608, 0x00000000
+1,      12672,      12672,     1152,     4608, 0x00000000
+1,      13824,      13824,     1152,     4608, 0x00000000
+1,      14976,      14976,     1152,     4608, 0x00000000
+1,      16128,      16128,     1152,     4608, 0x00000000
+1,      17280,      17280,     1152,     4608, 0x00000000
+1,      18432,      18432,     1152,     4608, 0x00000000
+1,      19584,      19584,     1152,     4608, 0x00000000
+1,      20736,      20736,     1152,     4608, 0x00000000
+1,      21888,      21888,     1152,     4608, 0x00000000
+1,      23040,      23040,     1152,     4608, 0x00000000
+1,      24192,      24192,     1152,     4608, 0x00000000
+1,      25344,      25344,     1152,     4608, 0x00000000
+1,      26496,      26496,     1152,     4608, 0x00000000
+1,      27648,      27648,     1152,     4608, 0x00000000
+1,      28800,      28800,     1152,     4608, 0x00000000
+1,      29952,      29952,     1152,     4608, 0x00000000
+1,      31104,      31104,     1152,     4608, 0x00000000
+1,      32256,      32256,     1152,     4608, 0x00000000
+1,      33408,      33408,     1152,     4608, 0x00000000
+1,      34560,      34560,     1152,     4608, 0x00000000
+1,      35712,      35712,     1152,     4608, 0x00000000
+1,      36864,      36864,     1152,     4608, 0x00000000
+1,      38016,      38016,     1152,     4608, 0x00000000
+1,      39168,      39168,     1152,     4608, 0x00000000
+1,      40320,      40320,     1152,     4608, 0x00000000
+1,      41472,      41472,     1152,     4608, 0x00000000
+1,      42624,      42624,     1152,     4608, 0x00000000
+1,      43776,      43776,     1152,     4608, 0x00000000
+1,      44928,      44928,     1152,     4608, 0x00000000
+1,      46080,      46080,     1152,     4608, 0x00000000
+1,      47232,      47232,     1152,     4608, 0x00000000
+1,      48384,      48384,     1152,     4608, 0x9eca8b7c
+0,         45,         45,        1,  3110400, 0xa426f15d
diff --git a/tests/ref/fate/h264-twofields-packet b/tests/ref/fate/h264-twofields-packet
index fc2b9f9318..db12498f15 100644
--- a/tests/ref/fate/h264-twofields-packet
+++ b/tests/ref/fate/h264-twofields-packet
@@ -1,31 +1,35 @@
-#tb 0: 1/90000
-0,          0,          0,        0,  3110400, 0x48e39acd
-0,       3003,       3003,        0,  3110400, 0x40d65f69
-0,       6006,       6006,        0,  3110400, 0xdcbc50bf
-0,       9009,       9009,        0,  3110400, 0x73a2276a
-0,      12012,      12012,        0,  3110400, 0x84a2b3c6
-0,      15015,      15015,        0,  3110400, 0x7cf3b570
-0,      18018,      18018,        0,  3110400, 0xa2d1e03a
-0,      21021,      21021,        0,  3110400, 0x03220fb1
-0,      24024,      24024,        0,  3110400, 0x89cd526a
-0,      27027,      27027,        0,  3110400, 0xbb4b7531
-0,      30030,      30030,        0,  3110400, 0x0a69f053
-0,      33033,      33033,        0,  3110400, 0x0187994b
-0,      36036,      36036,        0,  3110400, 0x26ed49fa
-0,      39039,      39039,        0,  3110400, 0xbe8966d4
-0,      42042,      42042,        0,  3110400, 0x248d203c
-0,      45045,      45045,        0,  3110400, 0x3139c754
-0,      48048,      48048,        0,  3110400, 0xf22380c4
-0,      51051,      51051,        0,  3110400, 0x3e00dcc1
-0,      54054,      54054,        0,  3110400, 0x8cbe2483
-0,      57057,      57057,        0,  3110400, 0x6951cd63
-0,      60060,      60060,        0,  3110400, 0x36aca4c5
-0,      63063,      63063,        0,  3110400, 0x4d4f6fbe
-0,      66066,      66066,        0,  3110400, 0x997247aa
-0,      69069,      69069,        0,  3110400, 0x0fd40e06
-0,      72072,      72072,        0,  3110400, 0xa10d2d67
-0,      75075,      75075,        0,  3110400, 0x87c481da
-0,      78078,      78078,        0,  3110400, 0xe3dca3cd
-0,      81081,      81081,        0,  3110400, 0x5f77b078
-0,      84084,      84084,        0,  3110400, 0xf1ddd098
-0,      87087,      87087,        0,  3110400, 0xedcd1754
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
+0,          0,          0,        1,  3110400, 0x48e39acd
+0,          1,          1,        1,  3110400, 0x40d65f69
+0,          2,          2,        1,  3110400, 0xdcbc50bf
+0,          3,          3,        1,  3110400, 0x73a2276a
+0,          4,          4,        1,  3110400, 0x84a2b3c6
+0,          5,          5,        1,  3110400, 0x7cf3b570
+0,          6,          6,        1,  3110400, 0xa2d1e03a
+0,          7,          7,        1,  3110400, 0x03220fb1
+0,          8,          8,        1,  3110400, 0x89cd526a
+0,          9,          9,        1,  3110400, 0xbb4b7531
+0,         10,         10,        1,  3110400, 0x0a69f053
+0,         11,         11,        1,  3110400, 0x0187994b
+0,         12,         12,        1,  3110400, 0x26ed49fa
+0,         13,         13,        1,  3110400, 0xbe8966d4
+0,         14,         14,        1,  3110400, 0x248d203c
+0,         15,         15,        1,  3110400, 0x3139c754
+0,         16,         16,        1,  3110400, 0xf22380c4
+0,         17,         17,        1,  3110400, 0x3e00dcc1
+0,         18,         18,        1,  3110400, 0x8cbe2483
+0,         19,         19,        1,  3110400, 0x6951cd63
+0,         20,         20,        1,  3110400, 0x36aca4c5
+0,         21,         21,        1,  3110400, 0x4d4f6fbe
+0,         22,         22,        1,  3110400, 0x997247aa
+0,         23,         23,        1,  3110400, 0x0fd40e06
+0,         24,         24,        1,  3110400, 0xa10d2d67
+0,         25,         25,        1,  3110400, 0x87c481da
+0,         26,         26,        1,  3110400, 0xe3dca3cd
+0,         27,         27,        1,  3110400, 0x5f77b078
+0,         28,         28,        1,  3110400, 0xf1ddd098
+0,         29,         29,        1,  3110400, 0xedcd1754
diff --git a/tests/ref/fate/h264-unescaped-extradata b/tests/ref/fate/h264-unescaped-extradata
index a131b6cca1..5e44bc255d 100644
--- a/tests/ref/fate/h264-unescaped-extradata
+++ b/tests/ref/fate/h264-unescaped-extradata
@@ -1,11 +1,15 @@
-#tb 0: 1/44100
-0,          0,          0,        0,    84480, 0x0699eb38
-0,       1764,       1764,        0,    84480, 0xce902c32
-0,       3528,       3528,        0,    84480, 0xb6d125f7
-0,       5292,       5292,        0,    84480, 0x2555e93b
-0,       7056,       7056,        0,    84480, 0xaea5c08c
-0,       8820,       8820,        0,    84480, 0x848eb3da
-0,      10584,      10584,        0,    84480, 0x6cfabe90
-0,      12348,      12348,        0,    84480, 0xed16cc5e
-0,      14112,      14112,        0,    84480, 0xda8df8f8
-0,      15876,      15876,        0,    84480, 0x83fa054b
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x176
+#sar 0: 0/1
+0,          0,          0,        1,    84480, 0x0699eb38
+0,          1,          1,        1,    84480, 0xce902c32
+0,          2,          2,        1,    84480, 0xb6d125f7
+0,          3,          3,        1,    84480, 0x2555e93b
+0,          4,          4,        1,    84480, 0xaea5c08c
+0,          5,          5,        1,    84480, 0x848eb3da
+0,          6,          6,        1,    84480, 0x6cfabe90
+0,          7,          7,        1,    84480, 0xed16cc5e
+0,          8,          8,        1,    84480, 0xda8df8f8
+0,          9,          9,        1,    84480, 0x83fa054b
diff --git a/tests/ref/fate/h264-xavc-4389 b/tests/ref/fate/h264-xavc-4389
new file mode 100644
index 0000000000..5c76bc222f
--- /dev/null
+++ b/tests/ref/fate/h264-xavc-4389
@@ -0,0 +1,23 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
+#tb 1: 1/48000
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 48000
+#channel_layout 1: 4
+#channel_layout_name 1: mono
+0,          0,          0,        1,  8294400, 0x9a02ecf2
+1,          0,          0,     1920,     3840, 0x38074ac8
+0,          1,          1,        1,  8294400, 0x626f870a
+1,       1920,       1920,     1920,     3840, 0xd154829c
+0,          2,          2,        1,  8294400, 0x2d60557c
+1,       3840,       3840,     1920,     3840, 0x52515421
+0,          3,          3,        1,  8294400, 0x9c582956
+1,       5760,       5760,     1920,     3840, 0xdb8869d8
+0,          4,          4,        1,  8294400, 0x1c071f9a
+1,       7680,       7680,     1920,     3840, 0x5b2f7758
+0,          5,          5,        1,  8294400, 0x727f33cc
+1,       9600,       9600,     1920,     3840, 0xd099976a
diff --git a/tests/ref/fate/h264_mp4toannexb_ticket2991 b/tests/ref/fate/h264_mp4toannexb_ticket2991
new file mode 100644
index 0000000000..76bdf3cae7
--- /dev/null
+++ b/tests/ref/fate/h264_mp4toannexb_ticket2991
@@ -0,0 +1,127 @@
+05d66e60ab22ee004720e0051af0fe74 *tests/data/fate/h264_mp4toannexb_ticket2991.h264
+1985815 tests/data/fate/h264_mp4toannexb_ticket2991.h264
+#extradata 0:       47, 0x3a590d55
+#tb 0: 1/1200000
+#media_type 0: video
+#codec_id 0: h264
+#dimensions 0: 1280x720
+#sar 0: 3/4
+0,          0,          0,    48000,    37126, 0xb020184c
+0,      48000,      48000,    40040,     6920, 0x8512361a, F=0x0
+0,      88040,      88040,    40040,     7550, 0x1bc56ed4, F=0x0
+0,     128081,     128081,    40040,     8752, 0xb8c6f0a1, F=0x0
+0,     168121,     168121,    40040,    13022, 0xe36b6255, F=0x0
+0,     208162,     208162,    40040,    12982, 0x7c993297, F=0x0
+0,     248202,     248202,    40040,    13982, 0x24fe5e0f, F=0x0
+0,     288242,     288242,    40040,    13958, 0x9a22230d, F=0x0
+0,     328283,     328283,    40040,    15346, 0xf0f1a59c, F=0x0
+0,     368323,     368323,    40040,    21016, 0x8d061e7f, F=0x0
+0,     408364,     408364,    40040,    14786, 0x7b1e889d, F=0x0
+0,     448404,     448404,    40040,    11917, 0xf7742a9d, F=0x0
+0,     488444,     488444,    40040,    11234, 0x83cbd9fd, F=0x0
+0,     528485,     528485,    40040,    17616, 0xfdf95104, F=0x0
+0,     568525,     568525,    40040,    10689, 0x9633d32b, F=0x0
+0,     608566,     608566,    40040,    45291, 0x543c2cf6
+0,     648606,     648606,    40040,    20837, 0x051abfab, F=0x0
+0,     688646,     688646,    40040,    21418, 0xe2a59d70, F=0x0
+0,     728687,     728687,    40040,    15643, 0x15cf2cec, F=0x0
+0,     768727,     768727,    40040,    11956, 0x5aef382e, F=0x0
+0,     808768,     808768,    40040,    15393, 0x951dd757, F=0x0
+0,     848808,     848808,    40040,    14839, 0x2d33151c, F=0x0
+0,     888848,     888848,    40040,    14580, 0x2a895aa6, F=0x0
+0,     928889,     928889,    40040,    17571, 0xb3a115f0, F=0x0
+0,     968929,     968929,    40040,    15621, 0x2cc6577d, F=0x0
+0,    1008970,    1008970,    40040,    13653, 0xb6a3ac6e, F=0x0
+0,    1049010,    1049010,    40040,    16274, 0xe8b9b09d, F=0x0
+0,    1089050,    1089050,    40040,    13130, 0xcbb6bb8e, F=0x0
+0,    1129091,    1129091,    40040,    16180, 0x5d188a7a, F=0x0
+0,    1169131,    1169131,    40040,    14961, 0x9ff2f463, F=0x0
+0,    1209172,    1209172,    40040,    54296, 0xe6ec30ed
+0,    1249212,    1249212,    40040,    11500, 0x8c4852c9, F=0x0
+0,    1289252,    1289252,    40040,    12065, 0xfb7954c3, F=0x0
+0,    1329293,    1329293,    40040,    12532, 0xf0a935d3, F=0x0
+0,    1369333,    1369333,    40040,    16284, 0xc5c18561, F=0x0
+0,    1409374,    1409374,    40040,    17657, 0x08ce58cc, F=0x0
+0,    1449414,    1449414,    40040,    21336, 0xd0965202, F=0x0
+0,    1489454,    1489454,    40040,    18549, 0x9e9a42ef, F=0x0
+0,    1529495,    1529495,    40040,    14351, 0xa864d2be, F=0x0
+0,    1569535,    1569535,    40040,    15205, 0x5bd7b98e, F=0x0
+0,    1609576,    1609576,    40040,    18040, 0x287af301, F=0x0
+0,    1649616,    1649616,    40040,    15917, 0x2db52580, F=0x0
+0,    1689656,    1689656,    40040,    13250, 0xfed0deb8, F=0x0
+0,    1729697,    1729697,    40040,    13360, 0xbf92d476, F=0x0
+0,    1769737,    1769737,    40040,    11749, 0x3041eaf1, F=0x0
+0,    1809778,    1809778,    40040,    23997, 0xdbe6d5c4
+0,    1849818,    1849818,    40040,    16065, 0xe8f715b7, F=0x0
+0,    1889858,    1889858,    40040,    16441, 0x0a4e060f, F=0x0
+0,    1929899,    1929899,    40040,    17395, 0xa8edecc2, F=0x0
+0,    1969939,    1969939,    40040,    22295, 0xd5173c68, F=0x0
+0,    2009980,    2009980,    40040,    22778, 0xf5e522ce, F=0x0
+0,    2050020,    2050020,    40040,    20590, 0x2fd6b2ca, F=0x0
+0,    2090060,    2090060,    40040,    19937, 0xe109dda5, F=0x0
+0,    2130101,    2130101,    40040,    23833, 0xd12691cb, F=0x0
+0,    2170141,    2170141,    40040,    17969, 0x9baad67a, F=0x0
+0,    2210182,    2210182,    40040,    16645, 0x53fb3099, F=0x0
+0,    2250222,    2250222,    40040,    15307, 0xbc5bac8d, F=0x0
+0,    2290262,    2290262,    40040,    13748, 0xed26aeb4, F=0x0
+0,    2330303,    2330303,    40040,    15092, 0x3c983538, F=0x0
+0,    2370343,    2370343,    40040,    14636, 0x9b278a6c, F=0x0
+0,    2410384,    2410384,    40040,    29134, 0xf784be18
+0,    2450424,    2450424,    40040,    10232, 0x5408e15b, F=0x0
+0,    2490464,    2490464,    40040,     9769, 0xc93cb7f9, F=0x0
+0,    2530505,    2530505,    40040,    14454, 0x45230dbe, F=0x0
+0,    2570545,    2570545,    40040,    14481, 0x4e111562, F=0x0
+0,    2610586,    2610586,    40040,    13439, 0x0e096eeb, F=0x0
+0,    2650626,    2650626,    40040,    13543, 0xc24569d9, F=0x0
+0,    2690666,    2690666,    40040,    16012, 0x81543332, F=0x0
+0,    2730707,    2730707,    40040,    15769, 0x2ddfa189, F=0x0
+0,    2770747,    2770747,    40040,    14208, 0x1379add2, F=0x0
+0,    2810788,    2810788,    40040,    11479, 0xdfc14b55, F=0x0
+0,    2850828,    2850828,    40040,    11130, 0x0ab5959b, F=0x0
+0,    2890868,    2890868,    40040,    14801, 0x40bae016, F=0x0
+0,    2930909,    2930909,    40040,    17303, 0x9ce1fd31, F=0x0
+0,    2970949,    2970949,    40040,    17678, 0x9bd66141, F=0x0
+0,    3010990,    3010990,    40040,    48672, 0x3215ce46
+0,    3051030,    3051030,    40040,    11894, 0x12e1fece, F=0x0
+0,    3091070,    3091070,    40040,    16514, 0xc57aed05, F=0x0
+0,    3131111,    3131111,    40040,    13044, 0x61914fa0, F=0x0
+0,    3171151,    3171151,    40040,    16155, 0xb46c958a, F=0x0
+0,    3211192,    3211192,    40040,    12950, 0xa676f605, F=0x0
+0,    3251232,    3251232,    40040,    17870, 0x7a5aa03a, F=0x0
+0,    3291272,    3291272,    40040,    13192, 0x3c9e9d99, F=0x0
+0,    3331313,    3331313,    40040,    25559, 0x93e0becb, F=0x0
+0,    3371353,    3371353,    40040,    14695, 0x19ace95a, F=0x0
+0,    3411394,    3411394,    40040,    15484, 0x6e3bd0d2, F=0x0
+0,    3451434,    3451434,    40040,    17096, 0x2fd93b48, F=0x0
+0,    3491474,    3491474,    40040,    12208, 0x81a587c0, F=0x0
+0,    3531515,    3531515,    40040,    14709, 0x5dffbe04, F=0x0
+0,    3571555,    3571555,    40040,    14390, 0xbfd1e041, F=0x0
+0,    3611596,    3611596,    40040,    37236, 0xe7f924b1
+0,    3651636,    3651636,    40040,    14056, 0x24714c7c, F=0x0
+0,    3691676,    3691676,    40040,    19438, 0x0c50dcd5, F=0x0
+0,    3731717,    3731717,    40040,    21728, 0x7eea4a11, F=0x0
+0,    3771757,    3771757,    40040,    17966, 0xac7ac988, F=0x0
+0,    3811798,    3811798,    40040,    14868, 0x0eecb1be, F=0x0
+0,    3851838,    3851838,    40040,    15608, 0x1449377e, F=0x0
+0,    3891878,    3891878,    40040,    12484, 0xc9881139, F=0x0
+0,    3931919,    3931919,    40040,    18226, 0xdcda8dfa, F=0x0
+0,    3971959,    3971959,    40040,    19199, 0xe7ea4c92, F=0x0
+0,    4012000,    4012000,    40040,    19042, 0xa5ade66f, F=0x0
+0,    4052040,    4052040,    40040,    15662, 0x19ac319a, F=0x0
+0,    4092080,    4092080,    40040,    16878, 0x98efbae2, F=0x0
+0,    4132121,    4132121,    40040,    14685, 0x1bf78d65, F=0x0
+0,    4172161,    4172161,    40040,    13127, 0x0b91881d, F=0x0
+0,    4212202,    4212202,    40040,    29390, 0xf6a5ed6b
+0,    4252242,    4252242,    40040,    12576, 0xe9845ded, F=0x0
+0,    4292282,    4292282,    40040,    12599, 0x96a79ab8, F=0x0
+0,    4332323,    4332323,    40040,    16134, 0xb4c36d3f, F=0x0
+0,    4372363,    4372363,    40040,    15630, 0x33f65a2e, F=0x0
+0,    4412404,    4412404,    40040,    13087, 0xb4b3886d, F=0x0
+0,    4452444,    4452444,    40040,    10728, 0xbffd10fa, F=0x0
+0,    4492484,    4492484,    40040,    10353, 0xccfe3506, F=0x0
+0,    4532525,    4532525,    40040,     9534, 0xd42083f5, F=0x0
+0,    4572565,    4572565,    40040,    12641, 0x93e8abbd, F=0x0
+0,    4612606,    4612606,    40040,    11198, 0x6a9de1fb, F=0x0
+0,    4652646,    4652646,    40040,    15572, 0xd6cb6c4b, F=0x0
+0,    4692686,    4692686,    40040,    12072, 0x8928b77f, F=0x0
+0,    4732727,    4732727,    40040,    19172, 0x549b6b87, F=0x0
diff --git a/tests/ref/fate/h264_mp4toannexb_ticket5927 b/tests/ref/fate/h264_mp4toannexb_ticket5927
new file mode 100644
index 0000000000..95e35c4d80
--- /dev/null
+++ b/tests/ref/fate/h264_mp4toannexb_ticket5927
@@ -0,0 +1,21 @@
+a3b02fd09392e01619cebc959d4d9ff2 *tests/data/fate/h264_mp4toannexb_ticket5927.h264
+595583 tests/data/fate/h264_mp4toannexb_ticket5927.h264
+#extradata 0:       33, 0x84fe08f8
+#tb 0: 1/1200000
+#media_type 0: video
+#codec_id 0: h264
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,     -48000, -9223372036854775808,    48000,   247993, 0x1ce821ea
+0,          0, -9223372036854775808,    48000,    43354, 0xa05dca6f, F=0x0
+0,      48000, -9223372036854775808,    48000,    11423, 0x5e8086dd, F=0x0
+0,      96000, -9223372036854775808,    48000,    50798, 0x145fbe4f, F=0x0
+0,     144000, -9223372036854775808,    48000,    12567, 0x1e3d5304, F=0x0
+0,     192000, -9223372036854775808,    48000,    52444, 0x1a6c1a64, F=0x0
+0,     240000, -9223372036854775808,    48000,    12575, 0x2fff484b, F=0x0
+0,     288000, -9223372036854775808,    48000,    54025, 0xb3bf0ce6, F=0x0
+0,     336000, -9223372036854775808,    48000,    13539, 0xfdb16c57, F=0x0
+0,     384000, -9223372036854775808,    48000,    54483, 0xefead99f, F=0x0
+0,     432000, -9223372036854775808,    48000,    13705, 0x23cd27e8, F=0x0
+0,     480000, -9223372036854775808,    48000,    22308, 0x4093b5af, F=0x0
+0,     528000, -9223372036854775808,    48000,     6369, 0x858b2aa1
diff --git a/tests/ref/fate/h264_mp4toannexb_ticket5927_2 b/tests/ref/fate/h264_mp4toannexb_ticket5927_2
new file mode 100644
index 0000000000..8db6a7e54a
--- /dev/null
+++ b/tests/ref/fate/h264_mp4toannexb_ticket5927_2
@@ -0,0 +1,21 @@
+a3b02fd09392e01619cebc959d4d9ff2 *tests/data/fate/h264_mp4toannexb_ticket5927_2.h264
+595583 tests/data/fate/h264_mp4toannexb_ticket5927_2.h264
+#extradata 0:       33, 0x84fe08f8
+#tb 0: 1/1200000
+#media_type 0: video
+#codec_id 0: h264
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,     -48000, -9223372036854775808,    48000,   247993, 0x1ce821ea
+0,          0, -9223372036854775808,    48000,    43354, 0xa05dca6f, F=0x0
+0,      48000, -9223372036854775808,    48000,    11423, 0x5e8086dd, F=0x0
+0,      96000, -9223372036854775808,    48000,    50798, 0x145fbe4f, F=0x0
+0,     144000, -9223372036854775808,    48000,    12567, 0x1e3d5304, F=0x0
+0,     192000, -9223372036854775808,    48000,    52444, 0x1a6c1a64, F=0x0
+0,     240000, -9223372036854775808,    48000,    12575, 0x2fff484b, F=0x0
+0,     288000, -9223372036854775808,    48000,    54025, 0xb3bf0ce6, F=0x0
+0,     336000, -9223372036854775808,    48000,    13539, 0xfdb16c57, F=0x0
+0,     384000, -9223372036854775808,    48000,    54483, 0xefead99f, F=0x0
+0,     432000, -9223372036854775808,    48000,    13705, 0x23cd27e8, F=0x0
+0,     480000, -9223372036854775808,    48000,    22308, 0x4093b5af, F=0x0
+0,     528000, -9223372036854775808,    48000,     6369, 0x858b2aa1
diff --git a/tests/ref/fate/hap-chunk b/tests/ref/fate/hap-chunk
index 4f09d4306f..8dd5039ede 100644
--- a/tests/ref/fate/hap-chunk
+++ b/tests/ref/fate/hap-chunk
@@ -1,2 +1,6 @@
-#tb 0: 1/15360
-0,          0,          0,        0,    16384, 0x096d409e
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
+0,          0,          0,        1,    16384, 0x096d409e
diff --git a/tests/ref/fate/hap1 b/tests/ref/fate/hap1
index 0cabf8bf4f..fcdf9851fe 100644
--- a/tests/ref/fate/hap1
+++ b/tests/ref/fate/hap1
@@ -1,2 +1,6 @@
-#tb 0: 1/2997
-0,          0,          0,        0,  1228800, 0x0fa946bc
+#tb 0: 62/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+0,          0,          0,        1,  1228800, 0x0fa946bc
diff --git a/tests/ref/fate/hap5 b/tests/ref/fate/hap5
index a582c3952c..f46fe7845b 100644
--- a/tests/ref/fate/hap5
+++ b/tests/ref/fate/hap5
@@ -1,2 +1,6 @@
-#tb 0: 1/3000
-0,          0,          0,        0,  1228800, 0xb71ecf93
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+0,          0,          0,        1,  1228800, 0xb71ecf93
diff --git a/tests/ref/fate/hapy b/tests/ref/fate/hapy
index e6dd4f5df5..61feb2e36d 100644
--- a/tests/ref/fate/hapy
+++ b/tests/ref/fate/hapy
@@ -1,2 +1,6 @@
-#tb 0: 1/2997
-0,          0,          0,        0,  1228800, 0x5993522d
+#tb 0: 62/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+0,          0,          0,        1,  1228800, 0x5993522d
diff --git a/tests/ref/fate/hash b/tests/ref/fate/hash
new file mode 100644
index 0000000000..6e5a580bee
--- /dev/null
+++ b/tests/ref/fate/hash
@@ -0,0 +1,45 @@
+MD5 hex: 3b5d3c7d207e37dceeedd301e35e2e58
+MD5 bin: 0x3b 0x5d 0x3c 0x7d 0x20 0x7e 0x37 0xdc 0xee 0xed 0xd3 0x1 0xe3 0x5e 0x2e 0x58
+MD5 b64: O108fSB+N9zu7dMB414uWA==
+murmur3 hex: 6e484695e1d7b4e37d838791cc263395
+murmur3 bin: 0x6e 0x48 0x46 0x95 0xe1 0xd7 0xb4 0xe3 0x7d 0x83 0x87 0x91 0xcc 0x26 0x33 0x95
+murmur3 b64: bkhGleHXtON9g4eRzCYzlQ==
+RIPEMD128 hex: 082bfa9b829ef3a9e220dcc54e4c6383
+RIPEMD128 bin: 0x8 0x2b 0xfa 0x9b 0x82 0x9e 0xf3 0xa9 0xe2 0x20 0xdc 0xc5 0x4e 0x4c 0x63 0x83
+RIPEMD128 b64: CCv6m4Ke86niINzFTkxjgw==
+RIPEMD160 hex: 9b8ccc2f374ae313a914763cc9cdfb47bfe1c229
+RIPEMD160 bin: 0x9b 0x8c 0xcc 0x2f 0x37 0x4a 0xe3 0x13 0xa9 0x14 0x76 0x3c 0xc9 0xcd 0xfb 0x47 0xbf 0xe1 0xc2 0x29
+RIPEMD160 b64: m4zMLzdK4xOpFHY8yc37R7/hwik=
+RIPEMD256 hex: 26ba693759787f275f47dd5ab16e78c2fcd763b004fd05fc554e354223d6eab5
+RIPEMD256 bin: 0x26 0xba 0x69 0x37 0x59 0x78 0x7f 0x27 0x5f 0x47 0xdd 0x5a 0xb1 0x6e 0x78 0xc2 0xfc 0xd7 0x63 0xb0 0x4 0xfd 0x5 0xfc 0x55 0x4e 0x35 0x42 0x23 0xd6 0xea 0xb5
+RIPEMD256 b64: JrppN1l4fydfR91asW54wvzXY7AE/QX8VU41QiPW6rU=
+RIPEMD320 hex: 409a3111ffd3d4c8058ff5c231401c1d47210a5d22e6c90bf95d45c1c95c528463c69ce4bff3b884
+RIPEMD320 bin: 0x40 0x9a 0x31 0x11 0xff 0xd3 0xd4 0xc8 0x5 0x8f 0xf5 0xc2 0x31 0x40 0x1c 0x1d 0x47 0x21 0xa 0x5d 0x22 0xe6 0xc9 0xb 0xf9 0x5d 0x45 0xc1 0xc9 0x5c 0x52 0x84 0x63 0xc6 0x9c 0xe4 0xbf 0xf3 0xb8 0x84
+RIPEMD320 b64: QJoxEf/T1MgFj/XCMUAcHUchCl0i5skL+V1FwclcUoRjxpzkv/O4hA==
+SHA160 hex: c8d7d0ef0eedfa82d2ea1aa592845b9a6d4b02b7
+SHA160 bin: 0xc8 0xd7 0xd0 0xef 0xe 0xed 0xfa 0x82 0xd2 0xea 0x1a 0xa5 0x92 0x84 0x5b 0x9a 0x6d 0x4b 0x2 0xb7
+SHA160 b64: yNfQ7w7t+oLS6hqlkoRbmm1LArc=
+SHA224 hex: 750d81a39c18d3ce27ff3e5ece30b0088f12d8fd0450fe435326294b
+SHA224 bin: 0x75 0xd 0x81 0xa3 0x9c 0x18 0xd3 0xce 0x27 0xff 0x3e 0x5e 0xce 0x30 0xb0 0x8 0x8f 0x12 0xd8 0xfd 0x4 0x50 0xfe 0x43 0x53 0x26 0x29 0x4b
+SHA224 b64: dQ2Bo5wY084n/z5ezjCwCI8S2P0EUP5DUyYpSw==
+SHA256 hex: f5a5fd42d16a20302798ef6ed309979b43003d2320d9f0e8ea9831a92759fb4b
+SHA256 bin: 0xf5 0xa5 0xfd 0x42 0xd1 0x6a 0x20 0x30 0x27 0x98 0xef 0x6e 0xd3 0x9 0x97 0x9b 0x43 0 0x3d 0x23 0x20 0xd9 0xf0 0xe8 0xea 0x98 0x31 0xa9 0x27 0x59 0xfb 0x4b
+SHA256 b64: 9aX9QtFqIDAnmO9u0wmXm0MAPSMg2fDo6pgxqSdZ+0s=
+SHA512/224 hex: 1319d9b322452068e6f43c0ed3da115fbeccc169711dbbaee2846f90
+SHA512/224 bin: 0x13 0x19 0xd9 0xb3 0x22 0x45 0x20 0x68 0xe6 0xf4 0x3c 0xe 0xd3 0xda 0x11 0x5f 0xbe 0xcc 0xc1 0x69 0x71 0x1d 0xbb 0xae 0xe2 0x84 0x6f 0x90
+SHA512/224 b64: ExnZsyJFIGjm9DwO09oRX77MwWlxHbuu4oRvkA==
+SHA512/256 hex: 8aeecfa0b9f2ac7818863b1362241e4f32d06b100ae9d1c0fbcc4ed61b91b17a
+SHA512/256 bin: 0x8a 0xee 0xcf 0xa0 0xb9 0xf2 0xac 0x78 0x18 0x86 0x3b 0x13 0x62 0x24 0x1e 0x4f 0x32 0xd0 0x6b 0x10 0xa 0xe9 0xd1 0xc0 0xfb 0xcc 0x4e 0xd6 0x1b 0x91 0xb1 0x7a
+SHA512/256 b64: iu7PoLnyrHgYhjsTYiQeTzLQaxAK6dHA+8xO1huRsXo=
+SHA384 hex: c516aa8d3b457c636c6826937099c0d23a13f2c3701a388b3c8fe4bc2073281b0c4462610369884c4ababa8e97b6debe
+SHA384 bin: 0xc5 0x16 0xaa 0x8d 0x3b 0x45 0x7c 0x63 0x6c 0x68 0x26 0x93 0x70 0x99 0xc0 0xd2 0x3a 0x13 0xf2 0xc3 0x70 0x1a 0x38 0x8b 0x3c 0x8f 0xe4 0xbc 0x20 0x73 0x28 0x1b 0xc 0x44 0x62 0x61 0x3 0x69 0x88 0x4c 0x4a 0xba 0xba 0x8e 0x97 0xb6 0xde 0xbe
+SHA384 b64: xRaqjTtFfGNsaCaTcJnA0joT8sNwGjiLPI/kvCBzKBsMRGJhA2mITEq6uo6Xtt6+
+SHA512 hex: 7be9fda48f4179e611c698a73cff09faf72869431efee6eaad14de0cb44bbf66503f752b7a8eb17083355f3ce6eb7d2806f236b25af96a24e22b887405c20081
+SHA512 bin: 0x7b 0xe9 0xfd 0xa4 0x8f 0x41 0x79 0xe6 0x11 0xc6 0x98 0xa7 0x3c 0xff 0x9 0xfa 0xf7 0x28 0x69 0x43 0x1e 0xfe 0xe6 0xea 0xad 0x14 0xde 0xc 0xb4 0x4b 0xbf 0x66 0x50 0x3f 0x75 0x2b 0x7a 0x8e 0xb1 0x70 0x83 0x35 0x5f 0x3c 0xe6 0xeb 0x7d 0x28 0x6 0xf2 0x36 0xb2 0x5a 0xf9 0x6a 0x24 0xe2 0x2b 0x88 0x74 0x5 0xc2 0 0x81
+SHA512 b64: e+n9pI9BeeYRxpinPP8J+vcoaUMe/ubqrRTeDLRLv2ZQP3Ureo6xcIM1Xzzm630oBvI2slr5aiTiK4h0BcIAgQ==
+CRC32 hex: 758d6336
+CRC32 bin: 0x75 0x8d 0x63 0x36
+CRC32 b64: dY1jNg==
+adler32 hex: 00400001
+adler32 bin: 0 0x40 0 0x1
+adler32 b64: AEAAAQ==
diff --git a/tests/ref/fate/hevc-conformance-ADJUST_IPRED_ANGLE_A_RExt_Mitsubishi_1 b/tests/ref/fate/hevc-conformance-ADJUST_IPRED_ANGLE_A_RExt_Mitsubishi_1
new file mode 100644
index 0000000000..953fcf809f
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-ADJUST_IPRED_ANGLE_A_RExt_Mitsubishi_1
@@ -0,0 +1,8 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0xa061c78c
+0,          1,          1,        1,  8294400, 0x60250c76
+0,          2,          2,        1,  8294400, 0x48e3fbdb
diff --git a/tests/ref/fate/hevc-conformance-AMP_A_Samsung_4 b/tests/ref/fate/hevc-conformance-AMP_A_Samsung_4
index 84487a515a..e5938e2d8b 100644
--- a/tests/ref/fate/hevc-conformance-AMP_A_Samsung_4
+++ b/tests/ref/fate/hevc-conformance-AMP_A_Samsung_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 2560x1600
+#sar 0: 0/1
 0,          0,          0,        1,  6144000, 0xf7da9a00
 0,          1,          1,        1,  6144000, 0xf5cfc76f
 0,          2,          2,        1,  6144000, 0x20663e82
diff --git a/tests/ref/fate/hevc-conformance-AMP_A_Samsung_6 b/tests/ref/fate/hevc-conformance-AMP_A_Samsung_6
new file mode 100644
index 0000000000..c5f59bed49
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-AMP_A_Samsung_6
@@ -0,0 +1,65 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 2560x1600
+#sar 0: 0/1
+0,          0,          0,        1,  6144000, 0x6f9dd380
+0,          1,          1,        1,  6144000, 0x3ad765f8
+0,          2,          2,        1,  6144000, 0xe301292d
+0,          3,          3,        1,  6144000, 0x4272c502
+0,          4,          4,        1,  6144000, 0xa07fb65d
+0,          5,          5,        1,  6144000, 0x8ba3bfd9
+0,          6,          6,        1,  6144000, 0x60d043be
+0,          7,          7,        1,  6144000, 0x2569fa6e
+0,          8,          8,        1,  6144000, 0xd645ca25
+0,          9,          9,        1,  6144000, 0xd65a4297
+0,         10,         10,        1,  6144000, 0x3ce13abe
+0,         11,         11,        1,  6144000, 0x2c06229b
+0,         12,         12,        1,  6144000, 0x6efe8de1
+0,         13,         13,        1,  6144000, 0x1500d848
+0,         14,         14,        1,  6144000, 0x453cd614
+0,         15,         15,        1,  6144000, 0x65182daf
+0,         16,         16,        1,  6144000, 0x4cef8519
+0,         17,         17,        1,  6144000, 0x47ff5125
+0,         18,         18,        1,  6144000, 0xa86327d3
+0,         19,         19,        1,  6144000, 0x3e3bd7bb
+0,         20,         20,        1,  6144000, 0x3e591d1a
+0,         21,         21,        1,  6144000, 0x1cb0a751
+0,         22,         22,        1,  6144000, 0x3532e0ae
+0,         23,         23,        1,  6144000, 0xe44fb0fe
+0,         24,         24,        1,  6144000, 0x9b075bc6
+0,         25,         25,        1,  6144000, 0x53352d7d
+0,         26,         26,        1,  6144000, 0x7ded6eac
+0,         27,         27,        1,  6144000, 0xd65b88e8
+0,         28,         28,        1,  6144000, 0xea53ae64
+0,         29,         29,        1,  6144000, 0xf0e21afa
+0,         30,         30,        1,  6144000, 0x43f11a01
+0,         31,         31,        1,  6144000, 0xb3005915
+0,         32,         32,        1,  6144000, 0x3eb450ed
+0,         33,         33,        1,  6144000, 0xdba020e8
+0,         34,         34,        1,  6144000, 0x8f2cbd30
+0,         35,         35,        1,  6144000, 0x9e12e7d6
+0,         36,         36,        1,  6144000, 0x27fd7092
+0,         37,         37,        1,  6144000, 0xf63056cd
+0,         38,         38,        1,  6144000, 0x44bfff47
+0,         39,         39,        1,  6144000, 0x9706c5a8
+0,         40,         40,        1,  6144000, 0xe5fe4658
+0,         41,         41,        1,  6144000, 0x20d5518b
+0,         42,         42,        1,  6144000, 0x25e56fe5
+0,         43,         43,        1,  6144000, 0x8cebd3d1
+0,         44,         44,        1,  6144000, 0x458d2302
+0,         45,         45,        1,  6144000, 0x6fc44942
+0,         46,         46,        1,  6144000, 0xdf8fa6da
+0,         47,         47,        1,  6144000, 0xafb34a56
+0,         48,         48,        1,  6144000, 0x4c5b177e
+0,         49,         49,        1,  6144000, 0x83934d62
+0,         50,         50,        1,  6144000, 0x59028fc3
+0,         51,         51,        1,  6144000, 0xfd9810cf
+0,         52,         52,        1,  6144000, 0x104abf79
+0,         53,         53,        1,  6144000, 0xb9a68e12
+0,         54,         54,        1,  6144000, 0x5ac4bbd8
+0,         55,         55,        1,  6144000, 0x44f4bb5e
+0,         56,         56,        1,  6144000, 0xc48a4f6b
+0,         57,         57,        1,  6144000, 0xecb27957
+0,         58,         58,        1,  6144000, 0xe2ec6e92
+0,         59,         59,        1,  6144000, 0x94697078
diff --git a/tests/ref/fate/hevc-conformance-AMP_B_Samsung_4 b/tests/ref/fate/hevc-conformance-AMP_B_Samsung_4
index 034f7b890c..10db6c3cad 100644
--- a/tests/ref/fate/hevc-conformance-AMP_B_Samsung_4
+++ b/tests/ref/fate/hevc-conformance-AMP_B_Samsung_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 2560x1600
+#sar 0: 0/1
 0,          0,          0,        1,  6144000, 0xcd32ef33
 0,          1,          1,        1,  6144000, 0x58ce681d
 0,          2,          2,        1,  6144000, 0x77a732b6
diff --git a/tests/ref/fate/hevc-conformance-AMP_B_Samsung_6 b/tests/ref/fate/hevc-conformance-AMP_B_Samsung_6
new file mode 100644
index 0000000000..518d937b32
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-AMP_B_Samsung_6
@@ -0,0 +1,65 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 2560x1600
+#sar 0: 0/1
+0,          0,          0,        1,  6144000, 0x4217e40e
+0,          1,          1,        1,  6144000, 0xafa3a676
+0,          2,          2,        1,  6144000, 0xb8285522
+0,          3,          3,        1,  6144000, 0x07e52fe0
+0,          4,          4,        1,  6144000, 0x04838016
+0,          5,          5,        1,  6144000, 0xd421bd78
+0,          6,          6,        1,  6144000, 0xd49765e1
+0,          7,          7,        1,  6144000, 0xd6623f0c
+0,          8,          8,        1,  6144000, 0x11348e42
+0,          9,          9,        1,  6144000, 0x440a4ba5
+0,         10,         10,        1,  6144000, 0x8c5990fd
+0,         11,         11,        1,  6144000, 0x2284c72a
+0,         12,         12,        1,  6144000, 0x2b16b0c8
+0,         13,         13,        1,  6144000, 0xeadbfbfa
+0,         14,         14,        1,  6144000, 0xf7bf6e0a
+0,         15,         15,        1,  6144000, 0x62fc7321
+0,         16,         16,        1,  6144000, 0xee5707b5
+0,         17,         17,        1,  6144000, 0xc0cafdc7
+0,         18,         18,        1,  6144000, 0x0409333c
+0,         19,         19,        1,  6144000, 0x2ef82c00
+0,         20,         20,        1,  6144000, 0x01d99315
+0,         21,         21,        1,  6144000, 0x2086bdb6
+0,         22,         22,        1,  6144000, 0xdadd95b4
+0,         23,         23,        1,  6144000, 0x97cf72a2
+0,         24,         24,        1,  6144000, 0x1914e283
+0,         25,         25,        1,  6144000, 0x0073f731
+0,         26,         26,        1,  6144000, 0xdcd7a65b
+0,         27,         27,        1,  6144000, 0x43a5a65f
+0,         28,         28,        1,  6144000, 0x89c68568
+0,         29,         29,        1,  6144000, 0xf07517ad
+0,         30,         30,        1,  6144000, 0xa716e9e6
+0,         31,         31,        1,  6144000, 0x004267aa
+0,         32,         32,        1,  6144000, 0x68ec7399
+0,         33,         33,        1,  6144000, 0x558e0339
+0,         34,         34,        1,  6144000, 0xf3a57912
+0,         35,         35,        1,  6144000, 0x708d11e1
+0,         36,         36,        1,  6144000, 0x8c31af81
+0,         37,         37,        1,  6144000, 0xfc0ae2d2
+0,         38,         38,        1,  6144000, 0xdfdf4726
+0,         39,         39,        1,  6144000, 0xe101c925
+0,         40,         40,        1,  6144000, 0xb38ced35
+0,         41,         41,        1,  6144000, 0x4e8848b6
+0,         42,         42,        1,  6144000, 0xb9d526d9
+0,         43,         43,        1,  6144000, 0xb20f931c
+0,         44,         44,        1,  6144000, 0x4143e9f3
+0,         45,         45,        1,  6144000, 0x30fc4669
+0,         46,         46,        1,  6144000, 0x9087bd86
+0,         47,         47,        1,  6144000, 0x34f28088
+0,         48,         48,        1,  6144000, 0x675febc8
+0,         49,         49,        1,  6144000, 0x36ccb881
+0,         50,         50,        1,  6144000, 0xbc0ea02f
+0,         51,         51,        1,  6144000, 0x72619f9e
+0,         52,         52,        1,  6144000, 0x7e115352
+0,         53,         53,        1,  6144000, 0x7ef1e547
+0,         54,         54,        1,  6144000, 0xbac5db79
+0,         55,         55,        1,  6144000, 0xe75bf8e7
+0,         56,         56,        1,  6144000, 0x53992573
+0,         57,         57,        1,  6144000, 0x6b705da6
+0,         58,         58,        1,  6144000, 0x494dbecc
+0,         59,         59,        1,  6144000, 0xfe001b93
diff --git a/tests/ref/fate/hevc-conformance-AMP_D_Hisilicon b/tests/ref/fate/hevc-conformance-AMP_D_Hisilicon
index 6e17b83d96..8d4e07963a 100644
--- a/tests/ref/fate/hevc-conformance-AMP_D_Hisilicon
+++ b/tests/ref/fate/hevc-conformance-AMP_D_Hisilicon
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  3110400, 0x1559c293
 0,          1,          1,        1,  3110400, 0xd0802706
 0,          2,          2,        1,  3110400, 0xb48cf229
diff --git a/tests/ref/fate/hevc-conformance-AMP_E_Hisilicon b/tests/ref/fate/hevc-conformance-AMP_E_Hisilicon
index c1b7f2ee9b..075d024ea8 100644
--- a/tests/ref/fate/hevc-conformance-AMP_E_Hisilicon
+++ b/tests/ref/fate/hevc-conformance-AMP_E_Hisilicon
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  3110400, 0xf9342188
 0,          1,          1,        1,  3110400, 0x46638dc4
 0,          2,          2,        1,  3110400, 0x96da436e
diff --git a/tests/ref/fate/hevc-conformance-AMP_F_Hisilicon_3 b/tests/ref/fate/hevc-conformance-AMP_F_Hisilicon_3
index 71ce9c74cc..4a8849f5a9 100644
--- a/tests/ref/fate/hevc-conformance-AMP_F_Hisilicon_3
+++ b/tests/ref/fate/hevc-conformance-AMP_F_Hisilicon_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  3110400, 0xa5d2b8b0
 0,          1,          1,        1,  3110400, 0x13035cfa
 0,          2,          2,        1,  3110400, 0x96b16f86
diff --git a/tests/ref/fate/hevc-conformance-AMVP_A_MTK_4 b/tests/ref/fate/hevc-conformance-AMVP_A_MTK_4
index 59115fb020..f44c1747f8 100644
--- a/tests/ref/fate/hevc-conformance-AMVP_A_MTK_4
+++ b/tests/ref/fate/hevc-conformance-AMVP_A_MTK_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x88619f80
 0,          1,          1,        1,   149760, 0x550bdaf0
 0,          2,          2,        1,   149760, 0xb769fa4c
diff --git a/tests/ref/fate/hevc-conformance-AMVP_B_MTK_4 b/tests/ref/fate/hevc-conformance-AMVP_B_MTK_4
index 1f998c4f0f..3fd21e22df 100644
--- a/tests/ref/fate/hevc-conformance-AMVP_B_MTK_4
+++ b/tests/ref/fate/hevc-conformance-AMVP_B_MTK_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xcfffa013
 0,          1,          1,        1,   149760, 0x5166146a
 0,          2,          2,        1,   149760, 0xc3cc318e
diff --git a/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_4 b/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_4
index 16d3446953..649be46584 100644
--- a/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_4
+++ b/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x8087662a
 0,          1,          1,        1,   599040, 0x5278d8db
 0,          2,          2,        1,   599040, 0x73c74090
diff --git a/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_6 b/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_6
new file mode 100644
index 0000000000..36d5577529
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-AMVP_C_Samsung_6
@@ -0,0 +1,65 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
+0,          0,          0,        1,   599040, 0xd70f52b4
+0,          1,          1,        1,   599040, 0xaf3d1311
+0,          2,          2,        1,   599040, 0xc1b05eef
+0,          3,          3,        1,   599040, 0x74567085
+0,          4,          4,        1,   599040, 0x96fddb91
+0,          5,          5,        1,   599040, 0x17ad9135
+0,          6,          6,        1,   599040, 0xc548a9fb
+0,          7,          7,        1,   599040, 0xb4966a0d
+0,          8,          8,        1,   599040, 0x4faf57f9
+0,          9,          9,        1,   599040, 0x373f02e6
+0,         10,         10,        1,   599040, 0xd140dd00
+0,         11,         11,        1,   599040, 0x306c0cd8
+0,         12,         12,        1,   599040, 0x55cf5e78
+0,         13,         13,        1,   599040, 0xff0be66a
+0,         14,         14,        1,   599040, 0xd9d25dad
+0,         15,         15,        1,   599040, 0x15d9ea2c
+0,         16,         16,        1,   599040, 0x79376390
+0,         17,         17,        1,   599040, 0x24623936
+0,         18,         18,        1,   599040, 0x9219bd14
+0,         19,         19,        1,   599040, 0x527466b1
+0,         20,         20,        1,   599040, 0x7842c98d
+0,         21,         21,        1,   599040, 0x79d7fc77
+0,         22,         22,        1,   599040, 0xef05bfe9
+0,         23,         23,        1,   599040, 0xf8024da4
+0,         24,         24,        1,   599040, 0x511d016e
+0,         25,         25,        1,   599040, 0x81034a76
+0,         26,         26,        1,   599040, 0x08964794
+0,         27,         27,        1,   599040, 0x3a58520d
+0,         28,         28,        1,   599040, 0x11b985e2
+0,         29,         29,        1,   599040, 0x0a74dc70
+0,         30,         30,        1,   599040, 0x84e45bf8
+0,         31,         31,        1,   599040, 0xdfc7b5db
+0,         32,         32,        1,   599040, 0x45b2b466
+0,         33,         33,        1,   599040, 0xeb8a276b
+0,         34,         34,        1,   599040, 0x60901d6b
+0,         35,         35,        1,   599040, 0xa91f4bb5
+0,         36,         36,        1,   599040, 0x075a6805
+0,         37,         37,        1,   599040, 0x125cac7b
+0,         38,         38,        1,   599040, 0x1eaf3e28
+0,         39,         39,        1,   599040, 0xea09afb0
+0,         40,         40,        1,   599040, 0x880f7226
+0,         41,         41,        1,   599040, 0x9c59a833
+0,         42,         42,        1,   599040, 0x6219dc87
+0,         43,         43,        1,   599040, 0x44916437
+0,         44,         44,        1,   599040, 0xb545c563
+0,         45,         45,        1,   599040, 0x988d396e
+0,         46,         46,        1,   599040, 0x6fa11ed6
+0,         47,         47,        1,   599040, 0x7f7e3921
+0,         48,         48,        1,   599040, 0x62eb7f4a
+0,         49,         49,        1,   599040, 0x604c3071
+0,         50,         50,        1,   599040, 0x3d0a3fdd
+0,         51,         51,        1,   599040, 0x38df42ed
+0,         52,         52,        1,   599040, 0x3881190d
+0,         53,         53,        1,   599040, 0x6da811da
+0,         54,         54,        1,   599040, 0x23c61fa1
+0,         55,         55,        1,   599040, 0xfd6f428b
+0,         56,         56,        1,   599040, 0xd03424a8
+0,         57,         57,        1,   599040, 0xaa9b9e2e
+0,         58,         58,        1,   599040, 0x626636b5
+0,         59,         59,        1,   599040, 0x6ce8e513
diff --git a/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1 b/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1
new file mode 100644
index 0000000000..fe890040e6
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-BUMPING_A_ericsson_1
@@ -0,0 +1,54 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
+0,          0,          0,        1,   149760, 0x8ce7200b
+0,          1,          1,        1,   149760, 0x73610669
+0,          2,          2,        1,   149760, 0xc01620f4
+0,          3,          3,        1,   149760, 0x847a4297
+0,          4,          4,        1,   149760, 0x8b2db700
+0,          5,          5,        1,   149760, 0x17b1d77c
+0,          6,          6,        1,   149760, 0xc31ee8a5
+0,          7,          7,        1,   149760, 0x19541295
+0,          8,          8,        1,   149760, 0xd050be45
+0,          9,          9,        1,   149760, 0x45cf8e84
+0,         10,         10,        1,   149760, 0x0dd3e4d4
+0,         11,         11,        1,   149760, 0xc8347a7c
+0,         12,         12,        1,   149760, 0x24089674
+0,         13,         13,        1,   149760, 0xdf2c44e4
+0,         14,         14,        1,   149760, 0x83f5100b
+0,         15,         15,        1,   149760, 0x9a060faf
+0,         16,         16,        1,   149760, 0x4cdc6101
+0,         17,         17,        1,   149760, 0xe492ad68
+0,         18,         18,        1,   149760, 0x35b73887
+0,         19,         19,        1,   149760, 0x259f898a
+0,         20,         20,        1,   149760, 0x21df021b
+0,         21,         21,        1,   149760, 0xdddc1cfe
+0,         22,         22,        1,   149760, 0x53841bf5
+0,         23,         23,        1,   149760, 0x16745d74
+0,         24,         24,        1,   149760, 0x66e79e6a
+0,         25,         25,        1,   149760, 0x35f04b5a
+0,         26,         26,        1,   149760, 0x1472eee7
+0,         27,         27,        1,   149760, 0x42d0147c
+0,         28,         28,        1,   149760, 0x57c9bdc2
+0,         29,         29,        1,   149760, 0x20ad4cc7
+0,         30,         30,        1,   149760, 0x1617ef6c
+0,         31,         31,        1,   149760, 0xccdf4da2
+0,         32,         32,        1,   149760, 0xc173b762
+0,         33,         33,        1,   149760, 0xe7390c69
+0,         34,         34,        1,   149760, 0xfd0c97d3
+0,         35,         35,        1,   149760, 0xaeb2d61f
+0,         36,         36,        1,   149760, 0xe7b114d2
+0,         37,         37,        1,   149760, 0x1b771de4
+0,         38,         38,        1,   149760, 0xd3e03840
+0,         39,         39,        1,   149760, 0x702ef44b
+0,         40,         40,        1,   149760, 0xe96f848b
+0,         41,         41,        1,   149760, 0xa0ae24d9
+0,         42,         42,        1,   149760, 0x1b9efdfb
+0,         43,         43,        1,   149760, 0xceac9bc7
+0,         44,         44,        1,   149760, 0x73078700
+0,         45,         45,        1,   149760, 0xa736637e
+0,         46,         46,        1,   149760, 0xbd353c9d
+0,         47,         47,        1,   149760, 0x750a23ba
+0,         48,         48,        1,   149760, 0x4144c56e
diff --git a/tests/ref/fate/hevc-conformance-CAINIT_A_SHARP_4 b/tests/ref/fate/hevc-conformance-CAINIT_A_SHARP_4
index 53b621b70f..2ad98af6ce 100644
--- a/tests/ref/fate/hevc-conformance-CAINIT_A_SHARP_4
+++ b/tests/ref/fate/hevc-conformance-CAINIT_A_SHARP_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x001f0c48
 0,          1,          1,        1,   599040, 0x83120d87
 0,          2,          2,        1,   599040, 0x10c267aa
diff --git a/tests/ref/fate/hevc-conformance-CAINIT_B_SHARP_4 b/tests/ref/fate/hevc-conformance-CAINIT_B_SHARP_4
index 9aeb3b15eb..2ac978272c 100644
--- a/tests/ref/fate/hevc-conformance-CAINIT_B_SHARP_4
+++ b/tests/ref/fate/hevc-conformance-CAINIT_B_SHARP_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x001f0c48
 0,          1,          1,        1,   599040, 0xf8160d82
 0,          2,          2,        1,   599040, 0x5f2060e2
diff --git a/tests/ref/fate/hevc-conformance-CAINIT_C_SHARP_3 b/tests/ref/fate/hevc-conformance-CAINIT_C_SHARP_3
index c891c44a82..11c98cb719 100644
--- a/tests/ref/fate/hevc-conformance-CAINIT_C_SHARP_3
+++ b/tests/ref/fate/hevc-conformance-CAINIT_C_SHARP_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x2b58dee2
 0,          1,          1,        1,   599040, 0x2b58dee2
 0,          2,          2,        1,   599040, 0xcd9295f4
diff --git a/tests/ref/fate/hevc-conformance-CAINIT_D_SHARP_3 b/tests/ref/fate/hevc-conformance-CAINIT_D_SHARP_3
index 0294a7eefc..ad303fa06f 100644
--- a/tests/ref/fate/hevc-conformance-CAINIT_D_SHARP_3
+++ b/tests/ref/fate/hevc-conformance-CAINIT_D_SHARP_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x2b58dee2
 0,          1,          1,        1,   599040, 0x2b58dee2
 0,          2,          2,        1,   599040, 0xb055b638
diff --git a/tests/ref/fate/hevc-conformance-CAINIT_E_SHARP_3 b/tests/ref/fate/hevc-conformance-CAINIT_E_SHARP_3
index 430426bd04..6dfd2212db 100644
--- a/tests/ref/fate/hevc-conformance-CAINIT_E_SHARP_3
+++ b/tests/ref/fate/hevc-conformance-CAINIT_E_SHARP_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x1cf21d79
 0,          1,          1,        1,   599040, 0x1cf21d79
 0,          2,          2,        1,   599040, 0xb54ee9e0
diff --git a/tests/ref/fate/hevc-conformance-CAINIT_F_SHARP_3 b/tests/ref/fate/hevc-conformance-CAINIT_F_SHARP_3
index aeba53ba65..cbe498b71f 100644
--- a/tests/ref/fate/hevc-conformance-CAINIT_F_SHARP_3
+++ b/tests/ref/fate/hevc-conformance-CAINIT_F_SHARP_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x1cf21d79
 0,          1,          1,        1,   599040, 0x1cf21d79
 0,          2,          2,        1,   599040, 0xc182eaa8
diff --git a/tests/ref/fate/hevc-conformance-CAINIT_G_SHARP_3 b/tests/ref/fate/hevc-conformance-CAINIT_G_SHARP_3
index e0501beab6..e7cc4bb625 100644
--- a/tests/ref/fate/hevc-conformance-CAINIT_G_SHARP_3
+++ b/tests/ref/fate/hevc-conformance-CAINIT_G_SHARP_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0xd9b73cbe
 0,          1,          1,        1,   599040, 0xd9b73cbe
 0,          2,          2,        1,   599040, 0xe4e5dd7c
diff --git a/tests/ref/fate/hevc-conformance-CAINIT_H_SHARP_3 b/tests/ref/fate/hevc-conformance-CAINIT_H_SHARP_3
index 01ab258d58..aadc24a612 100644
--- a/tests/ref/fate/hevc-conformance-CAINIT_H_SHARP_3
+++ b/tests/ref/fate/hevc-conformance-CAINIT_H_SHARP_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0xd9b73cbe
 0,          1,          1,        1,   599040, 0xd9b73cbe
 0,          2,          2,        1,   599040, 0x93a3fabf
diff --git a/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3 b/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3
index afa485470a..3adef2f366 100644
--- a/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3
+++ b/tests/ref/fate/hevc-conformance-CIP_A_Panasonic_3
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x6e1f16d0
 0,          1,          1,        1,   149760, 0x5be5bde9
diff --git a/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2 b/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2
index 3346e20a57..8e6c681cfe 100644
--- a/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2
+++ b/tests/ref/fate/hevc-conformance-CIP_C_Panasonic_2
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xcd1019b2
 0,          1,          1,        1,   149760, 0xeb39efeb
diff --git a/tests/ref/fate/hevc-conformance-CONFWIN_A_Sony_1 b/tests/ref/fate/hevc-conformance-CONFWIN_A_Sony_1
new file mode 100644
index 0000000000..1d4af3d58c
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-CONFWIN_A_Sony_1
@@ -0,0 +1,65 @@
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 412x236
+#sar 0: 0/1
+0,          0,          0,        1,   145848, 0xad4f07d0
+0,          1,          1,        1,   145848, 0x5825120c
+0,          2,          2,        1,   145848, 0x3eeb0da2
+0,          3,          3,        1,   145848, 0xcb8b552c
+0,          4,          4,        1,   145848, 0x47760242
+0,          5,          5,        1,   145848, 0x300db218
+0,          6,          6,        1,   145848, 0xef413a76
+0,          7,          7,        1,   145848, 0x35ef8c97
+0,          8,          8,        1,   145848, 0x9075e0e4
+0,          9,          9,        1,   145848, 0xedfc1421
+0,         10,         10,        1,   145848, 0x6b11ff04
+0,         11,         11,        1,   145848, 0x07d46c17
+0,         12,         12,        1,   145848, 0xeb65e8f5
+0,         13,         13,        1,   145848, 0xd3ce9d91
+0,         14,         14,        1,   145848, 0x2eec1e60
+0,         15,         15,        1,   145848, 0x31bd643f
+0,         16,         16,        1,   145848, 0xc7279b2d
+0,         17,         17,        1,   145848, 0x1ec6e5d0
+0,         18,         18,        1,   145848, 0x878e7dfb
+0,         19,         19,        1,   145848, 0xe5d06c0f
+0,         20,         20,        1,   145848, 0x67346b38
+0,         21,         21,        1,   145848, 0xe6fb3974
+0,         22,         22,        1,   145848, 0x85ff6677
+0,         23,         23,        1,   145848, 0xbcb7185c
+0,         24,         24,        1,   145848, 0xf83eb2c2
+0,         25,         25,        1,   145848, 0x86f0f302
+0,         26,         26,        1,   145848, 0x427a882b
+0,         27,         27,        1,   145848, 0x6ee5d9ab
+0,         28,         28,        1,   145848, 0x1da83f0e
+0,         29,         29,        1,   145848, 0x6d4c21f0
+0,         30,         30,        1,   145848, 0xccf4df3f
+0,         31,         31,        1,   145848, 0x605cb762
+0,         32,         32,        1,   145848, 0x183e01e4
+0,         33,         33,        1,   145848, 0xdad146e6
+0,         34,         34,        1,   145848, 0x3804955b
+0,         35,         35,        1,   145848, 0x379e8a1c
+0,         36,         36,        1,   145848, 0x73f3246b
+0,         37,         37,        1,   145848, 0x5440b62a
+0,         38,         38,        1,   145848, 0x4919daed
+0,         39,         39,        1,   145848, 0x43f4c06d
+0,         40,         40,        1,   145848, 0x96fd53a8
+0,         41,         41,        1,   145848, 0x41efa7a7
+0,         42,         42,        1,   145848, 0x6bd20430
+0,         43,         43,        1,   145848, 0x25a69a61
+0,         44,         44,        1,   145848, 0xb37a369f
+0,         45,         45,        1,   145848, 0x5f32c40b
+0,         46,         46,        1,   145848, 0x9774371c
+0,         47,         47,        1,   145848, 0x27f28d2d
+0,         48,         48,        1,   145848, 0xd4751a44
+0,         49,         49,        1,   145848, 0x49df5cde
+0,         50,         50,        1,   145848, 0x80829f9f
+0,         51,         51,        1,   145848, 0xc6c3a17d
+0,         52,         52,        1,   145848, 0xdbc0bf65
+0,         53,         53,        1,   145848, 0xd941733a
+0,         54,         54,        1,   145848, 0x1ca612a9
+0,         55,         55,        1,   145848, 0xba52806b
+0,         56,         56,        1,   145848, 0x387f1a1f
+0,         57,         57,        1,   145848, 0x24e405c4
+0,         58,         58,        1,   145848, 0xe35f8d73
+0,         59,         59,        1,   145848, 0x5209a2e4
diff --git a/tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_2 b/tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_3
index 50be4f1845..f33b1623c8 100644
--- a/tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_2
+++ b/tests/ref/fate/hevc-conformance-DBLK_A_MAIN10_VIXS_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    76032, 0x4313935b
 0,          1,          1,        1,    76032, 0x4c8071b5
 0,          2,          2,        1,    76032, 0x5e627edc
diff --git a/tests/ref/fate/hevc-conformance-DBLK_A_SONY_3 b/tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
index 0750bb3209..4571119a91 100644
--- a/tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
+++ b/tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
@@ -1,31 +1,35 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x154e6dd9
-0,          2,          2,        1,   599040, 0xcce25693
-0,          3,          3,        1,   599040, 0x3dd84e88
-0,          4,          4,        1,   599040, 0xca197027
-0,          5,          5,        1,   599040, 0xc9af0241
-0,          6,          6,        1,   599040, 0x510470de
-0,          7,          7,        1,   599040, 0xac8c0a7c
-0,          8,          8,        1,   599040, 0x04cbed5e
-0,          9,          9,        1,   599040, 0x514ce2f1
-0,         10,         10,        1,   599040, 0xf37a4eec
-0,         11,         11,        1,   599040, 0xabfd7f2f
-0,         12,         12,        1,   599040, 0x944458a1
-0,         13,         13,        1,   599040, 0xf4f81db2
-0,         14,         14,        1,   599040, 0xdde236fb
-0,         15,         15,        1,   599040, 0x6b0132be
-0,         16,         16,        1,   599040, 0x641683a3
-0,         17,         17,        1,   599040, 0x81d6be90
-0,         18,         18,        1,   599040, 0xf1e04e55
-0,         19,         19,        1,   599040, 0x63c4dc0a
-0,         20,         20,        1,   599040, 0x47170db8
-0,         21,         21,        1,   599040, 0xdc22f27b
-0,         22,         22,        1,   599040, 0xd5b63800
-0,         23,         23,        1,   599040, 0x07b76936
-0,         24,         24,        1,   599040, 0x5215eee2
-0,         25,         25,        1,   599040, 0xb5b2c9b1
-0,         26,         26,        1,   599040, 0x79bee732
-0,         27,         27,        1,   599040, 0x14c1f436
-0,         28,         28,        1,   599040, 0x384f7f05
-0,         29,         29,        1,   599040, 0x44229c42
-0,         30,         30,        1,   599040, 0x5dea88e9
+0,          1,          1,        1,   599040, 0xcce25693
+0,          2,          2,        1,   599040, 0x3dd84e88
+0,          3,          3,        1,   599040, 0xca197027
+0,          4,          4,        1,   599040, 0xc9af0241
+0,          5,          5,        1,   599040, 0x510470de
+0,          6,          6,        1,   599040, 0xac8c0a7c
+0,          7,          7,        1,   599040, 0x04cbed5e
+0,          8,          8,        1,   599040, 0x514ce2f1
+0,          9,          9,        1,   599040, 0xf37a4eec
+0,         10,         10,        1,   599040, 0xabfd7f2f
+0,         11,         11,        1,   599040, 0x944458a1
+0,         12,         12,        1,   599040, 0xf4f81db2
+0,         13,         13,        1,   599040, 0xdde236fb
+0,         14,         14,        1,   599040, 0x6b0132be
+0,         15,         15,        1,   599040, 0x641683a3
+0,         16,         16,        1,   599040, 0x81d6be90
+0,         17,         17,        1,   599040, 0xf1e04e55
+0,         18,         18,        1,   599040, 0x63c4dc0a
+0,         19,         19,        1,   599040, 0x47170db8
+0,         20,         20,        1,   599040, 0xdc22f27b
+0,         21,         21,        1,   599040, 0xd5b63800
+0,         22,         22,        1,   599040, 0x07b76936
+0,         23,         23,        1,   599040, 0x5215eee2
+0,         24,         24,        1,   599040, 0xb5b2c9b1
+0,         25,         25,        1,   599040, 0x79bee732
+0,         26,         26,        1,   599040, 0x14c1f436
+0,         27,         27,        1,   599040, 0x384f7f05
+0,         28,         28,        1,   599040, 0x44229c42
+0,         29,         29,        1,   599040, 0x5dea88e9
diff --git a/tests/ref/fate/hevc-conformance-DBLK_B_SONY_3 b/tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
index 83f9b4a265..eebb5a3d01 100644
--- a/tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
+++ b/tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
@@ -1,31 +1,35 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0xda0cb5d4
-0,          2,          2,        1,   599040, 0x352bc397
-0,          3,          3,        1,   599040, 0x72bc28fe
-0,          4,          4,        1,   599040, 0x22294f68
-0,          5,          5,        1,   599040, 0x1f6415a7
-0,          6,          6,        1,   599040, 0xa9f6b0d7
-0,          7,          7,        1,   599040, 0x6b7c1f2d
-0,          8,          8,        1,   599040, 0xb93857f5
-0,          9,          9,        1,   599040, 0xb0d752d3
-0,         10,         10,        1,   599040, 0x0622e689
-0,         11,         11,        1,   599040, 0x23d8780a
-0,         12,         12,        1,   599040, 0x4844581b
-0,         13,         13,        1,   599040, 0x791322f9
-0,         14,         14,        1,   599040, 0x82f6cf43
-0,         15,         15,        1,   599040, 0xcace3aba
-0,         16,         16,        1,   599040, 0x68a68427
-0,         17,         17,        1,   599040, 0x23fa500a
-0,         18,         18,        1,   599040, 0x7d78b77d
-0,         19,         19,        1,   599040, 0x8d295032
-0,         20,         20,        1,   599040, 0x16fa266c
-0,         21,         21,        1,   599040, 0x37d8173b
-0,         22,         22,        1,   599040, 0x8a4f90e1
-0,         23,         23,        1,   599040, 0x40f98f6d
-0,         24,         24,        1,   599040, 0xc060b193
-0,         25,         25,        1,   599040, 0xa53c3bc1
-0,         26,         26,        1,   599040, 0x5a9556d6
-0,         27,         27,        1,   599040, 0x37582393
-0,         28,         28,        1,   599040, 0x376acd14
-0,         29,         29,        1,   599040, 0x81ee1e64
-0,         30,         30,        1,   599040, 0xff2a600c
+0,          1,          1,        1,   599040, 0x352bc397
+0,          2,          2,        1,   599040, 0x72bc28fe
+0,          3,          3,        1,   599040, 0x22294f68
+0,          4,          4,        1,   599040, 0x1f6415a7
+0,          5,          5,        1,   599040, 0xa9f6b0d7
+0,          6,          6,        1,   599040, 0x6b7c1f2d
+0,          7,          7,        1,   599040, 0xb93857f5
+0,          8,          8,        1,   599040, 0xb0d752d3
+0,          9,          9,        1,   599040, 0x0622e689
+0,         10,         10,        1,   599040, 0x23d8780a
+0,         11,         11,        1,   599040, 0x4844581b
+0,         12,         12,        1,   599040, 0x791322f9
+0,         13,         13,        1,   599040, 0x82f6cf43
+0,         14,         14,        1,   599040, 0xcace3aba
+0,         15,         15,        1,   599040, 0x68a68427
+0,         16,         16,        1,   599040, 0x23fa500a
+0,         17,         17,        1,   599040, 0x7d78b77d
+0,         18,         18,        1,   599040, 0x8d295032
+0,         19,         19,        1,   599040, 0x16fa266c
+0,         20,         20,        1,   599040, 0x37d8173b
+0,         21,         21,        1,   599040, 0x8a4f90e1
+0,         22,         22,        1,   599040, 0x40f98f6d
+0,         23,         23,        1,   599040, 0xc060b193
+0,         24,         24,        1,   599040, 0xa53c3bc1
+0,         25,         25,        1,   599040, 0x5a9556d6
+0,         26,         26,        1,   599040, 0x37582393
+0,         27,         27,        1,   599040, 0x376acd14
+0,         28,         28,        1,   599040, 0x81ee1e64
+0,         29,         29,        1,   599040, 0xff2a600c
diff --git a/tests/ref/fate/hevc-conformance-DBLK_C_SONY_3 b/tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
index 1087148501..c452c19f11 100644
--- a/tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
+++ b/tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
@@ -1,31 +1,35 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x57369bf4
-0,          2,          2,        1,   599040, 0x319aab9c
-0,          3,          3,        1,   599040, 0xbc1b7698
-0,          4,          4,        1,   599040, 0x05cea248
-0,          5,          5,        1,   599040, 0xdca73743
-0,          6,          6,        1,   599040, 0x5b5a9f70
-0,          7,          7,        1,   599040, 0x16c51b34
-0,          8,          8,        1,   599040, 0x734fe724
-0,          9,          9,        1,   599040, 0x48e4e0ba
-0,         10,         10,        1,   599040, 0xf1423cc1
-0,         11,         11,        1,   599040, 0xb4bb68b1
-0,         12,         12,        1,   599040, 0x54a77ad6
-0,         13,         13,        1,   599040, 0x6e0dfce3
-0,         14,         14,        1,   599040, 0x7ca687e3
-0,         15,         15,        1,   599040, 0xf9ac2443
-0,         16,         16,        1,   599040, 0xe35b8d34
-0,         17,         17,        1,   599040, 0xef4bbe9f
-0,         18,         18,        1,   599040, 0x21eb418e
-0,         19,         19,        1,   599040, 0xae6df30f
-0,         20,         20,        1,   599040, 0x743500af
-0,         21,         21,        1,   599040, 0x7fba1ce1
-0,         22,         22,        1,   599040, 0x45793eae
-0,         23,         23,        1,   599040, 0x1f7e3467
-0,         24,         24,        1,   599040, 0x7400c7c3
-0,         25,         25,        1,   599040, 0xcf79806d
-0,         26,         26,        1,   599040, 0x324ea91d
-0,         27,         27,        1,   599040, 0x9c8cae92
-0,         28,         28,        1,   599040, 0x70bfc368
-0,         29,         29,        1,   599040, 0x46a0f8ff
-0,         30,         30,        1,   599040, 0xd864208a
+0,          1,          1,        1,   599040, 0x319aab9c
+0,          2,          2,        1,   599040, 0xbc1b7698
+0,          3,          3,        1,   599040, 0x05cea248
+0,          4,          4,        1,   599040, 0xdca73743
+0,          5,          5,        1,   599040, 0x5b5a9f70
+0,          6,          6,        1,   599040, 0x16c51b34
+0,          7,          7,        1,   599040, 0x734fe724
+0,          8,          8,        1,   599040, 0x48e4e0ba
+0,          9,          9,        1,   599040, 0xf1423cc1
+0,         10,         10,        1,   599040, 0xb4bb68b1
+0,         11,         11,        1,   599040, 0x54a77ad6
+0,         12,         12,        1,   599040, 0x6e0dfce3
+0,         13,         13,        1,   599040, 0x7ca687e3
+0,         14,         14,        1,   599040, 0xf9ac2443
+0,         15,         15,        1,   599040, 0xe35b8d34
+0,         16,         16,        1,   599040, 0xef4bbe9f
+0,         17,         17,        1,   599040, 0x21eb418e
+0,         18,         18,        1,   599040, 0xae6df30f
+0,         19,         19,        1,   599040, 0x743500af
+0,         20,         20,        1,   599040, 0x7fba1ce1
+0,         21,         21,        1,   599040, 0x45793eae
+0,         22,         22,        1,   599040, 0x1f7e3467
+0,         23,         23,        1,   599040, 0x7400c7c3
+0,         24,         24,        1,   599040, 0xcf79806d
+0,         25,         25,        1,   599040, 0x324ea91d
+0,         26,         26,        1,   599040, 0x9c8cae92
+0,         27,         27,        1,   599040, 0x70bfc368
+0,         28,         28,        1,   599040, 0x46a0f8ff
+0,         29,         29,        1,   599040, 0xd864208a
diff --git a/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_1 b/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_1
deleted file mode 100644
index 3d9e43b1c0..0000000000
--- a/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_1
+++ /dev/null
@@ -1,9 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,  1382400, 0x6ef5c76e
-0,          1,          1,        1,  1382400, 0x975238be
-0,          2,          2,        1,  1382400, 0xe5529a79
-0,          3,          3,        1,  1382400, 0x639641d4
-0,          4,          4,        1,  1382400, 0x566eb1df
-0,          5,          5,        1,  1382400, 0x4fd4b46a
-0,          6,          6,        1,  1382400, 0xfb4a6a0e
-0,          7,          7,        1,  1382400, 0x4485af32
diff --git a/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_2 b/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_2
index 2bdc548bd0..4a15b950a6 100644
--- a/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_2
+++ b/tests/ref/fate/hevc-conformance-DBLK_D_VIXS_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  1382400, 0x6ef5c76e
 0,          1,          1,        1,  1382400, 0x1e1926b1
 0,          2,          2,        1,  1382400, 0x69888786
diff --git a/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_1 b/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_1
deleted file mode 100644
index c3ebaf2081..0000000000
--- a/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_1
+++ /dev/null
@@ -1,9 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,  1382400, 0x7119bbe5
-0,          1,          1,        1,  1382400, 0xbeda2c83
-0,          2,          2,        1,  1382400, 0x2cbe6669
-0,          3,          3,        1,  1382400, 0x3cee2619
-0,          4,          4,        1,  1382400, 0x93e388e3
-0,          5,          5,        1,  1382400, 0x5e286889
-0,          6,          6,        1,  1382400, 0x4718f29c
-0,          7,          7,        1,  1382400, 0xbedf4dbd
diff --git a/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_2 b/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_2
index 4c8b07d726..8bde7a7ee7 100644
--- a/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_2
+++ b/tests/ref/fate/hevc-conformance-DBLK_E_VIXS_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  1382400, 0xecfdf606
 0,          1,          1,        1,  1382400, 0x0b0382e1
 0,          2,          2,        1,  1382400, 0xbef3afd6
diff --git a/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_1 b/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_1
deleted file mode 100644
index 59f51efaa8..0000000000
--- a/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_1
+++ /dev/null
@@ -1,9 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,  1382400, 0xea27f7bd
-0,          1,          1,        1,  1382400, 0xce3d7b4c
-0,          2,          2,        1,  1382400, 0xaea4970e
-0,          3,          3,        1,  1382400, 0xcbc7c89f
-0,          4,          4,        1,  1382400, 0xe5367019
-0,          5,          5,        1,  1382400, 0xb92ca18e
-0,          6,          6,        1,  1382400, 0xde046be1
-0,          7,          7,        1,  1382400, 0x1ae6e393
diff --git a/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_2 b/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_2
index 3ff62e5a45..8794dbbbf4 100644
--- a/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_2
+++ b/tests/ref/fate/hevc-conformance-DBLK_F_VIXS_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  1382400, 0xea27f7bd
 0,          1,          1,        1,  1382400, 0x423e555b
 0,          2,          2,        1,  1382400, 0x87898ae0
diff --git a/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_1 b/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_1
deleted file mode 100644
index 4b9793b154..0000000000
--- a/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_1
+++ /dev/null
@@ -1,9 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,  1382400, 0xecfdf606
-0,          1,          1,        1,  1382400, 0x7607799b
-0,          2,          2,        1,  1382400, 0x67fb98e4
-0,          3,          3,        1,  1382400, 0xf2dce07f
-0,          4,          4,        1,  1382400, 0x663f991c
-0,          5,          5,        1,  1382400, 0x3877aeb0
-0,          6,          6,        1,  1382400, 0x73409282
-0,          7,          7,        1,  1382400, 0x766c10b1
diff --git a/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_2 b/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_2
index 4c8b07d726..8bde7a7ee7 100644
--- a/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_2
+++ b/tests/ref/fate/hevc-conformance-DBLK_G_VIXS_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  1382400, 0xecfdf606
 0,          1,          1,        1,  1382400, 0x0b0382e1
 0,          2,          2,        1,  1382400, 0xbef3afd6
diff --git a/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4 b/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4
new file mode 100644
index 0000000000..2abd58b64b
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-DELTAQP_A_BRCM_4
@@ -0,0 +1,101 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1088
+#sar 0: 0/1
+0,          0,          0,        1,  3133440, 0xfbd10331
+0,          1,          1,        1,  3133440, 0x7764ad70
+0,          2,          2,        1,  3133440, 0xaeaf44c1
+0,          3,          3,        1,  3133440, 0x0590073b
+0,          4,          4,        1,  3133440, 0xc4173137
+0,          5,          5,        1,  3133440, 0xd173b667
+0,          6,          6,        1,  3133440, 0xb70253db
+0,          7,          7,        1,  3133440, 0x506ada41
+0,          8,          8,        1,  3133440, 0x7748178b
+0,          9,          9,        1,  3133440, 0xd5450415
+0,         10,         10,        1,  3133440, 0x2d1cf084
+0,         11,         11,        1,  3133440, 0xc89fb208
+0,         12,         12,        1,  3133440, 0x3d065c44
+0,         13,         13,        1,  3133440, 0x15a67a95
+0,         14,         14,        1,  3133440, 0xde1684ca
+0,         15,         15,        1,  3133440, 0xc3e64367
+0,         16,         16,        1,  3133440, 0x5bf1bd00
+0,         17,         17,        1,  3133440, 0x253703c8
+0,         18,         18,        1,  3133440, 0x5c5fb22b
+0,         19,         19,        1,  3133440, 0x5fcd0915
+0,         20,         20,        1,  3133440, 0xb6fe6c0d
+0,         21,         21,        1,  3133440, 0x3673f749
+0,         22,         22,        1,  3133440, 0x42535c71
+0,         23,         23,        1,  3133440, 0x889fd32d
+0,         24,         24,        1,  3133440, 0x259c6c22
+0,         25,         25,        1,  3133440, 0x128844a2
+0,         26,         26,        1,  3133440, 0x34d9ead6
+0,         27,         27,        1,  3133440, 0x0a68658a
+0,         28,         28,        1,  3133440, 0x3aa96f3e
+0,         29,         29,        1,  3133440, 0x20249702
+0,         30,         30,        1,  3133440, 0x6d14a401
+0,         31,         31,        1,  3133440, 0xf6acf9ae
+0,         32,         32,        1,  3133440, 0x0894adfb
+0,         33,         33,        1,  3133440, 0x664178bb
+0,         34,         34,        1,  3133440, 0x6b9305df
+0,         35,         35,        1,  3133440, 0x8afd4ab4
+0,         36,         36,        1,  3133440, 0x1869c2aa
+0,         37,         37,        1,  3133440, 0x004f3a7d
+0,         38,         38,        1,  3133440, 0xadeb9a81
+0,         39,         39,        1,  3133440, 0xbeffc378
+0,         40,         40,        1,  3133440, 0x58c34e3c
+0,         41,         41,        1,  3133440, 0x5b07ad91
+0,         42,         42,        1,  3133440, 0x41bf5cb6
+0,         43,         43,        1,  3133440, 0x65ebea43
+0,         44,         44,        1,  3133440, 0x9c2462ae
+0,         45,         45,        1,  3133440, 0x3cbc1a04
+0,         46,         46,        1,  3133440, 0x0debbeeb
+0,         47,         47,        1,  3133440, 0x954399f6
+0,         48,         48,        1,  3133440, 0x3ba1b057
+0,         49,         49,        1,  3133440, 0x3b5a0cae
+0,         50,         50,        1,  3133440, 0xfdf6c423
+0,         51,         51,        1,  3133440, 0x08097c97
+0,         52,         52,        1,  3133440, 0x13f06984
+0,         53,         53,        1,  3133440, 0x52a3baec
+0,         54,         54,        1,  3133440, 0x7961fb92
+0,         55,         55,        1,  3133440, 0xb6805a96
+0,         56,         56,        1,  3133440, 0xde1c16e9
+0,         57,         57,        1,  3133440, 0x07cb1ffc
+0,         58,         58,        1,  3133440, 0xad1a1f91
+0,         59,         59,        1,  3133440, 0x77bb5968
+0,         60,         60,        1,  3133440, 0x85e8074c
+0,         61,         61,        1,  3133440, 0x1a2919ef
+0,         62,         62,        1,  3133440, 0x81540640
+0,         63,         63,        1,  3133440, 0xd61a3574
+0,         64,         64,        1,  3133440, 0xf875c32c
+0,         65,         65,        1,  3133440, 0x50548308
+0,         66,         66,        1,  3133440, 0xf98ee7e9
+0,         67,         67,        1,  3133440, 0xb7b4cb8e
+0,         68,         68,        1,  3133440, 0x1c22b2b7
+0,         69,         69,        1,  3133440, 0x2ea55366
+0,         70,         70,        1,  3133440, 0x82e76ac5
+0,         71,         71,        1,  3133440, 0x292af798
+0,         72,         72,        1,  3133440, 0x29508415
+0,         73,         73,        1,  3133440, 0x4ef87b17
+0,         74,         74,        1,  3133440, 0xa6eeb679
+0,         75,         75,        1,  3133440, 0xfe69f819
+0,         76,         76,        1,  3133440, 0x95bb6b49
+0,         77,         77,        1,  3133440, 0x5bf3f8ad
+0,         78,         78,        1,  3133440, 0x58113e3a
+0,         79,         79,        1,  3133440, 0xd87b6888
+0,         80,         80,        1,  3133440, 0xb3e7a295
+0,         81,         81,        1,  3133440, 0x3c2c7f97
+0,         82,         82,        1,  3133440, 0xe5f5cc48
+0,         83,         83,        1,  3133440, 0xa222f3e6
+0,         84,         84,        1,  3133440, 0x6ae80e0b
+0,         85,         85,        1,  3133440, 0x2bc02816
+0,         86,         86,        1,  3133440, 0x2a5043cb
+0,         87,         87,        1,  3133440, 0x857089b9
+0,         88,         88,        1,  3133440, 0xf3443ad1
+0,         89,         89,        1,  3133440, 0x7cb10b4c
+0,         90,         90,        1,  3133440, 0x75bb32b9
+0,         91,         91,        1,  3133440, 0x6b720e0f
+0,         92,         92,        1,  3133440, 0x761571be
+0,         93,         93,        1,  3133440, 0x34dc14a1
+0,         94,         94,        1,  3133440, 0xbb94c2d4
+0,         95,         95,        1,  3133440, 0x5300e459
diff --git a/tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3 b/tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
index a8427d1d1c..b88c9f8d2a 100644
--- a/tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
+++ b/tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
@@ -1,31 +1,35 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x7ea9597c
-0,          2,          2,        1,   599040, 0x3e7365e4
-0,          3,          3,        1,   599040, 0x4a9149c9
-0,          4,          4,        1,   599040, 0x3b1f6549
-0,          5,          5,        1,   599040, 0x3e35f616
-0,          6,          6,        1,   599040, 0x843c7951
-0,          7,          7,        1,   599040, 0xa2adb299
-0,          8,          8,        1,   599040, 0xb9dda682
-0,          9,          9,        1,   599040, 0x9a5e7355
-0,         10,         10,        1,   599040, 0xc4bafa8c
-0,         11,         11,        1,   599040, 0xc4ec160e
-0,         12,         12,        1,   599040, 0x538421a3
-0,         13,         13,        1,   599040, 0xb294a96e
-0,         14,         14,        1,   599040, 0x9bb217df
-0,         15,         15,        1,   599040, 0xbe70c870
-0,         16,         16,        1,   599040, 0xa4e319a8
-0,         17,         17,        1,   599040, 0x3a4c702d
-0,         18,         18,        1,   599040, 0x9f790906
-0,         19,         19,        1,   599040, 0xbbfdb8d6
-0,         20,         20,        1,   599040, 0x0965c0ed
-0,         21,         21,        1,   599040, 0x6993e1f1
-0,         22,         22,        1,   599040, 0xc1cc1df9
-0,         23,         23,        1,   599040, 0xe570c390
-0,         24,         24,        1,   599040, 0x422f6fd7
-0,         25,         25,        1,   599040, 0x9c89298c
-0,         26,         26,        1,   599040, 0x5ece4193
-0,         27,         27,        1,   599040, 0x142a4f2f
-0,         28,         28,        1,   599040, 0xa5356c63
-0,         29,         29,        1,   599040, 0x8458a378
-0,         30,         30,        1,   599040, 0xc149ed56
+0,          1,          1,        1,   599040, 0x3e7365e4
+0,          2,          2,        1,   599040, 0x4a9149c9
+0,          3,          3,        1,   599040, 0x3b1f6549
+0,          4,          4,        1,   599040, 0x3e35f616
+0,          5,          5,        1,   599040, 0x843c7951
+0,          6,          6,        1,   599040, 0xa2adb299
+0,          7,          7,        1,   599040, 0xb9dda682
+0,          8,          8,        1,   599040, 0x9a5e7355
+0,          9,          9,        1,   599040, 0xc4bafa8c
+0,         10,         10,        1,   599040, 0xc4ec160e
+0,         11,         11,        1,   599040, 0x538421a3
+0,         12,         12,        1,   599040, 0xb294a96e
+0,         13,         13,        1,   599040, 0x9bb217df
+0,         14,         14,        1,   599040, 0xbe70c870
+0,         15,         15,        1,   599040, 0xa4e319a8
+0,         16,         16,        1,   599040, 0x3a4c702d
+0,         17,         17,        1,   599040, 0x9f790906
+0,         18,         18,        1,   599040, 0xbbfdb8d6
+0,         19,         19,        1,   599040, 0x0965c0ed
+0,         20,         20,        1,   599040, 0x6993e1f1
+0,         21,         21,        1,   599040, 0xc1cc1df9
+0,         22,         22,        1,   599040, 0xe570c390
+0,         23,         23,        1,   599040, 0x422f6fd7
+0,         24,         24,        1,   599040, 0x9c89298c
+0,         25,         25,        1,   599040, 0x5ece4193
+0,         26,         26,        1,   599040, 0x142a4f2f
+0,         27,         27,        1,   599040, 0xa5356c63
+0,         28,         28,        1,   599040, 0x8458a378
+0,         29,         29,        1,   599040, 0xc149ed56
diff --git a/tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3 b/tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
index 8037e9c818..56d4f05bdd 100644
--- a/tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
+++ b/tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
@@ -1,31 +1,35 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0xcb2969c5
-0,          2,          2,        1,   599040, 0xd9825d1f
-0,          3,          3,        1,   599040, 0x5ff4245a
-0,          4,          4,        1,   599040, 0xd34e7bcb
-0,          5,          5,        1,   599040, 0x032e1b8b
-0,          6,          6,        1,   599040, 0x5ba1873c
-0,          7,          7,        1,   599040, 0xa0b725ad
-0,          8,          8,        1,   599040, 0x9cade6a6
-0,          9,          9,        1,   599040, 0xe41bee5a
-0,         10,         10,        1,   599040, 0x9de4340f
-0,         11,         11,        1,   599040, 0xb966282a
-0,         12,         12,        1,   599040, 0x52fd5300
-0,         13,         13,        1,   599040, 0x8e6d6753
-0,         14,         14,        1,   599040, 0x2011759b
-0,         15,         15,        1,   599040, 0x5da5b7af
-0,         16,         16,        1,   599040, 0x090e298c
-0,         17,         17,        1,   599040, 0xfd618263
-0,         18,         18,        1,   599040, 0xdaf4ef69
-0,         19,         19,        1,   599040, 0x0349d1a0
-0,         20,         20,        1,   599040, 0x75a35caf
-0,         21,         21,        1,   599040, 0x4544918e
-0,         22,         22,        1,   599040, 0xbca15836
-0,         23,         23,        1,   599040, 0x443bc611
-0,         24,         24,        1,   599040, 0xc380beaf
-0,         25,         25,        1,   599040, 0x01a581ca
-0,         26,         26,        1,   599040, 0x1690835f
-0,         27,         27,        1,   599040, 0x871e9c3b
-0,         28,         28,        1,   599040, 0xf4c20a25
-0,         29,         29,        1,   599040, 0x86d8f2df
-0,         30,         30,        1,   599040, 0x7690bd56
+0,          1,          1,        1,   599040, 0xd9825d1f
+0,          2,          2,        1,   599040, 0x5ff4245a
+0,          3,          3,        1,   599040, 0xd34e7bcb
+0,          4,          4,        1,   599040, 0x032e1b8b
+0,          5,          5,        1,   599040, 0x5ba1873c
+0,          6,          6,        1,   599040, 0xa0b725ad
+0,          7,          7,        1,   599040, 0x9cade6a6
+0,          8,          8,        1,   599040, 0xe41bee5a
+0,          9,          9,        1,   599040, 0x9de4340f
+0,         10,         10,        1,   599040, 0xb966282a
+0,         11,         11,        1,   599040, 0x52fd5300
+0,         12,         12,        1,   599040, 0x8e6d6753
+0,         13,         13,        1,   599040, 0x2011759b
+0,         14,         14,        1,   599040, 0x5da5b7af
+0,         15,         15,        1,   599040, 0x090e298c
+0,         16,         16,        1,   599040, 0xfd618263
+0,         17,         17,        1,   599040, 0xdaf4ef69
+0,         18,         18,        1,   599040, 0x0349d1a0
+0,         19,         19,        1,   599040, 0x75a35caf
+0,         20,         20,        1,   599040, 0x4544918e
+0,         21,         21,        1,   599040, 0xbca15836
+0,         22,         22,        1,   599040, 0x443bc611
+0,         23,         23,        1,   599040, 0xc380beaf
+0,         24,         24,        1,   599040, 0x01a581ca
+0,         25,         25,        1,   599040, 0x1690835f
+0,         26,         26,        1,   599040, 0x871e9c3b
+0,         27,         27,        1,   599040, 0xf4c20a25
+0,         28,         28,        1,   599040, 0x86d8f2df
+0,         29,         29,        1,   599040, 0x7690bd56
diff --git a/tests/ref/fate/hevc-conformance-DSLICE_A_HHI_5 b/tests/ref/fate/hevc-conformance-DSLICE_A_HHI_5
index 6cd113bf1a..999a76a704 100644
--- a/tests/ref/fate/hevc-conformance-DSLICE_A_HHI_5
+++ b/tests/ref/fate/hevc-conformance-DSLICE_A_HHI_5
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  3110400, 0xdc18cd12
 0,          1,          1,        1,  3110400, 0x42f7020d
 0,          2,          2,        1,  3110400, 0x6ac4421a
diff --git a/tests/ref/fate/hevc-conformance-DSLICE_B_HHI_5 b/tests/ref/fate/hevc-conformance-DSLICE_B_HHI_5
index 7626d76adf..84a0c79a7d 100644
--- a/tests/ref/fate/hevc-conformance-DSLICE_B_HHI_5
+++ b/tests/ref/fate/hevc-conformance-DSLICE_B_HHI_5
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  3110400, 0x96995c57
 0,          1,          1,        1,  3110400, 0x2924a10f
 0,          2,          2,        1,  3110400, 0x892e146c
diff --git a/tests/ref/fate/hevc-conformance-DSLICE_C_HHI_5 b/tests/ref/fate/hevc-conformance-DSLICE_C_HHI_5
index c4275cb714..4b0d10866b 100644
--- a/tests/ref/fate/hevc-conformance-DSLICE_C_HHI_5
+++ b/tests/ref/fate/hevc-conformance-DSLICE_C_HHI_5
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  3110400, 0x62a2ceab
 0,          1,          1,        1,  3110400, 0x5e4d6adc
 0,          2,          2,        1,  3110400, 0x4ad0955d
diff --git a/tests/ref/fate/hevc-conformance-ENTP_A_LG_2 b/tests/ref/fate/hevc-conformance-ENTP_A_LG_2
deleted file mode 100644
index 5697619a69..0000000000
--- a/tests/ref/fate/hevc-conformance-ENTP_A_LG_2
+++ /dev/null
@@ -1,51 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,   599040, 0x866449d5
-0,          1,          1,        1,   599040, 0x6a8919f0
-0,          2,          2,        1,   599040, 0x5bec3742
-0,          3,          3,        1,   599040, 0x0e66f78b
-0,          4,          4,        1,   599040, 0x798e543b
-0,          5,          5,        1,   599040, 0x342467e0
-0,          6,          6,        1,   599040, 0x2cb393e1
-0,          7,          7,        1,   599040, 0x2f326539
-0,          8,          8,        1,   599040, 0x8ac6eb6a
-0,          9,          9,        1,   599040, 0x810a887b
-0,         10,         10,        1,   599040, 0x4feb2d60
-0,         11,         11,        1,   599040, 0xd32165ff
-0,         12,         12,        1,   599040, 0x46e505e1
-0,         13,         13,        1,   599040, 0x2d917014
-0,         14,         14,        1,   599040, 0xb504f112
-0,         15,         15,        1,   599040, 0x0fca37ce
-0,         16,         16,        1,   599040, 0x2d5a269d
-0,         17,         17,        1,   599040, 0x3928ef6d
-0,         18,         18,        1,   599040, 0x94397312
-0,         19,         19,        1,   599040, 0xc1c1257b
-0,         20,         20,        1,   599040, 0x4e23adcc
-0,         21,         21,        1,   599040, 0x3eaef1e0
-0,         22,         22,        1,   599040, 0x5e66fa14
-0,         23,         23,        1,   599040, 0x2adfa0c2
-0,         24,         24,        1,   599040, 0xf888db90
-0,         25,         25,        1,   599040, 0xab3a6418
-0,         26,         26,        1,   599040, 0x7689d0a2
-0,         27,         27,        1,   599040, 0x2f5746bf
-0,         28,         28,        1,   599040, 0xad2cf3da
-0,         29,         29,        1,   599040, 0x32f2854e
-0,         30,         30,        1,   599040, 0xb73cf7db
-0,         31,         31,        1,   599040, 0xbe996991
-0,         32,         32,        1,   599040, 0xe66501c8
-0,         33,         33,        1,   599040, 0x12d1bc13
-0,         34,         34,        1,   599040, 0x06e103d5
-0,         35,         35,        1,   599040, 0x49af0680
-0,         36,         36,        1,   599040, 0xdbf128b0
-0,         37,         37,        1,   599040, 0xa1ac770d
-0,         38,         38,        1,   599040, 0x99156429
-0,         39,         39,        1,   599040, 0x8ce1a9a7
-0,         40,         40,        1,   599040, 0x14067700
-0,         41,         41,        1,   599040, 0xcdedccee
-0,         42,         42,        1,   599040, 0x09c12765
-0,         43,         43,        1,   599040, 0x7979a1be
-0,         44,         44,        1,   599040, 0xbd3148d1
-0,         45,         45,        1,   599040, 0xc83f9aac
-0,         46,         46,        1,   599040, 0x91acbae4
-0,         47,         47,        1,   599040, 0xd230907a
-0,         48,         48,        1,   599040, 0x3f6c31f6
-0,         49,         49,        1,   599040, 0x84496e55
diff --git a/tests/ref/fate/hevc-conformance-ENTP_A_Qualcomm_1 b/tests/ref/fate/hevc-conformance-ENTP_A_Qualcomm_1
new file mode 100644
index 0000000000..26848c51c0
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-ENTP_A_Qualcomm_1
@@ -0,0 +1,29 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  3110400, 0x26663e50
+0,          1,          1,        1,  3110400, 0x64ae36c1
+0,          2,          2,        1,  3110400, 0x5c72ac0b
+0,          3,          3,        1,  3110400, 0x13617553
+0,          4,          4,        1,  3110400, 0xee94be8a
+0,          5,          5,        1,  3110400, 0x6324f8da
+0,          6,          6,        1,  3110400, 0xea0dd277
+0,          7,          7,        1,  3110400, 0xdf3e6b85
+0,          8,          8,        1,  3110400, 0xdc754b17
+0,          9,          9,        1,  3110400, 0xbb53a891
+0,         10,         10,        1,  3110400, 0x53c6575a
+0,         11,         11,        1,  3110400, 0xda720794
+0,         12,         12,        1,  3110400, 0x21be3522
+0,         13,         13,        1,  3110400, 0x7fd72aa9
+0,         14,         14,        1,  3110400, 0xeb0d104a
+0,         15,         15,        1,  3110400, 0xd038405a
+0,         16,         16,        1,  3110400, 0xd1f8b9fa
+0,         17,         17,        1,  3110400, 0xc96d2b8c
+0,         18,         18,        1,  3110400, 0x07f77dcd
+0,         19,         19,        1,  3110400, 0x673b444c
+0,         20,         20,        1,  3110400, 0x5a8b4836
+0,         21,         21,        1,  3110400, 0x1ce733d3
+0,         22,         22,        1,  3110400, 0xd919ae60
+0,         23,         23,        1,  3110400, 0x5dcc11c0
diff --git a/tests/ref/fate/hevc-conformance-ENTP_B_LG_2 b/tests/ref/fate/hevc-conformance-ENTP_B_LG_2
deleted file mode 100644
index 0251f3070c..0000000000
--- a/tests/ref/fate/hevc-conformance-ENTP_B_LG_2
+++ /dev/null
@@ -1,51 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,   599040, 0x95a24137
-0,          1,          1,        1,   599040, 0x7d7f2b75
-0,          2,          2,        1,   599040, 0xd9fb2120
-0,          3,          3,        1,   599040, 0x14d50590
-0,          4,          4,        1,   599040, 0xe3d1b70e
-0,          5,          5,        1,   599040, 0x57708a86
-0,          6,          6,        1,   599040, 0xae56a720
-0,          7,          7,        1,   599040, 0x74c18679
-0,          8,          8,        1,   599040, 0x6422d2a7
-0,          9,          9,        1,   599040, 0xf587702b
-0,         10,         10,        1,   599040, 0x0f630fe0
-0,         11,         11,        1,   599040, 0x4e3537dd
-0,         12,         12,        1,   599040, 0xa645e9c1
-0,         13,         13,        1,   599040, 0x35ab4155
-0,         14,         14,        1,   599040, 0x4b78ba34
-0,         15,         15,        1,   599040, 0xa9a9e572
-0,         16,         16,        1,   599040, 0x6d57f10f
-0,         17,         17,        1,   599040, 0xffb8e333
-0,         18,         18,        1,   599040, 0x7b2d6319
-0,         19,         19,        1,   599040, 0xcf3319aa
-0,         20,         20,        1,   599040, 0xb0d097ee
-0,         21,         21,        1,   599040, 0xf042f780
-0,         22,         22,        1,   599040, 0xfafafdcb
-0,         23,         23,        1,   599040, 0xc8c1c452
-0,         24,         24,        1,   599040, 0x83c4d488
-0,         25,         25,        1,   599040, 0x81a8fd08
-0,         26,         26,        1,   599040, 0x2cb0c333
-0,         27,         27,        1,   599040, 0xa7bf4e52
-0,         28,         28,        1,   599040, 0x5b7ed8e9
-0,         29,         29,        1,   599040, 0x4ff03464
-0,         30,         30,        1,   599040, 0x54a700c2
-0,         31,         31,        1,   599040, 0x7dbb63aa
-0,         32,         32,        1,   599040, 0xda26288e
-0,         33,         33,        1,   599040, 0x8074da41
-0,         34,         34,        1,   599040, 0xa32b2ab2
-0,         35,         35,        1,   599040, 0x51b457fb
-0,         36,         36,        1,   599040, 0x05e34953
-0,         37,         37,        1,   599040, 0x68c762d6
-0,         38,         38,        1,   599040, 0x11bf469e
-0,         39,         39,        1,   599040, 0xc2fdadaf
-0,         40,         40,        1,   599040, 0x05588da0
-0,         41,         41,        1,   599040, 0x8855f927
-0,         42,         42,        1,   599040, 0x11c85d5a
-0,         43,         43,        1,   599040, 0x7a0aede5
-0,         44,         44,        1,   599040, 0x39dc4f7d
-0,         45,         45,        1,   599040, 0x388f81d6
-0,         46,         46,        1,   599040, 0x2afa830d
-0,         47,         47,        1,   599040, 0xd7f26886
-0,         48,         48,        1,   599040, 0xb8e12aef
-0,         49,         49,        1,   599040, 0x73f7582c
diff --git a/tests/ref/fate/hevc-conformance-ENTP_B_Qualcomm_1 b/tests/ref/fate/hevc-conformance-ENTP_B_Qualcomm_1
new file mode 100644
index 0000000000..70f0a6df41
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-ENTP_B_Qualcomm_1
@@ -0,0 +1,29 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  3110400, 0x7d014690
+0,          1,          1,        1,  3110400, 0xe02cd173
+0,          2,          2,        1,  3110400, 0x2f9794c5
+0,          3,          3,        1,  3110400, 0x5df433de
+0,          4,          4,        1,  3110400, 0xae409f1d
+0,          5,          5,        1,  3110400, 0xb4886e82
+0,          6,          6,        1,  3110400, 0x636ee735
+0,          7,          7,        1,  3110400, 0x4d340b3f
+0,          8,          8,        1,  3110400, 0xf11ce983
+0,          9,          9,        1,  3110400, 0x2a1b2094
+0,         10,         10,        1,  3110400, 0x1dee485f
+0,         11,         11,        1,  3110400, 0xac329574
+0,         12,         12,        1,  3110400, 0xa0f11f30
+0,         13,         13,        1,  3110400, 0x99d827d3
+0,         14,         14,        1,  3110400, 0xa0b75c5b
+0,         15,         15,        1,  3110400, 0xf3f169d8
+0,         16,         16,        1,  3110400, 0xde71892b
+0,         17,         17,        1,  3110400, 0xf1129a0e
+0,         18,         18,        1,  3110400, 0x02150e54
+0,         19,         19,        1,  3110400, 0xc79d65a4
+0,         20,         20,        1,  3110400, 0x708fc8fb
+0,         21,         21,        1,  3110400, 0x5431050b
+0,         22,         22,        1,  3110400, 0x237faa60
+0,         23,         23,        1,  3110400, 0xb05ffa7c
diff --git a/tests/ref/fate/hevc-conformance-ENTP_C_LG_3 b/tests/ref/fate/hevc-conformance-ENTP_C_LG_3
deleted file mode 100644
index 3c0946e93f..0000000000
--- a/tests/ref/fate/hevc-conformance-ENTP_C_LG_3
+++ /dev/null
@@ -1,51 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,  3110400, 0xaea1c3d6
-0,          1,          1,        1,  3110400, 0x665b4f52
-0,          2,          2,        1,  3110400, 0xc7da58a2
-0,          3,          3,        1,  3110400, 0x1dda6461
-0,          4,          4,        1,  3110400, 0x1d8d6eaf
-0,          5,          5,        1,  3110400, 0x7a29911a
-0,          6,          6,        1,  3110400, 0x0dce92c9
-0,          7,          7,        1,  3110400, 0x79c84570
-0,          8,          8,        1,  3110400, 0x736ef1e7
-0,          9,          9,        1,  3110400, 0x9dd86492
-0,         10,         10,        1,  3110400, 0x0ea31a1b
-0,         11,         11,        1,  3110400, 0x0d84fdc8
-0,         12,         12,        1,  3110400, 0x06ed89a7
-0,         13,         13,        1,  3110400, 0xfaea4fd6
-0,         14,         14,        1,  3110400, 0xe787abe8
-0,         15,         15,        1,  3110400, 0x050b653a
-0,         16,         16,        1,  3110400, 0x35cc1ec1
-0,         17,         17,        1,  3110400, 0x86a43e07
-0,         18,         18,        1,  3110400, 0xa6ab021e
-0,         19,         19,        1,  3110400, 0x491e0efa
-0,         20,         20,        1,  3110400, 0x8f210c38
-0,         21,         21,        1,  3110400, 0x637af0d0
-0,         22,         22,        1,  3110400, 0x47a59197
-0,         23,         23,        1,  3110400, 0x53e04637
-0,         24,         24,        1,  3110400, 0x7b99325e
-0,         25,         25,        1,  3110400, 0x972aa252
-0,         26,         26,        1,  3110400, 0xe76ef917
-0,         27,         27,        1,  3110400, 0x7a25babc
-0,         28,         28,        1,  3110400, 0x3bee3c5c
-0,         29,         29,        1,  3110400, 0xbae82bcb
-0,         30,         30,        1,  3110400, 0x5b65c1e5
-0,         31,         31,        1,  3110400, 0xa546266f
-0,         32,         32,        1,  3110400, 0x5c5b9b8e
-0,         33,         33,        1,  3110400, 0xec29c804
-0,         34,         34,        1,  3110400, 0x384efc7d
-0,         35,         35,        1,  3110400, 0x6c1aaa23
-0,         36,         36,        1,  3110400, 0x55494f9f
-0,         37,         37,        1,  3110400, 0xa9c56fec
-0,         38,         38,        1,  3110400, 0x49c29ef2
-0,         39,         39,        1,  3110400, 0xac24fdd4
-0,         40,         40,        1,  3110400, 0x403d8213
-0,         41,         41,        1,  3110400, 0xf2d8aefe
-0,         42,         42,        1,  3110400, 0x2884f0e1
-0,         43,         43,        1,  3110400, 0x69a0a781
-0,         44,         44,        1,  3110400, 0x3ab6114c
-0,         45,         45,        1,  3110400, 0x1d4425a2
-0,         46,         46,        1,  3110400, 0x59f8970a
-0,         47,         47,        1,  3110400, 0xfe0a05a9
-0,         48,         48,        1,  3110400, 0x50b9be4f
-0,         49,         49,        1,  3110400, 0x3e1b65bd
diff --git a/tests/ref/fate/hevc-conformance-ENTP_C_Qualcomm_1 b/tests/ref/fate/hevc-conformance-ENTP_C_Qualcomm_1
new file mode 100644
index 0000000000..fd2c47fc55
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-ENTP_C_Qualcomm_1
@@ -0,0 +1,29 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  3110400, 0x4ea3fa57
+0,          1,          1,        1,  3110400, 0xbe33724f
+0,          2,          2,        1,  3110400, 0x9011755e
+0,          3,          3,        1,  3110400, 0x62de338c
+0,          4,          4,        1,  3110400, 0xa49096c5
+0,          5,          5,        1,  3110400, 0xc7af7402
+0,          6,          6,        1,  3110400, 0xd8241f6b
+0,          7,          7,        1,  3110400, 0x82ebc552
+0,          8,          8,        1,  3110400, 0x57c07503
+0,          9,          9,        1,  3110400, 0xc302fc68
+0,         10,         10,        1,  3110400, 0x10183476
+0,         11,         11,        1,  3110400, 0xa953ab4b
+0,         12,         12,        1,  3110400, 0xe1daee4f
+0,         13,         13,        1,  3110400, 0x86828802
+0,         14,         14,        1,  3110400, 0x9bb96175
+0,         15,         15,        1,  3110400, 0xe6c033a0
+0,         16,         16,        1,  3110400, 0x417407dd
+0,         17,         17,        1,  3110400, 0x422ef66c
+0,         18,         18,        1,  3110400, 0x3d216600
+0,         19,         19,        1,  3110400, 0xdfd83135
+0,         20,         20,        1,  3110400, 0x8deff979
+0,         21,         21,        1,  3110400, 0xbce973f4
+0,         22,         22,        1,  3110400, 0x2ae172e2
+0,         23,         23,        1,  3110400, 0x2aa32f21
diff --git a/tests/ref/fate/hevc-conformance-EXT_A_ericsson_4 b/tests/ref/fate/hevc-conformance-EXT_A_ericsson_4
index bf4616a919..4e186d67e4 100644
--- a/tests/ref/fate/hevc-conformance-EXT_A_ericsson_4
+++ b/tests/ref/fate/hevc-conformance-EXT_A_ericsson_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8ce7200b
 0,          1,          1,        1,   149760, 0xf97412f6
 0,          2,          2,        1,   149760, 0x0ea132c4
diff --git a/tests/ref/fate/hevc-conformance-FILLER_A_Sony_1 b/tests/ref/fate/hevc-conformance-FILLER_A_Sony_1
new file mode 100644
index 0000000000..08c3375458
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-FILLER_A_Sony_1
@@ -0,0 +1,65 @@
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
+0,          0,          0,        1,   149760, 0x83261e41
+0,          1,          1,        1,   149760, 0xa8c02e8e
+0,          2,          2,        1,   149760, 0xb89d1fa0
+0,          3,          3,        1,   149760, 0x22f83f2a
+0,          4,          4,        1,   149760, 0x0529e619
+0,          5,          5,        1,   149760, 0x18488682
+0,          6,          6,        1,   149760, 0x91c0fde2
+0,          7,          7,        1,   149760, 0xe07355aa
+0,          8,          8,        1,   149760, 0x6deca92f
+0,          9,          9,        1,   149760, 0xcd16e610
+0,         10,         10,        1,   149760, 0x3fd6cab8
+0,         11,         11,        1,   149760, 0x063e39e4
+0,         12,         12,        1,   149760, 0x8b1fb242
+0,         13,         13,        1,   149760, 0x00ef6987
+0,         14,         14,        1,   149760, 0xdfa7e8ab
+0,         15,         15,        1,   149760, 0x315a23a8
+0,         16,         16,        1,   149760, 0xdd655173
+0,         17,         17,        1,   149760, 0x741b9603
+0,         18,         18,        1,   149760, 0x4a3c29a4
+0,         19,         19,        1,   149760, 0xb14b06f4
+0,         20,         20,        1,   149760, 0x5dd7fa14
+0,         21,         21,        1,   149760, 0x60dac9fe
+0,         22,         22,        1,   149760, 0x231effa8
+0,         23,         23,        1,   149760, 0x6b0cca33
+0,         24,         24,        1,   149760, 0xb1fc6596
+0,         25,         25,        1,   149760, 0x683fa8b5
+0,         26,         26,        1,   149760, 0xa9da45be
+0,         27,         27,        1,   149760, 0x96d69624
+0,         28,         28,        1,   149760, 0xff9e0778
+0,         29,         29,        1,   149760, 0x7410078e
+0,         30,         30,        1,   149760, 0x6418b280
+0,         31,         31,        1,   149760, 0xee66b0dd
+0,         32,         32,        1,   149760, 0xdf4d06fb
+0,         33,         33,        1,   149760, 0xf75c33fd
+0,         34,         34,        1,   149760, 0x73e97017
+0,         35,         35,        1,   149760, 0xcc8c4e15
+0,         36,         36,        1,   149760, 0xa494d7f7
+0,         37,         37,        1,   149760, 0x57564b5f
+0,         38,         38,        1,   149760, 0x84433b5c
+0,         39,         39,        1,   149760, 0x8ec138cf
+0,         40,         40,        1,   149760, 0x72a9e2df
+0,         41,         41,        1,   149760, 0x69ee26c7
+0,         42,         42,        1,   149760, 0x8d85941b
+0,         43,         43,        1,   149760, 0xfa9f41a2
+0,         44,         44,        1,   149760, 0x2ec9d6df
+0,         45,         45,        1,   149760, 0xb9a85b2b
+0,         46,         46,        1,   149760, 0xea10c86d
+0,         47,         47,        1,   149760, 0x2a2d0c1b
+0,         48,         48,        1,   149760, 0xb96395d7
+0,         49,         49,        1,   149760, 0xb9abdbde
+0,         50,         50,        1,   149760, 0x8aff19ae
+0,         51,         51,        1,   149760, 0xa46d1e0b
+0,         52,         52,        1,   149760, 0xb5943391
+0,         53,         53,        1,   149760, 0x49aacf5c
+0,         54,         54,        1,   149760, 0x837b6b38
+0,         55,         55,        1,   149760, 0x1455d41b
+0,         56,         56,        1,   149760, 0xf5b87056
+0,         57,         57,        1,   149760, 0x15ef5ca7
+0,         58,         58,        1,   149760, 0x29edded5
+0,         59,         59,        1,   149760, 0x86f1eb45
diff --git a/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_2 b/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_2
new file mode 100644
index 0000000000..81f25a53db
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_2
@@ -0,0 +1,101 @@
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
+0,          0,          0,        1,   149760, 0x49bcac59
+0,          1,          1,        1,   149760, 0x30ffadcd
+0,          2,          2,        1,   149760, 0x85ccc14a
+0,          3,          3,        1,   149760, 0x9e80bab5
+0,          4,          4,        1,   149760, 0xf4d6b065
+0,          5,          5,        1,   149760, 0x3dfea025
+0,          6,          6,        1,   149760, 0x752381f4
+0,          7,          7,        1,   149760, 0x55875176
+0,          8,          8,        1,   149760, 0xaeeceea9
+0,          9,          9,        1,   149760, 0xfa19792b
+0,         10,         10,        1,   149760, 0x1f0cfa3c
+0,         11,         11,        1,   149760, 0xecc09b1a
+0,         12,         12,        1,   149760, 0x816e4e1b
+0,         13,         13,        1,   149760, 0x375cef94
+0,         14,         14,        1,   149760, 0xace1a0ff
+0,         15,         15,        1,   149760, 0x85827658
+0,         16,         16,        1,   149760, 0x8189237e
+0,         17,         17,        1,   149760, 0xec53e171
+0,         18,         18,        1,   149760, 0x0b1bad4a
+0,         19,         19,        1,   149760, 0x9d566fd0
+0,         20,         20,        1,   149760, 0x9b323c87
+0,         21,         21,        1,   149760, 0x2d900cb7
+0,         22,         22,        1,   149760, 0x7062ed06
+0,         23,         23,        1,   149760, 0xe687c687
+0,         24,         24,        1,   149760, 0x4767dd46
+0,         25,         25,        1,   149760, 0xf0d04aae
+0,         26,         26,        1,   149760, 0x1a9d0640
+0,         27,         27,        1,   149760, 0xc831e356
+0,         28,         28,        1,   149760, 0x3b5ee48b
+0,         29,         29,        1,   149760, 0x083f94ec
+0,         30,         30,        1,   149760, 0xfd92050f
+0,         31,         31,        1,   149760, 0x23ce5764
+0,         32,         32,        1,   149760, 0x98167d17
+0,         33,         33,        1,   149760, 0x458a1e97
+0,         34,         34,        1,   149760, 0x913fe090
+0,         35,         35,        1,   149760, 0xdf87fb99
+0,         36,         36,        1,   149760, 0x2c9ffb76
+0,         37,         37,        1,   149760, 0xe52b1f88
+0,         38,         38,        1,   149760, 0xeb6441b3
+0,         39,         39,        1,   149760, 0x229a3428
+0,         40,         40,        1,   149760, 0xab5dc58c
+0,         41,         41,        1,   149760, 0xfdaff77d
+0,         42,         42,        1,   149760, 0x120326dc
+0,         43,         43,        1,   149760, 0x9a9ff8fd
+0,         44,         44,        1,   149760, 0x4e5bb152
+0,         45,         45,        1,   149760, 0x2d16f231
+0,         46,         46,        1,   149760, 0x99a01d57
+0,         47,         47,        1,   149760, 0x3a555c12
+0,         48,         48,        1,   149760, 0x20ad0e79
+0,         49,         49,        1,   149760, 0xc62724f2
+0,         50,         50,        1,   149760, 0x07a81153
+0,         51,         51,        1,   149760, 0x14b9732e
+0,         52,         52,        1,   149760, 0xeefa0be1
+0,         53,         53,        1,   149760, 0x95a82b9e
+0,         54,         54,        1,   149760, 0xa6ecbed4
+0,         55,         55,        1,   149760, 0xaaec0cf6
+0,         56,         56,        1,   149760, 0x087815ca
+0,         57,         57,        1,   149760, 0xff82b221
+0,         58,         58,        1,   149760, 0x709afb9f
+0,         59,         59,        1,   149760, 0xb91e712a
+0,         60,         60,        1,   149760, 0x66dfbaaa
+0,         61,         61,        1,   149760, 0x574501b2
+0,         62,         62,        1,   149760, 0xe1c13daf
+0,         63,         63,        1,   149760, 0xdab85ad6
+0,         64,         64,        1,   149760, 0x57e8a455
+0,         65,         65,        1,   149760, 0xfc95db86
+0,         66,         66,        1,   149760, 0xe298f7ee
+0,         67,         67,        1,   149760, 0x13302040
+0,         68,         68,        1,   149760, 0x69811199
+0,         69,         69,        1,   149760, 0x64f31874
+0,         70,         70,        1,   149760, 0xc1450115
+0,         71,         71,        1,   149760, 0xf0efc355
+0,         72,         72,        1,   149760, 0xeaee572d
+0,         73,         73,        1,   149760, 0xf256fc07
+0,         74,         74,        1,   149760, 0x20d48047
+0,         75,         75,        1,   149760, 0x37a934bf
+0,         76,         76,        1,   149760, 0xd14bcc48
+0,         77,         77,        1,   149760, 0x3de67683
+0,         78,         78,        1,   149760, 0x3b3b2edd
+0,         79,         79,        1,   149760, 0x8cf00f8d
+0,         80,         80,        1,   149760, 0x83d8ddff
+0,         81,         81,        1,   149760, 0xf2f36ae4
+0,         82,         82,        1,   149760, 0xf2549f1a
+0,         83,         83,        1,   149760, 0x6c5a9443
+0,         84,         84,        1,   149760, 0x071e4d64
+0,         85,         85,        1,   149760, 0x0b160074
+0,         86,         86,        1,   149760, 0x0ebdf969
+0,         87,         87,        1,   149760, 0x0331793d
+0,         88,         88,        1,   149760, 0xee7ad61f
+0,         89,         89,        1,   149760, 0xb9ba083f
+0,         90,         90,        1,   149760, 0x8ecf1f9d
+0,         91,         91,        1,   149760, 0x6e861158
+0,         92,         92,        1,   149760, 0x977a203b
+0,         93,         93,        1,   149760, 0xa25d1077
+0,         94,         94,        1,   149760, 0xa4d2fca1
+0,         95,         95,        1,   149760, 0x6093084d
diff --git a/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_3 b/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_3
new file mode 100644
index 0000000000..534874bd63
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-HRD_A_Fujitsu_3
@@ -0,0 +1,101 @@
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
+0,          0,          0,        1,   149760, 0xa329afaa
+0,          1,          1,        1,   149760, 0xb326c405
+0,          2,          2,        1,   149760, 0x7834b936
+0,          3,          3,        1,   149760, 0xb46dbb3e
+0,          4,          4,        1,   149760, 0xcf1ea94c
+0,          5,          5,        1,   149760, 0x4eac94fa
+0,          6,          6,        1,   149760, 0xbfdb808f
+0,          7,          7,        1,   149760, 0x62806469
+0,          8,          8,        1,   149760, 0x74420022
+0,          9,          9,        1,   149760, 0x91e97911
+0,         10,         10,        1,   149760, 0x4903fc4a
+0,         11,         11,        1,   149760, 0x31a09d4e
+0,         12,         12,        1,   149760, 0xeb404776
+0,         13,         13,        1,   149760, 0xadd2ee9e
+0,         14,         14,        1,   149760, 0x23e7a8b7
+0,         15,         15,        1,   149760, 0x76ac5fb9
+0,         16,         16,        1,   149760, 0x32770d4f
+0,         17,         17,        1,   149760, 0x208ddbd0
+0,         18,         18,        1,   149760, 0xf2559760
+0,         19,         19,        1,   149760, 0x3bc65f9e
+0,         20,         20,        1,   149760, 0x9f10263b
+0,         21,         21,        1,   149760, 0x3978edd8
+0,         22,         22,        1,   149760, 0x7afde5b9
+0,         23,         23,        1,   149760, 0xc01699f8
+0,         24,         24,        1,   149760, 0x5056cdeb
+0,         25,         25,        1,   149760, 0xf2275141
+0,         26,         26,        1,   149760, 0xe22efce6
+0,         27,         27,        1,   149760, 0x4331e359
+0,         28,         28,        1,   149760, 0x9a5e031d
+0,         29,         29,        1,   149760, 0x8982a88f
+0,         30,         30,        1,   149760, 0x7e27f127
+0,         31,         31,        1,   149760, 0x1a5a422c
+0,         32,         32,        1,   149760, 0x39328011
+0,         33,         33,        1,   149760, 0x26c335ca
+0,         34,         34,        1,   149760, 0x6429d5e2
+0,         35,         35,        1,   149760, 0x7cf52425
+0,         36,         36,        1,   149760, 0x1762186c
+0,         37,         37,        1,   149760, 0xe0e9370f
+0,         38,         38,        1,   149760, 0x1f0a3f7a
+0,         39,         39,        1,   149760, 0xf19e30be
+0,         40,         40,        1,   149760, 0x14b9a723
+0,         41,         41,        1,   149760, 0x3514f916
+0,         42,         42,        1,   149760, 0x21dd1e9a
+0,         43,         43,        1,   149760, 0x02b2f69c
+0,         44,         44,        1,   149760, 0xec1fa93a
+0,         45,         45,        1,   149760, 0xad45ea1f
+0,         46,         46,        1,   149760, 0x22092591
+0,         47,         47,        1,   149760, 0x733b205b
+0,         48,         48,        1,   149760, 0xcd85ef6a
+0,         49,         49,        1,   149760, 0x5d3afdfb
+0,         50,         50,        1,   149760, 0xc7200b59
+0,         51,         51,        1,   149760, 0xf2c74f38
+0,         52,         52,        1,   149760, 0x8f0b0a60
+0,         53,         53,        1,   149760, 0x875a0fa6
+0,         54,         54,        1,   149760, 0x03ac9cbc
+0,         55,         55,        1,   149760, 0x16830708
+0,         56,         56,        1,   149760, 0xabe709cc
+0,         57,         57,        1,   149760, 0xc5019f66
+0,         58,         58,        1,   149760, 0x6355f5e2
+0,         59,         59,        1,   149760, 0x7770586e
+0,         60,         60,        1,   149760, 0x482aa304
+0,         61,         61,        1,   149760, 0x9b90ef01
+0,         62,         62,        1,   149760, 0x22153180
+0,         63,         63,        1,   149760, 0x23876fda
+0,         64,         64,        1,   149760, 0xfa9d938d
+0,         65,         65,        1,   149760, 0x5731d140
+0,         66,         66,        1,   149760, 0x734ce2c1
+0,         67,         67,        1,   149760, 0x74dafecd
+0,         68,         68,        1,   149760, 0x33b4ff4e
+0,         69,         69,        1,   149760, 0xcd8ef975
+0,         70,         70,        1,   149760, 0xc97cd0ee
+0,         71,         71,        1,   149760, 0x88faa07a
+0,         72,         72,        1,   149760, 0x8c174fe9
+0,         73,         73,        1,   149760, 0x9c60e74e
+0,         74,         74,        1,   149760, 0x7faf7160
+0,         75,         75,        1,   149760, 0x94c70d14
+0,         76,         76,        1,   149760, 0x8e49a6b1
+0,         77,         77,        1,   149760, 0x67255170
+0,         78,         78,        1,   149760, 0xeb1d1a49
+0,         79,         79,        1,   149760, 0x9413051f
+0,         80,         80,        1,   149760, 0x43bce110
+0,         81,         81,        1,   149760, 0x76c821ec
+0,         82,         82,        1,   149760, 0x21487745
+0,         83,         83,        1,   149760, 0xb8776615
+0,         84,         84,        1,   149760, 0x1f2ffc65
+0,         85,         85,        1,   149760, 0x3f1eb53d
+0,         86,         86,        1,   149760, 0x9d15c8e0
+0,         87,         87,        1,   149760, 0x44e77332
+0,         88,         88,        1,   149760, 0x629bb845
+0,         89,         89,        1,   149760, 0x80ea02e8
+0,         90,         90,        1,   149760, 0x405d1653
+0,         91,         91,        1,   149760, 0x0ee8fccd
+0,         92,         92,        1,   149760, 0x4444fe13
+0,         93,         93,        1,   149760, 0x7493f631
+0,         94,         94,        1,   149760, 0xa6c1f737
+0,         95,         95,        1,   149760, 0xb84b055d
diff --git a/tests/ref/fate/hevc-conformance-INITQP_A_Sony_1 b/tests/ref/fate/hevc-conformance-INITQP_A_Sony_1
new file mode 100644
index 0000000000..8cc652f476
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-INITQP_A_Sony_1
@@ -0,0 +1,65 @@
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
+0,          0,          0,        1,   149760, 0x59891e4e
+0,          1,          1,        1,   149760, 0x6c152de8
+0,          2,          2,        1,   149760, 0x6f2c0f37
+0,          3,          3,        1,   149760, 0xdc4142e9
+0,          4,          4,        1,   149760, 0x13a6dfe0
+0,          5,          5,        1,   149760, 0xea2b8197
+0,          6,          6,        1,   149760, 0x228207b8
+0,          7,          7,        1,   149760, 0xe6c33dc5
+0,          8,          8,        1,   149760, 0xa488a0f6
+0,          9,          9,        1,   149760, 0xf618c591
+0,         10,         10,        1,   149760, 0x0c96c7eb
+0,         11,         11,        1,   149760, 0x347b17b8
+0,         12,         12,        1,   149760, 0xa2379e18
+0,         13,         13,        1,   149760, 0x635a7cbd
+0,         14,         14,        1,   149760, 0xa770ed3c
+0,         15,         15,        1,   149760, 0x54271b2b
+0,         16,         16,        1,   149760, 0xc09751d6
+0,         17,         17,        1,   149760, 0xa33997cb
+0,         18,         18,        1,   149760, 0x8f382ef3
+0,         19,         19,        1,   149760, 0x449311d8
+0,         20,         20,        1,   149760, 0x67a2f419
+0,         21,         21,        1,   149760, 0xa025b8a1
+0,         22,         22,        1,   149760, 0xebb7e911
+0,         23,         23,        1,   149760, 0x6decb08e
+0,         24,         24,        1,   149760, 0x20a354ef
+0,         25,         25,        1,   149760, 0x6d609fc5
+0,         26,         26,        1,   149760, 0x73992f9b
+0,         27,         27,        1,   149760, 0x46968752
+0,         28,         28,        1,   149760, 0xd9e9017d
+0,         29,         29,        1,   149760, 0xae321b3c
+0,         30,         30,        1,   149760, 0x0f53a016
+0,         31,         31,        1,   149760, 0x74a5aacd
+0,         32,         32,        1,   149760, 0x893afc39
+0,         33,         33,        1,   149760, 0xbeb13aed
+0,         34,         34,        1,   149760, 0xc8658ed9
+0,         35,         35,        1,   149760, 0xcf7d544e
+0,         36,         36,        1,   149760, 0x782bd063
+0,         37,         37,        1,   149760, 0x32c53ffa
+0,         38,         38,        1,   149760, 0xed3849c2
+0,         39,         39,        1,   149760, 0xda5f336a
+0,         40,         40,        1,   149760, 0x0460dbf7
+0,         41,         41,        1,   149760, 0x782f25e3
+0,         42,         42,        1,   149760, 0x1199900a
+0,         43,         43,        1,   149760, 0xd51e4dfd
+0,         44,         44,        1,   149760, 0xfd32e6d5
+0,         45,         45,        1,   149760, 0x880d5f9b
+0,         46,         46,        1,   149760, 0xe1a7b52d
+0,         47,         47,        1,   149760, 0x97c4228a
+0,         48,         48,        1,   149760, 0x0c539d58
+0,         49,         49,        1,   149760, 0x5edfd99e
+0,         50,         50,        1,   149760, 0x92a40dcc
+0,         51,         51,        1,   149760, 0xa33dff8d
+0,         52,         52,        1,   149760, 0xf9f637ee
+0,         53,         53,        1,   149760, 0x4c02c63d
+0,         54,         54,        1,   149760, 0x94125eda
+0,         55,         55,        1,   149760, 0x0ba6d181
+0,         56,         56,        1,   149760, 0x1c4b7cf1
+0,         57,         57,        1,   149760, 0x3af454c4
+0,         58,         58,        1,   149760, 0x3666e3f4
+0,         59,         59,        1,   149760, 0x1013f2ec
diff --git a/tests/ref/fate/hevc-conformance-INITQP_B_Sony_1 b/tests/ref/fate/hevc-conformance-INITQP_B_Sony_1
new file mode 100644
index 0000000000..ca98245748
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-INITQP_B_Sony_1
@@ -0,0 +1,95 @@
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
+0,          0,          0,        1,   299520, 0x5514958a
+0,          1,          1,        1,   299520, 0x06725ede
+0,          2,          2,        1,   299520, 0xa71d1493
+0,          3,          3,        1,   299520, 0xdd4cde37
+0,          4,          4,        1,   299520, 0x6ea2f981
+0,          5,          5,        1,   299520, 0x34de0d7f
+0,          6,          6,        1,   299520, 0xe3555f62
+0,          7,          7,        1,   299520, 0xa56cf8b5
+0,          8,          8,        1,   299520, 0x74f85f70
+0,          9,          9,        1,   299520, 0x7cc4ff3b
+0,         10,         10,        1,   299520, 0xacaf62f0
+0,         11,         11,        1,   299520, 0x049aa473
+0,         12,         12,        1,   299520, 0x3d202b52
+0,         13,         13,        1,   299520, 0x530920d5
+0,         14,         14,        1,   299520, 0xcf69e5c8
+0,         15,         15,        1,   299520, 0x18ad9a4f
+0,         16,         16,        1,   299520, 0xc8c1bbd9
+0,         17,         17,        1,   299520, 0x6cd37ffc
+0,         18,         18,        1,   299520, 0xc8d64c57
+0,         19,         19,        1,   299520, 0xec4679bf
+0,         20,         20,        1,   299520, 0xc4228355
+0,         21,         21,        1,   299520, 0x908c71b0
+0,         22,         22,        1,   299520, 0x4c4a92eb
+0,         23,         23,        1,   299520, 0x28f7d30d
+0,         24,         24,        1,   299520, 0xed2db3da
+0,         25,         25,        1,   299520, 0xfb22801f
+0,         26,         26,        1,   299520, 0x514de5b9
+0,         27,         27,        1,   299520, 0x7bb8d8f7
+0,         28,         28,        1,   299520, 0x3e43ae30
+0,         29,         29,        1,   299520, 0x45473924
+0,         30,         30,        1,   299520, 0x914a440e
+0,         31,         31,        1,   299520, 0x91e74926
+0,         32,         32,        1,   299520, 0xa8a43ffd
+0,         33,         33,        1,   299520, 0x1df08075
+0,         34,         34,        1,   299520, 0x84611007
+0,         35,         35,        1,   299520, 0x622d7495
+0,         36,         36,        1,   299520, 0xede897b6
+0,         37,         37,        1,   299520, 0xb14f0650
+0,         38,         38,        1,   299520, 0x74f600f9
+0,         39,         39,        1,   299520, 0xf04e2de3
+0,         40,         40,        1,   299520, 0xaeadd6fc
+0,         41,         41,        1,   299520, 0xb5855f8d
+0,         42,         42,        1,   299520, 0xbb6c709f
+0,         43,         43,        1,   299520, 0x486d66e9
+0,         44,         44,        1,   299520, 0x87e7d165
+0,         45,         45,        1,   299520, 0x1f936d47
+0,         46,         46,        1,   299520, 0x2da721a2
+0,         47,         47,        1,   299520, 0x36caf481
+0,         48,         48,        1,   299520, 0x067e3f4d
+0,         49,         49,        1,   299520, 0x1a95c86b
+0,         50,         50,        1,   299520, 0x186c1bde
+0,         51,         51,        1,   299520, 0xd1552b21
+0,         52,         52,        1,   299520, 0x72521786
+0,         53,         53,        1,   299520, 0xe0f0b1b2
+0,         54,         54,        1,   299520, 0xee8c6751
+0,         55,         55,        1,   299520, 0x281817ef
+0,         56,         56,        1,   299520, 0xea98b174
+0,         57,         57,        1,   299520, 0x839575de
+0,         58,         58,        1,   299520, 0xd89b6ff1
+0,         59,         59,        1,   299520, 0xee8432a7
+0,         60,         60,        1,   299520, 0x8f262218
+0,         61,         61,        1,   299520, 0xac918f83
+0,         62,         62,        1,   299520, 0x398c23d7
+0,         63,         63,        1,   299520, 0xdc560109
+0,         64,         64,        1,   299520, 0xb4c3cd8b
+0,         65,         65,        1,   299520, 0x79824026
+0,         66,         66,        1,   299520, 0xd20f5be8
+0,         67,         67,        1,   299520, 0xc93b32a3
+0,         68,         68,        1,   299520, 0xc1363d67
+0,         69,         69,        1,   299520, 0xeb6d2f0a
+0,         70,         70,        1,   299520, 0x29053a08
+0,         71,         71,        1,   299520, 0x8a236752
+0,         72,         72,        1,   299520, 0x5e572146
+0,         73,         73,        1,   299520, 0x4f7ca5cf
+0,         74,         74,        1,   299520, 0x62951193
+0,         75,         75,        1,   299520, 0xf163d1cb
+0,         76,         76,        1,   299520, 0xb995206c
+0,         77,         77,        1,   299520, 0xcf5ebaa3
+0,         78,         78,        1,   299520, 0x22fad89d
+0,         79,         79,        1,   299520, 0xc9c25e12
+0,         80,         80,        1,   299520, 0xd5404f45
+0,         81,         81,        1,   299520, 0x484bd02d
+0,         82,         82,        1,   299520, 0x5790a1c4
+0,         83,         83,        1,   299520, 0xcbec0fed
+0,         84,         84,        1,   299520, 0x36bd1758
+0,         85,         85,        1,   299520, 0x4a133700
+0,         86,         86,        1,   299520, 0x2c582b0a
+0,         87,         87,        1,   299520, 0xadd773e1
+0,         88,         88,        1,   299520, 0xe4bbced3
+0,         89,         89,        1,   299520, 0x463b3ff0
diff --git a/tests/ref/fate/hevc-conformance-IPCM_A_RExt_NEC b/tests/ref/fate/hevc-conformance-IPCM_A_RExt_NEC
new file mode 100644
index 0000000000..a0ed530c2c
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-IPCM_A_RExt_NEC
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
+0,          0,          0,        1,   399360, 0xbac29a51
diff --git a/tests/ref/fate/hevc-conformance-IPCM_B_RExt_NEC b/tests/ref/fate/hevc-conformance-IPCM_B_RExt_NEC
new file mode 100644
index 0000000000..94c12476f0
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-IPCM_B_RExt_NEC
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
+0,          0,          0,        1,   599040, 0x1f808406
diff --git a/tests/ref/fate/hevc-conformance-IPRED_A_docomo_2 b/tests/ref/fate/hevc-conformance-IPRED_A_docomo_2
index 33878fd142..a66652424d 100644
--- a/tests/ref/fate/hevc-conformance-IPRED_A_docomo_2
+++ b/tests/ref/fate/hevc-conformance-IPRED_A_docomo_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0xac658d10
 0,          1,          1,        1,   599040, 0xe3f65389
 0,          2,          2,        1,   599040, 0xfbd644b0
diff --git a/tests/ref/fate/hevc-conformance-IPRED_B_Nokia_3 b/tests/ref/fate/hevc-conformance-IPRED_B_Nokia_3
index 4de7c3c7b1..f3e8d6bc71 100644
--- a/tests/ref/fate/hevc-conformance-IPRED_B_Nokia_3
+++ b/tests/ref/fate/hevc-conformance-IPRED_B_Nokia_3
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  3110400, 0x11ef5ddd
diff --git a/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_2 b/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_2
deleted file mode 100644
index bff448bb1b..0000000000
--- a/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_2
+++ /dev/null
@@ -1,5 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,   599040, 0x9a8664e6
-0,          1,          1,        1,   599040, 0x72f15982
-0,          2,          2,        1,   599040, 0xc6610a7b
-0,          3,          3,        1,   599040, 0x091d3a93
diff --git a/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_3 b/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_3
new file mode 100644
index 0000000000..9426a72a0a
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-IPRED_C_Mitsubishi_3
@@ -0,0 +1,9 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
+0,          0,          0,        1,   599040, 0x6b61371d
+0,          1,          1,        1,   599040, 0xd38a2e50
+0,          2,          2,        1,   599040, 0xe8eb34bd
+0,          3,          3,        1,   599040, 0xb3ae6401
diff --git a/tests/ref/fate/hevc-conformance-LS_A_Orange_2 b/tests/ref/fate/hevc-conformance-LS_A_Orange_2
index 4dd4ad49ae..f49ae01a94 100644
--- a/tests/ref/fate/hevc-conformance-LS_A_Orange_2
+++ b/tests/ref/fate/hevc-conformance-LS_A_Orange_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x94a51701
 0,          1,          1,        1,   149760, 0x67c71885
 0,          2,          2,        1,   149760, 0x218f1751
diff --git a/tests/ref/fate/hevc-conformance-LS_B_ORANGE_4 b/tests/ref/fate/hevc-conformance-LS_B_ORANGE_4
index 34dc379c56..e8d815b5de 100644
--- a/tests/ref/fate/hevc-conformance-LS_B_ORANGE_4
+++ b/tests/ref/fate/hevc-conformance-LS_B_ORANGE_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x25267761
 0,          1,          1,        1,   599040, 0x4b4b6846
 0,          2,          2,        1,   599040, 0x78e251e8
diff --git a/tests/ref/fate/hevc-conformance-LTRPSPS_A_Qualcomm_1 b/tests/ref/fate/hevc-conformance-LTRPSPS_A_Qualcomm_1
index ddf25c9ddf..3479d627fd 100644
--- a/tests/ref/fate/hevc-conformance-LTRPSPS_A_Qualcomm_1
+++ b/tests/ref/fate/hevc-conformance-LTRPSPS_A_Qualcomm_1
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xcfffa013
 0,          1,          1,        1,   149760, 0x8ae80654
 0,          2,          2,        1,   149760, 0xa79915b8
diff --git a/tests/ref/fate/hevc-conformance-MAXBINS_A_TI_4 b/tests/ref/fate/hevc-conformance-MAXBINS_A_TI_4
index 9110cf6e6f..433e215732 100644
--- a/tests/ref/fate/hevc-conformance-MAXBINS_A_TI_4
+++ b/tests/ref/fate/hevc-conformance-MAXBINS_A_TI_4
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x9cad90f9
 0,          1,          1,        1,   149760, 0x7deeab1c
diff --git a/tests/ref/fate/hevc-conformance-MAXBINS_B_TI_4 b/tests/ref/fate/hevc-conformance-MAXBINS_B_TI_4
index 5cad961c19..c18c13a1c7 100644
--- a/tests/ref/fate/hevc-conformance-MAXBINS_B_TI_4
+++ b/tests/ref/fate/hevc-conformance-MAXBINS_B_TI_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x211e8487
 0,          1,          1,        1,   149760, 0xa53b13d8
 0,          2,          2,        1,   149760, 0xb63cc103
diff --git a/tests/ref/fate/hevc-conformance-MAXBINS_C_TI_4 b/tests/ref/fate/hevc-conformance-MAXBINS_C_TI_4
index 2eb38437f0..db0e3f738a 100644
--- a/tests/ref/fate/hevc-conformance-MAXBINS_C_TI_4
+++ b/tests/ref/fate/hevc-conformance-MAXBINS_C_TI_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xa8d7adfa
 0,          1,          1,        1,   149760, 0x76d1ddfe
 0,          2,          2,        1,   149760, 0x56599cae
diff --git a/tests/ref/fate/hevc-conformance-MERGE_A_TI_3 b/tests/ref/fate/hevc-conformance-MERGE_A_TI_3
index 0ab6acc2e5..447fb6b772 100644
--- a/tests/ref/fate/hevc-conformance-MERGE_A_TI_3
+++ b/tests/ref/fate/hevc-conformance-MERGE_A_TI_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0x16eb25a8
 0,          2,          2,        1,   149760, 0xcfff29c8
diff --git a/tests/ref/fate/hevc-conformance-MERGE_B_TI_3 b/tests/ref/fate/hevc-conformance-MERGE_B_TI_3
index 2f9395fbf5..dcab89ea8e 100644
--- a/tests/ref/fate/hevc-conformance-MERGE_B_TI_3
+++ b/tests/ref/fate/hevc-conformance-MERGE_B_TI_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0xb5932505
 0,          2,          2,        1,   149760, 0xa5b20e66
diff --git a/tests/ref/fate/hevc-conformance-MERGE_C_TI_3 b/tests/ref/fate/hevc-conformance-MERGE_C_TI_3
index bcc5a1a3e2..703480c898 100644
--- a/tests/ref/fate/hevc-conformance-MERGE_C_TI_3
+++ b/tests/ref/fate/hevc-conformance-MERGE_C_TI_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0x88cb1216
 0,          2,          2,        1,   149760, 0x6d1024da
diff --git a/tests/ref/fate/hevc-conformance-MERGE_D_TI_3 b/tests/ref/fate/hevc-conformance-MERGE_D_TI_3
index 7b4df26d5d..c74094b109 100644
--- a/tests/ref/fate/hevc-conformance-MERGE_D_TI_3
+++ b/tests/ref/fate/hevc-conformance-MERGE_D_TI_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0x3220183c
 0,          2,          2,        1,   149760, 0x43a21acc
diff --git a/tests/ref/fate/hevc-conformance-MERGE_E_TI_3 b/tests/ref/fate/hevc-conformance-MERGE_E_TI_3
index 8491172ca8..b300f8739d 100644
--- a/tests/ref/fate/hevc-conformance-MERGE_E_TI_3
+++ b/tests/ref/fate/hevc-conformance-MERGE_E_TI_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0x187419b5
 0,          2,          2,        1,   149760, 0x61100980
diff --git a/tests/ref/fate/hevc-conformance-MERGE_F_MTK_4 b/tests/ref/fate/hevc-conformance-MERGE_F_MTK_4
index 34a09795db..005ba59ce2 100644
--- a/tests/ref/fate/hevc-conformance-MERGE_F_MTK_4
+++ b/tests/ref/fate/hevc-conformance-MERGE_F_MTK_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xcfffa013
 0,          1,          1,        1,   149760, 0xec800e71
 0,          2,          2,        1,   149760, 0x9fb014c7
diff --git a/tests/ref/fate/hevc-conformance-MERGE_G_HHI_4 b/tests/ref/fate/hevc-conformance-MERGE_G_HHI_4
index 2e88350fe0..6f66e4b3ee 100644
--- a/tests/ref/fate/hevc-conformance-MERGE_G_HHI_4
+++ b/tests/ref/fate/hevc-conformance-MERGE_G_HHI_4
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x65433cfe
 0,          1,          1,        1,   599040, 0x9309e2c5
diff --git a/tests/ref/fate/hevc-conformance-MVCLIP_A_qualcomm_3 b/tests/ref/fate/hevc-conformance-MVCLIP_A_qualcomm_3
index 675622169f..f1cf7e394f 100644
--- a/tests/ref/fate/hevc-conformance-MVCLIP_A_qualcomm_3
+++ b/tests/ref/fate/hevc-conformance-MVCLIP_A_qualcomm_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xa5b11720
 0,          1,          1,        1,   149760, 0x42e52c6e
 0,          2,          2,        1,   149760, 0x27b15a30
diff --git a/tests/ref/fate/hevc-conformance-MVDL1ZERO_A_docomo_3 b/tests/ref/fate/hevc-conformance-MVDL1ZERO_A_docomo_3
index 2019db2621..789cd7c1bd 100644
--- a/tests/ref/fate/hevc-conformance-MVDL1ZERO_A_docomo_3
+++ b/tests/ref/fate/hevc-conformance-MVDL1ZERO_A_docomo_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x9b27dc7d
 0,          1,          1,        1,   599040, 0x796cdd26
 0,          2,          2,        1,   599040, 0xd3c9dca9
diff --git a/tests/ref/fate/hevc-conformance-MVEDGE_A_qualcomm_3 b/tests/ref/fate/hevc-conformance-MVEDGE_A_qualcomm_3
index 0db06c5789..4c676ea18a 100644
--- a/tests/ref/fate/hevc-conformance-MVEDGE_A_qualcomm_3
+++ b/tests/ref/fate/hevc-conformance-MVEDGE_A_qualcomm_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x1d68213a
 0,          1,          1,        1,   149760, 0x9cc81d30
 0,          2,          2,        1,   149760, 0xa3cf6438
diff --git a/tests/ref/fate/hevc-conformance-Main_422_10_A_RExt_Sony_1 b/tests/ref/fate/hevc-conformance-Main_422_10_A_RExt_Sony_1
new file mode 100644
index 0000000000..43cfb611a1
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-Main_422_10_A_RExt_Sony_1
@@ -0,0 +1,29 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0xa189c341
+0,          1,          1,        1,  8294400, 0xefe07f3f
+0,          2,          2,        1,  8294400, 0xf11cd41f
+0,          3,          3,        1,  8294400, 0x85897411
+0,          4,          4,        1,  8294400, 0x2db68eca
+0,          5,          5,        1,  8294400, 0xbf826c45
+0,          6,          6,        1,  8294400, 0x9960de92
+0,          7,          7,        1,  8294400, 0xd8125d06
+0,          8,          8,        1,  8294400, 0xb90251df
+0,          9,          9,        1,  8294400, 0x5cc8c099
+0,         10,         10,        1,  8294400, 0xe5b49131
+0,         11,         11,        1,  8294400, 0xa861faac
+0,         12,         12,        1,  8294400, 0x1e125ad2
+0,         13,         13,        1,  8294400, 0xbceba6d9
+0,         14,         14,        1,  8294400, 0x135dab49
+0,         15,         15,        1,  8294400, 0xf09f3164
+0,         16,         16,        1,  8294400, 0xfda414dd
+0,         17,         17,        1,  8294400, 0xbf273db4
+0,         18,         18,        1,  8294400, 0x0dea125e
+0,         19,         19,        1,  8294400, 0xde6dedb0
+0,         20,         20,        1,  8294400, 0x6389ceb6
+0,         21,         21,        1,  8294400, 0x8d69e4b8
+0,         22,         22,        1,  8294400, 0xf74c0457
+0,         23,         23,        1,  8294400, 0x5ecd983e
diff --git a/tests/ref/fate/hevc-conformance-Main_422_10_B_RExt_Sony_1 b/tests/ref/fate/hevc-conformance-Main_422_10_B_RExt_Sony_1
new file mode 100644
index 0000000000..dd95b52329
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-Main_422_10_B_RExt_Sony_1
@@ -0,0 +1,22 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 2560x1600
+#sar 0: 0/1
+0,          0,          0,        1, 16384000, 0xbf300829
+0,          1,          1,        1, 16384000, 0x7beeab61
+0,          2,          2,        1, 16384000, 0x5e55cd13
+0,          3,          3,        1, 16384000, 0x62a54105
+0,          4,          4,        1, 16384000, 0x2db21797
+0,          5,          5,        1, 16384000, 0x6d9f84c1
+0,          6,          6,        1, 16384000, 0x68fdacfc
+0,          7,          7,        1, 16384000, 0xe2c93c1a
+0,          8,          8,        1, 16384000, 0x7d011df0
+0,          9,          9,        1, 16384000, 0x7524e2d3
+0,         10,         10,        1, 16384000, 0x1d240868
+0,         11,         11,        1, 16384000, 0x14cab858
+0,         12,         12,        1, 16384000, 0x4e2e1130
+0,         13,         13,        1, 16384000, 0x60c75577
+0,         14,         14,        1, 16384000, 0x32dfc64b
+0,         15,         15,        1, 16384000, 0x0725f9ac
+0,         16,         16,        1, 16384000, 0xda0886f1
diff --git a/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5 b/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5
index fe65880bc5..7ac223ef7b 100644
--- a/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5
+++ b/tests/ref/fate/hevc-conformance-NUT_A_ericsson_5
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8ce7200b
 0,          1,          1,        1,   149760, 0x73610669
 0,          2,          2,        1,   149760, 0x42942047
diff --git a/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1 b/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1
new file mode 100644
index 0000000000..5de9da9a39
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-NoOutPrior_A_Qualcomm_1
@@ -0,0 +1,45 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
+0,          0,          0,        1,   599040, 0x91d452d5
+0,          1,          1,        1,   599040, 0x1b482509
+0,          2,          2,        1,   599040, 0xbc51425c
+0,          3,          3,        1,   599040, 0x5777eeee
+0,          4,          4,        1,   599040, 0xe274644d
+0,          5,          5,        1,   599040, 0x867450b5
+0,          6,          6,        1,   599040, 0x58708122
+0,          7,          7,        1,   599040, 0xeef17206
+0,          8,          8,        1,   599040, 0x97f4dc1e
+0,          9,          9,        1,   599040, 0x92c961cc
+0,         10,         10,        1,   599040, 0x1c4ffcb0
+0,         11,         11,        1,   599040, 0xc73e34e6
+0,         12,         12,        1,   599040, 0x1991f1f9
+0,         13,         13,        1,   599040, 0x36e54ba2
+0,         14,         14,        1,   599040, 0x698ce0c6
+0,         15,         15,        1,   599040, 0xc6dd131e
+0,         16,         16,        1,   599040, 0x0a22f4c5
+0,         17,         17,        1,   599040, 0xd6a0c196
+0,         18,         18,        1,   599040, 0x699a3e69
+0,         19,         19,        1,   599040, 0x4227009b
+0,         20,         20,        1,   599040, 0x1bda8be4
+0,         21,         21,        1,   599040, 0xd1d5dcb4
+0,         22,         22,        1,   599040, 0x00a0249f
+0,         23,         23,        1,   599040, 0x7263f7cf
+0,         24,         24,        1,   599040, 0x47054be4
+0,         25,         25,        1,   599040, 0xda083f52
+0,         26,         26,        1,   599040, 0xf2906ab1
+0,         27,         27,        1,   599040, 0x20936797
+0,         28,         28,        1,   599040, 0x644d7c3e
+0,         29,         29,        1,   599040, 0x7c00e8bf
+0,         30,         30,        1,   599040, 0x041f8a48
+0,         31,         31,        1,   599040, 0xcef6e936
+0,         32,         32,        1,   599040, 0x361461e9
+0,         33,         33,        1,   599040, 0xf663ba0a
+0,         34,         34,        1,   599040, 0x4d3371d3
+0,         35,         35,        1,   599040, 0xed6b5c92
+0,         36,         36,        1,   599040, 0xdec67f6e
+0,         37,         37,        1,   599040, 0xbafa50c0
+0,         38,         38,        1,   599040, 0xc9181637
+0,         39,         39,        1,   599040, 0x95834e17
diff --git a/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1 b/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1
new file mode 100644
index 0000000000..f107e937d7
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-NoOutPrior_B_Qualcomm_1
@@ -0,0 +1,52 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
+0,          0,          0,        1,   599040, 0x91d452d5
+0,          1,          1,        1,   599040, 0x1b482509
+0,          2,          2,        1,   599040, 0xbc51425c
+0,          3,          3,        1,   599040, 0x5777eeee
+0,          4,          4,        1,   599040, 0xe274644d
+0,          5,          5,        1,   599040, 0x867450b5
+0,          6,          6,        1,   599040, 0x58708122
+0,          7,          7,        1,   599040, 0xeef17206
+0,          8,          8,        1,   599040, 0x97f4dc1e
+0,          9,          9,        1,   599040, 0x92c961cc
+0,         10,         10,        1,   599040, 0x1c4ffcb0
+0,         11,         11,        1,   599040, 0xc73e34e6
+0,         12,         12,        1,   599040, 0x1991f1f9
+0,         13,         13,        1,   599040, 0x36e54ba2
+0,         14,         14,        1,   599040, 0x698ce0c6
+0,         15,         15,        1,   599040, 0xc6dd131e
+0,         16,         16,        1,   599040, 0x0a22f4c5
+0,         17,         17,        1,   599040, 0xd6a0c196
+0,         18,         18,        1,   599040, 0x699a3e69
+0,         19,         19,        1,   599040, 0x4227009b
+0,         20,         20,        1,   599040, 0x1bda8be4
+0,         21,         21,        1,   599040, 0xd1d5dcb4
+0,         22,         22,        1,   599040, 0x00d87745
+0,         23,         23,        1,   599040, 0x9b689b16
+0,         24,         24,        1,   599040, 0x40ae530a
+0,         25,         25,        1,   599040, 0x8284f649
+0,         26,         26,        1,   599040, 0x37423ae4
+0,         27,         27,        1,   599040, 0xb3f72b02
+0,         28,         28,        1,   599040, 0xc0cc5860
+0,         29,         29,        1,   599040, 0x00a0249f
+0,         30,         30,        1,   599040, 0x7263f7cf
+0,         31,         31,        1,   599040, 0x47054be4
+0,         32,         32,        1,   599040, 0xda083f52
+0,         33,         33,        1,   599040, 0xf2906ab1
+0,         34,         34,        1,   599040, 0x20936797
+0,         35,         35,        1,   599040, 0x644d7c3e
+0,         36,         36,        1,   599040, 0x7c00e8bf
+0,         37,         37,        1,   599040, 0x041f8a48
+0,         38,         38,        1,   599040, 0xcef6e936
+0,         39,         39,        1,   599040, 0x361461e9
+0,         40,         40,        1,   599040, 0xf663ba0a
+0,         41,         41,        1,   599040, 0x4d3371d3
+0,         42,         42,        1,   599040, 0xed6b5c92
+0,         43,         43,        1,   599040, 0xdec67f6e
+0,         44,         44,        1,   599040, 0xbafa50c0
+0,         45,         45,        1,   599040, 0xc9181637
+0,         46,         46,        1,   599040, 0x95834e17
diff --git a/tests/ref/fate/hevc-conformance-OPFLAG_A_Qualcomm_1 b/tests/ref/fate/hevc-conformance-OPFLAG_A_Qualcomm_1
new file mode 100644
index 0000000000..ed2e9ec8eb
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-OPFLAG_A_Qualcomm_1
@@ -0,0 +1,505 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
+0,          0,          0,        1,   149760, 0xcfffa013
+0,          1,          1,        1,   149760, 0x8ae80654
+0,          2,          2,        1,   149760, 0xa79915b8
+0,          3,          3,        1,   149760, 0xcc5d4a1e
+0,          4,          4,        1,   149760, 0x80636df7
+0,          5,          5,        1,   149760, 0x9cf2c175
+0,          6,          6,        1,   149760, 0xb7c9ecc5
+0,          7,          7,        1,   149760, 0xd038133c
+0,          8,          8,        1,   149760, 0x82c62409
+0,          9,          9,        1,   149760, 0xf9ec8f18
+0,         10,         10,        1,   149760, 0x4969ba2d
+0,         11,         11,        1,   149760, 0xc4ece232
+0,         12,         12,        1,   149760, 0xc346cab1
+0,         13,         13,        1,   149760, 0xec83e8fd
+0,         14,         14,        1,   149760, 0x08e6ee21
+0,         15,         15,        1,   149760, 0x816818ac
+0,         16,         16,        1,   149760, 0xc6822627
+0,         17,         17,        1,   149760, 0x2d1d751f
+0,         18,         18,        1,   149760, 0xceb8796d
+0,         19,         19,        1,   149760, 0xa8919e96
+0,         20,         20,        1,   149760, 0x6fce9abe
+0,         21,         21,        1,   149760, 0x66fcbc8b
+0,         22,         22,        1,   149760, 0xfc0acbdb
+0,         23,         23,        1,   149760, 0x4fa7f7c3
+0,         24,         24,        1,   149760, 0xcc1a00a8
+0,         25,         25,        1,   149760, 0xe3b9aab4
+0,         26,         26,        1,   149760, 0xc064a2a9
+0,         27,         27,        1,   149760, 0x7c29bc1e
+0,         28,         28,        1,   149760, 0x54b0a3f2
+0,         29,         29,        1,   149760, 0x4781f75f
+0,         30,         30,        1,   149760, 0x3722ec9b
+0,         31,         31,        1,   149760, 0xb73fffc8
+0,         32,         32,        1,   149760, 0xd4437e12
+0,         33,         33,        1,   149760, 0xeb8bc09f
+0,         34,         34,        1,   149760, 0xe6b0cf24
+0,         35,         35,        1,   149760, 0xffbee400
+0,         36,         36,        1,   149760, 0x71b3d1c2
+0,         37,         37,        1,   149760, 0xeb05fce6
+0,         38,         38,        1,   149760, 0x968a049c
+0,         39,         39,        1,   149760, 0xf0b81987
+0,         40,         40,        1,   149760, 0x8ec12318
+0,         41,         41,        1,   149760, 0xb25f6f73
+0,         42,         42,        1,   149760, 0x4d9972ea
+0,         43,         43,        1,   149760, 0xb1be9ddd
+0,         44,         44,        1,   149760, 0xd8f97724
+0,         45,         45,        1,   149760, 0x88e9a071
+0,         46,         46,        1,   149760, 0xec3a6985
+0,         47,         47,        1,   149760, 0x5eb77758
+0,         48,         48,        1,   149760, 0x7a2d6bc0
+0,         49,         49,        1,   149760, 0x4c108b5a
+0,         50,         50,        1,   149760, 0xd1609676
+0,         51,         51,        1,   149760, 0xf497c5f2
+0,         52,         52,        1,   149760, 0x7d52bf67
+0,         53,         53,        1,   149760, 0xa9aeed34
+0,         54,         54,        1,   149760, 0x8a7a03ad
+0,         55,         55,        1,   149760, 0x7d6f34ba
+0,         56,         56,        1,   149760, 0x3c7a3f33
+0,         57,         57,        1,   149760, 0x220db437
+0,         58,         58,        1,   149760, 0x9098aed1
+0,         59,         59,        1,   149760, 0xba89f864
+0,         60,         60,        1,   149760, 0xc6f0f02a
+0,         61,         61,        1,   149760, 0xda71bdce
+0,         62,         62,        1,   149760, 0x7532698a
+0,         63,         63,        1,   149760, 0x20725283
+0,         64,         64,        1,   149760, 0xd3378be9
+0,         65,         65,        1,   149760, 0x0c449d3b
+0,         66,         66,        1,   149760, 0xcb16554e
+0,         67,         67,        1,   149760, 0x63bf54fd
+0,         68,         68,        1,   149760, 0xc9b8125a
+0,         69,         69,        1,   149760, 0x29391d98
+0,         70,         70,        1,   149760, 0xaba92f83
+0,         71,         71,        1,   149760, 0x278360ab
+0,         72,         72,        1,   149760, 0x72a17719
+0,         73,         73,        1,   149760, 0xc1057998
+0,         74,         74,        1,   149760, 0x3e3fb884
+0,         75,         75,        1,   149760, 0x4cadfcf5
+0,         76,         76,        1,   149760, 0x265ef61a
+0,         77,         77,        1,   149760, 0xc84e8e23
+0,         78,         78,        1,   149760, 0xf23cf3c3
+0,         79,         79,        1,   149760, 0x19280d25
+0,         80,         80,        1,   149760, 0xfc1ed859
+0,         81,         81,        1,   149760, 0x1a4caf70
+0,         82,         82,        1,   149760, 0xcbc3e559
+0,         83,         83,        1,   149760, 0x2284cd25
+0,         84,         84,        1,   149760, 0x4eca841e
+0,         85,         85,        1,   149760, 0xc5b2783b
+0,         86,         86,        1,   149760, 0x5c07bffe
+0,         87,         87,        1,   149760, 0x965b366d
+0,         88,         88,        1,   149760, 0x96a87998
+0,         89,         89,        1,   149760, 0x325fb5a8
+0,         90,         90,        1,   149760, 0xfb50de20
+0,         91,         91,        1,   149760, 0x4551ff6f
+0,         92,         92,        1,   149760, 0x2c313114
+0,         93,         93,        1,   149760, 0x585fbb08
+0,         94,         94,        1,   149760, 0xab620fbc
+0,         95,         95,        1,   149760, 0xac147ed6
+0,         96,         96,        1,   149760, 0x8753dbea
+0,         97,         97,        1,   149760, 0x7bd147a4
+0,         98,         98,        1,   149760, 0x09db40f9
+0,         99,         99,        1,   149760, 0x2c1d3e0e
+0,        100,        100,        1,   149760, 0xb3678490
+0,        101,        101,        1,   149760, 0xaa1ef03a
+0,        102,        102,        1,   149760, 0xaa272a2b
+0,        103,        103,        1,   149760, 0x765022ee
+0,        104,        104,        1,   149760, 0xa77ae265
+0,        105,        105,        1,   149760, 0xd48ce610
+0,        106,        106,        1,   149760, 0xbbe32786
+0,        107,        107,        1,   149760, 0x2ba067dd
+0,        108,        108,        1,   149760, 0x28251c88
+0,        109,        109,        1,   149760, 0xf7073bea
+0,        110,        110,        1,   149760, 0x5ada8c9f
+0,        111,        111,        1,   149760, 0x0ac5f0c3
+0,        112,        112,        1,   149760, 0x5771b681
+0,        113,        113,        1,   149760, 0x63b1aff4
+0,        114,        114,        1,   149760, 0xe52f1c14
+0,        115,        115,        1,   149760, 0x9fc6a873
+0,        116,        116,        1,   149760, 0xaa7fa136
+0,        117,        117,        1,   149760, 0xea0f1bc3
+0,        118,        118,        1,   149760, 0xb960a92a
+0,        119,        119,        1,   149760, 0x8a57440d
+0,        120,        120,        1,   149760, 0x0975231e
+0,        121,        121,        1,   149760, 0x01f4e2ca
+0,        122,        122,        1,   149760, 0x2feba705
+0,        123,        123,        1,   149760, 0xd8c2bb3e
+0,        124,        124,        1,   149760, 0x96d8a2a3
+0,        125,        125,        1,   149760, 0xc32ff8d3
+0,        126,        126,        1,   149760, 0x1f8a8edb
+0,        127,        127,        1,   149760, 0xc6242875
+0,        128,        128,        1,   149760, 0x3d4df3de
+0,        129,        129,        1,   149760, 0x43408010
+0,        130,        130,        1,   149760, 0x2ecd8706
+0,        131,        131,        1,   149760, 0x283c99f9
+0,        132,        132,        1,   149760, 0xa659bde0
+0,        133,        133,        1,   149760, 0x0edc3e70
+0,        134,        134,        1,   149760, 0x9ab3077e
+0,        135,        135,        1,   149760, 0x45a2bf0b
+0,        136,        136,        1,   149760, 0x67aff7d9
+0,        137,        137,        1,   149760, 0x4395fe6f
+0,        138,        138,        1,   149760, 0x84e8ca70
+0,        139,        139,        1,   149760, 0x4089d054
+0,        140,        140,        1,   149760, 0x893bcd2c
+0,        141,        141,        1,   149760, 0x36644083
+0,        142,        142,        1,   149760, 0xa0cf4e7d
+0,        143,        143,        1,   149760, 0x1ee06750
+0,        144,        144,        1,   149760, 0xef952e66
+0,        145,        145,        1,   149760, 0x7bc3936b
+0,        146,        146,        1,   149760, 0x73820f10
+0,        147,        147,        1,   149760, 0xf20e4fa7
+0,        148,        148,        1,   149760, 0xedc2b195
+0,        149,        149,        1,   149760, 0xd5dda892
+0,        150,        150,        1,   149760, 0x065559e4
+0,        151,        151,        1,   149760, 0xd1d1d2f7
+0,        152,        152,        1,   149760, 0x7ea0069e
+0,        153,        153,        1,   149760, 0x7eb18a44
+0,        154,        154,        1,   149760, 0x5165627b
+0,        155,        155,        1,   149760, 0x2bc02a08
+0,        156,        156,        1,   149760, 0x054f4260
+0,        157,        157,        1,   149760, 0x90206d1a
+0,        158,        158,        1,   149760, 0x86a46770
+0,        159,        159,        1,   149760, 0x877956ae
+0,        160,        160,        1,   149760, 0xeaee7801
+0,        161,        161,        1,   149760, 0xf5ae2e9d
+0,        162,        162,        1,   149760, 0x65ef307b
+0,        163,        163,        1,   149760, 0xbcd72d22
+0,        164,        164,        1,   149760, 0x6f5555eb
+0,        165,        165,        1,   149760, 0x5c5f43af
+0,        166,        166,        1,   149760, 0x13c9fa8e
+0,        167,        167,        1,   149760, 0x2236154f
+0,        168,        168,        1,   149760, 0x13fdcefc
+0,        169,        169,        1,   149760, 0x3e95cea3
+0,        170,        170,        1,   149760, 0x11d73074
+0,        171,        171,        1,   149760, 0x66a68f43
+0,        172,        172,        1,   149760, 0x594ce4d2
+0,        173,        173,        1,   149760, 0xbea4a3de
+0,        174,        174,        1,   149760, 0x72258b54
+0,        175,        175,        1,   149760, 0xf7598059
+0,        176,        176,        1,   149760, 0x527b8538
+0,        177,        177,        1,   149760, 0x9150a81a
+0,        178,        178,        1,   149760, 0x9c227fd2
+0,        179,        179,        1,   149760, 0x60347245
+0,        180,        180,        1,   149760, 0x3b9f6f64
+0,        181,        181,        1,   149760, 0xd6f37def
+0,        182,        182,        1,   149760, 0xa06933dd
+0,        183,        183,        1,   149760, 0x19e4ef4d
+0,        184,        184,        1,   149760, 0x1fb958cb
+0,        185,        185,        1,   149760, 0x3c4e3f19
+0,        186,        186,        1,   149760, 0x98ab1123
+0,        187,        187,        1,   149760, 0x0b4cdf66
+0,        188,        188,        1,   149760, 0x75cd51ef
+0,        189,        189,        1,   149760, 0x83e9617d
+0,        190,        190,        1,   149760, 0xb97a175b
+0,        191,        191,        1,   149760, 0x017520de
+0,        192,        192,        1,   149760, 0xa72ecc38
+0,        193,        193,        1,   149760, 0xfb493c45
+0,        194,        194,        1,   149760, 0x6c8e40b4
+0,        195,        195,        1,   149760, 0x4aa6672c
+0,        196,        196,        1,   149760, 0x223f68e5
+0,        197,        197,        1,   149760, 0x6257d660
+0,        198,        198,        1,   149760, 0xade0f8af
+0,        199,        199,        1,   149760, 0x8543652c
+0,        200,        200,        1,   149760, 0x593b7957
+0,        201,        201,        1,   149760, 0x90ce1910
+0,        202,        202,        1,   149760, 0x3d617a3f
+0,        203,        203,        1,   149760, 0x9336fbc0
+0,        204,        204,        1,   149760, 0x26f1387b
+0,        205,        205,        1,   149760, 0x0273a944
+0,        206,        206,        1,   149760, 0x71b9b110
+0,        207,        207,        1,   149760, 0x123fee6d
+0,        208,        208,        1,   149760, 0xc4bde65b
+0,        209,        209,        1,   149760, 0x646e3a45
+0,        210,        210,        1,   149760, 0x987e6024
+0,        211,        211,        1,   149760, 0x0bf6c9d4
+0,        212,        212,        1,   149760, 0x20d6e1cf
+0,        213,        213,        1,   149760, 0x5e0931df
+0,        214,        214,        1,   149760, 0xd96e313c
+0,        215,        215,        1,   149760, 0x04bbfcc5
+0,        216,        216,        1,   149760, 0xa764de56
+0,        217,        217,        1,   149760, 0x1e584d95
+0,        218,        218,        1,   149760, 0x1779f283
+0,        219,        219,        1,   149760, 0xfaefbc07
+0,        220,        220,        1,   149760, 0x2e9b4e2b
+0,        221,        221,        1,   149760, 0xeb6e3a42
+0,        222,        222,        1,   149760, 0xd2cbe3d4
+0,        223,        223,        1,   149760, 0xb9c4cf8c
+0,        224,        224,        1,   149760, 0x167b5401
+0,        225,        225,        1,   149760, 0x37846b87
+0,        226,        226,        1,   149760, 0xd0d66b7c
+0,        227,        227,        1,   149760, 0x4d61970e
+0,        228,        228,        1,   149760, 0x987cbc29
+0,        229,        229,        1,   149760, 0x3fa00111
+0,        230,        230,        1,   149760, 0x42ba262f
+0,        231,        231,        1,   149760, 0x9d40660b
+0,        232,        232,        1,   149760, 0x3b678b28
+0,        233,        233,        1,   149760, 0x3c72d081
+0,        234,        234,        1,   149760, 0xd8ad0056
+0,        235,        235,        1,   149760, 0x86052268
+0,        236,        236,        1,   149760, 0x8ac3f213
+0,        237,        237,        1,   149760, 0xe2cfb6fb
+0,        238,        238,        1,   149760, 0x412b5544
+0,        239,        239,        1,   149760, 0x468d2f6d
+0,        240,        240,        1,   149760, 0x63f5e9d0
+0,        241,        241,        1,   149760, 0x4318f07d
+0,        242,        242,        1,   149760, 0xa0c7b7df
+0,        243,        243,        1,   149760, 0x8ad37f38
+0,        244,        244,        1,   149760, 0xa6101620
+0,        245,        245,        1,   149760, 0x02b3d774
+0,        246,        246,        1,   149760, 0x541a6c86
+0,        247,        247,        1,   149760, 0xe11148f0
+0,        248,        248,        1,   149760, 0x4a920c7e
+0,        249,        249,        1,   149760, 0x878104a9
+0,        250,        250,        1,   149760, 0xbb65dfda
+0,        251,        251,        1,   149760, 0xda02bd47
+0,        252,        252,        1,   149760, 0xe0529fd7
+0,        253,        253,        1,   149760, 0x52619028
+0,        254,        254,        1,   149760, 0x4e9c9f32
+0,        255,        255,        1,   149760, 0x9ae49e70
+0,        256,        256,        1,   149760, 0x851e84de
+0,        257,        257,        1,   149760, 0x1709a3cd
+0,        258,        258,        1,   149760, 0x3dace2eb
+0,        259,        259,        1,   149760, 0x46fe3ebf
+0,        260,        260,        1,   149760, 0xea53610c
+0,        261,        261,        1,   149760, 0x0df3415f
+0,        262,        262,        1,   149760, 0x29c57eec
+0,        263,        263,        1,   149760, 0x1ed3a882
+0,        264,        264,        1,   149760, 0xf3047aed
+0,        265,        265,        1,   149760, 0x7a7d08cd
+0,        266,        266,        1,   149760, 0xc69dd2ad
+0,        267,        267,        1,   149760, 0x94d1c233
+0,        268,        268,        1,   149760, 0x21d7eab9
+0,        269,        269,        1,   149760, 0xd8755fda
+0,        270,        270,        1,   149760, 0xa44fbf4a
+0,        271,        271,        1,   149760, 0x624d42cb
+0,        272,        272,        1,   149760, 0xf462482d
+0,        273,        273,        1,   149760, 0x8dd0641d
+0,        274,        274,        1,   149760, 0x9349bc12
+0,        275,        275,        1,   149760, 0x0488137f
+0,        276,        276,        1,   149760, 0x8088d83e
+0,        277,        277,        1,   149760, 0x051895e4
+0,        278,        278,        1,   149760, 0x0cc16c74
+0,        279,        279,        1,   149760, 0xcdc62942
+0,        280,        280,        1,   149760, 0x6d1392aa
+0,        281,        281,        1,   149760, 0x61e2e1da
+0,        282,        282,        1,   149760, 0x5cb06ae9
+0,        283,        283,        1,   149760, 0x5110b773
+0,        284,        284,        1,   149760, 0x050db1cb
+0,        285,        285,        1,   149760, 0x353dfc85
+0,        286,        286,        1,   149760, 0x96ac57f2
+0,        287,        287,        1,   149760, 0x7e925578
+0,        288,        288,        1,   149760, 0x4eaa64c0
+0,        289,        289,        1,   149760, 0x10b6d8cf
+0,        290,        290,        1,   149760, 0x645317c2
+0,        291,        291,        1,   149760, 0xcf60e8e2
+0,        292,        292,        1,   149760, 0x38dc8503
+0,        293,        293,        1,   149760, 0xf88bd43b
+0,        294,        294,        1,   149760, 0x284b675e
+0,        295,        295,        1,   149760, 0xba9ac819
+0,        296,        296,        1,   149760, 0xd913bba8
+0,        297,        297,        1,   149760, 0x50612c15
+0,        298,        298,        1,   149760, 0x8ec14fb1
+0,        299,        299,        1,   149760, 0x2dd30b7d
+0,        300,        300,        1,   149760, 0x5a3f52cf
+0,        301,        301,        1,   149760, 0x95169561
+0,        302,        302,        1,   149760, 0x6ede7115
+0,        303,        303,        1,   149760, 0x70e435e0
+0,        304,        304,        1,   149760, 0x496df85a
+0,        305,        305,        1,   149760, 0xdd583698
+0,        306,        306,        1,   149760, 0xee46c909
+0,        307,        307,        1,   149760, 0x4b0632ed
+0,        308,        308,        1,   149760, 0x744e4d23
+0,        309,        309,        1,   149760, 0xc72d8111
+0,        310,        310,        1,   149760, 0x6d6c62d4
+0,        311,        311,        1,   149760, 0xbc39103c
+0,        312,        312,        1,   149760, 0x1b0548e5
+0,        313,        313,        1,   149760, 0xac760971
+0,        314,        314,        1,   149760, 0x0bbfeab1
+0,        315,        315,        1,   149760, 0x843ca731
+0,        316,        316,        1,   149760, 0x6a8dd5c9
+0,        317,        317,        1,   149760, 0xd5e19d6e
+0,        318,        318,        1,   149760, 0xde1e9259
+0,        319,        319,        1,   149760, 0xa9c6aecf
+0,        320,        320,        1,   149760, 0x4e3c1463
+0,        321,        321,        1,   149760, 0x20e95cd5
+0,        322,        322,        1,   149760, 0x26b9c119
+0,        323,        323,        1,   149760, 0x0284eab3
+0,        324,        324,        1,   149760, 0x128544f3
+0,        325,        325,        1,   149760, 0x5c33579c
+0,        326,        326,        1,   149760, 0x58e48fc1
+0,        327,        327,        1,   149760, 0x46d20ba5
+0,        328,        328,        1,   149760, 0x232478d4
+0,        329,        329,        1,   149760, 0x4299f014
+0,        330,        330,        1,   149760, 0x68e08339
+0,        331,        331,        1,   149760, 0x01c0ca97
+0,        332,        332,        1,   149760, 0xad7071d6
+0,        333,        333,        1,   149760, 0xa1efff2e
+0,        334,        334,        1,   149760, 0xe788aa06
+0,        335,        335,        1,   149760, 0xa203d648
+0,        336,        336,        1,   149760, 0xdec84349
+0,        337,        337,        1,   149760, 0xb15fc868
+0,        338,        338,        1,   149760, 0x6ca04511
+0,        339,        339,        1,   149760, 0xc4b95d7e
+0,        340,        340,        1,   149760, 0xa3d0d178
+0,        341,        341,        1,   149760, 0xb4835e5f
+0,        342,        342,        1,   149760, 0xcff22407
+0,        343,        343,        1,   149760, 0x8259ad5a
+0,        344,        344,        1,   149760, 0x9cb2f71a
+0,        345,        345,        1,   149760, 0xf2d3cae6
+0,        346,        346,        1,   149760, 0xbdaa58c5
+0,        347,        347,        1,   149760, 0x2c0ec9bd
+0,        348,        348,        1,   149760, 0x63357b56
+0,        349,        349,        1,   149760, 0xc92b5672
+0,        350,        350,        1,   149760, 0xc2deae0d
+0,        351,        351,        1,   149760, 0x111a214d
+0,        352,        352,        1,   149760, 0xbb7a0383
+0,        353,        353,        1,   149760, 0x31b6d2ad
+0,        354,        354,        1,   149760, 0x87f8b103
+0,        355,        355,        1,   149760, 0xd035ede8
+0,        356,        356,        1,   149760, 0xf021cb64
+0,        357,        357,        1,   149760, 0x18a1c19c
+0,        358,        358,        1,   149760, 0xc51980ac
+0,        359,        359,        1,   149760, 0x2394c13e
+0,        360,        360,        1,   149760, 0x2b27c7ee
+0,        361,        361,        1,   149760, 0x40e0670f
+0,        362,        362,        1,   149760, 0xbc0f3989
+0,        363,        363,        1,   149760, 0x391048d6
+0,        364,        364,        1,   149760, 0x1bc0e92c
+0,        365,        365,        1,   149760, 0xa7e278d9
+0,        366,        366,        1,   149760, 0xb4123421
+0,        367,        367,        1,   149760, 0x106bb0e1
+0,        368,        368,        1,   149760, 0x4c2a61d2
+0,        369,        369,        1,   149760, 0x69aaee6e
+0,        370,        370,        1,   149760, 0x925e5432
+0,        371,        371,        1,   149760, 0x06d6d786
+0,        372,        372,        1,   149760, 0xd431fba8
+0,        373,        373,        1,   149760, 0x54092812
+0,        374,        374,        1,   149760, 0xb8e10742
+0,        375,        375,        1,   149760, 0x2ee782d3
+0,        376,        376,        1,   149760, 0x210ff556
+0,        377,        377,        1,   149760, 0xa41cf41e
+0,        378,        378,        1,   149760, 0xbe852e5a
+0,        379,        379,        1,   149760, 0x4a89b5c5
+0,        380,        380,        1,   149760, 0xe44408d1
+0,        381,        381,        1,   149760, 0x503197f3
+0,        382,        382,        1,   149760, 0x686bf74e
+0,        383,        383,        1,   149760, 0xb96fd46b
+0,        384,        384,        1,   149760, 0x9a926a62
+0,        385,        385,        1,   149760, 0x97cf58e9
+0,        386,        386,        1,   149760, 0x0e7840af
+0,        387,        387,        1,   149760, 0x00aa85e9
+0,        388,        388,        1,   149760, 0x24c4fd96
+0,        389,        389,        1,   149760, 0xe520844b
+0,        390,        390,        1,   149760, 0xd4755d80
+0,        391,        391,        1,   149760, 0x9cd4b85c
+0,        392,        392,        1,   149760, 0xd01aa4ad
+0,        393,        393,        1,   149760, 0xa5479aa5
+0,        394,        394,        1,   149760, 0x74c066d4
+0,        395,        395,        1,   149760, 0xe1a35a46
+0,        396,        396,        1,   149760, 0x714aeafb
+0,        397,        397,        1,   149760, 0xb3e0f80e
+0,        398,        398,        1,   149760, 0x99663804
+0,        399,        399,        1,   149760, 0x3a40a623
+0,        400,        400,        1,   149760, 0x91b4d995
+0,        401,        401,        1,   149760, 0x6edd8a1f
+0,        402,        402,        1,   149760, 0x1f763e9a
+0,        403,        403,        1,   149760, 0x932b79d4
+0,        404,        404,        1,   149760, 0x6a1a9755
+0,        405,        405,        1,   149760, 0x403562c8
+0,        406,        406,        1,   149760, 0x6486231b
+0,        407,        407,        1,   149760, 0x3c2bfb98
+0,        408,        408,        1,   149760, 0x198a3cee
+0,        409,        409,        1,   149760, 0x4d2f7817
+0,        410,        410,        1,   149760, 0xd7b189a7
+0,        411,        411,        1,   149760, 0x9ad0ba76
+0,        412,        412,        1,   149760, 0xea8d8859
+0,        413,        413,        1,   149760, 0x30fae052
+0,        414,        414,        1,   149760, 0x55b1763c
+0,        415,        415,        1,   149760, 0x4be39b5b
+0,        416,        416,        1,   149760, 0xec332a7f
+0,        417,        417,        1,   149760, 0x226f7c74
+0,        418,        418,        1,   149760, 0x0a82fa19
+0,        419,        419,        1,   149760, 0x8bb5ca7d
+0,        420,        420,        1,   149760, 0xe59f21e1
+0,        421,        421,        1,   149760, 0x20450c0b
+0,        422,        422,        1,   149760, 0xd9fcc726
+0,        423,        423,        1,   149760, 0xf4e9a639
+0,        424,        424,        1,   149760, 0x932602d1
+0,        425,        425,        1,   149760, 0xcdfdb2c6
+0,        426,        426,        1,   149760, 0xc91929b2
+0,        427,        427,        1,   149760, 0x6b24081c
+0,        428,        428,        1,   149760, 0xa2e00bd5
+0,        429,        429,        1,   149760, 0x7536baea
+0,        430,        430,        1,   149760, 0x5a4279b7
+0,        431,        431,        1,   149760, 0x48741fb4
+0,        432,        432,        1,   149760, 0xe0a71c39
+0,        433,        433,        1,   149760, 0x4422b4cf
+0,        434,        434,        1,   149760, 0x3ddc7752
+0,        435,        435,        1,   149760, 0x209ebb6b
+0,        436,        436,        1,   149760, 0x47cc746f
+0,        437,        437,        1,   149760, 0x159f56a4
+0,        438,        438,        1,   149760, 0x22e39511
+0,        439,        439,        1,   149760, 0x78698fbd
+0,        440,        440,        1,   149760, 0x7bc88f86
+0,        441,        441,        1,   149760, 0x44a423d1
+0,        442,        442,        1,   149760, 0x25fadf02
+0,        443,        443,        1,   149760, 0xd360cfee
+0,        444,        444,        1,   149760, 0xcd6c409f
+0,        445,        445,        1,   149760, 0xd5905aca
+0,        446,        446,        1,   149760, 0x621f3edc
+0,        447,        447,        1,   149760, 0x79bd347e
+0,        448,        448,        1,   149760, 0xdb9d163d
+0,        449,        449,        1,   149760, 0x7282e4d6
+0,        450,        450,        1,   149760, 0x8d6dc686
+0,        451,        451,        1,   149760, 0x35132151
+0,        452,        452,        1,   149760, 0x27a05c87
+0,        453,        453,        1,   149760, 0x8e12df27
+0,        454,        454,        1,   149760, 0xf2fb72cd
+0,        455,        455,        1,   149760, 0xea71796e
+0,        456,        456,        1,   149760, 0xbd2ffeec
+0,        457,        457,        1,   149760, 0xdb849b70
+0,        458,        458,        1,   149760, 0xc8193666
+0,        459,        459,        1,   149760, 0x7dab4b05
+0,        460,        460,        1,   149760, 0x83a94327
+0,        461,        461,        1,   149760, 0x56a2ca36
+0,        462,        462,        1,   149760, 0x7d20c938
+0,        463,        463,        1,   149760, 0xfbbfa0bd
+0,        464,        464,        1,   149760, 0xea020d13
+0,        465,        465,        1,   149760, 0x2ef8c012
+0,        466,        466,        1,   149760, 0x36a10f18
+0,        467,        467,        1,   149760, 0x56e538e3
+0,        468,        468,        1,   149760, 0xf98d9ca8
+0,        469,        469,        1,   149760, 0xeba06818
+0,        470,        470,        1,   149760, 0x7d9c6f79
+0,        471,        471,        1,   149760, 0xd7173a90
+0,        472,        472,        1,   149760, 0xff4ced8d
+0,        473,        473,        1,   149760, 0xe7d92ff8
+0,        474,        474,        1,   149760, 0x4f020382
+0,        475,        475,        1,   149760, 0x4e93292a
+0,        476,        476,        1,   149760, 0x08dc52c7
+0,        477,        477,        1,   149760, 0xbff9557e
+0,        478,        478,        1,   149760, 0x1caa8bc5
+0,        479,        479,        1,   149760, 0x9b7aaf9a
+0,        480,        480,        1,   149760, 0x2cb89025
+0,        481,        481,        1,   149760, 0x18e2a4ad
+0,        482,        482,        1,   149760, 0xf50dce5e
+0,        483,        483,        1,   149760, 0x9f87c44f
+0,        484,        484,        1,   149760, 0xbfdc521d
+0,        485,        485,        1,   149760, 0xa06f5b06
+0,        486,        486,        1,   149760, 0xa169a6fe
+0,        487,        487,        1,   149760, 0xce6280d4
+0,        488,        488,        1,   149760, 0x056c21d6
+0,        489,        489,        1,   149760, 0x70b068df
+0,        490,        490,        1,   149760, 0x1097459b
+0,        491,        491,        1,   149760, 0xef1925f1
+0,        492,        492,        1,   149760, 0x6969b893
+0,        493,        493,        1,   149760, 0x0203fc33
+0,        494,        494,        1,   149760, 0x812e46b9
+0,        495,        495,        1,   149760, 0x7379207f
+0,        496,        496,        1,   149760, 0xff11e733
+0,        497,        497,        1,   149760, 0xc5af45a8
+0,        498,        498,        1,   149760, 0x3ec6b250
+0,        499,        499,        1,   149760, 0xb90ddf3a
diff --git a/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1 b/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1
new file mode 100644
index 0000000000..cc4a22f92e
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-OPFLAG_B_Qualcomm_1
@@ -0,0 +1,103 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
+0,          0,          0,        1,   599040, 0x4246702a
+0,          1,          1,        1,   599040, 0x25e02747
+0,          2,          2,        1,   599040, 0x0894b9de
+0,          3,          3,        1,   599040, 0x88ea9524
+0,          4,          4,        1,   599040, 0xaff26463
+0,          5,          5,        1,   599040, 0x5fb75697
+0,          6,          6,        1,   599040, 0xbc2f36a3
+0,          7,          7,        1,   599040, 0xb7823c25
+0,          8,          8,        1,   599040, 0x61cb05cb
+0,          9,          9,        1,   599040, 0x74bfcc5c
+0,         10,         10,        1,   599040, 0x435c4cb3
+0,         11,         11,        1,   599040, 0x34e1a6df
+0,         12,         12,        1,   599040, 0x57760c47
+0,         13,         13,        1,   599040, 0xd8c5092c
+0,         14,         14,        1,   599040, 0x56d4aeed
+0,         15,         15,        1,   599040, 0xda4388c2
+0,         16,         16,        1,   599040, 0x09c82870
+0,         17,         17,        1,   599040, 0x77f63854
+0,         18,         18,        1,   599040, 0xb7ca000b
+0,         19,         19,        1,   599040, 0x6ef162db
+0,         20,         20,        1,   599040, 0x1a274bec
+0,         21,         21,        1,   599040, 0x1a839505
+0,         22,         22,        1,   599040, 0xf78f0c03
+0,         23,         23,        1,   599040, 0x3d395229
+0,         24,         24,        1,   599040, 0x9494b5ac
+0,         25,         25,        1,   599040, 0x42560d96
+0,         26,         26,        1,   599040, 0x135f76d8
+0,         27,         27,        1,   599040, 0x3758c2ab
+0,         28,         28,        1,   599040, 0x100fb1d8
+0,         29,         29,        1,   599040, 0x9273f18e
+0,         30,         30,        1,   599040, 0x41b31734
+0,         31,         31,        1,   599040, 0xb2e140b7
+0,         32,         32,        1,   599040, 0xd35f3451
+0,         33,         33,        1,   599040, 0x6198a3d6
+0,         34,         34,        1,   599040, 0x0253e3fa
+0,         35,         35,        1,   599040, 0x421a1cd1
+0,         36,         36,        1,   599040, 0xd2152e6b
+0,         37,         37,        1,   599040, 0xe4c37cc7
+0,         38,         38,        1,   599040, 0xec3393c3
+0,         39,         39,        1,   599040, 0x1fe16574
+0,         40,         40,        1,   599040, 0xa3a8c14d
+0,         41,         41,        1,   599040, 0x32eb90aa
+0,         42,         42,        1,   599040, 0xebca8310
+0,         43,         43,        1,   599040, 0x7888627f
+0,         44,         44,        1,   599040, 0xe048335c
+0,         45,         45,        1,   599040, 0xe2262b9c
+0,         46,         46,        1,   599040, 0xb8c2b115
+0,         47,         47,        1,   599040, 0x2ff4194b
+0,         48,         48,        1,   599040, 0x3a9b5520
+0,         49,         49,        1,   599040, 0xbd8c0486
+0,         50,         50,        1,   599040, 0xc8b8f29e
+0,         51,         51,        1,   599040, 0xbc12f62c
+0,         52,         52,        1,   599040, 0x04bb6438
+0,         53,         53,        1,   599040, 0x07971646
+0,         54,         54,        1,   599040, 0x0193dabe
+0,         55,         55,        1,   599040, 0x20f41d9e
+0,         56,         56,        1,   599040, 0x04b40718
+0,         57,         57,        1,   599040, 0x75d2c51c
+0,         58,         58,        1,   599040, 0x9b8c2c50
+0,         59,         59,        1,   599040, 0x970e39ea
+0,         60,         60,        1,   599040, 0x7c4264aa
+0,         61,         61,        1,   599040, 0xe939a6fd
+0,         62,         62,        1,   599040, 0xc8b95f8d
+0,         63,         63,        1,   599040, 0x9e2f384a
+0,         64,         64,        1,   599040, 0x7dc74724
+0,         65,         65,        1,   599040, 0x7e93bc5f
+0,         66,         66,        1,   599040, 0x99b2c09d
+0,         67,         67,        1,   599040, 0x284e436f
+0,         68,         68,        1,   599040, 0xaa303eee
+0,         69,         69,        1,   599040, 0x65e54342
+0,         70,         70,        1,   599040, 0x2fe183cd
+0,         71,         71,        1,   599040, 0x5953c191
+0,         72,         72,        1,   599040, 0x0fc9a701
+0,         73,         73,        1,   599040, 0x0eea5327
+0,         74,         74,        1,   599040, 0x118752f1
+0,         75,         75,        1,   599040, 0x778c7711
+0,         76,         76,        1,   599040, 0x6f3ad6a5
+0,         77,         77,        1,   599040, 0xf70fcd3d
+0,         78,         78,        1,   599040, 0x85a366cb
+0,         79,         79,        1,   599040, 0xdda47432
+0,         80,         80,        1,   599040, 0x86379004
+0,         81,         81,        1,   599040, 0xfc539512
+0,         82,         82,        1,   599040, 0x04e70786
+0,         83,         83,        1,   599040, 0x7dddc8f7
+0,         84,         84,        1,   599040, 0xa76a3b6e
+0,         85,         85,        1,   599040, 0x44183060
+0,         86,         86,        1,   599040, 0x6f691c5a
+0,         87,         87,        1,   599040, 0x39d25e12
+0,         88,         88,        1,   599040, 0xfe3aad0d
+0,         89,         89,        1,   599040, 0x57f76928
+0,         90,         90,        1,   599040, 0x4e68eed5
+0,         91,         91,        1,   599040, 0x3a589d50
+0,         92,         92,        1,   599040, 0x92ec69b8
+0,         93,         93,        1,   599040, 0x9f78926e
+0,         94,         94,        1,   599040, 0xa1ca1b1d
+0,         95,         95,        1,   599040, 0x140240eb
+0,         96,         96,        1,   599040, 0x61fa01af
+0,         97,         97,        1,   599040, 0x79f9e3ae
diff --git a/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1 b/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1
new file mode 100644
index 0000000000..233b042671
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-OPFLAG_C_Qualcomm_1
@@ -0,0 +1,101 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
+0,          0,          0,        1,   599040, 0x91d452d5
+0,          1,          1,        1,   599040, 0x1b482509
+0,          2,          2,        1,   599040, 0xbc51425c
+0,          3,          3,        1,   599040, 0x5777eeee
+0,          4,          4,        1,   599040, 0xe274644d
+0,          5,          5,        1,   599040, 0x867450b5
+0,          6,          6,        1,   599040, 0x58708122
+0,          7,          7,        1,   599040, 0xeef17206
+0,          8,          8,        1,   599040, 0x97f4dc1e
+0,          9,          9,        1,   599040, 0x92c961cc
+0,         10,         10,        1,   599040, 0x1c4ffcb0
+0,         11,         11,        1,   599040, 0xc73e34e6
+0,         12,         12,        1,   599040, 0x1991f1f9
+0,         13,         13,        1,   599040, 0x36e54ba2
+0,         14,         14,        1,   599040, 0x698ce0c6
+0,         15,         15,        1,   599040, 0xc6dd131e
+0,         16,         16,        1,   599040, 0x0a22f4c5
+0,         17,         17,        1,   599040, 0xd6a0c196
+0,         18,         18,        1,   599040, 0x699a3e69
+0,         19,         19,        1,   599040, 0x4227009b
+0,         20,         20,        1,   599040, 0xd1d5dcb4
+0,         21,         21,        1,   599040, 0x58b2edb3
+0,         22,         22,        1,   599040, 0xd1f795d8
+0,         23,         23,        1,   599040, 0x3331d5e6
+0,         24,         24,        1,   599040, 0x5e5ec2c9
+0,         25,         25,        1,   599040, 0x3b907bf5
+0,         26,         26,        1,   599040, 0xefcbf471
+0,         27,         27,        1,   599040, 0x2769a578
+0,         28,         28,        1,   599040, 0x812ce986
+0,         29,         29,        1,   599040, 0xf07c212c
+0,         30,         30,        1,   599040, 0x00a0249f
+0,         31,         31,        1,   599040, 0x7263f7cf
+0,         32,         32,        1,   599040, 0x47054be4
+0,         33,         33,        1,   599040, 0xda083f52
+0,         34,         34,        1,   599040, 0xf2906ab1
+0,         35,         35,        1,   599040, 0x20936797
+0,         36,         36,        1,   599040, 0x644d7c3e
+0,         37,         37,        1,   599040, 0x7c00e8bf
+0,         38,         38,        1,   599040, 0x041f8a48
+0,         39,         39,        1,   599040, 0xcef6e936
+0,         40,         40,        1,   599040, 0x361461e9
+0,         41,         41,        1,   599040, 0xf663ba0a
+0,         42,         42,        1,   599040, 0x4d3371d3
+0,         43,         43,        1,   599040, 0xed6b5c92
+0,         44,         44,        1,   599040, 0xdec67f6e
+0,         45,         45,        1,   599040, 0xbafa50c0
+0,         46,         46,        1,   599040, 0xc9181637
+0,         47,         47,        1,   599040, 0x29eadcac
+0,         48,         48,        1,   599040, 0xb258430f
+0,         49,         49,        1,   599040, 0x49dc8716
+0,         50,         50,        1,   599040, 0x80b0a3b3
+0,         51,         51,        1,   599040, 0x5d8275a7
+0,         52,         52,        1,   599040, 0xe236242d
+0,         53,         53,        1,   599040, 0x3e14bb43
+0,         54,         54,        1,   599040, 0x20e6e2d7
+0,         55,         55,        1,   599040, 0x19cad4ee
+0,         56,         56,        1,   599040, 0x13fd16f1
+0,         57,         57,        1,   599040, 0x98e56b95
+0,         58,         58,        1,   599040, 0x028e4c6a
+0,         59,         59,        1,   599040, 0x5bd1131d
+0,         60,         60,        1,   599040, 0x0afe3873
+0,         61,         61,        1,   599040, 0xea93e425
+0,         62,         62,        1,   599040, 0xeb301be1
+0,         63,         63,        1,   599040, 0x443ca0a3
+0,         64,         64,        1,   599040, 0xb68b40a1
+0,         65,         65,        1,   599040, 0xf58f75b9
+0,         66,         66,        1,   599040, 0xefa27c52
+0,         67,         67,        1,   599040, 0xac676fa5
+0,         68,         68,        1,   599040, 0x688d1582
+0,         69,         69,        1,   599040, 0x9067a4ef
+0,         70,         70,        1,   599040, 0xdc753d6c
+0,         71,         71,        1,   599040, 0x6f6da304
+0,         72,         72,        1,   599040, 0xa7606f97
+0,         73,         73,        1,   599040, 0xb53c8c18
+0,         74,         74,        1,   599040, 0x3572d550
+0,         75,         75,        1,   599040, 0x123d5423
+0,         76,         76,        1,   599040, 0x89f11e50
+0,         77,         77,        1,   599040, 0x702649cc
+0,         78,         78,        1,   599040, 0x2b4767c4
+0,         79,         79,        1,   599040, 0xf18b9628
+0,         80,         80,        1,   599040, 0x1ef72a6b
+0,         81,         81,        1,   599040, 0x0a8c9641
+0,         82,         82,        1,   599040, 0xf2fa0233
+0,         83,         83,        1,   599040, 0x99385e51
+0,         84,         84,        1,   599040, 0x77b413cf
+0,         85,         85,        1,   599040, 0x6360c9e3
+0,         86,         86,        1,   599040, 0xe216b383
+0,         87,         87,        1,   599040, 0x54df8826
+0,         88,         88,        1,   599040, 0x6691e1ee
+0,         89,         89,        1,   599040, 0x37bebd20
+0,         90,         90,        1,   599040, 0xf05184e4
+0,         91,         91,        1,   599040, 0xbd7fab4f
+0,         92,         92,        1,   599040, 0x70211cdc
+0,         93,         93,        1,   599040, 0x4f4c375b
+0,         94,         94,        1,   599040, 0x2d645b5a
+0,         95,         95,        1,   599040, 0x475d263f
diff --git a/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_1 b/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_1
new file mode 100644
index 0000000000..54f4db8c5f
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-PERSIST_RPARAM_A_RExt_Sony_1
@@ -0,0 +1,7 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 400x384
+#sar 0: 0/1
+0,          0,          0,        1,   921600, 0x702f0d67
+0,          1,          1,        1,   921600, 0x99822b52
diff --git a/tests/ref/fate/hevc-conformance-PICSIZE_A_Bossen_1 b/tests/ref/fate/hevc-conformance-PICSIZE_A_Bossen_1
index 4c09ca564b..5bb3f539ec 100644
--- a/tests/ref/fate/hevc-conformance-PICSIZE_A_Bossen_1
+++ b/tests/ref/fate/hevc-conformance-PICSIZE_A_Bossen_1
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1056x8440
+#sar 0: 0/1
 0,          0,          0,        1, 13368960, 0x830b3a1d
 0,          1,          1,        1, 13368960, 0x120ca009
 0,          2,          2,        1, 13368960, 0xc94e0d86
diff --git a/tests/ref/fate/hevc-conformance-PICSIZE_B_Bossen_1 b/tests/ref/fate/hevc-conformance-PICSIZE_B_Bossen_1
index a3ab7c84a0..c1c6170a7b 100644
--- a/tests/ref/fate/hevc-conformance-PICSIZE_B_Bossen_1
+++ b/tests/ref/fate/hevc-conformance-PICSIZE_B_Bossen_1
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 8440x1056
+#sar 0: 0/1
 0,          0,          0,        1, 13368960, 0xe1e32c3d
 0,          1,          1,        1, 13368960, 0x75a503d3
 0,          2,          2,        1, 13368960, 0x71f33a0a
diff --git a/tests/ref/fate/hevc-conformance-PICSIZE_C_Bossen_1 b/tests/ref/fate/hevc-conformance-PICSIZE_C_Bossen_1
index 10520d17b6..f3e2e02ca4 100644
--- a/tests/ref/fate/hevc-conformance-PICSIZE_C_Bossen_1
+++ b/tests/ref/fate/hevc-conformance-PICSIZE_C_Bossen_1
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 528x4216
+#sar 0: 0/1
 0,          0,          0,        1,  3339072, 0x28be238d
 0,          1,          1,        1,  3339072, 0x43b62aae
 0,          2,          2,        1,  3339072, 0x36259da6
diff --git a/tests/ref/fate/hevc-conformance-PICSIZE_D_Bossen_1 b/tests/ref/fate/hevc-conformance-PICSIZE_D_Bossen_1
index 6f1c4fb0b2..a73a969021 100644
--- a/tests/ref/fate/hevc-conformance-PICSIZE_D_Bossen_1
+++ b/tests/ref/fate/hevc-conformance-PICSIZE_D_Bossen_1
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 4216x528
+#sar 0: 0/1
 0,          0,          0,        1,  3339072, 0xcb16f53e
 0,          1,          1,        1,  3339072, 0x6f1da8ec
 0,          2,          2,        1,  3339072, 0x978dae98
diff --git a/tests/ref/fate/hevc-conformance-PMERGE_A_TI_3 b/tests/ref/fate/hevc-conformance-PMERGE_A_TI_3
index 8491172ca8..b300f8739d 100644
--- a/tests/ref/fate/hevc-conformance-PMERGE_A_TI_3
+++ b/tests/ref/fate/hevc-conformance-PMERGE_A_TI_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0x187419b5
 0,          2,          2,        1,   149760, 0x61100980
diff --git a/tests/ref/fate/hevc-conformance-PMERGE_B_TI_3 b/tests/ref/fate/hevc-conformance-PMERGE_B_TI_3
index 1f15a022ef..046c90aa6e 100644
--- a/tests/ref/fate/hevc-conformance-PMERGE_B_TI_3
+++ b/tests/ref/fate/hevc-conformance-PMERGE_B_TI_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0xcebf1b76
 0,          2,          2,        1,   149760, 0x33930fb0
diff --git a/tests/ref/fate/hevc-conformance-PMERGE_C_TI_3 b/tests/ref/fate/hevc-conformance-PMERGE_C_TI_3
index bf474cc1c6..1269e53f0e 100644
--- a/tests/ref/fate/hevc-conformance-PMERGE_C_TI_3
+++ b/tests/ref/fate/hevc-conformance-PMERGE_C_TI_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0x2c271a9b
 0,          2,          2,        1,   149760, 0x53e419f3
diff --git a/tests/ref/fate/hevc-conformance-PMERGE_D_TI_3 b/tests/ref/fate/hevc-conformance-PMERGE_D_TI_3
index 2af0e1f864..474626c4ff 100644
--- a/tests/ref/fate/hevc-conformance-PMERGE_D_TI_3
+++ b/tests/ref/fate/hevc-conformance-PMERGE_D_TI_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0xf11a32ce
 0,          2,          2,        1,   149760, 0x0802237c
diff --git a/tests/ref/fate/hevc-conformance-PMERGE_E_TI_3 b/tests/ref/fate/hevc-conformance-PMERGE_E_TI_3
index df97237fde..e8596992d3 100644
--- a/tests/ref/fate/hevc-conformance-PMERGE_E_TI_3
+++ b/tests/ref/fate/hevc-conformance-PMERGE_E_TI_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0xea7b30bf
 0,          2,          2,        1,   149760, 0x273d092a
diff --git a/tests/ref/fate/hevc-conformance-POC_A_Bossen_3 b/tests/ref/fate/hevc-conformance-POC_A_Bossen_3
index bcfa7fa3d5..940eede52d 100644
--- a/tests/ref/fate/hevc-conformance-POC_A_Bossen_3
+++ b/tests/ref/fate/hevc-conformance-POC_A_Bossen_3
@@ -1,6 +1,10 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xda17acd4
-0,          0,          0,        1,   149760, 0x1691b47f
-0,          1,          1,        1,   149760, 0xeebeac0c
-0,          2,          2,        1,   149760, 0x895c9f62
-0,          3,          3,        1,   149760, 0x9e2077e8
+0,          1,          1,        1,   149760, 0x1691b47f
+0,          2,          2,        1,   149760, 0xeebeac0c
+0,          3,          3,        1,   149760, 0x895c9f62
+0,          4,          4,        1,   149760, 0x9e2077e8
diff --git a/tests/ref/fate/hevc-conformance-PPS_A_qualcomm_7 b/tests/ref/fate/hevc-conformance-PPS_A_qualcomm_7
index ef57f74cde..de683100ad 100644
--- a/tests/ref/fate/hevc-conformance-PPS_A_qualcomm_7
+++ b/tests/ref/fate/hevc-conformance-PPS_A_qualcomm_7
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x87159328
 0,          1,          1,        1,   599040, 0x825672ff
 0,          2,          2,        1,   599040, 0x2f4224ff
diff --git a/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3 b/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3
index 8f7e5e6911..59b82b72bb 100644
--- a/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3
+++ b/tests/ref/fate/hevc-conformance-PS_A_VIDYO_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x88619f80
 0,          1,          1,        1,   149760, 0x550bdaf0
 0,          2,          2,        1,   149760, 0x4121f7a2
diff --git a/tests/ref/fate/hevc-conformance-PS_B_VIDYO_3 b/tests/ref/fate/hevc-conformance-PS_B_VIDYO_3
index 8f7e5e6911..59b82b72bb 100644
--- a/tests/ref/fate/hevc-conformance-PS_B_VIDYO_3
+++ b/tests/ref/fate/hevc-conformance-PS_B_VIDYO_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x88619f80
 0,          1,          1,        1,   149760, 0x550bdaf0
 0,          2,          2,        1,   149760, 0x4121f7a2
diff --git a/tests/ref/fate/hevc-conformance-QMATRIX_A_RExt_Sony_1 b/tests/ref/fate/hevc-conformance-QMATRIX_A_RExt_Sony_1
new file mode 100644
index 0000000000..98d0bb3527
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-QMATRIX_A_RExt_Sony_1
@@ -0,0 +1,25 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
+0,          0,          0,        1,  2764800, 0xde442361
+0,          1,          1,        1,  2764800, 0x8d482fdf
+0,          2,          2,        1,  2764800, 0x9b431e37
+0,          3,          3,        1,  2764800, 0x8b7d893d
+0,          4,          4,        1,  2764800, 0xa471ac17
+0,          5,          5,        1,  2764800, 0xe990790f
+0,          6,          6,        1,  2764800, 0x8f3f8285
+0,          7,          7,        1,  2764800, 0xeaf9f242
+0,          8,          8,        1,  2764800, 0xfd37f69d
+0,          9,          9,        1,  2764800, 0x31d29f19
+0,         10,         10,        1,  2764800, 0x92f56414
+0,         11,         11,        1,  2764800, 0xb909e334
+0,         12,         12,        1,  2764800, 0x9f2fad13
+0,         13,         13,        1,  2764800, 0xbf9090b2
+0,         14,         14,        1,  2764800, 0xa39c7b78
+0,         15,         15,        1,  2764800, 0x83e77296
+0,         16,         16,        1,  2764800, 0x737a5a9d
+0,         17,         17,        1,  2764800, 0x356c51d6
+0,         18,         18,        1,  2764800, 0xd498468c
+0,         19,         19,        1,  2764800, 0xd25a396d
diff --git a/tests/ref/fate/hevc-conformance-RAP_A_docomo_4 b/tests/ref/fate/hevc-conformance-RAP_A_docomo_4
index 268f4cdc46..51ea08b584 100644
--- a/tests/ref/fate/hevc-conformance-RAP_A_docomo_4
+++ b/tests/ref/fate/hevc-conformance-RAP_A_docomo_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x1ae5f13d
 0,          1,          1,        1,   149760, 0x0a6ad0e3
 0,          2,          2,        1,   149760, 0x2415af05
diff --git a/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1 b/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1
index 4bea99754f..53e733bd75 100644
--- a/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1
+++ b/tests/ref/fate/hevc-conformance-RAP_B_Bossen_1
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xb989ae7a
 0,          1,          1,        1,   149760, 0x4765caed
 0,          2,          2,        1,   149760, 0xd908c148
@@ -66,19 +70,16 @@
 0,         64,         64,        1,   149760, 0x3362678b
 0,         65,         65,        1,   149760, 0x6e7fc851
 0,         66,         66,        1,   149760, 0x33f96449
-0,         67,         67,        1,   149760, 0xd9d05007
-0,         68,         68,        1,   149760, 0x477f2cf2
-0,         69,         69,        1,   149760, 0xe1f9ccd0
-0,         70,         70,        1,   149760, 0xb3ba8cfb
-0,         71,         71,        1,   149760, 0x64787995
-0,         72,         72,        1,   149760, 0xc10de4c4
-0,         73,         73,        1,   149760, 0x18dd343f
-0,         74,         74,        1,   149760, 0xa1c51358
-0,         75,         75,        1,   149760, 0x91fe6361
-0,         76,         76,        1,   149760, 0xeec85f94
-0,         77,         77,        1,   149760, 0x00a57402
-0,         78,         78,        1,   149760, 0x4e88cc16
-0,         79,         79,        1,   149760, 0xdbd51976
-0,         80,         80,        1,   149760, 0xfebf6b1a
-0,         81,         81,        1,   149760, 0x052546d2
-0,         82,         82,        1,   149760, 0x046cd73b
+0,         67,         67,        1,   149760, 0xb3ba8cfb
+0,         68,         68,        1,   149760, 0x64787995
+0,         69,         69,        1,   149760, 0xc10de4c4
+0,         70,         70,        1,   149760, 0x18dd343f
+0,         71,         71,        1,   149760, 0xa1c51358
+0,         72,         72,        1,   149760, 0x91fe6361
+0,         73,         73,        1,   149760, 0xeec85f94
+0,         74,         74,        1,   149760, 0x00a57402
+0,         75,         75,        1,   149760, 0x4e88cc16
+0,         76,         76,        1,   149760, 0xdbd51976
+0,         77,         77,        1,   149760, 0xfebf6b1a
+0,         78,         78,        1,   149760, 0x052546d2
+0,         79,         79,        1,   149760, 0x046cd73b
diff --git a/tests/ref/fate/hevc-conformance-RPLM_A_qualcomm_4 b/tests/ref/fate/hevc-conformance-RPLM_A_qualcomm_4
index 372d1202f5..7cb2bdf17e 100644
--- a/tests/ref/fate/hevc-conformance-RPLM_A_qualcomm_4
+++ b/tests/ref/fate/hevc-conformance-RPLM_A_qualcomm_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xdb5e3b56
 0,          1,          1,        1,   149760, 0xd5320970
 0,          2,          2,        1,   149760, 0x9387ed18
diff --git a/tests/ref/fate/hevc-conformance-RPLM_B_qualcomm_4 b/tests/ref/fate/hevc-conformance-RPLM_B_qualcomm_4
index a34dcc01bd..5515c6720e 100644
--- a/tests/ref/fate/hevc-conformance-RPLM_B_qualcomm_4
+++ b/tests/ref/fate/hevc-conformance-RPLM_B_qualcomm_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x82ff0cca
 0,          1,          1,        1,   149760, 0xcd05ba17
 0,          2,          2,        1,   149760, 0x33a5b924
diff --git a/tests/ref/fate/hevc-conformance-RPS_A_docomo_4 b/tests/ref/fate/hevc-conformance-RPS_A_docomo_4
index e29a74b26f..5ec1474e2a 100644
--- a/tests/ref/fate/hevc-conformance-RPS_A_docomo_4
+++ b/tests/ref/fate/hevc-conformance-RPS_A_docomo_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0x0bdf13f8
 0,          2,          2,        1,   149760, 0x45e702c7
diff --git a/tests/ref/fate/hevc-conformance-RPS_B_qualcomm_5 b/tests/ref/fate/hevc-conformance-RPS_B_qualcomm_5
index 3b24e753b8..9c9d894d01 100644
--- a/tests/ref/fate/hevc-conformance-RPS_B_qualcomm_5
+++ b/tests/ref/fate/hevc-conformance-RPS_B_qualcomm_5
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xdb5e3b56
 0,          1,          1,        1,   149760, 0xe328e677
 0,          2,          2,        1,   149760, 0x8f18f4c0
diff --git a/tests/ref/fate/hevc-conformance-RPS_C_ericsson_5 b/tests/ref/fate/hevc-conformance-RPS_C_ericsson_5
index e97e7eafa2..840d816ce3 100644
--- a/tests/ref/fate/hevc-conformance-RPS_C_ericsson_5
+++ b/tests/ref/fate/hevc-conformance-RPS_C_ericsson_5
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8ce7200b
 0,          1,          1,        1,   149760, 0x85340cda
 0,          2,          2,        1,   149760, 0x16fd1f91
diff --git a/tests/ref/fate/hevc-conformance-RPS_D_ericsson_6 b/tests/ref/fate/hevc-conformance-RPS_D_ericsson_6
index 1a58c0d7ff..9c0fc6c7fb 100644
--- a/tests/ref/fate/hevc-conformance-RPS_D_ericsson_6
+++ b/tests/ref/fate/hevc-conformance-RPS_D_ericsson_6
@@ -1,69 +1,73 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8ce7200b
-0,          2,          2,        1,   149760, 0x73610669
-0,          3,          3,        1,   149760, 0xc01620f4
-0,          4,          4,        1,   149760, 0x847a4297
-0,          5,          5,        1,   149760, 0xb4d3e870
-0,          6,          6,        1,   149760, 0xc2dd98a6
-0,          7,          7,        1,   149760, 0xefd02009
-0,          8,          8,        1,   149760, 0x3ae86ed0
-0,          9,          9,        1,   149760, 0x92f3cfb6
-0,         10,         10,        1,   149760, 0x0393e437
-0,         11,         11,        1,   149760, 0x6b29ea60
-0,         12,         12,        1,   149760, 0x9cb1216a
-0,         13,         13,        1,   149760, 0x82c2b1c4
-0,         14,         14,        1,   149760, 0x74899241
-0,         15,         15,        1,   149760, 0xa561f720
-0,         16,         16,        1,   149760, 0x339a11f6
-0,         17,         17,        1,   149760, 0x6bd9772b
-0,         18,         18,        1,   149760, 0x0a0c7c7d
-0,         19,         19,        1,   149760, 0x38426f65
-0,         20,         20,        1,   149760, 0x134ee7b3
-0,         21,         21,        1,   149760, 0xe436e35c
-0,         22,         22,        1,   149760, 0x4174d949
-0,         23,         23,        1,   149760, 0x44e60f0d
-0,         24,         24,        1,   149760, 0xbb6fb0a4
-0,         25,         25,        1,   149760, 0x715a653e
-0,         26,         26,        1,   149760, 0xad11b160
-0,         27,         27,        1,   149760, 0xfa6b368e
-0,         28,         28,        1,   149760, 0x60ff970f
-0,         29,         29,        1,   149760, 0x16430649
-0,         30,         30,        1,   149760, 0xa6cc0767
-0,         31,         31,        1,   149760, 0x59b0c566
-0,         32,         32,        1,   149760, 0xc9e3dfa9
-0,         33,         33,        1,   149760, 0x82873917
-0,         34,         34,        1,   149760, 0xc49e5d22
-0,         35,         35,        1,   149760, 0x416890a8
-0,         36,         36,        1,   149760, 0x386e57e8
-0,         37,         37,        1,   149760, 0x1c27e9d7
-0,         38,         38,        1,   149760, 0x85425596
-0,         39,         39,        1,   149760, 0xe6107df8
-0,         40,         40,        1,   149760, 0x056a3977
-0,         41,         41,        1,   149760, 0x753cf7f7
-0,         42,         42,        1,   149760, 0xc4005218
-0,         43,         43,        1,   149760, 0xce7edcf2
-0,         44,         44,        1,   149760, 0x93465fee
-0,         45,         45,        1,   149760, 0xa21b040a
-0,         46,         46,        1,   149760, 0xd82a53d5
-0,         47,         47,        1,   149760, 0x8f8fd3ae
-0,         48,         48,        1,   149760, 0x52420da5
-0,         49,         49,        1,   149760, 0xa899a9be
-0,         50,         50,        1,   149760, 0xcd85e363
-0,         51,         51,        1,   149760, 0x1a9240c4
-0,         52,         52,        1,   149760, 0xf0b11a36
-0,         53,         53,        1,   149760, 0xcf175809
-0,         54,         54,        1,   149760, 0x24afecc2
-0,         55,         55,        1,   149760, 0x874f7176
-0,         56,         56,        1,   149760, 0xb126dff9
-0,         57,         57,        1,   149760, 0x825ba060
-0,         58,         58,        1,   149760, 0x18c55eed
-0,         59,         59,        1,   149760, 0xf09b03f0
-0,         60,         60,        1,   149760, 0xf4dafd64
-0,         61,         61,        1,   149760, 0x08b49190
-0,         62,         62,        1,   149760, 0xcf336dc7
-0,         63,         63,        1,   149760, 0x51c65c08
-0,         64,         64,        1,   149760, 0x6cfe3433
-0,         65,         65,        1,   149760, 0x4b0af196
-0,         66,         66,        1,   149760, 0xffaeb2db
-0,         67,         67,        1,   149760, 0xa990a19f
-0,         68,         68,        1,   149760, 0x7ed944a3
+0,          1,          1,        1,   149760, 0x73610669
+0,          2,          2,        1,   149760, 0xc01620f4
+0,          3,          3,        1,   149760, 0x847a4297
+0,          4,          4,        1,   149760, 0xb4d3e870
+0,          5,          5,        1,   149760, 0xc2dd98a6
+0,          6,          6,        1,   149760, 0xefd02009
+0,          7,          7,        1,   149760, 0x3ae86ed0
+0,          8,          8,        1,   149760, 0x92f3cfb6
+0,          9,          9,        1,   149760, 0x0393e437
+0,         10,         10,        1,   149760, 0x6b29ea60
+0,         11,         11,        1,   149760, 0x9cb1216a
+0,         12,         12,        1,   149760, 0x82c2b1c4
+0,         13,         13,        1,   149760, 0x74899241
+0,         14,         14,        1,   149760, 0xa561f720
+0,         15,         15,        1,   149760, 0x339a11f6
+0,         16,         16,        1,   149760, 0x6bd9772b
+0,         17,         17,        1,   149760, 0x0a0c7c7d
+0,         18,         18,        1,   149760, 0x38426f65
+0,         19,         19,        1,   149760, 0x134ee7b3
+0,         20,         20,        1,   149760, 0xe436e35c
+0,         21,         21,        1,   149760, 0x4174d949
+0,         22,         22,        1,   149760, 0x44e60f0d
+0,         23,         23,        1,   149760, 0xbb6fb0a4
+0,         24,         24,        1,   149760, 0x715a653e
+0,         25,         25,        1,   149760, 0xad11b160
+0,         26,         26,        1,   149760, 0xfa6b368e
+0,         27,         27,        1,   149760, 0x60ff970f
+0,         28,         28,        1,   149760, 0x16430649
+0,         29,         29,        1,   149760, 0xa6cc0767
+0,         30,         30,        1,   149760, 0x59b0c566
+0,         31,         31,        1,   149760, 0xc9e3dfa9
+0,         32,         32,        1,   149760, 0x82873917
+0,         33,         33,        1,   149760, 0xc49e5d22
+0,         34,         34,        1,   149760, 0x416890a8
+0,         35,         35,        1,   149760, 0x386e57e8
+0,         36,         36,        1,   149760, 0x1c27e9d7
+0,         37,         37,        1,   149760, 0x85425596
+0,         38,         38,        1,   149760, 0xe6107df8
+0,         39,         39,        1,   149760, 0x056a3977
+0,         40,         40,        1,   149760, 0x753cf7f7
+0,         41,         41,        1,   149760, 0xc4005218
+0,         42,         42,        1,   149760, 0xce7edcf2
+0,         43,         43,        1,   149760, 0x93465fee
+0,         44,         44,        1,   149760, 0xa21b040a
+0,         45,         45,        1,   149760, 0xd82a53d5
+0,         46,         46,        1,   149760, 0x8f8fd3ae
+0,         47,         47,        1,   149760, 0x52420da5
+0,         48,         48,        1,   149760, 0xa899a9be
+0,         49,         49,        1,   149760, 0xcd85e363
+0,         50,         50,        1,   149760, 0x1a9240c4
+0,         51,         51,        1,   149760, 0xf0b11a36
+0,         52,         52,        1,   149760, 0xcf175809
+0,         53,         53,        1,   149760, 0x24afecc2
+0,         54,         54,        1,   149760, 0x874f7176
+0,         55,         55,        1,   149760, 0xb126dff9
+0,         56,         56,        1,   149760, 0x825ba060
+0,         57,         57,        1,   149760, 0x18c55eed
+0,         58,         58,        1,   149760, 0xf09b03f0
+0,         59,         59,        1,   149760, 0xf4dafd64
+0,         60,         60,        1,   149760, 0x08b49190
+0,         61,         61,        1,   149760, 0xcf336dc7
+0,         62,         62,        1,   149760, 0x51c65c08
+0,         63,         63,        1,   149760, 0x6cfe3433
+0,         64,         64,        1,   149760, 0x4b0af196
+0,         65,         65,        1,   149760, 0xffaeb2db
+0,         66,         66,        1,   149760, 0xa990a19f
+0,         67,         67,        1,   149760, 0x7ed944a3
diff --git a/tests/ref/fate/hevc-conformance-RPS_E_qualcomm_5 b/tests/ref/fate/hevc-conformance-RPS_E_qualcomm_5
index 82c25e171f..51c6300f69 100644
--- a/tests/ref/fate/hevc-conformance-RPS_E_qualcomm_5
+++ b/tests/ref/fate/hevc-conformance-RPS_E_qualcomm_5
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0xd62a31bc
 0,          2,          2,        1,   149760, 0xec822f84
diff --git a/tests/ref/fate/hevc-conformance-RPS_F_docomo_1 b/tests/ref/fate/hevc-conformance-RPS_F_docomo_1
index 06ae9c176a..0270e9d432 100644
--- a/tests/ref/fate/hevc-conformance-RPS_F_docomo_1
+++ b/tests/ref/fate/hevc-conformance-RPS_F_docomo_1
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x8edb27d7
 0,          1,          1,        1,   149760, 0x0bdf13f8
 0,          2,          2,        1,   149760, 0x45e702c7
diff --git a/tests/ref/fate/hevc-conformance-RQT_A_HHI_4 b/tests/ref/fate/hevc-conformance-RQT_A_HHI_4
index 5f2b9dabd3..c5a106ef1f 100644
--- a/tests/ref/fate/hevc-conformance-RQT_A_HHI_4
+++ b/tests/ref/fate/hevc-conformance-RQT_A_HHI_4
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x5c0f5423
 0,          1,          1,        1,   599040, 0x3d23be58
diff --git a/tests/ref/fate/hevc-conformance-RQT_B_HHI_4 b/tests/ref/fate/hevc-conformance-RQT_B_HHI_4
index dcf2691738..f4f0c267d1 100644
--- a/tests/ref/fate/hevc-conformance-RQT_B_HHI_4
+++ b/tests/ref/fate/hevc-conformance-RQT_B_HHI_4
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x69854954
 0,          1,          1,        1,   599040, 0x695ebc85
diff --git a/tests/ref/fate/hevc-conformance-RQT_C_HHI_4 b/tests/ref/fate/hevc-conformance-RQT_C_HHI_4
index 2e88350fe0..6f66e4b3ee 100644
--- a/tests/ref/fate/hevc-conformance-RQT_C_HHI_4
+++ b/tests/ref/fate/hevc-conformance-RQT_C_HHI_4
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x65433cfe
 0,          1,          1,        1,   599040, 0x9309e2c5
diff --git a/tests/ref/fate/hevc-conformance-RQT_D_HHI_4 b/tests/ref/fate/hevc-conformance-RQT_D_HHI_4
index 7f73896084..016d9eb7da 100644
--- a/tests/ref/fate/hevc-conformance-RQT_D_HHI_4
+++ b/tests/ref/fate/hevc-conformance-RQT_D_HHI_4
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x88d741bf
 0,          1,          1,        1,   599040, 0xbbd9ab22
diff --git a/tests/ref/fate/hevc-conformance-RQT_E_HHI_4 b/tests/ref/fate/hevc-conformance-RQT_E_HHI_4
index f0623188fd..0cb376720f 100644
--- a/tests/ref/fate/hevc-conformance-RQT_E_HHI_4
+++ b/tests/ref/fate/hevc-conformance-RQT_E_HHI_4
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0xce2e511d
 0,          1,          1,        1,   599040, 0xe55192d0
diff --git a/tests/ref/fate/hevc-conformance-RQT_F_HHI_4 b/tests/ref/fate/hevc-conformance-RQT_F_HHI_4
index 26bf5acc7a..f6904c6944 100644
--- a/tests/ref/fate/hevc-conformance-RQT_F_HHI_4
+++ b/tests/ref/fate/hevc-conformance-RQT_F_HHI_4
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x65433cfe
 0,          1,          1,        1,   599040, 0x6f99cc5f
diff --git a/tests/ref/fate/hevc-conformance-RQT_G_HHI_4 b/tests/ref/fate/hevc-conformance-RQT_G_HHI_4
index d36ea01172..ed67f43da9 100644
--- a/tests/ref/fate/hevc-conformance-RQT_G_HHI_4
+++ b/tests/ref/fate/hevc-conformance-RQT_G_HHI_4
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x5c0f5423
 0,          1,          1,        1,   599040, 0xe805b181
diff --git a/tests/ref/fate/hevc-conformance-SAO_A_MediaTek_4 b/tests/ref/fate/hevc-conformance-SAO_A_MediaTek_4
index 01226d9776..d9066ff8d3 100644
--- a/tests/ref/fate/hevc-conformance-SAO_A_MediaTek_4
+++ b/tests/ref/fate/hevc-conformance-SAO_A_MediaTek_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x304198c2
 0,          1,          1,        1,   149760, 0xe765e30d
 0,          2,          2,        1,   149760, 0x0130a054
diff --git a/tests/ref/fate/hevc-conformance-SAO_A_RExt_MediaTek_1 b/tests/ref/fate/hevc-conformance-SAO_A_RExt_MediaTek_1
new file mode 100644
index 0000000000..24736a9410
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-SAO_A_RExt_MediaTek_1
@@ -0,0 +1,13 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 2560x1600
+#sar 0: 0/1
+0,          0,          0,        1, 24576000, 0x5b01ceed
+0,          1,          1,        1, 24576000, 0x043fa798
+0,          2,          2,        1, 24576000, 0x9ec62721
+0,          3,          3,        1, 24576000, 0x5533793b
+0,          4,          4,        1, 24576000, 0x125f859e
+0,          5,          5,        1, 24576000, 0xe3b916b4
+0,          6,          6,        1, 24576000, 0x1fc1a62c
+0,          7,          7,        1, 24576000, 0xe3507948
diff --git a/tests/ref/fate/hevc-conformance-SAO_B_MediaTek_5 b/tests/ref/fate/hevc-conformance-SAO_B_MediaTek_5
index 9da0268057..1e593b1e57 100644
--- a/tests/ref/fate/hevc-conformance-SAO_B_MediaTek_5
+++ b/tests/ref/fate/hevc-conformance-SAO_B_MediaTek_5
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0xe56f6a5c
 0,          1,          1,        1,   599040, 0x31ec1bb9
 0,          2,          2,        1,   599040, 0xf3ce0311
diff --git a/tests/ref/fate/hevc-conformance-SAO_C_Samsung_4 b/tests/ref/fate/hevc-conformance-SAO_C_Samsung_4
index f87921d315..fa4cdfc1e6 100644
--- a/tests/ref/fate/hevc-conformance-SAO_C_Samsung_4
+++ b/tests/ref/fate/hevc-conformance-SAO_C_Samsung_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xf923a1a0
 0,          1,          1,        1,   149760, 0x614d851a
 0,          2,          2,        1,   149760, 0xc3976ce4
diff --git a/tests/ref/fate/hevc-conformance-SAO_C_Samsung_5 b/tests/ref/fate/hevc-conformance-SAO_C_Samsung_5
new file mode 100644
index 0000000000..2344dce32a
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-SAO_C_Samsung_5
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  3110400, 0x6fe6508f
+0,          1,          1,        1,  3110400, 0xa56a3403
+0,          2,          2,        1,  3110400, 0x45db0973
+0,          3,          3,        1,  3110400, 0xb341a760
+0,          4,          4,        1,  3110400, 0x849c086c
diff --git a/tests/ref/fate/hevc-conformance-SAO_D_Samsung_4 b/tests/ref/fate/hevc-conformance-SAO_D_Samsung_4
index ce1cefeeaa..df3e4172bb 100644
--- a/tests/ref/fate/hevc-conformance-SAO_D_Samsung_4
+++ b/tests/ref/fate/hevc-conformance-SAO_D_Samsung_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x0d2edbbc
 0,          1,          1,        1,   149760, 0x4830af95
 0,          2,          2,        1,   149760, 0x39e8d3bb
diff --git a/tests/ref/fate/hevc-conformance-SAO_D_Samsung_5 b/tests/ref/fate/hevc-conformance-SAO_D_Samsung_5
new file mode 100644
index 0000000000..1a51cf3a4c
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-SAO_D_Samsung_5
@@ -0,0 +1,10 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  3110400, 0xcfb2f251
+0,          1,          1,        1,  3110400, 0xc2621936
+0,          2,          2,        1,  3110400, 0x5cb42788
+0,          3,          3,        1,  3110400, 0x5a3144a5
+0,          4,          4,        1,  3110400, 0x59eca534
diff --git a/tests/ref/fate/hevc-conformance-SAO_E_Canon_4 b/tests/ref/fate/hevc-conformance-SAO_E_Canon_4
index 92aa7f4f9a..7051b436ac 100644
--- a/tests/ref/fate/hevc-conformance-SAO_E_Canon_4
+++ b/tests/ref/fate/hevc-conformance-SAO_E_Canon_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x1613b277
 0,          1,          1,        1,   149760, 0xf92d5543
 0,          2,          2,        1,   149760, 0xf119ba8e
diff --git a/tests/ref/fate/hevc-conformance-SAO_F_Canon_3 b/tests/ref/fate/hevc-conformance-SAO_F_Canon_3
index cf240558cf..613e70d478 100644
--- a/tests/ref/fate/hevc-conformance-SAO_F_Canon_3
+++ b/tests/ref/fate/hevc-conformance-SAO_F_Canon_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x92b5107a
 0,          1,          1,        1,   149760, 0x97eb31ef
 0,          2,          2,        1,   149760, 0xeb743e30
diff --git a/tests/ref/fate/hevc-conformance-SAO_G_Canon_3 b/tests/ref/fate/hevc-conformance-SAO_G_Canon_3
index 5ce6772b21..8f3f9acb0f 100644
--- a/tests/ref/fate/hevc-conformance-SAO_G_Canon_3
+++ b/tests/ref/fate/hevc-conformance-SAO_G_Canon_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xc4f239e0
 0,          1,          1,        1,   149760, 0xf57a2e44
 0,          2,          2,        1,   149760, 0xbf1e9995
diff --git a/tests/ref/fate/hevc-conformance-SDH_A_Orange_3 b/tests/ref/fate/hevc-conformance-SDH_A_Orange_3
index caf90eed0b..f3ef192c6a 100644
--- a/tests/ref/fate/hevc-conformance-SDH_A_Orange_3
+++ b/tests/ref/fate/hevc-conformance-SDH_A_Orange_3
@@ -1,3 +1,7 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  3110400, 0x0117aa5d
 0,          1,          1,        1,  3110400, 0xa737bc56
diff --git a/tests/ref/fate/hevc-conformance-SLICES_A_Rovi_3 b/tests/ref/fate/hevc-conformance-SLICES_A_Rovi_3
index f884f7f8d7..c45dfd6e0d 100644
--- a/tests/ref/fate/hevc-conformance-SLICES_A_Rovi_3
+++ b/tests/ref/fate/hevc-conformance-SLICES_A_Rovi_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   460800, 0x7f06cb02
 0,          1,          1,        1,   460800, 0x1ad483aa
 0,          2,          2,        1,   460800, 0x1bbbc991
diff --git a/tests/ref/fate/hevc-conformance-SLIST_A_Sony_4 b/tests/ref/fate/hevc-conformance-SLIST_A_Sony_4
index ebb65c3e2f..9e68d0dbe7 100644
--- a/tests/ref/fate/hevc-conformance-SLIST_A_Sony_4
+++ b/tests/ref/fate/hevc-conformance-SLIST_A_Sony_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0xbd0eb43e
 0,          1,          1,        1,   599040, 0x4c3a98b5
 0,          2,          2,        1,   599040, 0x105410dc
diff --git a/tests/ref/fate/hevc-conformance-SLIST_B_Sony_8 b/tests/ref/fate/hevc-conformance-SLIST_B_Sony_8
index fc39039592..0164b31f2d 100644
--- a/tests/ref/fate/hevc-conformance-SLIST_B_Sony_8
+++ b/tests/ref/fate/hevc-conformance-SLIST_B_Sony_8
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0xbd0eb43e
 0,          1,          1,        1,   599040, 0x3ea696c4
 0,          2,          2,        1,   599040, 0x866beffc
diff --git a/tests/ref/fate/hevc-conformance-SLIST_C_Sony_3 b/tests/ref/fate/hevc-conformance-SLIST_C_Sony_3
index 482e56ff36..b40fa4142e 100644
--- a/tests/ref/fate/hevc-conformance-SLIST_C_Sony_3
+++ b/tests/ref/fate/hevc-conformance-SLIST_C_Sony_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0xc3e98658
 0,          1,          1,        1,   599040, 0x621fa0b7
 0,          2,          2,        1,   599040, 0x53b2e637
diff --git a/tests/ref/fate/hevc-conformance-SLIST_D_Sony_9 b/tests/ref/fate/hevc-conformance-SLIST_D_Sony_9
index 384f81f767..d26b75f738 100644
--- a/tests/ref/fate/hevc-conformance-SLIST_D_Sony_9
+++ b/tests/ref/fate/hevc-conformance-SLIST_D_Sony_9
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0xf3038515
 0,          1,          1,        1,   599040, 0xb1bc9386
 0,          2,          2,        1,   599040, 0xa069e86f
diff --git a/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_1 b/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_1
index bbb3cfeaa1..6cd9643536 100644
--- a/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_1
+++ b/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_1
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x88619f80
 0,          1,          1,        1,   149760, 0x550bdaf0
 0,          2,          2,        1,   149760, 0x99440a14
diff --git a/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_2 b/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_2
new file mode 100644
index 0000000000..6cd9643536
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-SLPPLP_A_VIDYO_2
@@ -0,0 +1,38 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
+0,          0,          0,        1,   149760, 0x88619f80
+0,          1,          1,        1,   149760, 0x550bdaf0
+0,          2,          2,        1,   149760, 0x99440a14
+0,          3,          3,        1,   149760, 0xcc2c2049
+0,          4,          4,        1,   149760, 0x46927368
+0,          5,          5,        1,   149760, 0x53cdb3fe
+0,          6,          6,        1,   149760, 0x654df025
+0,          7,          7,        1,   149760, 0x024d24bc
+0,          8,          8,        1,   149760, 0x409138c2
+0,          9,          9,        1,   149760, 0xfbb47c48
+0,         10,         10,        1,   149760, 0x18caa19d
+0,         11,         11,        1,   149760, 0x0f88c2e5
+0,         12,         12,        1,   149760, 0x1c16aa2d
+0,         13,         13,        1,   149760, 0x60bfcce8
+0,         14,         14,        1,   149760, 0x1c38e3d3
+0,         15,         15,        1,   149760, 0x0d5b044a
+0,         16,         16,        1,   149760, 0x93d21593
+0,         17,         17,        1,   149760, 0xdf283910
+0,         18,         18,        1,   149760, 0x03324c23
+0,         19,         19,        1,   149760, 0x3b175b7b
+0,         20,         20,        1,   149760, 0xb91b9a7e
+0,         21,         21,        1,   149760, 0x734fbbe7
+0,         22,         22,        1,   149760, 0xfc3fea48
+0,         23,         23,        1,   149760, 0x6609103e
+0,         24,         24,        1,   149760, 0x3f5916fa
+0,         25,         25,        1,   149760, 0x08e43f4d
+0,         26,         26,        1,   149760, 0xc84e5471
+0,         27,         27,        1,   149760, 0xbd4e5c8d
+0,         28,         28,        1,   149760, 0x4a4d3995
+0,         29,         29,        1,   149760, 0x662163c0
+0,         30,         30,        1,   149760, 0xda28671f
+0,         31,         31,        1,   149760, 0x19e1878e
+0,         32,         32,        1,   149760, 0x19807e67
diff --git a/tests/ref/fate/hevc-conformance-STRUCT_A_Samsung_5 b/tests/ref/fate/hevc-conformance-STRUCT_A_Samsung_5
index da5cfa1883..0916a9db87 100644
--- a/tests/ref/fate/hevc-conformance-STRUCT_A_Samsung_5
+++ b/tests/ref/fate/hevc-conformance-STRUCT_A_Samsung_5
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x479fa7ca
 0,          1,          1,        1,   149760, 0x761fb3a3
 0,          2,          2,        1,   149760, 0xa0f4cd97
diff --git a/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_4 b/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_4
index c03111c0c8..b95c176bea 100644
--- a/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_4
+++ b/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
 0,          0,          0,        1,   599040, 0x4b489a60
 0,          1,          1,        1,   599040, 0x80369c9a
 0,          2,          2,        1,   599040, 0x33189b1a
diff --git a/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_6 b/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_6
new file mode 100644
index 0000000000..6127f769a1
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-STRUCT_B_Samsung_6
@@ -0,0 +1,65 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 832x480
+#sar 0: 0/1
+0,          0,          0,        1,   599040, 0x10e6d882
+0,          1,          1,        1,   599040, 0x10e6d882
+0,          2,          2,        1,   599040, 0x10e6d882
+0,          3,          3,        1,   599040, 0x2fc276f4
+0,          4,          4,        1,   599040, 0x087c24a5
+0,          5,          5,        1,   599040, 0x4355f37b
+0,          6,          6,        1,   599040, 0x4eefa76a
+0,          7,          7,        1,   599040, 0x270f268a
+0,          8,          8,        1,   599040, 0xa9be7d32
+0,          9,          9,        1,   599040, 0xbf75116e
+0,         10,         10,        1,   599040, 0x7d8a4ae2
+0,         11,         11,        1,   599040, 0x53e1c0d8
+0,         12,         12,        1,   599040, 0x076c3784
+0,         13,         13,        1,   599040, 0x49bf1c8d
+0,         14,         14,        1,   599040, 0xe7b537b9
+0,         15,         15,        1,   599040, 0xddc81bcb
+0,         16,         16,        1,   599040, 0x7761c601
+0,         17,         17,        1,   599040, 0xf5993c06
+0,         18,         18,        1,   599040, 0x6e21e3e4
+0,         19,         19,        1,   599040, 0x5964c0b5
+0,         20,         20,        1,   599040, 0xb10e8493
+0,         21,         21,        1,   599040, 0x17b1c730
+0,         22,         22,        1,   599040, 0xa55efe36
+0,         23,         23,        1,   599040, 0x3cb75b6c
+0,         24,         24,        1,   599040, 0xf8ed6b0c
+0,         25,         25,        1,   599040, 0xf1e4bc7d
+0,         26,         26,        1,   599040, 0x23236fd9
+0,         27,         27,        1,   599040, 0x8d8b2892
+0,         28,         28,        1,   599040, 0x3e311573
+0,         29,         29,        1,   599040, 0x81764911
+0,         30,         30,        1,   599040, 0x14d1802e
+0,         31,         31,        1,   599040, 0x0e065246
+0,         32,         32,        1,   599040, 0xc8a607cf
+0,         33,         33,        1,   599040, 0x23b210e7
+0,         34,         34,        1,   599040, 0x2c80da1c
+0,         35,         35,        1,   599040, 0x3e6e896b
+0,         36,         36,        1,   599040, 0x5a4aa035
+0,         37,         37,        1,   599040, 0x1b2d2d20
+0,         38,         38,        1,   599040, 0x12f928fc
+0,         39,         39,        1,   599040, 0x49ae617c
+0,         40,         40,        1,   599040, 0x77fe18a4
+0,         41,         41,        1,   599040, 0x296c1ef7
+0,         42,         42,        1,   599040, 0x72cad62f
+0,         43,         43,        1,   599040, 0xbf82d227
+0,         44,         44,        1,   599040, 0xf2bef8b1
+0,         45,         45,        1,   599040, 0xba67092f
+0,         46,         46,        1,   599040, 0xd5551dab
+0,         47,         47,        1,   599040, 0xf973b042
+0,         48,         48,        1,   599040, 0xdddf947a
+0,         49,         49,        1,   599040, 0x00a3e427
+0,         50,         50,        1,   599040, 0x23d8a74d
+0,         51,         51,        1,   599040, 0x1b84b0a9
+0,         52,         52,        1,   599040, 0x94bfcee9
+0,         53,         53,        1,   599040, 0xf0b6a9cb
+0,         54,         54,        1,   599040, 0x4a950fbe
+0,         55,         55,        1,   599040, 0x925c319c
+0,         56,         56,        1,   599040, 0x76511c5c
+0,         57,         57,        1,   599040, 0x1f59398f
+0,         58,         58,        1,   599040, 0x14af6c11
+0,         59,         59,        1,   599040, 0x20c87118
diff --git a/tests/ref/fate/hevc-conformance-TILES_A_Cisco_2 b/tests/ref/fate/hevc-conformance-TILES_A_Cisco_2
index 63c9722f5a..8d0b5276e6 100644
--- a/tests/ref/fate/hevc-conformance-TILES_A_Cisco_2
+++ b/tests/ref/fate/hevc-conformance-TILES_A_Cisco_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  3110400, 0xfc052e85
 0,          1,          1,        1,  3110400, 0xfb49bf20
 0,          2,          2,        1,  3110400, 0x549eef2b
diff --git a/tests/ref/fate/hevc-conformance-TILES_B_Cisco_1 b/tests/ref/fate/hevc-conformance-TILES_B_Cisco_1
index 9c3712195f..b03a9c3f80 100644
--- a/tests/ref/fate/hevc-conformance-TILES_B_Cisco_1
+++ b/tests/ref/fate/hevc-conformance-TILES_B_Cisco_1
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
 0,          0,          0,        1,  3110400, 0x3471f473
 0,          1,          1,        1,  3110400, 0xb371a3e8
 0,          2,          2,        1,  3110400, 0x6d83c623
diff --git a/tests/ref/fate/hevc-conformance-TMVP_A_MS_3 b/tests/ref/fate/hevc-conformance-TMVP_A_MS_3
index 531370d26a..d037d38469 100644
--- a/tests/ref/fate/hevc-conformance-TMVP_A_MS_3
+++ b/tests/ref/fate/hevc-conformance-TMVP_A_MS_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xdb5e3b56
 0,          1,          1,        1,   149760, 0x6d4418eb
 0,          2,          2,        1,   149760, 0x0473e366
diff --git a/tests/ref/fate/hevc-conformance-TSCL_A_VIDYO_5 b/tests/ref/fate/hevc-conformance-TSCL_A_VIDYO_5
index 84d4219e37..7f875840c2 100644
--- a/tests/ref/fate/hevc-conformance-TSCL_A_VIDYO_5
+++ b/tests/ref/fate/hevc-conformance-TSCL_A_VIDYO_5
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xcfffa013
 0,          1,          1,        1,   149760, 0x5166146a
 0,          2,          2,        1,   149760, 0xc3cc318e
diff --git a/tests/ref/fate/hevc-conformance-TSCL_B_VIDYO_4 b/tests/ref/fate/hevc-conformance-TSCL_B_VIDYO_4
index 6ee24acf9e..c8b192404f 100644
--- a/tests/ref/fate/hevc-conformance-TSCL_B_VIDYO_4
+++ b/tests/ref/fate/hevc-conformance-TSCL_B_VIDYO_4
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x88619f80
 0,          1,          1,        1,   149760, 0x550bdaf0
 0,          2,          2,        1,   149760, 0x99440a14
diff --git a/tests/ref/fate/hevc-conformance-TSKIP_A_MS_3 b/tests/ref/fate/hevc-conformance-TSKIP_A_MS_3
index b5eca3c3da..2f7ee57ec4 100644
--- a/tests/ref/fate/hevc-conformance-TSKIP_A_MS_3
+++ b/tests/ref/fate/hevc-conformance-TSKIP_A_MS_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  1382400, 0xaea37937
 0,          1,          1,        1,  1382400, 0xea5c7b5d
 0,          2,          2,        1,  1382400, 0x4e41e421
diff --git a/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1 b/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1
index 4886a40162..f0498e1a22 100644
--- a/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1
+++ b/tests/ref/fate/hevc-conformance-TUSIZE_A_Samsung_1
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 2560x1600
+#sar 0: 0/1
 0,          0,          0,        1,  6144000, 0x3681421d
 0,          1,          1,        1,  6144000, 0xecf3f343
 0,          2,          2,        1,  6144000, 0x53742db2
diff --git a/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1 b/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1
index bbb3cfeaa1..6cd9643536 100644
--- a/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1
+++ b/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_1
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x88619f80
 0,          1,          1,        1,   149760, 0x550bdaf0
 0,          2,          2,        1,   149760, 0x99440a14
diff --git a/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_2 b/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_2
new file mode 100644
index 0000000000..6cd9643536
--- /dev/null
+++ b/tests/ref/fate/hevc-conformance-VPSID_A_VIDYO_2
@@ -0,0 +1,38 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
+0,          0,          0,        1,   149760, 0x88619f80
+0,          1,          1,        1,   149760, 0x550bdaf0
+0,          2,          2,        1,   149760, 0x99440a14
+0,          3,          3,        1,   149760, 0xcc2c2049
+0,          4,          4,        1,   149760, 0x46927368
+0,          5,          5,        1,   149760, 0x53cdb3fe
+0,          6,          6,        1,   149760, 0x654df025
+0,          7,          7,        1,   149760, 0x024d24bc
+0,          8,          8,        1,   149760, 0x409138c2
+0,          9,          9,        1,   149760, 0xfbb47c48
+0,         10,         10,        1,   149760, 0x18caa19d
+0,         11,         11,        1,   149760, 0x0f88c2e5
+0,         12,         12,        1,   149760, 0x1c16aa2d
+0,         13,         13,        1,   149760, 0x60bfcce8
+0,         14,         14,        1,   149760, 0x1c38e3d3
+0,         15,         15,        1,   149760, 0x0d5b044a
+0,         16,         16,        1,   149760, 0x93d21593
+0,         17,         17,        1,   149760, 0xdf283910
+0,         18,         18,        1,   149760, 0x03324c23
+0,         19,         19,        1,   149760, 0x3b175b7b
+0,         20,         20,        1,   149760, 0xb91b9a7e
+0,         21,         21,        1,   149760, 0x734fbbe7
+0,         22,         22,        1,   149760, 0xfc3fea48
+0,         23,         23,        1,   149760, 0x6609103e
+0,         24,         24,        1,   149760, 0x3f5916fa
+0,         25,         25,        1,   149760, 0x08e43f4d
+0,         26,         26,        1,   149760, 0xc84e5471
+0,         27,         27,        1,   149760, 0xbd4e5c8d
+0,         28,         28,        1,   149760, 0x4a4d3995
+0,         29,         29,        1,   149760, 0x662163c0
+0,         30,         30,        1,   149760, 0xda28671f
+0,         31,         31,        1,   149760, 0x19e1878e
+0,         32,         32,        1,   149760, 0x19807e67
diff --git a/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN10_2 b/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN10_2
index fe46c99baf..8bed654e25 100644
--- a/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN10_2
+++ b/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN10_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   299520, 0xa3f96d63
 0,          1,          1,        1,   299520, 0x5f788f3f
 0,          2,          2,        1,   299520, 0x41c7d0ae
diff --git a/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN_2 b/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN_2
index 497c8025de..1be833d37b 100644
--- a/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN_2
+++ b/tests/ref/fate/hevc-conformance-WPP_A_ericsson_MAIN_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xfbb3d914
 0,          1,          1,        1,   149760, 0xdccd707b
 0,          2,          2,        1,   149760, 0x32008963
diff --git a/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN10_2 b/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN10_2
index d199d383d1..b14666882e 100644
--- a/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN10_2
+++ b/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN10_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   299520, 0x66b3cef3
 0,          1,          1,        1,   299520, 0x99df880f
 0,          2,          2,        1,   299520, 0xb4a03801
diff --git a/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN_2 b/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN_2
index bb61b103eb..9ac63c1438 100644
--- a/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN_2
+++ b/tests/ref/fate/hevc-conformance-WPP_B_ericsson_MAIN_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x3772de54
 0,          1,          1,        1,   149760, 0x571d885e
 0,          2,          2,        1,   149760, 0x71576f09
diff --git a/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN10_2 b/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN10_2
index b1e6312402..ee951bb284 100644
--- a/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN10_2
+++ b/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN10_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   299520, 0xbc71d699
 0,          1,          1,        1,   299520, 0x3207e1f9
 0,          2,          2,        1,   299520, 0xdd2087b5
diff --git a/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN_2 b/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN_2
index 49c4f21af7..12fbbf6972 100644
--- a/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN_2
+++ b/tests/ref/fate/hevc-conformance-WPP_C_ericsson_MAIN_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x0948e521
 0,          1,          1,        1,   149760, 0x37afb384
 0,          2,          2,        1,   149760, 0xe1864c4a
diff --git a/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN10_2 b/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN10_2
index 83cf10ce38..6fc9a04971 100644
--- a/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN10_2
+++ b/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN10_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x240
+#sar 0: 0/1
 0,          0,          0,        1,    46080, 0xc50ed6b4
 0,          1,          1,        1,    46080, 0x2aeac52d
 0,          2,          2,        1,    46080, 0xe3e36cd3
diff --git a/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN_2 b/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN_2
index 6e6fc32071..dc469f62ac 100644
--- a/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN_2
+++ b/tests/ref/fate/hevc-conformance-WPP_D_ericsson_MAIN_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x240
+#sar 0: 0/1
 0,          0,          0,        1,    23040, 0x6977dbca
 0,          1,          1,        1,    23040, 0xd9bfcb5c
 0,          2,          2,        1,    23040, 0xbdd5a346
diff --git a/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN10_2 b/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN10_2
index dbf6f780d4..0dd096c898 100644
--- a/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN10_2
+++ b/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN10_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x240
+#sar 0: 0/1
 0,          0,          0,        1,    92160, 0x591c992e
 0,          1,          1,        1,    92160, 0xe7a8cd8b
 0,          2,          2,        1,    92160, 0x2e7528bb
diff --git a/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN_2 b/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN_2
index ac478c6ae9..e284c179ee 100644
--- a/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN_2
+++ b/tests/ref/fate/hevc-conformance-WPP_E_ericsson_MAIN_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x240
+#sar 0: 0/1
 0,          0,          0,        1,    46080, 0xcd234724
 0,          1,          1,        1,    46080, 0x66649579
 0,          2,          2,        1,    46080, 0x4317d38d
diff --git a/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN10_2 b/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN10_2
index 2f103b7af8..aa8452db98 100644
--- a/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN10_2
+++ b/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN10_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x240
+#sar 0: 0/1
 0,          0,          0,        1,   138240, 0x99f196ae
 0,          1,          1,        1,   138240, 0x45f407de
 0,          2,          2,        1,   138240, 0xdaef815b
diff --git a/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN_2 b/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN_2
index 6256d96cb1..1654ec1c53 100644
--- a/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN_2
+++ b/tests/ref/fate/hevc-conformance-WPP_F_ericsson_MAIN_2
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x240
+#sar 0: 0/1
 0,          0,          0,        1,    69120, 0x28326a13
 0,          1,          1,        1,    69120, 0x1f41a4a7
 0,          2,          2,        1,    69120, 0x803ceeb4
diff --git a/tests/ref/fate/hevc-conformance-WP_A_MAIN10_Toshiba_3 b/tests/ref/fate/hevc-conformance-WP_A_MAIN10_Toshiba_3
index b2dadbad8a..4ca7eb2564 100644
--- a/tests/ref/fate/hevc-conformance-WP_A_MAIN10_Toshiba_3
+++ b/tests/ref/fate/hevc-conformance-WP_A_MAIN10_Toshiba_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   299520, 0x7750edc7
 0,          1,          1,        1,   299520, 0x97fb359b
 0,          2,          2,        1,   299520, 0x89ac22bc
diff --git a/tests/ref/fate/hevc-conformance-WP_A_Toshiba_3 b/tests/ref/fate/hevc-conformance-WP_A_Toshiba_3
index a8c5df34f1..88f319c90b 100644
--- a/tests/ref/fate/hevc-conformance-WP_A_Toshiba_3
+++ b/tests/ref/fate/hevc-conformance-WP_A_Toshiba_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xf4bafc83
 0,          1,          1,        1,   149760, 0x611ca492
 0,          2,          2,        1,   149760, 0x8fa9bbb1
diff --git a/tests/ref/fate/hevc-conformance-WP_B_Toshiba_3 b/tests/ref/fate/hevc-conformance-WP_B_Toshiba_3
index f302764711..ed6988005a 100644
--- a/tests/ref/fate/hevc-conformance-WP_B_Toshiba_3
+++ b/tests/ref/fate/hevc-conformance-WP_B_Toshiba_3
@@ -1,257 +1,261 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xd8bf0c39
-0,          4,          4,        1,   149760, 0xad390a29
-0,          5,          5,        1,   149760, 0x0d310906
-0,          5,          5,        1,   149760, 0x03bcb5ac
-0,          6,          6,        1,   149760, 0x6c38226f
-0,          7,          7,        1,   149760, 0xc7d898b6
-0,          8,          8,        1,   149760, 0x1e031118
-0,          9,          9,        1,   149760, 0x7a2437f2
-0,         10,         10,        1,   149760, 0x524d616a
-0,         11,         11,        1,   149760, 0x001ac80e
-0,         12,         12,        1,   149760, 0x6fe323e4
-0,         13,         13,        1,   149760, 0x2a95a125
-0,         14,         14,        1,   149760, 0x212316e4
-0,         15,         15,        1,   149760, 0x7984e2ed
-0,         16,         16,        1,   149760, 0xb0a4a95c
-0,         17,         17,        1,   149760, 0x100566ae
-0,         18,         18,        1,   149760, 0xb21b2344
-0,         19,         19,        1,   149760, 0x0578bca2
-0,         20,         20,        1,   149760, 0xf7523964
-0,         21,         21,        1,   149760, 0x38d2ca9e
-0,         22,         22,        1,   149760, 0x77890564
-0,         23,         23,        1,   149760, 0xbdba85df
-0,         24,         24,        1,   149760, 0x646ae92d
-0,         25,         25,        1,   149760, 0xfcbb58b9
-0,         26,         26,        1,   149760, 0x0122aa96
-0,         27,         27,        1,   149760, 0x60f8e1ee
-0,         28,         28,        1,   149760, 0x3fc2d587
-0,         29,         29,        1,   149760, 0xdb622c12
-0,         30,         30,        1,   149760, 0xa8df64cf
-0,         31,         31,        1,   149760, 0x12f8d6c8
-0,         32,         32,        1,   149760, 0xf6703c4d
-0,         33,         33,        1,   149760, 0x66ef211d
-0,         34,         34,        1,   149760, 0x821b02f6
-0,         35,         35,        1,   149760, 0xc87f48a0
-0,         36,         36,        1,   149760, 0xb816ad51
-0,         37,         37,        1,   149760, 0x238e6fa0
-0,         38,         38,        1,   149760, 0x0fc06010
-0,         39,         39,        1,   149760, 0x749c71dc
-0,         40,         40,        1,   149760, 0x88c69718
-0,         41,         41,        1,   149760, 0x4b29aeb1
-0,         42,         42,        1,   149760, 0xaaefb509
-0,         43,         43,        1,   149760, 0x2975fda6
-0,         44,         44,        1,   149760, 0x613ec356
-0,         45,         45,        1,   149760, 0xf1e46db6
-0,         46,         46,        1,   149760, 0x8c8aec07
-0,         47,         47,        1,   149760, 0xb9a8be75
-0,         48,         48,        1,   149760, 0xfdce756a
-0,         49,         49,        1,   149760, 0x9c76f148
-0,         50,         50,        1,   149760, 0x5d1862dd
-0,         51,         51,        1,   149760, 0x42ae08bf
-0,         52,         52,        1,   149760, 0xc28f9247
-0,         53,         53,        1,   149760, 0x719d321c
-0,         54,         54,        1,   149760, 0x1520a7bc
-0,         55,         55,        1,   149760, 0x4fb98c9a
-0,         56,         56,        1,   149760, 0x88d410a6
-0,         57,         57,        1,   149760, 0x807ac417
-0,         58,         58,        1,   149760, 0x6de5f4ab
-0,         59,         59,        1,   149760, 0x678613c7
-0,         60,         60,        1,   149760, 0xe7d12abf
-0,         61,         61,        1,   149760, 0x23955076
-0,         62,         62,        1,   149760, 0x298d1bce
-0,         63,         63,        1,   149760, 0x18d4605d
-0,         64,         64,        1,   149760, 0x3a606618
-0,         65,         65,        1,   149760, 0x861fcb5a
-0,         66,         66,        1,   149760, 0xc6622a90
-0,         67,         67,        1,   149760, 0x62d4cd48
-0,         68,         68,        1,   149760, 0x991430e6
-0,         69,         69,        1,   149760, 0x6316503c
-0,         70,         70,        1,   149760, 0xdf2d29f2
-0,         71,         71,        1,   149760, 0xeeeb307a
-0,         72,         72,        1,   149760, 0xade9ae1d
-0,         73,         73,        1,   149760, 0x54734581
-0,         74,         74,        1,   149760, 0x5ccd7389
-0,         75,         75,        1,   149760, 0xf0588bf8
-0,         76,         76,        1,   149760, 0xf18e44e5
-0,         77,         77,        1,   149760, 0x4512602b
-0,         78,         78,        1,   149760, 0x9aac8281
-0,         79,         79,        1,   149760, 0x69bdad58
-0,         80,         80,        1,   149760, 0x04ffe580
-0,         81,         81,        1,   149760, 0x28bfe45f
-0,         82,         82,        1,   149760, 0xd7ce93b0
-0,         83,         83,        1,   149760, 0xa880b1d4
-0,         84,         84,        1,   149760, 0xf38298d0
-0,         85,         85,        1,   149760, 0x2ae05958
-0,         86,         86,        1,   149760, 0xa892151b
-0,         87,         87,        1,   149760, 0xed2cef63
-0,         88,         88,        1,   149760, 0x678fc6f5
-0,         89,         89,        1,   149760, 0xfcbaa892
-0,         90,         90,        1,   149760, 0x48cc722b
-0,         91,         91,        1,   149760, 0x32cd8975
-0,         92,         92,        1,   149760, 0x05ad8586
-0,         93,         93,        1,   149760, 0x62a0fb36
-0,         94,         94,        1,   149760, 0x41df8d45
-0,         95,         95,        1,   149760, 0x80bd938d
-0,         96,         96,        1,   149760, 0xafe414b0
-0,         97,         97,        1,   149760, 0x3077d51d
-0,         98,         98,        1,   149760, 0x65148cef
-0,         99,         99,        1,   149760, 0xadb76ef0
-0,        100,        100,        1,   149760, 0x889c3051
-0,        101,        101,        1,   149760, 0xe83b227e
-0,        102,        102,        1,   149760, 0xc373f5e0
-0,        103,        103,        1,   149760, 0x6ffa2a5f
-0,        104,        104,        1,   149760, 0x6eef18f5
-0,        105,        105,        1,   149760, 0x1b1ba6e4
-0,        106,        106,        1,   149760, 0x88e316a4
-0,        107,        107,        1,   149760, 0x4c0697f4
-0,        108,        108,        1,   149760, 0x5eb30515
-0,        109,        109,        1,   149760, 0xeeff8fa3
-0,        110,        110,        1,   149760, 0x653a07a9
-0,        111,        111,        1,   149760, 0x3faf44a8
-0,        112,        112,        1,   149760, 0xe33f740e
-0,        113,        113,        1,   149760, 0x6bea0f49
-0,        114,        114,        1,   149760, 0x4d5aa784
-0,        115,        115,        1,   149760, 0x0c85ea00
-0,        116,        116,        1,   149760, 0xf64fc40b
-0,        117,        117,        1,   149760, 0xf222e3b4
-0,        118,        118,        1,   149760, 0x6b3be6bc
-0,        119,        119,        1,   149760, 0x91447dfb
-0,        120,        120,        1,   149760, 0xfd0dd98c
-0,        121,        121,        1,   149760, 0x468eb01a
-0,        122,        122,        1,   149760, 0x928a720a
-0,        123,        123,        1,   149760, 0x0b3f576b
-0,        124,        124,        1,   149760, 0x430493df
-0,        125,        125,        1,   149760, 0x375d2221
-0,        126,        126,        1,   149760, 0x50d0a88c
-0,        127,        127,        1,   149760, 0x54363ffb
-0,        128,        128,        1,   149760, 0xc243c434
-0,        129,        129,        1,   149760, 0x26fe8f5c
-0,        130,        130,        1,   149760, 0xd936485c
-0,        131,        131,        1,   149760, 0xd936485c
-0,        132,        132,        1,   149760, 0xa0cabe5a
-0,        133,        133,        1,   149760, 0xf0956484
-0,        134,        134,        1,   149760, 0x14cda6ee
-0,        135,        135,        1,   149760, 0x0b7ada70
-0,        136,        136,        1,   149760, 0x113f0ec5
-0,        137,        137,        1,   149760, 0xc1364acc
-0,        138,        138,        1,   149760, 0x0c768a6a
-0,        139,        139,        1,   149760, 0x94fd7a00
-0,        140,        140,        1,   149760, 0x624a5ebb
-0,        141,        141,        1,   149760, 0xdd5008a0
-0,        142,        142,        1,   149760, 0xc380626c
-0,        143,        143,        1,   149760, 0xb0974c02
-0,        144,        144,        1,   149760, 0x68be6c1e
-0,        145,        145,        1,   149760, 0xb8d24677
-0,        146,        146,        1,   149760, 0x1efe195c
-0,        147,        147,        1,   149760, 0x29e9153a
-0,        148,        148,        1,   149760, 0x1b6057b7
-0,        149,        149,        1,   149760, 0x959a4461
-0,        150,        150,        1,   149760, 0x4e3d33a9
-0,        151,        151,        1,   149760, 0x206e7899
-0,        152,        152,        1,   149760, 0xcb7da081
-0,        153,        153,        1,   149760, 0xc650ed7b
-0,        154,        154,        1,   149760, 0x82832d10
-0,        155,        155,        1,   149760, 0xdf9c6218
-0,        156,        156,        1,   149760, 0xcc3489c7
-0,        157,        157,        1,   149760, 0xd284a4a1
-0,        158,        158,        1,   149760, 0x7099451c
-0,        159,        159,        1,   149760, 0xec26fc56
-0,        160,        160,        1,   149760, 0x105a496f
-0,        161,        161,        1,   149760, 0xb8756fe8
-0,        162,        162,        1,   149760, 0xb1a509df
-0,        163,        163,        1,   149760, 0x135f8f7e
-0,        164,        164,        1,   149760, 0x3419098d
-0,        165,        165,        1,   149760, 0xa55dad5f
-0,        166,        166,        1,   149760, 0x326ba794
-0,        167,        167,        1,   149760, 0x5401b03c
-0,        168,        168,        1,   149760, 0x3ace76ee
-0,        169,        169,        1,   149760, 0x140191ac
-0,        170,        170,        1,   149760, 0x3e3ca195
-0,        171,        171,        1,   149760, 0x2a8b3622
-0,        172,        172,        1,   149760, 0x9e33c765
-0,        173,        173,        1,   149760, 0xf7795367
-0,        174,        174,        1,   149760, 0xa7909e25
-0,        175,        175,        1,   149760, 0x44a5a014
-0,        176,        176,        1,   149760, 0x919bb07c
-0,        177,        177,        1,   149760, 0xd353b9a7
-0,        178,        178,        1,   149760, 0x4c3dda24
-0,        179,        179,        1,   149760, 0x1428eafb
-0,        180,        180,        1,   149760, 0x9d9fa613
-0,        181,        181,        1,   149760, 0x661475c6
-0,        182,        182,        1,   149760, 0x5f6f4180
-0,        183,        183,        1,   149760, 0xf50a4b4c
-0,        184,        184,        1,   149760, 0xf6373eb9
-0,        185,        185,        1,   149760, 0x0ab24b74
-0,        186,        186,        1,   149760, 0x6b3d58b0
-0,        187,        187,        1,   149760, 0xc4c8bd05
-0,        188,        188,        1,   149760, 0x0df172c6
-0,        189,        189,        1,   149760, 0x81a85144
-0,        190,        190,        1,   149760, 0x7f926ee5
-0,        191,        191,        1,   149760, 0x3a355d45
-0,        192,        192,        1,   149760, 0x9f645c90
-0,        193,        193,        1,   149760, 0xf42674ea
-0,        194,        194,        1,   149760, 0xa6e943ab
-0,        195,        195,        1,   149760, 0xede16b49
-0,        196,        196,        1,   149760, 0xf80c9957
-0,        197,        197,        1,   149760, 0xa7a44665
-0,        198,        198,        1,   149760, 0x08f17b20
-0,        199,        199,        1,   149760, 0x0319e942
-0,        200,        200,        1,   149760, 0xab69057c
-0,        201,        201,        1,   149760, 0xb98814f4
-0,        202,        202,        1,   149760, 0xa172e6d0
-0,        203,        203,        1,   149760, 0x6cd35cd1
-0,        204,        204,        1,   149760, 0x7352b4b9
-0,        205,        205,        1,   149760, 0x07cbdedd
-0,        206,        206,        1,   149760, 0xbe7aa3c8
-0,        207,        207,        1,   149760, 0xdcbc8993
-0,        208,        208,        1,   149760, 0x0c5dbf95
-0,        209,        209,        1,   149760, 0x107e4f2c
-0,        210,        210,        1,   149760, 0xc650e333
-0,        211,        211,        1,   149760, 0x46abae6f
-0,        212,        212,        1,   149760, 0x0e41309d
-0,        213,        213,        1,   149760, 0x831e19a1
-0,        214,        214,        1,   149760, 0xd1955874
-0,        215,        215,        1,   149760, 0x486c41bb
-0,        216,        216,        1,   149760, 0xba020143
-0,        217,        217,        1,   149760, 0x3ebedef4
-0,        218,        218,        1,   149760, 0xda7bc235
-0,        219,        219,        1,   149760, 0x0abcb13e
-0,        220,        220,        1,   149760, 0xdf5159ac
-0,        221,        221,        1,   149760, 0x4e39d893
-0,        222,        222,        1,   149760, 0x393f382d
-0,        223,        223,        1,   149760, 0x92556867
-0,        224,        224,        1,   149760, 0x2daf47a8
-0,        225,        225,        1,   149760, 0x792a4448
-0,        226,        226,        1,   149760, 0x429e05ad
-0,        227,        227,        1,   149760, 0x89caaa32
-0,        228,        228,        1,   149760, 0xa70ec97b
-0,        229,        229,        1,   149760, 0xce0d24b7
-0,        230,        230,        1,   149760, 0x04be745d
-0,        231,        231,        1,   149760, 0xfb04d3d2
-0,        232,        232,        1,   149760, 0x5b472952
-0,        233,        233,        1,   149760, 0x6cd704b5
-0,        234,        234,        1,   149760, 0x18b0db7e
-0,        235,        235,        1,   149760, 0xdfb24e07
-0,        236,        236,        1,   149760, 0x6d9bae45
-0,        237,        237,        1,   149760, 0xf2eb5756
-0,        238,        238,        1,   149760, 0xdf858203
-0,        239,        239,        1,   149760, 0xdcd4822f
-0,        240,        240,        1,   149760, 0x80ceabaf
-0,        241,        241,        1,   149760, 0x8bd1a92f
-0,        242,        242,        1,   149760, 0x981a61ca
-0,        243,        243,        1,   149760, 0x5fa92603
-0,        244,        244,        1,   149760, 0xbb28f8da
-0,        245,        245,        1,   149760, 0x1710666d
-0,        246,        246,        1,   149760, 0xf928099a
-0,        247,        247,        1,   149760, 0x2e0ae9cb
-0,        248,        248,        1,   149760, 0xcf0e402c
-0,        249,        249,        1,   149760, 0x48e5b987
-0,        250,        250,        1,   149760, 0x7dc42853
-0,        251,        251,        1,   149760, 0x25f4aef0
-0,        252,        252,        1,   149760, 0x5f1d37b3
-0,        253,        253,        1,   149760, 0xb2fabf9f
-0,        254,        254,        1,   149760, 0xe87348ee
-0,        255,        255,        1,   149760, 0xbe9ec00f
-0,        256,        256,        1,   149760, 0xd67d1fb2
-0,        257,        257,        1,   149760, 0x92db1ca8
+0,          1,          1,        1,   149760, 0xad390a29
+0,          2,          2,        1,   149760, 0x0d310906
+0,          3,          3,        1,   149760, 0x03bcb5ac
+0,          4,          4,        1,   149760, 0x6c38226f
+0,          5,          5,        1,   149760, 0xc7d898b6
+0,          6,          6,        1,   149760, 0x1e031118
+0,          7,          7,        1,   149760, 0x7a2437f2
+0,          8,          8,        1,   149760, 0x524d616a
+0,          9,          9,        1,   149760, 0x001ac80e
+0,         10,         10,        1,   149760, 0x6fe323e4
+0,         11,         11,        1,   149760, 0x2a95a125
+0,         12,         12,        1,   149760, 0x212316e4
+0,         13,         13,        1,   149760, 0x7984e2ed
+0,         14,         14,        1,   149760, 0xb0a4a95c
+0,         15,         15,        1,   149760, 0x100566ae
+0,         16,         16,        1,   149760, 0xb21b2344
+0,         17,         17,        1,   149760, 0x0578bca2
+0,         18,         18,        1,   149760, 0xf7523964
+0,         19,         19,        1,   149760, 0x38d2ca9e
+0,         20,         20,        1,   149760, 0x77890564
+0,         21,         21,        1,   149760, 0xbdba85df
+0,         22,         22,        1,   149760, 0x646ae92d
+0,         23,         23,        1,   149760, 0xfcbb58b9
+0,         24,         24,        1,   149760, 0x0122aa96
+0,         25,         25,        1,   149760, 0x60f8e1ee
+0,         26,         26,        1,   149760, 0x3fc2d587
+0,         27,         27,        1,   149760, 0xdb622c12
+0,         28,         28,        1,   149760, 0xa8df64cf
+0,         29,         29,        1,   149760, 0x12f8d6c8
+0,         30,         30,        1,   149760, 0xf6703c4d
+0,         31,         31,        1,   149760, 0x66ef211d
+0,         32,         32,        1,   149760, 0x821b02f6
+0,         33,         33,        1,   149760, 0xc87f48a0
+0,         34,         34,        1,   149760, 0xb816ad51
+0,         35,         35,        1,   149760, 0x238e6fa0
+0,         36,         36,        1,   149760, 0x0fc06010
+0,         37,         37,        1,   149760, 0x749c71dc
+0,         38,         38,        1,   149760, 0x88c69718
+0,         39,         39,        1,   149760, 0x4b29aeb1
+0,         40,         40,        1,   149760, 0xaaefb509
+0,         41,         41,        1,   149760, 0x2975fda6
+0,         42,         42,        1,   149760, 0x613ec356
+0,         43,         43,        1,   149760, 0xf1e46db6
+0,         44,         44,        1,   149760, 0x8c8aec07
+0,         45,         45,        1,   149760, 0xb9a8be75
+0,         46,         46,        1,   149760, 0xfdce756a
+0,         47,         47,        1,   149760, 0x9c76f148
+0,         48,         48,        1,   149760, 0x5d1862dd
+0,         49,         49,        1,   149760, 0x42ae08bf
+0,         50,         50,        1,   149760, 0xc28f9247
+0,         51,         51,        1,   149760, 0x719d321c
+0,         52,         52,        1,   149760, 0x1520a7bc
+0,         53,         53,        1,   149760, 0x4fb98c9a
+0,         54,         54,        1,   149760, 0x88d410a6
+0,         55,         55,        1,   149760, 0x807ac417
+0,         56,         56,        1,   149760, 0x6de5f4ab
+0,         57,         57,        1,   149760, 0x678613c7
+0,         58,         58,        1,   149760, 0xe7d12abf
+0,         59,         59,        1,   149760, 0x23955076
+0,         60,         60,        1,   149760, 0x298d1bce
+0,         61,         61,        1,   149760, 0x18d4605d
+0,         62,         62,        1,   149760, 0x3a606618
+0,         63,         63,        1,   149760, 0x861fcb5a
+0,         64,         64,        1,   149760, 0xc6622a90
+0,         65,         65,        1,   149760, 0x62d4cd48
+0,         66,         66,        1,   149760, 0x991430e6
+0,         67,         67,        1,   149760, 0x6316503c
+0,         68,         68,        1,   149760, 0xdf2d29f2
+0,         69,         69,        1,   149760, 0xeeeb307a
+0,         70,         70,        1,   149760, 0xade9ae1d
+0,         71,         71,        1,   149760, 0x54734581
+0,         72,         72,        1,   149760, 0x5ccd7389
+0,         73,         73,        1,   149760, 0xf0588bf8
+0,         74,         74,        1,   149760, 0xf18e44e5
+0,         75,         75,        1,   149760, 0x4512602b
+0,         76,         76,        1,   149760, 0x9aac8281
+0,         77,         77,        1,   149760, 0x69bdad58
+0,         78,         78,        1,   149760, 0x04ffe580
+0,         79,         79,        1,   149760, 0x28bfe45f
+0,         80,         80,        1,   149760, 0xd7ce93b0
+0,         81,         81,        1,   149760, 0xa880b1d4
+0,         82,         82,        1,   149760, 0xf38298d0
+0,         83,         83,        1,   149760, 0x2ae05958
+0,         84,         84,        1,   149760, 0xa892151b
+0,         85,         85,        1,   149760, 0xed2cef63
+0,         86,         86,        1,   149760, 0x678fc6f5
+0,         87,         87,        1,   149760, 0xfcbaa892
+0,         88,         88,        1,   149760, 0x48cc722b
+0,         89,         89,        1,   149760, 0x32cd8975
+0,         90,         90,        1,   149760, 0x05ad8586
+0,         91,         91,        1,   149760, 0x62a0fb36
+0,         92,         92,        1,   149760, 0x41df8d45
+0,         93,         93,        1,   149760, 0x80bd938d
+0,         94,         94,        1,   149760, 0xafe414b0
+0,         95,         95,        1,   149760, 0x3077d51d
+0,         96,         96,        1,   149760, 0x65148cef
+0,         97,         97,        1,   149760, 0xadb76ef0
+0,         98,         98,        1,   149760, 0x889c3051
+0,         99,         99,        1,   149760, 0xe83b227e
+0,        100,        100,        1,   149760, 0xc373f5e0
+0,        101,        101,        1,   149760, 0x6ffa2a5f
+0,        102,        102,        1,   149760, 0x6eef18f5
+0,        103,        103,        1,   149760, 0x1b1ba6e4
+0,        104,        104,        1,   149760, 0x88e316a4
+0,        105,        105,        1,   149760, 0x4c0697f4
+0,        106,        106,        1,   149760, 0x5eb30515
+0,        107,        107,        1,   149760, 0xeeff8fa3
+0,        108,        108,        1,   149760, 0x653a07a9
+0,        109,        109,        1,   149760, 0x3faf44a8
+0,        110,        110,        1,   149760, 0xe33f740e
+0,        111,        111,        1,   149760, 0x6bea0f49
+0,        112,        112,        1,   149760, 0x4d5aa784
+0,        113,        113,        1,   149760, 0x0c85ea00
+0,        114,        114,        1,   149760, 0xf64fc40b
+0,        115,        115,        1,   149760, 0xf222e3b4
+0,        116,        116,        1,   149760, 0x6b3be6bc
+0,        117,        117,        1,   149760, 0x91447dfb
+0,        118,        118,        1,   149760, 0xfd0dd98c
+0,        119,        119,        1,   149760, 0x468eb01a
+0,        120,        120,        1,   149760, 0x928a720a
+0,        121,        121,        1,   149760, 0x0b3f576b
+0,        122,        122,        1,   149760, 0x430493df
+0,        123,        123,        1,   149760, 0x375d2221
+0,        124,        124,        1,   149760, 0x50d0a88c
+0,        125,        125,        1,   149760, 0x54363ffb
+0,        126,        126,        1,   149760, 0xc243c434
+0,        127,        127,        1,   149760, 0x26fe8f5c
+0,        128,        128,        1,   149760, 0xd936485c
+0,        129,        129,        1,   149760, 0xd936485c
+0,        130,        130,        1,   149760, 0xa0cabe5a
+0,        131,        131,        1,   149760, 0xf0956484
+0,        132,        132,        1,   149760, 0x14cda6ee
+0,        133,        133,        1,   149760, 0x0b7ada70
+0,        134,        134,        1,   149760, 0x113f0ec5
+0,        135,        135,        1,   149760, 0xc1364acc
+0,        136,        136,        1,   149760, 0x0c768a6a
+0,        137,        137,        1,   149760, 0x94fd7a00
+0,        138,        138,        1,   149760, 0x624a5ebb
+0,        139,        139,        1,   149760, 0xdd5008a0
+0,        140,        140,        1,   149760, 0xc380626c
+0,        141,        141,        1,   149760, 0xb0974c02
+0,        142,        142,        1,   149760, 0x68be6c1e
+0,        143,        143,        1,   149760, 0xb8d24677
+0,        144,        144,        1,   149760, 0x1efe195c
+0,        145,        145,        1,   149760, 0x29e9153a
+0,        146,        146,        1,   149760, 0x1b6057b7
+0,        147,        147,        1,   149760, 0x959a4461
+0,        148,        148,        1,   149760, 0x4e3d33a9
+0,        149,        149,        1,   149760, 0x206e7899
+0,        150,        150,        1,   149760, 0xcb7da081
+0,        151,        151,        1,   149760, 0xc650ed7b
+0,        152,        152,        1,   149760, 0x82832d10
+0,        153,        153,        1,   149760, 0xdf9c6218
+0,        154,        154,        1,   149760, 0xcc3489c7
+0,        155,        155,        1,   149760, 0xd284a4a1
+0,        156,        156,        1,   149760, 0x7099451c
+0,        157,        157,        1,   149760, 0xec26fc56
+0,        158,        158,        1,   149760, 0x105a496f
+0,        159,        159,        1,   149760, 0xb8756fe8
+0,        160,        160,        1,   149760, 0xb1a509df
+0,        161,        161,        1,   149760, 0x135f8f7e
+0,        162,        162,        1,   149760, 0x3419098d
+0,        163,        163,        1,   149760, 0xa55dad5f
+0,        164,        164,        1,   149760, 0x326ba794
+0,        165,        165,        1,   149760, 0x5401b03c
+0,        166,        166,        1,   149760, 0x3ace76ee
+0,        167,        167,        1,   149760, 0x140191ac
+0,        168,        168,        1,   149760, 0x3e3ca195
+0,        169,        169,        1,   149760, 0x2a8b3622
+0,        170,        170,        1,   149760, 0x9e33c765
+0,        171,        171,        1,   149760, 0xf7795367
+0,        172,        172,        1,   149760, 0xa7909e25
+0,        173,        173,        1,   149760, 0x44a5a014
+0,        174,        174,        1,   149760, 0x919bb07c
+0,        175,        175,        1,   149760, 0xd353b9a7
+0,        176,        176,        1,   149760, 0x4c3dda24
+0,        177,        177,        1,   149760, 0x1428eafb
+0,        178,        178,        1,   149760, 0x9d9fa613
+0,        179,        179,        1,   149760, 0x661475c6
+0,        180,        180,        1,   149760, 0x5f6f4180
+0,        181,        181,        1,   149760, 0xf50a4b4c
+0,        182,        182,        1,   149760, 0xf6373eb9
+0,        183,        183,        1,   149760, 0x0ab24b74
+0,        184,        184,        1,   149760, 0x6b3d58b0
+0,        185,        185,        1,   149760, 0xc4c8bd05
+0,        186,        186,        1,   149760, 0x0df172c6
+0,        187,        187,        1,   149760, 0x81a85144
+0,        188,        188,        1,   149760, 0x7f926ee5
+0,        189,        189,        1,   149760, 0x3a355d45
+0,        190,        190,        1,   149760, 0x9f645c90
+0,        191,        191,        1,   149760, 0xf42674ea
+0,        192,        192,        1,   149760, 0xa6e943ab
+0,        193,        193,        1,   149760, 0xede16b49
+0,        194,        194,        1,   149760, 0xf80c9957
+0,        195,        195,        1,   149760, 0xa7a44665
+0,        196,        196,        1,   149760, 0x08f17b20
+0,        197,        197,        1,   149760, 0x0319e942
+0,        198,        198,        1,   149760, 0xab69057c
+0,        199,        199,        1,   149760, 0xb98814f4
+0,        200,        200,        1,   149760, 0xa172e6d0
+0,        201,        201,        1,   149760, 0x6cd35cd1
+0,        202,        202,        1,   149760, 0x7352b4b9
+0,        203,        203,        1,   149760, 0x07cbdedd
+0,        204,        204,        1,   149760, 0xbe7aa3c8
+0,        205,        205,        1,   149760, 0xdcbc8993
+0,        206,        206,        1,   149760, 0x0c5dbf95
+0,        207,        207,        1,   149760, 0x107e4f2c
+0,        208,        208,        1,   149760, 0xc650e333
+0,        209,        209,        1,   149760, 0x46abae6f
+0,        210,        210,        1,   149760, 0x0e41309d
+0,        211,        211,        1,   149760, 0x831e19a1
+0,        212,        212,        1,   149760, 0xd1955874
+0,        213,        213,        1,   149760, 0x486c41bb
+0,        214,        214,        1,   149760, 0xba020143
+0,        215,        215,        1,   149760, 0x3ebedef4
+0,        216,        216,        1,   149760, 0xda7bc235
+0,        217,        217,        1,   149760, 0x0abcb13e
+0,        218,        218,        1,   149760, 0xdf5159ac
+0,        219,        219,        1,   149760, 0x4e39d893
+0,        220,        220,        1,   149760, 0x393f382d
+0,        221,        221,        1,   149760, 0x92556867
+0,        222,        222,        1,   149760, 0x2daf47a8
+0,        223,        223,        1,   149760, 0x792a4448
+0,        224,        224,        1,   149760, 0x429e05ad
+0,        225,        225,        1,   149760, 0x89caaa32
+0,        226,        226,        1,   149760, 0xa70ec97b
+0,        227,        227,        1,   149760, 0xce0d24b7
+0,        228,        228,        1,   149760, 0x04be745d
+0,        229,        229,        1,   149760, 0xfb04d3d2
+0,        230,        230,        1,   149760, 0x5b472952
+0,        231,        231,        1,   149760, 0x6cd704b5
+0,        232,        232,        1,   149760, 0x18b0db7e
+0,        233,        233,        1,   149760, 0xdfb24e07
+0,        234,        234,        1,   149760, 0x6d9bae45
+0,        235,        235,        1,   149760, 0xf2eb5756
+0,        236,        236,        1,   149760, 0xdf858203
+0,        237,        237,        1,   149760, 0xdcd4822f
+0,        238,        238,        1,   149760, 0x80ceabaf
+0,        239,        239,        1,   149760, 0x8bd1a92f
+0,        240,        240,        1,   149760, 0x981a61ca
+0,        241,        241,        1,   149760, 0x5fa92603
+0,        242,        242,        1,   149760, 0xbb28f8da
+0,        243,        243,        1,   149760, 0x1710666d
+0,        244,        244,        1,   149760, 0xf928099a
+0,        245,        245,        1,   149760, 0x2e0ae9cb
+0,        246,        246,        1,   149760, 0xcf0e402c
+0,        247,        247,        1,   149760, 0x48e5b987
+0,        248,        248,        1,   149760, 0x7dc42853
+0,        249,        249,        1,   149760, 0x25f4aef0
+0,        250,        250,        1,   149760, 0x5f1d37b3
+0,        251,        251,        1,   149760, 0xb2fabf9f
+0,        252,        252,        1,   149760, 0xe87348ee
+0,        253,        253,        1,   149760, 0xbe9ec00f
+0,        254,        254,        1,   149760, 0xd67d1fb2
+0,        255,        255,        1,   149760, 0x92db1ca8
diff --git a/tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3 b/tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3
index 23f03f8487..027776443a 100644
--- a/tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3
+++ b/tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3
@@ -1,257 +1,261 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   299520, 0x6ecba46b
-0,          4,          4,        1,   299520, 0x54e6ef0a
-0,          5,          5,        1,   299520, 0x7a4d46c5
-0,          6,          6,        1,   299520, 0xccd57f4e
-0,          7,          7,        1,   299520, 0xbe0cb48d
-0,          8,          8,        1,   299520, 0x10e7b49f
-0,          9,          9,        1,   299520, 0x81aa72e2
-0,         10,         10,        1,   299520, 0x5bf7b51f
-0,         11,         11,        1,   299520, 0xfcedee4a
-0,         12,         12,        1,   299520, 0x586c99b6
-0,         13,         13,        1,   299520, 0x414ca13c
-0,         14,         14,        1,   299520, 0x3f0162f2
-0,         15,         15,        1,   299520, 0x4d450c05
-0,         16,         16,        1,   299520, 0x0a58bd84
-0,         17,         17,        1,   299520, 0x26e8394d
-0,         18,         18,        1,   299520, 0xfd78121b
-0,         19,         19,        1,   299520, 0x6afeaf44
-0,         20,         20,        1,   299520, 0x3e9a9270
-0,         21,         21,        1,   299520, 0x58b889ca
-0,         22,         22,        1,   299520, 0x0245ba62
-0,         23,         23,        1,   299520, 0xddecc5ab
-0,         24,         24,        1,   299520, 0x32cf3cd9
-0,         25,         25,        1,   299520, 0x5c0a0440
-0,         26,         26,        1,   299520, 0x9d3e2fee
-0,         27,         27,        1,   299520, 0x2894c708
-0,         28,         28,        1,   299520, 0x25be67d5
-0,         29,         29,        1,   299520, 0xe3ece9d6
-0,         30,         30,        1,   299520, 0xcc98e38b
-0,         31,         31,        1,   299520, 0xc448c794
-0,         32,         32,        1,   299520, 0xb4f75575
-0,         33,         33,        1,   299520, 0xac74a437
-0,         34,         34,        1,   299520, 0x09c7f2e2
-0,         35,         35,        1,   299520, 0xbfaed8ab
-0,         36,         36,        1,   299520, 0xb077d700
-0,         37,         37,        1,   299520, 0x6efa0545
-0,         38,         38,        1,   299520, 0xb8c1802d
-0,         39,         39,        1,   299520, 0x794774f8
-0,         40,         40,        1,   299520, 0x1098f4ff
-0,         41,         41,        1,   299520, 0x80ab8bfc
-0,         42,         42,        1,   299520, 0xc324c3bc
-0,         43,         43,        1,   299520, 0x1eee77cd
-0,         44,         44,        1,   299520, 0x7147e72e
-0,         45,         45,        1,   299520, 0x1a34883c
-0,         46,         46,        1,   299520, 0x74e93e31
-0,         47,         47,        1,   299520, 0x89410382
-0,         48,         48,        1,   299520, 0xfcce0ce1
-0,         49,         49,        1,   299520, 0x07bb33c6
-0,         50,         50,        1,   299520, 0xc1ee7318
-0,         51,         51,        1,   299520, 0xd1c4bd2d
-0,         52,         52,        1,   299520, 0xa670cfae
-0,         53,         53,        1,   299520, 0x718de79b
-0,         54,         54,        1,   299520, 0x85e40b78
-0,         55,         55,        1,   299520, 0x15362e72
-0,         56,         56,        1,   299520, 0xc6e523fa
-0,         57,         57,        1,   299520, 0x3e536edd
-0,         58,         58,        1,   299520, 0x9312996e
-0,         59,         59,        1,   299520, 0x9456d53c
-0,         60,         60,        1,   299520, 0x7bc01398
-0,         61,         61,        1,   299520, 0x5a40bcb4
-0,         62,         62,        1,   299520, 0xcfe126ce
-0,         63,         63,        1,   299520, 0xd9e1adf1
-0,         64,         64,        1,   299520, 0x9027b1ae
-0,         65,         65,        1,   299520, 0x4c1372fb
-0,         66,         66,        1,   299520, 0xe475a00b
-0,         67,         67,        1,   299520, 0x945bc646
-0,         68,         68,        1,   299520, 0xc33dbab3
-0,         69,         69,        1,   299520, 0x9e4afb82
-0,         70,         70,        1,   299520, 0x1bffa858
-0,         71,         71,        1,   299520, 0x3bc78ad7
-0,         72,         72,        1,   299520, 0xa096e683
-0,         73,         73,        1,   299520, 0xb889aa23
-0,         74,         74,        1,   299520, 0x8ffad857
-0,         75,         75,        1,   299520, 0x59d3cc7c
-0,         76,         76,        1,   299520, 0x47d1377a
-0,         77,         77,        1,   299520, 0xea73e864
-0,         78,         78,        1,   299520, 0x0994bd5c
-0,         79,         79,        1,   299520, 0xdf779d85
-0,         80,         80,        1,   299520, 0x8238cfa7
-0,         81,         81,        1,   299520, 0x8f2e94cc
-0,         82,         82,        1,   299520, 0x9e0b0df8
-0,         83,         83,        1,   299520, 0x98ac1ce5
-0,         84,         84,        1,   299520, 0xc1c293ed
-0,         85,         85,        1,   299520, 0x1f1dfedb
-0,         86,         86,        1,   299520, 0xe7297d56
-0,         87,         87,        1,   299520, 0xa1390726
-0,         88,         88,        1,   299520, 0xf0e828e8
-0,         89,         89,        1,   299520, 0x108b8291
-0,         90,         90,        1,   299520, 0xd8830efb
-0,         91,         91,        1,   299520, 0xeee3d2f0
-0,         92,         92,        1,   299520, 0xa35d5b29
-0,         93,         93,        1,   299520, 0xa14d0840
-0,         94,         94,        1,   299520, 0xfa894a56
-0,         95,         95,        1,   299520, 0xd50005b5
-0,         96,         96,        1,   299520, 0xba625134
-0,         97,         97,        1,   299520, 0xce7dd782
-0,         98,         98,        1,   299520, 0x9e04e32f
-0,         99,         99,        1,   299520, 0x07e6d466
-0,        100,        100,        1,   299520, 0x4e66e1d4
-0,        101,        101,        1,   299520, 0x80aa6be6
-0,        102,        102,        1,   299520, 0xa4564be8
-0,        103,        103,        1,   299520, 0x7d34e443
-0,        104,        104,        1,   299520, 0xd5a08c86
-0,        105,        105,        1,   299520, 0xa73e63e8
-0,        106,        106,        1,   299520, 0x93937eb2
-0,        107,        107,        1,   299520, 0x0c08ba8f
-0,        108,        108,        1,   299520, 0x1d6b1a8c
-0,        109,        109,        1,   299520, 0x2e0272b4
-0,        110,        110,        1,   299520, 0x47177676
-0,        111,        111,        1,   299520, 0x6af7ffce
-0,        112,        112,        1,   299520, 0x0564a4bc
-0,        113,        113,        1,   299520, 0x7f664100
-0,        114,        114,        1,   299520, 0x6decd6ae
-0,        115,        115,        1,   299520, 0xb2d94adc
-0,        116,        116,        1,   299520, 0x55d33809
-0,        117,        117,        1,   299520, 0x5b126674
-0,        118,        118,        1,   299520, 0xd25d5750
-0,        119,        119,        1,   299520, 0x789a7f89
-0,        120,        120,        1,   299520, 0xdd082ab2
-0,        121,        121,        1,   299520, 0x3e6132ee
-0,        122,        122,        1,   299520, 0xe48209ca
-0,        123,        123,        1,   299520, 0x707d3b24
-0,        124,        124,        1,   299520, 0x8af19539
-0,        125,        125,        1,   299520, 0x0bbb4c38
-0,        126,        126,        1,   299520, 0xaaba4bd6
-0,        127,        127,        1,   299520, 0xa325d79e
-0,        128,        128,        1,   299520, 0x2bd4b64a
-0,        129,        129,        1,   299520, 0xab0c59a7
-0,        130,        130,        1,   299520, 0x260a56fc
-0,        131,        131,        1,   299520, 0xa1a55847
-0,        132,        132,        1,   299520, 0xa1a55847
-0,        133,        133,        1,   299520, 0x01438514
-0,        134,        134,        1,   299520, 0xa511e8bd
-0,        135,        135,        1,   299520, 0x7ebfd5b9
-0,        136,        136,        1,   299520, 0xdf4f1365
-0,        137,        137,        1,   299520, 0x6266911a
-0,        138,        138,        1,   299520, 0xe8eefcab
-0,        139,        139,        1,   299520, 0x7e74ca0d
-0,        140,        140,        1,   299520, 0x4b21d349
-0,        141,        141,        1,   299520, 0xa8b9ef41
-0,        142,        142,        1,   299520, 0x3187ee5b
-0,        143,        143,        1,   299520, 0x3fadb935
-0,        144,        144,        1,   299520, 0x8dca0391
-0,        145,        145,        1,   299520, 0x68215cc6
-0,        146,        146,        1,   299520, 0x7c81f366
-0,        147,        147,        1,   299520, 0x1a976381
-0,        148,        148,        1,   299520, 0x8ac095f4
-0,        149,        149,        1,   299520, 0xf5f8752b
-0,        150,        150,        1,   299520, 0xd8c03c80
-0,        151,        151,        1,   299520, 0x445a2e07
-0,        152,        152,        1,   299520, 0xddb83c6f
-0,        153,        153,        1,   299520, 0xc6dfe76a
-0,        154,        154,        1,   299520, 0x860a120f
-0,        155,        155,        1,   299520, 0x1ec91a95
-0,        156,        156,        1,   299520, 0x0180cc49
-0,        157,        157,        1,   299520, 0x63a115e3
-0,        158,        158,        1,   299520, 0x8848e971
-0,        159,        159,        1,   299520, 0x49246622
-0,        160,        160,        1,   299520, 0x3169db32
-0,        161,        161,        1,   299520, 0xcf01d8a3
-0,        162,        162,        1,   299520, 0x57a1a9c1
-0,        163,        163,        1,   299520, 0x517670eb
-0,        164,        164,        1,   299520, 0x4e2e6b5a
-0,        165,        165,        1,   299520, 0x06240a68
-0,        166,        166,        1,   299520, 0xa0d076a1
-0,        167,        167,        1,   299520, 0xb73c4515
-0,        168,        168,        1,   299520, 0x9f523268
-0,        169,        169,        1,   299520, 0x6fdcc6a2
-0,        170,        170,        1,   299520, 0xf3f5b69f
-0,        171,        171,        1,   299520, 0xce33a286
-0,        172,        172,        1,   299520, 0xce46e834
-0,        173,        173,        1,   299520, 0x14a6fe0d
-0,        174,        174,        1,   299520, 0x39a8145f
-0,        175,        175,        1,   299520, 0x91981d47
-0,        176,        176,        1,   299520, 0x1507d9be
-0,        177,        177,        1,   299520, 0x4525d4a2
-0,        178,        178,        1,   299520, 0x95e058ab
-0,        179,        179,        1,   299520, 0x8de2438a
-0,        180,        180,        1,   299520, 0xf43dc0ff
-0,        181,        181,        1,   299520, 0xaf232f4b
-0,        182,        182,        1,   299520, 0x8adabd81
-0,        183,        183,        1,   299520, 0x1e837b72
-0,        184,        184,        1,   299520, 0xb79f811d
-0,        185,        185,        1,   299520, 0x1532fb05
-0,        186,        186,        1,   299520, 0x2e3f6341
-0,        187,        187,        1,   299520, 0x10c82269
-0,        188,        188,        1,   299520, 0x8c39bd0c
-0,        189,        189,        1,   299520, 0x64fefe7b
-0,        190,        190,        1,   299520, 0x3ef6d5c7
-0,        191,        191,        1,   299520, 0x571c1edc
-0,        192,        192,        1,   299520, 0xe9e1584c
-0,        193,        193,        1,   299520, 0xd150a0db
-0,        194,        194,        1,   299520, 0x5d140f2d
-0,        195,        195,        1,   299520, 0xea00f302
-0,        196,        196,        1,   299520, 0xdd4e0fc4
-0,        197,        197,        1,   299520, 0x51c760fa
-0,        198,        198,        1,   299520, 0x68d5d26e
-0,        199,        199,        1,   299520, 0xde594a02
-0,        200,        200,        1,   299520, 0xac6d361a
-0,        201,        201,        1,   299520, 0xef6506ae
-0,        202,        202,        1,   299520, 0x744737a8
-0,        203,        203,        1,   299520, 0x2bd0834b
-0,        204,        204,        1,   299520, 0x348a8d0f
-0,        205,        205,        1,   299520, 0x93e165c8
-0,        206,        206,        1,   299520, 0x208d305c
-0,        207,        207,        1,   299520, 0xb927ed9a
-0,        208,        208,        1,   299520, 0xd252b13a
-0,        209,        209,        1,   299520, 0x11a59b2d
-0,        210,        210,        1,   299520, 0xc27785d0
-0,        211,        211,        1,   299520, 0x5c654cb5
-0,        212,        212,        1,   299520, 0x3d03a387
-0,        213,        213,        1,   299520, 0xdb0dc19d
-0,        214,        214,        1,   299520, 0x2ef3bbba
-0,        215,        215,        1,   299520, 0x7d36cd79
-0,        216,        216,        1,   299520, 0xa9ceca1e
-0,        217,        217,        1,   299520, 0x33db4d99
-0,        218,        218,        1,   299520, 0x8d28a55e
-0,        219,        219,        1,   299520, 0x554864a6
-0,        220,        220,        1,   299520, 0x6a336557
-0,        221,        221,        1,   299520, 0xd2285832
-0,        222,        222,        1,   299520, 0x9509f5f8
-0,        223,        223,        1,   299520, 0x8e479b03
-0,        224,        224,        1,   299520, 0x9513a8c3
-0,        225,        225,        1,   299520, 0x81080fac
-0,        226,        226,        1,   299520, 0x6c447b69
-0,        227,        227,        1,   299520, 0xbf4c2fbd
-0,        228,        228,        1,   299520, 0x1a77306e
-0,        229,        229,        1,   299520, 0xd485864b
-0,        230,        230,        1,   299520, 0x4e87b787
-0,        231,        231,        1,   299520, 0xe28e7153
-0,        232,        232,        1,   299520, 0x2ab24b9b
-0,        233,        233,        1,   299520, 0xffcb7357
-0,        234,        234,        1,   299520, 0x5e1e2b7e
-0,        235,        235,        1,   299520, 0x58d39e6d
-0,        236,        236,        1,   299520, 0x4a2b836a
-0,        237,        237,        1,   299520, 0xa1728e1e
-0,        238,        238,        1,   299520, 0x33e5bdd4
-0,        239,        239,        1,   299520, 0x3b144d98
-0,        240,        240,        1,   299520, 0xe72c4de2
-0,        241,        241,        1,   299520, 0x031350cb
-0,        242,        242,        1,   299520, 0x146fba58
-0,        243,        243,        1,   299520, 0x1b6679c7
-0,        244,        244,        1,   299520, 0x27e9d545
-0,        245,        245,        1,   299520, 0x5105beeb
-0,        246,        246,        1,   299520, 0x80284fd3
-0,        247,        247,        1,   299520, 0x426a5d65
-0,        248,        248,        1,   299520, 0xdcc33f89
-0,        249,        249,        1,   299520, 0x29e805ec
-0,        250,        250,        1,   299520, 0x89a09ed9
-0,        251,        251,        1,   299520, 0x60ad258c
-0,        252,        252,        1,   299520, 0xb44ee9b1
-0,        253,        253,        1,   299520, 0x184d6a88
-0,        254,        254,        1,   299520, 0xb4c8cefe
-0,        255,        255,        1,   299520, 0x358a0407
-0,        256,        256,        1,   299520, 0xa5cb97eb
-0,        257,        257,        1,   299520, 0x3d6a096e
-0,        258,        258,        1,   299520, 0xcb266e78
+0,          1,          1,        1,   299520, 0x54e6ef0a
+0,          2,          2,        1,   299520, 0x7a4d46c5
+0,          3,          3,        1,   299520, 0xccd57f4e
+0,          4,          4,        1,   299520, 0xbe0cb48d
+0,          5,          5,        1,   299520, 0x10e7b49f
+0,          6,          6,        1,   299520, 0x81aa72e2
+0,          7,          7,        1,   299520, 0x5bf7b51f
+0,          8,          8,        1,   299520, 0xfcedee4a
+0,          9,          9,        1,   299520, 0x586c99b6
+0,         10,         10,        1,   299520, 0x414ca13c
+0,         11,         11,        1,   299520, 0x3f0162f2
+0,         12,         12,        1,   299520, 0x4d450c05
+0,         13,         13,        1,   299520, 0x0a58bd84
+0,         14,         14,        1,   299520, 0x26e8394d
+0,         15,         15,        1,   299520, 0xfd78121b
+0,         16,         16,        1,   299520, 0x6afeaf44
+0,         17,         17,        1,   299520, 0x3e9a9270
+0,         18,         18,        1,   299520, 0x58b889ca
+0,         19,         19,        1,   299520, 0x0245ba62
+0,         20,         20,        1,   299520, 0xddecc5ab
+0,         21,         21,        1,   299520, 0x32cf3cd9
+0,         22,         22,        1,   299520, 0x5c0a0440
+0,         23,         23,        1,   299520, 0x9d3e2fee
+0,         24,         24,        1,   299520, 0x2894c708
+0,         25,         25,        1,   299520, 0x25be67d5
+0,         26,         26,        1,   299520, 0xe3ece9d6
+0,         27,         27,        1,   299520, 0xcc98e38b
+0,         28,         28,        1,   299520, 0xc448c794
+0,         29,         29,        1,   299520, 0xb4f75575
+0,         30,         30,        1,   299520, 0xac74a437
+0,         31,         31,        1,   299520, 0x09c7f2e2
+0,         32,         32,        1,   299520, 0xbfaed8ab
+0,         33,         33,        1,   299520, 0xb077d700
+0,         34,         34,        1,   299520, 0x6efa0545
+0,         35,         35,        1,   299520, 0xb8c1802d
+0,         36,         36,        1,   299520, 0x794774f8
+0,         37,         37,        1,   299520, 0x1098f4ff
+0,         38,         38,        1,   299520, 0x80ab8bfc
+0,         39,         39,        1,   299520, 0xc324c3bc
+0,         40,         40,        1,   299520, 0x1eee77cd
+0,         41,         41,        1,   299520, 0x7147e72e
+0,         42,         42,        1,   299520, 0x1a34883c
+0,         43,         43,        1,   299520, 0x74e93e31
+0,         44,         44,        1,   299520, 0x89410382
+0,         45,         45,        1,   299520, 0xfcce0ce1
+0,         46,         46,        1,   299520, 0x07bb33c6
+0,         47,         47,        1,   299520, 0xc1ee7318
+0,         48,         48,        1,   299520, 0xd1c4bd2d
+0,         49,         49,        1,   299520, 0xa670cfae
+0,         50,         50,        1,   299520, 0x718de79b
+0,         51,         51,        1,   299520, 0x85e40b78
+0,         52,         52,        1,   299520, 0x15362e72
+0,         53,         53,        1,   299520, 0xc6e523fa
+0,         54,         54,        1,   299520, 0x3e536edd
+0,         55,         55,        1,   299520, 0x9312996e
+0,         56,         56,        1,   299520, 0x9456d53c
+0,         57,         57,        1,   299520, 0x7bc01398
+0,         58,         58,        1,   299520, 0x5a40bcb4
+0,         59,         59,        1,   299520, 0xcfe126ce
+0,         60,         60,        1,   299520, 0xd9e1adf1
+0,         61,         61,        1,   299520, 0x9027b1ae
+0,         62,         62,        1,   299520, 0x4c1372fb
+0,         63,         63,        1,   299520, 0xe475a00b
+0,         64,         64,        1,   299520, 0x945bc646
+0,         65,         65,        1,   299520, 0xc33dbab3
+0,         66,         66,        1,   299520, 0x9e4afb82
+0,         67,         67,        1,   299520, 0x1bffa858
+0,         68,         68,        1,   299520, 0x3bc78ad7
+0,         69,         69,        1,   299520, 0xa096e683
+0,         70,         70,        1,   299520, 0xb889aa23
+0,         71,         71,        1,   299520, 0x8ffad857
+0,         72,         72,        1,   299520, 0x59d3cc7c
+0,         73,         73,        1,   299520, 0x47d1377a
+0,         74,         74,        1,   299520, 0xea73e864
+0,         75,         75,        1,   299520, 0x0994bd5c
+0,         76,         76,        1,   299520, 0xdf779d85
+0,         77,         77,        1,   299520, 0x8238cfa7
+0,         78,         78,        1,   299520, 0x8f2e94cc
+0,         79,         79,        1,   299520, 0x9e0b0df8
+0,         80,         80,        1,   299520, 0x98ac1ce5
+0,         81,         81,        1,   299520, 0xc1c293ed
+0,         82,         82,        1,   299520, 0x1f1dfedb
+0,         83,         83,        1,   299520, 0xe7297d56
+0,         84,         84,        1,   299520, 0xa1390726
+0,         85,         85,        1,   299520, 0xf0e828e8
+0,         86,         86,        1,   299520, 0x108b8291
+0,         87,         87,        1,   299520, 0xd8830efb
+0,         88,         88,        1,   299520, 0xeee3d2f0
+0,         89,         89,        1,   299520, 0xa35d5b29
+0,         90,         90,        1,   299520, 0xa14d0840
+0,         91,         91,        1,   299520, 0xfa894a56
+0,         92,         92,        1,   299520, 0xd50005b5
+0,         93,         93,        1,   299520, 0xba625134
+0,         94,         94,        1,   299520, 0xce7dd782
+0,         95,         95,        1,   299520, 0x9e04e32f
+0,         96,         96,        1,   299520, 0x07e6d466
+0,         97,         97,        1,   299520, 0x4e66e1d4
+0,         98,         98,        1,   299520, 0x80aa6be6
+0,         99,         99,        1,   299520, 0xa4564be8
+0,        100,        100,        1,   299520, 0x7d34e443
+0,        101,        101,        1,   299520, 0xd5a08c86
+0,        102,        102,        1,   299520, 0xa73e63e8
+0,        103,        103,        1,   299520, 0x93937eb2
+0,        104,        104,        1,   299520, 0x0c08ba8f
+0,        105,        105,        1,   299520, 0x1d6b1a8c
+0,        106,        106,        1,   299520, 0x2e0272b4
+0,        107,        107,        1,   299520, 0x47177676
+0,        108,        108,        1,   299520, 0x6af7ffce
+0,        109,        109,        1,   299520, 0x0564a4bc
+0,        110,        110,        1,   299520, 0x7f664100
+0,        111,        111,        1,   299520, 0x6decd6ae
+0,        112,        112,        1,   299520, 0xb2d94adc
+0,        113,        113,        1,   299520, 0x55d33809
+0,        114,        114,        1,   299520, 0x5b126674
+0,        115,        115,        1,   299520, 0xd25d5750
+0,        116,        116,        1,   299520, 0x789a7f89
+0,        117,        117,        1,   299520, 0xdd082ab2
+0,        118,        118,        1,   299520, 0x3e6132ee
+0,        119,        119,        1,   299520, 0xe48209ca
+0,        120,        120,        1,   299520, 0x707d3b24
+0,        121,        121,        1,   299520, 0x8af19539
+0,        122,        122,        1,   299520, 0x0bbb4c38
+0,        123,        123,        1,   299520, 0xaaba4bd6
+0,        124,        124,        1,   299520, 0xa325d79e
+0,        125,        125,        1,   299520, 0x2bd4b64a
+0,        126,        126,        1,   299520, 0xab0c59a7
+0,        127,        127,        1,   299520, 0x260a56fc
+0,        128,        128,        1,   299520, 0xa1a55847
+0,        129,        129,        1,   299520, 0xa1a55847
+0,        130,        130,        1,   299520, 0x01438514
+0,        131,        131,        1,   299520, 0xa511e8bd
+0,        132,        132,        1,   299520, 0x7ebfd5b9
+0,        133,        133,        1,   299520, 0xdf4f1365
+0,        134,        134,        1,   299520, 0x6266911a
+0,        135,        135,        1,   299520, 0xe8eefcab
+0,        136,        136,        1,   299520, 0x7e74ca0d
+0,        137,        137,        1,   299520, 0x4b21d349
+0,        138,        138,        1,   299520, 0xa8b9ef41
+0,        139,        139,        1,   299520, 0x3187ee5b
+0,        140,        140,        1,   299520, 0x3fadb935
+0,        141,        141,        1,   299520, 0x8dca0391
+0,        142,        142,        1,   299520, 0x68215cc6
+0,        143,        143,        1,   299520, 0x7c81f366
+0,        144,        144,        1,   299520, 0x1a976381
+0,        145,        145,        1,   299520, 0x8ac095f4
+0,        146,        146,        1,   299520, 0xf5f8752b
+0,        147,        147,        1,   299520, 0xd8c03c80
+0,        148,        148,        1,   299520, 0x445a2e07
+0,        149,        149,        1,   299520, 0xddb83c6f
+0,        150,        150,        1,   299520, 0xc6dfe76a
+0,        151,        151,        1,   299520, 0x860a120f
+0,        152,        152,        1,   299520, 0x1ec91a95
+0,        153,        153,        1,   299520, 0x0180cc49
+0,        154,        154,        1,   299520, 0x63a115e3
+0,        155,        155,        1,   299520, 0x8848e971
+0,        156,        156,        1,   299520, 0x49246622
+0,        157,        157,        1,   299520, 0x3169db32
+0,        158,        158,        1,   299520, 0xcf01d8a3
+0,        159,        159,        1,   299520, 0x57a1a9c1
+0,        160,        160,        1,   299520, 0x517670eb
+0,        161,        161,        1,   299520, 0x4e2e6b5a
+0,        162,        162,        1,   299520, 0x06240a68
+0,        163,        163,        1,   299520, 0xa0d076a1
+0,        164,        164,        1,   299520, 0xb73c4515
+0,        165,        165,        1,   299520, 0x9f523268
+0,        166,        166,        1,   299520, 0x6fdcc6a2
+0,        167,        167,        1,   299520, 0xf3f5b69f
+0,        168,        168,        1,   299520, 0xce33a286
+0,        169,        169,        1,   299520, 0xce46e834
+0,        170,        170,        1,   299520, 0x14a6fe0d
+0,        171,        171,        1,   299520, 0x39a8145f
+0,        172,        172,        1,   299520, 0x91981d47
+0,        173,        173,        1,   299520, 0x1507d9be
+0,        174,        174,        1,   299520, 0x4525d4a2
+0,        175,        175,        1,   299520, 0x95e058ab
+0,        176,        176,        1,   299520, 0x8de2438a
+0,        177,        177,        1,   299520, 0xf43dc0ff
+0,        178,        178,        1,   299520, 0xaf232f4b
+0,        179,        179,        1,   299520, 0x8adabd81
+0,        180,        180,        1,   299520, 0x1e837b72
+0,        181,        181,        1,   299520, 0xb79f811d
+0,        182,        182,        1,   299520, 0x1532fb05
+0,        183,        183,        1,   299520, 0x2e3f6341
+0,        184,        184,        1,   299520, 0x10c82269
+0,        185,        185,        1,   299520, 0x8c39bd0c
+0,        186,        186,        1,   299520, 0x64fefe7b
+0,        187,        187,        1,   299520, 0x3ef6d5c7
+0,        188,        188,        1,   299520, 0x571c1edc
+0,        189,        189,        1,   299520, 0xe9e1584c
+0,        190,        190,        1,   299520, 0xd150a0db
+0,        191,        191,        1,   299520, 0x5d140f2d
+0,        192,        192,        1,   299520, 0xea00f302
+0,        193,        193,        1,   299520, 0xdd4e0fc4
+0,        194,        194,        1,   299520, 0x51c760fa
+0,        195,        195,        1,   299520, 0x68d5d26e
+0,        196,        196,        1,   299520, 0xde594a02
+0,        197,        197,        1,   299520, 0xac6d361a
+0,        198,        198,        1,   299520, 0xef6506ae
+0,        199,        199,        1,   299520, 0x744737a8
+0,        200,        200,        1,   299520, 0x2bd0834b
+0,        201,        201,        1,   299520, 0x348a8d0f
+0,        202,        202,        1,   299520, 0x93e165c8
+0,        203,        203,        1,   299520, 0x208d305c
+0,        204,        204,        1,   299520, 0xb927ed9a
+0,        205,        205,        1,   299520, 0xd252b13a
+0,        206,        206,        1,   299520, 0x11a59b2d
+0,        207,        207,        1,   299520, 0xc27785d0
+0,        208,        208,        1,   299520, 0x5c654cb5
+0,        209,        209,        1,   299520, 0x3d03a387
+0,        210,        210,        1,   299520, 0xdb0dc19d
+0,        211,        211,        1,   299520, 0x2ef3bbba
+0,        212,        212,        1,   299520, 0x7d36cd79
+0,        213,        213,        1,   299520, 0xa9ceca1e
+0,        214,        214,        1,   299520, 0x33db4d99
+0,        215,        215,        1,   299520, 0x8d28a55e
+0,        216,        216,        1,   299520, 0x554864a6
+0,        217,        217,        1,   299520, 0x6a336557
+0,        218,        218,        1,   299520, 0xd2285832
+0,        219,        219,        1,   299520, 0x9509f5f8
+0,        220,        220,        1,   299520, 0x8e479b03
+0,        221,        221,        1,   299520, 0x9513a8c3
+0,        222,        222,        1,   299520, 0x81080fac
+0,        223,        223,        1,   299520, 0x6c447b69
+0,        224,        224,        1,   299520, 0xbf4c2fbd
+0,        225,        225,        1,   299520, 0x1a77306e
+0,        226,        226,        1,   299520, 0xd485864b
+0,        227,        227,        1,   299520, 0x4e87b787
+0,        228,        228,        1,   299520, 0xe28e7153
+0,        229,        229,        1,   299520, 0x2ab24b9b
+0,        230,        230,        1,   299520, 0xffcb7357
+0,        231,        231,        1,   299520, 0x5e1e2b7e
+0,        232,        232,        1,   299520, 0x58d39e6d
+0,        233,        233,        1,   299520, 0x4a2b836a
+0,        234,        234,        1,   299520, 0xa1728e1e
+0,        235,        235,        1,   299520, 0x33e5bdd4
+0,        236,        236,        1,   299520, 0x3b144d98
+0,        237,        237,        1,   299520, 0xe72c4de2
+0,        238,        238,        1,   299520, 0x031350cb
+0,        239,        239,        1,   299520, 0x146fba58
+0,        240,        240,        1,   299520, 0x1b6679c7
+0,        241,        241,        1,   299520, 0x27e9d545
+0,        242,        242,        1,   299520, 0x5105beeb
+0,        243,        243,        1,   299520, 0x80284fd3
+0,        244,        244,        1,   299520, 0x426a5d65
+0,        245,        245,        1,   299520, 0xdcc33f89
+0,        246,        246,        1,   299520, 0x29e805ec
+0,        247,        247,        1,   299520, 0x89a09ed9
+0,        248,        248,        1,   299520, 0x60ad258c
+0,        249,        249,        1,   299520, 0xb44ee9b1
+0,        250,        250,        1,   299520, 0x184d6a88
+0,        251,        251,        1,   299520, 0xb4c8cefe
+0,        252,        252,        1,   299520, 0x358a0407
+0,        253,        253,        1,   299520, 0xa5cb97eb
+0,        254,        254,        1,   299520, 0x3d6a096e
+0,        255,        255,        1,   299520, 0xcb266e78
diff --git a/tests/ref/fate/hevc-conformance-cip_B_NEC_3 b/tests/ref/fate/hevc-conformance-cip_B_NEC_3
index 016f0f1ee1..c8dfedf7b2 100644
--- a/tests/ref/fate/hevc-conformance-cip_B_NEC_3
+++ b/tests/ref/fate/hevc-conformance-cip_B_NEC_3
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xcbda260f
 0,          1,          1,        1,   149760, 0xbd8d32a9
 0,          2,          2,        1,   149760, 0x39562006
diff --git a/tests/ref/fate/hevc-conformance-ipcm_A_NEC_3 b/tests/ref/fate/hevc-conformance-ipcm_A_NEC_3
index 145f590872..4d34d32ae2 100644
--- a/tests/ref/fate/hevc-conformance-ipcm_A_NEC_3
+++ b/tests/ref/fate/hevc-conformance-ipcm_A_NEC_3
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0x2356474c
diff --git a/tests/ref/fate/hevc-conformance-ipcm_B_NEC_3 b/tests/ref/fate/hevc-conformance-ipcm_B_NEC_3
index d917cbc41c..0dd1379ea8 100644
--- a/tests/ref/fate/hevc-conformance-ipcm_B_NEC_3
+++ b/tests/ref/fate/hevc-conformance-ipcm_B_NEC_3
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xc80d43f8
diff --git a/tests/ref/fate/hevc-conformance-ipcm_C_NEC_3 b/tests/ref/fate/hevc-conformance-ipcm_C_NEC_3
index 6c89cea38f..4bc3fc63ed 100644
--- a/tests/ref/fate/hevc-conformance-ipcm_C_NEC_3
+++ b/tests/ref/fate/hevc-conformance-ipcm_C_NEC_3
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xb92d38ee
diff --git a/tests/ref/fate/hevc-conformance-ipcm_D_NEC_3 b/tests/ref/fate/hevc-conformance-ipcm_D_NEC_3
index 2ccff0579f..23d7aaa9ee 100644
--- a/tests/ref/fate/hevc-conformance-ipcm_D_NEC_3
+++ b/tests/ref/fate/hevc-conformance-ipcm_D_NEC_3
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xa24d17f8
diff --git a/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2 b/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2
index 794c4acdd3..3f7d7809f8 100644
--- a/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2
+++ b/tests/ref/fate/hevc-conformance-ipcm_E_NEC_2
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 416x240
+#sar 0: 0/1
 0,          0,          0,        1,   149760, 0xf4582514
diff --git a/tests/ref/fate/hevc-extradata-reload b/tests/ref/fate/hevc-extradata-reload
index 9fcab7150d..b08754ed2b 100644
--- a/tests/ref/fate/hevc-extradata-reload
+++ b/tests/ref/fate/hevc-extradata-reload
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    24576, 0d01217c5d1ec6799643fc7d75ba2337
 0,          1,          1,        1,    24576, f73d9cca9b4c1765d0ead242c3f0c339
 0,          2,          2,        1,    24576, 39a8714d763c623ae7f6faae34e107d1
diff --git a/tests/ref/fate/hevc-paired-fields b/tests/ref/fate/hevc-paired-fields
new file mode 100644
index 0000000000..f2223e770b
--- /dev/null
+++ b/tests/ref/fate/hevc-paired-fields
@@ -0,0 +1,16 @@
+[FRAME]
+interlaced_frame=1
+top_field_first=1
+[/FRAME]
+[FRAME]
+interlaced_frame=1
+top_field_first=0
+[/FRAME]
+[FRAME]
+interlaced_frame=1
+top_field_first=1
+[/FRAME]
+[FRAME]
+interlaced_frame=1
+top_field_first=0
+[/FRAME]
diff --git a/tests/ref/fate/hevc-paramchange-yuv420p-yuv420p10 b/tests/ref/fate/hevc-paramchange-yuv420p-yuv420p10
index 16a6a3c586..73bf868cac 100644
--- a/tests/ref/fate/hevc-paramchange-yuv420p-yuv420p10
+++ b/tests/ref/fate/hevc-paramchange-yuv420p-yuv420p10
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1056x8440
+#sar 0: 0/1
 0,          0,          0,        1, 13368960, 0x830b3a1d
 0,          1,          1,        1, 13368960, 0x120ca009
 0,          2,          2,        1, 13368960, 0xc94e0d86
@@ -9,259 +13,259 @@
 0,          7,          7,        1, 13368960, 0x7832ef4e
 0,          8,          8,        1, 13368960, 0x328142e9
 0,          9,          9,        1, 13368960, 0xbe22f686
-0,         10,         10,        1, 13368960, 0xfdf78a41
-0,         11,         11,        1, 13368960, 0x8ea3a29e
-0,         12,         12,        1, 13368960, 0x10fc932f
-0,         13,         13,        1, 13368960, 0xaea485ff
-0,         14,         14,        1, 13368960, 0xd545d3c9
-0,         15,         15,        1, 13368960, 0x285d23be
-0,         16,         16,        1, 13368960, 0x21453f6a
-0,         17,         17,        1, 13368960, 0xc997240e
-0,         18,         18,        1, 13368960, 0xe4a6a4c9
-0,         19,         19,        1, 13368960, 0x645a04f4
-0,         20,         20,        1, 13368960, 0xf0868e8d
-0,         21,         21,        1, 13368960, 0x53e93a3c
-0,         22,         22,        1, 13368960, 0x9d0bf5c0
-0,         23,         23,        1, 13368960, 0xcff5f416
-0,         24,         24,        1, 13368960, 0xd30bf22e
-0,         25,         25,        1, 13368960, 0x9db94f89
-0,         26,         26,        1, 13368960, 0x32549fde
-0,         27,         27,        1, 13368960, 0xf842679a
-0,         28,         28,        1, 13368960, 0x057b893b
-0,         29,         29,        1, 13368960, 0x10308d96
-0,         30,         30,        1, 13368960, 0x2b92ad92
-0,         31,         31,        1, 13368960, 0xfaef4689
-0,         32,         32,        1, 13368960, 0x0d49ccb3
-0,         33,         33,        1, 13368960, 0x927f9fbf
-0,         34,         34,        1, 13368960, 0x424001ca
-0,         35,         35,        1, 13368960, 0x08651f52
-0,         36,         36,        1, 13368960, 0x95a60717
-0,         37,         37,        1, 13368960, 0x9571a4fc
-0,         38,         38,        1, 13368960, 0x958b479a
-0,         39,         39,        1, 13368960, 0xa93d2034
-0,         40,         40,        1, 13368960, 0x63568237
-0,         41,         41,        1, 13368960, 0x101fcc08
-0,         42,         42,        1, 13368960, 0xb4cd30ae
-0,         43,         43,        1, 13368960, 0x6b16a36e
-0,         44,         44,        1, 13368960, 0x16f462ba
-0,         45,         45,        1, 13368960, 0xfc6f6a4d
-0,         46,         46,        1, 13368960, 0x5801d227
-0,         47,         47,        1, 13368960, 0x4af661ba
-0,         48,         48,        1, 13368960, 0xb3f78825
-0,         49,         49,        1, 13368960, 0xccc5e616
-0,         50,         50,        1, 13368960, 0xf574dd62
-0,         51,         51,        1, 13368960, 0x5f82af98
-0,         52,         52,        1, 13368960, 0xe63f2bcf
-0,         53,         53,        1, 13368960, 0x407d7ee1
-0,         54,         54,        1, 13368960, 0xbdb7eeba
-0,         55,         55,        1, 13368960, 0x37c001c5
-0,         56,         56,        1, 13368960, 0x619414d1
-0,         57,         57,        1, 13368960, 0x82f8cf67
-0,         58,         58,        1, 13368960, 0x464ac4f3
-0,         59,         59,        1, 13368960, 0x78f9991a
-0,         60,         60,        1, 13368960, 0xeeddba5b
-0,         61,         61,        1, 13368960, 0x9426f039
-0,         62,         62,        1, 13368960, 0x2b418600
-0,         63,         63,        1, 13368960, 0xfc41210c
-0,         64,         64,        1, 13368960, 0xa191b118
-0,         65,         65,        1, 13368960, 0x9a3dec6a
-0,         66,         66,        1, 13368960, 0xd8e8b55a
-0,         67,         67,        1, 13368960, 0xb45b815a
-0,         68,         68,        1, 13368960, 0x86a91143
-0,         69,         69,        1, 13368960, 0x2b03221b
-0,         70,         70,        1, 13368960, 0x78aba843
-0,         71,         71,        1, 13368960, 0x6fe9268b
-0,         72,         72,        1, 13368960, 0x4ebe6005
-0,         73,         73,        1, 13368960, 0x5a66f82b
-0,         74,         74,        1, 13368960, 0x8a224cc6
-0,         75,         75,        1, 13368960, 0x8a224cc6
-0,         76,         76,        1, 13368960, 0x5a055a2f
-0,         77,         77,        1, 13368960, 0x5a055a2f
-0,         78,         78,        1, 13368960, 0x984ee1a4
-0,         79,         79,        1, 13368960, 0x0d65da82
-0,         80,         80,        1, 13368960, 0xcd7c4226
-0,         81,         81,        1, 13368960, 0x2896614e
-0,         82,         82,        1, 13368960, 0x997ddce1
-0,         83,         83,        1, 13368960, 0x3018e3d9
-0,         84,         84,        1, 13368960, 0xd01cb3bc
-0,         85,         85,        1, 13368960, 0x2f643612
-0,         86,         86,        1, 13368960, 0x23c2dfb3
-0,         87,         87,        1, 13368960, 0x23c2dfb3
-0,         88,         88,        1, 13368960, 0x57d69dd3
-0,         89,         89,        1, 13368960, 0xd270a0ab
-0,         90,         90,        1, 13368960, 0xa24e5c1e
-0,         91,         91,        1, 13368960, 0xc3c047b2
-0,         92,         92,        1, 13368960, 0x5a5b4eaa
-0,         93,         93,        1, 13368960, 0xd32c7a91
-0,         94,         94,        1, 13368960, 0x87ee6217
-0,         95,         95,        1, 13368960, 0xbe1e8641
-0,         96,         96,        1, 13368960, 0x88225cf9
-0,         97,         97,        1, 13368960, 0x41c1b776
-0,         98,         98,        1, 13368960, 0xc7cde7f4
-0,         99,         99,        1, 13368960, 0x31b8ac12
-0,        100,        100,        1, 13368960, 0x6c12322d
-0,        101,        101,        1, 13368960, 0xa3d4a8e4
-0,        102,        102,        1, 13368960, 0x6d62ade8
-0,        103,        103,        1, 13368960, 0x6d62ade8
-0,        104,        104,        1, 13368960, 0x3ede9b6f
-0,        105,        105,        1, 13368960, 0x56924e2b
-0,        106,        106,        1, 13368960, 0x8c25ee45
-0,        107,        107,        1, 13368960, 0xfc2e5e96
-0,        108,        108,        1, 13368960, 0x5fd3c9ce
-0,        109,        109,        1, 13368960, 0x51e9dd4d
-0,        110,        110,        1, 13368960, 0xd7b90558
-0,        111,        111,        1, 13368960, 0xfe185238
-0,        112,        112,        1, 13368960, 0x1be11174
-0,        113,        113,        1, 13368960, 0x16f9a81b
-0,        114,        114,        1, 13368960, 0x8533b2be
-0,        115,        115,        1, 13368960, 0xd8327426
-0,        116,        116,        1, 13368960, 0x7a6f3d80
-0,        117,        117,        1, 13368960, 0xeb879ea8
-0,        118,        118,        1, 13368960, 0x904da2b8
-0,        119,        119,        1, 13368960, 0xeed21ab9
-0,        120,        120,        1, 13368960, 0x9c5cf568
-0,        121,        121,        1, 13368960, 0x0bbe1a28
-0,        122,        122,        1, 13368960, 0xf2604543
-0,        123,        123,        1, 13368960, 0xf3d43846
-0,        124,        124,        1, 13368960, 0x9f768657
-0,        125,        125,        1, 13368960, 0x74b0d261
-0,        126,        126,        1, 13368960, 0x0f08ec8e
-0,        127,        127,        1, 13368960, 0xb77f9cb8
-0,        128,        128,        1, 13368960, 0x696c5bfa
-0,        129,        129,        1, 13368960, 0x4e99ddf6
-0,        130,        130,        1, 13368960, 0x229ecd66
-0,        131,        131,        1, 13368960, 0xd2b322d4
-0,        132,        132,        1, 13368960, 0x83d42180
-0,        133,        133,        1, 13368960, 0xb40d2508
-0,        134,        134,        1, 13368960, 0x35e92fa5
-0,        135,        135,        1, 13368960, 0x5aa2bec9
-0,        136,        136,        1, 13368960, 0x92be5044
-0,        137,        137,        1, 13368960, 0x6ae3f3a2
-0,        138,        138,        1, 13368960, 0xc76e7b05
-0,        139,        139,        1, 13368960, 0xc76e7b05
-0,        140,        140,        1, 13368960, 0xf04961fe
-0,        141,        141,        1, 13368960, 0x44ce69d1
-0,        142,        142,        1, 13368960, 0xf659fb8f
-0,        143,        143,        1, 13368960, 0x365ae456
-0,        144,        144,        1, 13368960, 0xa6dceffc
-0,        145,        145,        1, 13368960, 0x2dd12c22
-0,        146,        146,        1, 13368960, 0xb896e3f3
-0,        147,        147,        1, 13368960, 0xd6615b15
-0,        148,        148,        1, 13368960, 0xc375996b
-0,        149,        149,        1, 13368960, 0x89a06cbf
-0,        150,        150,        1, 13368960, 0x20d54f8b
-0,        151,        151,        1, 13368960, 0x955f4329
-0,        152,        152,        1, 13368960, 0x9c7e3906
-0,        153,        153,        1, 13368960, 0x449a63ea
-0,        154,        154,        1, 13368960, 0x62431d75
-0,        155,        155,        1, 13368960, 0xac52d9f3
-0,        156,        156,        1, 13368960, 0x57bef208
-0,        157,        157,        1, 13368960, 0x32f604d5
-0,        158,        158,        1, 13368960, 0x55b679c9
-0,        159,        159,        1, 13368960, 0x2003c55d
-0,        160,        160,        1, 13368960, 0x0e8d0111
-0,        161,        161,        1, 13368960, 0x4876f64d
-0,        162,        162,        1, 13368960, 0x44514a09
-0,        163,        163,        1, 13368960, 0x7ce81efd
-0,        164,        164,        1, 13368960, 0x2af740ab
-0,        165,        165,        1, 13368960, 0xbc52dca2
-0,        166,        166,        1, 13368960, 0x9ba679e2
-0,        167,        167,        1, 13368960, 0x4e9195e1
-0,        168,        168,        1, 13368960, 0x5078ae80
-0,        169,        169,        1, 13368960, 0xab823be0
-0,        170,        170,        1, 13368960, 0xc45a011e
-0,        171,        171,        1, 13368960, 0xb0a0beaf
-0,        172,        172,        1, 13368960, 0x0f1169a6
-0,        173,        173,        1, 13368960, 0x56d53564
-0,        174,        174,        1, 13368960, 0x93874837
-0,        175,        175,        1, 13368960, 0x2e4c3acf
-0,        176,        176,        1, 13368960, 0xf51f5beb
-0,        177,        177,        1, 13368960, 0x5ffffae0
-0,        178,        178,        1, 13368960, 0x3b1a3df9
-0,        179,        179,        1, 13368960, 0xfecd52e1
-0,        180,        180,        1, 13368960, 0xc84ec5c6
-0,        181,        181,        1, 13368960, 0xd033a6b4
-0,        182,        182,        1, 13368960, 0x18230ce6
-0,        183,        183,        1, 13368960, 0xa240d858
-0,        184,        184,        1, 13368960, 0x058d32ec
-0,        185,        185,        1, 13368960, 0x46e81bad
-0,        186,        186,        1, 13368960, 0x78a89b7d
-0,        187,        187,        1, 13368960, 0xf9a0b94e
-0,        188,        188,        1, 13368960, 0x34fdd579
-0,        189,        189,        1, 13368960, 0xd58f5aa2
-0,        190,        190,        1, 13368960, 0x4d957a13
-0,        191,        191,        1, 13368960, 0x0b233f2c
-0,        192,        192,        1, 13368960, 0xcc5471d5
-0,        193,        193,        1, 13368960, 0xcc5471d5
-0,        194,        194,        1, 13368960, 0xddccf2ea
-0,        195,        195,        1, 13368960, 0xddccf2ea
-0,        196,        196,        1, 13368960, 0x38290ed9
-0,        197,        197,        1, 13368960, 0x095f6f3a
-0,        198,        198,        1, 13368960, 0xe4c70f9f
-0,        199,        199,        1, 13368960, 0x695cd27d
-0,        200,        200,        1, 13368960, 0x98a15fcb
-0,        201,        201,        1, 13368960, 0x22a37600
-0,        202,        202,        1, 13368960, 0xa7bc5ddf
-0,        203,        203,        1, 13368960, 0x63778def
-0,        204,        204,        1, 13368960, 0xa7bc5ddf
-0,        205,        205,        1, 13368960, 0xcce44a22
-0,        206,        206,        1, 13368960, 0xe9e1e769
-0,        207,        207,        1, 13368960, 0x05c652e7
-0,        208,        208,        1, 13368960, 0xc075c9b0
-0,        209,        209,        1, 13368960, 0x6d674c85
-0,        210,        210,        1, 13368960, 0x57938439
-0,        211,        211,        1, 13368960, 0x28296abd
-0,        212,        212,        1, 13368960, 0xc29bd537
-0,        213,        213,        1, 13368960, 0xbb01f326
-0,        214,        214,        1, 13368960, 0x68f9366d
-0,        215,        215,        1, 13368960, 0x3b8f6d9a
-0,        216,        216,        1, 13368960, 0x26db944e
-0,        217,        217,        1, 13368960, 0x2f975635
-0,        218,        218,        1, 13368960, 0x4f8d15a2
-0,        219,        219,        1, 13368960, 0x3b773121
-0,        220,        220,        1, 13368960, 0x0e502331
-0,        221,        221,        1, 13368960, 0xffe3a0e9
-0,        222,        222,        1, 13368960, 0x443fa9fb
-0,        223,        223,        1, 13368960, 0xdc592fd0
-0,        224,        224,        1, 13368960, 0x88f537a3
-0,        225,        225,        1, 13368960, 0x99216d73
-0,        226,        226,        1, 13368960, 0x4809af2c
-0,        227,        227,        1, 13368960, 0x2dd56e6a
-0,        228,        228,        1, 13368960, 0x674cc602
-0,        229,        229,        1, 13368960, 0x08685038
-0,        230,        230,        1, 13368960, 0x4b4219f3
-0,        231,        231,        1, 13368960, 0xb850e27c
-0,        232,        232,        1, 13368960, 0xe3aca387
-0,        233,        233,        1, 13368960, 0x11c50e02
-0,        234,        234,        1, 13368960, 0xa14f9a7f
-0,        235,        235,        1, 13368960, 0x2407abdd
-0,        236,        236,        1, 13368960, 0xbe8cc86b
-0,        237,        237,        1, 13368960, 0x53f539b4
-0,        238,        238,        1, 13368960, 0x0d4c359c
-0,        239,        239,        1, 13368960, 0x3ed14dad
-0,        240,        240,        1, 13368960, 0xf4676505
-0,        241,        241,        1, 13368960, 0x6dade6bf
-0,        242,        242,        1, 13368960, 0x4390f1fa
-0,        243,        243,        1, 13368960, 0xd4ffd518
-0,        244,        244,        1, 13368960, 0x933b9c20
-0,        245,        245,        1, 13368960, 0xe586663a
-0,        246,        246,        1, 13368960, 0x4b3f1e0f
-0,        247,        247,        1, 13368960, 0xe99668e1
-0,        248,        248,        1, 13368960, 0x4967157b
-0,        249,        249,        1, 13368960, 0x443314db
-0,        250,        250,        1, 13368960, 0x83023744
-0,        251,        251,        1, 13368960, 0x35e8b4da
-0,        252,        252,        1, 13368960, 0xc2eeb60d
-0,        253,        253,        1, 13368960, 0x2df97afe
-0,        254,        254,        1, 13368960, 0x4f9eeab8
-0,        255,        255,        1, 13368960, 0x5cfa523d
-0,        256,        256,        1, 13368960, 0x4badc6b8
-0,        257,        257,        1, 13368960, 0xaa801786
-0,        258,        258,        1, 13368960, 0xca282526
-0,        259,        259,        1, 13368960, 0x3a93f0cc
-0,        260,        260,        1, 13368960, 0x290e550c
-0,        261,        261,        1, 13368960, 0x29a015d8
-0,        262,        262,        1, 13368960, 0x4e2f73d6
-0,        263,        263,        1, 13368960, 0xfa87495c
-0,        264,        264,        1, 13368960, 0xaca638a5
-0,        265,        265,        1, 13368960, 0xef22830f
+0,         10,         10,        1, 13368960, 0x9c4bc207
+0,         11,         11,        1, 13368960, 0x3c5ed3a8
+0,         12,         12,        1, 13368960, 0x2bbad24b
+0,         13,         13,        1, 13368960, 0x1673c4d9
+0,         14,         14,        1, 13368960, 0x2091113f
+0,         15,         15,        1, 13368960, 0xcf6d4fbc
+0,         16,         16,        1, 13368960, 0xd6568883
+0,         17,         17,        1, 13368960, 0xb28f6a46
+0,         18,         18,        1, 13368960, 0x2194e8aa
+0,         19,         19,        1, 13368960, 0xcf9c48ce
+0,         20,         20,        1, 13368960, 0xfc38b71e
+0,         21,         21,        1, 13368960, 0x95497860
+0,         22,         22,        1, 13368960, 0x18d43b46
+0,         23,         23,        1, 13368960, 0xb9e03612
+0,         24,         24,        1, 13368960, 0x0df619fa
+0,         25,         25,        1, 13368960, 0x941c823f
+0,         26,         26,        1, 13368960, 0x4df9ed34
+0,         27,         27,        1, 13368960, 0x6f09aec5
+0,         28,         28,        1, 13368960, 0x03dfcbb1
+0,         29,         29,        1, 13368960, 0x4a64c338
+0,         30,         30,        1, 13368960, 0xd33cf17a
+0,         31,         31,        1, 13368960, 0xc1a38b1b
+0,         32,         32,        1, 13368960, 0x38571158
+0,         33,         33,        1, 13368960, 0x1979e549
+0,         34,         34,        1, 13368960, 0x0c1f42e6
+0,         35,         35,        1, 13368960, 0x589267c1
+0,         36,         36,        1, 13368960, 0x77643e84
+0,         37,         37,        1, 13368960, 0x0b91e89c
+0,         38,         38,        1, 13368960, 0x5a627dc6
+0,         39,         39,        1, 13368960, 0xb1576053
+0,         40,         40,        1, 13368960, 0x9adbc4a1
+0,         41,         41,        1, 13368960, 0x4f6b0f4f
+0,         42,         42,        1, 13368960, 0x70bb7560
+0,         43,         43,        1, 13368960, 0x8c5de89e
+0,         44,         44,        1, 13368960, 0x3268ad70
+0,         45,         45,        1, 13368960, 0xef3caed4
+0,         46,         46,        1, 13368960, 0x71f817b9
+0,         47,         47,        1, 13368960, 0x645da999
+0,         48,         48,        1, 13368960, 0x928ecfad
+0,         49,         49,        1, 13368960, 0xb0d92ec8
+0,         50,         50,        1, 13368960, 0x165927df
+0,         51,         51,        1, 13368960, 0x08fffeed
+0,         52,         52,        1, 13368960, 0xae5b6e67
+0,         53,         53,        1, 13368960, 0x9865c501
+0,         54,         54,        1, 13368960, 0x7ffe38dd
+0,         55,         55,        1, 13368960, 0x27494a3d
+0,         56,         56,        1, 13368960, 0x4bd65d63
+0,         57,         57,        1, 13368960, 0x740c1991
+0,         58,         58,        1, 13368960, 0xc4dd13a5
+0,         59,         59,        1, 13368960, 0xda00e57e
+0,         60,         60,        1, 13368960, 0x49dd07ed
+0,         61,         61,        1, 13368960, 0x0abd3d38
+0,         62,         62,        1, 13368960, 0x5e4dd6c1
+0,         63,         63,        1, 13368960, 0x8003709b
+0,         64,         64,        1, 13368960, 0xc6890279
+0,         65,         65,        1, 13368960, 0x19873cc1
+0,         66,         66,        1, 13368960, 0x4b200ba0
+0,         67,         67,        1, 13368960, 0x4a1cd324
+0,         68,         68,        1, 13368960, 0x0c3067bd
+0,         69,         69,        1, 13368960, 0x8aaa7653
+0,         70,         70,        1, 13368960, 0xf80e0b5b
+0,         71,         71,        1, 13368960, 0x8b3994a7
+0,         72,         72,        1, 13368960, 0x9283add5
+0,         73,         73,        1, 13368960, 0x84c65370
+0,         74,         74,        1, 13368960, 0x861eb66f
+0,         75,         75,        1, 13368960, 0x861eb66f
+0,         76,         76,        1, 13368960, 0xb345c45f
+0,         77,         77,        1, 13368960, 0xb345c45f
+0,         78,         78,        1, 13368960, 0x610a4127
+0,         79,         79,        1, 13368960, 0x80243f40
+0,         80,         80,        1, 13368960, 0xf4759cb7
+0,         81,         81,        1, 13368960, 0x6590bcb9
+0,         82,         82,        1, 13368960, 0xccda37ba
+0,         83,         83,        1, 13368960, 0x63753eb2
+0,         84,         84,        1, 13368960, 0x6c9f0d49
+0,         85,         85,        1, 13368960, 0x65c8760b
+0,         86,         86,        1, 13368960, 0xf67331ae
+0,         87,         87,        1, 13368960, 0xf67331ae
+0,         88,         88,        1, 13368960, 0x04e4f2cf
+0,         89,         89,        1, 13368960, 0xce3bf739
+0,         90,         90,        1, 13368960, 0x37dfaf28
+0,         91,         91,        1, 13368960, 0x66439ac4
+0,         92,         92,        1, 13368960, 0xfccfa1bc
+0,         93,         93,        1, 13368960, 0x5bdfc263
+0,         94,         94,        1, 13368960, 0x65c4c237
+0,         95,         95,        1, 13368960, 0x17aad32b
+0,         96,         96,        1, 13368960, 0xa8dba25c
+0,         97,         97,        1, 13368960, 0x26c6fc9d
+0,         98,         98,        1, 13368960, 0x7e8b4357
+0,         99,         99,        1, 13368960, 0x1bb60730
+0,        100,        100,        1, 13368960, 0x7fa37b25
+0,        101,        101,        1, 13368960, 0xacc7fcf2
+0,        102,        102,        1, 13368960, 0x06a9f637
+0,        103,        103,        1, 13368960, 0x06a9f637
+0,        104,        104,        1, 13368960, 0xd875e692
+0,        105,        105,        1, 13368960, 0x6e4b9e1d
+0,        106,        106,        1, 13368960, 0x58cb3e45
+0,        107,        107,        1, 13368960, 0x9c5daea2
+0,        108,        108,        1, 13368960, 0x78d01454
+0,        109,        109,        1, 13368960, 0xd2122531
+0,        110,        110,        1, 13368960, 0xaf115288
+0,        111,        111,        1, 13368960, 0x17b09d6e
+0,        112,        112,        1, 13368960, 0xc7335c78
+0,        113,        113,        1, 13368960, 0x028bf70c
+0,        114,        114,        1, 13368960, 0x84c9f7ef
+0,        115,        115,        1, 13368960, 0x7151bb7d
+0,        116,        116,        1, 13368960, 0xe5a88164
+0,        117,        117,        1, 13368960, 0xd5e4e381
+0,        118,        118,        1, 13368960, 0xdb3be595
+0,        119,        119,        1, 13368960, 0x068a5b66
+0,        120,        120,        1, 13368960, 0x0eab39c8
+0,        121,        121,        1, 13368960, 0x0dc56563
+0,        122,        122,        1, 13368960, 0xbbf98dd0
+0,        123,        123,        1, 13368960, 0x5a487c5c
+0,        124,        124,        1, 13368960, 0xd33dc8a8
+0,        125,        125,        1, 13368960, 0x8527158b
+0,        126,        126,        1, 13368960, 0x20f2321a
+0,        127,        127,        1, 13368960, 0x2609d883
+0,        128,        128,        1, 13368960, 0x69b89df1
+0,        129,        129,        1, 13368960, 0x74d5246b
+0,        130,        130,        1, 13368960, 0x873e0eeb
+0,        131,        131,        1, 13368960, 0x90405f59
+0,        132,        132,        1, 13368960, 0x93125fd2
+0,        133,        133,        1, 13368960, 0xcbe963c1
+0,        134,        134,        1, 13368960, 0xe79c6347
+0,        135,        135,        1, 13368960, 0x6ffbf0fb
+0,        136,        136,        1, 13368960, 0x3ed97d05
+0,        137,        137,        1, 13368960, 0x724221bc
+0,        138,        138,        1, 13368960, 0x5c1baa66
+0,        139,        139,        1, 13368960, 0x5c1baa66
+0,        140,        140,        1, 13368960, 0xbd3690df
+0,        141,        141,        1, 13368960, 0x52a5947d
+0,        142,        142,        1, 13368960, 0xd73732c8
+0,        143,        143,        1, 13368960, 0x4356196a
+0,        144,        144,        1, 13368960, 0xef7e1e3f
+0,        145,        145,        1, 13368960, 0xa3d76323
+0,        146,        146,        1, 13368960, 0x01751d58
+0,        147,        147,        1, 13368960, 0xd0ef9115
+0,        148,        148,        1, 13368960, 0x2e09d119
+0,        149,        149,        1, 13368960, 0x09d7a785
+0,        150,        150,        1, 13368960, 0xb93189a9
+0,        151,        151,        1, 13368960, 0xd8277b99
+0,        152,        152,        1, 13368960, 0xf3b8766a
+0,        153,        153,        1, 13368960, 0x782e9fa1
+0,        154,        154,        1, 13368960, 0x36d4601e
+0,        155,        155,        1, 13368960, 0x86f70f8c
+0,        156,        156,        1, 13368960, 0xcc7f2c1d
+0,        157,        157,        1, 13368960, 0xe83641fc
+0,        158,        158,        1, 13368960, 0x1d81af8a
+0,        159,        159,        1, 13368960, 0x83c2fe6c
+0,        160,        160,        1, 13368960, 0x3e324390
+0,        161,        161,        1, 13368960, 0xd00235b3
+0,        162,        162,        1, 13368960, 0xd1e8873a
+0,        163,        163,        1, 13368960, 0x7d8f603a
+0,        164,        164,        1, 13368960, 0x76107866
+0,        165,        165,        1, 13368960, 0x79f71d19
+0,        166,        166,        1, 13368960, 0x5ae7b71d
+0,        167,        167,        1, 13368960, 0xeb0acd6e
+0,        168,        168,        1, 13368960, 0x3400e989
+0,        169,        169,        1, 13368960, 0xaa5f7ae6
+0,        170,        170,        1, 13368960, 0xfc294222
+0,        171,        171,        1, 13368960, 0xc95000e2
+0,        172,        172,        1, 13368960, 0x8525afaf
+0,        173,        173,        1, 13368960, 0x02e87e93
+0,        174,        174,        1, 13368960, 0x84de93e2
+0,        175,        175,        1, 13368960, 0xc96984ed
+0,        176,        176,        1, 13368960, 0xf2bba506
+0,        177,        177,        1, 13368960, 0x580a43bd
+0,        178,        178,        1, 13368960, 0xa0768ffe
+0,        179,        179,        1, 13368960, 0x6438a4e6
+0,        180,        180,        1, 13368960, 0x93be17fb
+0,        181,        181,        1, 13368960, 0x3ae701f8
+0,        182,        182,        1, 13368960, 0xdd915885
+0,        183,        183,        1, 13368960, 0x72fd266b
+0,        184,        184,        1, 13368960, 0xb4278a8e
+0,        185,        185,        1, 13368960, 0x3c48692b
+0,        186,        186,        1, 13368960, 0x44dced17
+0,        187,        187,        1, 13368960, 0x75091091
+0,        188,        188,        1, 13368960, 0x5c3e2aeb
+0,        189,        189,        1, 13368960, 0xb867b21b
+0,        190,        190,        1, 13368960, 0x4c54d3df
+0,        191,        191,        1, 13368960, 0x513a925d
+0,        192,        192,        1, 13368960, 0x1413cd87
+0,        193,        193,        1, 13368960, 0x1413cd87
+0,        194,        194,        1, 13368960, 0x3d18513f
+0,        195,        195,        1, 13368960, 0x3d18513f
+0,        196,        196,        1, 13368960, 0x97666d1f
+0,        197,        197,        1, 13368960, 0xc650d2fb
+0,        198,        198,        1, 13368960, 0x506d7298
+0,        199,        199,        1, 13368960, 0x727835f3
+0,        200,        200,        1, 13368960, 0xbd01cccf
+0,        201,        201,        1, 13368960, 0x9903d82f
+0,        202,        202,        1, 13368960, 0x365cccf3
+0,        203,        203,        1, 13368960, 0x6fe5fa0e
+0,        204,        204,        1, 13368960, 0x365cccf3
+0,        205,        205,        1, 13368960, 0x6f3bbbe8
+0,        206,        206,        1, 13368960, 0x15e1563c
+0,        207,        207,        1, 13368960, 0x92b7c586
+0,        208,        208,        1, 13368960, 0x06303a2b
+0,        209,        209,        1, 13368960, 0x6821a67f
+0,        210,        210,        1, 13368960, 0x53dcf376
+0,        211,        211,        1, 13368960, 0x853cca77
+0,        212,        212,        1, 13368960, 0x4990374c
+0,        213,        213,        1, 13368960, 0x96a45ba2
+0,        214,        214,        1, 13368960, 0x33119f81
+0,        215,        215,        1, 13368960, 0x98bcd5cd
+0,        216,        216,        1, 13368960, 0xfe96fda5
+0,        217,        217,        1, 13368960, 0xf299be0f
+0,        218,        218,        1, 13368960, 0xa986733f
+0,        219,        219,        1, 13368960, 0xe95f90f7
+0,        220,        220,        1, 13368960, 0xbc388307
+0,        221,        221,        1, 13368960, 0x9f85ff25
+0,        222,        222,        1, 13368960, 0xec8200e0
+0,        223,        223,        1, 13368960, 0x508b9054
+0,        224,        224,        1, 13368960, 0x96a4975f
+0,        225,        225,        1, 13368960, 0xe583cf82
+0,        226,        226,        1, 13368960, 0xdb930543
+0,        227,        227,        1, 13368960, 0x4359caa5
+0,        228,        228,        1, 13368960, 0x6eb2243b
+0,        229,        229,        1, 13368960, 0xb0b2afd0
+0,        230,        230,        1, 13368960, 0x6b546e73
+0,        231,        231,        1, 13368960, 0x9e3d3798
+0,        232,        232,        1, 13368960, 0xb5c6fd40
+0,        233,        233,        1, 13368960, 0x61ca65a9
+0,        234,        234,        1, 13368960, 0x01c5eb8d
+0,        235,        235,        1, 13368960, 0x02b9f965
+0,        236,        236,        1, 13368960, 0xf8250f5f
+0,        237,        237,        1, 13368960, 0x29ca8680
+0,        238,        238,        1, 13368960, 0x22788402
+0,        239,        239,        1, 13368960, 0xa48697c6
+0,        240,        240,        1, 13368960, 0x20edbbbf
+0,        241,        241,        1, 13368960, 0x83202f92
+0,        242,        242,        1, 13368960, 0x39753c63
+0,        243,        243,        1, 13368960, 0xe53b2010
+0,        244,        244,        1, 13368960, 0x8f4de71d
+0,        245,        245,        1, 13368960, 0x6258a840
+0,        246,        246,        1, 13368960, 0xe6bb63fa
+0,        247,        247,        1, 13368960, 0xe402b0fa
+0,        248,        248,        1, 13368960, 0x2fb45d78
+0,        249,        249,        1, 13368960, 0xf1615865
+0,        250,        250,        1, 13368960, 0xf7b27d57
+0,        251,        251,        1, 13368960, 0x8acff7a0
+0,        252,        252,        1, 13368960, 0x9a07f770
+0,        253,        253,        1, 13368960, 0xd78ebcec
+0,        254,        254,        1, 13368960, 0x9ab52d9c
+0,        255,        255,        1, 13368960, 0xd27494dd
+0,        256,        256,        1, 13368960, 0xc8e60814
+0,        257,        257,        1, 13368960, 0xa1225c85
+0,        258,        258,        1, 13368960, 0x94386aec
+0,        259,        259,        1, 13368960, 0x98352e63
+0,        260,        260,        1, 13368960, 0x1e469945
+0,        261,        261,        1, 13368960, 0xf646569c
+0,        262,        262,        1, 13368960, 0x9831b297
+0,        263,        263,        1, 13368960, 0x37e38119
+0,        264,        264,        1, 13368960, 0xebe37433
+0,        265,        265,        1, 13368960, 0xa1b5c8e1
diff --git a/tests/ref/fate/hmac b/tests/ref/fate/hmac
index 7964305eb4..27b95ba36d 100644
--- a/tests/ref/fate/hmac
+++ b/tests/ref/fate/hmac
@@ -18,3 +18,13 @@ b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7
 773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514ced565fe
 60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f0ee37f54
 9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f51535c3a35e2
+afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c7cebc59cfaea9ea9076ede7f4af152e8b2fa9cb6
+af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec3736322445e8e2240ca5e69e2c78b3239ecfab21649
+88062608d3e6ad8a0aa2ace014c8a86f0aa635d947ac9febe83ef4e55966144b2a5ab39dc13814b94e3ab6e101a34f27
+4ece084485813e9088d2c63a041bc5b44f9ef1012a2b588f3cd11f05033ac4c60c2ef6ab4030fe8296248df163f44952
+6617178e941f020d351e2f254e8fd32c602420feb0b8fb9adccebb82461e99c5a678cc31e799176d3860e6110c46523e
+87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b30545e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f1702e696c203a126854
+164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737
+fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33b2279d39bf3e848279a722c806b485a47e67c807b946a337bee8942674278859e13292fb
+80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b013783f8f3526b56d037e05f2598bd0fd2215d6a1e5295e64f73f63f0aec8b915a985d786598
+e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d20cdc944b6022cac3c4982b10d5eeb55c3e4de15134676fb6de0446065c97440fa8c6a58
diff --git a/tests/ref/fate/id-cin-video b/tests/ref/fate/id-cin-video
index f55544f831..671b396a11 100644
--- a/tests/ref/fate/id-cin-video
+++ b/tests/ref/fate/id-cin-video
@@ -1,5 +1,14 @@
 #tb 0: 1/14
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 #tb 1: 1/22050
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 22050
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
 0,          0,          0,        1,   230400, 0x00000000
 1,          0,          0,     1575,     6300, 0xdd759df8
 0,          1,          1,        1,   230400, 0x3a3486b4
diff --git a/tests/ref/fate/idroq-video-encode b/tests/ref/fate/idroq-video-encode
index badb06d11d..bdb6fedf56 100644
--- a/tests/ref/fate/idroq-video-encode
+++ b/tests/ref/fate/idroq-video-encode
@@ -1 +1 @@
-2ac89fa0e5600152667bcbc661f06cfe
+e9ff61023826fce304350ff6e7c63b2f
diff --git a/tests/ref/fate/iff-byterun1 b/tests/ref/fate/iff-byterun1
index 6f80c72d47..8e6f949f62 100644
--- a/tests/ref/fate/iff-byterun1
+++ b/tests/ref/fate/iff-byterun1
@@ -1,2 +1,6 @@
 #tb 0: 1/90000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 5/6
 0,          0,          0,        0,   230400, 0x35e51c62
diff --git a/tests/ref/fate/iff-ilbm b/tests/ref/fate/iff-ilbm
index a801aff46d..38c43eb589 100644
--- a/tests/ref/fate/iff-ilbm
+++ b/tests/ref/fate/iff-ilbm
@@ -1,2 +1,6 @@
 #tb 0: 1/90000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
 0,          0,          0,        0,   230400, 0x0929e342
diff --git a/tests/ref/fate/imgutils b/tests/ref/fate/imgutils
new file mode 100644
index 0000000000..aba482221f
--- /dev/null
+++ b/tests/ref/fate/imgutils
@@ -0,0 +1,55 @@
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0011111111111111111111111111111111110000000000000000000
+0011111111111111111111111111111111110000000000000000000
+0011111111111111111111111111111111110000000000000000000
+0011111111111111111111111111111111110000000000000000000
+0011111111111111111111111111111111110000000000000000000
+0011111111111111111111111111111111110000000000000000000
+0011111111111111111111111111111111110000000000000000000
+0011111111111111111111111111111111110000000000000000000
+0011111111111111111111111111111111100000000000000000000
+0011111111111111111111111111111111100000000000000000000
+0011111111111111111111111111111111000000000000000000000
+0011111111111111111111111111111111000000000000000000000
+0011111111111111111111111111111110000000000000000000000
+0011111111111111111111111111111100000000000000000000000
+0011111111111111111111111111111100000000000000000000000
+0011111111111111111111111111111000000000000000000000000
+0011111111111111111111111111110000000000000000000000000
+0011111111111111111111111111100000000000000000000000000
+0011111111111111111111111111000000000000000000000000000
+0011111111111111111111111110000000000000000000000000000
+0011111111111111111111111100000000000000000000000000000
+0011111111111111111111111000000000000000000000000000000
+0011111111111111111111110000000000000000000000000000000
+0011111111111111111111100000000000000000000000000000000
+0011111111111111111111000000000000000000000000000000000
+0011111111111111111110000000000000000000000000000000000
+0011111111111111111100000000000000000000000000000000000
+0011111111111111111000000000000000000000000000000000000
+0011111111111111110000000000000000000000000000000000000
+0011111111111111100000000000000000000000000000000000000
+0011111111111110000000000000000000000000000000000000000
+0011111111111100000000000000000000000000000000000000000
+0011111111110000000000000000000000000000000000000000000
+0011111111000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000
diff --git a/tests/ref/fate/indeo2-delta b/tests/ref/fate/indeo2-delta
index c197dcc52b..05a01fdd81 100644
--- a/tests/ref/fate/indeo2-delta
+++ b/tests/ref/fate/indeo2-delta
@@ -1,4 +1,8 @@
 #tb 0: 16567/250000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    21600, 0xa3e914dd
 0,          1,          1,        1,    21600, 0x367eb420
 0,          2,          2,        1,    21600, 0x527488e2
diff --git a/tests/ref/fate/indeo2-intra b/tests/ref/fate/indeo2-intra
index 9f80f35d0c..0831d91182 100644
--- a/tests/ref/fate/indeo2-intra
+++ b/tests/ref/fate/indeo2-intra
@@ -1,4 +1,8 @@
 #tb 0: 66667/1000000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    21600, 0x57a2ba42
 0,          1,          1,        1,    21600, 0x61e09615
 0,          2,          2,        1,    21600, 0x826e4e63
diff --git a/tests/ref/fate/indeo3-1 b/tests/ref/fate/indeo3-1
index e294f70bb8..386e530906 100644
--- a/tests/ref/fate/indeo3-1
+++ b/tests/ref/fate/indeo3-1
@@ -1,41 +1,45 @@
-#tb 0: 1/600
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    21600, 0x845098fc
-0,         60,         60,        1,    21600, 0xc28e8bf0
-0,        120,        120,        1,    21600, 0x2f418fb4
-0,        180,        180,        1,    21600, 0x051d7a0e
-0,        240,        240,        1,    21600, 0x1b36aa7c
-0,        300,        300,        1,    21600, 0xb9e2ad38
-0,        360,        360,        1,    21600, 0x8dc99b60
-0,        420,        420,        1,    21600, 0xa3fa789a
-0,        480,        480,        1,    21600, 0x1fdbade2
-0,        540,        540,        1,    21600, 0x4f4ac164
-0,        600,        600,        1,    21600, 0x0ea5cb50
-0,        660,        660,        1,    21600, 0xfb659528
-0,        720,        720,        1,    21600, 0xac5790f8
-0,        780,        780,        1,    21600, 0x9762beb4
-0,        840,        840,        1,    21600, 0x29b0da0a
-0,        900,        900,        1,    21600, 0x6d88b0da
-0,        960,        960,        1,    21600, 0x687b8efa
-0,       1020,       1020,        1,    21600, 0xcd726220
-0,       1080,       1080,        1,    21600, 0xa1766598
-0,       1140,       1140,        1,    21600, 0xff4b8074
-0,       1200,       1200,        1,    21600, 0x845098fc
-0,       1260,       1260,        1,    21600, 0xdb259e08
-0,       1320,       1320,        1,    21600, 0xb6bda5a0
-0,       1380,       1380,        1,    21600, 0xbb998962
-0,       1440,       1440,        1,    21600, 0x28aa7b7c
-0,       1500,       1500,        1,    21600, 0x1ad1a15c
-0,       1560,       1560,        1,    21600, 0xb535a128
-0,       1620,       1620,        1,    21600, 0x4dbf968a
-0,       1680,       1680,        1,    21600, 0xfe90a8d6
-0,       1740,       1740,        1,    21600, 0xf63fabf0
-0,       1800,       1800,        1,    21600, 0xd6fabe58
-0,       1860,       1860,        1,    21600, 0x172eb09c
-0,       1920,       1920,        1,    21600, 0x44f8a8fe
-0,       1980,       1980,        1,    21600, 0x29429a06
-0,       2040,       2040,        1,    21600, 0xb12f8cc4
-0,       2100,       2100,        1,    21600, 0xd0c78cb4
-0,       2160,       2160,        1,    21600, 0x97e17e0c
-0,       2220,       2220,        1,    21600, 0xf8ac6700
-0,       2280,       2280,        1,    21600, 0xf9c17c94
-0,       2340,       2340,        1,    21600, 0xb10e8c54
+0,          1,          1,        1,    21600, 0xc28e8bf0
+0,          2,          2,        1,    21600, 0x2f418fb4
+0,          3,          3,        1,    21600, 0x051d7a0e
+0,          4,          4,        1,    21600, 0x1b36aa7c
+0,          5,          5,        1,    21600, 0xb9e2ad38
+0,          6,          6,        1,    21600, 0x8dc99b60
+0,          7,          7,        1,    21600, 0xa3fa789a
+0,          8,          8,        1,    21600, 0x1fdbade2
+0,          9,          9,        1,    21600, 0x4f4ac164
+0,         10,         10,        1,    21600, 0x0ea5cb50
+0,         11,         11,        1,    21600, 0xfb659528
+0,         12,         12,        1,    21600, 0xac5790f8
+0,         13,         13,        1,    21600, 0x9762beb4
+0,         14,         14,        1,    21600, 0x29b0da0a
+0,         15,         15,        1,    21600, 0x6d88b0da
+0,         16,         16,        1,    21600, 0x687b8efa
+0,         17,         17,        1,    21600, 0xcd726220
+0,         18,         18,        1,    21600, 0xa1766598
+0,         19,         19,        1,    21600, 0xff4b8074
+0,         20,         20,        1,    21600, 0x845098fc
+0,         21,         21,        1,    21600, 0xdb259e08
+0,         22,         22,        1,    21600, 0xb6bda5a0
+0,         23,         23,        1,    21600, 0xbb998962
+0,         24,         24,        1,    21600, 0x28aa7b7c
+0,         25,         25,        1,    21600, 0x1ad1a15c
+0,         26,         26,        1,    21600, 0xb535a128
+0,         27,         27,        1,    21600, 0x4dbf968a
+0,         28,         28,        1,    21600, 0xfe90a8d6
+0,         29,         29,        1,    21600, 0xf63fabf0
+0,         30,         30,        1,    21600, 0xd6fabe58
+0,         31,         31,        1,    21600, 0x172eb09c
+0,         32,         32,        1,    21600, 0x44f8a8fe
+0,         33,         33,        1,    21600, 0x29429a06
+0,         34,         34,        1,    21600, 0xb12f8cc4
+0,         35,         35,        1,    21600, 0xd0c78cb4
+0,         36,         36,        1,    21600, 0x97e17e0c
+0,         37,         37,        1,    21600, 0xf8ac6700
+0,         38,         38,        1,    21600, 0xf9c17c94
+0,         39,         39,        1,    21600, 0xb10e8c54
diff --git a/tests/ref/fate/indeo3-2 b/tests/ref/fate/indeo3-2
index 702d06b3c9..78e145e410 100644
--- a/tests/ref/fate/indeo3-2
+++ b/tests/ref/fate/indeo3-2
@@ -1,4 +1,8 @@
 #tb 0: 200/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x188
+#sar 0: 0/1
 0,          0,          0,        1,    67680, 0x532a4c40
 0,         37,         37,        1,    67680, 0x63d2757a
 0,         38,         38,        1,    67680, 0xb1dcf7d3
diff --git a/tests/ref/fate/indeo4 b/tests/ref/fate/indeo4
index 7f60461337..0a2b051b79 100644
--- a/tests/ref/fate/indeo4
+++ b/tests/ref/fate/indeo4
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,    86400, 0x98f5e422
 0,          1,          1,        1,    86400, 0x1864cb06
 0,          2,          2,        1,    86400, 0xb09532ef
diff --git a/tests/ref/fate/indeo5 b/tests/ref/fate/indeo5
index 3f0adfb4ee..6be2818b82 100644
--- a/tests/ref/fate/indeo5
+++ b/tests/ref/fate/indeo5
@@ -1,6 +1,9 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 240x180
+#sar 0: 0/1
 0,          0,          0,        1,    48600, 0x72d4193b
-0,          1,          1,        1,    48600, 0x72d4193b
 0,          2,          2,        1,    48600, 0x36abd6f3
 0,          3,          3,        1,    48600, 0x99e582f7
 0,          4,          4,        1,    48600, 0xa4cb6fb7
diff --git a/tests/ref/fate/interplay-mve-16bit b/tests/ref/fate/interplay-mve-16bit
index 2469aaac59..c1ec1ca890 100644
--- a/tests/ref/fate/interplay-mve-16bit
+++ b/tests/ref/fate/interplay-mve-16bit
@@ -1,51 +1,55 @@
-#tb 0: 1/1000000
-0,          0,          0,        0,   614400, 0x00000000
-0,      33360,      33360,        0,   614400, 0x00000000
-0,      66720,      66720,        0,   614400, 0xa17ea4ec
-0,     100080,     100080,        0,   614400, 0x4fd207fb
-0,     133440,     133440,        0,   614400, 0xd7a510fb
-0,     166800,     166800,        0,   614400, 0xe901e2f4
-0,     200160,     200160,        0,   614400, 0x4ac5d3c4
-0,     233520,     233520,        0,   614400, 0x32e3e99c
-0,     266880,     266880,        0,   614400, 0x7a2ff20c
-0,     300240,     300240,        0,   614400, 0x59941193
-0,     333600,     333600,        0,   614400, 0x92773a2b
-0,     366960,     366960,        0,   614400, 0x4cd14313
-0,     400320,     400320,        0,   614400, 0x2a093fa3
-0,     433680,     433680,        0,   614400, 0xf68b8463
-0,     467040,     467040,        0,   614400, 0xa9e1969b
-0,     500400,     500400,        0,   614400, 0x461996bb
-0,     533760,     533760,        0,   614400, 0xae58d053
-0,     567120,     567120,        0,   614400, 0x7693015a
-0,     600480,     600480,        0,   614400, 0x0b3507fa
-0,     633840,     633840,        0,   614400, 0xff5c2492
-0,     667200,     667200,        0,   614400, 0x636e3e32
-0,     700560,     700560,        0,   614400, 0x1acd6d0a
-0,     733920,     733920,        0,   614400, 0x67039232
-0,     767280,     767280,        0,   614400, 0x8ab9c75a
-0,     800640,     800640,        0,   614400, 0xe824bbe2
-0,     834000,     834000,        0,   614400, 0x5133e9ea
-0,     867360,     867360,        0,   614400, 0xcecf1249
-0,     900720,     900720,        0,   614400, 0xe6d928c1
-0,     934080,     934080,        0,   614400, 0x8da46ff1
-0,     967440,     967440,        0,   614400, 0x1c778319
-0,    1000800,    1000800,        0,   614400, 0x35a19451
-0,    1034160,    1034160,        0,   614400, 0x5145d1b9
-0,    1067520,    1067520,        0,   614400, 0x146ee231
-0,    1100880,    1100880,        0,   614400, 0xd9b33380
-0,    1134240,    1134240,        0,   614400, 0x8b112ef8
-0,    1167600,    1167600,        0,   614400, 0xb9e79ab0
-0,    1200960,    1200960,        0,   614400, 0x62d3a498
-0,    1234320,    1234320,        0,   614400, 0xaeaaaa58
-0,    1267680,    1267680,        0,   614400, 0x8922c440
-0,    1301040,    1301040,        0,   614400, 0xd62ef758
-0,    1334400,    1334400,        0,   614400, 0x2a53149f
-0,    1367760,    1367760,        0,   614400, 0x13da47df
-0,    1401120,    1401120,        0,   614400, 0x27c05c3f
-0,    1434480,    1434480,        0,   614400, 0x41ff7ca7
-0,    1467840,    1467840,        0,   614400, 0x6b0e8a07
-0,    1501200,    1501200,        0,   614400, 0xa200ad9f
-0,    1534560,    1534560,        0,   614400, 0x9da7cc77
-0,    1567920,    1567920,        0,   614400, 0x2f5703be
-0,    1601280,    1601280,        0,   614400, 0x91c720f6
-0,    1634640,    1634640,        0,   614400, 0x927a882e
+#tb 0: 417/12500
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x320
+#sar 0: 0/1
+0,          0,          0,        1,   614400, 0x00000000
+0,          1,          1,        1,   614400, 0x00000000
+0,          2,          2,        1,   614400, 0x3c4ce011
+0,          3,          3,        1,   614400, 0x16e83922
+0,          4,          4,        1,   614400, 0x657a3d4d
+0,          5,          5,        1,   614400, 0x933a08b0
+0,          6,          6,        1,   614400, 0xfcd5f76e
+0,          7,          7,        1,   614400, 0xd0990cf8
+0,          8,          8,        1,   614400, 0x02131686
+0,          9,          9,        1,   614400, 0x4cf53656
+0,         10,         10,        1,   614400, 0x7d1960c0
+0,         11,         11,        1,   614400, 0x5d9f696f
+0,         12,         12,        1,   614400, 0x54e06663
+0,         13,         13,        1,   614400, 0x4c1eade1
+0,         14,         14,        1,   614400, 0x4bd3bfff
+0,         15,         15,        1,   614400, 0xab86c041
+0,         16,         16,        1,   614400, 0xbb2bfbf4
+0,         17,         17,        1,   614400, 0x43822e15
+0,         18,         18,        1,   614400, 0x835e352c
+0,         19,         19,        1,   614400, 0x72cc538f
+0,         20,         20,        1,   614400, 0x20bb6e30
+0,         21,         21,        1,   614400, 0xfb079f52
+0,         22,         22,        1,   614400, 0x759bc4d6
+0,         23,         23,        1,   614400, 0xd116fc3b
+0,         24,         24,        1,   614400, 0x5c06efd2
+0,         25,         25,        1,   614400, 0x61641ecd
+0,         26,         26,        1,   614400, 0x6c8d48a0
+0,         27,         27,        1,   614400, 0x64725eed
+0,         28,         28,        1,   614400, 0x88f9a8ca
+0,         29,         29,        1,   614400, 0xcf1cbcd9
+0,         30,         30,        1,   614400, 0x75a3ce24
+0,         31,         31,        1,   614400, 0x3bf80ce7
+0,         32,         32,        1,   614400, 0xd4011d7c
+0,         33,         33,        1,   614400, 0xd569716b
+0,         34,         34,        1,   614400, 0xfd626b6b
+0,         35,         35,        1,   614400, 0xc856dbaf
+0,         36,         36,        1,   614400, 0x0e56e68e
+0,         37,         37,        1,   614400, 0x5b29ecc9
+0,         38,         38,        1,   614400, 0xe83c0804
+0,         39,         39,        1,   614400, 0xebdd3d61
+0,         40,         40,        1,   614400, 0x7f4c5b56
+0,         41,         41,        1,   614400, 0xb4019155
+0,         42,         42,        1,   614400, 0xffdda515
+0,         43,         43,        1,   614400, 0x5271c695
+0,         44,         44,        1,   614400, 0x8526d3c1
+0,         45,         45,        1,   614400, 0x5accf7a6
+0,         46,         46,        1,   614400, 0x959017aa
+0,         47,         47,        1,   614400, 0x22f450f6
+0,         48,         48,        1,   614400, 0x2e3d6f37
+0,         49,         49,        1,   614400, 0x0db9d89f
diff --git a/tests/ref/fate/interplay-mve-8bit b/tests/ref/fate/interplay-mve-8bit
index abd86eb46d..6fb5af3d69 100644
--- a/tests/ref/fate/interplay-mve-8bit
+++ b/tests/ref/fate/interplay-mve-8bit
@@ -1,111 +1,115 @@
-#tb 0: 1/1000000
-0,          0,          0,        0,   414720, 0xa5cd50ca
-0,      66728,      66728,        0,   414720, 0x3facd321
-0,     133456,     133456,        0,   414720, 0x849e6d4b
-0,     200184,     200184,        0,   414720, 0xe649363f
-0,     266912,     266912,        0,   414720, 0x5bbd7b14
-0,     333640,     333640,        0,   414720, 0xe246ab51
-0,     400368,     400368,        0,   414720, 0x5721b22e
-0,     467096,     467096,        0,   414720, 0xe391e107
-0,     533824,     533824,        0,   414720, 0x04d851ff
-0,     600552,     600552,        0,   414720, 0x8d80d580
-0,     667280,     667280,        0,   414720, 0x5a24b0bc
-0,     734008,     734008,        0,   414720, 0x06cd6960
-0,     800736,     800736,        0,   414720, 0xf5ca48b4
-0,     867464,     867464,        0,   414720, 0x24700f94
-0,     934192,     934192,        0,   414720, 0xb0bfe451
-0,    1000920,    1000920,        0,   414720, 0x00e9f3d1
-0,    1067648,    1067648,        0,   414720, 0x0efbffd1
-0,    1134376,    1134376,        0,   414720, 0x2ecdfc8d
-0,    1201104,    1201104,        0,   414720, 0x94b531fc
-0,    1267832,    1267832,        0,   414720, 0x2c2579f8
-0,    1334560,    1334560,        0,   414720, 0x6c7ecfb8
-0,    1401288,    1401288,        0,   414720, 0x08982527
-0,    1468016,    1468016,        0,   414720, 0x5c0161b3
-0,    1534744,    1534744,        0,   414720, 0x453ce413
-0,    1601472,    1601472,        0,   414720, 0x634e36b2
-0,    1668200,    1668200,        0,   414720, 0x401a683a
-0,    1734928,    1734928,        0,   414720, 0x3c5f442e
-0,    1801656,    1801656,        0,   414720, 0x075ef787
-0,    1868384,    1868384,        0,   414720, 0x8501a04f
-0,    1935112,    1935112,        0,   414720, 0x3620093b
-0,    2001840,    2001840,        0,   414720, 0xa42d9480
-0,    2068568,    2068568,        0,   414720, 0x09b150b4
-0,    2135296,    2135296,        0,   414720, 0xcad407f0
-0,    2202024,    2202024,        0,   414720, 0x69e5eecd
-0,    2268752,    2268752,        0,   414720, 0xb92ad2d9
-0,    2335480,    2335480,        0,   414720, 0xc78eaf29
-0,    2402208,    2402208,        0,   414720, 0x47c3fa91
-0,    2468936,    2468936,        0,   414720, 0x8847b7b8
-0,    2535664,    2535664,        0,   414720, 0x864cab2f
-0,    2602392,    2602392,        0,   414720, 0x78d653e2
-0,    2669120,    2669120,        0,   414720, 0xda15cbd2
-0,    2735848,    2735848,        0,   414720, 0xdf9ce28a
-0,    2802576,    2802576,        0,   414720, 0xe88c49ca
-0,    2869304,    2869304,        0,   414720, 0xd6bcbc07
-0,    2936032,    2936032,        0,   414720, 0xf0b4a7bf
-0,    3002760,    3002760,        0,   414720, 0x74f9bfbf
-0,    3069488,    3069488,        0,   414720, 0x904ce103
-0,    3136216,    3136216,        0,   414720, 0xca877e4a
-0,    3202944,    3202944,        0,   414720, 0x588effd6
-0,    3269672,    3269672,        0,   414720, 0x6dff8b71
-0,    3336400,    3336400,        0,   414720, 0xbeaae788
-0,    3403128,    3403128,        0,   414720, 0x1a4d1242
-0,    3469856,    3469856,        0,   414720, 0x4ae98ea0
-0,    3536584,    3536584,        0,   414720, 0x41ed6d22
-0,    3603312,    3603312,        0,   414720, 0x486e70aa
-0,    3670040,    3670040,        0,   414720, 0xfddc103e
-0,    3736768,    3736768,        0,   414720, 0x8620f03e
-0,    3803496,    3803496,        0,   414720, 0x0e4ec273
-0,    3870224,    3870224,        0,   414720, 0xb2298b3e
-0,    3936952,    3936952,        0,   414720, 0xb4f50176
-0,    4003680,    4003680,        0,   414720, 0xb9c7a495
-0,    4070408,    4070408,        0,   414720, 0xed270702
-0,    4137136,    4137136,        0,   414720, 0x98b72586
-0,    4203864,    4203864,        0,   414720, 0xd8977cb1
-0,    4270592,    4270592,        0,   414720, 0xff3d3851
-0,    4337320,    4337320,        0,   414720, 0x7e4f0424
-0,    4404048,    4404048,        0,   414720, 0xa9e75006
-0,    4470776,    4470776,        0,   414720, 0x8f98cba9
-0,    4537504,    4537504,        0,   414720, 0x25ecd620
-0,    4604232,    4604232,        0,   414720, 0x78cf5c58
-0,    4670960,    4670960,        0,   414720, 0x3fb4b81a
-0,    4737688,    4737688,        0,   414720, 0xd7b655fa
-0,    4804416,    4804416,        0,   414720, 0xd9158db3
-0,    4871144,    4871144,        0,   414720, 0x2e651852
-0,    4937872,    4937872,        0,   414720, 0x9f9adb64
-0,    5004600,    5004600,        0,   414720, 0xe9d16e81
-0,    5071328,    5071328,        0,   414720, 0xbe73daf5
-0,    5138056,    5138056,        0,   414720, 0x3d164329
-0,    5204784,    5204784,        0,   414720, 0x1d5a9bc8
-0,    5271512,    5271512,        0,   414720, 0x8e8debbe
-0,    5338240,    5338240,        0,   414720, 0x4e7a2bf0
-0,    5404968,    5404968,        0,   414720, 0x4a13804d
-0,    5471696,    5471696,        0,   414720, 0x5dd188d8
-0,    5538424,    5538424,        0,   414720, 0xbe7f4963
-0,    5605152,    5605152,        0,   414720, 0xcff3b767
-0,    5671880,    5671880,        0,   414720, 0xbbd3afa0
-0,    5738608,    5738608,        0,   414720, 0xaf9dec62
-0,    5805336,    5805336,        0,   414720, 0xc74816a1
-0,    5872064,    5872064,        0,   414720, 0x51488bfc
-0,    5938792,    5938792,        0,   414720, 0x68c10a2c
-0,    6005520,    6005520,        0,   414720, 0x10179c4e
-0,    6072248,    6072248,        0,   414720, 0x18d559b7
-0,    6138976,    6138976,        0,   414720, 0x8257aa55
-0,    6205704,    6205704,        0,   414720, 0x9ea24501
-0,    6272432,    6272432,        0,   414720, 0x238605cc
-0,    6339160,    6339160,        0,   414720, 0xb552deaa
-0,    6405888,    6405888,        0,   414720, 0x07c3348d
-0,    6472616,    6472616,        0,   414720, 0x82f4f9b0
-0,    6539344,    6539344,        0,   414720, 0xf5d76bc5
-0,    6606072,    6606072,        0,   414720, 0x34b3a1e6
-0,    6672800,    6672800,        0,   414720, 0xda25e11b
-0,    6739528,    6739528,        0,   414720, 0x2b19936b
-0,    6806256,    6806256,        0,   414720, 0xe91f9f73
-0,    6872984,    6872984,        0,   414720, 0x48d09aab
-0,    6939712,    6939712,        0,   414720, 0xac42bf83
-0,    7006440,    7006440,        0,   414720, 0x2d8ca14e
-0,    7073168,    7073168,        0,   414720, 0xe65462fd
-0,    7139896,    7139896,        0,   414720, 0xe5bfc929
-0,    7206624,    7206624,        0,   414720, 0x66784c58
-0,    7273352,    7273352,        0,   414720, 0x70dbeca8
+#tb 0: 8341/125000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 432x320
+#sar 0: 0/1
+0,          0,          0,        1,   414720, 0x2580d574
+0,          1,          1,        1,   414720, 0x97f55cd3
+0,          2,          2,        1,   414720, 0x9408fb63
+0,          3,          3,        1,   414720, 0x7e53c155
+0,          4,          4,        1,   414720, 0xd8570262
+0,          5,          5,        1,   414720, 0x9dc72ed5
+0,          6,          6,        1,   414720, 0xf7d33211
+0,          7,          7,        1,   414720, 0x95935e3b
+0,          8,          8,        1,   414720, 0x62b1cdc5
+0,          9,          9,        1,   414720, 0x971f500a
+0,         10,         10,        1,   414720, 0x05f82b6c
+0,         11,         11,        1,   414720, 0x7713e3cb
+0,         12,         12,        1,   414720, 0x3170c2f0
+0,         13,         13,        1,   414720, 0x8d818956
+0,         14,         14,        1,   414720, 0x16775d71
+0,         15,         15,        1,   414720, 0x63016ce1
+0,         16,         16,        1,   414720, 0x2f94792c
+0,         17,         17,        1,   414720, 0x37f67725
+0,         18,         18,        1,   414720, 0xeb95adb1
+0,         19,         19,        1,   414720, 0xbf32f6df
+0,         20,         20,        1,   414720, 0x242f4d09
+0,         21,         21,        1,   414720, 0x28a2a3b9
+0,         22,         22,        1,   414720, 0x895de0a6
+0,         23,         23,        1,   414720, 0xd3b46447
+0,         24,         24,        1,   414720, 0x3bbfb7d1
+0,         25,         25,        1,   414720, 0x0a5ee9ad
+0,         26,         26,        1,   414720, 0xaabac502
+0,         27,         27,        1,   414720, 0x0951779d
+0,         28,         28,        1,   414720, 0x150e2073
+0,         29,         29,        1,   414720, 0xb86d87ae
+0,         30,         30,        1,   414720, 0x135411da
+0,         31,         31,        1,   414720, 0x9c8fcda5
+0,         32,         32,        1,   414720, 0xb7ba838e
+0,         33,         33,        1,   414720, 0x7ef869e1
+0,         34,         34,        1,   414720, 0xf9764d47
+0,         35,         35,        1,   414720, 0xe6c72872
+0,         36,         36,        1,   414720, 0xb95b73b8
+0,         37,         37,        1,   414720, 0xa19e3221
+0,         38,         38,        1,   414720, 0xc0be27cd
+0,         39,         39,        1,   414720, 0xe97cd1a9
+0,         40,         40,        1,   414720, 0xb6524a34
+0,         41,         41,        1,   414720, 0x61a1607b
+0,         42,         42,        1,   414720, 0x1dd9c606
+0,         43,         43,        1,   414720, 0xe2e736fa
+0,         44,         44,        1,   414720, 0x25b922d9
+0,         45,         45,        1,   414720, 0xbc023b36
+0,         46,         46,        1,   414720, 0x39bb5cdf
+0,         47,         47,        1,   414720, 0xf83bfc4f
+0,         48,         48,        1,   414720, 0x3eae7f36
+0,         49,         49,        1,   414720, 0x8cf80c32
+0,         50,         50,        1,   414720, 0xbc576c03
+0,         51,         51,        1,   414720, 0x28b79ab1
+0,         52,         52,        1,   414720, 0x15da1138
+0,         53,         53,        1,   414720, 0x345ff676
+0,         54,         54,        1,   414720, 0x0108f909
+0,         55,         55,        1,   414720, 0x57459616
+0,         56,         56,        1,   414720, 0x2f497782
+0,         57,         57,        1,   414720, 0xb72b4f79
+0,         58,         58,        1,   414720, 0x2bfd1967
+0,         59,         59,        1,   414720, 0x974a99cd
+0,         60,         60,        1,   414720, 0x5f5f4129
+0,         61,         61,        1,   414720, 0x51ad9df4
+0,         62,         62,        1,   414720, 0xd6e5c16c
+0,         63,         63,        1,   414720, 0xd8751bda
+0,         64,         64,        1,   414720, 0x216ed6f3
+0,         65,         65,        1,   414720, 0x63a0a67d
+0,         66,         66,        1,   414720, 0xe4f4eb0f
+0,         67,         67,        1,   414720, 0xa1665ef8
+0,         68,         68,        1,   414720, 0xc3116dfd
+0,         69,         69,        1,   414720, 0x3213fd70
+0,         70,         70,        1,   414720, 0x2af76048
+0,         71,         71,        1,   414720, 0x3570085d
+0,         72,         72,        1,   414720, 0x2a7c3c39
+0,         73,         73,        1,   414720, 0xd8a6ba7e
+0,         74,         74,        1,   414720, 0x48107b4d
+0,         75,         75,        1,   414720, 0x653a0936
+0,         76,         76,        1,   414720, 0xf68c77ab
+0,         77,         77,        1,   414720, 0xa5ecde84
+0,         78,         78,        1,   414720, 0xaec33ca1
+0,         79,         79,        1,   414720, 0x26e68740
+0,         80,         80,        1,   414720, 0xac09bfa5
+0,         81,         81,        1,   414720, 0xed5111b2
+0,         82,         82,        1,   414720, 0x38041c98
+0,         83,         83,        1,   414720, 0x76fbde1d
+0,         84,         84,        1,   414720, 0x3ae64b7d
+0,         85,         85,        1,   414720, 0xb05f4da2
+0,         86,         86,        1,   414720, 0x65769088
+0,         87,         87,        1,   414720, 0xbc45ba59
+0,         88,         88,        1,   414720, 0x8c893436
+0,         89,         89,        1,   414720, 0x1d5ebe7f
+0,         90,         90,        1,   414720, 0xa9cd5a53
+0,         91,         91,        1,   414720, 0xc69e1fb0
+0,         92,         92,        1,   414720, 0xb28a77ec
+0,         93,         93,        1,   414720, 0x834f1219
+0,         94,         94,        1,   414720, 0xba34c848
+0,         95,         95,        1,   414720, 0x80e590c1
+0,         96,         96,        1,   414720, 0x7146dc31
+0,         97,         97,        1,   414720, 0x05929a5f
+0,         98,         98,        1,   414720, 0x721708c5
+0,         99,         99,        1,   414720, 0x4aa83cbe
+0,        100,        100,        1,   414720, 0x221d799f
+0,        101,        101,        1,   414720, 0xe9e72bec
+0,        102,        102,        1,   414720, 0xb6a3385d
+0,        103,        103,        1,   414720, 0x795a3362
+0,        104,        104,        1,   414720, 0x770b58d9
+0,        105,        105,        1,   414720, 0xb5563ce4
+0,        106,        106,        1,   414720, 0x0c1a00cc
+0,        107,        107,        1,   414720, 0xcbd467fd
+0,        108,        108,        1,   414720, 0x3bccec29
+0,        109,        109,        1,   414720, 0x92d78db7
diff --git a/tests/ref/fate/iscc b/tests/ref/fate/iscc
index 69dbfe158e..7c1bb49939 100644
--- a/tests/ref/fate/iscc
+++ b/tests/ref/fate/iscc
@@ -1,4 +1,8 @@
 #tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1760x968
+#sar 0: 0/1
 0,          0,          0,        1,  6814720, 0x1365f8ef
 0,          1,          1,        1,  6814720, 0x90838983
 0,          2,          2,        1,  6814720, 0xf0cc3131
diff --git a/tests/ref/fate/iv8-demux b/tests/ref/fate/iv8-demux
index 56a54a11db..518f3de974 100644
--- a/tests/ref/fate/iv8-demux
+++ b/tests/ref/fate/iv8-demux
@@ -1,26 +1,31 @@
+#extradata 0:       19, 0x1f2604b9
 #tb 0: 1/90000
+#media_type 0: video
+#codec_id 0: mpeg4
+#dimensions 0: 704x576
+#sar 0: 1/1
 0,          0,          0,        0,    20883, 0x347191e2
-0,          0,       3600,        0,    20882, 0xe1573905
-0,       3600,       7200,        0,    20894, 0xd54f516a
-0,       7200,      10800,        0,    20891, 0x1b5c5039
-0,      10800,      14400,        0,    20883, 0x8e785b4d
-0,      14400,      18000,        0,    20870, 0xd26ca1f6
-0,      18000,      21600,        0,    21448, 0x946f5b2b
-0,      21600,      25200,        0,    21433, 0xb18687c5
-0,      25200,      28800,        0,    20865, 0xc0eb3fce
-0,      28800,      32399,        0,    20842, 0x9d0728ba
-0,      32399,      35999,        0,    20878, 0xf60f5dee
-0,      35999,      39600,        0,    20866, 0x3bde568f
-0,      39600,      43200,        0,    20884, 0x22736993
-0,      43200,      46800,        0,    20860, 0xf56f2fca
-0,      46800,      50400,        0,    20872, 0xf39e3cb3
-0,      50400,      53999,        0,    20835, 0xa3c4363b
-0,      53999,      57600,        0,    20905, 0x552853d1
-0,      57600,      61200,        0,    20874, 0xed0b91ec
-0,      61200,      64799,        0,    20877, 0xe1623e01
-0,      64799,      68399,        0,    20933, 0x19906564
-0,      68399,      72000,     3600,    20891, 0x3d064fd3
-0,      72000,      75600,     3600,    20834, 0xcb774dbc
-0,      75600,      79200,     3600,    20870, 0xbc536589
-0,      79200,      82800,     3600,    21421, 0xc99a68e4
-0,      82800,      86400,     3600,    12869, 0x5684e304
+0,       3600,       3600,        0,    20882, 0xe1573905
+0,       7200,       7200,        0,    20894, 0xd54f516a
+0,      10800,      10800,        0,    20891, 0x1b5c5039
+0,      14400,      14400,        0,    20883, 0x8e785b4d
+0,      18000,      18000,        0,    20870, 0xd26ca1f6
+0,      21600,      21600,        0,    21448, 0x946f5b2b
+0,      25200,      25200,        0,    21433, 0xb18687c5
+0,      28800,      28800,        0,    20865, 0xc0eb3fce
+0,      32399,      32399,        0,    20842, 0x9d0728ba
+0,      35999,      35999,        0,    20878, 0xf60f5dee
+0,      39600,      39600,        0,    20866, 0x3bde568f
+0,      43200,      43200,        0,    20884, 0x22736993
+0,      46800,      46800,        0,    20860, 0xf56f2fca
+0,      50400,      50400,        0,    20872, 0xf39e3cb3
+0,      53999,      53999,        0,    20835, 0xa3c4363b
+0,      57600,      57600,        0,    20905, 0x552853d1
+0,      61200,      61200,        0,    20874, 0xed0b91ec
+0,      64799,      64799,        0,    20877, 0xe1623e01
+0,      68399,      68399,        0,    20933, 0x19906564
+0,      72000,      72000,        0,    20891, 0x3d064fd3
+0,      75600,      75600,        0,    20834, 0xcb774dbc
+0,      79200,      79200,        0,    20870, 0xbc536589
+0,      82800,      82800,        0,    21421, 0xc99a68e4
+0,      86400,      86400,        0,    12869, 0x5684e304
diff --git a/tests/ref/fate/j2k-dwt b/tests/ref/fate/j2k-dwt
new file mode 100644
index 0000000000..42415f00f9
--- /dev/null
+++ b/tests/ref/fate/j2k-dwt
@@ -0,0 +1,60 @@
+5/3i, decomp:15 border 151 170 140 183 milli-err2:        0
+9/7i, decomp:15 border 151 170 140 183 milli-err2:      544
+9/7f, decomp:15 border 151 170 140 183 err2:               0.000
+5/3i, decomp:21 border 173 201  81 189 milli-err2:        0
+9/7i, decomp:21 border 173 201  81 189 milli-err2:      592
+9/7f, decomp:21 border 173 201  81 189 err2:               0.000
+5/3i, decomp:22 border 213 227  76 245 milli-err2:        0
+9/7i, decomp:22 border 213 227  76 245 milli-err2:      533
+9/7f, decomp:22 border 213 227  76 245 err2:               0.000
+5/3i, decomp:13 border 134 157 184 203 milli-err2:        0
+9/7i, decomp:13 border 134 157 184 203 milli-err2:      535
+9/7f, decomp:13 border 134 157 184 203 err2:               0.000
+5/3i, decomp: 1 border 204 237   6 106 milli-err2:        0
+9/7i, decomp: 1 border 204 237   6 106 milli-err2:      219
+9/7f, decomp: 1 border 204 237   6 106 err2:               0.000
+5/3i, decomp:28 border  76 211  13 210 milli-err2:        0
+9/7i, decomp:28 border  76 211  13 210 milli-err2:      791
+9/7f, decomp:28 border  76 211  13 210 err2:               0.000
+5/3i, decomp:21 border  76  99  43 123 milli-err2:        0
+9/7i, decomp:21 border  76  99  43 123 milli-err2:      686
+9/7f, decomp:21 border  76  99  43 123 err2:               0.000
+5/3i, decomp:15 border 192 243 174 204 milli-err2:        0
+9/7i, decomp:15 border 192 243 174 204 milli-err2:      476
+9/7f, decomp:15 border 192 243 174 204 err2:               0.000
+5/3i, decomp:21 border  17  68  93 204 milli-err2:        0
+9/7i, decomp:21 border  17  68  93 204 milli-err2:      633
+9/7f, decomp:21 border  17  68  93 204 err2:               0.000
+5/3i, decomp:11 border 142 168  82 174 milli-err2:        0
+9/7i, decomp:11 border 142 168  82 174 milli-err2:      696
+9/7f, decomp:11 border 142 168  82 174 err2:               0.000
+5/3i, decomp:23 border 142 209 171 235 milli-err2:        0
+9/7i, decomp:23 border 142 209 171 235 milli-err2:      626
+9/7f, decomp:23 border 142 209 171 235 err2:               0.000
+5/3i, decomp:30 border  37 185  79 245 milli-err2:        0
+9/7i, decomp:30 border  37 185  79 245 milli-err2:      953
+9/7f, decomp:30 border  37 185  79 245 err2:               0.000
+5/3i, decomp: 5 border 129 236  30 243 milli-err2:        0
+9/7i, decomp: 5 border 129 236  30 243 milli-err2:      620
+9/7f, decomp: 5 border 129 236  30 243 err2:               0.000
+5/3i, decomp:10 border   5 160 146 247 milli-err2:        0
+9/7i, decomp:10 border   5 160 146 247 milli-err2:      797
+9/7f, decomp:10 border   5 160 146 247 err2:               0.000
+5/3i, decomp: 5 border 104 162   6  47 milli-err2:        0
+9/7i, decomp: 5 border 104 162   6  47 milli-err2:      603
+9/7f, decomp: 5 border 104 162   6  47 err2:               0.000
+5/3i, decomp:24 border  78 250 102 218 milli-err2:        0
+9/7i, decomp:24 border  78 250 102 218 milli-err2:      836
+9/7f, decomp:24 border  78 250 102 218 err2:               0.000
+5/3i, decomp:28 border  86  98  56  79 milli-err2:        0
+9/7i, decomp:28 border  86  98  56  79 milli-err2:      597
+9/7f, decomp:28 border  86  98  56  79 err2:               0.000
+5/3i, decomp: 6 border  95 238 197 214 milli-err2:        0
+9/7i, decomp: 6 border  95 238 197 214 milli-err2:      478
+9/7f, decomp: 6 border  95 238 197 214 err2:               0.000
+5/3i, decomp:17 border  77 169  93 165 milli-err2:        0
+9/7i, decomp:17 border  77 169  93 165 milli-err2:      616
+9/7f, decomp:17 border  77 169  93 165 err2:               0.000
+5/3i, decomp:22 border 178 187   7 119 milli-err2:        0
+9/7i, decomp:22 border 178 187   7 119 milli-err2:      392
+9/7f, decomp:22 border 178 187   7 119 err2:               0.000
diff --git a/tests/ref/fate/jpeg2000-dcinema b/tests/ref/fate/jpeg2000-dcinema
index 940759aeb4..cdf8cd4fc6 100644
--- a/tests/ref/fate/jpeg2000-dcinema
+++ b/tests/ref/fate/jpeg2000-dcinema
@@ -1,3 +1,7 @@
 #tb 0: 1/24
-0,          0,          0,        1, 12441600, 0xf0de508b
-0,          1,          1,        1, 12441600, 0x8e50c249
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
+0,          0,          0,        1, 12441600, 0xfcf6a127
+0,          1,          1,        1, 12441600, 0x577b6a64
diff --git a/tests/ref/fate/jpg-12bpp b/tests/ref/fate/jpg-12bpp
new file mode 100644
index 0000000000..b3c662d587
--- /dev/null
+++ b/tests/ref/fate/jpg-12bpp
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 999x749
+#sar 0: 1/1
+0,          0,          0,        1,  1496502, 0xd91deb4b
diff --git a/tests/ref/fate/jpg-jfif b/tests/ref/fate/jpg-jfif
new file mode 100644
index 0000000000..39413e77d2
--- /dev/null
+++ b/tests/ref/fate/jpg-jfif
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 807x538
+#sar 0: 72/72
+0,          0,          0,        1,   651518, 0x50faa5ad
diff --git a/tests/ref/fate/jv b/tests/ref/fate/jv
index 0d5102d13d..d90fe24637 100644
--- a/tests/ref/fate/jv
+++ b/tests/ref/fate/jv
@@ -1,9 +1,12 @@
 #tb 0: 2/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
 0,          0,          0,        1,   192000, 0x00000000
-0,          2,          2,        1,   192000, 0x95ece4ea
-0,          3,          3,        1,   192000, 0x9abaf682
-0,          4,          4,        1,   192000, 0x9a93fed6
-0,          5,          5,        1,   192000, 0x112dfade
-0,          6,          6,        1,   192000, 0xb8f3e986
-0,          7,          7,        1,   192000, 0x21daea8e
-0,          8,          8,        1,   192000, 0x5dc1032d
+0,          2,          2,        1,   192000, 0x331b1c12
+0,          3,          3,        1,   192000, 0xc2fa2d89
+0,          4,          4,        1,   192000, 0x9b3035ac
+0,          5,          5,        1,   192000, 0xb8e331eb
+0,          6,          6,        1,   192000, 0xd35b2053
+0,          7,          7,        1,   192000, 0x01062188
diff --git a/tests/ref/fate/jv-demux b/tests/ref/fate/jv-demux
new file mode 100644
index 0000000000..bf8211074c
--- /dev/null
+++ b/tests/ref/fate/jv-demux
@@ -0,0 +1,29 @@
+#tb 0: 2/25
+#media_type 0: video
+#codec_id 0: jv
+#dimensions 0: 320x200
+#sar 0: 0/1
+#tb 1: 1/22050
+#media_type 1: audio
+#codec_id 1: pcm_u8
+#sample_rate 1: 22050
+#channel_layout 1: 4
+#channel_layout_name 1: mono
+0,          0,          0,        1,        6, 0x000a0003
+1,          0,          0,   131072,   131072, 0x14c664d6
+0,          1,          1,        1,      773, 0x11802a51
+0,          2,          2,        1,    12974, 0xc2e466b7
+0,          3,          3,        1,    12200, 0x3c0eeb31
+0,          4,          4,        1,    13339, 0x91d82488
+0,          5,          5,        1,    13940, 0x064c350a
+0,          6,          6,        1,    14418, 0x078d2dd2
+0,          7,          7,        1,    14539, 0x145167ed
+0,          8,          8,        1,     2552, 0xcf2b1db7, F=0x3
+1,     131072,     131072,     1764,     1764, 0x30be734d
+1,     132836,     132836,     1764,     1764, 0xa4c873a7
+1,     134600,     134600,     1764,     1764, 0xd5f17443
+1,     136364,     136364,     1764,     1764, 0xd31c7230
+1,     138128,     138128,     1764,     1764, 0x181d730f
+1,     139892,     139892,     1764,     1764, 0x76f47538
+1,     141656,     141656,     1764,     1764, 0x6c51715d
+1,     143420,     143420,     1764,     1764, 0x689374f5
diff --git a/tests/ref/fate/kgv1 b/tests/ref/fate/kgv1
index 6f35893f83..a3649bc8aa 100644
--- a/tests/ref/fate/kgv1
+++ b/tests/ref/fate/kgv1
@@ -1,4 +1,8 @@
 #tb 0: 1/60
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   153600, 0x00000000
 0,          1,          1,        1,   153600, 0x00000000
 0,          2,          2,        1,   153600, 0x00000000
@@ -294,15 +298,15 @@
 0,        292,        292,        1,   153600, 0x1348310e
 0,        293,        293,        1,   153600, 0xb5489dad
 0,        294,        294,        1,   153600, 0xa1eb1408
-0,        295,        295,        1,   153600, 0x15e1832c
+0,        295,        295,        1,   153600, 0x15e0832b
 0,        296,        296,        1,   153600, 0xb789cba5
 0,        297,        297,        1,   153600, 0x3ee86e4f
 0,        298,        298,        1,   153600, 0x06ea3883
 0,        299,        299,        1,   153600, 0xcedd02b7
-0,        300,        300,        1,   153600, 0xbce6ce58
-0,        301,        301,        1,   153600, 0xaadf9a00
+0,        300,        300,        1,   153600, 0xbcd6ce50
+0,        301,        301,        1,   153600, 0xaacf99f8
 0,        302,        302,        1,   153600, 0x98c865a0
-0,        303,        303,        1,   153600, 0x4c8432e0
+0,        303,        303,        1,   153600, 0x4c6432d0
 0,        304,        304,        1,   153600, 0x00000000
 0,        305,        305,        1,   153600, 0x00000000
 0,        306,        306,        1,   153600, 0x00000000
diff --git a/tests/ref/fate/kmvc b/tests/ref/fate/kmvc
index 8a733bbb4e..9c7686bab8 100644
--- a/tests/ref/fate/kmvc
+++ b/tests/ref/fate/kmvc
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x160
+#sar 0: 0/1
 0,          0,          0,        1,   153600, 0x00000000
 0,          1,          1,        1,   153600, 0x00000000
 0,          2,          2,        1,   153600, 0x00000000
diff --git a/tests/ref/fate/lagarith-red b/tests/ref/fate/lagarith-red
new file mode 100644
index 0000000000..0e065d60d5
--- /dev/null
+++ b/tests/ref/fate/lagarith-red
@@ -0,0 +1,30 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+0,          0,          0,        1,   230400, 0x67dfe576
+0,          1,          1,        1,   230400, 0x67dfe576
+0,          2,          2,        1,   230400, 0x67dfe576
+0,          3,          3,        1,   230400, 0x67dfe576
+0,          4,          4,        1,   230400, 0x67dfe576
+0,          5,          5,        1,   230400, 0x67dfe576
+0,          6,          6,        1,   230400, 0x67dfe576
+0,          7,          7,        1,   230400, 0x67dfe576
+0,          8,          8,        1,   230400, 0x67dfe576
+0,          9,          9,        1,   230400, 0x67dfe576
+0,         10,         10,        1,   230400, 0x67dfe576
+0,         11,         11,        1,   230400, 0x67dfe576
+0,         12,         12,        1,   230400, 0x67dfe576
+0,         13,         13,        1,   230400, 0x67dfe576
+0,         14,         14,        1,   230400, 0x67dfe576
+0,         15,         15,        1,   230400, 0x67dfe576
+0,         16,         16,        1,   230400, 0x67dfe576
+0,         17,         17,        1,   230400, 0x67dfe576
+0,         18,         18,        1,   230400, 0x67dfe576
+0,         19,         19,        1,   230400, 0x67dfe576
+0,         20,         20,        1,   230400, 0x67dfe576
+0,         21,         21,        1,   230400, 0x67dfe576
+0,         22,         22,        1,   230400, 0x67dfe576
+0,         23,         23,        1,   230400, 0x67dfe576
+0,         24,         24,        1,   230400, 0x67dfe576
diff --git a/tests/ref/fate/lagarith-rgb24 b/tests/ref/fate/lagarith-rgb24
index 1eb2bc441c..63250c6bdc 100644
--- a/tests/ref/fate/lagarith-rgb24
+++ b/tests/ref/fate/lagarith-rgb24
@@ -1,4 +1,8 @@
 #tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 480x256
+#sar 0: 0/1
 0,          0,          0,        1,   368640, 0x26f74db2
 0,          1,          1,        1,   368640, 0x63b29ea4
 0,          2,          2,        1,   368640, 0x19467f03
diff --git a/tests/ref/fate/lagarith-rgb32 b/tests/ref/fate/lagarith-rgb32
index 490e2e5c7d..8a4c4d2a93 100644
--- a/tests/ref/fate/lagarith-rgb32
+++ b/tests/ref/fate/lagarith-rgb32
@@ -1,4 +1,8 @@
 #tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
 0,          0,          0,        1,  1382400, 0x00000000
 0,          1,          1,        1,  1382400, 0x00000000
 0,          2,          2,        1,  1382400, 0x00000000
diff --git a/tests/ref/fate/lagarith-ticket4119 b/tests/ref/fate/lagarith-ticket4119
new file mode 100644
index 0000000000..c46ef041e4
--- /dev/null
+++ b/tests/ref/fate/lagarith-ticket4119
@@ -0,0 +1,8 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x360
+#sar 0: 0/1
+0,          0,          0,        1,   691200, 0x00000000
+0,         25,         25,        1,   691200, 0xc88a6f24
+0,         50,         50,        1,   691200, 0x906d474c
diff --git a/tests/ref/fate/lagarith-ticket4119-cfr b/tests/ref/fate/lagarith-ticket4119-cfr
new file mode 100644
index 0000000000..324fe4483f
--- /dev/null
+++ b/tests/ref/fate/lagarith-ticket4119-cfr
@@ -0,0 +1,79 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x360
+#sar 0: 0/1
+0,          0,          0,        1,   691200, 0x00000000
+0,          1,          1,        1,   691200, 0x00000000
+0,          2,          2,        1,   691200, 0x00000000
+0,          3,          3,        1,   691200, 0x00000000
+0,          4,          4,        1,   691200, 0x00000000
+0,          5,          5,        1,   691200, 0x00000000
+0,          6,          6,        1,   691200, 0x00000000
+0,          7,          7,        1,   691200, 0x00000000
+0,          8,          8,        1,   691200, 0x00000000
+0,          9,          9,        1,   691200, 0x00000000
+0,         10,         10,        1,   691200, 0x00000000
+0,         11,         11,        1,   691200, 0x00000000
+0,         12,         12,        1,   691200, 0x00000000
+0,         13,         13,        1,   691200, 0x00000000
+0,         14,         14,        1,   691200, 0x00000000
+0,         15,         15,        1,   691200, 0x00000000
+0,         16,         16,        1,   691200, 0x00000000
+0,         17,         17,        1,   691200, 0x00000000
+0,         18,         18,        1,   691200, 0x00000000
+0,         19,         19,        1,   691200, 0x00000000
+0,         20,         20,        1,   691200, 0x00000000
+0,         21,         21,        1,   691200, 0x00000000
+0,         22,         22,        1,   691200, 0x00000000
+0,         23,         23,        1,   691200, 0x00000000
+0,         24,         24,        1,   691200, 0xc88a6f24
+0,         25,         25,        1,   691200, 0xc88a6f24
+0,         26,         26,        1,   691200, 0xc88a6f24
+0,         27,         27,        1,   691200, 0xc88a6f24
+0,         28,         28,        1,   691200, 0xc88a6f24
+0,         29,         29,        1,   691200, 0xc88a6f24
+0,         30,         30,        1,   691200, 0xc88a6f24
+0,         31,         31,        1,   691200, 0xc88a6f24
+0,         32,         32,        1,   691200, 0xc88a6f24
+0,         33,         33,        1,   691200, 0xc88a6f24
+0,         34,         34,        1,   691200, 0xc88a6f24
+0,         35,         35,        1,   691200, 0xc88a6f24
+0,         36,         36,        1,   691200, 0xc88a6f24
+0,         37,         37,        1,   691200, 0xc88a6f24
+0,         38,         38,        1,   691200, 0xc88a6f24
+0,         39,         39,        1,   691200, 0xc88a6f24
+0,         40,         40,        1,   691200, 0xc88a6f24
+0,         41,         41,        1,   691200, 0xc88a6f24
+0,         42,         42,        1,   691200, 0xc88a6f24
+0,         43,         43,        1,   691200, 0xc88a6f24
+0,         44,         44,        1,   691200, 0xc88a6f24
+0,         45,         45,        1,   691200, 0xc88a6f24
+0,         46,         46,        1,   691200, 0xc88a6f24
+0,         47,         47,        1,   691200, 0xc88a6f24
+0,         48,         48,        1,   691200, 0xc88a6f24
+0,         49,         49,        1,   691200, 0x906d474c
+0,         50,         50,        1,   691200, 0x906d474c
+0,         51,         51,        1,   691200, 0x906d474c
+0,         52,         52,        1,   691200, 0x906d474c
+0,         53,         53,        1,   691200, 0x906d474c
+0,         54,         54,        1,   691200, 0x906d474c
+0,         55,         55,        1,   691200, 0x906d474c
+0,         56,         56,        1,   691200, 0x906d474c
+0,         57,         57,        1,   691200, 0x906d474c
+0,         58,         58,        1,   691200, 0x906d474c
+0,         59,         59,        1,   691200, 0x906d474c
+0,         60,         60,        1,   691200, 0x906d474c
+0,         61,         61,        1,   691200, 0x906d474c
+0,         62,         62,        1,   691200, 0x906d474c
+0,         63,         63,        1,   691200, 0x906d474c
+0,         64,         64,        1,   691200, 0x906d474c
+0,         65,         65,        1,   691200, 0x906d474c
+0,         66,         66,        1,   691200, 0x906d474c
+0,         67,         67,        1,   691200, 0x906d474c
+0,         68,         68,        1,   691200, 0x906d474c
+0,         69,         69,        1,   691200, 0x906d474c
+0,         70,         70,        1,   691200, 0x906d474c
+0,         71,         71,        1,   691200, 0x906d474c
+0,         72,         72,        1,   691200, 0x906d474c
+0,         73,         73,        1,   691200, 0x906d474c
diff --git a/tests/ref/fate/lagarith-ticket4119-drop b/tests/ref/fate/lagarith-ticket4119-drop
new file mode 100644
index 0000000000..abc58d5cb5
--- /dev/null
+++ b/tests/ref/fate/lagarith-ticket4119-drop
@@ -0,0 +1,8 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x360
+#sar 0: 0/1
+0,          0,          0,        1,   691200, 0x00000000
+0,          1,          1,        1,   691200, 0xc88a6f24
+0,          2,          2,        1,   691200, 0x906d474c
diff --git a/tests/ref/fate/lagarith-ticket4119-pass b/tests/ref/fate/lagarith-ticket4119-pass
new file mode 100644
index 0000000000..c46ef041e4
--- /dev/null
+++ b/tests/ref/fate/lagarith-ticket4119-pass
@@ -0,0 +1,8 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x360
+#sar 0: 0/1
+0,          0,          0,        1,   691200, 0x00000000
+0,         25,         25,        1,   691200, 0xc88a6f24
+0,         50,         50,        1,   691200, 0x906d474c
diff --git a/tests/ref/fate/lagarith-ticket4119-vfr b/tests/ref/fate/lagarith-ticket4119-vfr
new file mode 100644
index 0000000000..c46ef041e4
--- /dev/null
+++ b/tests/ref/fate/lagarith-ticket4119-vfr
@@ -0,0 +1,8 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x360
+#sar 0: 0/1
+0,          0,          0,        1,   691200, 0x00000000
+0,         25,         25,        1,   691200, 0xc88a6f24
+0,         50,         50,        1,   691200, 0x906d474c
diff --git a/tests/ref/fate/lagarith-yuy2 b/tests/ref/fate/lagarith-yuy2
index c5aed92d61..64a211e244 100644
--- a/tests/ref/fate/lagarith-yuy2
+++ b/tests/ref/fate/lagarith-yuy2
@@ -1,2 +1,6 @@
 #tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1024x768
+#sar 0: 0/1
 0,          0,          0,        1,  1572864, 0xeed76a7d
diff --git a/tests/ref/fate/lagarith-yv12 b/tests/ref/fate/lagarith-yv12
index c9c9ff372f..a79a3bab3c 100644
--- a/tests/ref/fate/lagarith-yv12
+++ b/tests/ref/fate/lagarith-yv12
@@ -1,3 +1,7 @@
 #tb 0: 1/60
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x240
+#sar 0: 0/1
 0,          0,          0,        1,    92160, 0x1dfdf5c1
 0,          1,          1,        1,    92160, 0x6965884f
diff --git a/tests/ref/fate/lfg b/tests/ref/fate/lfg
new file mode 100644
index 0000000000..2d00f4d8a2
--- /dev/null
+++ b/tests/ref/fate/lfg
@@ -0,0 +1,1007 @@
+PRN0 : 993.985459
+PRN1 : 1033.987435
+PRN2 : 1047.662570
+PRN3 : 1063.912250
+PRN4 : 991.171781
+PRN5 : 981.734708
+PRN6 : 970.361179
+PRN7 : 998.599410
+PRN8 : 1001.562108
+PRN9 : 1094.675286
+PRN10 : 1026.730733
+PRN11 : 1001.794662
+PRN12 : 1063.992962
+PRN13 : 1003.176291
+PRN14 : 975.451418
+PRN15 : 963.164272
+PRN16 : 1035.042964
+PRN17 : 936.289221
+PRN18 : 1031.696061
+PRN19 : 1033.960882
+PRN20 : 970.449088
+PRN21 : 910.742009
+PRN22 : 1062.832837
+PRN23 : 972.315035
+PRN24 : 1094.553302
+PRN25 : 1004.366061
+PRN26 : 1067.940967
+PRN27 : 954.763340
+PRN28 : 923.089263
+PRN29 : 1053.286222
+PRN30 : 1012.639887
+PRN31 : 948.568149
+PRN32 : 1027.339362
+PRN33 : 953.080426
+PRN34 : 1035.425106
+PRN35 : 966.976740
+PRN36 : 1064.841657
+PRN37 : 904.714740
+PRN38 : 1054.112231
+PRN39 : 986.084454
+PRN40 : 964.995134
+PRN41 : 1064.898415
+PRN42 : 1049.385860
+PRN43 : 946.010664
+PRN44 : 914.563520
+PRN45 : 1054.057798
+PRN46 : 921.007266
+PRN47 : 1055.600575
+PRN48 : 984.003285
+PRN49 : 1064.479044
+PRN50 : 989.128936
+PRN51 : 972.772486
+PRN52 : 1028.824527
+PRN53 : 948.999392
+PRN54 : 926.982512
+PRN55 : 1028.107269
+PRN56 : 1018.971292
+PRN57 : 979.049159
+PRN58 : 1078.652930
+PRN59 : 1059.268785
+PRN60 : 966.062302
+PRN61 : 952.298249
+PRN62 : 965.484659
+PRN63 : 957.131298
+PRN64 : 1101.631483
+PRN65 : 991.328207
+PRN66 : 947.868071
+PRN67 : 977.329736
+PRN68 : 1039.860026
+PRN69 : 1005.357641
+PRN70 : 926.524754
+PRN71 : 1065.337110
+PRN72 : 1016.266500
+PRN73 : 1005.771115
+PRN74 : 1013.342260
+PRN75 : 1016.421157
+PRN76 : 918.857846
+PRN77 : 1084.126406
+PRN78 : 1013.273197
+PRN79 : 1009.859699
+PRN80 : 953.978276
+PRN81 : 966.195381
+PRN82 : 966.041526
+PRN83 : 1034.313935
+PRN84 : 1028.006502
+PRN85 : 988.667994
+PRN86 : 951.447243
+PRN87 : 950.197401
+PRN88 : 1004.492867
+PRN89 : 1018.726549
+PRN90 : 1002.135383
+PRN91 : 1015.553223
+PRN92 : 968.825638
+PRN93 : 909.251629
+PRN94 : 927.430200
+PRN95 : 1026.839173
+PRN96 : 1001.209732
+PRN97 : 903.997372
+PRN98 : 1029.582853
+PRN99 : 998.221588
+PRN100 : 874.533368
+PRN101 : 1008.158727
+PRN102 : 1064.130097
+PRN103 : 1020.425429
+PRN104 : 914.904591
+PRN105 : 1050.711960
+PRN106 : 1019.491585
+PRN107 : 968.062305
+PRN108 : 946.755388
+PRN109 : 1012.508705
+PRN110 : 997.922624
+PRN111 : 962.447265
+PRN112 : 1065.410496
+PRN113 : 1059.470790
+PRN114 : 1036.427789
+PRN115 : 963.516351
+PRN116 : 970.000982
+PRN117 : 978.030226
+PRN118 : 1041.883687
+PRN119 : 924.311759
+PRN120 : 987.574757
+PRN121 : 1020.188441
+PRN122 : 979.109616
+PRN123 : 1076.652961
+PRN124 : 905.994009
+PRN125 : 999.425282
+PRN126 : 1012.521111
+PRN127 : 893.443447
+PRN128 : 978.578327
+PRN129 : 1068.476732
+PRN130 : 960.687195
+PRN131 : 954.211448
+PRN132 : 1031.587651
+PRN133 : 1069.561334
+PRN134 : 948.293168
+PRN135 : 999.185195
+PRN136 : 967.284970
+PRN137 : 1004.112868
+PRN138 : 989.683149
+PRN139 : 1008.154639
+PRN140 : 1043.953748
+PRN141 : 1082.131379
+PRN142 : 1006.528611
+PRN143 : 942.893040
+PRN144 : 1120.072970
+PRN145 : 908.369273
+PRN146 : 1039.338207
+PRN147 : 1011.429056
+PRN148 : 1058.020374
+PRN149 : 1007.346274
+PRN150 : 916.830032
+PRN151 : 1000.237008
+PRN152 : 977.470622
+PRN153 : 985.066693
+PRN154 : 1020.675449
+PRN155 : 1026.074199
+PRN156 : 1087.961390
+PRN157 : 993.836698
+PRN158 : 1008.510268
+PRN159 : 1013.336576
+PRN160 : 1022.611211
+PRN161 : 996.211550
+PRN162 : 1025.772152
+PRN163 : 1058.268017
+PRN164 : 911.997787
+PRN165 : 1052.556722
+PRN166 : 998.536098
+PRN167 : 915.837410
+PRN168 : 979.313138
+PRN169 : 1045.691152
+PRN170 : 1018.832329
+PRN171 : 1086.959291
+PRN172 : 1065.875576
+PRN173 : 1018.341432
+PRN174 : 1101.511906
+PRN175 : 1130.164468
+PRN176 : 1043.232574
+PRN177 : 1086.907863
+PRN178 : 1025.378136
+PRN179 : 999.601323
+PRN180 : 1036.776794
+PRN181 : 988.653272
+PRN182 : 973.274518
+PRN183 : 1000.807655
+PRN184 : 1057.386211
+PRN185 : 960.735035
+PRN186 : 904.872645
+PRN187 : 889.117280
+PRN188 : 983.809186
+PRN189 : 912.874411
+PRN190 : 975.589269
+PRN191 : 948.421999
+PRN192 : 947.657566
+PRN193 : 950.000738
+PRN194 : 962.922561
+PRN195 : 1026.301488
+PRN196 : 1029.353812
+PRN197 : 1047.303674
+PRN198 : 1028.695557
+PRN199 : 1070.200632
+PRN200 : 947.575145
+PRN201 : 876.904616
+PRN202 : 1017.701430
+PRN203 : 1049.267498
+PRN204 : 958.139948
+PRN205 : 967.417379
+PRN206 : 968.274143
+PRN207 : 1000.864388
+PRN208 : 1066.802181
+PRN209 : 1014.463051
+PRN210 : 1026.799870
+PRN211 : 1018.450824
+PRN212 : 988.633963
+PRN213 : 904.749119
+PRN214 : 937.323052
+PRN215 : 1037.391158
+PRN216 : 1026.099281
+PRN217 : 907.667691
+PRN218 : 1010.454766
+PRN219 : 1019.473463
+PRN220 : 1005.177530
+PRN221 : 997.361757
+PRN222 : 954.628248
+PRN223 : 1061.917463
+PRN224 : 1039.311045
+PRN225 : 983.843948
+PRN226 : 968.679422
+PRN227 : 970.518863
+PRN228 : 963.038929
+PRN229 : 1086.210292
+PRN230 : 1022.961948
+PRN231 : 964.149961
+PRN232 : 949.462428
+PRN233 : 959.221279
+PRN234 : 987.151293
+PRN235 : 959.017697
+PRN236 : 996.893693
+PRN237 : 965.063094
+PRN238 : 1000.468116
+PRN239 : 1004.755878
+PRN240 : 995.674256
+PRN241 : 996.723454
+PRN242 : 966.714381
+PRN243 : 992.601460
+PRN244 : 1041.656776
+PRN245 : 1061.690153
+PRN246 : 1103.650456
+PRN247 : 1055.668922
+PRN248 : 1052.582092
+PRN249 : 953.461917
+PRN250 : 1006.433285
+PRN251 : 955.606772
+PRN252 : 1039.688043
+PRN253 : 1088.653591
+PRN254 : 942.093968
+PRN255 : 1031.071161
+PRN256 : 946.110148
+PRN257 : 932.761874
+PRN258 : 1052.693974
+PRN259 : 1008.479381
+PRN260 : 1063.720881
+PRN261 : 992.478541
+PRN262 : 915.981089
+PRN263 : 992.027282
+PRN264 : 1024.266535
+PRN265 : 919.165065
+PRN266 : 1010.516440
+PRN267 : 997.213969
+PRN268 : 1021.925225
+PRN269 : 978.883278
+PRN270 : 981.515166
+PRN271 : 980.281886
+PRN272 : 1053.161093
+PRN273 : 912.521231
+PRN274 : 953.132131
+PRN275 : 1004.643842
+PRN276 : 1058.794186
+PRN277 : 984.215138
+PRN278 : 1042.304270
+PRN279 : 972.388973
+PRN280 : 1033.185530
+PRN281 : 969.133442
+PRN282 : 1027.169707
+PRN283 : 1061.483306
+PRN284 : 960.680868
+PRN285 : 1001.272929
+PRN286 : 1017.813674
+PRN287 : 983.331085
+PRN288 : 932.052156
+PRN289 : 1004.348693
+PRN290 : 1086.961051
+PRN291 : 1038.181141
+PRN292 : 1050.191404
+PRN293 : 997.767778
+PRN294 : 1080.797673
+PRN295 : 976.782991
+PRN296 : 1031.633723
+PRN297 : 1011.128806
+PRN298 : 1008.380640
+PRN299 : 1087.552272
+PRN300 : 962.484066
+PRN301 : 942.301619
+PRN302 : 983.039469
+PRN303 : 962.689056
+PRN304 : 947.296230
+PRN305 : 1070.666154
+PRN306 : 1032.115321
+PRN307 : 1021.567324
+PRN308 : 953.506490
+PRN309 : 1002.026680
+PRN310 : 1008.181860
+PRN311 : 1025.392684
+PRN312 : 968.955019
+PRN313 : 1049.458891
+PRN314 : 957.676990
+PRN315 : 1035.683512
+PRN316 : 1112.131175
+PRN317 : 1055.138933
+PRN318 : 1078.236814
+PRN319 : 1125.693872
+PRN320 : 1022.131166
+PRN321 : 1116.997957
+PRN322 : 1089.131000
+PRN323 : 1077.159289
+PRN324 : 945.536432
+PRN325 : 1075.404651
+PRN326 : 946.487332
+PRN327 : 1024.258871
+PRN328 : 1031.225842
+PRN329 : 1016.780255
+PRN330 : 1103.910936
+PRN331 : 1000.846691
+PRN332 : 984.532087
+PRN333 : 1005.306673
+PRN334 : 1113.067840
+PRN335 : 964.786705
+PRN336 : 1031.129909
+PRN337 : 1102.032227
+PRN338 : 1032.427500
+PRN339 : 915.287948
+PRN340 : 1069.521468
+PRN341 : 1037.884311
+PRN342 : 1022.783172
+PRN343 : 1010.113843
+PRN344 : 936.663822
+PRN345 : 967.568134
+PRN346 : 998.248532
+PRN347 : 970.595103
+PRN348 : 1059.133013
+PRN349 : 1002.450372
+PRN350 : 1041.569244
+PRN351 : 1071.151467
+PRN352 : 1074.430879
+PRN353 : 1024.192522
+PRN354 : 1027.316098
+PRN355 : 903.837437
+PRN356 : 1025.087981
+PRN357 : 1078.239201
+PRN358 : 947.160744
+PRN359 : 943.791880
+PRN360 : 982.419379
+PRN361 : 1015.326413
+PRN362 : 930.457683
+PRN363 : 1056.989164
+PRN364 : 1048.214411
+PRN365 : 1011.714309
+PRN366 : 973.561885
+PRN367 : 938.897489
+PRN368 : 898.131351
+PRN369 : 1089.422229
+PRN370 : 1000.737285
+PRN371 : 943.187609
+PRN372 : 980.631385
+PRN373 : 1026.612456
+PRN374 : 914.530023
+PRN375 : 989.137431
+PRN376 : 936.013065
+PRN377 : 1037.484721
+PRN378 : 1005.741041
+PRN379 : 1079.121866
+PRN380 : 1055.031055
+PRN381 : 967.647139
+PRN382 : 1073.874913
+PRN383 : 987.676314
+PRN384 : 1064.291410
+PRN385 : 1036.029393
+PRN386 : 1021.885249
+PRN387 : 971.958380
+PRN388 : 1060.807076
+PRN389 : 944.558349
+PRN390 : 936.791120
+PRN391 : 986.203862
+PRN392 : 934.815474
+PRN393 : 950.177863
+PRN394 : 1053.566520
+PRN395 : 955.717211
+PRN396 : 914.562496
+PRN397 : 1021.237741
+PRN398 : 985.669335
+PRN399 : 1049.267052
+PRN400 : 1096.201981
+PRN401 : 871.290446
+PRN402 : 1056.942788
+PRN403 : 991.680777
+PRN404 : 987.094995
+PRN405 : 1030.857572
+PRN406 : 1014.738174
+PRN407 : 1122.789424
+PRN408 : 1057.378717
+PRN409 : 852.638284
+PRN410 : 979.034993
+PRN411 : 1050.776805
+PRN412 : 1013.760119
+PRN413 : 1013.442288
+PRN414 : 1056.335907
+PRN415 : 1003.833582
+PRN416 : 952.287368
+PRN417 : 983.410711
+PRN418 : 981.610215
+PRN419 : 955.751367
+PRN420 : 1026.024405
+PRN421 : 913.215405
+PRN422 : 1039.587952
+PRN423 : 934.420327
+PRN424 : 1048.085188
+PRN425 : 1069.984971
+PRN426 : 1022.569605
+PRN427 : 994.967729
+PRN428 : 978.231174
+PRN429 : 1091.191368
+PRN430 : 1110.565525
+PRN431 : 993.099640
+PRN432 : 943.356916
+PRN433 : 1008.520337
+PRN434 : 1039.057948
+PRN435 : 995.518711
+PRN436 : 923.381630
+PRN437 : 1008.525954
+PRN438 : 1074.725786
+PRN439 : 973.831465
+PRN440 : 992.850511
+PRN441 : 915.574772
+PRN442 : 935.268901
+PRN443 : 1030.668761
+PRN444 : 1006.389624
+PRN445 : 1070.532520
+PRN446 : 1044.161059
+PRN447 : 1009.868970
+PRN448 : 995.488179
+PRN449 : 1003.676963
+PRN450 : 1036.281447
+PRN451 : 1034.663850
+PRN452 : 1016.940948
+PRN453 : 1041.761449
+PRN454 : 1036.179308
+PRN455 : 927.147021
+PRN456 : 1015.267516
+PRN457 : 1025.120602
+PRN458 : 1003.012895
+PRN459 : 1017.405398
+PRN460 : 1084.152015
+PRN461 : 938.100545
+PRN462 : 982.848682
+PRN463 : 971.208439
+PRN464 : 1024.169902
+PRN465 : 984.026162
+PRN466 : 885.734952
+PRN467 : 970.662665
+PRN468 : 966.626383
+PRN469 : 970.630895
+PRN470 : 1065.729526
+PRN471 : 1087.725051
+PRN472 : 934.663676
+PRN473 : 982.326660
+PRN474 : 1028.573796
+PRN475 : 1042.602736
+PRN476 : 919.644128
+PRN477 : 1117.592528
+PRN478 : 973.727786
+PRN479 : 1017.035309
+PRN480 : 985.948508
+PRN481 : 993.332284
+PRN482 : 913.783006
+PRN483 : 1036.292614
+PRN484 : 944.347075
+PRN485 : 993.774520
+PRN486 : 1004.501737
+PRN487 : 975.074516
+PRN488 : 960.381723
+PRN489 : 1032.461979
+PRN490 : 965.849830
+PRN491 : 959.343865
+PRN492 : 998.303510
+PRN493 : 1098.972429
+PRN494 : 978.774732
+PRN495 : 923.587406
+PRN496 : 934.194464
+PRN497 : 1019.233725
+PRN498 : 998.978470
+PRN499 : 969.151090
+PRN500 : 1008.850844
+PRN501 : 1002.711126
+PRN502 : 991.872449
+PRN503 : 948.998513
+PRN504 : 985.482935
+PRN505 : 1064.356664
+PRN506 : 920.085989
+PRN507 : 957.924976
+PRN508 : 1059.586657
+PRN509 : 948.912499
+PRN510 : 969.734926
+PRN511 : 991.121045
+PRN512 : 980.425651
+PRN513 : 1002.105883
+PRN514 : 1044.420229
+PRN515 : 1050.108383
+PRN516 : 1055.666511
+PRN517 : 1050.562993
+PRN518 : 918.954103
+PRN519 : 1031.398881
+PRN520 : 1015.533157
+PRN521 : 982.110348
+PRN522 : 911.625140
+PRN523 : 908.261708
+PRN524 : 892.515101
+PRN525 : 999.272597
+PRN526 : 1063.535795
+PRN527 : 1001.036057
+PRN528 : 1054.891358
+PRN529 : 970.513392
+PRN530 : 1009.957719
+PRN531 : 994.077721
+PRN532 : 1094.151066
+PRN533 : 987.039498
+PRN534 : 973.811047
+PRN535 : 959.839155
+PRN536 : 961.322994
+PRN537 : 1051.549887
+PRN538 : 931.006138
+PRN539 : 1090.452240
+PRN540 : 967.033966
+PRN541 : 991.451211
+PRN542 : 1042.788825
+PRN543 : 1075.910278
+PRN544 : 1009.225010
+PRN545 : 1005.631562
+PRN546 : 972.521547
+PRN547 : 1001.788406
+PRN548 : 1026.096292
+PRN549 : 943.517653
+PRN550 : 1043.297977
+PRN551 : 1068.734900
+PRN552 : 971.528905
+PRN553 : 1101.736300
+PRN554 : 1064.997347
+PRN555 : 1036.258822
+PRN556 : 921.038528
+PRN557 : 1009.332591
+PRN558 : 908.767369
+PRN559 : 950.432316
+PRN560 : 1025.848851
+PRN561 : 1026.275418
+PRN562 : 1027.138158
+PRN563 : 891.008164
+PRN564 : 966.635315
+PRN565 : 1105.694983
+PRN566 : 901.168653
+PRN567 : 1005.085680
+PRN568 : 986.376781
+PRN569 : 1021.988728
+PRN570 : 1032.032304
+PRN571 : 1066.922843
+PRN572 : 978.165759
+PRN573 : 985.471003
+PRN574 : 1018.542739
+PRN575 : 1104.217604
+PRN576 : 993.366411
+PRN577 : 908.428162
+PRN578 : 1030.181215
+PRN579 : 959.654949
+PRN580 : 1001.943741
+PRN581 : 1024.829762
+PRN582 : 912.207242
+PRN583 : 1016.092124
+PRN584 : 944.519752
+PRN585 : 1115.606496
+PRN586 : 884.228571
+PRN587 : 1080.684296
+PRN588 : 1000.544389
+PRN589 : 1018.277531
+PRN590 : 1069.476533
+PRN591 : 972.380515
+PRN592 : 979.162973
+PRN593 : 1040.650719
+PRN594 : 962.376923
+PRN595 : 929.303273
+PRN596 : 977.208942
+PRN597 : 1009.877287
+PRN598 : 946.361825
+PRN599 : 937.358872
+PRN600 : 1045.706701
+PRN601 : 1001.353164
+PRN602 : 1071.691606
+PRN603 : 1020.971714
+PRN604 : 957.623404
+PRN605 : 970.896382
+PRN606 : 941.442249
+PRN607 : 945.406684
+PRN608 : 980.972425
+PRN609 : 969.174424
+PRN610 : 1031.894081
+PRN611 : 1029.095046
+PRN612 : 957.535746
+PRN613 : 943.186463
+PRN614 : 955.065383
+PRN615 : 988.925782
+PRN616 : 969.603025
+PRN617 : 976.321914
+PRN618 : 1081.982260
+PRN619 : 1021.381110
+PRN620 : 978.594813
+PRN621 : 991.522599
+PRN622 : 1056.221346
+PRN623 : 1005.261003
+PRN624 : 938.437253
+PRN625 : 1005.952092
+PRN626 : 1034.131845
+PRN627 : 1026.000397
+PRN628 : 1056.506798
+PRN629 : 1007.883782
+PRN630 : 948.805620
+PRN631 : 926.033432
+PRN632 : 929.683971
+PRN633 : 1084.549770
+PRN634 : 939.995126
+PRN635 : 1017.329087
+PRN636 : 929.734793
+PRN637 : 968.947835
+PRN638 : 992.543787
+PRN639 : 1051.439605
+PRN640 : 962.215123
+PRN641 : 934.669279
+PRN642 : 873.191979
+PRN643 : 978.156276
+PRN644 : 1036.169440
+PRN645 : 1009.123122
+PRN646 : 1042.696787
+PRN647 : 1004.992474
+PRN648 : 985.307029
+PRN649 : 914.993369
+PRN650 : 883.268853
+PRN651 : 978.492871
+PRN652 : 1037.468856
+PRN653 : 903.697832
+PRN654 : 1016.299145
+PRN655 : 1032.662729
+PRN656 : 971.860043
+PRN657 : 876.217640
+PRN658 : 1076.128497
+PRN659 : 967.662496
+PRN660 : 1118.152109
+PRN661 : 959.402400
+PRN662 : 931.127652
+PRN663 : 963.395502
+PRN664 : 985.039373
+PRN665 : 1130.966014
+PRN666 : 1015.222803
+PRN667 : 979.416557
+PRN668 : 1044.451714
+PRN669 : 1013.521435
+PRN670 : 986.434595
+PRN671 : 1081.668437
+PRN672 : 1118.515896
+PRN673 : 989.972971
+PRN674 : 966.293542
+PRN675 : 960.277413
+PRN676 : 1000.049668
+PRN677 : 1082.002407
+PRN678 : 993.898160
+PRN679 : 1026.534251
+PRN680 : 962.202086
+PRN681 : 1004.697585
+PRN682 : 945.449849
+PRN683 : 1036.296061
+PRN684 : 1025.414145
+PRN685 : 1063.165272
+PRN686 : 993.281842
+PRN687 : 1024.850451
+PRN688 : 978.756895
+PRN689 : 1000.348903
+PRN690 : 886.538615
+PRN691 : 1044.053091
+PRN692 : 1011.514352
+PRN693 : 977.162158
+PRN694 : 1040.123413
+PRN695 : 1049.348768
+PRN696 : 1070.281599
+PRN697 : 994.095158
+PRN698 : 998.311277
+PRN699 : 996.305247
+PRN700 : 926.604115
+PRN701 : 1000.046728
+PRN702 : 992.973540
+PRN703 : 1001.014210
+PRN704 : 950.900234
+PRN705 : 1074.602127
+PRN706 : 987.731174
+PRN707 : 946.971275
+PRN708 : 1027.578158
+PRN709 : 1024.011220
+PRN710 : 959.145194
+PRN711 : 1006.423937
+PRN712 : 981.213721
+PRN713 : 1044.065461
+PRN714 : 979.223485
+PRN715 : 1008.857033
+PRN716 : 1043.892450
+PRN717 : 1060.529980
+PRN718 : 933.250802
+PRN719 : 1061.461152
+PRN720 : 961.259637
+PRN721 : 1058.283064
+PRN722 : 1011.319119
+PRN723 : 996.167947
+PRN724 : 1037.665974
+PRN725 : 865.574895
+PRN726 : 1002.911144
+PRN727 : 978.886205
+PRN728 : 1002.302369
+PRN729 : 945.213366
+PRN730 : 1049.330526
+PRN731 : 1011.089995
+PRN732 : 911.273000
+PRN733 : 1030.796132
+PRN734 : 1101.699446
+PRN735 : 868.524288
+PRN736 : 951.807712
+PRN737 : 997.957367
+PRN738 : 953.791979
+PRN739 : 954.430760
+PRN740 : 993.834055
+PRN741 : 1021.300808
+PRN742 : 891.272906
+PRN743 : 879.577939
+PRN744 : 1093.176950
+PRN745 : 961.198091
+PRN746 : 976.086349
+PRN747 : 900.514535
+PRN748 : 911.711376
+PRN749 : 975.997454
+PRN750 : 1007.292432
+PRN751 : 1023.266464
+PRN752 : 1066.723102
+PRN753 : 1060.468262
+PRN754 : 1115.673922
+PRN755 : 1041.290534
+PRN756 : 912.248040
+PRN757 : 1034.518587
+PRN758 : 967.154895
+PRN759 : 1043.478493
+PRN760 : 1026.025257
+PRN761 : 997.795632
+PRN762 : 948.207823
+PRN763 : 970.366980
+PRN764 : 973.390941
+PRN765 : 1008.249734
+PRN766 : 965.810614
+PRN767 : 1034.368743
+PRN768 : 969.130435
+PRN769 : 939.525153
+PRN770 : 939.346863
+PRN771 : 1098.433434
+PRN772 : 973.913623
+PRN773 : 994.629391
+PRN774 : 1019.029751
+PRN775 : 999.068601
+PRN776 : 952.374565
+PRN777 : 1005.413476
+PRN778 : 1008.606450
+PRN779 : 949.586928
+PRN780 : 984.336007
+PRN781 : 966.334220
+PRN782 : 952.353697
+PRN783 : 1081.685083
+PRN784 : 1148.865924
+PRN785 : 1043.881782
+PRN786 : 950.747262
+PRN787 : 1013.342099
+PRN788 : 1021.841738
+PRN789 : 943.202183
+PRN790 : 1018.658753
+PRN791 : 1039.519748
+PRN792 : 1066.745417
+PRN793 : 991.922297
+PRN794 : 989.993508
+PRN795 : 935.256770
+PRN796 : 1049.355101
+PRN797 : 984.271969
+PRN798 : 1046.060384
+PRN799 : 1044.170052
+PRN800 : 920.720627
+PRN801 : 938.453295
+PRN802 : 980.425711
+PRN803 : 974.857425
+PRN804 : 1016.266917
+PRN805 : 1039.658764
+PRN806 : 925.171481
+PRN807 : 982.577139
+PRN808 : 997.552114
+PRN809 : 1063.108389
+PRN810 : 927.965656
+PRN811 : 1049.828313
+PRN812 : 1012.506665
+PRN813 : 962.613627
+PRN814 : 915.580235
+PRN815 : 1003.806599
+PRN816 : 1086.454522
+PRN817 : 968.915000
+PRN818 : 1008.546559
+PRN819 : 856.499306
+PRN820 : 960.536031
+PRN821 : 1025.778766
+PRN822 : 1071.326673
+PRN823 : 993.205599
+PRN824 : 1052.750624
+PRN825 : 1040.987166
+PRN826 : 1034.039072
+PRN827 : 963.048804
+PRN828 : 970.510949
+PRN829 : 1049.829816
+PRN830 : 934.945358
+PRN831 : 980.925084
+PRN832 : 1037.321718
+PRN833 : 1031.532551
+PRN834 : 1049.045828
+PRN835 : 1086.751941
+PRN836 : 1036.770670
+PRN837 : 1032.479988
+PRN838 : 957.264581
+PRN839 : 982.586134
+PRN840 : 1002.144549
+PRN841 : 856.221346
+PRN842 : 1077.732261
+PRN843 : 1023.844204
+PRN844 : 1049.015013
+PRN845 : 1109.868706
+PRN846 : 1032.030843
+PRN847 : 994.431051
+PRN848 : 999.263384
+PRN849 : 1052.311112
+PRN850 : 955.831734
+PRN851 : 958.864423
+PRN852 : 1016.728795
+PRN853 : 1004.874796
+PRN854 : 1004.259084
+PRN855 : 963.819718
+PRN856 : 949.755330
+PRN857 : 987.900168
+PRN858 : 995.226017
+PRN859 : 1098.708859
+PRN860 : 1009.514337
+PRN861 : 948.777253
+PRN862 : 982.680500
+PRN863 : 996.028285
+PRN864 : 1029.124415
+PRN865 : 942.101818
+PRN866 : 1034.222040
+PRN867 : 949.348550
+PRN868 : 965.963597
+PRN869 : 995.021503
+PRN870 : 889.653326
+PRN871 : 951.899055
+PRN872 : 1038.667756
+PRN873 : 1088.885329
+PRN874 : 979.471141
+PRN875 : 1027.647348
+PRN876 : 1054.157446
+PRN877 : 1003.472116
+PRN878 : 914.016815
+PRN879 : 1034.862598
+PRN880 : 936.253104
+PRN881 : 962.254857
+PRN882 : 1042.166034
+PRN883 : 934.618156
+PRN884 : 939.923222
+PRN885 : 998.649324
+PRN886 : 986.753492
+PRN887 : 1095.450118
+PRN888 : 982.660119
+PRN889 : 947.149665
+PRN890 : 893.930985
+PRN891 : 956.589953
+PRN892 : 1067.312301
+PRN893 : 952.406240
+PRN894 : 986.728920
+PRN895 : 1030.999219
+PRN896 : 993.306628
+PRN897 : 972.230094
+PRN898 : 993.227094
+PRN899 : 1008.926188
+PRN900 : 976.391192
+PRN901 : 952.545561
+PRN902 : 1011.157462
+PRN903 : 1056.357455
+PRN904 : 1027.929510
+PRN905 : 986.749151
+PRN906 : 963.462803
+PRN907 : 988.772926
+PRN908 : 1031.930882
+PRN909 : 981.130300
+PRN910 : 1073.463235
+PRN911 : 1081.696380
+PRN912 : 1020.678551
+PRN913 : 906.544270
+PRN914 : 1097.495849
+PRN915 : 1113.146380
+PRN916 : 1058.443029
+PRN917 : 902.487848
+PRN918 : 1009.914281
+PRN919 : 1057.100054
+PRN920 : 940.428079
+PRN921 : 941.473058
+PRN922 : 905.716759
+PRN923 : 997.789107
+PRN924 : 962.306176
+PRN925 : 1072.504216
+PRN926 : 946.554822
+PRN927 : 972.932223
+PRN928 : 1024.961360
+PRN929 : 1080.513692
+PRN930 : 1047.137658
+PRN931 : 1012.824933
+PRN932 : 976.404512
+PRN933 : 895.604509
+PRN934 : 1114.446905
+PRN935 : 1051.342533
+PRN936 : 1027.204609
+PRN937 : 917.811842
+PRN938 : 882.306487
+PRN939 : 1010.444766
+PRN940 : 978.686109
+PRN941 : 1020.585581
+PRN942 : 989.944335
+PRN943 : 1010.484323
+PRN944 : 936.727744
+PRN945 : 1038.631446
+PRN946 : 1012.530572
+PRN947 : 961.577357
+PRN948 : 988.253770
+PRN949 : 1054.353206
+PRN950 : 964.120426
+PRN951 : 943.486864
+PRN952 : 1052.650937
+PRN953 : 980.334313
+PRN954 : 1137.186817
+PRN955 : 1125.255968
+PRN956 : 964.830093
+PRN957 : 930.646626
+PRN958 : 1043.519941
+PRN959 : 1088.829938
+PRN960 : 1024.017051
+PRN961 : 1065.574266
+PRN962 : 1008.740833
+PRN963 : 972.421950
+PRN964 : 1082.991316
+PRN965 : 963.163028
+PRN966 : 1040.184197
+PRN967 : 865.234238
+PRN968 : 1026.703665
+PRN969 : 991.758625
+PRN970 : 1091.021716
+PRN971 : 1079.872892
+PRN972 : 1042.401875
+PRN973 : 1085.624604
+PRN974 : 1055.314437
+PRN975 : 1138.344149
+PRN976 : 906.958400
+PRN977 : 954.641162
+PRN978 : 1014.840472
+PRN979 : 991.906864
+PRN980 : 947.716713
+PRN981 : 1075.346169
+PRN982 : 913.043943
+PRN983 : 1006.107228
+PRN984 : 940.937691
+PRN985 : 925.827770
+PRN986 : 870.001279
+PRN987 : 1093.348026
+PRN988 : 990.938631
+PRN989 : 1067.552107
+PRN990 : 936.441162
+PRN991 : 956.066787
+PRN992 : 1001.705214
+PRN993 : 1007.198453
+PRN994 : 956.883661
+PRN995 : 1033.645356
+PRN996 : 1036.395999
+PRN997 : 954.941658
+PRN998 : 1015.720547
+PRN999 : 1023.147999
+sample mean  : 1000.303825
+true mean    : 1000.000000
+sample stddev: 53.233584
+true stddev  : 53.000000
+z-score      : 0.181279
+p-value      : 0.428600
+QH[normality]: 1.015347
diff --git a/tests/ref/fate/libavcodec-htmlsubtitles b/tests/ref/fate/libavcodec-htmlsubtitles
new file mode 100644
index 0000000000..66dd8e8d48
--- /dev/null
+++ b/tests/ref/fate/libavcodec-htmlsubtitles
@@ -0,0 +1,8 @@
+<<hello>> --> <<hello>>
+<<<b>hello</b>>> --> <<{\b1}hello{\b0}>>
+< hello < 2000 > world > --> < hello < 2000 > world >
+<h1>TITLE</h1> --> TITLE
+< font color=red >red</font> --> {\c&HFF&}red{\c}
+Foo <foo@bar.com> --> Foo <foo@bar.com>
+<b> foo <I> bar </B> bla </i> --> {\b1} foo {\i1} bar {\b0} bla {\i0}
+A<br>B<BR/>C<br  / >D<  Br >E<brk><brk/> --> A\NB\NC\ND\NE
diff --git a/tests/ref/fate/libavcodec-options b/tests/ref/fate/libavcodec-options
new file mode 100644
index 0000000000..ecdcac5cac
--- /dev/null
+++ b/tests/ref/fate/libavcodec-options
@@ -0,0 +1,161 @@
+testing avcodec_copy_context()
+dummy_v1_codec -> dummy_v1_codec
+closed:
+dummy_v1_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v1_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+opened:
+dummy_v1_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v1_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v1_codec -> dummy_v2_codec
+closed:
+dummy_v1_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v2_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+opened:
+dummy_v1_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v2_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+dummy_v1_codec -> dummy_v3_codec
+closed:
+dummy_v1_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v3_codec: 128x128 prv: set
+opened:
+dummy_v1_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v3_codec: 128x128 prv: set
+dummy_v1_codec -> dummy_v4_codec
+closed:
+dummy_v1_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v4_codec: 128x128 prv: null
+opened:
+dummy_v1_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v4_codec: 128x128 prv: null
+dummy_v1_codec -> NULL
+closed:
+dummy_v1_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+NULL          : 128x128 prv: null
+opened:
+dummy_v1_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+NULL          : 128x128 prv: null
+dummy_v2_codec -> dummy_v1_codec
+closed:
+dummy_v2_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v1_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+opened:
+dummy_v2_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v1_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+dummy_v2_codec -> dummy_v2_codec
+closed:
+dummy_v2_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v2_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+opened:
+dummy_v2_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v2_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v2_codec -> dummy_v3_codec
+closed:
+dummy_v2_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v3_codec: 128x128 prv: set
+opened:
+dummy_v2_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v3_codec: 128x128 prv: set
+dummy_v2_codec -> dummy_v4_codec
+closed:
+dummy_v2_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v4_codec: 128x128 prv: null
+opened:
+dummy_v2_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+dummy_v4_codec: 128x128 prv: null
+dummy_v2_codec -> NULL
+closed:
+dummy_v2_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+NULL          : 128x128 prv: null
+opened:
+dummy_v2_codec: 128x128 prv: set opts: 1500100900 i'm src default value
+NULL          : 128x128 prv: null
+dummy_v3_codec -> dummy_v1_codec
+closed:
+dummy_v3_codec: 128x128 prv: set
+dummy_v1_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+opened:
+dummy_v3_codec: 128x128 prv: set
+dummy_v1_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+dummy_v3_codec -> dummy_v2_codec
+closed:
+dummy_v3_codec: 128x128 prv: set
+dummy_v2_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+opened:
+dummy_v3_codec: 128x128 prv: set
+dummy_v2_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+dummy_v3_codec -> dummy_v3_codec
+closed:
+dummy_v3_codec: 128x128 prv: set
+dummy_v3_codec: 128x128 prv: set
+opened:
+dummy_v3_codec: 128x128 prv: set
+dummy_v3_codec: 128x128 prv: set
+dummy_v3_codec -> dummy_v4_codec
+closed:
+dummy_v3_codec: 128x128 prv: set
+dummy_v4_codec: 128x128 prv: null
+opened:
+dummy_v3_codec: 128x128 prv: set
+dummy_v4_codec: 128x128 prv: null
+dummy_v3_codec -> NULL
+closed:
+dummy_v3_codec: 128x128 prv: set
+NULL          : 128x128 prv: null
+opened:
+dummy_v3_codec: 128x128 prv: set
+NULL          : 128x128 prv: null
+dummy_v4_codec -> dummy_v1_codec
+closed:
+dummy_v4_codec: 128x128 prv: null
+dummy_v1_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+opened:
+dummy_v4_codec: 128x128 prv: null
+dummy_v1_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+dummy_v4_codec -> dummy_v2_codec
+closed:
+dummy_v4_codec: 128x128 prv: null
+dummy_v2_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+opened:
+dummy_v4_codec: 128x128 prv: null
+dummy_v2_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+dummy_v4_codec -> dummy_v3_codec
+closed:
+dummy_v4_codec: 128x128 prv: null
+dummy_v3_codec: 128x128 prv: set
+opened:
+dummy_v4_codec: 128x128 prv: null
+dummy_v3_codec: 128x128 prv: set
+dummy_v4_codec -> dummy_v4_codec
+closed:
+dummy_v4_codec: 128x128 prv: null
+dummy_v4_codec: 128x128 prv: null
+opened:
+dummy_v4_codec: 128x128 prv: null
+dummy_v4_codec: 128x128 prv: null
+dummy_v4_codec -> NULL
+closed:
+dummy_v4_codec: 128x128 prv: null
+NULL          : 128x128 prv: null
+opened:
+dummy_v4_codec: 128x128 prv: null
+NULL          : 128x128 prv: null
+NULL -> dummy_v1_codec
+closed:
+NULL          : 128x128 prv: null
+dummy_v1_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+NULL -> dummy_v2_codec
+closed:
+NULL          : 128x128 prv: null
+dummy_v2_codec: 128x128 prv: set opts: 667 i'm dest value before copy
+NULL -> dummy_v3_codec
+closed:
+NULL          : 128x128 prv: null
+dummy_v3_codec: 128x128 prv: set
+NULL -> dummy_v4_codec
+closed:
+NULL          : 128x128 prv: null
+dummy_v4_codec: 128x128 prv: null
+NULL -> NULL
+closed:
+NULL          : 128x128 prv: null
+NULL          : 128x128 prv: null
diff --git a/tests/ref/fate/limited_input_seek b/tests/ref/fate/limited_input_seek
new file mode 100644
index 0000000000..e0c4bf151a
--- /dev/null
+++ b/tests/ref/fate/limited_input_seek
@@ -0,0 +1 @@
+20a1bb9a1cfb23c1fe86f14e6065cd95
diff --git a/tests/ref/fate/limited_input_seek-copyts b/tests/ref/fate/limited_input_seek-copyts
new file mode 100644
index 0000000000..92790a8b9b
--- /dev/null
+++ b/tests/ref/fate/limited_input_seek-copyts
@@ -0,0 +1 @@
+ec3604b1954ed80de364b8ef491771ce
diff --git a/tests/ref/fate/lmlm4-demux b/tests/ref/fate/lmlm4-demux
index 95e8be573d..b0276d53e9 100644
--- a/tests/ref/fate/lmlm4-demux
+++ b/tests/ref/fate/lmlm4-demux
@@ -1,217 +1,227 @@
+#extradata 0:       28, 0x2f140538
 #tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: mpeg4
+#dimensions 0: 320x240
+#sar 0: 1/1
 #tb 1: 1/90000
-0,          0,          0,        1,     5951, 0xe9118e0d
+#media_type 1: audio
+#codec_id 1: mp2
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,          0, -9223372036854775808,        1,     5951, 0xe9118e0d
 1,          0,          0,     2160,      768, 0xaebcbebb
 1,       2160,       2160,     2160,      768, 0xaebcbebb
-0,          1,          1,        1,     1672, 0x4b80d4ca
+0,          1, -9223372036854775808,        1,     1672, 0x4b80d4ca, F=0x0
 1,       4320,       4320,     2160,      768, 0xaebcbebb
-0,          2,          2,        1,     1604, 0x99e1b0a7
+0,          2, -9223372036854775808,        1,     1604, 0x99e1b0a7, F=0x0
 1,       6480,       6480,     2160,      768, 0x866fe37a
 1,       8640,       8640,     2160,      768, 0x05d76890
-0,          3,          3,        1,     1204, 0x9559038a
+0,          3, -9223372036854775808,        1,     1204, 0x9559038a, F=0x0
 1,      10800,      10800,     2160,      768, 0x858f5511
-0,          4,          4,        1,     1482, 0x60056564
+0,          4, -9223372036854775808,        1,     1482, 0x60056564, F=0x0
 1,      12960,      12960,     2160,      768, 0x97cb65ef
-0,          5,          5,        1,     1105, 0xf508cef4
+0,          5, -9223372036854775808,        1,     1105, 0xf508cef4, F=0x0
 1,      15120,      15120,     2160,      768, 0xe269742c
 1,      17280,      17280,     2160,      768, 0xa6015f8d
-0,          6,          6,        1,     1193, 0xc8e0fd36
+0,          6, -9223372036854775808,        1,     1193, 0xc8e0fd36, F=0x0
 1,      19440,      19440,     2160,      768, 0x759163e0
-0,          7,          7,        1,     1247, 0x8dd202e5
+0,          7, -9223372036854775808,        1,     1247, 0x8dd202e5, F=0x0
 1,      21600,      21600,     2160,      768, 0xb1e16082
 1,      23760,      23760,     2160,      768, 0x1b616429
-0,          8,          8,        1,     1367, 0xf59435e5
+0,          8, -9223372036854775808,        1,     1367, 0xf59435e5, F=0x0
 1,      25920,      25920,     2160,      768, 0x7e4364f7
-0,          9,          9,        1,     1406, 0x68ba4a7e
+0,          9, -9223372036854775808,        1,     1406, 0x68ba4a7e, F=0x0
 1,      28080,      28080,     2160,      768, 0x59bd64f7
-0,         10,         10,        1,     1262, 0x82c04123
+0,         10, -9223372036854775808,        1,     1262, 0x82c04123, F=0x0
 1,      30240,      30240,     2160,      768, 0xc3116fc6
 1,      32400,      32400,     2160,      768, 0x6a1c6b56
-0,         11,         11,        1,     1381, 0x02335cf9
+0,         11, -9223372036854775808,        1,     1381, 0x02335cf9, F=0x0
 1,      34560,      34560,     2160,      768, 0x285a64cf
-0,         12,         12,        1,     1450, 0x7be46fd1
+0,         12, -9223372036854775808,        1,     1450, 0x7be46fd1, F=0x0
 1,      36720,      36720,     2160,      768, 0x79b16d65
 1,      38880,      38880,     2160,      768, 0x09b47635
-0,         13,         13,        1,     1362, 0x75cc381a
+0,         13, -9223372036854775808,        1,     1362, 0x75cc381a, F=0x0
 1,      41040,      41040,     2160,      768, 0x81597446
-0,         14,         14,        1,     1409, 0x9ed74f3f
+0,         14, -9223372036854775808,        1,     1409, 0x9ed74f3f, F=0x0
 1,      43200,      43200,     2160,      768, 0xfeb66eee
-0,         15,         15,        1,     1253, 0x82400ae1
+0,         15, -9223372036854775808,        1,     1253, 0x82400ae1, F=0x0
 1,      45360,      45360,     2160,      768, 0x78557618
 1,      47520,      47520,     2160,      768, 0x3af170bf
-0,         16,         16,        1,     5499, 0xed286805
+0,         16, -9223372036854775808,        1,     5499, 0xed286805
 1,      49680,      49680,     2160,      768, 0xefbd6399
-0,         17,         17,        1,     1403, 0x483c4cbc
+0,         17, -9223372036854775808,        1,     1403, 0x483c4cbc, F=0x0
 1,      51840,      51840,     2160,      768, 0xc98e7492
 1,      54000,      54000,     2160,      768, 0x010d7149
-0,         18,         18,        1,     1632, 0xa9ebcd6c
+0,         18, -9223372036854775808,        1,     1632, 0xa9ebcd6c, F=0x0
 1,      56160,      56160,     2160,      768, 0xce838b07
-0,         19,         19,        1,     1207, 0xc8580724
+0,         19, -9223372036854775808,        1,     1207, 0xc8580724, F=0x0
 1,      58320,      58320,     2160,      768, 0xed18726c
-0,         20,         20,        1,     1289, 0x61fb2fd2
+0,         20, -9223372036854775808,        1,     1289, 0x61fb2fd2, F=0x0
 1,      60480,      60480,     2160,      768, 0x017e6712
 1,      62640,      62640,     2160,      768, 0x7f9268e9
-0,         21,         21,        1,     1230, 0xf348f53c
+0,         21, -9223372036854775808,        1,     1230, 0xf348f53c, F=0x0
 1,      64800,      64800,     2160,      768, 0xf6f258fc
-0,         22,         22,        1,     1579, 0xa260b1ac
+0,         22, -9223372036854775808,        1,     1579, 0xa260b1ac, F=0x0
 1,      66960,      66960,     2160,      768, 0x9a1a6f31
-0,         23,         23,        1,      949, 0x91849002
+0,         23, -9223372036854775808,        1,      949, 0x91849002, F=0x0
 1,      69120,      69120,     2160,      768, 0x14b47b23
 1,      71280,      71280,     2160,      768, 0x9bdc6a50
-0,         24,         24,        1,      786, 0x3e33576f
+0,         24, -9223372036854775808,        1,      786, 0x3e33576f, F=0x0
 1,      73440,      73440,     2160,      768, 0x0fc46dab
-0,         25,         25,        1,      894, 0x9ac36a61
+0,         25, -9223372036854775808,        1,      894, 0x9ac36a61, F=0x0
 1,      75600,      75600,     2160,      768, 0x6c387372
 1,      77760,      77760,     2160,      768, 0x581e71cd
-0,         26,         26,        1,     1186, 0x6bfc116e
+0,         26, -9223372036854775808,        1,     1186, 0x6bfc116e, F=0x0
 1,      79920,      79920,     2160,      768, 0x00cb785f
-0,         27,         27,        1,     1187, 0xcfc512ae
+0,         27, -9223372036854775808,        1,     1187, 0xcfc512ae, F=0x0
 1,      82080,      82080,     2160,      768, 0x1dda7032
-0,         28,         28,        1,     1527, 0x5c2c965a
+0,         28, -9223372036854775808,        1,     1527, 0x5c2c965a, F=0x0
 1,      84240,      84240,     2160,      768, 0xf57c7103
 1,      86400,      86400,     2160,      768, 0x2d927183
-0,         29,         29,        1,     1536, 0x5ba7ac29
+0,         29, -9223372036854775808,        1,     1536, 0x5ba7ac29, F=0x0
 1,      88560,      88560,     2160,      768, 0xdae86cdf
-0,         30,         30,        1,     1095, 0xce06eb96
+0,         30, -9223372036854775808,        1,     1095, 0xce06eb96, F=0x0
 1,      90720,      90720,     2160,      768, 0x2a2f6c3c
 1,      92880,      92880,     2160,      768, 0x44696eba
-0,         31,         31,        1,     1402, 0x642f6b0d
+0,         31, -9223372036854775808,        1,     1402, 0x642f6b0d, F=0x0
 1,      95040,      95040,     2160,      768, 0xf67c71c4
-0,         32,         32,        1,     5551, 0xf01a9c08
+0,         32, -9223372036854775808,        1,     5551, 0xf01a9c08
 1,      97200,      97200,     2160,      768, 0xc1ce7237
-0,         33,         33,        1,     1211, 0x350206f7
+0,         33, -9223372036854775808,        1,     1211, 0x350206f7, F=0x0
 1,      99360,      99360,     2160,      768, 0xd9c36ef5
 1,     101520,     101520,     2160,      768, 0x63b06b03
-0,         34,         34,        1,      887, 0x08767619
+0,         34, -9223372036854775808,        1,      887, 0x08767619, F=0x0
 1,     103680,     103680,     2160,      768, 0x8de97ebe
-0,         35,         35,        1,     1042, 0xcc81a9ed
+0,         35, -9223372036854775808,        1,     1042, 0xcc81a9ed, F=0x0
 1,     105840,     105840,     2160,      768, 0xbf117c32
 1,     108000,     108000,     2160,      768, 0x82897497
-0,         36,         36,        1,     1247, 0x6f320614
+0,         36, -9223372036854775808,        1,     1247, 0x6f320614, F=0x0
 1,     110160,     110160,     2160,      768, 0x7a347abb
-0,         37,         37,        1,     1459, 0xd28975b5
+0,         37, -9223372036854775808,        1,     1459, 0xd28975b5, F=0x0
 1,     112320,     112320,     2160,      768, 0xc99b691e
-0,         38,         38,        1,     1116, 0x1ab1e9db
+0,         38, -9223372036854775808,        1,     1116, 0x1ab1e9db, F=0x0
 1,     114480,     114480,     2160,      768, 0xf4fc6e74
 1,     116640,     116640,     2160,      768, 0x511d6ec4
-0,         39,         39,        1,     1110, 0x6411f66a
+0,         39, -9223372036854775808,        1,     1110, 0x6411f66a, F=0x0
 1,     118800,     118800,     2160,      768, 0xb8c06b5f
-0,         40,         40,        1,     1282, 0xd468375d
+0,         40, -9223372036854775808,        1,     1282, 0xd468375d, F=0x0
 1,     120960,     120960,     2160,      768, 0xf1776aed
 1,     123120,     123120,     2160,      768, 0xe6fe7fb4
-0,         41,         41,        1,     1077, 0x1273c6e3
+0,         41, -9223372036854775808,        1,     1077, 0x1273c6e3, F=0x0
 1,     125280,     125280,     2160,      768, 0x36907aff
-0,         42,         42,        1,     1043, 0x12dbd3ae
+0,         42, -9223372036854775808,        1,     1043, 0x12dbd3ae, F=0x0
 1,     127440,     127440,     2160,      768, 0xddf666bb
-0,         43,         43,        1,     1087, 0x3e70d37a
+0,         43, -9223372036854775808,        1,     1087, 0x3e70d37a, F=0x0
 1,     129600,     129600,     2160,      768, 0x8e896ebc
 1,     131760,     131760,     2160,      768, 0x0aa47dfa
-0,         44,         44,        1,      992, 0x0651a71c
+0,         44, -9223372036854775808,        1,      992, 0x0651a71c, F=0x0
 1,     133920,     133920,     2160,      768, 0xc1736811
-0,         45,         45,        1,     1012, 0x6a069f8c
+0,         45, -9223372036854775808,        1,     1012, 0x6a069f8c, F=0x0
 1,     136080,     136080,     2160,      768, 0xb3e87009
-0,         46,         46,        1,     1320, 0x92803d69
+0,         46, -9223372036854775808,        1,     1320, 0x92803d69, F=0x0
 1,     138240,     138240,     2160,      768, 0xf23e6c00
 1,     140400,     140400,     2160,      768, 0x993a71d2
-0,         47,         47,        1,     1080, 0xe0ffbe95
+0,         47, -9223372036854775808,        1,     1080, 0xe0ffbe95, F=0x0
 1,     142560,     142560,     2160,      768, 0xa53466dd
-0,         48,         48,        1,     5639, 0x658ca26b
+0,         48, -9223372036854775808,        1,     5639, 0x658ca26b
 1,     144720,     144720,     2160,      768, 0xb43a74b0
 1,     146880,     146880,     2160,      768, 0x348f615c
-0,         49,         49,        1,     1385, 0xbcb96241
+0,         49, -9223372036854775808,        1,     1385, 0xbcb96241, F=0x0
 1,     149040,     149040,     2160,      768, 0x298f6e1b
-0,         50,         50,        1,     1142, 0x8c6df318
+0,         50, -9223372036854775808,        1,     1142, 0x8c6df318, F=0x0
 1,     151200,     151200,     2160,      768, 0x5db469c8
-0,         51,         51,        1,     1175, 0xcac1faef
+0,         51, -9223372036854775808,        1,     1175, 0xcac1faef, F=0x0
 1,     153360,     153360,     2160,      768, 0x08f16c2c
 1,     155520,     155520,     2160,      768, 0x4a0474cb
-0,         52,         52,        1,     1091, 0xa937e32a
+0,         52, -9223372036854775808,        1,     1091, 0xa937e32a, F=0x0
 1,     157680,     157680,     2160,      768, 0x077c760b
-0,         53,         53,        1,     1174, 0xfa50040d
+0,         53, -9223372036854775808,        1,     1174, 0xfa50040d, F=0x0
 1,     159840,     159840,     2160,      768, 0xa5777c2e
 1,     162000,     162000,     2160,      768, 0x0d157ea6
-0,         54,         54,        1,     1293, 0x0c8d2740
+0,         54, -9223372036854775808,        1,     1293, 0x0c8d2740, F=0x0
 1,     164160,     164160,     2160,      768, 0x9bc26f86
-0,         55,         55,        1,     1262, 0x502c0c35
+0,         55, -9223372036854775808,        1,     1262, 0x502c0c35, F=0x0
 1,     166320,     166320,     2160,      768, 0x1a72742d
-0,         56,         56,        1,     1038, 0x5e98c0cd
+0,         56, -9223372036854775808,        1,     1038, 0x5e98c0cd, F=0x0
 1,     168480,     168480,     2160,      768, 0xa5bb6bbb
 1,     170640,     170640,     2160,      768, 0x48496c4c
-0,         57,         57,        1,     1362, 0x256e43cf
+0,         57, -9223372036854775808,        1,     1362, 0x256e43cf, F=0x0
 1,     172800,     172800,     2160,      768, 0x800d78f0
-0,         58,         58,        1,     1200, 0x29e6f055
+0,         58, -9223372036854775808,        1,     1200, 0x29e6f055, F=0x0
 1,     174960,     174960,     2160,      768, 0x40db840c
 1,     177120,     177120,     2160,      768, 0xadc96a6b
-0,         59,         59,        1,     1495, 0x88e9b973
+0,         59, -9223372036854775808,        1,     1495, 0x88e9b973, F=0x0
 1,     179280,     179280,     2160,      768, 0xff986b03
-0,         60,         60,        1,     1386, 0x849297d2
+0,         60, -9223372036854775808,        1,     1386, 0x849297d2, F=0x0
 1,     181440,     181440,     2160,      768, 0x152473d6
-0,         61,         61,        1,     1572, 0x63b7dc79
+0,         61, -9223372036854775808,        1,     1572, 0x63b7dc79, F=0x0
 1,     183600,     183600,     2160,      768, 0x01567323
 1,     185760,     185760,     2160,      768, 0xe5f26fe5
-0,         62,         62,        1,     1190, 0x32ccf4cb
+0,         62, -9223372036854775808,        1,     1190, 0x32ccf4cb, F=0x0
 1,     187920,     187920,     2160,      768, 0xa8fd72cd
-0,         63,         63,        1,     1395, 0xa6ec4ae9
+0,         63, -9223372036854775808,        1,     1395, 0xa6ec4ae9, F=0x0
 1,     190080,     190080,     2160,      768, 0x8857655b
-0,         64,         64,        1,     5692, 0x81aed6f3
+0,         64, -9223372036854775808,        1,     5692, 0x81aed6f3
 1,     192240,     192240,     2160,      768, 0x84017b13
 1,     194400,     194400,     2160,      768, 0xe6a968b3
-0,         65,         65,        1,     1335, 0xe98a5497
+0,         65, -9223372036854775808,        1,     1335, 0xe98a5497, F=0x0
 1,     196560,     196560,     2160,      768, 0xb03a7566
-0,         66,         66,        1,     1361, 0x8ae15ab5
+0,         66, -9223372036854775808,        1,     1361, 0x8ae15ab5, F=0x0
 1,     198720,     198720,     2160,      768, 0x8bea5f62
 1,     200880,     200880,     2160,      768, 0xac7570b0
-0,         67,         67,        1,     1525, 0xed2bc1e8
+0,         67, -9223372036854775808,        1,     1525, 0xed2bc1e8, F=0x0
 1,     203040,     203040,     2160,      768, 0x11306fac
-0,         68,         68,        1,     1570, 0xba70d74b
+0,         68, -9223372036854775808,        1,     1570, 0xba70d74b, F=0x0
 1,     205200,     205200,     2160,      768, 0xf2af5b28
-0,         69,         69,        1,     1349, 0xd97a687d
+0,         69, -9223372036854775808,        1,     1349, 0xd97a687d, F=0x0
 1,     207360,     207360,     2160,      768, 0x3069681f
 1,     209520,     209520,     2160,      768, 0x7ff07033
-0,         70,         70,        1,     1270, 0xca8c3ca8
+0,         70, -9223372036854775808,        1,     1270, 0xca8c3ca8, F=0x0
 1,     211680,     211680,     2160,      768, 0xd74973f2
-0,         71,         71,        1,     1016, 0x32d0c81a
+0,         71, -9223372036854775808,        1,     1016, 0x32d0c81a, F=0x0
 1,     213840,     213840,     2160,      768, 0xb3627304
 1,     216000,     216000,     2160,      768, 0x11ff7589
-0,         72,         72,        1,      983, 0x536faa97
+0,         72, -9223372036854775808,        1,      983, 0x536faa97, F=0x0
 1,     218160,     218160,     2160,      768, 0x4a156c63
-0,         73,         73,        1,     1111, 0x44ade015
+0,         73, -9223372036854775808,        1,     1111, 0x44ade015, F=0x0
 1,     220320,     220320,     2160,      768, 0xcb036127
-0,         74,         74,        1,     1314, 0xce7c477d
+0,         74, -9223372036854775808,        1,     1314, 0xce7c477d, F=0x0
 1,     222480,     222480,     2160,      768, 0x0b796bb9
 1,     224640,     224640,     2160,      768, 0x1d516c35
-0,         75,         75,        1,     1005, 0x0196b491
+0,         75, -9223372036854775808,        1,     1005, 0x0196b491, F=0x0
 1,     226800,     226800,     2160,      768, 0xa9146da1
-0,         76,         76,        1,     1162, 0xb8f6ebe6
+0,         76, -9223372036854775808,        1,     1162, 0xb8f6ebe6, F=0x0
 1,     228960,     228960,     2160,      768, 0x6d176392
 1,     231120,     231120,     2160,      768, 0x6f966269
-0,         77,         77,        1,     1440, 0xfca67c72
+0,         77, -9223372036854775808,        1,     1440, 0xfca67c72, F=0x0
 1,     233280,     233280,     2160,      768, 0x7ee17724
-0,         78,         78,        1,     1437, 0x491181b1
+0,         78, -9223372036854775808,        1,     1437, 0x491181b1, F=0x0
 1,     235440,     235440,     2160,      768, 0x3f07614a
-0,         79,         79,        1,     1261, 0xf0cd1898
+0,         79, -9223372036854775808,        1,     1261, 0xf0cd1898, F=0x0
 1,     237600,     237600,     2160,      768, 0x49d56945
 1,     239760,     239760,     2160,      768, 0x68eb660a
-0,         80,         80,        1,     5638, 0x3a25a9f2
+0,         80, -9223372036854775808,        1,     5638, 0x3a25a9f2
 1,     241920,     241920,     2160,      768, 0xe7c96677
-0,         81,         81,        1,     1091, 0x67d9c693
+0,         81, -9223372036854775808,        1,     1091, 0x67d9c693, F=0x0
 1,     244080,     244080,     2160,      768, 0x7dc07a35
 1,     246240,     246240,     2160,      768, 0x1e9c6397
-0,         82,         82,        1,      875, 0x52147bb1
+0,         82, -9223372036854775808,        1,      875, 0x52147bb1, F=0x0
 1,     248400,     248400,     2160,      768, 0x93ef5de4
-0,         83,         83,        1,     1188, 0x8522000f
+0,         83, -9223372036854775808,        1,     1188, 0x8522000f, F=0x0
 1,     250560,     250560,     2160,      768, 0x34af6803
-0,         84,         84,        1,     1360, 0x89b82e7b
+0,         84, -9223372036854775808,        1,     1360, 0x89b82e7b, F=0x0
 1,     252720,     252720,     2160,      768, 0x77e068be
 1,     254880,     254880,     2160,      768, 0x65e274de
-0,         85,         85,        1,     1378, 0xe8644914
+0,         85, -9223372036854775808,        1,     1378, 0xe8644914, F=0x0
 1,     257040,     257040,     2160,      768, 0xb7ad6a8a
-0,         86,         86,        1,     1194, 0x89fef83d
+0,         86, -9223372036854775808,        1,     1194, 0x89fef83d, F=0x0
 1,     259200,     259200,     2160,      768, 0x84b3635f
-0,         87,         87,        1,     1422, 0x99daa18b
+0,         87, -9223372036854775808,        1,     1422, 0x99daa18b, F=0x0
 1,     261360,     261360,     2160,      768, 0x066b78f2
 1,     263520,     263520,     2160,      768, 0xda137428
-0,         88,         88,        1,     1049, 0x72a9cec1
+0,         88, -9223372036854775808,        1,     1049, 0x72a9cec1, F=0x0
 1,     265680,     265680,     2160,      768, 0xfd6c7597
-0,         89,         89,        1,     1327, 0x7d15307c
+0,         89, -9223372036854775808,        1,     1327, 0x7d15307c, F=0x0
 1,     267840,     267840,     2160,      768, 0x8d766d40
diff --git a/tests/ref/fate/loco-rgb b/tests/ref/fate/loco-rgb
index ad199f1410..289e73f7ed 100644
--- a/tests/ref/fate/loco-rgb
+++ b/tests/ref/fate/loco-rgb
@@ -1,4 +1,8 @@
 #tb 0: 71/500
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 188x128
+#sar 0: 0/1
 0,          0,          0,        1,    72192, 0x1847500c
 0,          1,          1,        1,    72192, 0x1b0e2e87
 0,          2,          2,        1,    72192, 0x293276c8
diff --git a/tests/ref/fate/loco-yuy2 b/tests/ref/fate/loco-yuy2
index 60a06bca7a..e963cda087 100644
--- a/tests/ref/fate/loco-yuy2
+++ b/tests/ref/fate/loco-yuy2
@@ -1,4 +1,8 @@
 #tb 0: 71/500
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 188x128
+#sar 0: 0/1
 0,          0,          0,        1,    48128, 0x7795782d
 0,          1,          1,        1,    48128, 0x3d89bcf7
 0,          2,          2,        1,    48128, 0x170d200a
diff --git a/tests/ref/fate/lossless-tak b/tests/ref/fate/lossless-tak
new file mode 100644
index 0000000000..9e9ba47652
--- /dev/null
+++ b/tests/ref/fate/lossless-tak
@@ -0,0 +1 @@
+CRC=0x4ec0971f
diff --git a/tests/ref/fate/lossless-tta-encrypted b/tests/ref/fate/lossless-tta-encrypted
new file mode 100644
index 0000000000..39aec95e88
--- /dev/null
+++ b/tests/ref/fate/lossless-tta-encrypted
@@ -0,0 +1 @@
+CRC=0x4563745f
diff --git a/tests/ref/fate/lossless-wma24-1 b/tests/ref/fate/lossless-wma24-1
new file mode 100644
index 0000000000..ddee31c2d4
--- /dev/null
+++ b/tests/ref/fate/lossless-wma24-1
@@ -0,0 +1 @@
+9ade91f506bc025854f6ffea0d635bc6
diff --git a/tests/ref/fate/lossless-wma24-2 b/tests/ref/fate/lossless-wma24-2
new file mode 100644
index 0000000000..5ebdfd192b
--- /dev/null
+++ b/tests/ref/fate/lossless-wma24-2
@@ -0,0 +1 @@
+908ec5c16f497bf7d5658d2689d125c8
diff --git a/tests/ref/fate/lossless-wma24-rawtile b/tests/ref/fate/lossless-wma24-rawtile
new file mode 100644
index 0000000000..96e5e210e3
--- /dev/null
+++ b/tests/ref/fate/lossless-wma24-rawtile
@@ -0,0 +1 @@
+337592f38a2218a5bc95ceb9b5e72c8b
diff --git a/tests/ref/fate/m4v b/tests/ref/fate/m4v
new file mode 100644
index 0000000000..cebe443adc
--- /dev/null
+++ b/tests/ref/fate/m4v
@@ -0,0 +1,47 @@
+#tb 0: 1/60
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   115200, 0x7262156b
+0,         11,         11,        1,   115200, 0xa6aebc2f
+0,         22,         22,        1,   115200, 0x9c7beba1
+0,         33,         33,        1,   115200, 0x556037a2
+0,         44,         44,        1,   115200, 0x532e3a23
+0,         60,         60,        1,   115200, 0x110511f4
+0,         71,         71,        1,   115200, 0xb7f929a4
+0,         82,         82,        1,   115200, 0xdab9f3c2
+0,         93,         93,        1,   115200, 0x441413dd
+0,        104,        104,        1,   115200, 0x01163f33
+0,        120,        120,        1,   115200, 0x47720c78
+0,        131,        131,        1,   115200, 0x07c21356
+0,        142,        142,        1,   115200, 0x085d4291
+0,        153,        153,        1,   115200, 0xf6db074c
+0,        164,        164,        1,   115200, 0x95093e75
+0,        180,        180,        1,   115200, 0x5f8118ef
+0,        191,        191,        1,   115200, 0x2b4de34a
+0,        202,        202,        1,   115200, 0x0a731857
+0,        213,        213,        1,   115200, 0xd75ef3be
+0,        224,        224,        1,   115200, 0x321cf5a9
+0,        240,        240,        1,   115200, 0x3eb222fd
+0,        251,        251,        1,   115200, 0xc7d92f3e
+0,        262,        262,        1,   115200, 0x6fda0366
+0,        273,        273,        1,   115200, 0x6bb61b03
+0,        284,        284,        1,   115200, 0x5f367ef8
+0,        300,        300,        1,   115200, 0x237d0c77
+0,        311,        311,        1,   115200, 0xafa813ef
+0,        322,        322,        1,   115200, 0x39263ef4
+0,        333,        333,        1,   115200, 0x47c70441
+0,        344,        344,        1,   115200, 0xd43fffb0
+0,        360,        360,        1,   115200, 0x75696afb
+0,        371,        371,        1,   115200, 0xb0f117a3
+0,        382,        382,        1,   115200, 0x002f42f0
+0,        393,        393,        1,   115200, 0xa192487e
+0,        404,        404,        1,   115200, 0x19a7072e
+0,        420,        420,        1,   115200, 0xc500669c
+0,        431,        431,        1,   115200, 0xe4636ba9
+0,        442,        442,        1,   115200, 0xdf3d5d86
+0,        453,        453,        1,   115200, 0xf30825d5
+0,        464,        464,        1,   115200, 0xe3c944a1
+0,        480,        480,        1,   115200, 0x8fec4420
+0,        491,        491,        1,   115200, 0x9381fdab
diff --git a/tests/ref/fate/m4v-cfr b/tests/ref/fate/m4v-cfr
new file mode 100644
index 0000000000..e2d02032fe
--- /dev/null
+++ b/tests/ref/fate/m4v-cfr
@@ -0,0 +1,46 @@
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   115200, 0x7262156b
+0,          1,          1,        1,   115200, 0xa6aebc2f
+0,          2,          2,        1,   115200, 0x9c7beba1
+0,          3,          3,        1,   115200, 0x556037a2
+0,          4,          4,        1,   115200, 0x532e3a23
+0,          5,          5,        1,   115200, 0x110511f4
+0,          6,          6,        1,   115200, 0xb7f929a4
+0,          7,          7,        1,   115200, 0xdab9f3c2
+0,          8,          8,        1,   115200, 0x441413dd
+0,          9,          9,        1,   115200, 0x01163f33
+0,         10,         10,        1,   115200, 0x47720c78
+0,         11,         11,        1,   115200, 0x07c21356
+0,         12,         12,        1,   115200, 0x085d4291
+0,         13,         13,        1,   115200, 0xf6db074c
+0,         14,         14,        1,   115200, 0x95093e75
+0,         15,         15,        1,   115200, 0x5f8118ef
+0,         16,         16,        1,   115200, 0x2b4de34a
+0,         17,         17,        1,   115200, 0x0a731857
+0,         18,         18,        1,   115200, 0xd75ef3be
+0,         19,         19,        1,   115200, 0x321cf5a9
+0,         20,         20,        1,   115200, 0x3eb222fd
+0,         21,         21,        1,   115200, 0xc7d92f3e
+0,         22,         22,        1,   115200, 0x6fda0366
+0,         23,         23,        1,   115200, 0x6bb61b03
+0,         24,         24,        1,   115200, 0x5f367ef8
+0,         25,         25,        1,   115200, 0x237d0c77
+0,         26,         26,        1,   115200, 0xafa813ef
+0,         27,         27,        1,   115200, 0x39263ef4
+0,         28,         28,        1,   115200, 0x47c70441
+0,         29,         29,        1,   115200, 0xd43fffb0
+0,         30,         30,        1,   115200, 0x75696afb
+0,         31,         31,        1,   115200, 0xb0f117a3
+0,         32,         32,        1,   115200, 0x002f42f0
+0,         33,         33,        1,   115200, 0xa192487e
+0,         34,         34,        1,   115200, 0x19a7072e
+0,         35,         35,        1,   115200, 0xc500669c
+0,         36,         36,        1,   115200, 0xe4636ba9
+0,         37,         37,        1,   115200, 0xdf3d5d86
+0,         38,         38,        1,   115200, 0xf30825d5
+0,         39,         39,        1,   115200, 0xe3c944a1
+0,         40,         40,        1,   115200, 0x8fec4420
diff --git a/tests/ref/fate/magicyuv-rgb b/tests/ref/fate/magicyuv-rgb
index a52574a952..9fd483bfb6 100644
--- a/tests/ref/fate/magicyuv-rgb
+++ b/tests/ref/fate/magicyuv-rgb
@@ -1,2 +1,6 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
 0,          0,          0,        1,   144768, 0x497c8ce1
diff --git a/tests/ref/fate/magicyuv-rgba b/tests/ref/fate/magicyuv-rgba
index 6cad8e0da4..d2ccb696c0 100644
--- a/tests/ref/fate/magicyuv-rgba
+++ b/tests/ref/fate/magicyuv-rgba
@@ -1,2 +1,6 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
 0,          0,          0,        1,   193024, 0x7e1b7233
diff --git a/tests/ref/fate/magicyuv-y400i b/tests/ref/fate/magicyuv-y400i
index 4c8fe7ecbe..bf87b62619 100644
--- a/tests/ref/fate/magicyuv-y400i
+++ b/tests/ref/fate/magicyuv-y400i
@@ -1,2 +1,6 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
 0,          0,          0,        1,    48256, 0x368b93f2
diff --git a/tests/ref/fate/magicyuv-y420 b/tests/ref/fate/magicyuv-y420
index 3145e8a71b..25fffc0358 100644
--- a/tests/ref/fate/magicyuv-y420
+++ b/tests/ref/fate/magicyuv-y420
@@ -1,2 +1,6 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
 0,          0,          0,        1,    72384, 0x59a87842
diff --git a/tests/ref/fate/magicyuv-y422i b/tests/ref/fate/magicyuv-y422i
index 2a7af47c49..4bb73f59ed 100644
--- a/tests/ref/fate/magicyuv-y422i
+++ b/tests/ref/fate/magicyuv-y422i
@@ -1,2 +1,6 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
 0,          0,          0,        1,    96512, 0xe84751be
diff --git a/tests/ref/fate/magicyuv-y444 b/tests/ref/fate/magicyuv-y444
index ee836c299d..372d49c192 100644
--- a/tests/ref/fate/magicyuv-y444
+++ b/tests/ref/fate/magicyuv-y444
@@ -1,2 +1,6 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
 0,          0,          0,        1,   144768, 0xef48043f
diff --git a/tests/ref/fate/magicyuv-y4444i b/tests/ref/fate/magicyuv-y4444i
index bc3c70251f..c5ab70e125 100644
--- a/tests/ref/fate/magicyuv-y4444i
+++ b/tests/ref/fate/magicyuv-y4444i
@@ -1,2 +1,6 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
 0,          0,          0,        1,   193024, 0x5292ecec
diff --git a/tests/ref/fate/mapchan-2ch-extract-ch0-ch2-trailing b/tests/ref/fate/mapchan-2ch-extract-ch0-ch2-trailing
new file mode 100644
index 0000000000..a5400373cf
--- /dev/null
+++ b/tests/ref/fate/mapchan-2ch-extract-ch0-ch2-trailing
@@ -0,0 +1 @@
+b6e1d142b4e484221562e7b66b9bbbdc
diff --git a/tests/ref/fate/mapchan-3ch-extract-ch0-ch2-trailing b/tests/ref/fate/mapchan-3ch-extract-ch0-ch2-trailing
new file mode 100644
index 0000000000..6237a988be
--- /dev/null
+++ b/tests/ref/fate/mapchan-3ch-extract-ch0-ch2-trailing
@@ -0,0 +1 @@
+ae533985186cab287309c04f6b3e866c
diff --git a/tests/ref/fate/mapchan-6ch-extract-2 b/tests/ref/fate/mapchan-6ch-extract-2
new file mode 100644
index 0000000000..435cbec17c
--- /dev/null
+++ b/tests/ref/fate/mapchan-6ch-extract-2
@@ -0,0 +1,2 @@
+955514d4a026a4a48695866d2ec904d0
+498a49e692ee2e3c454863654275c4bb
diff --git a/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono b/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono
new file mode 100644
index 0000000000..9ac4dba261
--- /dev/null
+++ b/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono
@@ -0,0 +1 @@
+6ededcfc9f0b26d200a7295205e87663
diff --git a/tests/ref/fate/mapchan-silent-mono b/tests/ref/fate/mapchan-silent-mono
new file mode 100644
index 0000000000..93f519e0ee
--- /dev/null
+++ b/tests/ref/fate/mapchan-silent-mono
@@ -0,0 +1 @@
+b6b034fffa8639e64d79be84f16d9ebe
diff --git a/tests/ref/fate/matroska-spherical-mono b/tests/ref/fate/matroska-spherical-mono
new file mode 100644
index 0000000000..bd57d94514
--- /dev/null
+++ b/tests/ref/fate/matroska-spherical-mono
@@ -0,0 +1,18 @@
+[STREAM]
+[SIDE_DATA]
+side_data_type=Stereo 3D
+type=2D
+inverted=0
+[/SIDE_DATA]
+[SIDE_DATA]
+side_data_type=Spherical Mapping
+projection=tiled equirectangular
+bound_left=148
+bound_top=73
+bound_right=147
+bound_bottom=72
+yaw=45
+pitch=30
+roll=15
+[/SIDE_DATA]
+[/STREAM]
diff --git a/tests/ref/fate/maxis-xa b/tests/ref/fate/maxis-xa
index c29738c868..ad9d73278b 100644
--- a/tests/ref/fate/maxis-xa
+++ b/tests/ref/fate/maxis-xa
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: adpcm_ea_maxis_xa
+#sample_rate 0: 22050
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,       28,       30, 0x51750711
 0,         28,         28,       28,       30, 0x9ca20c2a
 0,         56,         56,       28,       30, 0x7551081f
diff --git a/tests/ref/fate/mdec b/tests/ref/fate/mdec
index b7aab626e9..ae438ed232 100644
--- a/tests/ref/fate/mdec
+++ b/tests/ref/fate/mdec
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 304x224
+#sar 0: 0/1
 0,          0,          0,        1,   102144, 0x6edc83de
 0,          1,          1,        1,   102144, 0xd0534fda
 0,          2,          2,        1,   102144, 0x6447911f
diff --git a/tests/ref/fate/mdec-v3 b/tests/ref/fate/mdec-v3
index 7e4bbdb13d..471303f0b8 100644
--- a/tests/ref/fate/mdec-v3
+++ b/tests/ref/fate/mdec-v3
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x160
+#sar 0: 0/1
 0,          0,          0,        1,    76800, 0x2677be82
 0,          1,          1,        1,    76800, 0x1f323c75
 0,          2,          2,        1,    76800, 0xc8be3be9
diff --git a/tests/ref/fate/mimic b/tests/ref/fate/mimic
index 217d487b10..e36e6a8c91 100644
--- a/tests/ref/fate/mimic
+++ b/tests/ref/fate/mimic
@@ -1,4 +1,8 @@
 #tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        0,   115200, 0xa974d407
 0,        548,        548,        0,   115200, 0x72618b84
 0,       1088,       1088,        0,   115200, 0x87768573
diff --git a/tests/ref/fate/mjpegb b/tests/ref/fate/mjpegb
index e4887f4af9..0298274087 100644
--- a/tests/ref/fate/mjpegb
+++ b/tests/ref/fate/mjpegb
@@ -1,11 +1,15 @@
-#tb 0: 1/1200
-0,          0,          0,        0,    38400, 0x45311080
-0,        100,        100,        0,    38400, 0x9474f731
-0,        200,        200,        0,    38400, 0x429ebb12
-0,        300,        300,        0,    38400, 0x472c199a
-0,        400,        400,        0,    38400, 0xefd49dae
-0,        500,        500,        0,    38400, 0x78627fa9
-0,        600,        600,        0,    38400, 0x2a8d9148
-0,        700,        700,        0,    38400, 0x21cc6738
-0,        800,        800,        0,    38400, 0x0bc4703f
-0,        900,        900,        0,    38400, 0x1ddcc035
+#tb 0: 1/12
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
+0,          0,          0,        1,    38400, 0x45311080
+0,          1,          1,        1,    38400, 0x9474f731
+0,          2,          2,        1,    38400, 0x429ebb12
+0,          3,          3,        1,    38400, 0x472c199a
+0,          4,          4,        1,    38400, 0xefd49dae
+0,          5,          5,        1,    38400, 0x78627fa9
+0,          6,          6,        1,    38400, 0x2a8d9148
+0,          7,          7,        1,    38400, 0x21cc6738
+0,          8,          8,        1,    38400, 0x0bc4703f
+0,          9,          9,        1,    38400, 0x1ddcc035
diff --git a/tests/ref/fate/mkv b/tests/ref/fate/mkv
new file mode 100644
index 0000000000..f9c3037f09
--- /dev/null
+++ b/tests/ref/fate/mkv
@@ -0,0 +1,228 @@
+#extradata 0:       35, 0xc3b20b70
+#extradata 1:        2, 0x00b200a1
+#tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: h264
+#dimensions 0: 1024x576
+#sar 0: 1/1
+#tb 1: 1/1000
+#media_type 1: audio
+#codec_id 1: aac
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,        -42,          0,       41,    63501, 0x139d4c99
+0,          0,         84,       41,     5368, 0xd964b678, F=0x0
+1,          8,          8,       21,      528, 0x3c990ddf
+1,         29,         29,       21,      510, 0xc16e0719
+0,         42,         42,       41,     1840, 0x097b6726, F=0x0
+1,         50,         50,       21,      500, 0x6248f603
+1,         71,         71,       22,      491, 0xe767f705
+0,         84,        167,       41,     7168, 0xaa5913ed, F=0x0
+1,         93,         93,       21,      506, 0x4340f3f3
+1,        114,        114,       21,      492, 0xf11c0210
+0,        125,        125,       41,     2129, 0x6ab0db3e, F=0x0
+1,        135,        135,       21,      502, 0x314b007e
+1,        156,        156,       22,      507, 0x76de0162
+0,        167,        250,       41,     7230, 0x3fd63940, F=0x0
+1,        179,        179,       21,      501, 0x0538fa45
+1,        200,        200,       21,      521, 0xc89f06d2
+0,        209,        209,       41,     2114, 0xfceafb26, F=0x0
+1,        221,        221,       21,      646, 0x8d8d3599
+1,        242,        242,       22,      661, 0x222242de
+0,        250,        334,       41,    63420, 0x5ca6250f, F=0x0
+1,        264,        264,       21,      609, 0xc0dc255c
+1,        285,        285,       21,      619, 0x9ac52dd1
+0,        292,        292,       41,    16751, 0xf293ab46, F=0x0
+1,        306,        306,       21,      574, 0xf6410d4d
+1,        327,        327,       22,      565, 0xfd561191
+0,        334,        417,       41,    22029, 0x3696462b, F=0x0
+1,        350,        350,       21,      713, 0x48425147
+1,        371,        371,       21,      537, 0x09bbf515
+0,        375,        375,       41,     5044, 0xa0344ae6, F=0x0
+1,        392,        392,       21,      486, 0x7946e28c
+1,        413,        413,       22,      499, 0xa770f22a
+0,        417,        500,       41,    25289, 0x46f9a219, F=0x0
+1,        435,        435,       21,      506, 0x355ef81d
+1,        456,        456,       21,      474, 0x6d24e2c5
+0,        459,        459,       41,    12871, 0x23e570c4, F=0x0
+1,        477,        477,       21,      494, 0x7d77e90f
+1,        498,        498,       22,      524, 0x6c82fdd2
+0,        500,        584,       41,    29580, 0xd051ad0c, F=0x0
+1,        520,        520,       21,      482, 0xe625f255
+1,        541,        541,       21,      533, 0xed00fd16
+0,        542,        542,       41,     9221, 0xfa1bdf6c, F=0x0
+1,        562,        562,       21,      524, 0x65cdf879
+1,        583,        583,       22,      533, 0xee26f570
+0,        584,        667,       41,    22238, 0x4e0daf3e, F=0x0
+1,        605,        605,       21,      621, 0xed9f23cc
+0,        625,        625,       41,     7627, 0xc566337e, F=0x0
+1,        626,        626,       21,      400, 0xe4fdb43a
+1,        647,        647,       21,      428, 0xd7eacd61
+0,        667,        750,       41,    23124, 0x3bad1f16, F=0x0
+1,        668,        668,       22,      442, 0xef1fda0b
+1,        691,        691,       21,      450, 0x1c58e44b
+0,        709,        709,       41,     7093, 0x3ab77cce, F=0x0
+1,        712,        712,       21,      487, 0x0e5feab7
+1,        733,        733,       21,      465, 0x984adca9
+0,        750,        834,       41,    23210, 0xa7851bbf, F=0x0
+1,        754,        754,       22,      479, 0x0960e535
+1,        776,        776,       21,      489, 0x2f3ffc02
+0,        792,        792,       41,    16045, 0x33039eb5, F=0x0
+1,        797,        797,       21,      505, 0x541aff95
+1,        818,        818,       21,      485, 0xb7a5e7f8
+0,        834,        917,       41,    24859, 0x317ea0f2, F=0x0
+1,        839,        839,       22,      537, 0xb0dd1072
+1,        862,        862,       21,      485, 0x6e9eee58
+0,        875,        875,       41,     7589, 0x02a8e5d5, F=0x0
+1,        883,        883,       21,      480, 0x0a6fec0b
+1,        904,        904,       21,      496, 0x6ff8ee65
+0,        917,        959,       41,    19208, 0xdfb1a109, F=0x0
+1,        925,        925,       21,      505, 0x75a308b8
+1,        946,        946,       21,      512, 0x9628f3da
+0,        959,       2000,       41,    60241, 0x43fcc627
+1,        967,        967,       22,      506, 0xefc901cf
+1,        990,        990,       21,      487, 0x1fd3edc8
+1,       1011,       1011,       21,      485, 0x8ccde513
+1,       1993,       1993,       21,      459, 0x725ede33
+0,       2000,       2084,       41,    23528, 0xc1dd888a, F=0x0
+1,       2014,       2014,       21,      481, 0x2cd7e611
+1,       2035,       2035,       21,      473, 0x14f2d777
+0,       2042,       2042,       41,     9206, 0x8f8cb89b, F=0x0
+1,       2056,       2056,       21,      543, 0x0f6dfccf
+1,       2077,       2077,       22,      489, 0x8049f5df
+0,       2084,       2167,       41,    34864, 0x3a343fe0, F=0x0
+1,       2099,       2099,       21,      480, 0xaa82edfc
+1,       2120,       2120,       21,      505, 0xea87f3e9
+0,       2125,       2125,       41,    12516, 0x885c8e4d, F=0x0
+1,       2141,       2141,       21,      474, 0x0760e6a1
+1,       2162,       2162,       22,      547, 0xcde40a72
+0,       2167,       2250,       41,    21215, 0x4428040b, F=0x0
+1,       2184,       2184,       21,      606, 0x4e401ec6
+1,       2205,       2205,       21,      611, 0xd13e18b6
+0,       2209,       2209,       41,    11811, 0xfe46f6c7, F=0x0
+1,       2226,       2226,       21,      492, 0xe2a3ea95
+1,       2247,       2247,       22,      582, 0x15fe1df5
+0,       2250,       2334,       41,    18643, 0xdcd87177, F=0x0
+1,       2269,       2269,       21,      455, 0x3753cfd3
+1,       2290,       2290,       21,      467, 0x9342cfed
+0,       2292,       2292,       41,     4578, 0x0bacbdaf, F=0x0
+1,       2311,       2311,       21,      422, 0x080ec43e
+1,       2332,       2332,       22,      466, 0xefb8e9aa
+0,       2334,       2417,       41,    25403, 0x49348e8b, F=0x0
+1,       2355,       2355,       21,      482, 0x2455e264
+0,       2375,       2375,       41,     7254, 0xe5c672b9, F=0x0
+1,       2376,       2376,       21,      471, 0xb370df1e
+1,       2397,       2397,       21,      461, 0x01addfe6
+0,       2417,       2500,       41,    25215, 0x1149c259, F=0x0
+1,       2418,       2418,       22,      566, 0x93760a5d
+1,       2440,       2440,       21,      618, 0x4e8e2f95
+0,       2459,       2459,       41,    14257, 0x38956a4d, F=0x0
+1,       2461,       2461,       21,      612, 0xc79128bc
+1,       2482,       2482,       21,      594, 0x169d1975
+0,       2500,       2584,       41,    36619, 0xca6497c5, F=0x0
+1,       2503,       2503,       22,      488, 0xb218e907
+1,       2526,       2526,       21,      437, 0xb180c83f
+0,       2542,       2542,       41,    13152, 0x4ea52247, F=0x0
+1,       2547,       2547,       21,      432, 0x85f8cf2b
+1,       2568,       2568,       21,      469, 0x65d0e38e
+0,       2584,       2667,       41,    31751, 0xb0140e79, F=0x0
+1,       2589,       2589,       22,      473, 0xb4dee328
+1,       2611,       2611,       21,      462, 0xd95cd547
+0,       2625,       2625,       41,    13619, 0x97308292, F=0x0
+1,       2632,       2632,       21,      470, 0x3638f48d
+1,       2653,       2653,       21,      558, 0x93c3121b
+0,       2667,       2750,       41,    32851, 0x014d2abc, F=0x0
+1,       2674,       2674,       22,      486, 0x5983ed52
+1,       2696,       2696,       21,      507, 0x572af3c3
+0,       2709,       2709,       41,    16915, 0x3597bc67, F=0x0
+1,       2717,       2717,       21,      480, 0xe3b3e16c
+1,       2738,       2738,       21,      492, 0x9443f00e
+0,       2750,       2834,       41,    35380, 0x728cd77a, F=0x0
+1,       2759,       2759,       22,      480, 0x7845ea30
+1,       2781,       2781,       21,      480, 0x7d01e1a2
+0,       2792,       2792,       41,    12780, 0x84c38c29, F=0x0
+1,       2802,       2802,       21,      505, 0x17d6f18b
+1,       2823,       2823,       21,      506, 0xca09ee14
+0,       2834,       2917,       41,    26049, 0x3788982a, F=0x0
+1,       2844,       2844,       22,      479, 0x0383f05a
+1,       2867,       2867,       21,      499, 0xa3b5e804
+0,       2875,       2875,       41,    11796, 0x0cbff503, F=0x0
+1,       2888,       2888,       21,      494, 0x0970e72e
+1,       2909,       2909,       21,      484, 0x6f34da96
+0,       2917,       2959,       41,    16638, 0x097c9345, F=0x0
+1,       2930,       2930,       21,      492, 0x5282e9aa
+1,       2951,       2951,       21,      487, 0x6f19e15e
+0,       2959,       3000,       41,    64129, 0xc13b91ac
+1,       2972,       2972,       22,      500, 0x17aef81a
+1,       2995,       2995,       21,      510, 0xa323f6e6
+0,       3000,       3084,       41,    19338, 0xfe901382, F=0x0
+1,       3016,       3016,       21,      492, 0x49d7e74f
+1,       3038,       3038,       21,      483, 0xa78deadb
+0,       3042,       3042,       41,     4643, 0x5a05768b, F=0x0
+1,       3059,       3059,       21,      639, 0xf2c237e9
+1,       3080,       3080,       21,      661, 0xcd604711
+0,       3084,       3167,       41,    25932, 0x395e1d01, F=0x0
+1,       3101,       3101,       22,      647, 0xb8ee3acf
+1,       3123,       3123,       21,      575, 0x3303118e
+0,       3125,       3125,       41,     5301, 0x2aacb15c, F=0x0
+1,       3144,       3144,       21,      506, 0x2063eef7
+1,       3165,       3165,       21,      518, 0x7661f08e
+0,       3167,       3250,       41,    24089, 0x5cf78354, F=0x0
+1,       3186,       3186,       22,      534, 0x2858f90e
+1,       3208,       3208,       21,      520, 0xd596f460
+0,       3209,       3209,       41,     5837, 0x1c16cfad, F=0x0
+1,       3229,       3229,       21,      496, 0xc2a6efed
+0,       3250,       3334,       41,    26754, 0x4cf1ad04, F=0x0
+1,       3250,       3250,       21,      470, 0xcff5e778
+1,       3271,       3271,       22,      476, 0xcb63e48a
+0,       3292,       3292,       41,    11067, 0x8b0b776f, F=0x0
+1,       3293,       3293,       21,      516, 0xaea8f74b
+1,       3314,       3314,       21,      503, 0x5998f00d
+0,       3334,       3417,       41,    28780, 0xc610f024, F=0x0
+1,       3335,       3335,       21,      488, 0xd818dd28
+1,       3356,       3356,       22,      495, 0x2662f5b5
+0,       3375,       3375,       41,    14863, 0xd58ed8f0, F=0x0
+1,       3379,       3379,       21,      499, 0x6884ec30
+1,       3400,       3400,       21,      496, 0x556bdc0e
+0,       3417,       3500,       41,    24790, 0x71e32bae, F=0x0
+1,       3421,       3421,       21,      524, 0xa756f115
+1,       3442,       3442,       22,      505, 0xd332f37b
+0,       3459,       3459,       41,     9123, 0x6c72b7a3, F=0x0
+1,       3464,       3464,       21,      494, 0xa380e41e
+1,       3485,       3485,       21,      513, 0xf26bf0a9
+0,       3500,       3584,       41,    24706, 0x9bdd9247, F=0x0
+1,       3506,       3506,       21,      515, 0x28fffe2a
+1,       3527,       3527,       22,      506, 0xc5a2f83c
+0,       3542,       3542,       41,     8105, 0x85b8ff64, F=0x0
+1,       3550,       3550,       21,      510, 0xa10bf9c7
+1,       3571,       3571,       21,      507, 0x93d1e650
+0,       3584,       3667,       41,    25402, 0xe4622ee0, F=0x0
+1,       3592,       3592,       21,      506, 0x1a36f285
+1,       3613,       3613,       22,      522, 0xd7a1f5e4
+0,       3625,       3625,       41,     9693, 0x910910bc, F=0x0
+1,       3635,       3635,       21,      511, 0x2e79fa62
+1,       3656,       3656,       21,      516, 0xfda2ef86
+0,       3667,       3750,       41,    31403, 0xff9934ee, F=0x0
+1,       3677,       3677,       21,      497, 0xd65cf156
+1,       3698,       3698,       22,      480, 0xde3be560
+0,       3709,       3709,       41,    13936, 0x9b6aec9e, F=0x0
+1,       3720,       3720,       21,      514, 0x7d8cf49f
+1,       3741,       3741,       21,      667, 0x7a483dec
+0,       3750,       3834,       41,    28639, 0x620b80de, F=0x0
+1,       3762,       3762,       21,      640, 0x7cd92998
+1,       3783,       3783,       22,      504, 0xe3bbf106
+0,       3792,       3792,       41,    18769, 0xf51353c4, F=0x0
+1,       3805,       3805,       21,      498, 0xe8c6f489
+1,       3826,       3826,       21,      489, 0x620df125
+0,       3834,       3917,       41,    30240, 0x48151fb3, F=0x0
+1,       3847,       3847,       21,      505, 0x7d73e570
+1,       3868,       3868,       22,      496, 0xc211f6c6
+0,       3875,       3875,       41,    13391, 0x4f3f112d, F=0x0
+1,       3891,       3891,       21,      483, 0x126fe774
+1,       3912,       3912,       21,      479, 0xac88db91
+0,       3917,       3959,       41,    19896, 0x0e667f6e, F=0x0
+1,       3933,       3933,       21,      480, 0x545df57b
+1,       3954,       3954,       21,      473, 0x9a37e7ef
+1,       3975,       3975,       22,      472, 0x4c8ee70d
+1,       3998,       3998,       21,      508, 0x5c6bf8f3
diff --git a/tests/ref/fate/mkv-1242 b/tests/ref/fate/mkv-1242
new file mode 100644
index 0000000000..34e5b4aa9c
--- /dev/null
+++ b/tests/ref/fate/mkv-1242
@@ -0,0 +1,48 @@
+#extradata 0:       93, 0xc2a32e14
+#extradata 1:        2, 0x00b200a1
+#tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: h264
+#dimensions 0: 1280x718
+#sar 0: 1/1
+#tb 1: 1/1000
+#media_type 1: audio
+#codec_id 1: aac
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,        -42,          0,       41,     2969, 0xa7016742
+0,          0,         42,       41,      135, 0x33af1a9e, F=0x0
+1,          0,          0,       21,        6, 0x027e00e8
+1,         21,         21,       21,        6, 0x027e00e8
+0,         42,         83,       41,     9196, 0x24d8439f
+1,         42,         42,       21,        6, 0x027e00e8
+1,         63,         63,       21,        6, 0x027e00e8
+0,         83,        125,       41,     4926, 0xd7e2e492, F=0x0
+1,         85,         85,       21,        6, 0x027e00e8
+1,        106,        106,       21,       24, 0x886f0c1f
+0,        125,        167,       41,    11069, 0x44839c66
+1,        127,        127,       21,      550, 0xf863059c
+1,        148,        148,       22,      596, 0x32d414c1
+0,        167,        250,       41,     6143, 0xc25343dd, F=0x0
+1,        171,        171,       21,      247, 0x2d0776c9
+1,        192,        192,       21,      264, 0xf04a7b44
+0,        209,        209,       41,     4197, 0x3b9f74ad, F=0x0
+1,        213,        213,       21,      251, 0xc7628539
+1,        234,        234,       22,      243, 0x99ef768b
+0,        250,        334,       41,    17595, 0x1e502128, F=0x0
+1,        256,        256,       21,      257, 0x233f7ccc
+1,        277,        277,       21,      264, 0x7d9f7bd9
+0,        292,        292,       41,      741, 0xe6b94afc, F=0x0
+1,        298,        298,       21,      298, 0x51478f98
+1,        319,        319,       22,      323, 0x419d9938
+0,        334,        417,       41,    16138, 0xba72f2fe, F=0x0
+1,        341,        341,       21,      309, 0x6219980c
+1,        362,        362,       21,      325, 0x3fb3976f
+0,        375,        375,       41,      322, 0xd6bf790f, F=0x0
+1,        383,        383,       21,      325, 0xcd7a9fd6
+1,        404,        404,       22,      359, 0x6edeb91c
+1,        426,        426,       21,      333, 0xb8999fb7
+1,        447,        447,       21,      317, 0xf2589e1a
+1,        468,        468,       21,      319, 0x82ed9572
+1,        489,        489,       22,      473, 0xea54e696
diff --git a/tests/ref/fate/mlv-demux b/tests/ref/fate/mlv-demux
new file mode 100644
index 0000000000..8c59012805
--- /dev/null
+++ b/tests/ref/fate/mlv-demux
@@ -0,0 +1 @@
+CRC=0x937f8af3
diff --git a/tests/ref/fate/motionpixels b/tests/ref/fate/motionpixels
index 97d8edfb43..b376cc2841 100644
--- a/tests/ref/fate/motionpixels
+++ b/tests/ref/fate/motionpixels
@@ -1,112 +1,116 @@
 #tb 0: 66667/1000000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   230400, 0xee05b509
-0,          1,          1,        1,   230400, 0x71048964
-0,          2,          2,        1,   230400, 0x2ebe4ba1
-0,          3,          3,        1,   230400, 0xeedc45a6
-0,          4,          4,        1,   230400, 0x218e8656
-0,          5,          5,        1,   230400, 0x5792b17e
-0,          6,          6,        1,   230400, 0x51b0a062
-0,          7,          7,        1,   230400, 0x5dc4fd9c
-0,          8,          8,        1,   230400, 0x9b0261b1
-0,          9,          9,        1,   230400, 0x35086ffc
-0,         10,         10,        1,   230400, 0xcf9352ff
-0,         11,         11,        1,   230400, 0x0b5139a1
-0,         12,         12,        1,   230400, 0x22e8a31e
-0,         13,         13,        1,   230400, 0x82f61a81
-0,         14,         14,        1,   230400, 0xc5741ab5
-0,         15,         15,        1,   230400, 0xb5e7b2ff
-0,         16,         16,        1,   230400, 0x583289ca
-0,         17,         17,        1,   230400, 0xee52afbb
-0,         18,         18,        1,   230400, 0xfdb4dc1a
-0,         19,         19,        1,   230400, 0xf5ce99c0
-0,         20,         20,        1,   230400, 0xae222255
-0,         21,         21,        1,   230400, 0xc4f4439d
-0,         22,         22,        1,   230400, 0x1758f224
-0,         23,         23,        1,   230400, 0x5f517926
-0,         24,         24,        1,   230400, 0x73a8bed8
-0,         25,         25,        1,   230400, 0x7ef8410c
-0,         26,         26,        1,   230400, 0xfcb693c7
-0,         27,         27,        1,   230400, 0x5292832e
-0,         28,         28,        1,   230400, 0x591261d7
-0,         29,         29,        1,   230400, 0x28cca691
-0,         30,         30,        1,   230400, 0x22cf40ef
-0,         31,         31,        1,   230400, 0x517b10f9
-0,         32,         32,        1,   230400, 0x8197e939
-0,         33,         33,        1,   230400, 0x9654ffdb
-0,         34,         34,        1,   230400, 0x803f10dd
-0,         35,         35,        1,   230400, 0xff9f67af
-0,         36,         36,        1,   230400, 0x4847244c
-0,         37,         37,        1,   230400, 0xff31638f
-0,         38,         38,        1,   230400, 0x9692def5
-0,         39,         39,        1,   230400, 0x67f0a5fb
-0,         40,         40,        1,   230400, 0xce192074
-0,         41,         41,        1,   230400, 0x33d6c4a5
-0,         42,         42,        1,   230400, 0xaf7b5a03
-0,         43,         43,        1,   230400, 0xd956b0c0
-0,         44,         44,        1,   230400, 0x58ff1a65
-0,         45,         45,        1,   230400, 0x044758a1
-0,         46,         46,        1,   230400, 0xe8045b65
-0,         47,         47,        1,   230400, 0xf504c5fb
-0,         48,         48,        1,   230400, 0x17a9a2b0
-0,         49,         49,        1,   230400, 0xf68bab8c
-0,         50,         50,        1,   230400, 0xd06dd0cb
-0,         51,         51,        1,   230400, 0xc47d2673
-0,         52,         52,        1,   230400, 0x2112f291
-0,         53,         53,        1,   230400, 0x4c07c83c
-0,         54,         54,        1,   230400, 0x22ca0113
-0,         55,         55,        1,   230400, 0x25b0c8b1
-0,         56,         56,        1,   230400, 0xb6afc645
-0,         57,         57,        1,   230400, 0x663b1c09
-0,         58,         58,        1,   230400, 0x9006ef1f
-0,         59,         59,        1,   230400, 0x54f81b11
-0,         60,         60,        1,   230400, 0x456b79f2
-0,         61,         61,        1,   230400, 0xb08f24d0
-0,         62,         62,        1,   230400, 0x652ad875
-0,         63,         63,        1,   230400, 0xc6ecd67f
-0,         64,         64,        1,   230400, 0x78dad721
-0,         65,         65,        1,   230400, 0x1d2a4f71
-0,         66,         66,        1,   230400, 0xc71721d1
-0,         67,         67,        1,   230400, 0x64e3a7df
-0,         68,         68,        1,   230400, 0x3bb18e71
-0,         69,         69,        1,   230400, 0xb571d58c
-0,         70,         70,        1,   230400, 0xdae6ed5c
-0,         71,         71,        1,   230400, 0xdd91504b
-0,         72,         72,        1,   230400, 0xd5a807a5
-0,         73,         73,        1,   230400, 0x39a67b03
-0,         74,         74,        1,   230400, 0xe245c8ac
-0,         75,         75,        1,   230400, 0x5b0d7858
-0,         76,         76,        1,   230400, 0x501b8097
-0,         77,         77,        1,   230400, 0xf7b10d48
-0,         78,         78,        1,   230400, 0x769db0bd
-0,         79,         79,        1,   230400, 0x600f1086
-0,         80,         80,        1,   230400, 0x874f5565
-0,         81,         81,        1,   230400, 0x14322f73
-0,         82,         82,        1,   230400, 0x0eaa36a5
-0,         83,         83,        1,   230400, 0x97178d13
-0,         84,         84,        1,   230400, 0xd4c7a0d1
-0,         85,         85,        1,   230400, 0x1d424ec8
-0,         86,         86,        1,   230400, 0x695ad8d9
-0,         87,         87,        1,   230400, 0xe7cc3ecf
-0,         88,         88,        1,   230400, 0xfd25fd8c
-0,         89,         89,        1,   230400, 0xef4bc203
-0,         90,         90,        1,   230400, 0x2a113bec
-0,         91,         91,        1,   230400, 0x6e7ad403
-0,         92,         92,        1,   230400, 0xc6714d2b
-0,         93,         93,        1,   230400, 0x77df8ba6
-0,         94,         94,        1,   230400, 0xcd283106
-0,         95,         95,        1,   230400, 0xcb95676f
-0,         96,         96,        1,   230400, 0xb0b70393
-0,         97,         97,        1,   230400, 0x4c40bd63
-0,         98,         98,        1,   230400, 0x557e8ccf
-0,         99,         99,        1,   230400, 0x9d5934b2
-0,        100,        100,        1,   230400, 0x43c1793f
-0,        101,        101,        1,   230400, 0x0232361e
-0,        102,        102,        1,   230400, 0x92ed91e4
-0,        103,        103,        1,   230400, 0x99769789
-0,        104,        104,        1,   230400, 0xd49c2c5b
-0,        105,        105,        1,   230400, 0x66b03495
-0,        106,        106,        1,   230400, 0xb88a4658
-0,        107,        107,        1,   230400, 0x9c21e4c2
-0,        108,        108,        1,   230400, 0xb343f372
-0,        109,        109,        1,   230400, 0xf7f1e588
-0,        110,        110,        1,   230400, 0x9682bdb2
+0,          1,          1,        1,   230400, 0x23b28b24
+0,          2,          2,        1,   230400, 0x4a4d6007
+0,          3,          3,        1,   230400, 0xe5550693
+0,          4,          4,        1,   230400, 0xad4905a3
+0,          5,          5,        1,   230400, 0xc83b9030
+0,          6,          6,        1,   230400, 0xbc73a26a
+0,          7,          7,        1,   230400, 0x7065ff8a
+0,          8,          8,        1,   230400, 0x65bc7675
+0,          9,          9,        1,   230400, 0xc245737f
+0,         10,         10,        1,   230400, 0x77e6c1ed
+0,         11,         11,        1,   230400, 0x6761d73a
+0,         12,         12,        1,   230400, 0x6207b8f8
+0,         13,         13,        1,   230400, 0xa3691862
+0,         14,         14,        1,   230400, 0x83fbfc24
+0,         15,         15,        1,   230400, 0xe1c34ef0
+0,         16,         16,        1,   230400, 0xd7b50e8e
+0,         17,         17,        1,   230400, 0x5b5e2f29
+0,         18,         18,        1,   230400, 0xca7825e5
+0,         19,         19,        1,   230400, 0xb4c7b4a9
+0,         20,         20,        1,   230400, 0xc35513b5
+0,         21,         21,        1,   230400, 0x36117834
+0,         22,         22,        1,   230400, 0x8af035d7
+0,         23,         23,        1,   230400, 0x25c50a2e
+0,         24,         24,        1,   230400, 0x52f54107
+0,         25,         25,        1,   230400, 0xaddca5f9
+0,         26,         26,        1,   230400, 0x3b1fe64c
+0,         27,         27,        1,   230400, 0xcd52de15
+0,         28,         28,        1,   230400, 0xfaa4f7fa
+0,         29,         29,        1,   230400, 0xce5b3221
+0,         30,         30,        1,   230400, 0xb2c3d9ba
+0,         31,         31,        1,   230400, 0xf6ec95e9
+0,         32,         32,        1,   230400, 0xfa7ebd18
+0,         33,         33,        1,   230400, 0xb6e50465
+0,         34,         34,        1,   230400, 0xd48ceee9
+0,         35,         35,        1,   230400, 0x333605cf
+0,         36,         36,        1,   230400, 0xe7ccf362
+0,         37,         37,        1,   230400, 0x39f07b83
+0,         38,         38,        1,   230400, 0xd6450b2e
+0,         39,         39,        1,   230400, 0x2029ec12
+0,         40,         40,        1,   230400, 0x15d7762e
+0,         41,         41,        1,   230400, 0x0d69506d
+0,         42,         42,        1,   230400, 0xcf2ef066
+0,         43,         43,        1,   230400, 0x2c145df0
+0,         44,         44,        1,   230400, 0x153d7fe7
+0,         45,         45,        1,   230400, 0x98846aea
+0,         46,         46,        1,   230400, 0xc0347d4e
+0,         47,         47,        1,   230400, 0xda7a58a8
+0,         48,         48,        1,   230400, 0x5724c05e
+0,         49,         49,        1,   230400, 0x9805237b
+0,         50,         50,        1,   230400, 0x2f5f0d70
+0,         51,         51,        1,   230400, 0xb1271014
+0,         52,         52,        1,   230400, 0x6cb29d9c
+0,         53,         53,        1,   230400, 0x4f91fdb4
+0,         54,         54,        1,   230400, 0x274b3f30
+0,         55,         55,        1,   230400, 0xdfc508e8
+0,         56,         56,        1,   230400, 0x16e974ef
+0,         57,         57,        1,   230400, 0x98fae336
+0,         58,         58,        1,   230400, 0xbf265f84
+0,         59,         59,        1,   230400, 0x75cf323b
+0,         60,         60,        1,   230400, 0xdb3481f7
+0,         61,         61,        1,   230400, 0xb8453df5
+0,         62,         62,        1,   230400, 0xd4598deb
+0,         63,         63,        1,   230400, 0x4dc19cf6
+0,         64,         64,        1,   230400, 0xa8d1b340
+0,         65,         65,        1,   230400, 0x1f98aa27
+0,         66,         66,        1,   230400, 0x505c0687
+0,         67,         67,        1,   230400, 0x86179997
+0,         68,         68,        1,   230400, 0x7e28cc7d
+0,         69,         69,        1,   230400, 0x0a81c0bc
+0,         70,         70,        1,   230400, 0x71cc0c9a
+0,         71,         71,        1,   230400, 0x8c01340f
+0,         72,         72,        1,   230400, 0x4afea48a
+0,         73,         73,        1,   230400, 0x7dc88c26
+0,         74,         74,        1,   230400, 0x4155fbbb
+0,         75,         75,        1,   230400, 0xb1ec2d6b
+0,         76,         76,        1,   230400, 0x6986ee65
+0,         77,         77,        1,   230400, 0x8ff9a311
+0,         78,         78,        1,   230400, 0x36c21c52
+0,         79,         79,        1,   230400, 0xdb0fad2e
+0,         80,         80,        1,   230400, 0xc7a83c34
+0,         81,         81,        1,   230400, 0x8bd97389
+0,         82,         82,        1,   230400, 0x6dd8f0d6
+0,         83,         83,        1,   230400, 0x228e2076
+0,         84,         84,        1,   230400, 0x22544f03
+0,         85,         85,        1,   230400, 0x938084ef
+0,         86,         86,        1,   230400, 0xb002cd81
+0,         87,         87,        1,   230400, 0xe58d3339
+0,         88,         88,        1,   230400, 0x02470a69
+0,         89,         89,        1,   230400, 0xa5c51328
+0,         90,         90,        1,   230400, 0x1a6e37ec
+0,         91,         91,        1,   230400, 0x8f40563c
+0,         92,         92,        1,   230400, 0x30f9095f
+0,         93,         93,        1,   230400, 0x6227f0e8
+0,         94,         94,        1,   230400, 0xdca3596d
+0,         95,         95,        1,   230400, 0x30938988
+0,         96,         96,        1,   230400, 0x28bdc666
+0,         97,         97,        1,   230400, 0x6c534265
+0,         98,         98,        1,   230400, 0x6ea56d2d
+0,         99,         99,        1,   230400, 0x125f3808
+0,        100,        100,        1,   230400, 0x92a41d2f
+0,        101,        101,        1,   230400, 0xf1cf2410
+0,        102,        102,        1,   230400, 0x1bea1204
+0,        103,        103,        1,   230400, 0x817e60f9
+0,        104,        104,        1,   230400, 0x9f6c720e
+0,        105,        105,        1,   230400, 0xf1a43a2f
+0,        106,        106,        1,   230400, 0x5e5e0b7f
+0,        107,        107,        1,   230400, 0x7f526bcf
+0,        108,        108,        1,   230400, 0x63a846ed
+0,        109,        109,        1,   230400, 0x94400af9
+0,        110,        110,        1,   230400, 0x51f4241e
diff --git a/tests/ref/fate/mov-1elist-1ctts b/tests/ref/fate/mov-1elist-1ctts
new file mode 100644
index 0000000000..379d47a699
--- /dev/null
+++ b/tests/ref/fate/mov-1elist-1ctts
@@ -0,0 +1,57 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   460800, 3dd21395fc5d3429f9b08492f47af093
+0,          1,          1,        1,   460800, 117009cceecc160c385dac3d344505c9
+0,          2,          2,        1,   460800, c093aa6e8747287cfeb758f2da7476d1
+0,          3,          3,        1,   460800, 6b7c94a3363f3381f7f930ac02b0c975
+0,          4,          4,        1,   460800, 87c3824a0ef3566f1a384c3c3e2b0d96
+0,          5,          5,        1,   460800, 3de48f3009a159e4737b5993102266de
+0,          6,          6,        1,   460800, 2be0ed1afe921093645af2ff917281ab
+0,          7,          7,        1,   460800, a89170c8413305fdba8d413a5080e57a
+0,          8,          8,        1,   460800, 5a3be131222c223ef8eccd9636330839
+0,          9,          9,        1,   460800, 01068b423526481b9732214c16b9e229
+0,         10,         10,        1,   460800, f9ea60560154e82d77e2661c34dca143
+0,         11,         11,        1,   460800, d77f5b82e34ea5a450076a85141a5618
+0,         12,         12,        1,   460800, 91ff4efcfc3a2301fb2329139e0e71a2
+0,         13,         13,        1,   460800, af8d914008f5f64f2ec1fadfae8bc697
+0,         14,         14,        1,   460800, abb2c4fd1f1ce3c449236da246b62bef
+0,         15,         15,        1,   460800, 66b0558f03dd5a472836fea045dd06ea
+0,         16,         16,        1,   460800, 224207d3e5b93fc4e8c71b782aabca51
+0,         17,         17,        1,   460800, ef975cfa7bc4de88f1333eb301f7ebdd
+0,         18,         18,        1,   460800, d75bf790003d2b1ee56bea0cef068e8e
+0,         19,         19,        1,   460800, d7a16935d7f808cca046db971e5b612a
+0,         20,         20,        1,   460800, f49d06ca4995c267fdc8c674c992cdd1
+0,         21,         21,        1,   460800, f53fd634154dec26ec85b6bef01ba890
+0,         22,         22,        1,   460800, d2d36371e50ace43ae4d2bab092a24c3
+0,         23,         23,        1,   460800, a4c08f4979e7dc914d69a170e198656c
+0,         24,         24,        1,   460800, 0d128e33f156fcc228d92117d56a5f93
+0,         25,         25,        1,   460800, 52fb8fc75c848ed9bc61d5129473f3fb
+0,         26,         26,        1,   460800, 5517f79d2ccb4fc93ede061bfcd632ea
+0,         27,         27,        1,   460800, c24fea9e8d02240328de3cb520904a6b
+0,         28,         28,        1,   460800, 0cbe46a4b91a0bd235d5e74084058e61
+0,         29,         29,        1,   460800, 355b17c2feb6b809c95bb71b333a670d
+0,         30,         30,        1,   460800, 063643ba941293ba95e024da202267cb
+0,         31,         31,        1,   460800, 8b31727d492fa9b25e025a1f45425b16
+0,         32,         32,        1,   460800, 45c5901c24d2ae2304b3e82c075a96bf
+0,         33,         33,        1,   460800, b7d4449d0e2157093727cb0f00648751
+0,         34,         34,        1,   460800, 167642e702f645853c974531853987f8
+0,         35,         35,        1,   460800, 2eb4596d675f099bab6c3b40ce30fd88
+0,         36,         36,        1,   460800, 8dd1aec35b92610cb22bedd3c54cb26a
+0,         37,         37,        1,   460800, 8eacf32e58d9a731467aba0f61d9e60f
+0,         38,         38,        1,   460800, 6a735f86d18ebe265894f633071a25d7
+0,         39,         39,        1,   460800, 843b0c938845b72e1c23bc39f7479cba
+0,         40,         40,        1,   460800, ca2099b43141cb9131505ab40ac3959f
+0,         41,         41,        1,   460800, e65322e1929def11f9985683365ab6bf
+0,         42,         42,        1,   460800, 565410a8c2f4b50a192f9590e6ab32c0
+0,         43,         43,        1,   460800, fa9a8ac625854cc279a07766ddad6e6f
+0,         44,         44,        1,   460800, a46ac62886c48edef3dc58de34a2a004
+0,         45,         45,        1,   460800, 414e01b6c24e71efc9c58f65dc0f4aca
+0,         46,         46,        1,   460800, e0501b903f21b490da049e51e7a02bae
+0,         47,         47,        1,   460800, 48b30eec1e9d862ee54b136045e1d90f
diff --git a/tests/ref/fate/mov-1elist-ends-last-bframe b/tests/ref/fate/mov-1elist-ends-last-bframe
new file mode 100644
index 0000000000..4f8f1aec56
--- /dev/null
+++ b/tests/ref/fate/mov-1elist-ends-last-bframe
@@ -0,0 +1,56 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   460800, b3d774603a22dbf9e952465c0d295166
+0,          1,          1,        1,   460800, d8f88e4269888dfadeb15bec662a3851
+0,          2,          2,        1,   460800, 6d6e686070143f797f8f1eca43d9cf28
+0,          3,          3,        1,   460800, a934f883968e71f22df044f043e61b14
+0,          4,          4,        1,   460800, 83dc65c7703f43ce97c87eea7191f69e
+0,          5,          5,        1,   460800, d633ab0dba64277b104ff5c2e1983424
+0,          6,          6,        1,   460800, 6c7d2c7481bd11584d68dbb9262d8351
+0,          7,          7,        1,   460800, 59b0bbc661b79ba82d726ca4d28255f2
+0,          8,          8,        1,   460800, 821cd7ca0adc4d6a3f10419b6c4283a6
+0,          9,          9,        1,   460800, 4655b1d6e8237b2e880f5b4140f7cf08
+0,         10,         10,        1,   460800, 264858653f9ac0623ffc87ca5e4c9939
+0,         11,         11,        1,   460800, b7129e91b9a6b4f8582747f12cafa52e
+0,         12,         12,        1,   460800, 1f6596fba655e213fd5c2ea99a891138
+0,         13,         13,        1,   460800, c8d67dc8fa8bdca263060ae542e55278
+0,         14,         14,        1,   460800, 57aa680b64b140eaeaa7f4250c12b59e
+0,         15,         15,        1,   460800, b87e8a9c0701cd8811dd38292b9994f7
+0,         16,         16,        1,   460800, 2427eb2900c8e18da0f36e47799a5ed8
+0,         17,         17,        1,   460800, 710a727a7ba51bc2938ca83376c6edd6
+0,         18,         18,        1,   460800, 44d5ce80804d9ca470f9e5348c66e9b3
+0,         19,         19,        1,   460800, 448e1fc3af42c4143e5fc4120090cdd6
+0,         20,         20,        1,   460800, 7c2c4c61843cfdd033b8fa295766a524
+0,         21,         21,        1,   460800, 20a197cb4e20857e135d4c10945987f6
+0,         22,         22,        1,   460800, 7534b00e60f6920da7b767aef0876e65
+0,         23,         23,        1,   460800, b88cedb84145f07226d5573aa57a1cce
+0,         24,         24,        1,   460800, 620751271985df3728b6dbc627974183
+0,         25,         25,        1,   460800, 643719b26ac93f93d1674fee97c58a35
+0,         26,         26,        1,   460800, 5d3f8fa9abab0256afbf4285cd337804
+0,         27,         27,        1,   460800, a6c302c54c6481088f9c27189ecda5a8
+0,         28,         28,        1,   460800, 2851ad86c15a1dc7b6d4a0fe8f15de8f
+0,         29,         29,        1,   460800, 42157005018908c810b1840856778482
+0,         30,         30,        1,   460800, 2541042038568329922fd6f7187aad49
+0,         31,         31,        1,   460800, 855b9ecfa9da66ef5971fcea7e515890
+0,         32,         32,        1,   460800, 85df610183efce5de91946cb909019c9
+0,         33,         33,        1,   460800, 369bce83d8aa0ac3cfb853b7e2886896
+0,         34,         34,        1,   460800, b428e7b294e5ac0d316971e02a25b12a
+0,         35,         35,        1,   460800, aa66321995b890e8dbd0d7b188ecb19c
+0,         36,         36,        1,   460800, 1533e3c85fd9d1f6710442653b936ef0
+0,         37,         37,        1,   460800, 99f3d38c95f1e4c0b442007a466f77cb
+0,         38,         38,        1,   460800, 30e007d8a4c0f0cfa22c8b6051980b59
+0,         39,         39,        1,   460800, fef21426b54048af617211234ee9b602
+0,         40,         40,        1,   460800, ff9a482c793a8e9950c0aa7e2845ca0e
+0,         41,         41,        1,   460800, ac0bb586786c35a51bdb6a5514ff54b9
+0,         42,         42,        1,   460800, bb008ec74fe642d6350bb1b4c922a6b0
+0,         43,         43,        1,   460800, 3e4255d1e817b9c6fa2cfbb0f198069d
+0,         44,         44,        1,   460800, 0fe04242f0441fa5c90e69ca015f4b2d
+0,         45,         45,        1,   460800, f14c12ec008a56c9aa99ef1be857ad23
+0,         46,         46,        1,   460800, 43ac558397b699ac82f7e12810c7ade9
diff --git a/tests/ref/fate/mov-1elist-noctts b/tests/ref/fate/mov-1elist-noctts
new file mode 100644
index 0000000000..379d47a699
--- /dev/null
+++ b/tests/ref/fate/mov-1elist-noctts
@@ -0,0 +1,57 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   460800, 3dd21395fc5d3429f9b08492f47af093
+0,          1,          1,        1,   460800, 117009cceecc160c385dac3d344505c9
+0,          2,          2,        1,   460800, c093aa6e8747287cfeb758f2da7476d1
+0,          3,          3,        1,   460800, 6b7c94a3363f3381f7f930ac02b0c975
+0,          4,          4,        1,   460800, 87c3824a0ef3566f1a384c3c3e2b0d96
+0,          5,          5,        1,   460800, 3de48f3009a159e4737b5993102266de
+0,          6,          6,        1,   460800, 2be0ed1afe921093645af2ff917281ab
+0,          7,          7,        1,   460800, a89170c8413305fdba8d413a5080e57a
+0,          8,          8,        1,   460800, 5a3be131222c223ef8eccd9636330839
+0,          9,          9,        1,   460800, 01068b423526481b9732214c16b9e229
+0,         10,         10,        1,   460800, f9ea60560154e82d77e2661c34dca143
+0,         11,         11,        1,   460800, d77f5b82e34ea5a450076a85141a5618
+0,         12,         12,        1,   460800, 91ff4efcfc3a2301fb2329139e0e71a2
+0,         13,         13,        1,   460800, af8d914008f5f64f2ec1fadfae8bc697
+0,         14,         14,        1,   460800, abb2c4fd1f1ce3c449236da246b62bef
+0,         15,         15,        1,   460800, 66b0558f03dd5a472836fea045dd06ea
+0,         16,         16,        1,   460800, 224207d3e5b93fc4e8c71b782aabca51
+0,         17,         17,        1,   460800, ef975cfa7bc4de88f1333eb301f7ebdd
+0,         18,         18,        1,   460800, d75bf790003d2b1ee56bea0cef068e8e
+0,         19,         19,        1,   460800, d7a16935d7f808cca046db971e5b612a
+0,         20,         20,        1,   460800, f49d06ca4995c267fdc8c674c992cdd1
+0,         21,         21,        1,   460800, f53fd634154dec26ec85b6bef01ba890
+0,         22,         22,        1,   460800, d2d36371e50ace43ae4d2bab092a24c3
+0,         23,         23,        1,   460800, a4c08f4979e7dc914d69a170e198656c
+0,         24,         24,        1,   460800, 0d128e33f156fcc228d92117d56a5f93
+0,         25,         25,        1,   460800, 52fb8fc75c848ed9bc61d5129473f3fb
+0,         26,         26,        1,   460800, 5517f79d2ccb4fc93ede061bfcd632ea
+0,         27,         27,        1,   460800, c24fea9e8d02240328de3cb520904a6b
+0,         28,         28,        1,   460800, 0cbe46a4b91a0bd235d5e74084058e61
+0,         29,         29,        1,   460800, 355b17c2feb6b809c95bb71b333a670d
+0,         30,         30,        1,   460800, 063643ba941293ba95e024da202267cb
+0,         31,         31,        1,   460800, 8b31727d492fa9b25e025a1f45425b16
+0,         32,         32,        1,   460800, 45c5901c24d2ae2304b3e82c075a96bf
+0,         33,         33,        1,   460800, b7d4449d0e2157093727cb0f00648751
+0,         34,         34,        1,   460800, 167642e702f645853c974531853987f8
+0,         35,         35,        1,   460800, 2eb4596d675f099bab6c3b40ce30fd88
+0,         36,         36,        1,   460800, 8dd1aec35b92610cb22bedd3c54cb26a
+0,         37,         37,        1,   460800, 8eacf32e58d9a731467aba0f61d9e60f
+0,         38,         38,        1,   460800, 6a735f86d18ebe265894f633071a25d7
+0,         39,         39,        1,   460800, 843b0c938845b72e1c23bc39f7479cba
+0,         40,         40,        1,   460800, ca2099b43141cb9131505ab40ac3959f
+0,         41,         41,        1,   460800, e65322e1929def11f9985683365ab6bf
+0,         42,         42,        1,   460800, 565410a8c2f4b50a192f9590e6ab32c0
+0,         43,         43,        1,   460800, fa9a8ac625854cc279a07766ddad6e6f
+0,         44,         44,        1,   460800, a46ac62886c48edef3dc58de34a2a004
+0,         45,         45,        1,   460800, 414e01b6c24e71efc9c58f65dc0f4aca
+0,         46,         46,        1,   460800, e0501b903f21b490da049e51e7a02bae
+0,         47,         47,        1,   460800, 48b30eec1e9d862ee54b136045e1d90f
diff --git a/tests/ref/fate/mov-2elist-elist1-ends-bframe b/tests/ref/fate/mov-2elist-elist1-ends-bframe
new file mode 100644
index 0000000000..76296caae6
--- /dev/null
+++ b/tests/ref/fate/mov-2elist-elist1-ends-bframe
@@ -0,0 +1,51 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   460800, b3d774603a22dbf9e952465c0d295166
+0,          1,          1,        1,   460800, d8f88e4269888dfadeb15bec662a3851
+0,          2,          2,        1,   460800, 6d6e686070143f797f8f1eca43d9cf28
+0,          3,          3,        1,   460800, a934f883968e71f22df044f043e61b14
+0,          4,          4,        1,   460800, 83dc65c7703f43ce97c87eea7191f69e
+0,          5,          5,        1,   460800, d633ab0dba64277b104ff5c2e1983424
+0,          6,          6,        1,   460800, 6c7d2c7481bd11584d68dbb9262d8351
+0,          7,          7,        1,   460800, 59b0bbc661b79ba82d726ca4d28255f2
+0,          8,          8,        1,   460800, 821cd7ca0adc4d6a3f10419b6c4283a6
+0,          9,          9,        1,   460800, 4655b1d6e8237b2e880f5b4140f7cf08
+0,         10,         10,        1,   460800, 264858653f9ac0623ffc87ca5e4c9939
+0,         11,         11,        1,   460800, b7129e91b9a6b4f8582747f12cafa52e
+0,         12,         12,        1,   460800, 1f6596fba655e213fd5c2ea99a891138
+0,         13,         13,        1,   460800, c8d67dc8fa8bdca263060ae542e55278
+0,         14,         14,        1,   460800, 57aa680b64b140eaeaa7f4250c12b59e
+0,         15,         15,        1,   460800, b87e8a9c0701cd8811dd38292b9994f7
+0,         16,         16,        1,   460800, 2427eb2900c8e18da0f36e47799a5ed8
+0,         17,         17,        1,   460800, 710a727a7ba51bc2938ca83376c6edd6
+0,         18,         18,        1,   460800, 620751271985df3728b6dbc627974183
+0,         19,         19,        1,   460800, 643719b26ac93f93d1674fee97c58a35
+0,         20,         20,        1,   460800, 5d3f8fa9abab0256afbf4285cd337804
+0,         21,         21,        1,   460800, a6c302c54c6481088f9c27189ecda5a8
+0,         22,         22,        1,   460800, 2851ad86c15a1dc7b6d4a0fe8f15de8f
+0,         23,         23,        1,   460800, 42157005018908c810b1840856778482
+0,         24,         24,        1,   460800, 2541042038568329922fd6f7187aad49
+0,         25,         25,        1,   460800, 855b9ecfa9da66ef5971fcea7e515890
+0,         26,         26,        1,   460800, 85df610183efce5de91946cb909019c9
+0,         27,         27,        1,   460800, 369bce83d8aa0ac3cfb853b7e2886896
+0,         28,         28,        1,   460800, b428e7b294e5ac0d316971e02a25b12a
+0,         29,         29,        1,   460800, aa66321995b890e8dbd0d7b188ecb19c
+0,         30,         30,        1,   460800, 1533e3c85fd9d1f6710442653b936ef0
+0,         31,         31,        1,   460800, 99f3d38c95f1e4c0b442007a466f77cb
+0,         32,         32,        1,   460800, 30e007d8a4c0f0cfa22c8b6051980b59
+0,         33,         33,        1,   460800, fef21426b54048af617211234ee9b602
+0,         34,         34,        1,   460800, ff9a482c793a8e9950c0aa7e2845ca0e
+0,         35,         35,        1,   460800, ac0bb586786c35a51bdb6a5514ff54b9
+0,         36,         36,        1,   460800, bb008ec74fe642d6350bb1b4c922a6b0
+0,         37,         37,        1,   460800, 3e4255d1e817b9c6fa2cfbb0f198069d
+0,         38,         38,        1,   460800, 0fe04242f0441fa5c90e69ca015f4b2d
+0,         39,         39,        1,   460800, f14c12ec008a56c9aa99ef1be857ad23
+0,         40,         40,        1,   460800, 43ac558397b699ac82f7e12810c7ade9
+0,         41,         41,        1,   460800, 35431eb1a8be4f05d08d23380655178c
diff --git a/tests/ref/fate/mov-3elist b/tests/ref/fate/mov-3elist
new file mode 100644
index 0000000000..daf4927e0f
--- /dev/null
+++ b/tests/ref/fate/mov-3elist
@@ -0,0 +1,57 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   460800, 80fbbdec589e15e6c493b44d243f92a9
+0,          1,          1,        1,   460800, f4b23293bb2ecf69cc3570853d8c56a1
+0,          2,          2,        1,   460800, 0c03ce2c1c6ec405d7455465ecd559a3
+0,          3,          3,        1,   460800, 7921791695537fba2c3c123da4834cb9
+0,          4,          4,        1,   460800, 30c8e2903a561b84d4cbaf95c668d236
+0,          5,          5,        1,   460800, 7ff42e998217c17592ddf6b584f26cef
+0,          6,          6,        1,   460800, 5e402c48bf097db2d31b82bb4194a382
+0,          7,          7,        1,   460800, 824c49e92c8ae6d99a0207b514dd756c
+0,          8,          8,        1,   460800, 24f189216a1d9cf2313b2d6dbe3dbdd3
+0,          9,          9,        1,   460800, 519179a8e74275d26b183374637e003f
+0,         10,         10,        1,   460800, f18331ddcef0adf5b069bfa98baf8db4
+0,         11,         11,        1,   460800, 081f61688690d47dbdddd5384e5d5a70
+0,         12,         12,        1,   460800, 90dbf019b9035433371a8df41a9268b7
+0,         13,         13,        1,   460800, bb5adfb9c66732898b34186eca1667ba
+0,         14,         14,        1,   460800, cc08cfd64f37783ecddaf143f6ad78bc
+0,         15,         15,        1,   460800, b8ae21d024fe4df903d56f4521993c72
+0,         16,         16,        1,   460800, b45a99907f045dcadf0a2befc11555e3
+0,         17,         17,        1,   460800, 603ba935845e65ab6cccbbec88bbf60d
+0,         18,         18,        1,   460800, df80c8d3e6a77258a306903f17995a18
+0,         19,         19,        1,   460800, 4b7e90c0a5fd0e0cd958d47f0afac636
+0,         20,         20,        1,   460800, 9feb6e36182f1745be6387edea240eb6
+0,         21,         21,        1,   460800, 86e6de4bd0a5ff7558f4cf6c1ec3930d
+0,         22,         22,        1,   460800, 726b69df77edbe7b503d4698656d1320
+0,         23,         23,        1,   460800, d282fb7a953ac205b0a43d00c2d60a33
+0,         24,         24,        1,   460800, eece3daa70cc20208dd75d91ac84c8fd
+0,         25,         25,        1,   460800, c86d23e73bcce351fc315fb1f13348da
+0,         26,         26,        1,   460800, 93497b4f7c5ad9d61212239b7c9d2770
+0,         27,         27,        1,   460800, eb217d2c12de67903835a8c58f620488
+0,         28,         28,        1,   460800, d966480867bb54c8cd044f18388ed486
+0,         29,         29,        1,   460800, 3ea6207942b3181fdd8e8aa6cae1062a
+0,         30,         30,        1,   460800, 2620df54aca086ec0fb9527c6e6f5135
+0,         31,         31,        1,   460800, 43bb7320f0bb583188dc965ddbfade90
+0,         32,         32,        1,   460800, 0cddaa04645f804e02f65b0836412113
+0,         33,         33,        1,   460800, 83b2dc95807289d7f4a4632bf18c2e97
+0,         34,         34,        1,   460800, 98134d0e41e6dd12827049ccf33b4669
+0,         35,         35,        1,   460800, 56f55631731fa39c7acbab0afeb2eb1b
+0,         36,         36,        1,   460800, 379c1105be09d836a515dc909455ddf4
+0,         37,         37,        1,   460800, 1df87c47e9d98731faf1c3885b77e5da
+0,         38,         38,        1,   460800, 9a8734bcbfdb4d97e530683b8b556a26
+0,         39,         39,        1,   460800, c7a7990d0cddc5adfbe27da7a42e025e
+0,         40,         40,        1,   460800, 0c81e46011e03be410feaf056207fd55
+0,         41,         41,        1,   460800, ca76e4e63016ff29d8aeeb9cb053bb6c
+0,         42,         42,        1,   460800, cebfbe299c17c1f8fc1e6b189555c3c2
+0,         43,         43,        1,   460800, 4f002c5feca5e75f07089e0df47507dd
+0,         44,         44,        1,   460800, c5fd83fc4a745abee9b3d9a6eec9dd3e
+0,         45,         45,        1,   460800, 57d9bad9b45aa2746de5d8bdc2c24969
+0,         46,         46,        1,   460800, 9831673ad7dec167af4a959f64258949
+0,         47,         47,        1,   460800, 77a1cb208f70f51bcb01e28d8cba73b4
diff --git a/tests/ref/fate/mov-3elist-1ctts b/tests/ref/fate/mov-3elist-1ctts
new file mode 100644
index 0000000000..379d47a699
--- /dev/null
+++ b/tests/ref/fate/mov-3elist-1ctts
@@ -0,0 +1,57 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   460800, 3dd21395fc5d3429f9b08492f47af093
+0,          1,          1,        1,   460800, 117009cceecc160c385dac3d344505c9
+0,          2,          2,        1,   460800, c093aa6e8747287cfeb758f2da7476d1
+0,          3,          3,        1,   460800, 6b7c94a3363f3381f7f930ac02b0c975
+0,          4,          4,        1,   460800, 87c3824a0ef3566f1a384c3c3e2b0d96
+0,          5,          5,        1,   460800, 3de48f3009a159e4737b5993102266de
+0,          6,          6,        1,   460800, 2be0ed1afe921093645af2ff917281ab
+0,          7,          7,        1,   460800, a89170c8413305fdba8d413a5080e57a
+0,          8,          8,        1,   460800, 5a3be131222c223ef8eccd9636330839
+0,          9,          9,        1,   460800, 01068b423526481b9732214c16b9e229
+0,         10,         10,        1,   460800, f9ea60560154e82d77e2661c34dca143
+0,         11,         11,        1,   460800, d77f5b82e34ea5a450076a85141a5618
+0,         12,         12,        1,   460800, 91ff4efcfc3a2301fb2329139e0e71a2
+0,         13,         13,        1,   460800, af8d914008f5f64f2ec1fadfae8bc697
+0,         14,         14,        1,   460800, abb2c4fd1f1ce3c449236da246b62bef
+0,         15,         15,        1,   460800, 66b0558f03dd5a472836fea045dd06ea
+0,         16,         16,        1,   460800, 224207d3e5b93fc4e8c71b782aabca51
+0,         17,         17,        1,   460800, ef975cfa7bc4de88f1333eb301f7ebdd
+0,         18,         18,        1,   460800, d75bf790003d2b1ee56bea0cef068e8e
+0,         19,         19,        1,   460800, d7a16935d7f808cca046db971e5b612a
+0,         20,         20,        1,   460800, f49d06ca4995c267fdc8c674c992cdd1
+0,         21,         21,        1,   460800, f53fd634154dec26ec85b6bef01ba890
+0,         22,         22,        1,   460800, d2d36371e50ace43ae4d2bab092a24c3
+0,         23,         23,        1,   460800, a4c08f4979e7dc914d69a170e198656c
+0,         24,         24,        1,   460800, 0d128e33f156fcc228d92117d56a5f93
+0,         25,         25,        1,   460800, 52fb8fc75c848ed9bc61d5129473f3fb
+0,         26,         26,        1,   460800, 5517f79d2ccb4fc93ede061bfcd632ea
+0,         27,         27,        1,   460800, c24fea9e8d02240328de3cb520904a6b
+0,         28,         28,        1,   460800, 0cbe46a4b91a0bd235d5e74084058e61
+0,         29,         29,        1,   460800, 355b17c2feb6b809c95bb71b333a670d
+0,         30,         30,        1,   460800, 063643ba941293ba95e024da202267cb
+0,         31,         31,        1,   460800, 8b31727d492fa9b25e025a1f45425b16
+0,         32,         32,        1,   460800, 45c5901c24d2ae2304b3e82c075a96bf
+0,         33,         33,        1,   460800, b7d4449d0e2157093727cb0f00648751
+0,         34,         34,        1,   460800, 167642e702f645853c974531853987f8
+0,         35,         35,        1,   460800, 2eb4596d675f099bab6c3b40ce30fd88
+0,         36,         36,        1,   460800, 8dd1aec35b92610cb22bedd3c54cb26a
+0,         37,         37,        1,   460800, 8eacf32e58d9a731467aba0f61d9e60f
+0,         38,         38,        1,   460800, 6a735f86d18ebe265894f633071a25d7
+0,         39,         39,        1,   460800, 843b0c938845b72e1c23bc39f7479cba
+0,         40,         40,        1,   460800, ca2099b43141cb9131505ab40ac3959f
+0,         41,         41,        1,   460800, e65322e1929def11f9985683365ab6bf
+0,         42,         42,        1,   460800, 565410a8c2f4b50a192f9590e6ab32c0
+0,         43,         43,        1,   460800, fa9a8ac625854cc279a07766ddad6e6f
+0,         44,         44,        1,   460800, a46ac62886c48edef3dc58de34a2a004
+0,         45,         45,        1,   460800, 414e01b6c24e71efc9c58f65dc0f4aca
+0,         46,         46,        1,   460800, e0501b903f21b490da049e51e7a02bae
+0,         47,         47,        1,   460800, 48b30eec1e9d862ee54b136045e1d90f
diff --git a/tests/ref/fate/mov-3elist-encrypted b/tests/ref/fate/mov-3elist-encrypted
new file mode 100644
index 0000000000..daf4927e0f
--- /dev/null
+++ b/tests/ref/fate/mov-3elist-encrypted
@@ -0,0 +1,57 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   460800, 80fbbdec589e15e6c493b44d243f92a9
+0,          1,          1,        1,   460800, f4b23293bb2ecf69cc3570853d8c56a1
+0,          2,          2,        1,   460800, 0c03ce2c1c6ec405d7455465ecd559a3
+0,          3,          3,        1,   460800, 7921791695537fba2c3c123da4834cb9
+0,          4,          4,        1,   460800, 30c8e2903a561b84d4cbaf95c668d236
+0,          5,          5,        1,   460800, 7ff42e998217c17592ddf6b584f26cef
+0,          6,          6,        1,   460800, 5e402c48bf097db2d31b82bb4194a382
+0,          7,          7,        1,   460800, 824c49e92c8ae6d99a0207b514dd756c
+0,          8,          8,        1,   460800, 24f189216a1d9cf2313b2d6dbe3dbdd3
+0,          9,          9,        1,   460800, 519179a8e74275d26b183374637e003f
+0,         10,         10,        1,   460800, f18331ddcef0adf5b069bfa98baf8db4
+0,         11,         11,        1,   460800, 081f61688690d47dbdddd5384e5d5a70
+0,         12,         12,        1,   460800, 90dbf019b9035433371a8df41a9268b7
+0,         13,         13,        1,   460800, bb5adfb9c66732898b34186eca1667ba
+0,         14,         14,        1,   460800, cc08cfd64f37783ecddaf143f6ad78bc
+0,         15,         15,        1,   460800, b8ae21d024fe4df903d56f4521993c72
+0,         16,         16,        1,   460800, b45a99907f045dcadf0a2befc11555e3
+0,         17,         17,        1,   460800, 603ba935845e65ab6cccbbec88bbf60d
+0,         18,         18,        1,   460800, df80c8d3e6a77258a306903f17995a18
+0,         19,         19,        1,   460800, 4b7e90c0a5fd0e0cd958d47f0afac636
+0,         20,         20,        1,   460800, 9feb6e36182f1745be6387edea240eb6
+0,         21,         21,        1,   460800, 86e6de4bd0a5ff7558f4cf6c1ec3930d
+0,         22,         22,        1,   460800, 726b69df77edbe7b503d4698656d1320
+0,         23,         23,        1,   460800, d282fb7a953ac205b0a43d00c2d60a33
+0,         24,         24,        1,   460800, eece3daa70cc20208dd75d91ac84c8fd
+0,         25,         25,        1,   460800, c86d23e73bcce351fc315fb1f13348da
+0,         26,         26,        1,   460800, 93497b4f7c5ad9d61212239b7c9d2770
+0,         27,         27,        1,   460800, eb217d2c12de67903835a8c58f620488
+0,         28,         28,        1,   460800, d966480867bb54c8cd044f18388ed486
+0,         29,         29,        1,   460800, 3ea6207942b3181fdd8e8aa6cae1062a
+0,         30,         30,        1,   460800, 2620df54aca086ec0fb9527c6e6f5135
+0,         31,         31,        1,   460800, 43bb7320f0bb583188dc965ddbfade90
+0,         32,         32,        1,   460800, 0cddaa04645f804e02f65b0836412113
+0,         33,         33,        1,   460800, 83b2dc95807289d7f4a4632bf18c2e97
+0,         34,         34,        1,   460800, 98134d0e41e6dd12827049ccf33b4669
+0,         35,         35,        1,   460800, 56f55631731fa39c7acbab0afeb2eb1b
+0,         36,         36,        1,   460800, 379c1105be09d836a515dc909455ddf4
+0,         37,         37,        1,   460800, 1df87c47e9d98731faf1c3885b77e5da
+0,         38,         38,        1,   460800, 9a8734bcbfdb4d97e530683b8b556a26
+0,         39,         39,        1,   460800, c7a7990d0cddc5adfbe27da7a42e025e
+0,         40,         40,        1,   460800, 0c81e46011e03be410feaf056207fd55
+0,         41,         41,        1,   460800, ca76e4e63016ff29d8aeeb9cb053bb6c
+0,         42,         42,        1,   460800, cebfbe299c17c1f8fc1e6b189555c3c2
+0,         43,         43,        1,   460800, 4f002c5feca5e75f07089e0df47507dd
+0,         44,         44,        1,   460800, c5fd83fc4a745abee9b3d9a6eec9dd3e
+0,         45,         45,        1,   460800, 57d9bad9b45aa2746de5d8bdc2c24969
+0,         46,         46,        1,   460800, 9831673ad7dec167af4a959f64258949
+0,         47,         47,        1,   460800, 77a1cb208f70f51bcb01e28d8cba73b4
diff --git a/tests/ref/fate/mov-440hz-10ms b/tests/ref/fate/mov-440hz-10ms
new file mode 100644
index 0000000000..498879e52d
--- /dev/null
+++ b/tests/ref/fate/mov-440hz-10ms
@@ -0,0 +1,11 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,      960,     1920, 44e7e48ff08835ce30e93c7971dae7df
diff --git a/tests/ref/fate/mov-aac-2048-priming b/tests/ref/fate/mov-aac-2048-priming
new file mode 100644
index 0000000000..2616944de3
--- /dev/null
+++ b/tests/ref/fate/mov-aac-2048-priming
@@ -0,0 +1,218 @@
+packet|codec_type=audio|stream_index=0|pts=-2048|pts_time=-0.046440|dts=-2048|dts_time=-0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=258|pos=36|flags=KDside_data|side_data_type=Skip Samples|skip_samples=2048|discard_padding=0|skip_reason=0|discard_reason=0
+
+packet|codec_type=audio|stream_index=0|pts=-1024|pts_time=-0.023220|dts=-1024|dts_time=-0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=258|pos=294|flags=KD
+packet|codec_type=audio|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=146|pos=552|flags=K_
+packet|codec_type=audio|stream_index=0|pts=1024|pts_time=0.023220|dts=1024|dts_time=0.023220|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=186|pos=698|flags=K_
+packet|codec_type=audio|stream_index=0|pts=2048|pts_time=0.046440|dts=2048|dts_time=0.046440|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=222|pos=884|flags=K_
+packet|codec_type=audio|stream_index=0|pts=3072|pts_time=0.069660|dts=3072|dts_time=0.069660|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=186|pos=1106|flags=K_
+packet|codec_type=audio|stream_index=0|pts=4096|pts_time=0.092880|dts=4096|dts_time=0.092880|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=206|pos=1292|flags=K_
+packet|codec_type=audio|stream_index=0|pts=5120|pts_time=0.116100|dts=5120|dts_time=0.116100|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=199|pos=1498|flags=K_
+packet|codec_type=audio|stream_index=0|pts=6144|pts_time=0.139320|dts=6144|dts_time=0.139320|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=236|pos=1697|flags=K_
+packet|codec_type=audio|stream_index=0|pts=7168|pts_time=0.162540|dts=7168|dts_time=0.162540|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=208|pos=1933|flags=K_
+packet|codec_type=audio|stream_index=0|pts=8192|pts_time=0.185760|dts=8192|dts_time=0.185760|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=238|pos=2141|flags=K_
+packet|codec_type=audio|stream_index=0|pts=9216|pts_time=0.208980|dts=9216|dts_time=0.208980|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=222|pos=2379|flags=K_
+packet|codec_type=audio|stream_index=0|pts=10240|pts_time=0.232200|dts=10240|dts_time=0.232200|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=211|pos=2601|flags=K_
+packet|codec_type=audio|stream_index=0|pts=11264|pts_time=0.255420|dts=11264|dts_time=0.255420|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=153|pos=2812|flags=K_
+packet|codec_type=audio|stream_index=0|pts=12288|pts_time=0.278639|dts=12288|dts_time=0.278639|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=191|pos=2965|flags=K_
+packet|codec_type=audio|stream_index=0|pts=13312|pts_time=0.301859|dts=13312|dts_time=0.301859|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=208|pos=3156|flags=K_
+packet|codec_type=audio|stream_index=0|pts=14336|pts_time=0.325079|dts=14336|dts_time=0.325079|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=188|pos=3364|flags=K_
+packet|codec_type=audio|stream_index=0|pts=15360|pts_time=0.348299|dts=15360|dts_time=0.348299|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=170|pos=3552|flags=K_
+packet|codec_type=audio|stream_index=0|pts=16384|pts_time=0.371519|dts=16384|dts_time=0.371519|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=221|pos=3722|flags=K_
+packet|codec_type=audio|stream_index=0|pts=17408|pts_time=0.394739|dts=17408|dts_time=0.394739|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=247|pos=3943|flags=K_
+packet|codec_type=audio|stream_index=0|pts=18432|pts_time=0.417959|dts=18432|dts_time=0.417959|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=202|pos=4190|flags=K_
+packet|codec_type=audio|stream_index=0|pts=19456|pts_time=0.441179|dts=19456|dts_time=0.441179|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=186|pos=4392|flags=K_
+packet|codec_type=audio|stream_index=0|pts=20480|pts_time=0.464399|dts=20480|dts_time=0.464399|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=196|pos=4578|flags=K_
+packet|codec_type=audio|stream_index=0|pts=21504|pts_time=0.487619|dts=21504|dts_time=0.487619|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=200|pos=4774|flags=K_
+packet|codec_type=audio|stream_index=0|pts=22528|pts_time=0.510839|dts=22528|dts_time=0.510839|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=170|pos=4974|flags=K_
+packet|codec_type=audio|stream_index=0|pts=23552|pts_time=0.534059|dts=23552|dts_time=0.534059|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=172|pos=5144|flags=K_
+packet|codec_type=audio|stream_index=0|pts=24576|pts_time=0.557279|dts=24576|dts_time=0.557279|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=206|pos=5316|flags=K_
+packet|codec_type=audio|stream_index=0|pts=25600|pts_time=0.580499|dts=25600|dts_time=0.580499|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=208|pos=5522|flags=K_
+packet|codec_type=audio|stream_index=0|pts=26624|pts_time=0.603719|dts=26624|dts_time=0.603719|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=217|pos=5730|flags=K_
+packet|codec_type=audio|stream_index=0|pts=27648|pts_time=0.626939|dts=27648|dts_time=0.626939|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=252|pos=5947|flags=K_
+packet|codec_type=audio|stream_index=0|pts=28672|pts_time=0.650159|dts=28672|dts_time=0.650159|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=171|pos=6199|flags=K_
+packet|codec_type=audio|stream_index=0|pts=29696|pts_time=0.673379|dts=29696|dts_time=0.673379|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=206|pos=6370|flags=K_
+packet|codec_type=audio|stream_index=0|pts=30720|pts_time=0.696599|dts=30720|dts_time=0.696599|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=237|pos=6576|flags=K_
+packet|codec_type=audio|stream_index=0|pts=31744|pts_time=0.719819|dts=31744|dts_time=0.719819|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=210|pos=6813|flags=K_
+packet|codec_type=audio|stream_index=0|pts=32768|pts_time=0.743039|dts=32768|dts_time=0.743039|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=166|pos=7023|flags=K_
+packet|codec_type=audio|stream_index=0|pts=33792|pts_time=0.766259|dts=33792|dts_time=0.766259|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=166|pos=7189|flags=K_
+packet|codec_type=audio|stream_index=0|pts=34816|pts_time=0.789478|dts=34816|dts_time=0.789478|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=177|pos=7355|flags=K_
+packet|codec_type=audio|stream_index=0|pts=35840|pts_time=0.812698|dts=35840|dts_time=0.812698|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=188|pos=7532|flags=K_
+packet|codec_type=audio|stream_index=0|pts=36864|pts_time=0.835918|dts=36864|dts_time=0.835918|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=193|pos=7720|flags=K_
+packet|codec_type=audio|stream_index=0|pts=37888|pts_time=0.859138|dts=37888|dts_time=0.859138|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=195|pos=7913|flags=K_
+packet|codec_type=audio|stream_index=0|pts=38912|pts_time=0.882358|dts=38912|dts_time=0.882358|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=211|pos=8108|flags=K_
+packet|codec_type=audio|stream_index=0|pts=39936|pts_time=0.905578|dts=39936|dts_time=0.905578|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=249|pos=8319|flags=K_
+packet|codec_type=audio|stream_index=0|pts=40960|pts_time=0.928798|dts=40960|dts_time=0.928798|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=223|pos=8568|flags=K_
+packet|codec_type=audio|stream_index=0|pts=41984|pts_time=0.952018|dts=41984|dts_time=0.952018|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=230|pos=8791|flags=K_
+packet|codec_type=audio|stream_index=0|pts=43008|pts_time=0.975238|dts=43008|dts_time=0.975238|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=203|pos=9021|flags=K_
+packet|codec_type=audio|stream_index=0|pts=44032|pts_time=0.998458|dts=44032|dts_time=0.998458|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=180|pos=9224|flags=K_
+packet|codec_type=audio|stream_index=0|pts=45056|pts_time=1.021678|dts=45056|dts_time=1.021678|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=172|pos=9404|flags=K_
+packet|codec_type=audio|stream_index=0|pts=46080|pts_time=1.044898|dts=46080|dts_time=1.044898|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=240|pos=9576|flags=K_
+packet|codec_type=audio|stream_index=0|pts=47104|pts_time=1.068118|dts=47104|dts_time=1.068118|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=179|pos=9816|flags=K_
+packet|codec_type=audio|stream_index=0|pts=48128|pts_time=1.091338|dts=48128|dts_time=1.091338|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=191|pos=9995|flags=K_
+packet|codec_type=audio|stream_index=0|pts=49152|pts_time=1.114558|dts=49152|dts_time=1.114558|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=184|pos=10186|flags=K_
+packet|codec_type=audio|stream_index=0|pts=50176|pts_time=1.137778|dts=50176|dts_time=1.137778|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=214|pos=10370|flags=K_
+packet|codec_type=audio|stream_index=0|pts=51200|pts_time=1.160998|dts=51200|dts_time=1.160998|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=194|pos=10584|flags=K_
+packet|codec_type=audio|stream_index=0|pts=52224|pts_time=1.184218|dts=52224|dts_time=1.184218|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=235|pos=10778|flags=K_
+packet|codec_type=audio|stream_index=0|pts=53248|pts_time=1.207438|dts=53248|dts_time=1.207438|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=195|pos=11013|flags=K_
+packet|codec_type=audio|stream_index=0|pts=54272|pts_time=1.230658|dts=54272|dts_time=1.230658|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=220|pos=11208|flags=K_
+packet|codec_type=audio|stream_index=0|pts=55296|pts_time=1.253878|dts=55296|dts_time=1.253878|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=187|pos=11428|flags=K_
+packet|codec_type=audio|stream_index=0|pts=56320|pts_time=1.277098|dts=56320|dts_time=1.277098|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=238|pos=11615|flags=K_
+packet|codec_type=audio|stream_index=0|pts=57344|pts_time=1.300317|dts=57344|dts_time=1.300317|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=175|pos=11853|flags=K_
+packet|codec_type=audio|stream_index=0|pts=58368|pts_time=1.323537|dts=58368|dts_time=1.323537|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=178|pos=12028|flags=K_
+packet|codec_type=audio|stream_index=0|pts=59392|pts_time=1.346757|dts=59392|dts_time=1.346757|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=219|pos=12206|flags=K_
+packet|codec_type=audio|stream_index=0|pts=60416|pts_time=1.369977|dts=60416|dts_time=1.369977|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=179|pos=12425|flags=K_
+packet|codec_type=audio|stream_index=0|pts=61440|pts_time=1.393197|dts=61440|dts_time=1.393197|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=193|pos=12604|flags=K_
+packet|codec_type=audio|stream_index=0|pts=62464|pts_time=1.416417|dts=62464|dts_time=1.416417|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=200|pos=12797|flags=K_
+packet|codec_type=audio|stream_index=0|pts=63488|pts_time=1.439637|dts=63488|dts_time=1.439637|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=218|pos=12997|flags=K_
+packet|codec_type=audio|stream_index=0|pts=64512|pts_time=1.462857|dts=64512|dts_time=1.462857|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=215|pos=13215|flags=K_
+packet|codec_type=audio|stream_index=0|pts=65536|pts_time=1.486077|dts=65536|dts_time=1.486077|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=209|pos=13430|flags=K_
+packet|codec_type=audio|stream_index=0|pts=66560|pts_time=1.509297|dts=66560|dts_time=1.509297|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=171|pos=13639|flags=K_
+packet|codec_type=audio|stream_index=0|pts=67584|pts_time=1.532517|dts=67584|dts_time=1.532517|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=179|pos=13810|flags=K_
+packet|codec_type=audio|stream_index=0|pts=68608|pts_time=1.555737|dts=68608|dts_time=1.555737|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=185|pos=13989|flags=K_
+packet|codec_type=audio|stream_index=0|pts=69632|pts_time=1.578957|dts=69632|dts_time=1.578957|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=225|pos=14174|flags=K_
+packet|codec_type=audio|stream_index=0|pts=70656|pts_time=1.602177|dts=70656|dts_time=1.602177|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=221|pos=14399|flags=K_
+packet|codec_type=audio|stream_index=0|pts=71680|pts_time=1.625397|dts=71680|dts_time=1.625397|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=201|pos=14620|flags=K_
+packet|codec_type=audio|stream_index=0|pts=72704|pts_time=1.648617|dts=72704|dts_time=1.648617|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=206|pos=14821|flags=K_
+packet|codec_type=audio|stream_index=0|pts=73728|pts_time=1.671837|dts=73728|dts_time=1.671837|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=182|pos=15027|flags=K_
+packet|codec_type=audio|stream_index=0|pts=74752|pts_time=1.695057|dts=74752|dts_time=1.695057|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=176|pos=15209|flags=K_
+packet|codec_type=audio|stream_index=0|pts=75776|pts_time=1.718277|dts=75776|dts_time=1.718277|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=233|pos=15385|flags=K_
+packet|codec_type=audio|stream_index=0|pts=76800|pts_time=1.741497|dts=76800|dts_time=1.741497|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=199|pos=15618|flags=K_
+packet|codec_type=audio|stream_index=0|pts=77824|pts_time=1.764717|dts=77824|dts_time=1.764717|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=220|pos=15817|flags=K_
+packet|codec_type=audio|stream_index=0|pts=78848|pts_time=1.787937|dts=78848|dts_time=1.787937|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=190|pos=16037|flags=K_
+packet|codec_type=audio|stream_index=0|pts=79872|pts_time=1.811156|dts=79872|dts_time=1.811156|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=210|pos=16227|flags=K_
+packet|codec_type=audio|stream_index=0|pts=80896|pts_time=1.834376|dts=80896|dts_time=1.834376|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=204|pos=16437|flags=K_
+packet|codec_type=audio|stream_index=0|pts=81920|pts_time=1.857596|dts=81920|dts_time=1.857596|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=171|pos=16641|flags=K_
+packet|codec_type=audio|stream_index=0|pts=82944|pts_time=1.880816|dts=82944|dts_time=1.880816|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=167|pos=16812|flags=K_
+packet|codec_type=audio|stream_index=0|pts=83968|pts_time=1.904036|dts=83968|dts_time=1.904036|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=200|pos=16979|flags=K_
+packet|codec_type=audio|stream_index=0|pts=84992|pts_time=1.927256|dts=84992|dts_time=1.927256|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=254|pos=17179|flags=K_
+packet|codec_type=audio|stream_index=0|pts=86016|pts_time=1.950476|dts=86016|dts_time=1.950476|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=205|pos=17433|flags=K_
+packet|codec_type=audio|stream_index=0|pts=87040|pts_time=1.973696|dts=87040|dts_time=1.973696|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=196|pos=17638|flags=K_
+packet|codec_type=audio|stream_index=0|pts=88064|pts_time=1.996916|dts=88064|dts_time=1.996916|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=190|pos=17834|flags=K_
+packet|codec_type=audio|stream_index=0|pts=89088|pts_time=2.020136|dts=89088|dts_time=2.020136|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=197|pos=18024|flags=K_
+packet|codec_type=audio|stream_index=0|pts=90112|pts_time=2.043356|dts=90112|dts_time=2.043356|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=186|pos=18221|flags=K_
+packet|codec_type=audio|stream_index=0|pts=91136|pts_time=2.066576|dts=91136|dts_time=2.066576|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=194|pos=18407|flags=K_
+packet|codec_type=audio|stream_index=0|pts=92160|pts_time=2.089796|dts=92160|dts_time=2.089796|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=227|pos=18601|flags=K_
+packet|codec_type=audio|stream_index=0|pts=93184|pts_time=2.113016|dts=93184|dts_time=2.113016|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=195|pos=18828|flags=K_
+packet|codec_type=audio|stream_index=0|pts=94208|pts_time=2.136236|dts=94208|dts_time=2.136236|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=228|pos=19023|flags=K_
+packet|codec_type=audio|stream_index=0|pts=95232|pts_time=2.159456|dts=95232|dts_time=2.159456|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=196|pos=19251|flags=K_
+packet|codec_type=audio|stream_index=0|pts=96256|pts_time=2.182676|dts=96256|dts_time=2.182676|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=197|pos=19447|flags=K_
+packet|codec_type=audio|stream_index=0|pts=97280|pts_time=2.205896|dts=97280|dts_time=2.205896|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=186|pos=19644|flags=K_
+packet|codec_type=audio|stream_index=0|pts=98304|pts_time=2.229116|dts=98304|dts_time=2.229116|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=191|pos=19830|flags=K_
+packet|codec_type=audio|stream_index=0|pts=99328|pts_time=2.252336|dts=99328|dts_time=2.252336|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=215|pos=20021|flags=K_
+packet|codec_type=audio|stream_index=0|pts=100352|pts_time=2.275556|dts=100352|dts_time=2.275556|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=203|pos=20236|flags=K_
+packet|codec_type=audio|stream_index=0|pts=101376|pts_time=2.298776|dts=101376|dts_time=2.298776|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=205|pos=20439|flags=K_
+packet|codec_type=audio|stream_index=0|pts=102400|pts_time=2.321995|dts=102400|dts_time=2.321995|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=205|pos=20644|flags=K_
+packet|codec_type=audio|stream_index=0|pts=103424|pts_time=2.345215|dts=103424|dts_time=2.345215|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=213|pos=20849|flags=K_
+packet|codec_type=audio|stream_index=0|pts=104448|pts_time=2.368435|dts=104448|dts_time=2.368435|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=198|pos=21062|flags=K_
+packet|codec_type=audio|stream_index=0|pts=105472|pts_time=2.391655|dts=105472|dts_time=2.391655|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=178|pos=21260|flags=K_
+packet|codec_type=audio|stream_index=0|pts=106496|pts_time=2.414875|dts=106496|dts_time=2.414875|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=195|pos=21438|flags=K_
+packet|codec_type=audio|stream_index=0|pts=107520|pts_time=2.438095|dts=107520|dts_time=2.438095|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=227|pos=21633|flags=K_
+packet|codec_type=audio|stream_index=0|pts=108544|pts_time=2.461315|dts=108544|dts_time=2.461315|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=185|pos=21860|flags=K_
+packet|codec_type=audio|stream_index=0|pts=109568|pts_time=2.484535|dts=109568|dts_time=2.484535|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=206|pos=22045|flags=K_
+packet|codec_type=audio|stream_index=0|pts=110592|pts_time=2.507755|dts=110592|dts_time=2.507755|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=183|pos=22251|flags=K_
+packet|codec_type=audio|stream_index=0|pts=111616|pts_time=2.530975|dts=111616|dts_time=2.530975|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=208|pos=22434|flags=K_
+packet|codec_type=audio|stream_index=0|pts=112640|pts_time=2.554195|dts=112640|dts_time=2.554195|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=204|pos=22642|flags=K_
+packet|codec_type=audio|stream_index=0|pts=113664|pts_time=2.577415|dts=113664|dts_time=2.577415|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=192|pos=22846|flags=K_
+packet|codec_type=audio|stream_index=0|pts=114688|pts_time=2.600635|dts=114688|dts_time=2.600635|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=190|pos=23038|flags=K_
+packet|codec_type=audio|stream_index=0|pts=115712|pts_time=2.623855|dts=115712|dts_time=2.623855|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=199|pos=23228|flags=K_
+packet|codec_type=audio|stream_index=0|pts=116736|pts_time=2.647075|dts=116736|dts_time=2.647075|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=229|pos=23427|flags=K_
+packet|codec_type=audio|stream_index=0|pts=117760|pts_time=2.670295|dts=117760|dts_time=2.670295|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=208|pos=23656|flags=K_
+packet|codec_type=audio|stream_index=0|pts=118784|pts_time=2.693515|dts=118784|dts_time=2.693515|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=195|pos=23864|flags=K_
+packet|codec_type=audio|stream_index=0|pts=119808|pts_time=2.716735|dts=119808|dts_time=2.716735|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=190|pos=24059|flags=K_
+packet|codec_type=audio|stream_index=0|pts=120832|pts_time=2.739955|dts=120832|dts_time=2.739955|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=190|pos=24249|flags=K_
+packet|codec_type=audio|stream_index=0|pts=121856|pts_time=2.763175|dts=121856|dts_time=2.763175|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=192|pos=24439|flags=K_
+packet|codec_type=audio|stream_index=0|pts=122880|pts_time=2.786395|dts=122880|dts_time=2.786395|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=226|pos=24631|flags=K_
+packet|codec_type=audio|stream_index=0|pts=123904|pts_time=2.809615|dts=123904|dts_time=2.809615|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=195|pos=24857|flags=K_
+packet|codec_type=audio|stream_index=0|pts=124928|pts_time=2.832834|dts=124928|dts_time=2.832834|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=230|pos=25052|flags=K_
+packet|codec_type=audio|stream_index=0|pts=125952|pts_time=2.856054|dts=125952|dts_time=2.856054|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=198|pos=25282|flags=K_
+packet|codec_type=audio|stream_index=0|pts=126976|pts_time=2.879274|dts=126976|dts_time=2.879274|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=183|pos=25480|flags=K_
+packet|codec_type=audio|stream_index=0|pts=128000|pts_time=2.902494|dts=128000|dts_time=2.902494|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=199|pos=25663|flags=K_
+packet|codec_type=audio|stream_index=0|pts=129024|pts_time=2.925714|dts=129024|dts_time=2.925714|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=196|pos=25862|flags=K_
+packet|codec_type=audio|stream_index=0|pts=130048|pts_time=2.948934|dts=130048|dts_time=2.948934|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=186|pos=26058|flags=K_
+packet|codec_type=audio|stream_index=0|pts=131072|pts_time=2.972154|dts=131072|dts_time=2.972154|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=200|pos=26244|flags=K_
+packet|codec_type=audio|stream_index=0|pts=132096|pts_time=2.995374|dts=132096|dts_time=2.995374|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=210|pos=26444|flags=K_
+packet|codec_type=audio|stream_index=0|pts=133120|pts_time=3.018594|dts=133120|dts_time=3.018594|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=196|pos=26654|flags=K_
+packet|codec_type=audio|stream_index=0|pts=134144|pts_time=3.041814|dts=134144|dts_time=3.041814|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=214|pos=26850|flags=K_
+packet|codec_type=audio|stream_index=0|pts=135168|pts_time=3.065034|dts=135168|dts_time=3.065034|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=185|pos=27064|flags=K_
+packet|codec_type=audio|stream_index=0|pts=136192|pts_time=3.088254|dts=136192|dts_time=3.088254|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=198|pos=27249|flags=K_
+packet|codec_type=audio|stream_index=0|pts=137216|pts_time=3.111474|dts=137216|dts_time=3.111474|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=200|pos=27447|flags=K_
+packet|codec_type=audio|stream_index=0|pts=138240|pts_time=3.134694|dts=138240|dts_time=3.134694|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=208|pos=27647|flags=K_
+packet|codec_type=audio|stream_index=0|pts=139264|pts_time=3.157914|dts=139264|dts_time=3.157914|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=212|pos=27855|flags=K_
+packet|codec_type=audio|stream_index=0|pts=140288|pts_time=3.181134|dts=140288|dts_time=3.181134|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=208|pos=28067|flags=K_
+packet|codec_type=audio|stream_index=0|pts=141312|pts_time=3.204354|dts=141312|dts_time=3.204354|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=192|pos=28275|flags=K_
+packet|codec_type=audio|stream_index=0|pts=142336|pts_time=3.227574|dts=142336|dts_time=3.227574|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=192|pos=28467|flags=K_
+packet|codec_type=audio|stream_index=0|pts=143360|pts_time=3.250794|dts=143360|dts_time=3.250794|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=211|pos=28659|flags=K_
+packet|codec_type=audio|stream_index=0|pts=144384|pts_time=3.274014|dts=144384|dts_time=3.274014|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=195|pos=28870|flags=K_
+packet|codec_type=audio|stream_index=0|pts=145408|pts_time=3.297234|dts=145408|dts_time=3.297234|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=208|pos=29065|flags=K_
+packet|codec_type=audio|stream_index=0|pts=146432|pts_time=3.320454|dts=146432|dts_time=3.320454|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=195|pos=29273|flags=K_
+packet|codec_type=audio|stream_index=0|pts=147456|pts_time=3.343673|dts=147456|dts_time=3.343673|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=204|pos=29468|flags=K_
+packet|codec_type=audio|stream_index=0|pts=148480|pts_time=3.366893|dts=148480|dts_time=3.366893|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=209|pos=29672|flags=K_
+packet|codec_type=audio|stream_index=0|pts=149504|pts_time=3.390113|dts=149504|dts_time=3.390113|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=195|pos=29881|flags=K_
+packet|codec_type=audio|stream_index=0|pts=150528|pts_time=3.413333|dts=150528|dts_time=3.413333|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=191|pos=30076|flags=K_
+packet|codec_type=audio|stream_index=0|pts=151552|pts_time=3.436553|dts=151552|dts_time=3.436553|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=210|pos=30267|flags=K_
+packet|codec_type=audio|stream_index=0|pts=152576|pts_time=3.459773|dts=152576|dts_time=3.459773|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=209|pos=30477|flags=K_
+packet|codec_type=audio|stream_index=0|pts=153600|pts_time=3.482993|dts=153600|dts_time=3.482993|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=175|pos=30686|flags=K_
+packet|codec_type=audio|stream_index=0|pts=154624|pts_time=3.506213|dts=154624|dts_time=3.506213|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=244|pos=30861|flags=K_
+packet|codec_type=audio|stream_index=0|pts=155648|pts_time=3.529433|dts=155648|dts_time=3.529433|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=177|pos=31105|flags=K_
+packet|codec_type=audio|stream_index=0|pts=156672|pts_time=3.552653|dts=156672|dts_time=3.552653|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=217|pos=31282|flags=K_
+packet|codec_type=audio|stream_index=0|pts=157696|pts_time=3.575873|dts=157696|dts_time=3.575873|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=182|pos=31499|flags=K_
+packet|codec_type=audio|stream_index=0|pts=158720|pts_time=3.599093|dts=158720|dts_time=3.599093|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=181|pos=31681|flags=K_
+packet|codec_type=audio|stream_index=0|pts=159744|pts_time=3.622313|dts=159744|dts_time=3.622313|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=203|pos=31862|flags=K_
+packet|codec_type=audio|stream_index=0|pts=160768|pts_time=3.645533|dts=160768|dts_time=3.645533|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=198|pos=32065|flags=K_
+packet|codec_type=audio|stream_index=0|pts=161792|pts_time=3.668753|dts=161792|dts_time=3.668753|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=217|pos=32263|flags=K_
+packet|codec_type=audio|stream_index=0|pts=162816|pts_time=3.691973|dts=162816|dts_time=3.691973|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=195|pos=32480|flags=K_
+packet|codec_type=audio|stream_index=0|pts=163840|pts_time=3.715193|dts=163840|dts_time=3.715193|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=198|pos=32675|flags=K_
+packet|codec_type=audio|stream_index=0|pts=164864|pts_time=3.738413|dts=164864|dts_time=3.738413|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=202|pos=32873|flags=K_
+packet|codec_type=audio|stream_index=0|pts=165888|pts_time=3.761633|dts=165888|dts_time=3.761633|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=185|pos=33075|flags=K_
+packet|codec_type=audio|stream_index=0|pts=166912|pts_time=3.784853|dts=166912|dts_time=3.784853|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=196|pos=33260|flags=K_
+packet|codec_type=audio|stream_index=0|pts=167936|pts_time=3.808073|dts=167936|dts_time=3.808073|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=226|pos=33456|flags=K_
+packet|codec_type=audio|stream_index=0|pts=168960|pts_time=3.831293|dts=168960|dts_time=3.831293|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=187|pos=33682|flags=K_
+packet|codec_type=audio|stream_index=0|pts=169984|pts_time=3.854512|dts=169984|dts_time=3.854512|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=193|pos=33869|flags=K_
+packet|codec_type=audio|stream_index=0|pts=171008|pts_time=3.877732|dts=171008|dts_time=3.877732|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=218|pos=34062|flags=K_
+packet|codec_type=audio|stream_index=0|pts=172032|pts_time=3.900952|dts=172032|dts_time=3.900952|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=200|pos=34280|flags=K_
+packet|codec_type=audio|stream_index=0|pts=173056|pts_time=3.924172|dts=173056|dts_time=3.924172|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=200|pos=34480|flags=K_
+packet|codec_type=audio|stream_index=0|pts=174080|pts_time=3.947392|dts=174080|dts_time=3.947392|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=198|pos=34680|flags=K_
+packet|codec_type=audio|stream_index=0|pts=175104|pts_time=3.970612|dts=175104|dts_time=3.970612|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=200|pos=34878|flags=K_
+packet|codec_type=audio|stream_index=0|pts=176128|pts_time=3.993832|dts=176128|dts_time=3.993832|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=197|pos=35078|flags=K_
+packet|codec_type=audio|stream_index=0|pts=177152|pts_time=4.017052|dts=177152|dts_time=4.017052|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=209|pos=35275|flags=K_
+packet|codec_type=audio|stream_index=0|pts=178176|pts_time=4.040272|dts=178176|dts_time=4.040272|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=205|pos=35484|flags=K_
+packet|codec_type=audio|stream_index=0|pts=179200|pts_time=4.063492|dts=179200|dts_time=4.063492|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=199|pos=35689|flags=K_
+packet|codec_type=audio|stream_index=0|pts=180224|pts_time=4.086712|dts=180224|dts_time=4.086712|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=192|pos=35888|flags=K_
+packet|codec_type=audio|stream_index=0|pts=181248|pts_time=4.109932|dts=181248|dts_time=4.109932|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=201|pos=36080|flags=K_
+packet|codec_type=audio|stream_index=0|pts=182272|pts_time=4.133152|dts=182272|dts_time=4.133152|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=200|pos=36281|flags=K_
+packet|codec_type=audio|stream_index=0|pts=183296|pts_time=4.156372|dts=183296|dts_time=4.156372|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=202|pos=36481|flags=K_
+packet|codec_type=audio|stream_index=0|pts=184320|pts_time=4.179592|dts=184320|dts_time=4.179592|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=196|pos=36683|flags=K_
+packet|codec_type=audio|stream_index=0|pts=185344|pts_time=4.202812|dts=185344|dts_time=4.202812|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=200|pos=36879|flags=K_
+packet|codec_type=audio|stream_index=0|pts=186368|pts_time=4.226032|dts=186368|dts_time=4.226032|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=209|pos=37079|flags=K_
+packet|codec_type=audio|stream_index=0|pts=187392|pts_time=4.249252|dts=187392|dts_time=4.249252|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=201|pos=37288|flags=K_
+packet|codec_type=audio|stream_index=0|pts=188416|pts_time=4.272472|dts=188416|dts_time=4.272472|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=201|pos=37489|flags=K_
+packet|codec_type=audio|stream_index=0|pts=189440|pts_time=4.295692|dts=189440|dts_time=4.295692|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=201|pos=37690|flags=K_
+packet|codec_type=audio|stream_index=0|pts=190464|pts_time=4.318912|dts=190464|dts_time=4.318912|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=199|pos=37891|flags=K_
+packet|codec_type=audio|stream_index=0|pts=191488|pts_time=4.342132|dts=191488|dts_time=4.342132|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=198|pos=38090|flags=K_
+packet|codec_type=audio|stream_index=0|pts=192512|pts_time=4.365351|dts=192512|dts_time=4.365351|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=205|pos=38288|flags=K_
+packet|codec_type=audio|stream_index=0|pts=193536|pts_time=4.388571|dts=193536|dts_time=4.388571|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=190|pos=38493|flags=K_
+packet|codec_type=audio|stream_index=0|pts=194560|pts_time=4.411791|dts=194560|dts_time=4.411791|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=207|pos=38683|flags=K_
+packet|codec_type=audio|stream_index=0|pts=195584|pts_time=4.435011|dts=195584|dts_time=4.435011|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=204|pos=38890|flags=K_
+packet|codec_type=audio|stream_index=0|pts=196608|pts_time=4.458231|dts=196608|dts_time=4.458231|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=192|pos=39094|flags=K_
+packet|codec_type=audio|stream_index=0|pts=197632|pts_time=4.481451|dts=197632|dts_time=4.481451|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=211|pos=39286|flags=K_
+packet|codec_type=audio|stream_index=0|pts=198656|pts_time=4.504671|dts=198656|dts_time=4.504671|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=195|pos=39497|flags=K_
+packet|codec_type=audio|stream_index=0|pts=199680|pts_time=4.527891|dts=199680|dts_time=4.527891|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=214|pos=39692|flags=K_
+packet|codec_type=audio|stream_index=0|pts=200704|pts_time=4.551111|dts=200704|dts_time=4.551111|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=195|pos=39906|flags=K_
+packet|codec_type=audio|stream_index=0|pts=201728|pts_time=4.574331|dts=201728|dts_time=4.574331|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=199|pos=40101|flags=K_
+packet|codec_type=audio|stream_index=0|pts=202752|pts_time=4.597551|dts=202752|dts_time=4.597551|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=183|pos=40300|flags=K_
+packet|codec_type=audio|stream_index=0|pts=203776|pts_time=4.620771|dts=203776|dts_time=4.620771|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=211|pos=40483|flags=K_
+packet|codec_type=audio|stream_index=0|pts=204800|pts_time=4.643991|dts=204800|dts_time=4.643991|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=200|pos=40694|flags=K_
+packet|codec_type=audio|stream_index=0|pts=205824|pts_time=4.667211|dts=205824|dts_time=4.667211|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=199|pos=40894|flags=K_
+packet|codec_type=audio|stream_index=0|pts=206848|pts_time=4.690431|dts=206848|dts_time=4.690431|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=213|pos=41093|flags=K_
+packet|codec_type=audio|stream_index=0|pts=207872|pts_time=4.713651|dts=207872|dts_time=4.713651|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=191|pos=41306|flags=K_
+packet|codec_type=audio|stream_index=0|pts=208896|pts_time=4.736871|dts=208896|dts_time=4.736871|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=211|pos=41497|flags=K_
+packet|codec_type=audio|stream_index=0|pts=209920|pts_time=4.760091|dts=209920|dts_time=4.760091|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=198|pos=41708|flags=K_
+packet|codec_type=audio|stream_index=0|pts=210944|pts_time=4.783311|dts=210944|dts_time=4.783311|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=203|pos=41906|flags=K_
+packet|codec_type=audio|stream_index=0|pts=211968|pts_time=4.806531|dts=211968|dts_time=4.806531|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=196|pos=42109|flags=K_
+packet|codec_type=audio|stream_index=0|pts=212992|pts_time=4.829751|dts=212992|dts_time=4.829751|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=197|pos=42305|flags=K_
+packet|codec_type=audio|stream_index=0|pts=214016|pts_time=4.852971|dts=214016|dts_time=4.852971|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=190|pos=42502|flags=K_
+packet|codec_type=audio|stream_index=0|pts=215040|pts_time=4.876190|dts=215040|dts_time=4.876190|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=208|pos=42692|flags=K_
+packet|codec_type=audio|stream_index=0|pts=216064|pts_time=4.899410|dts=216064|dts_time=4.899410|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=203|pos=42900|flags=K_
+packet|codec_type=audio|stream_index=0|pts=217088|pts_time=4.922630|dts=217088|dts_time=4.922630|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=198|pos=43103|flags=K_
+packet|codec_type=audio|stream_index=0|pts=218112|pts_time=4.945850|dts=218112|dts_time=4.945850|duration=1024|duration_time=0.023220|convergence_duration=N/A|convergence_duration_time=N/A|size=284|pos=43301|flags=K_
+packet|codec_type=audio|stream_index=0|pts=219136|pts_time=4.969070|dts=219136|dts_time=4.969070|duration=1364|duration_time=0.030930|convergence_duration=N/A|convergence_duration_time=N/A|size=5|pos=43585|flags=K_
diff --git a/tests/ref/fate/mov-dar b/tests/ref/fate/mov-dar
deleted file mode 100644
index 9ca9a41bbc..0000000000
--- a/tests/ref/fate/mov-dar
+++ /dev/null
@@ -1 +0,0 @@
-3:2
diff --git a/tests/ref/fate/mov-display-matrix b/tests/ref/fate/mov-display-matrix
deleted file mode 100644
index 6498148147..0000000000
--- a/tests/ref/fate/mov-display-matrix
+++ /dev/null
@@ -1,9 +0,0 @@
-0
-131072
-0
--65536
-0
-0
-47185920
-0
-1073741824
diff --git a/tests/ref/fate/mov-displaymatrix b/tests/ref/fate/mov-displaymatrix
new file mode 100644
index 0000000000..a40fcf6db7
--- /dev/null
+++ b/tests/ref/fate/mov-displaymatrix
@@ -0,0 +1,13 @@
+[STREAM]
+sample_aspect_ratio=1:2
+display_aspect_ratio=1:3
+[SIDE_DATA]
+side_data_type=Display Matrix
+displaymatrix=
+00000000:            0      131072           0
+00000001:       -65536           0           0
+00000002:     47185920           0  1073741824
+
+rotation=-90
+[/SIDE_DATA]
+[/STREAM]
diff --git a/tests/ref/fate/mov-elist-starts-ctts-2ndsample b/tests/ref/fate/mov-elist-starts-ctts-2ndsample
new file mode 100644
index 0000000000..1287a40ac3
--- /dev/null
+++ b/tests/ref/fate/mov-elist-starts-ctts-2ndsample
@@ -0,0 +1,57 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   460800, e2ec4074e83dd4f9188915b6b08aa3a2
+0,          1,          1,        1,   460800, 9ed1ba935bc22ef03e6f8fd5b0b37ee6
+0,          2,          2,        1,   460800, 3f1c536514750de86571122046b5858f
+0,          3,          3,        1,   460800, 4f7943cb6f7966d19d344081b0db0d71
+0,          4,          4,        1,   460800, 0661f34eb45398f8cd158b5a1637bd96
+0,          5,          5,        1,   460800, 177620fa17c4d6fddad1d31c1605e46e
+0,          6,          6,        1,   460800, 8e22cde58a50e0279be01c23dfd7c032
+0,          7,          7,        1,   460800, 8c74c4d8ceee929fded82eeb7a0a7c29
+0,          8,          8,        1,   460800, a50d00a8868f0722be55fa5953bc6ebf
+0,          9,          9,        1,   460800, f791233c8904da4e267bf7bcf5d6201e
+0,         10,         10,        1,   460800, 4ff703ef573eb8e88639d3c700645bf8
+0,         11,         11,        1,   460800, fd4c98487779aa7783e9fb3e874f9c8b
+0,         12,         12,        1,   460800, e11fbc6c36ad086ea6e611ddd28b211c
+0,         13,         13,        1,   460800, a63b8af666ee30a243cf9ea0d49834b5
+0,         14,         14,        1,   460800, 1cec6499bfaf054bf581efdab72f5799
+0,         15,         15,        1,   460800, 5cb8ea5a7158cac1112fc6453b2a577f
+0,         16,         16,        1,   460800, 2df256cb311f97f4648cdeee41ba20d1
+0,         17,         17,        1,   460800, afb2c133204a99fe434767340f50c2b9
+0,         18,         18,        1,   460800, 27c802932fa873af8663a6b8733391d7
+0,         19,         19,        1,   460800, c53872c43baf56d496811d2809ebcd9b
+0,         20,         20,        1,   460800, d3ca26ecb6bec6bfa508f07e2a66fa3a
+0,         21,         21,        1,   460800, 2d44e18ccf734fe0ed98a7ce1e361fe7
+0,         22,         22,        1,   460800, ac4078b5426e4664029923ccf6ea3377
+0,         23,         23,        1,   460800, 60d4460a8b97e58e72c12d0c7334b4e4
+0,         24,         24,        1,   460800, 95bceab68b4ecf5df261ff9d3743041a
+0,         25,         25,        1,   460800, 0b80ad5bf2afbfbe512b83af797afd84
+0,         26,         26,        1,   460800, fbc70468f9331a0538e8c09ec3ead20e
+0,         27,         27,        1,   460800, de0578b4a114235250b7e93e9f9bf6de
+0,         28,         28,        1,   460800, 72f50490650b718e394822f8873ad071
+0,         29,         29,        1,   460800, b26594051d313892823eef711a08dc00
+0,         30,         30,        1,   460800, 1122641658f6b433e82080e092fe6943
+0,         31,         31,        1,   460800, aae4ddc51bcbdf9428f68069f5881090
+0,         32,         32,        1,   460800, 018047addf7fd2ef4f1d231d69187bf5
+0,         33,         33,        1,   460800, bd03ace29c974b64e2a7a4cc815ec582
+0,         34,         34,        1,   460800, 7fddacb17f01d8facfb09df44ff8bdfd
+0,         35,         35,        1,   460800, e8d84d6b3406404900b8342183f6ada7
+0,         36,         36,        1,   460800, 5b24faed4fdd21bf9a1218658a113009
+0,         37,         37,        1,   460800, 8d82775c56b6b0ab31db0c522999b0a1
+0,         38,         38,        1,   460800, 282e5e03295c80b2a7b472b82c57483d
+0,         39,         39,        1,   460800, 0ad41f5975c2466fc3166ea20bde6842
+0,         40,         40,        1,   460800, 1439ad336ceafda0ad62355a7d0b6e50
+0,         41,         41,        1,   460800, d3a97471ad64ac2378591d4f6eadba1c
+0,         42,         42,        1,   460800, a40c32a1e589b103f639f2068b71bf02
+0,         43,         43,        1,   460800, a339b2bedc7ef46961f8502089abfb87
+0,         44,         44,        1,   460800, 2ccde43c94259682ea72188b08489e92
+0,         45,         45,        1,   460800, fc47cca1f029d44ec92d95853e9c46b4
+0,         46,         46,        1,   460800, 6c4d3b63dc1d4291ec88a4bb8c35aecd
+0,         47,         47,        1,   460800, 7a9be67aca439dd2a7ff17447b478974
diff --git a/tests/ref/fate/mov-init-nonkeyframe b/tests/ref/fate/mov-init-nonkeyframe
new file mode 100644
index 0000000000..0e8184643a
--- /dev/null
+++ b/tests/ref/fate/mov-init-nonkeyframe
@@ -0,0 +1,120 @@
+packet|codec_type=video|stream_index=0|pts=0|pts_time=0.000000|dts=0|dts_time=0.000000|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=599|pos=48|flags=__
+packet|codec_type=video|stream_index=0|pts=2002|pts_time=0.066733|dts=1001|dts_time=0.033367|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2944|pos=1674|flags=__
+packet|codec_type=video|stream_index=0|pts=7007|pts_time=0.233567|dts=2002|dts_time=0.066733|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=21987|pos=5335|flags=__
+packet|codec_type=video|stream_index=0|pts=5005|pts_time=0.166833|dts=3003|dts_time=0.100100|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=4145|pos=28605|flags=__
+packet|codec_type=video|stream_index=0|pts=4004|pts_time=0.133467|dts=4004|dts_time=0.133467|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3093|pos=33425|flags=__
+packet|codec_type=video|stream_index=0|pts=6006|pts_time=0.200200|dts=5005|dts_time=0.166833|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=572|pos=37769|flags=__
+packet|codec_type=video|stream_index=0|pts=11011|pts_time=0.367033|dts=6006|dts_time=0.200200|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=21599|pos=38999|flags=__
+packet|codec_type=video|stream_index=0|pts=9009|pts_time=0.300300|dts=7007|dts_time=0.233567|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=6287|pos=61922|flags=__
+packet|codec_type=video|stream_index=0|pts=8008|pts_time=0.266933|dts=8008|dts_time=0.266933|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2720|pos=68909|flags=__
+packet|codec_type=video|stream_index=0|pts=10010|pts_time=0.333667|dts=9009|dts_time=0.300300|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2715|pos=72301|flags=__
+packet|codec_type=video|stream_index=0|pts=15015|pts_time=0.500500|dts=10010|dts_time=0.333667|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=20221|pos=76433|flags=__
+packet|codec_type=video|stream_index=0|pts=13013|pts_time=0.433767|dts=11011|dts_time=0.367033|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=9505|pos=97381|flags=__
+packet|codec_type=video|stream_index=0|pts=12012|pts_time=0.400400|dts=12012|dts_time=0.400400|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=522|pos=108391|flags=__
+packet|codec_type=video|stream_index=0|pts=14014|pts_time=0.467133|dts=13013|dts_time=0.433767|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2360|pos=109683|flags=__
+packet|codec_type=video|stream_index=0|pts=17017|pts_time=0.567233|dts=14014|dts_time=0.467133|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=22156|pos=113572|flags=__
+packet|codec_type=video|stream_index=0|pts=16016|pts_time=0.533867|dts=15015|dts_time=0.500500|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1801|pos=136496|flags=__
+packet|codec_type=video|stream_index=0|pts=21021|pts_time=0.700700|dts=16016|dts_time=0.533867|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=20181|pos=139074|flags=__
+packet|codec_type=video|stream_index=0|pts=19019|pts_time=0.633967|dts=17017|dts_time=0.567233|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3608|pos=160959|flags=__
+packet|codec_type=video|stream_index=0|pts=18018|pts_time=0.600600|dts=18018|dts_time=0.600600|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=368|pos=165305|flags=__
+packet|codec_type=video|stream_index=0|pts=20020|pts_time=0.667333|dts=19019|dts_time=0.633967|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2989|pos=167054|flags=__
+packet|codec_type=video|stream_index=0|pts=25025|pts_time=0.834167|dts=20020|dts_time=0.667333|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=24475|pos=170801|flags=__
+packet|codec_type=video|stream_index=0|pts=23023|pts_time=0.767433|dts=21021|dts_time=0.700700|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=10682|pos=196732|flags=__
+packet|codec_type=video|stream_index=0|pts=22022|pts_time=0.734067|dts=22022|dts_time=0.734067|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3198|pos=208151|flags=__
+packet|codec_type=video|stream_index=0|pts=24024|pts_time=0.800800|dts=23023|dts_time=0.767433|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=479|pos=212958|flags=__
+packet|codec_type=video|stream_index=0|pts=29029|pts_time=0.967633|dts=24024|dts_time=0.800800|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=21240|pos=214384|flags=__
+packet|codec_type=video|stream_index=0|pts=27027|pts_time=0.900900|dts=25025|dts_time=0.834167|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=4409|pos=236946|flags=__
+packet|codec_type=video|stream_index=0|pts=26026|pts_time=0.867533|dts=26026|dts_time=0.867533|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3106|pos=242647|flags=__
+packet|codec_type=video|stream_index=0|pts=28028|pts_time=0.934267|dts=27027|dts_time=0.900900|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=453|pos=246428|flags=__
+packet|codec_type=video|stream_index=0|pts=33033|pts_time=1.101100|dts=28028|dts_time=0.934267|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=20668|pos=248308|flags=__
+packet|codec_type=video|stream_index=0|pts=31031|pts_time=1.034367|dts=29029|dts_time=0.967633|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=6668|pos=269708|flags=__
+packet|codec_type=video|stream_index=0|pts=30030|pts_time=1.001000|dts=30030|dts_time=1.001000|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3027|pos=277789|flags=__
+packet|codec_type=video|stream_index=0|pts=32032|pts_time=1.067733|dts=31031|dts_time=1.034367|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2884|pos=281613|flags=__
+packet|codec_type=video|stream_index=0|pts=37037|pts_time=1.234567|dts=32032|dts_time=1.067733|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=21313|pos=285261|flags=__
+packet|codec_type=video|stream_index=0|pts=35035|pts_time=1.167833|dts=33033|dts_time=1.101100|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=9890|pos=308303|flags=__
+packet|codec_type=video|stream_index=0|pts=34034|pts_time=1.134467|dts=34034|dts_time=1.134467|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=501|pos=318919|flags=__
+packet|codec_type=video|stream_index=0|pts=36036|pts_time=1.201200|dts=35035|dts_time=1.167833|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3123|pos=320824|flags=__
+packet|codec_type=video|stream_index=0|pts=39039|pts_time=1.301300|dts=36036|dts_time=1.201200|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=21768|pos=324664|flags=__
+packet|codec_type=video|stream_index=0|pts=38038|pts_time=1.267933|dts=37037|dts_time=1.234567|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2664|pos=347922|flags=__
+packet|codec_type=video|stream_index=0|pts=43043|pts_time=1.434767|dts=38038|dts_time=1.267933|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=19144|pos=351354|flags=__
+packet|codec_type=video|stream_index=0|pts=41041|pts_time=1.368033|dts=39039|dts_time=1.301300|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=4118|pos=371991|flags=__
+packet|codec_type=video|stream_index=0|pts=40040|pts_time=1.334667|dts=40040|dts_time=1.334667|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=423|pos=376899|flags=__
+packet|codec_type=video|stream_index=0|pts=42042|pts_time=1.401400|dts=41041|dts_time=1.368033|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2785|pos=378037|flags=__
+packet|codec_type=video|stream_index=0|pts=45045|pts_time=1.501500|dts=42042|dts_time=1.401400|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=24489|pos=382144|flags=__
+packet|codec_type=video|stream_index=0|pts=44044|pts_time=1.468133|dts=43043|dts_time=1.434767|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2984|pos=407344|flags=__
+packet|codec_type=video|stream_index=0|pts=49049|pts_time=1.634967|dts=44044|dts_time=1.468133|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=19174|pos=411791|flags=__
+packet|codec_type=video|stream_index=0|pts=47047|pts_time=1.568233|dts=45045|dts_time=1.501500|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=4905|pos=431740|flags=__
+packet|codec_type=video|stream_index=0|pts=46046|pts_time=1.534867|dts=46046|dts_time=1.534867|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=412|pos=438183|flags=__
+packet|codec_type=video|stream_index=0|pts=48048|pts_time=1.601600|dts=47047|dts_time=1.568233|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3215|pos=439373|flags=__
+packet|codec_type=video|stream_index=0|pts=51051|pts_time=1.701700|dts=48048|dts_time=1.601600|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=21572|pos=443371|flags=__
+packet|codec_type=video|stream_index=0|pts=50050|pts_time=1.668333|dts=49049|dts_time=1.634967|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2644|pos=466486|flags=__
+packet|codec_type=video|stream_index=0|pts=55055|pts_time=1.835167|dts=50050|dts_time=1.668333|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=19417|pos=470462|flags=__
+packet|codec_type=video|stream_index=0|pts=53053|pts_time=1.768433|dts=51051|dts_time=1.701700|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3685|pos=491335|flags=__
+packet|codec_type=video|stream_index=0|pts=52052|pts_time=1.735067|dts=52052|dts_time=1.735067|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=355|pos=495771|flags=__
+packet|codec_type=video|stream_index=0|pts=54054|pts_time=1.801800|dts=53053|dts_time=1.768433|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3021|pos=497714|flags=__
+packet|codec_type=video|stream_index=0|pts=59059|pts_time=1.968633|dts=54054|dts_time=1.801800|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=21464|pos=501431|flags=__
+packet|codec_type=video|stream_index=0|pts=57057|pts_time=1.901900|dts=55055|dts_time=1.835167|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=9340|pos=524392|flags=__
+packet|codec_type=video|stream_index=0|pts=56056|pts_time=1.868533|dts=56056|dts_time=1.868533|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=406|pos=534504|flags=__
+packet|codec_type=video|stream_index=0|pts=58058|pts_time=1.935267|dts=57057|dts_time=1.901900|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3277|pos=535694|flags=__
+packet|codec_type=video|stream_index=0|pts=63063|pts_time=2.102100|dts=58058|dts_time=1.935267|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=21388|pos=541090|flags=__
+packet|codec_type=video|stream_index=0|pts=61061|pts_time=2.035367|dts=59059|dts_time=1.968633|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=4466|pos=563132|flags=__
+packet|codec_type=video|stream_index=0|pts=60060|pts_time=2.002000|dts=60060|dts_time=2.002000|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3467|pos=569245|flags=__
+packet|codec_type=video|stream_index=0|pts=62062|pts_time=2.068733|dts=61061|dts_time=2.035367|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=499|pos=573478|flags=__
+packet|codec_type=video|stream_index=0|pts=67067|pts_time=2.235567|dts=62062|dts_time=2.068733|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=25972|pos=575469|flags=__
+packet|codec_type=video|stream_index=0|pts=65065|pts_time=2.168833|dts=63063|dts_time=2.102100|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=6643|pos=602163|flags=__
+packet|codec_type=video|stream_index=0|pts=64064|pts_time=2.135467|dts=64064|dts_time=2.135467|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3069|pos=609558|flags=__
+packet|codec_type=video|stream_index=0|pts=66066|pts_time=2.202200|dts=65065|dts_time=2.168833|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3049|pos=614133|flags=__
+packet|codec_type=video|stream_index=0|pts=68068|pts_time=2.268933|dts=66066|dts_time=2.202200|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=4559|pos=618551|flags=__
+packet|codec_type=video|stream_index=0|pts=72072|pts_time=2.402400|dts=67067|dts_time=2.235567|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=21251|pos=624621|flags=__
+packet|codec_type=video|stream_index=0|pts=70070|pts_time=2.335667|dts=68068|dts_time=2.268933|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=7108|pos=646657|flags=__
+packet|codec_type=video|stream_index=0|pts=69069|pts_time=2.302300|dts=69069|dts_time=2.302300|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3250|pos=655299|flags=__
+packet|codec_type=video|stream_index=0|pts=71071|pts_time=2.369033|dts=70070|dts_time=2.335667|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3365|pos=659310|flags=__
+packet|codec_type=video|stream_index=0|pts=73073|pts_time=2.435767|dts=71071|dts_time=2.369033|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=24803|pos=664201|flags=__
+packet|codec_type=video|stream_index=0|pts=77077|pts_time=2.569233|dts=72072|dts_time=2.402400|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=22185|pos=689763|flags=__
+packet|codec_type=video|stream_index=0|pts=75075|pts_time=2.502500|dts=73073|dts_time=2.435767|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=5088|pos=712679|flags=__
+packet|codec_type=video|stream_index=0|pts=74074|pts_time=2.469133|dts=74074|dts_time=2.469133|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=537|pos=719128|flags=__
+packet|codec_type=video|stream_index=0|pts=76076|pts_time=2.535867|dts=75075|dts_time=2.502500|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3765|pos=720413|flags=__
+packet|codec_type=video|stream_index=0|pts=81081|pts_time=2.702700|dts=76076|dts_time=2.535867|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=20654|pos=725583|flags=__
+packet|codec_type=video|stream_index=0|pts=79079|pts_time=2.635967|dts=77077|dts_time=2.569233|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=10202|pos=746999|flags=__
+packet|codec_type=video|stream_index=0|pts=78078|pts_time=2.602600|dts=78078|dts_time=2.602600|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3970|pos=758705|flags=__
+packet|codec_type=video|stream_index=0|pts=80080|pts_time=2.669333|dts=79079|dts_time=2.635967|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=421|pos=763442|flags=__
+packet|codec_type=video|stream_index=0|pts=84084|pts_time=2.802800|dts=80080|dts_time=2.669333|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=25685|pos=764653|flags=__
+packet|codec_type=video|stream_index=0|pts=82082|pts_time=2.736067|dts=81081|dts_time=2.702700|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=4077|pos=791911|flags=__
+packet|codec_type=video|stream_index=0|pts=83083|pts_time=2.769433|dts=82082|dts_time=2.736067|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3049|pos=796780|flags=__
+packet|codec_type=video|stream_index=0|pts=88088|pts_time=2.936267|dts=83083|dts_time=2.769433|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=8924|pos=801473|flags=__
+packet|codec_type=video|stream_index=0|pts=86086|pts_time=2.869533|dts=84084|dts_time=2.802800|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2512|pos=811078|flags=__
+packet|codec_type=video|stream_index=0|pts=85085|pts_time=2.836167|dts=85085|dts_time=2.836167|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=163|pos=815033|flags=__
+packet|codec_type=video|stream_index=0|pts=87087|pts_time=2.902900|dts=86086|dts_time=2.869533|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1734|pos=815934|flags=__
+packet|codec_type=video|stream_index=0|pts=90090|pts_time=3.003000|dts=87087|dts_time=2.902900|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=11505|pos=819088|flags=__
+packet|codec_type=video|stream_index=0|pts=89089|pts_time=2.969633|dts=88088|dts_time=2.936267|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1431|pos=831367|flags=__
+packet|codec_type=video|stream_index=0|pts=92092|pts_time=3.069733|dts=89089|dts_time=2.969633|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=5269|pos=833580|flags=__
+packet|codec_type=video|stream_index=0|pts=91091|pts_time=3.036367|dts=90090|dts_time=3.003000|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=199|pos=840352|flags=__
+packet|codec_type=video|stream_index=0|pts=93093|pts_time=3.103100|dts=91091|dts_time=3.036367|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=85650|pos=841722|flags=K_
+packet|codec_type=video|stream_index=0|pts=95095|pts_time=3.169833|dts=92092|dts_time=3.069733|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=13261|pos=928747|flags=__
+packet|codec_type=video|stream_index=0|pts=94094|pts_time=3.136467|dts=93093|dts_time=3.103100|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1667|pos=942741|flags=__
+packet|codec_type=video|stream_index=0|pts=99099|pts_time=3.303300|dts=94094|dts_time=3.136467|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=20143|pos=945841|flags=__
+packet|codec_type=video|stream_index=0|pts=97097|pts_time=3.236567|dts=95095|dts_time=3.169833|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2484|pos=966681|flags=__
+packet|codec_type=video|stream_index=0|pts=96096|pts_time=3.203200|dts=96096|dts_time=3.203200|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=278|pos=969887|flags=__
+packet|codec_type=video|stream_index=0|pts=98098|pts_time=3.269933|dts=97097|dts_time=3.236567|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1539|pos=971696|flags=__
+packet|codec_type=video|stream_index=0|pts=101101|pts_time=3.370033|dts=98098|dts_time=3.269933|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=20270|pos=974088|flags=__
+packet|codec_type=video|stream_index=0|pts=100100|pts_time=3.336667|dts=99099|dts_time=3.303300|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1754|pos=995975|flags=__
+packet|codec_type=video|stream_index=0|pts=105105|pts_time=3.503500|dts=100100|dts_time=3.336667|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=19154|pos=998420|flags=__
+packet|codec_type=video|stream_index=0|pts=103103|pts_time=3.436767|dts=101101|dts_time=3.370033|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3359|pos=1019010|flags=__
+packet|codec_type=video|stream_index=0|pts=102102|pts_time=3.403400|dts=102102|dts_time=3.403400|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=287|pos=1023138|flags=__
+packet|codec_type=video|stream_index=0|pts=104104|pts_time=3.470133|dts=103103|dts_time=3.436767|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2111|pos=1024928|flags=__
+packet|codec_type=video|stream_index=0|pts=109109|pts_time=3.636967|dts=104104|dts_time=3.470133|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=17178|pos=1027833|flags=__
+packet|codec_type=video|stream_index=0|pts=107107|pts_time=3.570233|dts=105105|dts_time=3.503500|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=7205|pos=1045716|flags=__
+packet|codec_type=video|stream_index=0|pts=106106|pts_time=3.536867|dts=106106|dts_time=3.536867|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2209|pos=1054354|flags=__
+packet|codec_type=video|stream_index=0|pts=108108|pts_time=3.603600|dts=107107|dts_time=3.570233|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=359|pos=1057226|flags=__
+packet|codec_type=video|stream_index=0|pts=113113|pts_time=3.770433|dts=108108|dts_time=3.603600|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=18469|pos=1059024|flags=__
+packet|codec_type=video|stream_index=0|pts=111111|pts_time=3.703700|dts=109109|dts_time=3.636967|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3314|pos=1078213|flags=__
+packet|codec_type=video|stream_index=0|pts=110110|pts_time=3.670333|dts=110110|dts_time=3.670333|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2556|pos=1083059|flags=__
+packet|codec_type=video|stream_index=0|pts=112112|pts_time=3.737067|dts=111111|dts_time=3.703700|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=437|pos=1086388|flags=__
+packet|codec_type=video|stream_index=0|pts=117117|pts_time=3.903900|dts=112112|dts_time=3.737067|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=19707|pos=1087610|flags=__
+packet|codec_type=video|stream_index=0|pts=115115|pts_time=3.837167|dts=113113|dts_time=3.770433|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=5917|pos=1108845|flags=__
+packet|codec_type=video|stream_index=0|pts=114114|pts_time=3.803800|dts=114114|dts_time=3.803800|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2613|pos=1115495|flags=__
+packet|codec_type=video|stream_index=0|pts=116116|pts_time=3.870533|dts=115115|dts_time=3.837167|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2672|pos=1119530|flags=__
+packet|codec_type=video|stream_index=0|pts=121121|pts_time=4.037367|dts=116116|dts_time=3.870533|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=19091|pos=1122970|flags=_D
+packet|codec_type=video|stream_index=0|pts=119119|pts_time=3.970633|dts=117117|dts_time=3.903900|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=9244|pos=1143585|flags=__
+packet|codec_type=video|stream_index=0|pts=118118|pts_time=3.937267|dts=118118|dts_time=3.937267|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=284|pos=1153587|flags=__
+packet|codec_type=video|stream_index=0|pts=120120|pts_time=4.004000|dts=119119|dts_time=3.970633|duration=1001|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2381|pos=1155393|flags=_D
diff --git a/tests/ref/fate/mov-mp3-demux b/tests/ref/fate/mov-mp3-demux
new file mode 100644
index 0000000000..1930960640
--- /dev/null
+++ b/tests/ref/fate/mov-mp3-demux
@@ -0,0 +1,294 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: mp3
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1152,       36, 0x8e260589
+0,       1152,       1152,     1152,       36, 0x8e260589
+0,       2304,       2304,     1152,       36, 0x8e260589
+0,       3456,       3456,     1152,       36, 0x8e260589
+0,       4608,       4608,     1152,       36, 0x8e260589
+0,       5760,       5760,     1152,       36, 0x8e260589
+0,       6912,       6912,     1152,       69, 0xdb550f09
+0,       8064,       8064,     1152,      104, 0xbaeb1aa8
+0,       9216,       9216,     1152,      104, 0xbaeb1aa8
+0,      10368,      10368,     1152,      104, 0xbaeb1aa8
+0,      11520,      11520,     1152,      104, 0xbaeb1aa8
+0,      12672,      12672,     1152,      104, 0xbaeb1aa8
+0,      13824,      13824,     1152,      104, 0xbaeb1aa8
+0,      14976,      14976,     1152,       36, 0x8e260589
+0,      16128,      16128,     1152,      601, 0xc34f1dc9
+0,      17280,      17280,     1152,      716, 0x6c2665e5
+0,      18432,      18432,     1152,      672, 0xf9873f4b
+0,      19584,      19584,     1152,      631, 0xd13333cc
+0,      20736,      20736,     1152,      604, 0xc0bb13e5
+0,      21888,      21888,     1152,      642, 0x4e873319
+0,      23040,      23040,     1152,      631, 0xcf701e7d
+0,      24192,      24192,     1152,      632, 0x27773046
+0,      25344,      25344,     1152,      609, 0x7ec21e53
+0,      26496,      26496,     1152,      582, 0xd68e0d59
+0,      27648,      27648,     1152,      550, 0x5b1303ee
+0,      28800,      28800,     1152,      581, 0x73dc12e4
+0,      29952,      29952,     1152,      545, 0x530f085a
+0,      31104,      31104,     1152,      556, 0xff0cfd9a
+0,      32256,      32256,     1152,      567, 0x3c330743
+0,      33408,      33408,     1152,      564, 0x2c3a1144
+0,      34560,      34560,     1152,      913, 0x74b08ab7
+0,      35712,      35712,     1152,      681, 0x2669444a
+0,      36864,      36864,     1152,      615, 0x60a41b1a
+0,      38016,      38016,     1152,      670, 0x53793367
+0,      39168,      39168,     1152,      666, 0x8c453c1a
+0,      40320,      40320,     1152,      613, 0x679f17a4
+0,      41472,      41472,     1152,      561, 0x357405c0
+0,      42624,      42624,     1152,      527, 0x687afacb
+0,      43776,      43776,     1152,      515, 0xf99dfb73
+0,      44928,      44928,     1152,      560, 0xa9ca0767
+0,      46080,      46080,     1152,      550, 0xb1ce0990
+0,      47232,      47232,     1152,      494, 0x3fd2f2c8
+0,      48384,      48384,     1152,      518, 0x9c5b0242
+0,      49536,      49536,     1152,      520, 0xbfdc0877
+0,      50688,      50688,     1152,      512, 0x4988f94b
+0,      51840,      51840,     1152,      786, 0xf3cf61de
+0,      52992,      52992,     1152,      713, 0x2f1c46b4
+0,      54144,      54144,     1152,      616, 0x210327d8
+0,      55296,      55296,     1152,      632, 0x39d430d4
+0,      56448,      56448,     1152,      615, 0xd7231930
+0,      57600,      57600,     1152,      620, 0xb7023663
+0,      58752,      58752,     1152,      585, 0x9e90100a
+0,      59904,      59904,     1152,      583, 0xe4152b2a
+0,      61056,      61056,     1152,      614, 0x0d572ebf
+0,      62208,      62208,     1152,      636, 0x9d1f2e6b
+0,      63360,      63360,     1152,      603, 0x2e33240f
+0,      64512,      64512,     1152,      627, 0x2c7e204c
+0,      65664,      65664,     1152,      626, 0x5cc3254b
+0,      66816,      66816,     1152,      626, 0xe8fd34df
+0,      67968,      67968,     1152,      600, 0x33a926d5
+0,      69120,      69120,     1152,      777, 0x4cd66f53
+0,      70272,      70272,     1152,      753, 0x8b297901
+0,      71424,      71424,     1152,      657, 0xd10e302f
+0,      72576,      72576,     1152,      611, 0x484d2f44
+0,      73728,      73728,     1152,      640, 0x310b414a
+0,      74880,      74880,     1152,      580, 0x3b410cdb
+0,      76032,      76032,     1152,      574, 0x6aba282c
+0,      77184,      77184,     1152,      541, 0x59680d64
+0,      78336,      78336,     1152,      512, 0x0824f236
+0,      79488,      79488,     1152,      516, 0x6d1efaba
+0,      80640,      80640,     1152,      553, 0x942b0d90
+0,      81792,      81792,     1152,      564, 0xb8471180
+0,      82944,      82944,     1152,      550, 0xfb150964
+0,      84096,      84096,     1152,      534, 0xbc4e0254
+0,      85248,      85248,     1152,      529, 0x02b3f603
+0,      86400,      86400,     1152,      521, 0xe77a00f3
+0,      87552,      87552,     1152,      501, 0x0292f088
+0,      88704,      88704,     1152,      498, 0xd1f4eb60
+0,      89856,      89856,     1152,      495, 0xa9e8e882
+0,      91008,      91008,     1152,      487, 0x1b40edfd
+0,      92160,      92160,     1152,      492, 0xd8cde96f
+0,      93312,      93312,     1152,      480, 0x387be300
+0,      94464,      94464,     1152,      476, 0x4c6ae249
+0,      95616,      95616,     1152,      450, 0xd690d4f4
+0,      96768,      96768,     1152,      453, 0x1aafd73e
+0,      97920,      97920,     1152,      448, 0xe997d8d1
+0,      99072,      99072,     1152,      429, 0x5813c034
+0,     100224,     100224,     1152,      430, 0xcd4ac57b
+0,     101376,     101376,     1152,      416, 0xe466b916
+0,     102528,     102528,     1152,      425, 0x8f67b863
+0,     103680,     103680,     1152,      418, 0xc8faccfe
+0,     104832,     104832,     1152,      397, 0x932cb515
+0,     105984,     105984,     1152,      413, 0x0a64bdfc
+0,     107136,     107136,     1152,      408, 0xa4abcbe4
+0,     108288,     108288,     1152,      405, 0xb231c336
+0,     109440,     109440,     1152,      417, 0xda6ac762
+0,     110592,     110592,     1152,      404, 0xb2fdb983
+0,     111744,     111744,     1152,      420, 0x0478c7fc
+0,     112896,     112896,     1152,      414, 0x1a3fb9fb
+0,     114048,     114048,     1152,      411, 0xfda0c1a9
+0,     115200,     115200,     1152,      390, 0xe508c2ab
+0,     116352,     116352,     1152,      399, 0x610cc9ca
+0,     117504,     117504,     1152,      379, 0x04a4b4a3
+0,     118656,     118656,     1152,      383, 0x6217b91a
+0,     119808,     119808,     1152,      360, 0x1ca3aa4a
+0,     120960,     120960,     1152,      339, 0x26dca5ce
+0,     122112,     122112,     1152,      336, 0x0292a0b0
+0,     123264,     123264,     1152,      340, 0x4a24a36d
+0,     124416,     124416,     1152,      312, 0x45fc8afd
+0,     125568,     125568,     1152,      335, 0xb563a410
+0,     126720,     126720,     1152,      346, 0x0ab4a331
+0,     127872,     127872,     1152,      334, 0x327b9cfc
+0,     129024,     129024,     1152,      336, 0x55fda599
+0,     130176,     130176,     1152,      357, 0x9e6dade5
+0,     131328,     131328,     1152,      343, 0x3bf4a84a
+0,     132480,     132480,     1152,      330, 0x52d99957
+0,     133632,     133632,     1152,      358, 0x89bda76f
+0,     134784,     134784,     1152,      349, 0x6067a31d
+0,     135936,     135936,     1152,      357, 0x34dea77f
+0,     137088,     137088,     1152,      376, 0xd001b7d8
+0,     138240,     138240,     1152,      334, 0xa81d9b6b
+0,     139392,     139392,     1152,      369, 0x1fd5ab31
+0,     140544,     140544,     1152,      359, 0x7ffbae85
+0,     141696,     141696,     1152,      368, 0xa277a108
+0,     142848,     142848,     1152,      359, 0xea6da507
+0,     144000,     144000,     1152,      369, 0x437ab164
+0,     145152,     145152,     1152,      361, 0x1a2aa959
+0,     146304,     146304,     1152,      343, 0x83cfa2e2
+0,     147456,     147456,     1152,      369, 0x8558aeb6
+0,     148608,     148608,     1152,      355, 0x4d1da64d
+0,     149760,     149760,     1152,      364, 0x0fe9b2d8
+0,     150912,     150912,     1152,      355, 0xfc98aba5
+0,     152064,     152064,     1152,      390, 0x9d25b5c4
+0,     153216,     153216,     1152,      361, 0x9fe8ab24
+0,     154368,     154368,     1152,      364, 0x03ada717
+0,     155520,     155520,     1152,      379, 0xb06eb9e2
+0,     156672,     156672,     1152,      371, 0xc3aeb45c
+0,     157824,     157824,     1152,      895, 0x86d198dc
+0,     158976,     158976,     1152,      644, 0x1f1d376a
+0,     160128,     160128,     1152,      682, 0x4da84df6
+0,     161280,     161280,     1152,      675, 0xd41543be
+0,     162432,     162432,     1152,      642, 0xd5b04211
+0,     163584,     163584,     1152,      632, 0x45da38cd
+0,     164736,     164736,     1152,      597, 0x9f1611d3
+0,     165888,     165888,     1152,      574, 0x089f215f
+0,     167040,     167040,     1152,      578, 0x90880461
+0,     168192,     168192,     1152,      566, 0x38360e79
+0,     169344,     169344,     1152,      583, 0xe62e0ab6
+0,     170496,     170496,     1152,      593, 0xa55a19f8
+0,     171648,     171648,     1152,      625, 0xbf7d1b0f
+0,     172800,     172800,     1152,      574, 0xa719176a
+0,     173952,     173952,     1152,      605, 0xf5e517ef
+0,     175104,     175104,     1152,      804, 0x3a0a81ae
+0,     176256,     176256,     1152,      699, 0x880635bd
+0,     177408,     177408,     1152,      646, 0x79052faa
+0,     178560,     178560,     1152,      634, 0x2e8d2d8e
+0,     179712,     179712,     1152,      596, 0xc8281e87
+0,     180864,     180864,     1152,      605, 0xa5e73156
+0,     182016,     182016,     1152,      588, 0x7c8b1a55
+0,     183168,     183168,     1152,      566, 0x9e710ea4
+0,     184320,     184320,     1152,      624, 0x69072d37
+0,     185472,     185472,     1152,      600, 0xe84832fc
+0,     186624,     186624,     1152,      580, 0x29fd123a
+0,     187776,     187776,     1152,      562, 0xba300d11
+0,     188928,     188928,     1152,      577, 0x8a471fc9
+0,     190080,     190080,     1152,      588, 0x94fb1954
+0,     191232,     191232,     1152,      576, 0x6d7d1bcf
+0,     192384,     192384,     1152,      697, 0xc0a13955
+0,     193536,     193536,     1152,      805, 0xe5fb8aee
+0,     194688,     194688,     1152,      673, 0x645c4b23
+0,     195840,     195840,     1152,      635, 0xd40f2820
+0,     196992,     196992,     1152,      660, 0xb3d638b8
+0,     198144,     198144,     1152,      652, 0x7c21322a
+0,     199296,     199296,     1152,      623, 0x382a2735
+0,     200448,     200448,     1152,      606, 0xb0632a69
+0,     201600,     201600,     1152,      584, 0xfaa820eb
+0,     202752,     202752,     1152,      645, 0x774327c9
+0,     203904,     203904,     1152,      654, 0x96b41a4b
+0,     205056,     205056,     1152,      660, 0x57483145
+0,     206208,     206208,     1152,      606, 0xd61716f0
+0,     207360,     207360,     1152,      637, 0x6c8526ee
+0,     208512,     208512,     1152,      624, 0xcccf1f78
+0,     209664,     209664,     1152,      640, 0x966e2d58
+0,     210816,     210816,     1152,      868, 0x6f42a03e
+0,     211968,     211968,     1152,      712, 0x10195ab2
+0,     213120,     213120,     1152,      623, 0x3b3f24a8
+0,     214272,     214272,     1152,      618, 0xfb853122
+0,     215424,     215424,     1152,      606, 0x20922909
+0,     216576,     216576,     1152,      526, 0x05defcdd
+0,     217728,     217728,     1152,      538, 0xc18ffeef
+0,     218880,     218880,     1152,      508, 0x1943eba7
+0,     220032,     220032,     1152,      497, 0xf953fbb6
+0,     221184,     221184,     1152,      513, 0x3b35f026
+0,     222336,     222336,     1152,      530, 0x705b0333
+0,     223488,     223488,     1152,      528, 0x7c5800e9
+0,     224640,     224640,     1152,      517, 0x1601fa7e
+0,     225792,     225792,     1152,      501, 0x5045f61a
+0,     226944,     226944,     1152,      520, 0x254ee65d
+0,     228096,     228096,     1152,      827, 0x29644ce4
+0,     229248,     229248,     1152,      692, 0xb9d265ee
+0,     230400,     230400,     1152,      660, 0x050233c6
+0,     231552,     231552,     1152,      631, 0x0306284e
+0,     232704,     232704,     1152,      611, 0xf9ed2079
+0,     233856,     233856,     1152,      640, 0xd1ab3363
+0,     235008,     235008,     1152,      652, 0xaebf3b5a
+0,     236160,     236160,     1152,      619, 0xc64e280b
+0,     237312,     237312,     1152,      601, 0x647d258c
+0,     238464,     238464,     1152,      574, 0x0a2b1548
+0,     239616,     239616,     1152,      570, 0xd98e11bf
+0,     240768,     240768,     1152,      611, 0x04a81e85
+0,     241920,     241920,     1152,      525, 0x108ff5ee
+0,     243072,     243072,     1152,      569, 0x9a3b1319
+0,     244224,     244224,     1152,      574, 0xdc770a8d
+0,     245376,     245376,     1152,      831, 0x5ed066c7
+0,     246528,     246528,     1152,      722, 0xa8834f8b
+0,     247680,     247680,     1152,      730, 0x71f56be1
+0,     248832,     248832,     1152,      729, 0x9653694a
+0,     249984,     249984,     1152,      750, 0xf8716eb8
+0,     251136,     251136,     1152,      695, 0x541951fa
+0,     252288,     252288,     1152,      677, 0xbf575b05
+0,     253440,     253440,     1152,      639, 0x1f74352b
+0,     254592,     254592,     1152,      647, 0x87e43a7e
+0,     255744,     255744,     1152,      613, 0x09551766
+0,     256896,     256896,     1152,      564, 0xa067162a
+0,     258048,     258048,     1152,      539, 0xf2280791
+0,     259200,     259200,     1152,      516, 0x9cfef313
+0,     260352,     260352,     1152,      527, 0x5a94088f
+0,     261504,     261504,     1152,      528, 0x71d1f32b
+0,     262656,     262656,     1152,      511, 0xaf28f38c
+0,     263808,     263808,     1152,      519, 0x47a4f3e4
+0,     264960,     264960,     1152,      519, 0x6a67f4a4
+0,     266112,     266112,     1152,      514, 0xe176e6d1
+0,     267264,     267264,     1152,      525, 0xd194edac
+0,     268416,     268416,     1152,      527, 0x6d50f7c3
+0,     269568,     269568,     1152,      508, 0x3f8d05af
+0,     270720,     270720,     1152,      517, 0x7f48ec77
+0,     271872,     271872,     1152,      468, 0x73a2d82f
+0,     273024,     273024,     1152,      457, 0xc816cf16
+0,     274176,     274176,     1152,      434, 0x9e5bc930
+0,     275328,     275328,     1152,      443, 0xde0fd171
+0,     276480,     276480,     1152,      415, 0x5800b715
+0,     277632,     277632,     1152,      420, 0xeda9d20c
+0,     278784,     278784,     1152,      416, 0x4793c017
+0,     279936,     279936,     1152,      417, 0x5a37c00e
+0,     281088,     281088,     1152,      409, 0x02deb9ed
+0,     282240,     282240,     1152,      407, 0xd8b2b127
+0,     283392,     283392,     1152,      395, 0x787fba53
+0,     284544,     284544,     1152,      389, 0x3362b2b3
+0,     285696,     285696,     1152,      388, 0xe058af5d
+0,     286848,     286848,     1152,      374, 0xe1c0ad48
+0,     288000,     288000,     1152,      390, 0xa4f8b203
+0,     289152,     289152,     1152,      382, 0xe076b693
+0,     290304,     290304,     1152,      382, 0xa19ab1d1
+0,     291456,     291456,     1152,      389, 0x614db09b
+0,     292608,     292608,     1152,      375, 0x8e3bb1a9
+0,     293760,     293760,     1152,      375, 0x455daa5f
+0,     294912,     294912,     1152,      391, 0xd938ae9f
+0,     296064,     296064,     1152,      380, 0x6cebb555
+0,     297216,     297216,     1152,      381, 0xc42faf26
+0,     298368,     298368,     1152,      364, 0x6719a5b9
+0,     299520,     299520,     1152,      352, 0xd9aaa922
+0,     300672,     300672,     1152,      372, 0xfaceaab9
+0,     301824,     301824,     1152,      369, 0x1dd0b400
+0,     302976,     302976,     1152,      338, 0x1be49de3
+0,     304128,     304128,     1152,      340, 0x7f43a4af
+0,     305280,     305280,     1152,      344, 0x8f519ec0
+0,     306432,     306432,     1152,      355, 0xdcbda935
+0,     307584,     307584,     1152,      335, 0x69299219
+0,     308736,     308736,     1152,      331, 0x1f72a77c
+0,     309888,     309888,     1152,      353, 0xe28ba583
+0,     311040,     311040,     1152,      337, 0x70b69966
+0,     312192,     312192,     1152,      361, 0xbe73a133
+0,     313344,     313344,     1152,      369, 0x300ab491
+0,     314496,     314496,     1152,      381, 0x5913bf78
+0,     315648,     315648,     1152,      372, 0x544daa11
+0,     316800,     316800,     1152,      376, 0xdc04ba2b
+0,     317952,     317952,     1152,      337, 0xc3d095f5
+0,     319104,     319104,     1152,      345, 0x306da1c1
+0,     320256,     320256,     1152,      374, 0x8297b29e
+0,     321408,     321408,     1152,      347, 0xe7f2a33e
+0,     322560,     322560,     1152,      364, 0x9a7eb40c
+0,     323712,     323712,     1152,      358, 0x3bdca87c
+0,     324864,     324864,     1152,      339, 0x9d48a314
+0,     326016,     326016,     1152,      370, 0x78a6acb1
+0,     327168,     327168,     1152,      353, 0xb876a9ca
+0,     328320,     328320,     1152,      355, 0x82eab1cf
+0,     329472,     329472,     1152,      360, 0xa8cea2a9
+0,     330624,     330624,     1152,      547, 0x6176af27
diff --git a/tests/ref/fate/mov-rotation b/tests/ref/fate/mov-rotation
deleted file mode 100644
index 64ded27fb2..0000000000
--- a/tests/ref/fate/mov-rotation
+++ /dev/null
@@ -1 +0,0 @@
--90
diff --git a/tests/ref/fate/mov-sar b/tests/ref/fate/mov-sar
deleted file mode 100644
index 291b047df4..0000000000
--- a/tests/ref/fate/mov-sar
+++ /dev/null
@@ -1 +0,0 @@
-9:4
diff --git a/tests/ref/fate/mov-spherical b/tests/ref/fate/mov-spherical
deleted file mode 100644
index a3f8cdfa60..0000000000
--- a/tests/ref/fate/mov-spherical
+++ /dev/null
@@ -1,8 +0,0 @@
-tiled equirectangular
-148
-73
-147
-72
-45
-30
-15
diff --git a/tests/ref/fate/mov-spherical-mono b/tests/ref/fate/mov-spherical-mono
new file mode 100644
index 0000000000..bd57d94514
--- /dev/null
+++ b/tests/ref/fate/mov-spherical-mono
@@ -0,0 +1,18 @@
+[STREAM]
+[SIDE_DATA]
+side_data_type=Stereo 3D
+type=2D
+inverted=0
+[/SIDE_DATA]
+[SIDE_DATA]
+side_data_type=Spherical Mapping
+projection=tiled equirectangular
+bound_left=148
+bound_top=73
+bound_right=147
+bound_bottom=72
+yaw=45
+pitch=30
+roll=15
+[/SIDE_DATA]
+[/STREAM]
diff --git a/tests/ref/fate/mov-stereo3d b/tests/ref/fate/mov-stereo3d
deleted file mode 100644
index fe909bb197..0000000000
--- a/tests/ref/fate/mov-stereo3d
+++ /dev/null
@@ -1 +0,0 @@
-2D
diff --git a/tests/ref/fate/mov-zombie b/tests/ref/fate/mov-zombie
new file mode 100644
index 0000000000..e89abb1167
--- /dev/null
+++ b/tests/ref/fate/mov-zombie
@@ -0,0 +1,133 @@
+packet|codec_type=video|stream_index=0|pts=0|pts_time=0.000000|dts=-3004|dts_time=-0.033378|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=4133|pos=11309|flags=K_
+frame|media_type=video|stream_index=0|key_frame=1|pkt_pts=0|pkt_pts_time=0.000000|pkt_dts=-3004|pkt_dts_time=-0.033378|best_effort_timestamp=0|best_effort_timestamp_time=0.000000|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=11309|pkt_size=4133|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=I|coded_picture_number=0|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=5440|pts_time=0.060444|dts=-567|dts_time=-0.006300|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1077|pos=15442|flags=__
+packet|codec_type=video|stream_index=0|pts=2437|pts_time=0.027078|dts=2436|dts_time=0.027067|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=355|pos=16519|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=2437|pkt_pts_time=0.027078|pkt_dts=2436|pkt_dts_time=0.027067|best_effort_timestamp=2437|best_effort_timestamp_time=0.027078|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=16519|pkt_size=355|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=2|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=11446|pts_time=0.127178|dts=5439|dts_time=0.060433|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1110|pos=16874|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=5440|pkt_pts_time=0.060444|pkt_dts=5439|pkt_dts_time=0.060433|best_effort_timestamp=5440|best_effort_timestamp_time=0.060444|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=15442|pkt_size=1077|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=1|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=8443|pts_time=0.093811|dts=8442|dts_time=0.093800|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=430|pos=17984|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=8443|pkt_pts_time=0.093811|pkt_dts=8442|pkt_dts_time=0.093800|best_effort_timestamp=8443|best_effort_timestamp_time=0.093811|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=17984|pkt_size=430|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=4|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=17452|pts_time=0.193911|dts=11445|dts_time=0.127167|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1485|pos=18414|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=11446|pkt_pts_time=0.127178|pkt_dts=11445|pkt_dts_time=0.127167|best_effort_timestamp=11446|best_effort_timestamp_time=0.127178|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=16874|pkt_size=1110|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=3|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=14449|pts_time=0.160544|dts=14448|dts_time=0.160533|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1005|pos=19899|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=14449|pkt_pts_time=0.160544|pkt_dts=14448|pkt_dts_time=0.160533|best_effort_timestamp=14449|best_effort_timestamp_time=0.160544|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=19899|pkt_size=1005|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=6|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=23458|pts_time=0.260644|dts=17451|dts_time=0.193900|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1976|pos=20904|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=17452|pkt_pts_time=0.193911|pkt_dts=17451|pkt_dts_time=0.193900|best_effort_timestamp=17452|best_effort_timestamp_time=0.193911|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=18414|pkt_size=1485|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=5|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=20455|pts_time=0.227278|dts=20454|dts_time=0.227267|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=904|pos=22880|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=20455|pkt_pts_time=0.227278|pkt_dts=20454|pkt_dts_time=0.227267|best_effort_timestamp=20455|best_effort_timestamp_time=0.227278|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=22880|pkt_size=904|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=8|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=29464|pts_time=0.327378|dts=23457|dts_time=0.260633|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1254|pos=23784|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=23458|pkt_pts_time=0.260644|pkt_dts=23457|pkt_dts_time=0.260633|best_effort_timestamp=23458|best_effort_timestamp_time=0.260644|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=20904|pkt_size=1976|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=7|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=26461|pts_time=0.294011|dts=26460|dts_time=0.294000|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=700|pos=25038|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=26461|pkt_pts_time=0.294011|pkt_dts=26460|pkt_dts_time=0.294000|best_effort_timestamp=26461|best_effort_timestamp_time=0.294011|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=25038|pkt_size=700|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=10|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=35470|pts_time=0.394111|dts=29463|dts_time=0.327367|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1311|pos=25738|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=29464|pkt_pts_time=0.327378|pkt_dts=29463|pkt_dts_time=0.327367|best_effort_timestamp=29464|best_effort_timestamp_time=0.327378|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=23784|pkt_size=1254|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=9|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=32467|pts_time=0.360744|dts=32466|dts_time=0.360733|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=631|pos=27049|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=32467|pkt_pts_time=0.360744|pkt_dts=32466|pkt_dts_time=0.360733|best_effort_timestamp=32467|best_effort_timestamp_time=0.360744|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=27049|pkt_size=631|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=12|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=41476|pts_time=0.460844|dts=35469|dts_time=0.394100|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1296|pos=27680|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=35470|pkt_pts_time=0.394111|pkt_dts=35469|pkt_dts_time=0.394100|best_effort_timestamp=35470|best_effort_timestamp_time=0.394111|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=25738|pkt_size=1311|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=11|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=38473|pts_time=0.427478|dts=38472|dts_time=0.427467|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=466|pos=28976|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=38473|pkt_pts_time=0.427478|pkt_dts=38472|pkt_dts_time=0.427467|best_effort_timestamp=38473|best_effort_timestamp_time=0.427478|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=28976|pkt_size=466|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=14|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=47482|pts_time=0.527578|dts=41475|dts_time=0.460833|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1638|pos=29442|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=41476|pkt_pts_time=0.460844|pkt_dts=41475|pkt_dts_time=0.460833|best_effort_timestamp=41476|best_effort_timestamp_time=0.460844|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=27680|pkt_size=1296|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=13|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=44479|pts_time=0.494211|dts=44478|dts_time=0.494200|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=907|pos=31080|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=44479|pkt_pts_time=0.494211|pkt_dts=44478|pkt_dts_time=0.494200|best_effort_timestamp=44479|best_effort_timestamp_time=0.494211|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=31080|pkt_size=907|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=16|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=53488|pts_time=0.594311|dts=47481|dts_time=0.527567|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1362|pos=31987|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=47482|pkt_pts_time=0.527578|pkt_dts=47481|pkt_dts_time=0.527567|best_effort_timestamp=47482|best_effort_timestamp_time=0.527578|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=29442|pkt_size=1638|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=15|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=50485|pts_time=0.560944|dts=50484|dts_time=0.560933|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=682|pos=33349|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=50485|pkt_pts_time=0.560944|pkt_dts=50484|pkt_dts_time=0.560933|best_effort_timestamp=50485|best_effort_timestamp_time=0.560944|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=33349|pkt_size=682|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=18|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=59494|pts_time=0.661044|dts=53487|dts_time=0.594300|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2917|pos=34031|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=53488|pkt_pts_time=0.594311|pkt_dts=53487|pkt_dts_time=0.594300|best_effort_timestamp=53488|best_effort_timestamp_time=0.594311|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=31987|pkt_size=1362|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=17|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=56491|pts_time=0.627678|dts=56490|dts_time=0.627667|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1174|pos=36948|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=56491|pkt_pts_time=0.627678|pkt_dts=56490|pkt_dts_time=0.627667|best_effort_timestamp=56491|best_effort_timestamp_time=0.627678|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=36948|pkt_size=1174|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=20|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=65500|pts_time=0.727778|dts=59493|dts_time=0.661033|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1748|pos=38122|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=59494|pkt_pts_time=0.661044|pkt_dts=59493|pkt_dts_time=0.661033|best_effort_timestamp=59494|best_effort_timestamp_time=0.661044|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=34031|pkt_size=2917|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=19|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=62497|pts_time=0.694411|dts=62496|dts_time=0.694400|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=926|pos=39870|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=62497|pkt_pts_time=0.694411|pkt_dts=62496|pkt_dts_time=0.694400|best_effort_timestamp=62497|best_effort_timestamp_time=0.694411|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=39870|pkt_size=926|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=22|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=68503|pts_time=0.761144|dts=65499|dts_time=0.727767|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=918|pos=40796|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=65500|pkt_pts_time=0.727778|pkt_dts=65499|pkt_dts_time=0.727767|best_effort_timestamp=65500|best_effort_timestamp_time=0.727778|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=38122|pkt_size=1748|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=21|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=71506|pts_time=0.794511|dts=68502|dts_time=0.761133|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=3846|pos=41714|flags=K_
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=68503|pkt_pts_time=0.761144|pkt_dts=68502|pkt_dts_time=0.761133|best_effort_timestamp=68503|best_effort_timestamp_time=0.761144|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=40796|pkt_size=918|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=23|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=77512|pts_time=0.861244|dts=71505|dts_time=0.794500|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1932|pos=45560|flags=__
+frame|media_type=video|stream_index=0|key_frame=1|pkt_pts=71506|pkt_pts_time=0.794511|pkt_dts=71505|pkt_dts_time=0.794500|best_effort_timestamp=71506|best_effort_timestamp_time=0.794511|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=41714|pkt_size=3846|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=I|coded_picture_number=24|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=74509|pts_time=0.827878|dts=74508|dts_time=0.827867|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1159|pos=47492|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=74509|pkt_pts_time=0.827878|pkt_dts=74508|pkt_dts_time=0.827867|best_effort_timestamp=74509|best_effort_timestamp_time=0.827878|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=47492|pkt_size=1159|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=26|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=83518|pts_time=0.927978|dts=77511|dts_time=0.861233|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1522|pos=48651|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=77512|pkt_pts_time=0.861244|pkt_dts=77511|pkt_dts_time=0.861233|best_effort_timestamp=77512|best_effort_timestamp_time=0.861244|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=45560|pkt_size=1932|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=25|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=80515|pts_time=0.894611|dts=80514|dts_time=0.894600|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=719|pos=50173|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=80515|pkt_pts_time=0.894611|pkt_dts=80514|pkt_dts_time=0.894600|best_effort_timestamp=80515|best_effort_timestamp_time=0.894611|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=50173|pkt_size=719|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=28|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=89524|pts_time=0.994711|dts=83517|dts_time=0.927967|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1700|pos=50892|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=83518|pkt_pts_time=0.927978|pkt_dts=83517|pkt_dts_time=0.927967|best_effort_timestamp=83518|best_effort_timestamp_time=0.927978|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=48651|pkt_size=1522|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=27|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=86521|pts_time=0.961344|dts=86520|dts_time=0.961333|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1099|pos=52592|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=86521|pkt_pts_time=0.961344|pkt_dts=86520|pkt_dts_time=0.961333|best_effort_timestamp=86521|best_effort_timestamp_time=0.961344|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=52592|pkt_size=1099|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=30|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=95530|pts_time=1.061444|dts=89523|dts_time=0.994700|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2558|pos=53691|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=89524|pkt_pts_time=0.994711|pkt_dts=89523|pkt_dts_time=0.994700|best_effort_timestamp=89524|best_effort_timestamp_time=0.994711|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=50892|pkt_size=1700|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=29|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=92527|pts_time=1.028078|dts=92526|dts_time=1.028067|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1008|pos=56249|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=92527|pkt_pts_time=1.028078|pkt_dts=92526|pkt_dts_time=1.028067|best_effort_timestamp=92527|best_effort_timestamp_time=1.028078|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=56249|pkt_size=1008|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=32|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=101536|pts_time=1.128178|dts=95529|dts_time=1.061433|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1236|pos=57257|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=95530|pkt_pts_time=1.061444|pkt_dts=95529|pkt_dts_time=1.061433|best_effort_timestamp=95530|best_effort_timestamp_time=1.061444|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=53691|pkt_size=2558|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=31|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=98533|pts_time=1.094811|dts=98532|dts_time=1.094800|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=607|pos=58493|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=98533|pkt_pts_time=1.094811|pkt_dts=98532|pkt_dts_time=1.094800|best_effort_timestamp=98533|best_effort_timestamp_time=1.094811|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=58493|pkt_size=607|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=34|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=107542|pts_time=1.194911|dts=101535|dts_time=1.128167|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1883|pos=59100|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=101536|pkt_pts_time=1.128178|pkt_dts=101535|pkt_dts_time=1.128167|best_effort_timestamp=101536|best_effort_timestamp_time=1.128178|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=57257|pkt_size=1236|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=33|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=104539|pts_time=1.161544|dts=104538|dts_time=1.161533|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=893|pos=60983|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=104539|pkt_pts_time=1.161544|pkt_dts=104538|pkt_dts_time=1.161533|best_effort_timestamp=104539|best_effort_timestamp_time=1.161544|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=60983|pkt_size=893|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=36|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=113548|pts_time=1.261644|dts=107541|dts_time=1.194900|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1305|pos=61876|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=107542|pkt_pts_time=1.194911|pkt_dts=107541|pkt_dts_time=1.194900|best_effort_timestamp=107542|best_effort_timestamp_time=1.194911|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=59100|pkt_size=1883|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=35|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=110545|pts_time=1.228278|dts=110544|dts_time=1.228267|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=472|pos=63181|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=110545|pkt_pts_time=1.228278|pkt_dts=110544|pkt_dts_time=1.228267|best_effort_timestamp=110545|best_effort_timestamp_time=1.228278|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=63181|pkt_size=472|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=38|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=119554|pts_time=1.328378|dts=113547|dts_time=1.261633|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1411|pos=63653|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=113548|pkt_pts_time=1.261644|pkt_dts=113547|pkt_dts_time=1.261633|best_effort_timestamp=113548|best_effort_timestamp_time=1.261644|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=61876|pkt_size=1305|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=37|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=116551|pts_time=1.295011|dts=116550|dts_time=1.295000|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=616|pos=65064|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=116551|pkt_pts_time=1.295011|pkt_dts=116550|pkt_dts_time=1.295000|best_effort_timestamp=116551|best_effort_timestamp_time=1.295011|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=65064|pkt_size=616|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=40|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=125560|pts_time=1.395111|dts=119553|dts_time=1.328367|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1291|pos=65680|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=119554|pkt_pts_time=1.328378|pkt_dts=119553|pkt_dts_time=1.328367|best_effort_timestamp=119554|best_effort_timestamp_time=1.328378|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=63653|pkt_size=1411|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=39|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=122557|pts_time=1.361744|dts=122556|dts_time=1.361733|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=470|pos=66971|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=122557|pkt_pts_time=1.361744|pkt_dts=122556|pkt_dts_time=1.361733|best_effort_timestamp=122557|best_effort_timestamp_time=1.361744|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=66971|pkt_size=470|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=42|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=131566|pts_time=1.461844|dts=125559|dts_time=1.395100|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1977|pos=67441|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=125560|pkt_pts_time=1.395111|pkt_dts=125559|pkt_dts_time=1.395100|best_effort_timestamp=125560|best_effort_timestamp_time=1.395111|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=65680|pkt_size=1291|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=41|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=128563|pts_time=1.428478|dts=128562|dts_time=1.428467|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=436|pos=69418|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=128563|pkt_pts_time=1.428478|pkt_dts=128562|pkt_dts_time=1.428467|best_effort_timestamp=128563|best_effort_timestamp_time=1.428478|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=69418|pkt_size=436|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=44|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=137572|pts_time=1.528578|dts=131565|dts_time=1.461833|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2566|pos=69854|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=131566|pkt_pts_time=1.461844|pkt_dts=131565|pkt_dts_time=1.461833|best_effort_timestamp=131566|best_effort_timestamp_time=1.461844|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=67441|pkt_size=1977|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=43|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=134569|pts_time=1.495211|dts=134568|dts_time=1.495200|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=886|pos=72420|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=134569|pkt_pts_time=1.495211|pkt_dts=134568|pkt_dts_time=1.495200|best_effort_timestamp=134569|best_effort_timestamp_time=1.495211|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=72420|pkt_size=886|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=46|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=140575|pts_time=1.561944|dts=137571|dts_time=1.528567|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1330|pos=73306|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=137572|pkt_pts_time=1.528578|pkt_dts=137571|pkt_dts_time=1.528567|best_effort_timestamp=137572|best_effort_timestamp_time=1.528578|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=69854|pkt_size=2566|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=45|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=143578|pts_time=1.595311|dts=140574|dts_time=1.561933|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2227|pos=74636|flags=K_
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=140575|pkt_pts_time=1.561944|pkt_dts=140574|pkt_dts_time=1.561933|best_effort_timestamp=140575|best_effort_timestamp_time=1.561944|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=73306|pkt_size=1330|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=47|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=149584|pts_time=1.662044|dts=143577|dts_time=1.595300|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2210|pos=76863|flags=__
+frame|media_type=video|stream_index=0|key_frame=1|pkt_pts=143578|pkt_pts_time=1.595311|pkt_dts=143577|pkt_dts_time=1.595300|best_effort_timestamp=143578|best_effort_timestamp_time=1.595311|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=74636|pkt_size=2227|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=I|coded_picture_number=48|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=146581|pts_time=1.628678|dts=146580|dts_time=1.628667|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1498|pos=79073|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=146581|pkt_pts_time=1.628678|pkt_dts=146580|pkt_dts_time=1.628667|best_effort_timestamp=146581|best_effort_timestamp_time=1.628678|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=79073|pkt_size=1498|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=50|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=155590|pts_time=1.728778|dts=149583|dts_time=1.662033|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1721|pos=80571|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=149584|pkt_pts_time=1.662044|pkt_dts=149583|pkt_dts_time=1.662033|best_effort_timestamp=149584|best_effort_timestamp_time=1.662044|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=76863|pkt_size=2210|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=49|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=152587|pts_time=1.695411|dts=152586|dts_time=1.695400|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1238|pos=82292|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=152587|pkt_pts_time=1.695411|pkt_dts=152586|pkt_dts_time=1.695400|best_effort_timestamp=152587|best_effort_timestamp_time=1.695411|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=82292|pkt_size=1238|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=52|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=161596|pts_time=1.795511|dts=155589|dts_time=1.728767|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1753|pos=83530|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=155590|pkt_pts_time=1.728778|pkt_dts=155589|pkt_dts_time=1.728767|best_effort_timestamp=155590|best_effort_timestamp_time=1.728778|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=80571|pkt_size=1721|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=51|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=158593|pts_time=1.762144|dts=158592|dts_time=1.762133|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1014|pos=85283|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=158593|pkt_pts_time=1.762144|pkt_dts=158592|pkt_dts_time=1.762133|best_effort_timestamp=158593|best_effort_timestamp_time=1.762144|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=85283|pkt_size=1014|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=54|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=167602|pts_time=1.862244|dts=161595|dts_time=1.795500|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=2408|pos=86297|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=161596|pkt_pts_time=1.795511|pkt_dts=161595|pkt_dts_time=1.795500|best_effort_timestamp=161596|best_effort_timestamp_time=1.795511|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=83530|pkt_size=1753|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=53|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=164599|pts_time=1.828878|dts=164598|dts_time=1.828867|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1727|pos=88705|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=164599|pkt_pts_time=1.828878|pkt_dts=164598|pkt_dts_time=1.828867|best_effort_timestamp=164599|best_effort_timestamp_time=1.828878|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=88705|pkt_size=1727|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=56|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=173608|pts_time=1.928978|dts=167601|dts_time=1.862233|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1504|pos=90432|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=167602|pkt_pts_time=1.862244|pkt_dts=167601|pkt_dts_time=1.862233|best_effort_timestamp=167602|best_effort_timestamp_time=1.862244|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=86297|pkt_size=2408|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=55|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=170605|pts_time=1.895611|dts=170604|dts_time=1.895600|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=957|pos=91936|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=170605|pkt_pts_time=1.895611|pkt_dts=170604|pkt_dts_time=1.895600|best_effort_timestamp=170605|best_effort_timestamp_time=1.895611|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=91936|pkt_size=957|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=58|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=179614|pts_time=1.995711|dts=173607|dts_time=1.928967|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1890|pos=92893|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=173608|pkt_pts_time=1.928978|pkt_dts=173607|pkt_dts_time=1.928967|best_effort_timestamp=173608|best_effort_timestamp_time=1.928978|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=90432|pkt_size=1504|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=57|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=176611|pts_time=1.962344|dts=176610|dts_time=1.962333|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1239|pos=94783|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=176611|pkt_pts_time=1.962344|pkt_dts=176610|pkt_dts_time=1.962333|best_effort_timestamp=176611|best_effort_timestamp_time=1.962344|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=94783|pkt_size=1239|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=60|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=185620|pts_time=2.062444|dts=179613|dts_time=1.995700|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1856|pos=96022|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=179614|pkt_pts_time=1.995711|pkt_dts=179613|pkt_dts_time=1.995700|best_effort_timestamp=179614|best_effort_timestamp_time=1.995711|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=92893|pkt_size=1890|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=59|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=182617|pts_time=2.029078|dts=182616|dts_time=2.029067|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1302|pos=97878|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=182617|pkt_pts_time=2.029078|pkt_dts=182616|pkt_dts_time=2.029067|best_effort_timestamp=182617|best_effort_timestamp_time=2.029078|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=97878|pkt_size=1302|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=62|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=191626|pts_time=2.129178|dts=185619|dts_time=2.062433|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=1666|pos=99180|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=185620|pkt_pts_time=2.062444|pkt_dts=185619|pkt_dts_time=2.062433|best_effort_timestamp=185620|best_effort_timestamp_time=2.062444|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=96022|pkt_size=1856|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=61|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=188623|pts_time=2.095811|dts=188622|dts_time=2.095800|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=974|pos=100846|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=188623|pkt_pts_time=2.095811|pkt_dts=188622|pkt_dts_time=2.095800|best_effort_timestamp=188623|best_effort_timestamp_time=2.095811|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=100846|pkt_size=974|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=B|coded_picture_number=64|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+packet|codec_type=video|stream_index=0|pts=197632|pts_time=2.195911|dts=191625|dts_time=2.129167|duration=3003|duration_time=0.033367|convergence_duration=N/A|convergence_duration_time=N/A|size=580|pos=101820|flags=__
+frame|media_type=video|stream_index=0|key_frame=0|pkt_pts=191626|pkt_pts_time=2.129178|pkt_dts=N/A|pkt_dts_time=N/A|best_effort_timestamp=191626|best_effort_timestamp_time=2.129178|pkt_duration=3003|pkt_duration_time=0.033367|pkt_pos=99180|pkt_size=1666|width=160|height=240|pix_fmt=yuv420p|sample_aspect_ratio=2:1|pict_type=P|coded_picture_number=63|display_picture_number=0|interlaced_frame=0|top_field_first=0|repeat_pict=0|color_range=tv|color_space=smpte170m|color_primaries=smpte170m|color_transfer=bt709|chroma_location=topleft
+stream|index=0|codec_name=h264|profile=77|codec_type=video|codec_time_base=212521/12744000|codec_tag_string=avc1|codec_tag=0x31637661|width=160|height=240|coded_width=160|coded_height=240|has_b_frames=0|sample_aspect_ratio=2:1|display_aspect_ratio=4:3|pix_fmt=yuv420p|level=12|color_range=tv|color_space=smpte170m|color_transfer=bt709|color_primaries=smpte170m|chroma_location=topleft|field_order=unknown|timecode=N/A|refs=2|is_avc=true|nal_length_size=4|id=N/A|r_frame_rate=30000/1001|avg_frame_rate=6372000/212521|time_base=1/90000|start_pts=0|start_time=0.000000|duration_ts=2125200|duration=23.613333|bit_rate=333874|max_bit_rate=N/A|bits_per_raw_sample=8|nb_frames=708|nb_read_frames=65|nb_read_packets=66|disposition:default=1|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|tag:rotate=0|tag:creation_time=2008-05-12T20:59:27.000000Z|tag:language=eng|tag:handler_name=Apple Alias Data Handler|tag:encoder=H.264
+side_data|side_data_type=Display Matrix|displaymatrix=\n00000000:       131072           0           0\n00000001:            0       65536           0\n00000002:            0           0  1073741824\n|rotation=0
diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc
index a0a170080d..872796ebce 100644
--- a/tests/ref/fate/movenc
+++ b/tests/ref/fate/movenc
@@ -1,135 +1,153 @@
 write_data len 36, time nopts, type header atom ftyp
-write_data len 1807, time nopts, type header atom -
-write_data len 496, time 1000000, type sync atom moof
+write_data len 2389, time nopts, type header atom -
+write_data len 788, time 1000000, type sync atom moof
 write_data len 110, time nopts, type trailer atom -
-07cee26b35b140ae50268c3083e2d880 2449 non-empty-moov
+17a37691eba8b858cf15e60aa9a7dbf7 3323 non-empty-moov
 write_data len 36, time nopts, type header atom ftyp
-write_data len 2135, time nopts, type header atom -
-write_data len 616, time 966667, type sync atom moof
+write_data len 2721, time nopts, type header atom -
+write_data len 908, time 966667, type sync atom moof
 write_data len 110, time nopts, type trailer atom -
-c3c47c2c9566cb410e0832c37f4f8527 2897 non-empty-moov-elst
+0026ffe059c06c592021f972bf2c5e79 3775 non-empty-moov-elst
 write_data len 36, time nopts, type header atom ftyp
-write_data len 2055, time nopts, type header atom -
-write_data len 616, time 1000000, type sync atom moof
+write_data len 2629, time nopts, type header atom -
+write_data len 908, time 1000000, type sync atom moof
 write_data len 110, time nopts, type trailer atom -
-abc910edf1fc2a205658353dfdfc9a5f 2817 non-empty-moov-no-elst
+c184e168ac1e5bb3d9c70e580ab6179c 3683 non-empty-moov-no-elst
 write_data len 20, time nopts, type header atom ftyp
-write_data len 1195, time nopts, type header atom -
-write_data len 608, time 0, type sync atom moof
-write_data len 652, time nopts, type unknown atom -
-write_data len 608, time 1013106, type sync atom moof
-write_data len 640, time nopts, type unknown atom -
+write_data len 1171, time nopts, type header atom -
+write_data len 728, time 0, type sync atom moof
+write_data len 828, time nopts, type unknown atom -
+write_data len 728, time 1013106, type sync atom moof
+write_data len 812, time nopts, type unknown atom -
 write_data len 148, time nopts, type trailer atom -
-e8e0346bf20bfcb448695bd905946f78 3871 ismv
+1f37c1a8e01651e8bebcd66f00b6a226 4435 ismv
 write_data len 36, time nopts, type header atom ftyp
-write_data len 1147, time nopts, type header atom -
-write_data len 500, time 0, type sync atom moof
-write_data len 496, time 1000000, type sync atom moof
+write_data len 1123, time nopts, type header atom -
+write_data len 796, time 0, type sync atom moof
+write_data len 788, time 1000000, type sync atom moof
 write_data len 148, time nopts, type trailer atom -
-89ea214e1d1079556164664eea9a7884 2327 empty-moov
+ed8506ebfce4c41732205ae26a4759fd 2891 empty-moov
 write_data len 36, time nopts, type header atom ftyp
-write_data len 1147, time nopts, type header atom -
-write_data len 780, time 0, type sync atom moof
-write_data len 616, time 1000000, type sync atom moof
+write_data len 1123, time nopts, type header atom -
+write_data len 1068, time 0, type sync atom moof
+write_data len 908, time 1000000, type sync atom moof
 write_data len 148, time nopts, type trailer atom -
-cf9eec38fe557203a37a44c8adafb1fe 2727 empty-moov-no-elst
+1844ee6d19fd1e6daf2655632cf26310 3283 empty-moov-no-elst
 write_data len 36, time nopts, type header atom ftyp
-write_data len 1147, time nopts, type header atom -
-write_data len 612, time -33333, type sync atom moof
-write_data len 616, time 966667, type sync atom moof
-write_data len 148, time nopts, type trailer atom -
-42eca5843d98aa9a9b3275de201700b8 2559 empty-moov-no-elst-no-adjust
-write_data len 1183, time nopts, type header atom ftyp
-write_data len 500, time 0, type sync atom moof
-write_data len 496, time 1000000, type sync atom moof
-write_data len 148, time nopts, type trailer atom -
-89ea214e1d1079556164664eea9a7884 2327 delay-moov
-write_data len 1255, time nopts, type header atom ftyp
-write_data len 620, time -33333, type sync atom moof
-write_data len 616, time 966667, type sync atom moof
-write_data len 148, time nopts, type trailer atom -
-8fd78a5a91d73a735da53ac02f844177 2639 delay-moov-elst
-write_data len 1183, time nopts, type header atom ftyp
-write_data len 596, time 0, type sync atom moof
+write_data len 1123, time nopts, type header atom -
+write_data len 900, time -33333, type sync atom moof
+write_data len 908, time 966667, type sync atom moof
+write_data len 148, time nopts, type trailer atom -
+139b27dbe2a80c2dc088d0c755f26033 3115 empty-moov-no-elst-no-adjust
+write_data len 1159, time nopts, type header atom ftyp
+write_data len 796, time 0, type sync atom moof
+write_data len 788, time 1000000, type sync atom moof
+write_data len 148, time nopts, type trailer atom -
+ed8506ebfce4c41732205ae26a4759fd 2891 delay-moov
+write_data len 1231, time nopts, type header atom ftyp
+write_data len 916, time -33333, type sync atom moof
+write_data len 908, time 966667, type sync atom moof
+write_data len 148, time nopts, type trailer atom -
+3ece148745cd64b4428530a4d1080a2d 3203 delay-moov-elst
+write_data len 1195, time nopts, type header atom ftyp
+write_data len 836, time 0, type sync atom moof
 write_data len 67, time nopts, type trailer atom -
-848d2fe2f27882960b8e10315460bc23 1846 delay-moov-empty-track
-write_data len 1183, time nopts, type header atom ftyp
-write_data len 240, time 0, type sync atom moof
-write_data len 240, time 1000000, type sync atom moof
+9562946a369e6fb570fb2fd7aa2fe728 2098 delay-moov-empty-track
+write_data len 1195, time nopts, type header atom ftyp
+write_data len 360, time 0, type sync atom moof
+write_data len 360, time 1000000, type sync atom moof
 write_data len 86, time nopts, type trailer atom -
-cbf60ba66c47b8506c1a724d43f12cdc 1749 delay-moov-empty-track-flush
+4c7832b81836331c6c37155dc31d95be 2001 delay-moov-empty-track-flush
 write_data len 36, time nopts, type header atom ftyp
-write_data len 1147, time nopts, type header atom -
-c0b13fd47ca4c6de13c03155c38c231c 1183 empty-moov-header
-write_data len 500, time 0, type sync atom moof
-write_data len 496, time 1000000, type sync atom moof
-f12baf7c4269695817337192c7069328 996 empty-moov-content
-write_data len 148, time nopts, type trailer atom -
-write_data len 1183, time nopts, type header atom ftyp
-c0b13fd47ca4c6de13c03155c38c231c 1183 delay-moov-header
-write_data len 500, time 0, type sync atom moof
-write_data len 496, time 1000000, type sync atom moof
-f12baf7c4269695817337192c7069328 996 delay-moov-content
+write_data len 1123, time nopts, type header atom -
+b7e3c768b9094ebe2fda44979a7f8985 1159 empty-moov-header
+write_data len 796, time 0, type sync atom moof
+write_data len 788, time 1000000, type sync atom moof
+a0165f4a26a409212b0946e981bdefb9 1584 empty-moov-content
+write_data len 148, time nopts, type trailer atom -
+write_data len 1159, time nopts, type header atom ftyp
+b7e3c768b9094ebe2fda44979a7f8985 1159 delay-moov-header
+write_data len 796, time 0, type sync atom moof
+write_data len 788, time 1000000, type sync atom moof
+a0165f4a26a409212b0946e981bdefb9 1584 delay-moov-content
 write_data len 148, time nopts, type trailer atom -
 write_data len 24, time nopts, type header atom -
-write_data len 1147, time nopts, type header atom -
-write_data len 588, time 0, type sync atom sidx
-write_data len 584, time 1000000, type sync atom sidx
-76e1081bbab7541eadcaf4b19d37eff6 584 empty-moov-second-frag
+write_data len 1123, time nopts, type header atom -
+write_data len 884, time 0, type sync atom sidx
+write_data len 876, time 1000000, type sync atom sidx
+272a474cfd2a68cc5f05b426b14a2b7d 876 empty-moov-second-frag
 write_data len 148, time nopts, type trailer atom -
 write_data len 24, time nopts, type header atom -
-write_data len 1147, time nopts, type header atom -
-write_data len 584, time 1000000, type sync atom sidx
-76e1081bbab7541eadcaf4b19d37eff6 584 empty-moov-second-frag-discont
+write_data len 1123, time nopts, type header atom -
+write_data len 876, time 1000000, type sync atom sidx
+272a474cfd2a68cc5f05b426b14a2b7d 876 empty-moov-second-frag-discont
 write_data len 110, time nopts, type trailer atom -
-write_data len 1171, time nopts, type header atom -
-write_data len 584, time 1000000, type sync atom sidx
-76e1081bbab7541eadcaf4b19d37eff6 584 delay-moov-second-frag-discont
+write_data len 1219, time nopts, type header atom -
+write_data len 876, time 1000000, type sync atom sidx
+272a474cfd2a68cc5f05b426b14a2b7d 876 delay-moov-second-frag-discont
 write_data len 110, time nopts, type trailer atom -
-write_data len 1207, time nopts, type header atom ftyp
-fdc08ccfb9ca1a7a63a8e82a99e28e83 1207 delay-moov-elst-init
-write_data len 700, time -33333, type sync atom sidx
-write_data len 704, time 966667, type sync atom sidx
-41afdc44b0e376fae49a730afe0c53c2 704 delay-moov-elst-second-frag
-write_data len 148, time nopts, type trailer atom -
-write_data len 1207, time nopts, type header atom ftyp
-fdc08ccfb9ca1a7a63a8e82a99e28e83 1207 delay-moov-elst-init-discont
-write_data len 704, time 966667, type sync atom sidx
-41afdc44b0e376fae49a730afe0c53c2 704 delay-moov-elst-second-frag-discont
+write_data len 1219, time nopts, type header atom ftyp
+6ec3698bcc86013e0016e3d47d230363 1219 delay-moov-elst-init
+write_data len 988, time -33333, type sync atom sidx
+write_data len 996, time 966667, type sync atom sidx
+fcae8f40e015b59aabc8d4a99a759ca1 996 delay-moov-elst-second-frag
+write_data len 148, time nopts, type trailer atom -
+write_data len 1219, time nopts, type header atom ftyp
+6ec3698bcc86013e0016e3d47d230363 1219 delay-moov-elst-init-discont
+write_data len 996, time 966667, type sync atom sidx
+fcae8f40e015b59aabc8d4a99a759ca1 996 delay-moov-elst-second-frag-discont
 write_data len 110, time nopts, type trailer atom -
-write_data len 1243, time nopts, type header atom ftyp
-57c113cd2baf7b231355eee6980fb6b5 1243 delay-moov-elst-signal-init
-write_data len 708, time -33333, type sync atom sidx
-write_data len 704, time 966667, type sync atom sidx
-13b8487a4f004ec9f1db543aee1e5e18 704 delay-moov-elst-signal-second-frag
+write_data len 1219, time nopts, type header atom ftyp
+c3681590a292cb9ca19a5a982e530166 1219 delay-moov-elst-signal-init
+write_data len 1004, time -33333, type sync atom sidx
+write_data len 996, time 966667, type sync atom sidx
+aa5462cc0d2144f72154d9c309edb57d 996 delay-moov-elst-signal-second-frag
 write_data len 148, time nopts, type trailer atom -
-write_data len 1243, time nopts, type header atom ftyp
-57c113cd2baf7b231355eee6980fb6b5 1243 delay-moov-elst-signal-init-discont
-write_data len 704, time 966667, type sync atom sidx
-13b8487a4f004ec9f1db543aee1e5e18 704 delay-moov-elst-signal-second-frag-discont
+write_data len 1219, time nopts, type header atom ftyp
+c3681590a292cb9ca19a5a982e530166 1219 delay-moov-elst-signal-init-discont
+write_data len 996, time 966667, type sync atom sidx
+aa5462cc0d2144f72154d9c309edb57d 996 delay-moov-elst-signal-second-frag-discont
 write_data len 110, time nopts, type trailer atom -
 write_data len 1243, time nopts, type header atom ftyp
-write_data len 1552, time -333333, type sync atom sidx
-write_data len 704, time 5166667, type sync atom sidx
+dac14c8795d5cbd91ae770c6e2880c62 1243 delay-moov-elst-signal-init-discont-largets
+write_data len 996, time 279621233333, type sync atom sidx
+41cac4c3df656a87bb38363fdcd745e6 996 delay-moov-elst-signal-second-frag-discont-largets
+write_data len 110, time nopts, type trailer atom -
+write_data len 1219, time nopts, type header atom ftyp
+write_data len 2572, time -333333, type sync atom sidx
+write_data len 996, time 5166667, type sync atom sidx
 write_data len 148, time nopts, type trailer atom -
-5e676152714f9478b5f74ce67cd7ed60 3647 vfr
-write_data len 1243, time nopts, type header atom ftyp
-write_data len 1552, time -333333, type sync atom sidx
-write_data len 704, time 5166667, type sync atom sidx
+f12d4a0e054abcc508cc0d28cb320e57 4935 vfr
+write_data len 1219, time nopts, type header atom ftyp
+write_data len 2572, time -333333, type sync atom sidx
+write_data len 996, time 5166667, type sync atom sidx
 write_data len 148, time nopts, type trailer atom -
-5e676152714f9478b5f74ce67cd7ed60 3647 vfr-noduration
-write_data len 1255, time nopts, type header atom ftyp
+f12d4a0e054abcc508cc0d28cb320e57 4935 vfr-noduration
+write_data len 1231, time nopts, type header atom ftyp
 write_data len 1500, time -333333, type sync atom moof
-write_data len 620, time nopts, type unknown atom -
+write_data len 1500, time nopts, type unknown atom -
+write_data len 916, time nopts, type unknown atom -
 write_data len 1500, time 9666667, type sync atom moof
-write_data len 664, time nopts, type unknown atom -
-write_data len 148, time nopts, type trailer atom -
-03766894d839e5fcb1edb88498d812f7 5687 large_frag
-write_data len 1255, time nopts, type header atom ftyp
-write_data len 508, time -33333, type sync atom moof
-write_data len 372, time 800000, type boundary atom moof
-write_data len 328, time 1266667, type boundary atom moof
-write_data len 476, time 1566667, type sync atom moof
-write_data len 340, time 2233333, type boundary atom moof
+write_data len 1500, time nopts, type unknown atom -
+write_data len 1004, time nopts, type unknown atom -
+write_data len 148, time nopts, type trailer atom -
+3c2c3f98c8a047f0ecefff07570fd457 9299 large_frag
+write_data len 1231, time nopts, type header atom ftyp
+write_data len 684, time -33333, type sync atom moof
+write_data len 504, time 800000, type boundary atom moof
+write_data len 420, time 1266667, type boundary atom moof
+write_data len 668, time 1566667, type sync atom moof
+write_data len 440, time 2233333, type boundary atom moof
 write_data len 262, time nopts, type trailer atom -
-a4280bdc23af2c4334ec2da3fa946d3a 3541 vfr-noduration-interleave
+edd19deae2b70afcf2cd744b89b7013d 4209 vfr-noduration-interleave
+write_data len 1231, time nopts, type header atom ftyp
+write_data len 916, time 0, type sync atom moof
+write_data len 908, time 1000000, type sync atom moof
+write_data len 148, time nopts, type trailer atom -
+781dbfd228f36903178e29faa727d78b 3203 delay-moov-elst-neg-cts
+write_data len 36, time nopts, type header atom ftyp
+write_data len 1123, time nopts, type header atom -
+write_data len 1188, time 0, type sync atom moof
+write_data len 908, time 1033333, type sync atom moof
+write_data len 148, time nopts, type trailer atom -
+7630fdf358e02c79e88f312f82a260b7 3403 empty-moov-neg-cts
diff --git a/tests/ref/fate/mpeg2-field-enc b/tests/ref/fate/mpeg2-field-enc
index e302536f88..4c288a83ef 100644
--- a/tests/ref/fate/mpeg2-field-enc
+++ b/tests/ref/fate/mpeg2-field-enc
@@ -1,31 +1,35 @@
-#tb 0: 1/90000
-0,      32400,      32400,        0,   622080, 0xb3b66c5c
-0,      36000,      36000,        0,   622080, 0x088ec02b
-0,      39600,      39600,        0,   622080, 0x7a36db21
-0,      43200,      43200,        0,   622080, 0x541b286f
-0,      46800,      46800,        0,   622080, 0xb6c3e590
-0,      50400,      50400,        0,   622080, 0x39dbed51
-0,      54000,      54000,        0,   622080, 0x973dc728
-0,      57600,      57600,        0,   622080, 0xd7a4f804
-0,      61200,      61200,        0,   622080, 0xa2484762
-0,      64800,      64800,        0,   622080, 0x0cd268d1
-0,      68400,      68400,        0,   622080, 0x72eb663d
-0,      72000,      72000,        0,   622080, 0x8fdbac59
-0,      75600,      75600,        0,   622080, 0xa6f4feb9
-0,      79200,      79200,        0,   622080, 0xadb828c6
-0,      82800,      82800,        0,   622080, 0xea630a63
-0,      86400,      86400,        0,   622080, 0xa901d925
-0,      90000,      90000,        0,   622080, 0xac5e7087
-0,      93600,      93600,        0,   622080, 0x10274a2b
-0,      97200,      97200,        0,   622080, 0x143d541c
-0,     100800,     100800,        0,   622080, 0xee94c93a
-0,     104400,     104400,        0,   622080, 0xca030208
-0,     108000,     108000,        0,   622080, 0x26f30ead
-0,     111600,     111600,        0,   622080, 0xfc22f32c
-0,     115200,     115200,        0,   622080, 0x940a5ff8
-0,     118800,     118800,        0,   622080, 0x2164f805
-0,     122400,     122400,        0,   622080, 0xa76f5aba
-0,     126000,     126000,        0,   622080, 0x8c311471
-0,     129600,     129600,        0,   622080, 0xa45e1d95
-0,     133200,     133200,        0,   622080, 0x6cc61d6c
-0,     136800,     136800,        0,   622080, 0x6983b417
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 16/15
+0,          9,          9,        1,   622080, 0xb3b66c5c
+0,         10,         10,        1,   622080, 0x088ec02b
+0,         11,         11,        1,   622080, 0x7a36db21
+0,         12,         12,        1,   622080, 0x541b286f
+0,         13,         13,        1,   622080, 0xb6c3e590
+0,         14,         14,        1,   622080, 0x39dbed51
+0,         15,         15,        1,   622080, 0x973dc728
+0,         16,         16,        1,   622080, 0xd7a4f804
+0,         17,         17,        1,   622080, 0xa2484762
+0,         18,         18,        1,   622080, 0x0cd268d1
+0,         19,         19,        1,   622080, 0x72eb663d
+0,         20,         20,        1,   622080, 0x8fdbac59
+0,         21,         21,        1,   622080, 0xa6f4feb9
+0,         22,         22,        1,   622080, 0xadb828c6
+0,         23,         23,        1,   622080, 0xea630a63
+0,         24,         24,        1,   622080, 0xa901d925
+0,         25,         25,        1,   622080, 0xac5e7087
+0,         26,         26,        1,   622080, 0x10274a2b
+0,         27,         27,        1,   622080, 0x143d541c
+0,         28,         28,        1,   622080, 0xee94c93a
+0,         29,         29,        1,   622080, 0xca030208
+0,         30,         30,        1,   622080, 0x26f30ead
+0,         31,         31,        1,   622080, 0xfc22f32c
+0,         32,         32,        1,   622080, 0x940a5ff8
+0,         33,         33,        1,   622080, 0x2164f805
+0,         34,         34,        1,   622080, 0xa76f5aba
+0,         35,         35,        1,   622080, 0x8c311471
+0,         36,         36,        1,   622080, 0xa45e1d95
+0,         37,         37,        1,   622080, 0x6cc61d6c
+0,         38,         38,        1,   622080, 0x6983b417
diff --git a/tests/ref/fate/mpeg2-ticket186 b/tests/ref/fate/mpeg2-ticket186
new file mode 100644
index 0000000000..b716ca5611
--- /dev/null
+++ b/tests/ref/fate/mpeg2-ticket186
@@ -0,0 +1,356 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 12/11
+0,          0,          0,        1,   152064, 0xd23ffc59
+0,          1,          1,        1,   152064, 0x899fb8b1
+0,          2,          2,        1,   152064, 0x5958d070
+0,          3,          3,        1,   152064, 0xf2becd8f
+0,          4,          4,        1,   152064, 0xb47bbed7
+0,          5,          5,        1,   152064, 0x7ca54f36
+0,          6,          6,        1,   152064, 0x02389610
+0,          7,          7,        1,   152064, 0x469f3f87
+0,          8,          8,        1,   152064, 0x935a780e
+0,          9,          9,        1,   152064, 0x3876c20c
+0,         10,         10,        1,   152064, 0x49df265f
+0,         11,         11,        1,   152064, 0xdfe420e0
+0,         12,         12,        1,   152064, 0x6e34a0c4
+0,         13,         13,        1,   152064, 0x47e1cb26
+0,         14,         14,        1,   152064, 0x68e74188
+0,         15,         15,        1,   152064, 0xe9d34b4e
+0,         16,         16,        1,   152064, 0xa8665e1a
+0,         17,         17,        1,   152064, 0x88e3b39f
+0,         18,         18,        1,   152064, 0x1c1ab2c3
+0,         19,         19,        1,   152064, 0xb1a24ddf
+0,         20,         20,        1,   152064, 0x030d5afc
+0,         21,         21,        1,   152064, 0x98306d64
+0,         22,         22,        1,   152064, 0x5ce0548d
+0,         23,         23,        1,   152064, 0xacac26f3
+0,         24,         24,        1,   152064, 0xf167f698
+0,         25,         25,        1,   152064, 0xd9398539
+0,         26,         26,        1,   152064, 0xd7aec2c4
+0,         27,         27,        1,   152064, 0xa6ef9440
+0,         28,         28,        1,   152064, 0xc289b278
+0,         29,         29,        1,   152064, 0x3796939d
+0,         30,         30,        1,   152064, 0x48c09366
+0,         31,         31,        1,   152064, 0xf4cc815a
+0,         32,         32,        1,   152064, 0x1c63cdc2
+0,         33,         33,        1,   152064, 0xd3a8ad8e
+0,         34,         34,        1,   152064, 0x70f94bc0
+0,         35,         35,        1,   152064, 0xf9c115ea
+0,         36,         36,        1,   152064, 0x44a2f607
+0,         37,         37,        1,   152064, 0x7e9eaa64
+0,         38,         38,        1,   152064, 0x37b86b68
+0,         39,         39,        1,   152064, 0x59d22dd4
+0,         40,         40,        1,   152064, 0x5d0d0e8d
+0,         41,         41,        1,   152064, 0x5c97d4a1
+0,         42,         42,        1,   152064, 0xd44ef54d
+0,         43,         43,        1,   152064, 0x42721789
+0,         44,         44,        1,   152064, 0x27597277
+0,         45,         45,        1,   152064, 0xdf4af8b4
+0,         46,         46,        1,   152064, 0x5df7390c
+0,         47,         47,        1,   152064, 0xbebfbf7c
+0,         48,         48,        1,   152064, 0x753959bb
+0,         49,         49,        1,   152064, 0x3331ab18
+0,         50,         50,        1,   152064, 0xec4a0f33
+0,         51,         51,        1,   152064, 0xbb085737
+0,         52,         52,        1,   152064, 0x3938abf4
+0,         53,         53,        1,   152064, 0x18d46683
+0,         54,         54,        1,   152064, 0xb12ace0c
+0,         55,         55,        1,   152064, 0x09b13430
+0,         56,         56,        1,   152064, 0x85bd5e88
+0,         57,         57,        1,   152064, 0xec0f8a67
+0,         58,         58,        1,   152064, 0x51a4fc74
+0,         59,         59,        1,   152064, 0xded4cda7
+0,         60,         60,        1,   152064, 0xb69412a9
+0,         61,         61,        1,   152064, 0x3c9de6f9
+0,         62,         62,        1,   152064, 0x223fcc41
+0,         63,         63,        1,   152064, 0x5df7b89c
+0,         64,         64,        1,   152064, 0x1e58b37a
+0,         65,         65,        1,   152064, 0xbbff2c09
+0,         66,         66,        1,   152064, 0x4e0f4d4a
+0,         67,         67,        1,   152064, 0x3d99caa3
+0,         68,         68,        1,   152064, 0xcc329c2f
+0,         69,         69,        1,   152064, 0x49207c0a
+0,         70,         70,        1,   152064, 0x489f2d50
+0,         71,         71,        1,   152064, 0x5a50b0df
+0,         72,         72,        1,   152064, 0x509eb79e
+0,         73,         73,        1,   152064, 0x60622c61
+0,         74,         74,        1,   152064, 0x8c8cde9f
+0,         75,         75,        1,   152064, 0xe8c0bb6c
+0,         76,         76,        1,   152064, 0xb03581b6
+0,         77,         77,        1,   152064, 0x398525c2
+0,         78,         78,        1,   152064, 0x87983ab0
+0,         79,         79,        1,   152064, 0x032af6b5
+0,         80,         80,        1,   152064, 0x7434baa4
+0,         81,         81,        1,   152064, 0xff5dd044
+0,         82,         82,        1,   152064, 0x45b2bb36
+0,         83,         83,        1,   152064, 0x1af29008
+0,         84,         84,        1,   152064, 0x07aa8975
+0,         85,         85,        1,   152064, 0x17957756
+0,         86,         86,        1,   152064, 0x48b5825e
+0,         87,         87,        1,   152064, 0x169d70bc
+0,         88,         88,        1,   152064, 0x803b30c6
+0,         89,         89,        1,   152064, 0x6158c971
+0,         90,         90,        1,   152064, 0xb126e53e
+0,         91,         91,        1,   152064, 0xef49ba53
+0,         92,         92,        1,   152064, 0xfcfd7f17
+0,         93,         93,        1,   152064, 0x5280779e
+0,         94,         94,        1,   152064, 0x638d6f48
+0,         95,         95,        1,   152064, 0xdb0f1ed5
+0,         96,         96,        1,   152064, 0x2cb959b0
+0,         97,         97,        1,   152064, 0x0841547c
+0,         98,         98,        1,   152064, 0x412a555b
+0,         99,         99,        1,   152064, 0xfe525057
+0,        100,        100,        1,   152064, 0xa8cf0cbc
+0,        101,        101,        1,   152064, 0xbf2dcaee
+0,        102,        102,        1,   152064, 0x636cc494
+0,        103,        103,        1,   152064, 0xc9e288bc
+0,        104,        104,        1,   152064, 0xe77f4d03
+0,        105,        105,        1,   152064, 0x722a4bd0
+0,        106,        106,        1,   152064, 0x5271f5ef
+0,        107,        107,        1,   152064, 0x05208e75
+0,        108,        108,        1,   152064, 0xb8845f88
+0,        109,        109,        1,   152064, 0x47aa117c
+0,        110,        110,        1,   152064, 0xe695fe27
+0,        111,        111,        1,   152064, 0x2e50f864
+0,        112,        112,        1,   152064, 0x52d2b719
+0,        113,        113,        1,   152064, 0xdbf48285
+0,        114,        114,        1,   152064, 0xe0b2ba93
+0,        115,        115,        1,   152064, 0x1c85a5ce
+0,        116,        116,        1,   152064, 0x8ef9a8e8
+0,        117,        117,        1,   152064, 0x41e8ae26
+0,        118,        118,        1,   152064, 0x3328d571
+0,        119,        119,        1,   152064, 0xce7d4da2
+0,        120,        120,        1,   152064, 0x7a6f7416
+0,        121,        121,        1,   152064, 0xb3fc65a6
+0,        122,        122,        1,   152064, 0xc5a261e9
+0,        123,        123,        1,   152064, 0x943c5925
+0,        124,        124,        1,   152064, 0x259180b2
+0,        125,        125,        1,   152064, 0x3acd4e1b
+0,        126,        126,        1,   152064, 0x692090b4
+0,        127,        127,        1,   152064, 0xea1184d0
+0,        128,        128,        1,   152064, 0x3e0038d5
+0,        129,        129,        1,   152064, 0xf77872a2
+0,        130,        130,        1,   152064, 0xe4cb7bb5
+0,        131,        131,        1,   152064, 0x9d6d2623
+0,        132,        132,        1,   152064, 0xb9056247
+0,        133,        133,        1,   152064, 0xcd8b3dc5
+0,        134,        134,        1,   152064, 0x13ea1b6d
+0,        135,        135,        1,   152064, 0x764f3233
+0,        136,        136,        1,   152064, 0x54c00ba8
+0,        137,        137,        1,   152064, 0x2d9aedac
+0,        138,        138,        1,   152064, 0x1af00532
+0,        139,        139,        1,   152064, 0xcecae31b
+0,        140,        140,        1,   152064, 0x0e6ea17f
+0,        141,        141,        1,   152064, 0x66b0b8c4
+0,        142,        142,        1,   152064, 0x0ee879bb
+0,        143,        143,        1,   152064, 0xf7f029cc
+0,        144,        144,        1,   152064, 0xdd5d08d6
+0,        145,        145,        1,   152064, 0x936ae367
+0,        146,        146,        1,   152064, 0xf0f4aba0
+0,        147,        147,        1,   152064, 0x5233a9e7
+0,        148,        148,        1,   152064, 0x02af732b
+0,        149,        149,        1,   152064, 0xb2eb2476
+0,        150,        150,        1,   152064, 0x998732b4
+0,        151,        151,        1,   152064, 0xf025230f
+0,        152,        152,        1,   152064, 0x474f3b12
+0,        153,        153,        1,   152064, 0xe4e950e2
+0,        154,        154,        1,   152064, 0xa3f87fb3
+0,        155,        155,        1,   152064, 0x1e465fda
+0,        156,        156,        1,   152064, 0x9e8caab2
+0,        157,        157,        1,   152064, 0x0224aca7
+0,        158,        158,        1,   152064, 0x24fcec49
+0,        159,        159,        1,   152064, 0x1c1df7ea
+0,        160,        160,        1,   152064, 0xc466f68f
+0,        161,        161,        1,   152064, 0xdb11d8fa
+0,        162,        162,        1,   152064, 0xa0f61157
+0,        163,        163,        1,   152064, 0x352013b0
+0,        164,        164,        1,   152064, 0xc14243c7
+0,        165,        165,        1,   152064, 0xb18b6810
+0,        166,        166,        1,   152064, 0x040942e6
+0,        167,        167,        1,   152064, 0x6fe129f9
+0,        168,        168,        1,   152064, 0xc3d64c5f
+0,        169,        169,        1,   152064, 0x50954752
+0,        170,        170,        1,   152064, 0xa4d24c64
+0,        171,        171,        1,   152064, 0x3af254c0
+0,        172,        172,        1,   152064, 0x6fde4801
+0,        173,        173,        1,   152064, 0xf8fe19b4
+0,        174,        174,        1,   152064, 0x97b34958
+0,        175,        175,        1,   152064, 0x916e2ff4
+0,        176,        176,        1,   152064, 0x60c528e2
+0,        177,        177,        1,   152064, 0x4522435e
+0,        178,        178,        1,   152064, 0x861f5d1b
+0,        179,        179,        1,   152064, 0x42c3bf28
+0,        180,        180,        1,   152064, 0x9772db11
+0,        181,        181,        1,   152064, 0x0692f5b8
+0,        182,        182,        1,   152064, 0xb06b4aed
+0,        183,        183,        1,   152064, 0xdc852986
+0,        184,        184,        1,   152064, 0xa7a025fb
+0,        185,        185,        1,   152064, 0xe28f365a
+0,        186,        186,        1,   152064, 0xcbf3830e
+0,        187,        187,        1,   152064, 0x043bace9
+0,        188,        188,        1,   152064, 0x5dd0b5df
+0,        189,        189,        1,   152064, 0x6bd6d112
+0,        190,        190,        1,   152064, 0xa585ceb6
+0,        191,        191,        1,   152064, 0x91e7556a
+0,        192,        192,        1,   152064, 0x8f2a0404
+0,        193,        193,        1,   152064, 0x14066893
+0,        194,        194,        1,   152064, 0x8f715862
+0,        195,        195,        1,   152064, 0xb1063958
+0,        196,        196,        1,   152064, 0x014c40f0
+0,        197,        197,        1,   152064, 0x7ddcf94d
+0,        198,        198,        1,   152064, 0x25473a22
+0,        199,        199,        1,   152064, 0xcd150536
+0,        200,        200,        1,   152064, 0x2d24d974
+0,        201,        201,        1,   152064, 0x9130b2ce
+0,        202,        202,        1,   152064, 0x9450a62a
+0,        203,        203,        1,   152064, 0x7da258cd
+0,        204,        204,        1,   152064, 0x6c2770de
+0,        205,        205,        1,   152064, 0xd5fa731a
+0,        206,        206,        1,   152064, 0x93757c14
+0,        207,        207,        1,   152064, 0x4b754c71
+0,        208,        208,        1,   152064, 0x51544841
+0,        209,        209,        1,   152064, 0xf466910e
+0,        210,        210,        1,   152064, 0xe818c675
+0,        211,        211,        1,   152064, 0x6d45b6d8
+0,        212,        212,        1,   152064, 0xa3de9aec
+0,        213,        213,        1,   152064, 0x56023275
+0,        214,        214,        1,   152064, 0xa1af21cb
+0,        215,        215,        1,   152064, 0x1ff1b05e
+0,        216,        216,        1,   152064, 0x142ecbdb
+0,        217,        217,        1,   152064, 0xdfc6d541
+0,        218,        218,        1,   152064, 0x8d8f7a4c
+0,        219,        219,        1,   152064, 0x03d611ca
+0,        220,        220,        1,   152064, 0x999e6d3f
+0,        221,        221,        1,   152064, 0x304c95df
+0,        222,        222,        1,   152064, 0xbdcff306
+0,        223,        223,        1,   152064, 0x6408670c
+0,        224,        224,        1,   152064, 0xa6d4d038
+0,        225,        225,        1,   152064, 0xf2d13572
+0,        226,        226,        1,   152064, 0x2fa8b357
+0,        227,        227,        1,   152064, 0x24bbd269
+0,        228,        228,        1,   152064, 0x23dd31f2
+0,        229,        229,        1,   152064, 0x90913fe2
+0,        230,        230,        1,   152064, 0x855efbca
+0,        231,        231,        1,   152064, 0x45a123c0
+0,        232,        232,        1,   152064, 0xec465cb2
+0,        233,        233,        1,   152064, 0x3e79c4e9
+0,        234,        234,        1,   152064, 0xaeac4476
+0,        235,        235,        1,   152064, 0x2146392c
+0,        236,        236,        1,   152064, 0x7a186239
+0,        237,        237,        1,   152064, 0x9d26fed8
+0,        238,        238,        1,   152064, 0x88f090ba
+0,        239,        239,        1,   152064, 0x518bd9f8
+0,        240,        240,        1,   152064, 0x70013bdd
+0,        241,        241,        1,   152064, 0x5317601a
+0,        242,        242,        1,   152064, 0x97e91795
+0,        243,        243,        1,   152064, 0x1058915b
+0,        244,        244,        1,   152064, 0x3549ffeb
+0,        245,        245,        1,   152064, 0xa277707d
+0,        246,        246,        1,   152064, 0xdcb6287d
+0,        247,        247,        1,   152064, 0x371344fc
+0,        248,        248,        1,   152064, 0xb7ea75c7
+0,        249,        249,        1,   152064, 0x70c2fa2f
+0,        250,        250,        1,   152064, 0x8dbec050
+0,        251,        251,        1,   152064, 0xc21a77fe
+0,        252,        252,        1,   152064, 0xf7c7678e
+0,        253,        253,        1,   152064, 0xbee83fcb
+0,        254,        254,        1,   152064, 0x6627efd7
+0,        255,        255,        1,   152064, 0x4f139865
+0,        256,        256,        1,   152064, 0x76fa5435
+0,        257,        257,        1,   152064, 0xf0701fd6
+0,        258,        258,        1,   152064, 0x153e3763
+0,        259,        259,        1,   152064, 0xf5211469
+0,        260,        260,        1,   152064, 0xc19d24b8
+0,        261,        261,        1,   152064, 0xc2483a75
+0,        262,        262,        1,   152064, 0x67a149ee
+0,        263,        263,        1,   152064, 0x86f70e3a
+0,        264,        264,        1,   152064, 0x281b166b
+0,        265,        265,        1,   152064, 0xca810f3b
+0,        266,        266,        1,   152064, 0x91c90741
+0,        267,        267,        1,   152064, 0x4edcfbfa
+0,        268,        268,        1,   152064, 0x0ca40c66
+0,        269,        269,        1,   152064, 0xee998e3d
+0,        270,        270,        1,   152064, 0xe4b6c1b2
+0,        271,        271,        1,   152064, 0xbbe0a4cc
+0,        272,        272,        1,   152064, 0xd080bcfd
+0,        273,        273,        1,   152064, 0x365df7c5
+0,        274,        274,        1,   152064, 0x934f071f
+0,        275,        275,        1,   152064, 0xcfaefeef
+0,        276,        276,        1,   152064, 0xedd8263e
+0,        277,        277,        1,   152064, 0x1d5243de
+0,        278,        278,        1,   152064, 0xc0d87e50
+0,        279,        279,        1,   152064, 0xe25845b1
+0,        280,        280,        1,   152064, 0x47006123
+0,        281,        281,        1,   152064, 0xf1926203
+0,        282,        282,        1,   152064, 0x494b8b9c
+0,        283,        283,        1,   152064, 0xc50aa1b7
+0,        284,        284,        1,   152064, 0xb82da5e2
+0,        285,        285,        1,   152064, 0xa11cd0f6
+0,        286,        286,        1,   152064, 0x7ebff98d
+0,        287,        287,        1,   152064, 0x00902e76
+0,        288,        288,        1,   152064, 0xdee41ea2
+0,        289,        289,        1,   152064, 0x2b026058
+0,        290,        290,        1,   152064, 0xce81051f
+0,        291,        291,        1,   152064, 0x0d708815
+0,        292,        292,        1,   152064, 0xd7719e35
+0,        293,        293,        1,   152064, 0xf0239467
+0,        294,        294,        1,   152064, 0x466d98b4
+0,        295,        295,        1,   152064, 0xc1fb36e1
+0,        296,        296,        1,   152064, 0x26bc139e
+0,        297,        297,        1,   152064, 0x7fd111ea
+0,        298,        298,        1,   152064, 0xa39737cb
+0,        299,        299,        1,   152064, 0x8f5851ba
+0,        300,        300,        1,   152064, 0xa971f6e2
+0,        301,        301,        1,   152064, 0x0e5f6f80
+0,        302,        302,        1,   152064, 0xdb8b5e06
+0,        303,        303,        1,   152064, 0xf6006bcc
+0,        304,        304,        1,   152064, 0x060cd1a6
+0,        305,        305,        1,   152064, 0x419ef0a4
+0,        306,        306,        1,   152064, 0xe79f0b93
+0,        307,        307,        1,   152064, 0x1919e999
+0,        308,        308,        1,   152064, 0xacb715bc
+0,        309,        309,        1,   152064, 0x16616075
+0,        310,        310,        1,   152064, 0x09aa4f10
+0,        311,        311,        1,   152064, 0x976cdd70
+0,        312,        312,        1,   152064, 0x4811dc21
+0,        313,        313,        1,   152064, 0x30d31172
+0,        314,        314,        1,   152064, 0x2db60b70
+0,        315,        315,        1,   152064, 0x5377bb89
+0,        316,        316,        1,   152064, 0x6c20cab3
+0,        317,        317,        1,   152064, 0x964dad60
+0,        318,        318,        1,   152064, 0x514df2c3
+0,        319,        319,        1,   152064, 0xced22332
+0,        320,        320,        1,   152064, 0x1c64bc82
+0,        321,        321,        1,   152064, 0x10c38662
+0,        322,        322,        1,   152064, 0xe6c7ff46
+0,        323,        323,        1,   152064, 0x359da948
+0,        324,        324,        1,   152064, 0x5a9458ee
+0,        325,        325,        1,   152064, 0x1cda9888
+0,        326,        326,        1,   152064, 0xbd081682
+0,        327,        327,        1,   152064, 0x20f1510f
+0,        328,        328,        1,   152064, 0x6bc261a9
+0,        329,        329,        1,   152064, 0x9f0e5797
+0,        330,        330,        1,   152064, 0xd14ca712
+0,        331,        331,        1,   152064, 0x8df79054
+0,        332,        332,        1,   152064, 0x34efa950
+0,        333,        333,        1,   152064, 0x268d9d12
+0,        334,        334,        1,   152064, 0xad91b2ed
+0,        335,        335,        1,   152064, 0xe0ac87cf
+0,        336,        336,        1,   152064, 0xba4cfd8e
+0,        337,        337,        1,   152064, 0x876ef9e3
+0,        338,        338,        1,   152064, 0x45ab6684
+0,        339,        339,        1,   152064, 0x72a99564
+0,        340,        340,        1,   152064, 0xdfc8be01
+0,        341,        341,        1,   152064, 0x3a6b9e74
+0,        342,        342,        1,   152064, 0xca1be9c6
+0,        343,        343,        1,   152064, 0xc351bfc6
+0,        344,        344,        1,   152064, 0xef30c978
+0,        345,        345,        1,   152064, 0x062fc6f3
+0,        346,        346,        1,   152064, 0x8731a9ec
+0,        347,        347,        1,   152064, 0x19874144
+0,        348,        348,        1,   152064, 0x929650eb
+0,        349,        349,        1,   152064, 0x082557a1
+0,        350,        350,        1,   152064, 0xb80510ae
diff --git a/tests/ref/fate/mpeg2-ticket6024 b/tests/ref/fate/mpeg2-ticket6024
new file mode 100644
index 0000000000..bd416240f3
--- /dev/null
+++ b/tests/ref/fate/mpeg2-ticket6024
@@ -0,0 +1,27 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 716x236
+#sar 0: 1/1
+0,          2,          2,        1,   253464, 0xc51a46f9
+0,          4,          4,        1,   253464, 0xd0661651
+0,          5,          5,        1,   253464, 0x38a213b3
+0,          6,          6,        1,   253464, 0x038a5118
+0,          7,          7,        1,   253464, 0xebd8de64
+0,          8,          8,        1,   253464, 0x0b319ee0
+0,          9,          9,        1,   253464, 0x37b03a45
+0,         10,         10,        1,   253464, 0x5f9c89ae
+0,         11,         11,        1,   253464, 0x88ad9c08
+0,         12,         12,        1,   253464, 0x387198bc
+0,         13,         13,        1,   253464, 0xf3933eb6
+0,         14,         14,        1,   253464, 0x9bd27b98
+0,         15,         15,        1,   253464, 0x9442c538
+0,         16,         16,        1,   253464, 0x330be2a4
+0,         17,         17,        1,   253464, 0xb4b8c1df
+0,         18,         18,        1,   253464, 0xc97ded34
+0,         19,         19,        1,   253464, 0xcad936e0
+0,         20,         20,        1,   253464, 0x11a2850d
+0,         21,         21,        1,   253464, 0x2545ad23
+0,         22,         22,        1,   253464, 0xa5e17c47
+0,         23,         23,        1,   253464, 0x39452689
+0,         24,         24,        1,   253464, 0x1daefd72
diff --git a/tests/ref/fate/mpeg2-ticket6677 b/tests/ref/fate/mpeg2-ticket6677
new file mode 100644
index 0000000000..5fc7cb2a26
--- /dev/null
+++ b/tests/ref/fate/mpeg2-ticket6677
@@ -0,0 +1,12 @@
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 8/9
+0,          0,          0,        1,   518400, 0x354b6fc3
+0,          1,          1,        1,   518400, 0xd86f281b
+0,          2,          2,        1,   518400, 0xdd2e2b38
+0,          3,          3,        1,   518400, 0x589535d4
+0,          4,          4,        1,   518400, 0x3f8f02b6
+0,          5,          5,        1,   518400, 0xa81b246a
+0,          6,          6,        1,   518400, 0xb98dd9f7
diff --git a/tests/ref/fate/mpeg4-bsf-unpack-bframes b/tests/ref/fate/mpeg4-bsf-unpack-bframes
new file mode 100644
index 0000000000..703ae3a8e8
--- /dev/null
+++ b/tests/ref/fate/mpeg4-bsf-unpack-bframes
@@ -0,0 +1 @@
+a0c4ba21ab9d68966b8fce7cc848e2c6
diff --git a/tests/ref/fate/mpeg4-packed b/tests/ref/fate/mpeg4-packed
new file mode 100644
index 0000000000..4336da0001
--- /dev/null
+++ b/tests/ref/fate/mpeg4-packed
@@ -0,0 +1,21 @@
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 544x352
+#sar 0: 1/1
+0,          0,          0,        1,   287232, 0x17288ed1
+0,          1,          1,        1,   287232, 0x17288ed1
+0,          2,          2,        1,   287232, 0x232dfda4
+0,          3,          3,        1,   287232, 0x1e880ed6
+0,          4,          4,        1,   287232, 0x60197d73
+0,          5,          5,        1,   287232, 0xe27a4c05
+0,          6,          6,        1,   287232, 0xa588b659
+0,          7,          7,        1,   287232, 0xaa111895
+0,          8,          8,        1,   287232, 0x39ad64c0
+0,          9,          9,        1,   287232, 0x2a046b62
+0,         10,         10,        1,   287232, 0x733dea31
+0,         11,         11,        1,   287232, 0x06e38bfc
+0,         12,         12,        1,   287232, 0xcc1d2de4
+0,         13,         13,        1,   287232, 0x207a0a62
+0,         14,         14,        1,   287232, 0x9ee6289f
+0,         15,         15,        1,   287232, 0x60dedf92
diff --git a/tests/ref/fate/mpeg4-resolution-change-down-down b/tests/ref/fate/mpeg4-resolution-change-down-down
index 137575ac64..df53794965 100644
--- a/tests/ref/fate/mpeg4-resolution-change-down-down
+++ b/tests/ref/fate/mpeg4-resolution-change-down-down
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,   460800, d65fcc79c7eb9ebd9d88dca3ebb15bf4
 0,          1,          1,        1,   460800, 6c86b8c7e8eae3d63b21342f233fb44e
 0,          2,          2,        1,   460800, 7fea65fd8ee4d3fcec722f721d05ef45
diff --git a/tests/ref/fate/mpeg4-resolution-change-down-up b/tests/ref/fate/mpeg4-resolution-change-down-up
index 31332c31fd..5236115c6a 100644
--- a/tests/ref/fate/mpeg4-resolution-change-down-up
+++ b/tests/ref/fate/mpeg4-resolution-change-down-up
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,   460800, d65fcc79c7eb9ebd9d88dca3ebb15bf4
 0,          1,          1,        1,   460800, 6c86b8c7e8eae3d63b21342f233fb44e
 0,          2,          2,        1,   460800, 7fea65fd8ee4d3fcec722f721d05ef45
diff --git a/tests/ref/fate/mpeg4-resolution-change-up-down b/tests/ref/fate/mpeg4-resolution-change-up-down
index 81911f7592..0930cb7a1a 100644
--- a/tests/ref/fate/mpeg4-resolution-change-up-down
+++ b/tests/ref/fate/mpeg4-resolution-change-up-down
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 400x300
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,   180000, 9fc6302026cf2a2dd310646b83c5dfa1
 0,          1,          1,        1,   180000, b1b2646c8df579ddf8676bc2488411a5
 0,          2,          2,        1,   180000, 5aca8cdf4914a96577cffbbc18508043
diff --git a/tests/ref/fate/mpeg4-resolution-change-up-up b/tests/ref/fate/mpeg4-resolution-change-up-up
index 9aac9c8900..ba812b6a79 100644
--- a/tests/ref/fate/mpeg4-resolution-change-up-up
+++ b/tests/ref/fate/mpeg4-resolution-change-up-up
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,   152064, 7f952fd8bd40c32197afc21e2fa66404
 0,          1,          1,        1,   152064, 5b2cc25b04d9a9d33bcf5fe480505d68
 0,          2,          2,        1,   152064, 56d6bb0022f68fbccae81ef054a88c9a
diff --git a/tests/ref/fate/mpegts-probe-latm b/tests/ref/fate/mpegts-probe-latm
new file mode 100644
index 0000000000..13aea2bcfd
--- /dev/null
+++ b/tests/ref/fate/mpegts-probe-latm
@@ -0,0 +1,14 @@
+[PROGRAM]
+[STREAM]
+codec_name=hevc
+[/STREAM]
+[STREAM]
+codec_name=aac_latm
+[/STREAM]
+[/PROGRAM]
+[STREAM]
+codec_name=hevc
+[/STREAM]
+[STREAM]
+codec_name=aac_latm
+[/STREAM]
diff --git a/tests/ref/fate/msmpeg4v1 b/tests/ref/fate/msmpeg4v1
index d67a0efa17..946ede95c3 100644
--- a/tests/ref/fate/msmpeg4v1
+++ b/tests/ref/fate/msmpeg4v1
@@ -1,4 +1,8 @@
 #tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x240
+#sar 0: 0/1
 0,          0,          0,        1,   126720, 0x84284323
 0,          1,          1,        1,   126720, 0x336fe236
 0,          2,          2,        1,   126720, 0x901f1299
diff --git a/tests/ref/fate/msrle-8bit b/tests/ref/fate/msrle-8bit
index 5db1c244fa..202b3f05cc 100644
--- a/tests/ref/fate/msrle-8bit
+++ b/tests/ref/fate/msrle-8bit
@@ -1,4 +1,8 @@
 #tb 0: 83333/500000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 80x48
+#sar 0: 0/1
 0,          0,          0,        1,    11520, 0xaf416a66
 0,          1,          1,        1,    11520, 0x8ab76654
 0,          2,          2,        1,    11520, 0xd22880c4
diff --git a/tests/ref/fate/mss1 b/tests/ref/fate/mss1
deleted file mode 100644
index bb1f37cdf3..0000000000
--- a/tests/ref/fate/mss1
+++ /dev/null
@@ -1,137 +0,0 @@
-#tb 0: 1/1000
-0,        291,        291,        0,  2359296, 0x38a6293f
-0,        851,        851,        0,  2359296, 0x307ed2e0
-0,       1416,       1416,        0,  2359296, 0x8947e5d5
-0,       1961,       1961,        0,  2359296, 0xb5e92959
-0,       2346,       2346,        0,  2359296, 0x674a2218
-0,       2884,       2884,        0,  2359296, 0x83382cd6
-0,       3414,       3414,        0,  2359296, 0x5d5502ee
-0,       3942,       3942,        0,  2359296, 0x031fa84e
-0,       4464,       4464,        0,  2359296, 0x10ff2a13
-0,       4992,       4992,        0,  2359296, 0x2b203e2f
-0,       5536,       5536,        0,  2359296, 0x6b4d8a08
-0,       6064,       6064,        0,  2359296, 0x839a632f
-0,       6599,       6599,        0,  2359296, 0x5d0b70e1
-0,       7128,       7128,        0,  2359296, 0xcb0cec73
-0,       7659,       7659,        0,  2359296, 0x23951182
-0,       8736,       8736,        0,  2359296, 0x63cf93cd
-0,       9278,       9278,        0,  2359296, 0x6f0a93cd
-0,      10354,      10354,        0,  2359296, 0x360adb85
-0,      10883,      10883,        0,  2359296, 0x6f0a93cd
-0,      11420,      11420,        0,  2359296, 0x2472fe54
-0,      12483,      12483,        0,  2359296, 0x5f2890a6
-0,      13016,      13016,        0,  2359296, 0x2f67d126
-0,      13540,      13540,        0,  2359296, 0x2a56896e
-0,      14071,      14071,        0,  2359296, 0x3f148647
-0,      14593,      14593,        0,  2359296, 0xaee8923b
-0,      15093,      15093,        0,  2359296, 0xa964923b
-0,      15594,      15594,        0,  2359296, 0xa1cb8647
-0,      16628,      16628,        0,  2359296, 0xdce78647
-0,      17128,      17128,        0,  2359296, 0x07d4923b
-0,      17635,      17635,        0,  2359296, 0xbb368647
-0,      18687,      18687,        0,  2359296, 0xd18cf0ce
-0,      19208,      19208,        0,  2359296, 0xb821f0ce
-0,      19757,      19757,        0,  2359296, 0xb52cf0ce
-0,      20731,      20731,        0,  2359296, 0x7a10f0ce
-0,      21737,      21737,        0,  2359296, 0x556af0ce
-0,      22259,      22259,        0,  2359296, 0x8d513895
-0,      22815,      22815,        0,  2359296, 0x8c3508c5
-0,      23887,      23887,        0,  2359296, 0xb33808c5
-0,      24392,      24392,        0,  2359296, 0x8d513895
-0,      25478,      25478,        0,  2359296, 0xb33808c5
-0,      26028,      26028,        0,  2359296, 0x8d513895
-0,      28119,      28119,        0,  2359296, 0xb33808c5
-0,      28658,      28658,        0,  2359296, 0x8d513895
-0,      29187,      29187,        0,  2359296, 0xb33808c5
-0,      29720,      29720,        0,  2359296, 0x8d513895
-0,      30235,      30235,        0,  2359296, 0xb33808c5
-0,      30768,      30768,        0,  2359296, 0x8d513895
-0,      31292,      31292,        0,  2359296, 0x540d5a57
-0,      32360,      32360,        0,  2359296, 0xb7e3bee4
-0,      32888,      32888,        0,  2359296, 0xe10206ab
-0,      33887,      33887,        0,  2359296, 0x38716431
-0,      34389,      34389,        0,  2359296, 0xc15bb1e3
-0,      35417,      35417,        0,  2359296, 0xf97f167f
-0,      36418,      36418,        0,  2359296, 0x98e55e37
-0,      36946,      36946,        0,  2359296, 0x5f875136
-0,      37472,      37472,        0,  2359296, 0xfa1d3e3b
-0,      38540,      38540,        0,  2359296, 0xdbb785f3
-0,      39079,      39079,        0,  2359296, 0xfa1d3e3b
-0,      39607,      39607,        0,  2359296, 0xfa650277
-0,      40678,      40678,        0,  2359296, 0x22671f4c
-0,      41212,      41212,        0,  2359296, 0x22671f4c
-0,      41736,      41736,        0,  2359296, 0x67463924
-0,      42286,      42286,        0,  2359296, 0x53fb2b16
-0,      42819,      42819,        0,  2359296, 0xe28a1221
-0,      43846,      43846,        0,  2359296, 0xac6df810
-0,      44357,      44357,        0,  2359296, 0xd8a4bc4c
-0,      44867,      44867,        0,  2359296, 0xe3dfbc4c
-0,      45399,      45399,        0,  2359296, 0xe6eef5f6
-0,      45920,      45920,        0,  2359296, 0x635c0bd3
-0,      47003,      47003,        0,  2359296, 0x18a3538b
-0,      47536,      47536,        0,  2359296, 0xbab6e6db
-0,      48063,      48063,        0,  2359296, 0x83379929
-0,      49128,      49128,        0,  2359296, 0x85ede0e1
-0,      49646,      49646,        0,  2359296, 0x83379929
-0,      50200,      50200,        0,  2359296, 0x85ede0e1
-0,      51221,      51221,        0,  2359296, 0x85ede0e1
-0,      51737,      51737,        0,  2359296, 0xf9dab111
-0,      52836,      52836,        0,  2359296, 0x85ede0e1
-0,      53362,      53362,        0,  2359296, 0xf9dab111
-0,      53851,      53851,        0,  2359296, 0x85ede0e1
-0,      54826,      54826,        0,  2359296, 0xf9dab111
-0,      55870,      55870,        0,  2359296, 0x85ede0e1
-0,      58473,      58473,        0,  2359296, 0xf9dab111
-0,      58978,      58978,        0,  2359296, 0x85ede0e1
-0,      59461,      59461,        0,  2359296, 0xf9dab111
-0,      60369,      60369,        0,  2359296, 0x85ede0e1
-0,      61237,      61237,        0,  2359296, 0x12d62c88
-0,      62303,      62303,        0,  2359296, 0x9686dec7
-0,      63378,      63378,        0,  2359296, 0x34f15741
-0,      63884,      63884,        0,  2359296, 0x8e85fc7f
-0,      64409,      64409,        0,  2359296, 0x3328a7c6
-0,      64940,      64940,        0,  2359296, 0x6ba6ef7e
-0,      66011,      66011,        0,  2359296, 0x97dfd362
-0,      67096,      67096,        0,  2359296, 0x9a09da3f
-0,      67629,      67629,        0,  2359296, 0xa6b19f5e
-0,      68694,      68694,        0,  2359296, 0x3d8003fa
-0,      69732,      69732,        0,  2359296, 0xa006925d
-0,      70230,      70230,        0,  2359296, 0xb9a8f6ea
-0,      71170,      71170,        0,  2359296, 0x0884f7cd
-0,      71665,      71665,        0,  2359296, 0x13bff7cd
-0,      72198,      72198,        0,  2359296, 0x26c2c013
-0,      73838,      73838,        0,  2359296, 0x30e9e43d
-0,      74830,      74830,        0,  2359296, 0x3bc348d9
-0,      75371,      75371,        0,  2359296, 0x30e9e43d
-0,      75886,      75886,        0,  2359296, 0x3097fb18
-0,      76433,      76433,        0,  2359296, 0x20f1ad66
-0,      76962,      76962,        0,  2359296, 0xd668ad66
-0,      77492,      77492,        0,  2359296, 0xea0db95a
-0,      78021,      78021,        0,  2359296, 0xf6ebad66
-0,      78565,      78565,        0,  2359296, 0x95fbad66
-0,      79099,      79099,        0,  2359296, 0x1479b95a
-0,      79635,      79635,        0,  2359296, 0x4046ad66
-0,      80150,      80150,        0,  2359296, 0xf7a6b95a
-0,      80684,      80684,        0,  2359296, 0xdf47ad66
-0,      81662,      81662,        0,  2359296, 0x60c9ad66
-0,      82153,      82153,        0,  2359296, 0x60c9ad66
-0,      82695,      82695,        0,  2359296, 0x3d75b95a
-0,      83243,      83243,        0,  2359296, 0x0b14ad66
-0,      84322,      84322,        0,  2359296, 0x23b9968b
-0,      84828,      84828,        0,  2359296, 0x76d87fb0
-0,      85908,      85908,        0,  2359296, 0xe5c6c65b
-0,      86456,      86456,        0,  2359296, 0x26fdd24f
-0,      86957,      86957,        0,  2359296, 0x6f8ec65b
-0,      87483,      87483,        0,  2359296, 0xc543c65b
-0,      88525,      88525,        0,  2359296, 0x0fccc65b
-0,      89022,      89022,        0,  2359296, 0xfdf2d24f
-0,      89546,      89546,        0,  2359296, 0x1c35c65b
-0,      90080,      90080,        0,  2359296, 0x71eac65b
-0,      90611,      90611,        0,  2359296, 0xa5eec65b
-0,      91155,      91155,        0,  2359296, 0xf068c65b
-0,      91686,      91686,        0,  2359296, 0xb9310e22
-0,      92183,      92183,        0,  2359296, 0x5430de43
-0,      92739,      92739,        0,  2359296, 0x7b33de43
-0,      93815,      93815,        0,  2359296, 0xb9310e22
-0,      94351,      94351,        0,  2359296, 0x5fc1bd64
-0,      94875,      94875,        0,  2359296, 0x5185052b
diff --git a/tests/ref/fate/mss1-pal b/tests/ref/fate/mss1-pal
new file mode 100644
index 0000000000..9baffb46a9
--- /dev/null
+++ b/tests/ref/fate/mss1-pal
@@ -0,0 +1,25 @@
+#tb 0: 12/23
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1024x768
+#sar 0: 0/1
+0,          1,          1,        1,   787456, 0x9369daec
+0,          2,          2,        1,   787456, 0x1c61a5b8
+0,          3,          3,        1,   787456, 0xb9c3af1f
+0,          4,          4,        1,   787456, 0xc078bec7
+0,          5,          5,        1,   787456, 0x31aece7b
+0,          6,          6,        1,   787456, 0x060a869e
+0,          7,          7,        1,   787456, 0x12bea936
+0,          8,          8,        1,   787456, 0xb493af19
+0,          9,          9,        1,   787456, 0xc8f4b0cc
+0,         10,         10,        1,   787456, 0x21e4aad0
+0,         11,         11,        1,   787456, 0xee84b8a0
+0,         12,         12,        1,   787456, 0xcec7b254
+0,         13,         13,        1,   787456, 0x90b98f22
+0,         14,         14,        1,   787456, 0x113ae355
+0,         15,         15,        1,   787456, 0xbe1dead9
+0,         17,         17,        1,   787456, 0x81167b2e
+0,         18,         18,        1,   787456, 0xc6d67b2e
+0,         20,         20,        1,   787456, 0xe14686ce
+0,         21,         21,        1,   787456, 0xc6d67b2e
+0,         22,         22,        1,   787456, 0x3ef162f6
diff --git a/tests/ref/fate/mss2-pal b/tests/ref/fate/mss2-pal
index ae8bd6fc39..a2fb12fdfc 100644
--- a/tests/ref/fate/mss2-pal
+++ b/tests/ref/fate/mss2-pal
@@ -1,3 +1,7 @@
 #tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x48
+#sar 0: 0/1
 0,          0,          0,        0,     9216, 0xd3c106ef
 0,        100,        100,        0,     9216, 0x8871f7c2
diff --git a/tests/ref/fate/mss2-pals b/tests/ref/fate/mss2-pals
index ae8bd6fc39..a2fb12fdfc 100644
--- a/tests/ref/fate/mss2-pals
+++ b/tests/ref/fate/mss2-pals
@@ -1,3 +1,7 @@
 #tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x48
+#sar 0: 0/1
 0,          0,          0,        0,     9216, 0xd3c106ef
 0,        100,        100,        0,     9216, 0x8871f7c2
diff --git a/tests/ref/fate/mss2-rgb555 b/tests/ref/fate/mss2-rgb555
index d15b3b4e6d..10f1f03e7f 100644
--- a/tests/ref/fate/mss2-rgb555
+++ b/tests/ref/fate/mss2-rgb555
@@ -1,3 +1,7 @@
 #tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x48
+#sar 0: 0/1
 0,          0,          0,        0,     6144, 0x4145b7ae
 0,        100,        100,        0,     6144, 0x3b2b38de
diff --git a/tests/ref/fate/mss2-rgb555s b/tests/ref/fate/mss2-rgb555s
index d15b3b4e6d..10f1f03e7f 100644
--- a/tests/ref/fate/mss2-rgb555s
+++ b/tests/ref/fate/mss2-rgb555s
@@ -1,3 +1,7 @@
 #tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x48
+#sar 0: 0/1
 0,          0,          0,        0,     6144, 0x4145b7ae
 0,        100,        100,        0,     6144, 0x3b2b38de
diff --git a/tests/ref/fate/mss2-wmv b/tests/ref/fate/mss2-wmv
index d539c714bf..d9abbb30c9 100644
--- a/tests/ref/fate/mss2-wmv
+++ b/tests/ref/fate/mss2-wmv
@@ -1,101 +1,105 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   230400, 0x00000000
-0,        233,        233,        0,   230400, 0xaf950008
-0,        299,        299,        0,   230400, 0x8d2a0010
-0,        366,        366,        0,   230400, 0xd75e0018
-0,        433,        433,        0,   230400, 0x00000000
-0,        499,        499,        0,   230400, 0x517f0008
-0,        566,        566,        0,   230400, 0xcf5a0010
-0,        633,        633,        0,   230400, 0x00000000
-0,        699,        699,        0,   230400, 0x40ef0018
-0,        766,        766,        0,   230400, 0xdc850008
-0,        833,        833,        0,   230400, 0x00000000
-0,        899,        899,        0,   230400, 0x09a40008
-0,        966,        966,        0,   230400, 0x00000000
-0,       1033,       1033,        0,   230400, 0x8b950008
-0,       1099,       1099,        0,   230400, 0xae260038
-0,       1166,       1166,        0,   230400, 0x6d850008
-0,       1233,       1233,        0,   230400, 0x00000000
-0,       1566,       1566,        0,   230400, 0x8b950008
-0,       1633,       1633,        0,   230400, 0x75450018
-0,       1699,       1699,        0,   230400, 0xb0dd0010
-0,       1766,       1766,        0,   230400, 0xecdd0018
-0,       1833,       1833,        0,   230400, 0x68e3f7f7
-0,       1899,       1899,        0,   230400, 0x9cfdcea6
-0,       1966,       1966,        0,   230400, 0x735ababf
-0,       2033,       2033,        0,   230400, 0xa1c604ea
-0,       2099,       2099,        0,   230400, 0x18a2f97a
-0,       2166,       2166,        0,   230400, 0xf9e82961
-0,       2233,       2233,        0,   230400, 0x57a8e9e8
-0,       2299,       2299,        0,   230400, 0xdef6fd66
-0,       2366,       2366,        0,   230400, 0xc7d923a9
-0,       2433,       2433,        0,   230400, 0x08bb41ee
-0,       2499,       2499,        0,   230400, 0x43ccbd29
-0,       2566,       2566,        0,   230400, 0x46666ee3
-0,       2633,       2633,        0,   230400, 0xbfd2ef29
-0,       2699,       2699,        0,   230400, 0x6504545f
-0,       2766,       2766,        0,   230400, 0x8fb86901
-0,       2833,       2833,        0,   230400, 0xc95f0917
-0,       2899,       2899,        0,   230400, 0x21f6a54b
-0,       2966,       2966,        0,   230400, 0xf808106b
-0,       3033,       3033,        0,   230400, 0x34150020
-0,       3099,       3099,        0,   230400, 0x50fdfe89
-0,       3166,       3166,        0,   230400, 0x920b7708
-0,       3233,       3233,        0,   230400, 0xed64fcc4
-0,       3299,       3299,        0,   230400, 0x6291a170
-0,       3366,       3366,        0,   230400, 0x20524643
-0,       3433,       3433,        0,   230400, 0x92aafecd
-0,       3499,       3499,        0,   230400, 0xf00ee14d
-0,       3566,       3566,        0,   230400, 0xfa3113ea
-0,       3633,       3633,        0,   230400, 0x99c06df1
-0,       3699,       3699,        0,   230400, 0x625c6918
-0,       3766,       3766,        0,   230400, 0xb277b25e
-0,       3833,       3833,        0,   230400, 0x2e913006
-0,       3899,       3899,        0,   230400, 0x3f6f1d99
-0,       3966,       3966,        0,   230400, 0x100ab60f
-0,       4033,       4033,        0,   230400, 0x9b73d0bf
-0,       4099,       4099,        0,   230400, 0xda0df2ce
-0,       4166,       4166,        0,   230400, 0x67f7ca24
-0,       4233,       4233,        0,   230400, 0xbde9b3d0
-0,       4299,       4299,        0,   230400, 0x92e14d07
-0,       4366,       4366,        0,   230400, 0x9426c3d9
-0,       4433,       4433,        0,   230400, 0x6104be70
-0,       4499,       4499,        0,   230400, 0xc4d1078a
-0,       4566,       4566,        0,   230400, 0x89426a42
-0,       4633,       4633,        0,   230400, 0x5271324a
-0,       4699,       4699,        0,   230400, 0x1cb1c735
-0,       4766,       4766,        0,   230400, 0x4249b8c6
-0,       4833,       4833,        0,   230400, 0x4b88cad3
-0,       4899,       4899,        0,   230400, 0x76af545d
-0,       4966,       4966,        0,   230400, 0xfe47e3c4
-0,       5033,       5033,        0,   230400, 0xa2e0e721
-0,       5099,       5099,        0,   230400, 0xde974a42
-0,       5166,       5166,        0,   230400, 0xe86a376b
-0,       5233,       5233,        0,   230400, 0xd52318fd
-0,       5299,       5299,        0,   230400, 0x0bbb1526
-0,       5366,       5366,        0,   230400, 0xa22c5e5e
-0,       5433,       5433,        0,   230400, 0x4532c5d2
-0,       5499,       5499,        0,   230400, 0x88b560ec
-0,       5566,       5566,        0,   230400, 0xcee9d9c9
-0,       5633,       5633,        0,   230400, 0x0429358f
-0,       5699,       5699,        0,   230400, 0xf18a9b98
-0,       5766,       5766,        0,   230400, 0x63f7a12c
-0,       5833,       5833,        0,   230400, 0x98635515
-0,       5899,       5899,        0,   230400, 0x36affebc
-0,       5966,       5966,        0,   230400, 0xd8c19629
-0,       6033,       6033,        0,   230400, 0x9ef5344d
-0,       6099,       6099,        0,   230400, 0x545668dc
-0,       6166,       6166,        0,   230400, 0x50e65e74
-0,       6233,       6233,        0,   230400, 0xe3258be3
-0,       6299,       6299,        0,   230400, 0xeb479e1b
-0,       6366,       6366,        0,   230400, 0x91894243
-0,       6433,       6433,        0,   230400, 0x3c5660fc
-0,       6499,       6499,        0,   230400, 0xf0c35673
-0,       6566,       6566,        0,   230400, 0x552832e8
-0,       6633,       6633,        0,   230400, 0x1970f2b1
-0,       6699,       6699,        0,   230400, 0x812d4c91
-0,       6766,       6766,        0,   230400, 0xa3fbd4ef
-0,       6833,       6833,        0,   230400, 0x486f9649
-0,       6899,       6899,        0,   230400, 0x850f315a
-0,       6966,       6966,        0,   230400, 0xc18ec66b
-0,       7033,       7033,        0,   230400, 0xc9ef266e
+#tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,   230400, 0x00000000
+0,          3,          3,        1,   230400, 0xaf950008
+0,          4,          4,        1,   230400, 0x8d2a0010
+0,          5,          5,        1,   230400, 0xd75e0018
+0,          6,          6,        1,   230400, 0x00000000
+0,          7,          7,        1,   230400, 0x517f0008
+0,          8,          8,        1,   230400, 0xcf5a0010
+0,          9,          9,        1,   230400, 0x00000000
+0,         10,         10,        1,   230400, 0x40ef0018
+0,         11,         11,        1,   230400, 0xdc850008
+0,         12,         12,        1,   230400, 0x00000000
+0,         13,         13,        1,   230400, 0x09a40008
+0,         14,         14,        1,   230400, 0x00000000
+0,         15,         15,        1,   230400, 0x8b950008
+0,         16,         16,        1,   230400, 0xae260038
+0,         17,         17,        1,   230400, 0x6d850008
+0,         18,         18,        1,   230400, 0x00000000
+0,         23,         23,        1,   230400, 0x8b950008
+0,         24,         24,        1,   230400, 0x75450018
+0,         25,         25,        1,   230400, 0xb0dd0010
+0,         26,         26,        1,   230400, 0xecdd0018
+0,         27,         27,        1,   230400, 0x68e3f7f7
+0,         28,         28,        1,   230400, 0x9cfdcea6
+0,         29,         29,        1,   230400, 0x735ababf
+0,         30,         30,        1,   230400, 0xa1c604ea
+0,         31,         31,        1,   230400, 0x18a2f97a
+0,         32,         32,        1,   230400, 0xf9e82961
+0,         33,         33,        1,   230400, 0x57a8e9e8
+0,         34,         34,        1,   230400, 0xdef6fd66
+0,         35,         35,        1,   230400, 0xc7d923a9
+0,         36,         36,        1,   230400, 0x08bb41ee
+0,         37,         37,        1,   230400, 0x43ccbd29
+0,         38,         38,        1,   230400, 0x46666ee3
+0,         39,         39,        1,   230400, 0xbfd2ef29
+0,         40,         40,        1,   230400, 0x6504545f
+0,         41,         41,        1,   230400, 0x8fb86901
+0,         42,         42,        1,   230400, 0xc95f0917
+0,         43,         43,        1,   230400, 0x21f6a54b
+0,         44,         44,        1,   230400, 0xf808106b
+0,         45,         45,        1,   230400, 0x34150020
+0,         46,         46,        1,   230400, 0x50fdfe89
+0,         47,         47,        1,   230400, 0x920b7708
+0,         48,         48,        1,   230400, 0xed64fcc4
+0,         49,         49,        1,   230400, 0x6291a170
+0,         50,         50,        1,   230400, 0x20524643
+0,         51,         51,        1,   230400, 0x92aafecd
+0,         52,         52,        1,   230400, 0xf00ee14d
+0,         53,         53,        1,   230400, 0xfa3113ea
+0,         54,         54,        1,   230400, 0x99c06df1
+0,         55,         55,        1,   230400, 0x625c6918
+0,         56,         56,        1,   230400, 0xb277b25e
+0,         57,         57,        1,   230400, 0x2e913006
+0,         58,         58,        1,   230400, 0x3f6f1d99
+0,         59,         59,        1,   230400, 0x100ab60f
+0,         60,         60,        1,   230400, 0x9b73d0bf
+0,         61,         61,        1,   230400, 0xda0df2ce
+0,         62,         62,        1,   230400, 0x67f7ca24
+0,         63,         63,        1,   230400, 0xbde9b3d0
+0,         64,         64,        1,   230400, 0x92e14d07
+0,         65,         65,        1,   230400, 0x9426c3d9
+0,         66,         66,        1,   230400, 0x6104be70
+0,         67,         67,        1,   230400, 0xc4d1078a
+0,         68,         68,        1,   230400, 0x89426a42
+0,         69,         69,        1,   230400, 0x5271324a
+0,         70,         70,        1,   230400, 0x1cb1c735
+0,         71,         71,        1,   230400, 0x4249b8c6
+0,         72,         72,        1,   230400, 0x4b88cad3
+0,         73,         73,        1,   230400, 0x76af545d
+0,         74,         74,        1,   230400, 0xfe47e3c4
+0,         75,         75,        1,   230400, 0xa2e0e721
+0,         76,         76,        1,   230400, 0xde974a42
+0,         77,         77,        1,   230400, 0x87bf38ba
+0,         78,         78,        1,   230400, 0xd52318fd
+0,         79,         79,        1,   230400, 0x0bbb1526
+0,         80,         80,        1,   230400, 0xa22c5e5e
+0,         81,         81,        1,   230400, 0x4532c5d2
+0,         82,         82,        1,   230400, 0x88b560ec
+0,         83,         83,        1,   230400, 0xcee9d9c9
+0,         84,         84,        1,   230400, 0x0429358f
+0,         85,         85,        1,   230400, 0xf18a9b98
+0,         86,         86,        1,   230400, 0x63f7a12c
+0,         87,         87,        1,   230400, 0x98635515
+0,         88,         88,        1,   230400, 0x36affebc
+0,         89,         89,        1,   230400, 0xd8c19629
+0,         90,         90,        1,   230400, 0x9ef5344d
+0,         91,         91,        1,   230400, 0x545668dc
+0,         92,         92,        1,   230400, 0x50e65e74
+0,         93,         93,        1,   230400, 0xe3258be3
+0,         94,         94,        1,   230400, 0xeb479e1b
+0,         95,         95,        1,   230400, 0x91894243
+0,         96,         96,        1,   230400, 0x3c5660fc
+0,         97,         97,        1,   230400, 0xf0c35673
+0,         98,         98,        1,   230400, 0x552832e8
+0,         99,         99,        1,   230400, 0x1970f2b1
+0,        100,        100,        1,   230400, 0x812d4c91
+0,        101,        101,        1,   230400, 0xa3fbd4ef
+0,        102,        102,        1,   230400, 0x486f9649
+0,        103,        103,        1,   230400, 0x850f315a
+0,        104,        104,        1,   230400, 0xc18ec66b
+0,        105,        105,        1,   230400, 0xc9ef266e
diff --git a/tests/ref/fate/msvideo1-16bit b/tests/ref/fate/msvideo1-16bit
index fffdea294a..d28d92e82f 100644
--- a/tests/ref/fate/msvideo1-16bit
+++ b/tests/ref/fate/msvideo1-16bit
@@ -1,31 +1,35 @@
 #tb 0: 33369/500000
-0,          0,          0,        1,    65712, 0x917e0076
-0,          1,          1,        1,    65712, 0xfe76fd1f
-0,          2,          2,        1,    65712, 0xd85820ee
-0,          3,          3,        1,    65712, 0x1b410f6e
-0,          4,          4,        1,    65712, 0x53c50436
-0,          5,          5,        1,    65712, 0xa191044d
-0,          6,          6,        1,    65712, 0xcf02ff1f
-0,          7,          7,        1,    65712, 0xc2abf85f
-0,          8,          8,        1,    65712, 0xe273087e
-0,          9,          9,        1,    65712, 0x087d0936
-0,         10,         10,        1,    65712, 0x4e4f2e96
-0,         11,         11,        1,    65712, 0x91b51896
-0,         12,         12,        1,    65712, 0x2798450e
-0,         13,         13,        1,    65712, 0x9fea1d06
-0,         14,         14,        1,    65712, 0xc64a2506
-0,         15,         15,        1,    65712, 0x0551fe07
-0,         16,         16,        1,    65712, 0xc64a042e
-0,         17,         17,        1,    65712, 0xf3680dc6
-0,         18,         18,        1,    65712, 0x2ea5356e
-0,         19,         19,        1,    65712, 0x0315ed3f
-0,         20,         20,        1,    65712, 0xc1d1f917
-0,         21,         21,        1,    65712, 0xc0f6e607
-0,         22,         22,        1,    65712, 0x5b0a092e
-0,         23,         23,        1,    65712, 0x1551f16f
-0,         24,         24,        1,    65712, 0x8440ee87
-0,         25,         25,        1,    65712, 0xf7581ae6
-0,         26,         26,        1,    65712, 0xee67037e
-0,         27,         27,        1,    65712, 0x4a212ca6
-0,         28,         28,        1,    65712, 0x693e0aa6
-0,         29,         29,        1,    65712, 0x13e31116
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 148x148
+#sar 0: 0/1
+0,          0,          0,        1,    65712, 0x03ff25b8
+0,          1,          1,        1,    65712, 0xfca02276
+0,          2,          2,        1,    65712, 0xd23646e4
+0,          3,          3,        1,    65712, 0x9ea43556
+0,          4,          4,        1,    65712, 0x47412948
+0,          5,          5,        1,    65712, 0x667230c9
+0,          6,          6,        1,    65712, 0x8224247a
+0,          7,          7,        1,    65712, 0x9c0f1d71
+0,          8,          8,        1,    65712, 0x4fbb2e11
+0,          9,          9,        1,    65712, 0x0e4a2e34
+0,         10,         10,        1,    65712, 0xd58954c8
+0,         11,         11,        1,    65712, 0x131d3e2c
+0,         12,         12,        1,    65712, 0x3b686bc7
+0,         13,         13,        1,    65712, 0xbea342a7
+0,         14,         14,        1,    65712, 0xbdff4ac7
+0,         15,         15,        1,    65712, 0x215e22ab
+0,         16,         16,        1,    65712, 0xa9f0295f
+0,         17,         17,        1,    65712, 0x46fb32f3
+0,         18,         18,        1,    65712, 0xd8be5bee
+0,         19,         19,        1,    65712, 0x526411b6
+0,         20,         20,        1,    65712, 0x53951e21
+0,         21,         21,        1,    65712, 0x54a70ab3
+0,         22,         22,        1,    65712, 0xcc872e7a
+0,         23,         23,        1,    65712, 0x06b2164c
+0,         24,         24,        1,    65712, 0x1ae5135f
+0,         25,         25,        1,    65712, 0x8d8a40b4
+0,         26,         26,        1,    65712, 0x3d732893
+0,         27,         27,        1,    65712, 0x239a52a8
+0,         28,         28,        1,    65712, 0xf6bd2fc9
+0,         29,         29,        1,    65712, 0x40b336c4
diff --git a/tests/ref/fate/msvideo1-8bit b/tests/ref/fate/msvideo1-8bit
index 74d54e8b5f..b2714388df 100644
--- a/tests/ref/fate/msvideo1-8bit
+++ b/tests/ref/fate/msvideo1-8bit
@@ -1,4 +1,8 @@
 #tb 0: 10000/300003
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    57600, 0x8c3c5ee8
 0,          1,          1,        1,    57600, 0xb79800b1
 0,          2,          2,        1,    57600, 0x54a221be
diff --git a/tests/ref/fate/mszh b/tests/ref/fate/mszh
index 4ff76ffbac..007fe00c24 100644
--- a/tests/ref/fate/mszh
+++ b/tests/ref/fate/mszh
@@ -1,2 +1,6 @@
 #tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x240
+#sar 0: 0/1
 0,          0,          0,        1,   253440, 0x94af61e5
diff --git a/tests/ref/fate/mts2 b/tests/ref/fate/mts2
index 0e82f19571..778fdfbe45 100644
--- a/tests/ref/fate/mts2
+++ b/tests/ref/fate/mts2
@@ -1,129 +1,133 @@
-#tb 0: 1/1000
-0,          0,          0,        0,  2995632, 0xd99bcd57
-0,        202,        202,        0,  2995632, 0xd99bcd57
-0,        268,        268,        0,  2995632, 0xd99bcd57
-0,        334,        334,        0,  2995632, 0xd99bcd57
-0,        399,        399,        0,  2995632, 0xd99bcd57
-0,        466,        466,        0,  2995632, 0xd99bcd57
-0,        532,        532,        0,  2995632, 0xd99bcd57
-0,        598,        598,        0,  2995632, 0xd99bcd57
-0,        665,        665,        0,  2995632, 0xd99bcd57
-0,        731,        731,        0,  2995632, 0xd99bcd57
-0,        798,        798,        0,  2995632, 0xd99bcd57
-0,        863,        863,        0,  2995632, 0xd99bcd57
-0,        929,        929,        0,  2995632, 0xd99bcd57
-0,        996,        996,        0,  2995632, 0xd99bcd57
-0,       1061,       1061,        0,  2995632, 0xd99bcd57
-0,       1127,       1127,        0,  2995632, 0xd99bcd57
-0,       1192,       1192,        0,  2995632, 0xd99bcd57
-0,       1258,       1258,        0,  2995632, 0xd99bcd57
-0,       1323,       1323,        0,  2995632, 0xd99bcd57
-0,       1389,       1389,        0,  2995632, 0xd99bcd57
-0,       1457,       1457,        0,  2995632, 0xd99bcd57
-0,       1522,       1522,        0,  2995632, 0xd99bcd57
-0,       1589,       1589,        0,  2995632, 0xd99bcd57
-0,       1655,       1655,        0,  2995632, 0xd99bcd57
-0,       1721,       1721,        0,  2995632, 0xd99bcd57
-0,       1788,       1788,        0,  2995632, 0xd99bcd57
-0,       1855,       1855,        0,  2995632, 0xd99bcd57
-0,       1922,       1922,        0,  2995632, 0xd99bcd57
-0,       1987,       1987,        0,  2995632, 0xbeb35375
-0,       2054,       2054,        0,  2995632, 0xbeb35375
-0,       2120,       2120,        0,  2995632, 0xbeb35375
-0,       2185,       2185,        0,  2995632, 0xbeb35375
-0,       2252,       2252,        0,  2995632, 0xbeb35375
-0,       2318,       2318,        0,  2995632, 0xbeb35375
-0,       2383,       2383,        0,  2995632, 0xbeb35375
-0,       2452,       2452,        0,  2995632, 0xcaae4108
-0,       2517,       2517,        0,  2995632, 0xcaae4108
-0,       2584,       2584,        0,  2995632, 0xcaae4108
-0,       2650,       2650,        0,  2995632, 0xcaae4108
-0,       2715,       2715,        0,  2995632, 0xcaae4108
-0,       2782,       2782,        0,  2995632, 0xcaae4108
-0,       2849,       2849,        0,  2995632, 0x8aa38ce0
-0,       2915,       2915,        0,  2995632, 0x8aa38ce0
-0,       2981,       2981,        0,  2995632, 0x8aa38ce0
-0,       3048,       3048,        0,  2995632, 0x8aa38ce0
-0,       3114,       3114,        0,  2995632, 0x8aa38ce0
-0,       3179,       3179,        0,  2995632, 0x8aa38ce0
-0,       3246,       3246,        0,  2995632, 0x05885d30
-0,       3311,       3311,        0,  2995632, 0xd3eee8e8
-0,       3378,       3378,        0,  2995632, 0x0b82ea84
-0,       3444,       3444,        0,  2995632, 0x0b82ea84
-0,       3510,       3510,        0,  2995632, 0x19f32c5e
-0,       3576,       3576,        0,  2995632, 0x19f32c5e
-0,       3642,       3642,        0,  2995632, 0x19f32c5e
-0,       3710,       3710,        0,  2995632, 0x478b455c
-0,       3777,       3777,        0,  2995632, 0x08256940
-0,       3843,       3843,        0,  2995632, 0x08256940
-0,       3909,       3909,        0,  2995632, 0x08256940
-0,       3977,       3977,        0,  2995632, 0x188c88fc
-0,       4044,       4044,        0,  2995632, 0x7ff65403
-0,       4117,       4117,        0,  2995632, 0xef8686db
-0,       4186,       4186,        0,  2995632, 0x8ca34321
-0,       4252,       4252,        0,  2995632, 0x722e18d1
-0,       4317,       4317,        0,  2995632, 0x722e18d1
-0,       4383,       4383,        0,  2995632, 0x0f0c1574
-0,       4449,       4449,        0,  2995632, 0x0f0c1574
-0,       4515,       4515,        0,  2995632, 0x0f0c1574
-0,       4582,       4582,        0,  2995632, 0x440c5180
-0,       4647,       4647,        0,  2995632, 0x440c5180
-0,       4714,       4714,        0,  2995632, 0x440c5180
-0,       4781,       4781,        0,  2995632, 0x440c5180
-0,       4846,       4846,        0,  2995632, 0x440c5180
-0,       4912,       4912,        0,  2995632, 0x440c5180
-0,       4977,       4977,        0,  2995632, 0x440c5180
-0,       5044,       5044,        0,  2995632, 0x440c5180
-0,       5110,       5110,        0,  2995632, 0x50b9656c
-0,       5176,       5176,        0,  2995632, 0x50b9656c
-0,       5243,       5243,        0,  2995632, 0x50b9656c
-0,       5309,       5309,        0,  2995632, 0x50b9656c
-0,       5376,       5376,        0,  2995632, 0x29c17deb
-0,       5442,       5442,        0,  2995632, 0x6f868d8a
-0,       5508,       5508,        0,  2995632, 0x2ea88d55
-0,       5575,       5575,        0,  2995632, 0xe0208c8d
-0,       5641,       5641,        0,  2995632, 0x25084a8f
-0,       5709,       5709,        0,  2995632, 0xd0e3bddd
-0,       5776,       5776,        0,  2995632, 0xc9c3e0ff
-0,       5842,       5842,        0,  2995632, 0xcbefe0b1
-0,       5911,       5911,        0,  2995632, 0xd7b0e00d
-0,       5977,       5977,        0,  2995632, 0x2dc9dff8
-0,       6044,       6044,        0,  2995632, 0x1ea9a835
-0,       6158,       6158,        0,  2995632, 0x9be91cc7
-0,       6225,       6225,        0,  2995632, 0x27c31d09
-0,       6292,       6292,        0,  2995632, 0xc4d65c0c
-0,       6358,       6358,        0,  2995632, 0xc4d65c0c
-0,       6423,       6423,        0,  2995632, 0xc4d65c0c
-0,       6490,       6490,        0,  2995632, 0xc4d65c0c
-0,       6556,       6556,        0,  2995632, 0xc4d65c0c
-0,       6623,       6623,        0,  2995632, 0xceb7bde7
-0,       6689,       6689,        0,  2995632, 0xfbace8b0
-0,       6754,       6754,        0,  2995632, 0x18ab6b35
-0,       6821,       6821,        0,  2995632, 0x18ab6b35
-0,       6887,       6887,        0,  2995632, 0x18ab6b35
-0,       6954,       6954,        0,  2995632, 0x18ab6b35
-0,       7019,       7019,        0,  2995632, 0x18ab6b35
-0,       7084,       7084,        0,  2995632, 0x18ab6b35
-0,       7150,       7150,        0,  2995632, 0x18ab6b35
-0,       7215,       7215,        0,  2995632, 0x18ab6b35
-0,       7282,       7282,        0,  2995632, 0x18ab6b35
-0,       7348,       7348,        0,  2995632, 0x18ab6b35
-0,       7415,       7415,        0,  2995632, 0x18ab6b35
-0,       7480,       7480,        0,  2995632, 0x18ab6b35
-0,       7545,       7545,        0,  2995632, 0x18ab6b35
-0,       7612,       7612,        0,  2995632, 0x18ab6b35
-0,       7678,       7678,        0,  2995632, 0x18ab6b35
-0,       7745,       7745,        0,  2995632, 0x18ab6b35
-0,       7810,       7810,        0,  2995632, 0x18ab6b35
-0,       7876,       7876,        0,  2995632, 0x18ab6b35
-0,       7943,       7943,        0,  2995632, 0x18ab6b35
-0,       8009,       8009,        0,  2995632, 0x18ab6b35
-0,       8076,       8076,        0,  2995632, 0x18ab6b35
-0,       8141,       8141,        0,  2995632, 0x18ab6b35
-0,       8206,       8206,        0,  2995632, 0x18ab6b35
-0,       8273,       8273,        0,  2995632, 0x18ab6b35
-0,       8339,       8339,        0,  2995632, 0x18ab6b35
-0,       8406,       8406,        0,  2995632, 0x18ab6b35
-0,       8472,       8472,        0,  2995632, 0x18ab6b35
-0,       8539,       8539,        0,  2995632, 0x18ab6b35
-0,       8605,       8605,        0,  2995632, 0x68f6d0e7
+#tb 0: 12/181
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1172x852
+#sar 0: 0/1
+0,          0,          0,        1,  2995632, 0xd99bcd57
+0,          3,          3,        1,  2995632, 0xd99bcd57
+0,          4,          4,        1,  2995632, 0xd99bcd57
+0,          5,          5,        1,  2995632, 0xd99bcd57
+0,          6,          6,        1,  2995632, 0xd99bcd57
+0,          7,          7,        1,  2995632, 0xd99bcd57
+0,          8,          8,        1,  2995632, 0xd99bcd57
+0,          9,          9,        1,  2995632, 0xd99bcd57
+0,         10,         10,        1,  2995632, 0xd99bcd57
+0,         11,         11,        1,  2995632, 0xd99bcd57
+0,         12,         12,        1,  2995632, 0xd99bcd57
+0,         13,         13,        1,  2995632, 0xd99bcd57
+0,         14,         14,        1,  2995632, 0xd99bcd57
+0,         15,         15,        1,  2995632, 0xd99bcd57
+0,         16,         16,        1,  2995632, 0xd99bcd57
+0,         17,         17,        1,  2995632, 0xd99bcd57
+0,         18,         18,        1,  2995632, 0xd99bcd57
+0,         19,         19,        1,  2995632, 0xd99bcd57
+0,         20,         20,        1,  2995632, 0xd99bcd57
+0,         21,         21,        1,  2995632, 0xd99bcd57
+0,         22,         22,        1,  2995632, 0xd99bcd57
+0,         23,         23,        1,  2995632, 0xd99bcd57
+0,         24,         24,        1,  2995632, 0xd99bcd57
+0,         25,         25,        1,  2995632, 0xd99bcd57
+0,         26,         26,        1,  2995632, 0xd99bcd57
+0,         27,         27,        1,  2995632, 0xd99bcd57
+0,         28,         28,        1,  2995632, 0xd99bcd57
+0,         29,         29,        1,  2995632, 0xd99bcd57
+0,         30,         30,        1,  2995632, 0xbeb35375
+0,         31,         31,        1,  2995632, 0xbeb35375
+0,         32,         32,        1,  2995632, 0xbeb35375
+0,         33,         33,        1,  2995632, 0xbeb35375
+0,         34,         34,        1,  2995632, 0xbeb35375
+0,         35,         35,        1,  2995632, 0xbeb35375
+0,         36,         36,        1,  2995632, 0xbeb35375
+0,         37,         37,        1,  2995632, 0xcaae4108
+0,         38,         38,        1,  2995632, 0xcaae4108
+0,         39,         39,        1,  2995632, 0xcaae4108
+0,         40,         40,        1,  2995632, 0xcaae4108
+0,         41,         41,        1,  2995632, 0xcaae4108
+0,         42,         42,        1,  2995632, 0xcaae4108
+0,         43,         43,        1,  2995632, 0x8aa38ce0
+0,         44,         44,        1,  2995632, 0x8aa38ce0
+0,         45,         45,        1,  2995632, 0x8aa38ce0
+0,         46,         46,        1,  2995632, 0x8aa38ce0
+0,         47,         47,        1,  2995632, 0x8aa38ce0
+0,         48,         48,        1,  2995632, 0x8aa38ce0
+0,         49,         49,        1,  2995632, 0x05885d30
+0,         50,         50,        1,  2995632, 0xd3eee8e8
+0,         51,         51,        1,  2995632, 0x0b82ea84
+0,         52,         52,        1,  2995632, 0x0b82ea84
+0,         53,         53,        1,  2995632, 0x19f32c5e
+0,         54,         54,        1,  2995632, 0x19f32c5e
+0,         55,         55,        1,  2995632, 0x19f32c5e
+0,         56,         56,        1,  2995632, 0x478b455c
+0,         57,         57,        1,  2995632, 0x08256940
+0,         58,         58,        1,  2995632, 0x08256940
+0,         59,         59,        1,  2995632, 0x08256940
+0,         60,         60,        1,  2995632, 0x188c88fc
+0,         61,         61,        1,  2995632, 0x7ff65403
+0,         62,         62,        1,  2995632, 0xef8686db
+0,         63,         63,        1,  2995632, 0x8ca34321
+0,         64,         64,        1,  2995632, 0x722e18d1
+0,         65,         65,        1,  2995632, 0x722e18d1
+0,         66,         66,        1,  2995632, 0x0f0c1574
+0,         67,         67,        1,  2995632, 0x0f0c1574
+0,         68,         68,        1,  2995632, 0x0f0c1574
+0,         69,         69,        1,  2995632, 0x440c5180
+0,         70,         70,        1,  2995632, 0x440c5180
+0,         71,         71,        1,  2995632, 0x440c5180
+0,         72,         72,        1,  2995632, 0x440c5180
+0,         73,         73,        1,  2995632, 0x440c5180
+0,         74,         74,        1,  2995632, 0x440c5180
+0,         75,         75,        1,  2995632, 0x440c5180
+0,         76,         76,        1,  2995632, 0x440c5180
+0,         77,         77,        1,  2995632, 0x50b9656c
+0,         78,         78,        1,  2995632, 0x50b9656c
+0,         79,         79,        1,  2995632, 0x50b9656c
+0,         80,         80,        1,  2995632, 0x50b9656c
+0,         81,         81,        1,  2995632, 0x29c17deb
+0,         82,         82,        1,  2995632, 0x6f868d8a
+0,         83,         83,        1,  2995632, 0x2ea88d55
+0,         84,         84,        1,  2995632, 0xe0208c8d
+0,         85,         85,        1,  2995632, 0x25084a8f
+0,         86,         86,        1,  2995632, 0xd0e3bddd
+0,         87,         87,        1,  2995632, 0xc9c3e0ff
+0,         88,         88,        1,  2995632, 0xcbefe0b1
+0,         89,         89,        1,  2995632, 0xd7b0e00d
+0,         90,         90,        1,  2995632, 0x2dc9dff8
+0,         91,         91,        1,  2995632, 0x1ea9a835
+0,         93,         93,        1,  2995632, 0x9be91cc7
+0,         94,         94,        1,  2995632, 0x27c31d09
+0,         95,         95,        1,  2995632, 0xc4d65c0c
+0,         96,         96,        1,  2995632, 0xc4d65c0c
+0,         97,         97,        1,  2995632, 0xc4d65c0c
+0,         98,         98,        1,  2995632, 0xc4d65c0c
+0,         99,         99,        1,  2995632, 0xc4d65c0c
+0,        100,        100,        1,  2995632, 0xceb7bde7
+0,        101,        101,        1,  2995632, 0xfbace8b0
+0,        102,        102,        1,  2995632, 0x18ab6b35
+0,        103,        103,        1,  2995632, 0x18ab6b35
+0,        104,        104,        1,  2995632, 0x18ab6b35
+0,        105,        105,        1,  2995632, 0x18ab6b35
+0,        106,        106,        1,  2995632, 0x18ab6b35
+0,        107,        107,        1,  2995632, 0x18ab6b35
+0,        108,        108,        1,  2995632, 0x18ab6b35
+0,        109,        109,        1,  2995632, 0x18ab6b35
+0,        110,        110,        1,  2995632, 0x18ab6b35
+0,        111,        111,        1,  2995632, 0x18ab6b35
+0,        112,        112,        1,  2995632, 0x18ab6b35
+0,        113,        113,        1,  2995632, 0x18ab6b35
+0,        114,        114,        1,  2995632, 0x18ab6b35
+0,        115,        115,        1,  2995632, 0x18ab6b35
+0,        116,        116,        1,  2995632, 0x18ab6b35
+0,        117,        117,        1,  2995632, 0x18ab6b35
+0,        118,        118,        1,  2995632, 0x18ab6b35
+0,        119,        119,        1,  2995632, 0x18ab6b35
+0,        120,        120,        1,  2995632, 0x18ab6b35
+0,        121,        121,        1,  2995632, 0x18ab6b35
+0,        122,        122,        1,  2995632, 0x18ab6b35
+0,        123,        123,        1,  2995632, 0x18ab6b35
+0,        124,        124,        1,  2995632, 0x18ab6b35
+0,        125,        125,        1,  2995632, 0x18ab6b35
+0,        126,        126,        1,  2995632, 0x18ab6b35
+0,        127,        127,        1,  2995632, 0x18ab6b35
+0,        128,        128,        1,  2995632, 0x18ab6b35
+0,        129,        129,        1,  2995632, 0x18ab6b35
+0,        130,        130,        1,  2995632, 0x68f6d0e7
diff --git a/tests/ref/fate/mts2-xesc b/tests/ref/fate/mts2-xesc
new file mode 100644
index 0000000000..6d407413fb
--- /dev/null
+++ b/tests/ref/fate/mts2-xesc
@@ -0,0 +1,22 @@
+#tb 0: 12/185
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1368x768
+#sar 0: 0/1
+0,          0,          0,        1,  3151872, 0x90aa1943
+0,          3,          3,        1,  3151872, 0xbbe670de
+0,          4,          4,        1,  3151872, 0x818d8c1c
+0,          5,          5,        1,  3151872, 0xc2cf510d
+0,          6,          6,        1,  3151872, 0xff904cda
+0,          7,          7,        1,  3151872, 0xc843fce8
+0,          8,          8,        1,  3151872, 0xbfc24e6e
+0,          9,          9,        1,  3151872, 0x5eea45bc
+0,         10,         10,        1,  3151872, 0x86634b52
+0,         11,         11,        1,  3151872, 0x86634b52
+0,         12,         12,        1,  3151872, 0x86634b52
+0,         13,         13,        1,  3151872, 0x86634b52
+0,         14,         14,        1,  3151872, 0x86634b52
+0,         15,         15,        1,  3151872, 0x86634b52
+0,         16,         16,        1,  3151872, 0x86634b52
+0,         17,         17,        1,  3151872, 0xaf542632
+0,         18,         18,        1,  3151872, 0x8f16cdaf
diff --git a/tests/ref/fate/mtv b/tests/ref/fate/mtv
index 4f8f6165b7..7b17bc1b6c 100644
--- a/tests/ref/fate/mtv
+++ b/tests/ref/fate/mtv
@@ -1,5 +1,15 @@
+#extradata 0:        9, 0x116c033a
 #tb 0: 1/16
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 96x64
+#sar 0: 0/1
 #tb 1: 1/44100
+#media_type 1: audio
+#codec_id 1: mp3
+#sample_rate 1: 44100
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
 0,          0,          0,        1,    12288, 0xc2258ebc
 1,          0,          0,     1152,      417, 0xae1cc66a
 1,       1152,       1152,     1152,      418, 0xdc3ec850
@@ -133,6 +143,6 @@
 1,     104832,     104832,     1152,      418, 0xa105cdcc
 1,     105984,     105984,     1152,      418, 0x1477ba58
 1,     107136,     107136,     1152,      418, 0x8d0dcdb2
-0,         39,         39,        1,     3584, 0x0354c435
+0,         39,         39,        1,     3584, 0x0354c435, F=0x3
 1,     108288,     108288,     1152,      418, 0x0d7cbef4
 1,     109440,     109440,     1152,      294, 0x5e2b87c4
diff --git a/tests/ref/fate/murmur3 b/tests/ref/fate/murmur3
new file mode 100644
index 0000000000..cd5c0e8655
--- /dev/null
+++ b/tests/ref/fate/murmur3
@@ -0,0 +1 @@
+result: 0x63f3de036384ba69 0x7192878ce684ed2d
diff --git a/tests/ref/fate/mv-mvc1 b/tests/ref/fate/mv-mvc1
index 073c95a487..5327af0cf1 100644
--- a/tests/ref/fate/mv-mvc1
+++ b/tests/ref/fate/mv-mvc1
@@ -1,4 +1,8 @@
 #tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 384x288
+#sar 0: 0/1
 0,          0,          0,        1,   221184, 0x340ab080
 0,          1,          1,        1,   221184, 0xc21105a0
 0,          2,          2,        1,   221184, 0xa7482ab3
diff --git a/tests/ref/fate/mv-mvc2 b/tests/ref/fate/mv-mvc2
index 99acdc0fb4..7639f3d301 100644
--- a/tests/ref/fate/mv-mvc2
+++ b/tests/ref/fate/mv-mvc2
@@ -1,4 +1,8 @@
 #tb 0: 1/60
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 168x188
+#sar 0: 1/1
 0,          0,          0,        1,   126336, 0xb50e8bb0
 0,          1,          1,        1,   126336, 0xdc260cfa
 0,          2,          2,        1,   126336, 0x2762f0d9
diff --git a/tests/ref/fate/mv-sgirle b/tests/ref/fate/mv-sgirle
index 60aff0a4b5..3f5de2be28 100644
--- a/tests/ref/fate/mv-sgirle
+++ b/tests/ref/fate/mv-sgirle
@@ -1,4 +1,8 @@
 #tb 0: 1/4
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 500x375
+#sar 0: 1/1
 0,          0,          0,        1,   187500, 0xf2c26a39
 0,          1,          1,        1,   187500, 0xf65e6ea5
 0,          2,          2,        1,   187500, 0x804f78d0
diff --git a/tests/ref/fate/mxf-demux b/tests/ref/fate/mxf-demux
index b4cd6f9c55..906a6d0638 100644
--- a/tests/ref/fate/mxf-demux
+++ b/tests/ref/fate/mxf-demux
@@ -1,99 +1,109 @@
+#extradata 0:       18, 0x0b150244
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: mpeg4
+#dimensions 0: 352x288
+#sar 0: 16/11
 #tb 1: 1/8000
-0,          0,          0,        1,     8468, 0xc0855553
+#media_type 1: audio
+#codec_id 1: pcm_alaw
+#sample_rate 1: 8000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,          0, -9223372036854775808,        1,     8468, 0xc0855553
 1,          0,          0,    16000,    32000, 0x479155e6
-0,          1,          1,        1,     3814, 0xa10783b4
-0,          2,          2,        1,     3747, 0xb7bf6973
-0,          3,          3,        1,     3705, 0x5462a600
-0,          4,          4,        1,     3704, 0x1e564943
-0,          5,          5,        1,     3760, 0x10464b9a
-0,          6,          6,        1,     3799, 0xd41d6dcf
-0,          7,          7,        1,     3832, 0x5cf6999e
-0,          8,          8,        1,     3778, 0xe5fc7b9e
-0,          9,          9,        1,    38193, 0xd34e5dd4
-0,         10,         10,        1,     8520, 0x2a203e68
-0,         11,         11,        1,     3832, 0xe4c4b2fe
-0,         12,         12,        1,     3787, 0x0cf95fee
-0,         13,         13,        1,     3766, 0x9e019d14
-0,         14,         14,        1,     3785, 0x0ea9ae75
-0,         15,         15,        1,     3703, 0x11d349ff
-0,         16,         16,        1,     3731, 0x5cf358ef
-0,         17,         17,        1,     3785, 0x01c8962f
-0,         18,         18,        1,     3741, 0xb2c47d53
-0,         19,         19,        1,    38150, 0x08fa1f55
-0,         20,         20,        1,     8487, 0x0c234b9a
-0,         21,         21,        1,     3791, 0x831192ef
-0,         22,         22,        1,     3612, 0x598944fb
-0,         23,         23,        1,     3710, 0xccbb711a
-0,         24,         24,        1,     3864, 0x4385966e
-0,         25,         25,        1,     3919, 0x24e2abc3
-0,         26,         26,        1,     3777, 0x210c6219
-0,         27,         27,        1,     3811, 0x23bf68c2
-0,         28,         28,        1,     3802, 0x52688862
-0,         29,         29,        1,    38027, 0x3d5aa8b9
-0,         30,         30,        1,     8333, 0x617de950
-0,         31,         31,        1,     3831, 0x13fad8fc
-0,         32,         32,        1,     3719, 0xbc317470
-0,         33,         33,        1,     3761, 0xeac460b6
-0,         34,         34,        1,     3637, 0x27d64b32
-0,         35,         35,        1,     3666, 0xf0f700a5
-0,         36,         36,        1,     3788, 0x1c4662a8
-0,         37,         37,        1,     3960, 0xef6b9e99
-0,         38,         38,        1,     3793, 0x3a6ca832
-0,         39,         39,        1,    38312, 0xce1317cc
-0,         40,         40,        1,     8548, 0x4ca944d4
-0,         41,         41,        1,     3866, 0x4e85bf0f
-0,         42,         42,        1,     3644, 0x030338e5
-0,         43,         43,        1,     3634, 0xa95f4512
-0,         44,         44,        1,     3925, 0x7583ba86
-0,         45,         45,        1,     3675, 0x979f423f
-0,         46,         46,        1,     3703, 0x11375f7a
-0,         47,         47,        1,     3705, 0xb7de5d16
-0,         48,         48,        1,     3688, 0x1db45852
-0,         49,         49,        1,    38412, 0x2ee26a63
-0,         50,         50,        1,     8385, 0x0bc20a27
+0,          1, -9223372036854775808,        1,     3814, 0xa10783b4, F=0x0
+0,          2, -9223372036854775808,        1,     3747, 0xb7bf6973, F=0x0
+0,          3, -9223372036854775808,        1,     3705, 0x5462a600, F=0x0
+0,          4, -9223372036854775808,        1,     3704, 0x1e564943, F=0x0
+0,          5, -9223372036854775808,        1,     3760, 0x10464b9a, F=0x0
+0,          6, -9223372036854775808,        1,     3799, 0xd41d6dcf, F=0x0
+0,          7, -9223372036854775808,        1,     3832, 0x5cf6999e, F=0x0
+0,          8, -9223372036854775808,        1,     3778, 0xe5fc7b9e, F=0x0
+0,          9, -9223372036854775808,        1,    38193, 0xd34e5dd4, F=0x0
+0,         10, -9223372036854775808,        1,     8520, 0x2a203e68
+0,         11, -9223372036854775808,        1,     3832, 0xe4c4b2fe, F=0x0
+0,         12, -9223372036854775808,        1,     3787, 0x0cf95fee, F=0x0
+0,         13, -9223372036854775808,        1,     3766, 0x9e019d14, F=0x0
+0,         14, -9223372036854775808,        1,     3785, 0x0ea9ae75, F=0x0
+0,         15, -9223372036854775808,        1,     3703, 0x11d349ff, F=0x0
+0,         16, -9223372036854775808,        1,     3731, 0x5cf358ef, F=0x0
+0,         17, -9223372036854775808,        1,     3785, 0x01c8962f, F=0x0
+0,         18, -9223372036854775808,        1,     3741, 0xb2c47d53, F=0x0
+0,         19, -9223372036854775808,        1,    38150, 0x08fa1f55, F=0x0
+0,         20, -9223372036854775808,        1,     8487, 0x0c234b9a
+0,         21, -9223372036854775808,        1,     3791, 0x831192ef, F=0x0
+0,         22, -9223372036854775808,        1,     3612, 0x598944fb, F=0x0
+0,         23, -9223372036854775808,        1,     3710, 0xccbb711a, F=0x0
+0,         24, -9223372036854775808,        1,     3864, 0x4385966e, F=0x0
+0,         25, -9223372036854775808,        1,     3919, 0x24e2abc3, F=0x0
+0,         26, -9223372036854775808,        1,     3777, 0x210c6219, F=0x0
+0,         27, -9223372036854775808,        1,     3811, 0x23bf68c2, F=0x0
+0,         28, -9223372036854775808,        1,     3802, 0x52688862, F=0x0
+0,         29, -9223372036854775808,        1,    38027, 0x3d5aa8b9, F=0x0
+0,         30, -9223372036854775808,        1,     8333, 0x617de950
+0,         31, -9223372036854775808,        1,     3831, 0x13fad8fc, F=0x0
+0,         32, -9223372036854775808,        1,     3719, 0xbc317470, F=0x0
+0,         33, -9223372036854775808,        1,     3761, 0xeac460b6, F=0x0
+0,         34, -9223372036854775808,        1,     3637, 0x27d64b32, F=0x0
+0,         35, -9223372036854775808,        1,     3666, 0xf0f700a5, F=0x0
+0,         36, -9223372036854775808,        1,     3788, 0x1c4662a8, F=0x0
+0,         37, -9223372036854775808,        1,     3960, 0xef6b9e99, F=0x0
+0,         38, -9223372036854775808,        1,     3793, 0x3a6ca832, F=0x0
+0,         39, -9223372036854775808,        1,    38312, 0xce1317cc, F=0x0
+0,         40, -9223372036854775808,        1,     8548, 0x4ca944d4
+0,         41, -9223372036854775808,        1,     3866, 0x4e85bf0f, F=0x0
+0,         42, -9223372036854775808,        1,     3644, 0x030338e5, F=0x0
+0,         43, -9223372036854775808,        1,     3634, 0xa95f4512, F=0x0
+0,         44, -9223372036854775808,        1,     3925, 0x7583ba86, F=0x0
+0,         45, -9223372036854775808,        1,     3675, 0x979f423f, F=0x0
+0,         46, -9223372036854775808,        1,     3703, 0x11375f7a, F=0x0
+0,         47, -9223372036854775808,        1,     3705, 0xb7de5d16, F=0x0
+0,         48, -9223372036854775808,        1,     3688, 0x1db45852, F=0x0
+0,         49, -9223372036854775808,        1,    38412, 0x2ee26a63, F=0x0
+0,         50, -9223372036854775808,        1,     8385, 0x0bc20a27
 1,      16000,      16000,    16000,    32000, 0x8f7e5009
-0,         51,         51,        1,     3733, 0xa3e2a9a0
-0,         52,         52,        1,     3773, 0x27769caa
-0,         53,         53,        1,     3670, 0xc8335e98
-0,         54,         54,        1,     3596, 0xd6512fb0
-0,         55,         55,        1,     3579, 0xa621fbc2
-0,         56,         56,        1,     3641, 0x2f4f46ca
-0,         57,         57,        1,     3686, 0x0a92385a
-0,         58,         58,        1,     3672, 0xe65137b9
-0,         59,         59,        1,    39065, 0xc723bf8b
-0,         60,         60,        1,     8611, 0x5d177f40
-0,         61,         61,        1,     3758, 0x33d59966
-0,         62,         62,        1,     3674, 0x54f37902
-0,         63,         63,        1,     3615, 0xa0f045fa
-0,         64,         64,        1,     3719, 0x41cf93ff
-0,         65,         65,        1,     3757, 0x3a1b7e8f
-0,         66,         66,        1,     3762, 0xe7f9714d
-0,         67,         67,        1,     3738, 0x8121805b
-0,         68,         68,        1,     3733, 0x13e262db
-0,         69,         69,        1,    38433, 0x3d58c500
-0,         70,         70,        1,     8410, 0xa4f7fd2e
-0,         71,         71,        1,     3711, 0x0e112d3c
-0,         72,         72,        1,     3692, 0xb46574b2
-0,         73,         73,        1,     3563, 0xad43343d
-0,         74,         74,        1,     3613, 0x5cd85c4f
-0,         75,         75,        1,     3653, 0xe15a2853
-0,         76,         76,        1,     3684, 0x9ddd58cb
-0,         77,         77,        1,     3256, 0xd7f89f2e
-0,         78,         78,        1,     3698, 0x2b82624a
-0,         79,         79,        1,    39520, 0xd3f2b7c5
-0,         80,         80,        1,     8493, 0x163559be
-0,         81,         81,        1,     3719, 0x6fa0916f
-0,         82,         82,        1,     3655, 0xa9233de1
-0,         83,         83,        1,     3684, 0xa6125737
-0,         84,         84,        1,     3688, 0xa9da6686
-0,         85,         85,        1,     3685, 0x674d634e
-0,         86,         86,        1,     3677, 0x7a85535d
-0,         87,         87,        1,     3666, 0xce3600a2
-0,         88,         88,        1,     3837, 0x3a7090e1
-0,         89,         89,        1,    38696, 0x12c59cd2
-0,         90,         90,        1,     8022, 0xd343433f
-0,         91,         91,        1,     5157, 0x440c14e5
-0,         92,         92,        1,     5003, 0xf8e1daff
-0,         93,         93,        1,     4954, 0x89866344
-0,         94,         94,        1,    53664, 0xeb0c4c42
+0,         51, -9223372036854775808,        1,     3733, 0xa3e2a9a0, F=0x0
+0,         52, -9223372036854775808,        1,     3773, 0x27769caa, F=0x0
+0,         53, -9223372036854775808,        1,     3670, 0xc8335e98, F=0x0
+0,         54, -9223372036854775808,        1,     3596, 0xd6512fb0, F=0x0
+0,         55, -9223372036854775808,        1,     3579, 0xa621fbc2, F=0x0
+0,         56, -9223372036854775808,        1,     3641, 0x2f4f46ca, F=0x0
+0,         57, -9223372036854775808,        1,     3686, 0x0a92385a, F=0x0
+0,         58, -9223372036854775808,        1,     3672, 0xe65137b9, F=0x0
+0,         59, -9223372036854775808,        1,    39065, 0xc723bf8b, F=0x0
+0,         60, -9223372036854775808,        1,     8611, 0x5d177f40
+0,         61, -9223372036854775808,        1,     3758, 0x33d59966, F=0x0
+0,         62, -9223372036854775808,        1,     3674, 0x54f37902, F=0x0
+0,         63, -9223372036854775808,        1,     3615, 0xa0f045fa, F=0x0
+0,         64, -9223372036854775808,        1,     3719, 0x41cf93ff, F=0x0
+0,         65, -9223372036854775808,        1,     3757, 0x3a1b7e8f, F=0x0
+0,         66, -9223372036854775808,        1,     3762, 0xe7f9714d, F=0x0
+0,         67, -9223372036854775808,        1,     3738, 0x8121805b, F=0x0
+0,         68, -9223372036854775808,        1,     3733, 0x13e262db, F=0x0
+0,         69, -9223372036854775808,        1,    38433, 0x3d58c500, F=0x0
+0,         70, -9223372036854775808,        1,     8410, 0xa4f7fd2e
+0,         71, -9223372036854775808,        1,     3711, 0x0e112d3c, F=0x0
+0,         72, -9223372036854775808,        1,     3692, 0xb46574b2, F=0x0
+0,         73, -9223372036854775808,        1,     3563, 0xad43343d, F=0x0
+0,         74, -9223372036854775808,        1,     3613, 0x5cd85c4f, F=0x0
+0,         75, -9223372036854775808,        1,     3653, 0xe15a2853, F=0x0
+0,         76, -9223372036854775808,        1,     3684, 0x9ddd58cb, F=0x0
+0,         77, -9223372036854775808,        1,     3256, 0xd7f89f2e, F=0x0
+0,         78, -9223372036854775808,        1,     3698, 0x2b82624a, F=0x0
+0,         79, -9223372036854775808,        1,    39520, 0xd3f2b7c5, F=0x0
+0,         80, -9223372036854775808,        1,     8493, 0x163559be
+0,         81, -9223372036854775808,        1,     3719, 0x6fa0916f, F=0x0
+0,         82, -9223372036854775808,        1,     3655, 0xa9233de1, F=0x0
+0,         83, -9223372036854775808,        1,     3684, 0xa6125737, F=0x0
+0,         84, -9223372036854775808,        1,     3688, 0xa9da6686, F=0x0
+0,         85, -9223372036854775808,        1,     3685, 0x674d634e, F=0x0
+0,         86, -9223372036854775808,        1,     3677, 0x7a85535d, F=0x0
+0,         87, -9223372036854775808,        1,     3666, 0xce3600a2, F=0x0
+0,         88, -9223372036854775808,        1,     3837, 0x3a7090e1, F=0x0
+0,         89, -9223372036854775808,        1,    38696, 0x12c59cd2, F=0x0
+0,         90, -9223372036854775808,        1,     8022, 0xd343433f
+0,         91, -9223372036854775808,        1,     5157, 0x440c14e5, F=0x0
+0,         92, -9223372036854775808,        1,     5003, 0xf8e1daff, F=0x0
+0,         93, -9223372036854775808,        1,     4954, 0x89866344, F=0x0
+0,         94, -9223372036854775808,        1,    53664, 0xeb0c4c42, F=0x0
diff --git a/tests/ref/fate/mxf-essencegroup-demux b/tests/ref/fate/mxf-essencegroup-demux
new file mode 100644
index 0000000000..8045cddf76
--- /dev/null
+++ b/tests/ref/fate/mxf-essencegroup-demux
@@ -0,0 +1,6 @@
+#tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
+0,          0,          0,        1,  2080768, 0xe99233d9
diff --git a/tests/ref/fate/mxf-metadata-source-ref1 b/tests/ref/fate/mxf-metadata-source-ref1
new file mode 100644
index 0000000000..48e1e4150e
--- /dev/null
+++ b/tests/ref/fate/mxf-metadata-source-ref1
@@ -0,0 +1,13 @@
+;FFMETADATA1
+[STREAM]
+file_package_umid=0x060A2B340101010101010F001300000057E19D16BA8302DB060E2B347F7F2A80
+track_name=Base
+data_type=video
+[STREAM]
+file_package_umid=0x060A2B340101010101010F001300000057E19D16BA8502DB060E2B347F7F2A80
+track_name=Left Channel
+data_type=audio
+[STREAM]
+file_package_umid=0x060A2B340101010101010F001300000057E19D16BA8602DB060E2B347F7F2A80
+track_name=Right Channel
+data_type=audio
diff --git a/tests/ref/fate/mxf-metadata-source-ref2 b/tests/ref/fate/mxf-metadata-source-ref2
new file mode 100644
index 0000000000..5cfa22527e
--- /dev/null
+++ b/tests/ref/fate/mxf-metadata-source-ref2
@@ -0,0 +1,13 @@
+;FFMETADATA1
+[STREAM]
+file_package_umid=0x060A2B340101010101010F001300000057E19D16BA8302DB060E2B347F7F2A80
+track_name=Base
+data_type=video
+[STREAM]
+file_package_umid=0x060A2B340101010101010F001300000057E19D16BA8402DB060E2B347F7F2A80
+track_name=Titles
+data_type=video
+[STREAM]
+file_package_umid=0x060A2B340101010101010F001300000057E19D16BA8602DB060E2B347F7F2A80
+track_name=Right Channel
+data_type=audio
diff --git a/tests/ref/fate/mxf-missing-index-demux b/tests/ref/fate/mxf-missing-index-demux
new file mode 100644
index 0000000000..8f03fc1e26
--- /dev/null
+++ b/tests/ref/fate/mxf-missing-index-demux
@@ -0,0 +1 @@
+CRC=0x48508eed
diff --git a/tests/ref/fate/mxf-multiple-components-demux b/tests/ref/fate/mxf-multiple-components-demux
new file mode 100644
index 0000000000..9da7bc6923
--- /dev/null
+++ b/tests/ref/fate/mxf-multiple-components-demux
@@ -0,0 +1,11 @@
+#tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: dnxhd
+#dimensions 0: 640x480
+#sar 0: 1/1
+0,          0,          0,        1,    28672, 0x7a4b0044
+0,          1,          1,        1,    28672, 0x75dc29a6
+0,          2,          2,        1,    28672, 0xecabd44b
+0,          3,          3,        1,    28672, 0xc917a96e
+0,          4,          4,        1,    28672, 0x7805cfd5
+0,          5,          5,        1,    28672, 0x55d26dab
diff --git a/tests/ref/fate/mxf-probe-d10 b/tests/ref/fate/mxf-probe-d10
new file mode 100644
index 0000000000..30ceaaf421
--- /dev/null
+++ b/tests/ref/fate/mxf-probe-d10
@@ -0,0 +1,108 @@
+[STREAM]
+index=0
+codec_name=mpeg2video
+profile=0
+codec_type=video
+codec_time_base=1/25
+codec_tag_string=[0][0][0][0]
+codec_tag=0x0000
+width=720
+height=608
+coded_width=0
+coded_height=0
+has_b_frames=0
+sample_aspect_ratio=152:135
+display_aspect_ratio=4:3
+pix_fmt=yuv422p
+level=5
+color_range=tv
+color_space=unknown
+color_transfer=unknown
+color_primaries=unknown
+chroma_location=topleft
+field_order=tt
+timecode=N/A
+refs=1
+id=N/A
+r_frame_rate=25/1
+avg_frame_rate=25/1
+time_base=1/25
+start_pts=0
+start_time=0.000000
+duration_ts=4
+duration=0.160000
+bit_rate=50000000
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=N/A
+nb_read_packets=N/A
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+DISPOSITION:comment=0
+DISPOSITION:lyrics=0
+DISPOSITION:karaoke=0
+DISPOSITION:forced=0
+DISPOSITION:hearing_impaired=0
+DISPOSITION:visual_impaired=0
+DISPOSITION:clean_effects=0
+DISPOSITION:attached_pic=0
+DISPOSITION:timed_thumbnails=0
+TAG:file_package_umid=0x060A2B340101010501010D1313000000AE86B200913105800000080046A54011
+[/STREAM]
+[STREAM]
+index=1
+codec_name=pcm_s16le
+profile=unknown
+codec_type=audio
+codec_time_base=1/48000
+codec_tag_string=[0][0][0][0]
+codec_tag=0x0000
+sample_fmt=s16
+sample_rate=48000
+channels=8
+channel_layout=unknown
+bits_per_sample=16
+id=N/A
+r_frame_rate=0/0
+avg_frame_rate=0/0
+time_base=1/48000
+start_pts=0
+start_time=0.000000
+duration_ts=8562
+duration=0.178375
+bit_rate=6144000
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=N/A
+nb_read_packets=N/A
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+DISPOSITION:comment=0
+DISPOSITION:lyrics=0
+DISPOSITION:karaoke=0
+DISPOSITION:forced=0
+DISPOSITION:hearing_impaired=0
+DISPOSITION:visual_impaired=0
+DISPOSITION:clean_effects=0
+DISPOSITION:attached_pic=0
+DISPOSITION:timed_thumbnails=0
+TAG:file_package_umid=0x060A2B340101010501010D1313000000AE86B200913105800000080046A54011
+[/STREAM]
+[FORMAT]
+format_name=mxf
+duration=0.178375
+bit_rate=56419744
+TAG:uid=0086b200-9131-0580-0000-080046a54011
+TAG:generation_uid=b486b200-9131-0580-0000-080046a54011
+TAG:company_name=SONY
+TAG:product_name=eVTR
+TAG:product_version=1.00
+TAG:product_uid=060e2b34-0401-0106-0e06-012001010100
+TAG:modification_date=2004-07-05T21:39:00.000000Z
+TAG:material_package_umid=0x060A2B340101010501010D1313000000A886B200913105800000080046A54011
+TAG:timecode=07:12:10:00
+[/FORMAT]
diff --git a/tests/ref/fate/mxf-probe-dnxhd b/tests/ref/fate/mxf-probe-dnxhd
new file mode 100644
index 0000000000..c4de291d32
--- /dev/null
+++ b/tests/ref/fate/mxf-probe-dnxhd
@@ -0,0 +1,182 @@
+[STREAM]
+index=0
+codec_name=unknown
+profile=unknown
+codec_type=data
+codec_tag_string=[0][0][0][0]
+codec_tag=0x0000
+id=N/A
+r_frame_rate=0/0
+avg_frame_rate=0/0
+time_base=1/90000
+start_pts=0
+start_time=0.000000
+duration_ts=22523
+duration=0.250256
+bit_rate=N/A
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=N/A
+nb_read_packets=N/A
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+DISPOSITION:comment=0
+DISPOSITION:lyrics=0
+DISPOSITION:karaoke=0
+DISPOSITION:forced=0
+DISPOSITION:hearing_impaired=0
+DISPOSITION:visual_impaired=0
+DISPOSITION:clean_effects=0
+DISPOSITION:attached_pic=0
+DISPOSITION:timed_thumbnails=0
+TAG:file_package_umid=0x060A2B340101010101010F001300000057DEEA25B7D80C94060E2B347F7F2A80
+TAG:data_type=audio
+[/STREAM]
+[STREAM]
+index=1
+codec_name=unknown
+profile=unknown
+codec_type=data
+codec_tag_string=[0][0][0][0]
+codec_tag=0x0000
+id=N/A
+r_frame_rate=0/0
+avg_frame_rate=0/0
+time_base=1/90000
+start_pts=0
+start_time=0.000000
+duration_ts=22523
+duration=0.250256
+bit_rate=N/A
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=N/A
+nb_read_packets=N/A
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+DISPOSITION:comment=0
+DISPOSITION:lyrics=0
+DISPOSITION:karaoke=0
+DISPOSITION:forced=0
+DISPOSITION:hearing_impaired=0
+DISPOSITION:visual_impaired=0
+DISPOSITION:clean_effects=0
+DISPOSITION:attached_pic=0
+DISPOSITION:timed_thumbnails=0
+TAG:file_package_umid=0x060A2B340101010101010F001300000057DEEA25B7F40C94060E2B347F7F2A80
+TAG:data_type=audio
+[/STREAM]
+[STREAM]
+index=2
+codec_name=unknown
+profile=unknown
+codec_type=data
+codec_tag_string=[0][0][0][0]
+codec_tag=0x0000
+id=N/A
+r_frame_rate=0/0
+avg_frame_rate=0/0
+time_base=1/90000
+start_pts=0
+start_time=0.000000
+duration_ts=22523
+duration=0.250256
+bit_rate=N/A
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=N/A
+nb_read_packets=N/A
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+DISPOSITION:comment=0
+DISPOSITION:lyrics=0
+DISPOSITION:karaoke=0
+DISPOSITION:forced=0
+DISPOSITION:hearing_impaired=0
+DISPOSITION:visual_impaired=0
+DISPOSITION:clean_effects=0
+DISPOSITION:attached_pic=0
+DISPOSITION:timed_thumbnails=0
+TAG:file_package_umid=0x060A2B340101010101010F001300000057DEEA25B8050C94060E2B347F7F2A80
+TAG:data_type=video
+[/STREAM]
+[STREAM]
+index=3
+codec_name=dnxhd
+profile=1
+codec_type=video
+codec_time_base=0/1
+codec_tag_string=[0][0][0][0]
+codec_tag=0x0000
+width=640
+height=480
+coded_width=640
+coded_height=480
+has_b_frames=0
+sample_aspect_ratio=1:1
+display_aspect_ratio=4:3
+pix_fmt=yuv422p
+level=-99
+color_range=unknown
+color_space=bt709
+color_transfer=unknown
+color_primaries=unknown
+chroma_location=unspecified
+field_order=progressive
+timecode=N/A
+refs=1
+id=N/A
+r_frame_rate=24000/1001
+avg_frame_rate=0/0
+time_base=1001/24000
+start_pts=0
+start_time=0.000000
+duration_ts=6
+duration=0.250250
+bit_rate=N/A
+max_bit_rate=N/A
+bits_per_raw_sample=8
+nb_frames=N/A
+nb_read_frames=N/A
+nb_read_packets=N/A
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+DISPOSITION:comment=0
+DISPOSITION:lyrics=0
+DISPOSITION:karaoke=0
+DISPOSITION:forced=0
+DISPOSITION:hearing_impaired=0
+DISPOSITION:visual_impaired=0
+DISPOSITION:clean_effects=0
+DISPOSITION:attached_pic=0
+DISPOSITION:timed_thumbnails=0
+TAG:file_package_umid=0x060A2B340101010101010F001300000057DEEA25B84D0C94060E2B347F7F2A80
+TAG:file_package_name=dnxhr_export.aaf
+TAG:reel_umid=0x060A2B340101010101010F001300000057DEEA1570895313060E2B347F7F2A80
+TAG:reel_name=sample_footage
+TAG:timecode=01:00:00:00
+[/STREAM]
+[FORMAT]
+format_name=mxf
+duration=0.250250
+bit_rate=25340195
+TAG:project_name=UHD
+TAG:uid=784c8132-ae36-ed4d-b0ff-2edf1f3f2d92
+TAG:generation_uid=b6bcfcab-70ff-7331-c47c-478869de11d2
+TAG:application_platform=AAFSDK (MacOS X)
+TAG:modification_date=2016-09-18T19:25:25.000000Z
+TAG:product_uid=acfbf03a-4f42-a231-d0b7-c06ecd3d4ad7
+TAG:product_version=Unknown version
+TAG:product_name=Avid Media Composer 8.6.3.43955
+TAG:company_name=Avid Technology, Inc.
+TAG:material_package_umid=0x060A2B340101010101010F001300000057DEEA1570665313060E2B347F7F2A80
+TAG:material_package_name=sample_footage
+TAG:comment_UNC Path=/Users/mark/Dev/pyaaf/example/work/dnxhr_export.aaf
+[/FORMAT]
diff --git a/tests/ref/fate/mxf-probe-dv25 b/tests/ref/fate/mxf-probe-dv25
new file mode 100644
index 0000000000..6e02dd9802
--- /dev/null
+++ b/tests/ref/fate/mxf-probe-dv25
@@ -0,0 +1,149 @@
+[STREAM]
+index=0
+codec_name=dvvideo
+profile=unknown
+codec_type=video
+codec_time_base=1/25
+codec_tag_string=[0][0][0][0]
+codec_tag=0x0000
+width=720
+height=576
+coded_width=720
+coded_height=576
+has_b_frames=0
+sample_aspect_ratio=16:15
+display_aspect_ratio=4:3
+pix_fmt=yuv420p
+level=-99
+color_range=unknown
+color_space=unknown
+color_transfer=unknown
+color_primaries=unknown
+chroma_location=topleft
+field_order=bb
+timecode=N/A
+refs=1
+id=N/A
+r_frame_rate=25/1
+avg_frame_rate=25/1
+time_base=1/25
+start_pts=0
+start_time=0.000000
+duration_ts=25
+duration=1.000000
+bit_rate=N/A
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=N/A
+nb_read_packets=N/A
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+DISPOSITION:comment=0
+DISPOSITION:lyrics=0
+DISPOSITION:karaoke=0
+DISPOSITION:forced=0
+DISPOSITION:hearing_impaired=0
+DISPOSITION:visual_impaired=0
+DISPOSITION:clean_effects=0
+DISPOSITION:attached_pic=0
+DISPOSITION:timed_thumbnails=0
+TAG:file_package_umid=0x060A2B340101010501010D4313000000F2E2FCE98722F14F947F08DE1EF7A8DA
+[/STREAM]
+[STREAM]
+index=1
+codec_name=pcm_s16le
+profile=unknown
+codec_type=audio
+codec_time_base=1/48000
+codec_tag_string=[0][0][0][0]
+codec_tag=0x0000
+sample_fmt=s16
+sample_rate=48000
+channels=1
+channel_layout=unknown
+bits_per_sample=16
+id=N/A
+r_frame_rate=0/0
+avg_frame_rate=0/0
+time_base=1/48000
+start_pts=0
+start_time=0.000000
+duration_ts=48000
+duration=1.000000
+bit_rate=768000
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=N/A
+nb_read_packets=N/A
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+DISPOSITION:comment=0
+DISPOSITION:lyrics=0
+DISPOSITION:karaoke=0
+DISPOSITION:forced=0
+DISPOSITION:hearing_impaired=0
+DISPOSITION:visual_impaired=0
+DISPOSITION:clean_effects=0
+DISPOSITION:attached_pic=0
+DISPOSITION:timed_thumbnails=0
+TAG:file_package_umid=0x060A2B340101010501010D4313000000F2E2FCE98722F14F947F08DE1EF7A8DA
+[/STREAM]
+[STREAM]
+index=2
+codec_name=pcm_s16le
+profile=unknown
+codec_type=audio
+codec_time_base=1/48000
+codec_tag_string=[0][0][0][0]
+codec_tag=0x0000
+sample_fmt=s16
+sample_rate=48000
+channels=1
+channel_layout=unknown
+bits_per_sample=16
+id=N/A
+r_frame_rate=0/0
+avg_frame_rate=0/0
+time_base=1/48000
+start_pts=0
+start_time=0.000000
+duration_ts=48000
+duration=1.000000
+bit_rate=768000
+max_bit_rate=N/A
+bits_per_raw_sample=N/A
+nb_frames=N/A
+nb_read_frames=N/A
+nb_read_packets=N/A
+DISPOSITION:default=0
+DISPOSITION:dub=0
+DISPOSITION:original=0
+DISPOSITION:comment=0
+DISPOSITION:lyrics=0
+DISPOSITION:karaoke=0
+DISPOSITION:forced=0
+DISPOSITION:hearing_impaired=0
+DISPOSITION:visual_impaired=0
+DISPOSITION:clean_effects=0
+DISPOSITION:attached_pic=0
+DISPOSITION:timed_thumbnails=0
+TAG:file_package_umid=0x060A2B340101010501010D4313000000F2E2FCE98722F14F947F08DE1EF7A8DA
+[/STREAM]
+[FORMAT]
+format_name=mxf
+duration=1.000000
+bit_rate=30679040
+TAG:uid=a741d0c7-244a-bc4a-bd36-3323d04f8954
+TAG:generation_uid=c1d7a0ee-89d6-754d-bd52-cdf42b53de9f
+TAG:company_name=AVID
+TAG:product_name=TRMG
+TAG:product_version=2.97
+TAG:product_uid=00000000-0000-0000-0000-000000000000
+TAG:modification_date=2006-06-22T16:37:36.000000Z
+TAG:material_package_umid=0x060A2B340101010501010D431300000008DC3900972905800000080046B1E89C
+TAG:timecode=01:00:00:00
+[/FORMAT]
diff --git a/tests/ref/fate/mxpeg b/tests/ref/fate/mxpeg
new file mode 100644
index 0000000000..9c5c1fa4bf
--- /dev/null
+++ b/tests/ref/fate/mxpeg
@@ -0,0 +1,35 @@
+#tb 0: 4/63
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x960
+#sar 0: 0/1
+0,          0,          0,        1,  1843200, 0x868a4e64
+0,          4,          4,        1,  1843200, 0x8dda4373
+0,          6,          6,        1,  1843200, 0xfcde3afc
+0,          8,          8,        1,  1843200, 0xeb4048a7
+0,         12,         12,        1,  1843200, 0xe2aa5718
+0,         14,         14,        1,  1843200, 0x86c35765
+0,         16,         16,        1,  1843200, 0x05c66542
+0,         18,         18,        1,  1843200, 0x020967f8
+0,         22,         22,        1,  1843200, 0x57757510
+0,         24,         24,        1,  1843200, 0xb91c61be
+0,         26,         26,        1,  1843200, 0x702381e9
+0,         30,         30,        1,  1843200, 0xe28c6851
+0,         32,         32,        1,  1843200, 0x7f806daa
+0,         34,         34,        1,  1843200, 0xc0758a39
+0,         38,         38,        1,  1843200, 0x3af87be2
+0,         40,         40,        1,  1843200, 0x1d1876eb
+0,         42,         42,        1,  1843200, 0x720e81dd
+0,         44,         44,        1,  1843200, 0xd85b7556
+0,         48,         48,        1,  1843200, 0xb9968314
+0,         50,         50,        1,  1843200, 0x946b9d34
+0,         52,         52,        1,  1843200, 0xd2d87d03
+0,         54,         54,        1,  1843200, 0xdd1b8056
+0,         58,         58,        1,  1843200, 0x436b7937
+0,         60,         60,        1,  1843200, 0xe87a6e42
+0,         62,         62,        1,  1843200, 0x57475c09
+0,         64,         64,        1,  1843200, 0xc3b45a77
+0,         68,         68,        1,  1843200, 0x0308494c
+0,         70,         70,        1,  1843200, 0x1ed02c80
+0,         72,         72,        1,  1843200, 0x48602e92
+0,         74,         74,        1,  1843200, 0xcf332caa
diff --git a/tests/ref/fate/nc-demux b/tests/ref/fate/nc-demux
index 8a3c2116cc..006addcac8 100644
--- a/tests/ref/fate/nc-demux
+++ b/tests/ref/fate/nc-demux
@@ -1,92 +1,97 @@
+#extradata 0:       19, 0x1afd0446
 #tb 0: 1/100
+#media_type 0: video
+#codec_id 0: mpeg4
+#dimensions 0: 720x576
+#sar 0: 1/1
 0,          0,          0,        1,    19787, 0x75e463f3
-0,          1,          1,        1,    11913, 0x0f429c34
-0,          2,          2,        1,    14225, 0xbd3c704c
-0,          3,          3,        1,    10357, 0xbf232393
-0,          4,          4,        1,     9595, 0xf565d39e
-0,          5,          5,        1,     9262, 0x2afd6ce0
-0,          6,          6,        1,    12214, 0x6ae81d9b
-0,          7,          7,        1,    13920, 0x31b5b307
-0,          8,          8,        1,    10164, 0x141eca4e
-0,          9,          9,        1,     9516, 0xd5f2c42b
-0,         10,         10,        1,    10006, 0x80850a76
-0,         11,         11,        1,    11791, 0x10bc2dcd
-0,         12,         12,        1,    13756, 0xda1fee08
-0,         13,         13,        1,    10452, 0xbb3d62b0
-0,         14,         14,        1,     9171, 0x64ae10f6
-0,         15,         15,        1,     8816, 0x31ad8fcb
-0,         16,         16,        1,    13168, 0xea1085ac
-0,         17,         17,        1,    12797, 0x25143d22
-0,         18,         18,        1,    11324, 0x3a54b38e
-0,         19,         19,        1,     9173, 0x8b2bf552
-0,         20,         20,        1,     9247, 0x2e87226b
-0,         21,         21,        1,    14140, 0x1063786c
-0,         22,         22,        1,    14437, 0xde123a17
-0,         23,         23,        1,    11938, 0x3f1168f4
-0,         24,         24,        1,    11966, 0xdd6786ec
-0,         25,         25,        1,    13213, 0x8ab27c58
-0,         26,         26,        1,    11843, 0x90415d8b
-0,         27,         27,        1,    13345, 0x3c0e1793
-0,         28,         28,        1,     9977, 0x74fc7f4b
-0,         29,         29,        1,     9158, 0x0b5426a5
-0,         30,         30,        1,    12715, 0x0035d569
+0,          1,          1,        1,    11913, 0x0f429c34, F=0x0
+0,          2,          2,        1,    14225, 0xbd3c704c, F=0x0
+0,          3,          3,        1,    10357, 0xbf232393, F=0x0
+0,          4,          4,        1,     9595, 0xf565d39e, F=0x0
+0,          5,          5,        1,     9262, 0x2afd6ce0, F=0x0
+0,          6,          6,        1,    12214, 0x6ae81d9b, F=0x0
+0,          7,          7,        1,    13920, 0x31b5b307, F=0x0
+0,          8,          8,        1,    10164, 0x141eca4e, F=0x0
+0,          9,          9,        1,     9516, 0xd5f2c42b, F=0x0
+0,         10,         10,        1,    10006, 0x80850a76, F=0x0
+0,         11,         11,        1,    11791, 0x10bc2dcd, F=0x0
+0,         12,         12,        1,    13756, 0xda1fee08, F=0x0
+0,         13,         13,        1,    10452, 0xbb3d62b0, F=0x0
+0,         14,         14,        1,     9171, 0x64ae10f6, F=0x0
+0,         15,         15,        1,     8816, 0x31ad8fcb, F=0x0
+0,         16,         16,        1,    13168, 0xea1085ac, F=0x0
+0,         17,         17,        1,    12797, 0x25143d22, F=0x0
+0,         18,         18,        1,    11324, 0x3a54b38e, F=0x0
+0,         19,         19,        1,     9173, 0x8b2bf552, F=0x0
+0,         20,         20,        1,     9247, 0x2e87226b, F=0x0
+0,         21,         21,        1,    14140, 0x1063786c, F=0x0
+0,         22,         22,        1,    14437, 0xde123a17, F=0x0
+0,         23,         23,        1,    11938, 0x3f1168f4, F=0x0
+0,         24,         24,        1,    11966, 0xdd6786ec, F=0x0
+0,         25,         25,        1,    13213, 0x8ab27c58, F=0x0
+0,         26,         26,        1,    11843, 0x90415d8b, F=0x0
+0,         27,         27,        1,    13345, 0x3c0e1793, F=0x0
+0,         28,         28,        1,     9977, 0x74fc7f4b, F=0x0
+0,         29,         29,        1,     9158, 0x0b5426a5, F=0x0
+0,         30,         30,        1,    12715, 0x0035d569, F=0x0
 0,         31,         31,        1,    19944, 0xe2887ba8
-0,         32,         32,        1,    12762, 0xb0f17939
-0,         33,         33,        1,    10260, 0x182b27aa
-0,         34,         34,        1,     7405, 0x227fe9bf
-0,         35,         35,        1,    13317, 0x1a678c62
-0,         36,         36,        1,    11304, 0x3277af6d
-0,         37,         37,        1,    13291, 0xe267616a
-0,         38,         38,        1,     8975, 0xe7eeacea
-0,         39,         39,        1,     8473, 0x8bb1cbff
-0,         40,         40,        1,    13878, 0xfd3d55bb
-0,         41,         41,        1,    11278, 0x61c7c55e
-0,         42,         42,        1,    13785, 0x2acbf88f
-0,         43,         43,        1,     9521, 0x99e2d065
-0,         44,         44,        1,     9340, 0xe5c96510
-0,         45,         45,        1,    12777, 0x4c3c7844
-0,         46,         46,        1,    10685, 0x39e0f42e
-0,         47,         47,        1,    14237, 0x9398d07f
-0,         48,         48,        1,     9021, 0x3343c7ec
-0,         49,         49,        1,     9327, 0xad489e86
-0,         50,         50,        1,    13507, 0xb1344f1c
-0,         51,         51,        1,    10199, 0x9a8868bf
-0,         52,         52,        1,    14535, 0xddb13f41
-0,         53,         53,        1,     8773, 0x3d8b6a79
-0,         54,         54,        1,    16084, 0x5d915de4
-0,         55,         55,        1,     9156, 0x5cb08a6a
-0,         56,         56,        1,    15027, 0xc23b1dc8
-0,         57,         57,        1,     8240, 0xd6d3526c
-0,         58,         58,        1,     8720, 0x439c43bf
-0,         59,         59,        1,    13684, 0x18fc82f0
-0,         60,         60,        1,     8829, 0xa3ebeb30
-0,         61,         61,        1,    14650, 0x99e8678c
+0,         32,         32,        1,    12762, 0xb0f17939, F=0x0
+0,         33,         33,        1,    10260, 0x182b27aa, F=0x0
+0,         34,         34,        1,     7405, 0x227fe9bf, F=0x0
+0,         35,         35,        1,    13317, 0x1a678c62, F=0x0
+0,         36,         36,        1,    11304, 0x3277af6d, F=0x0
+0,         37,         37,        1,    13291, 0xe267616a, F=0x0
+0,         38,         38,        1,     8975, 0xe7eeacea, F=0x0
+0,         39,         39,        1,     8473, 0x8bb1cbff, F=0x0
+0,         40,         40,        1,    13878, 0xfd3d55bb, F=0x0
+0,         41,         41,        1,    11278, 0x61c7c55e, F=0x0
+0,         42,         42,        1,    13785, 0x2acbf88f, F=0x0
+0,         43,         43,        1,     9521, 0x99e2d065, F=0x0
+0,         44,         44,        1,     9340, 0xe5c96510, F=0x0
+0,         45,         45,        1,    12777, 0x4c3c7844, F=0x0
+0,         46,         46,        1,    10685, 0x39e0f42e, F=0x0
+0,         47,         47,        1,    14237, 0x9398d07f, F=0x0
+0,         48,         48,        1,     9021, 0x3343c7ec, F=0x0
+0,         49,         49,        1,     9327, 0xad489e86, F=0x0
+0,         50,         50,        1,    13507, 0xb1344f1c, F=0x0
+0,         51,         51,        1,    10199, 0x9a8868bf, F=0x0
+0,         52,         52,        1,    14535, 0xddb13f41, F=0x0
+0,         53,         53,        1,     8773, 0x3d8b6a79, F=0x0
+0,         54,         54,        1,    16084, 0x5d915de4, F=0x0
+0,         55,         55,        1,     9156, 0x5cb08a6a, F=0x0
+0,         56,         56,        1,    15027, 0xc23b1dc8, F=0x0
+0,         57,         57,        1,     8240, 0xd6d3526c, F=0x0
+0,         58,         58,        1,     8720, 0x439c43bf, F=0x0
+0,         59,         59,        1,    13684, 0x18fc82f0, F=0x0
+0,         60,         60,        1,     8829, 0xa3ebeb30, F=0x0
+0,         61,         61,        1,    14650, 0x99e8678c, F=0x0
 0,         62,         62,        1,    19626, 0x80a7ee5c
-0,         63,         63,        1,     7762, 0x7c209a12
-0,         64,         64,        1,    13636, 0xc89c1aa3
-0,         65,         65,        1,     8337, 0x749bf76a
-0,         66,         66,        1,    15098, 0xc98bc6dc
-0,         67,         67,        1,     9070, 0xcd4cf7f1
-0,         68,         68,        1,     8269, 0x90e95d54
-0,         69,         69,        1,    12672, 0x034888d0
-0,         70,         70,        1,     7519, 0x6c089672
-0,         71,         71,        1,    14439, 0x5d2478b9
-0,         72,         72,        1,     6928, 0x98fbaa67
-0,         73,         73,        1,     8735, 0x07643f1e
-0,         74,         74,        1,    13522, 0x55034cdb
-0,         75,         75,        1,     7807, 0xf5983103
-0,         76,         76,        1,    14484, 0xfc9cf260
-0,         77,         77,        1,     7193, 0x170a0fa1
-0,         78,         78,        1,     9444, 0x6f9be36f
-0,         79,         79,        1,    12598, 0x69b7609d
-0,         80,         80,        1,     7650, 0x1abaec9e
-0,         81,         81,        1,    15162, 0x2a87f723
-0,         82,         82,        1,     7752, 0xcca248aa
-0,         83,         83,        1,     9085, 0x1ca7d7e5
-0,         84,         84,        1,    13187, 0xababcc64
-0,         85,         85,        1,     7968, 0x64a28f46
-0,         86,         86,        1,    15474, 0xf34c587c
-0,         87,         87,        1,     8615, 0x61301034
-0,         88,         88,        1,    14129, 0x42c88bea
-0,         89,         89,        1,     7223, 0x675d7500
-0,         90,         90,        1,     3072, 0x4cb6254c
+0,         63,         63,        1,     7762, 0x7c209a12, F=0x0
+0,         64,         64,        1,    13636, 0xc89c1aa3, F=0x0
+0,         65,         65,        1,     8337, 0x749bf76a, F=0x0
+0,         66,         66,        1,    15098, 0xc98bc6dc, F=0x0
+0,         67,         67,        1,     9070, 0xcd4cf7f1, F=0x0
+0,         68,         68,        1,     8269, 0x90e95d54, F=0x0
+0,         69,         69,        1,    12672, 0x034888d0, F=0x0
+0,         70,         70,        1,     7519, 0x6c089672, F=0x0
+0,         71,         71,        1,    14439, 0x5d2478b9, F=0x0
+0,         72,         72,        1,     6928, 0x98fbaa67, F=0x0
+0,         73,         73,        1,     8735, 0x07643f1e, F=0x0
+0,         74,         74,        1,    13522, 0x55034cdb, F=0x0
+0,         75,         75,        1,     7807, 0xf5983103, F=0x0
+0,         76,         76,        1,    14484, 0xfc9cf260, F=0x0
+0,         77,         77,        1,     7193, 0x170a0fa1, F=0x0
+0,         78,         78,        1,     9444, 0x6f9be36f, F=0x0
+0,         79,         79,        1,    12598, 0x69b7609d, F=0x0
+0,         80,         80,        1,     7650, 0x1abaec9e, F=0x0
+0,         81,         81,        1,    15162, 0x2a87f723, F=0x0
+0,         82,         82,        1,     7752, 0xcca248aa, F=0x0
+0,         83,         83,        1,     9085, 0x1ca7d7e5, F=0x0
+0,         84,         84,        1,    13187, 0xababcc64, F=0x0
+0,         85,         85,        1,     7968, 0x64a28f46, F=0x0
+0,         86,         86,        1,    15474, 0xf34c587c, F=0x0
+0,         87,         87,        1,     8615, 0x61301034, F=0x0
+0,         88,         88,        1,    14129, 0x42c88bea, F=0x0
+0,         89,         89,        1,     7223, 0x675d7500, F=0x0
+0,         90,         90,        1,     3072, 0x4cb6254c, F=0x0
diff --git a/tests/ref/fate/nistsphere-demux b/tests/ref/fate/nistsphere-demux
new file mode 100644
index 0000000000..bb4874f842
--- /dev/null
+++ b/tests/ref/fate/nistsphere-demux
@@ -0,0 +1 @@
+CRC=0xc4faddaf
diff --git a/tests/ref/fate/nsv-demux b/tests/ref/fate/nsv-demux
index 0f094465db..bff871dabe 100644
--- a/tests/ref/fate/nsv-demux
+++ b/tests/ref/fate/nsv-demux
@@ -1,173 +1,182 @@
 #tb 0: 1001/15000
+#media_type 0: video
+#codec_id 0: vp3
+#dimensions 0: 160x112
+#sar 0: 0/1
 #tb 1: 1/30000000
+#media_type 1: audio
+#codec_id 1: mp3
+#sample_rate 1: 11025
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,       12, 0x1396035f
-0,          1,          1,        1,       24, 0x8ab80ac7
-0,          2,          2,        1,      208, 0x1de1603e
+0,          1,          1,        1,       24, 0x8ab80ac7, F=0x0
+0,          2,          2,        1,      208, 0x1de1603e, F=0x0
 1,    4173848,    4173848,  1567346,      104, 0x8ae85dc9
 1,    5741194,    5741194,  1567346,      105, 0xb7033847
-0,          3,          3,        1,      364, 0xffb4b341
+0,          3,          3,        1,      364, 0xffb4b341, F=0x0
 1,    7308540,    7308540,  1567346,      104, 0x5f853482
-0,          4,          4,        1,      456, 0x7a4deaeb
+0,          4,          4,        1,      456, 0x7a4deaeb, F=0x0
 1,    8875886,    8875886,  1567346,      105, 0xfcb731fd
-0,          5,          5,        1,      432, 0xf4ddd813
+0,          5,          5,        1,      432, 0xf4ddd813, F=0x0
 1,   10443232,   10443232,  1567346,      104, 0x4f8232bb
 1,   12010578,   12010578,  1567346,      105, 0x2f543039
-0,          6,          6,        1,      572, 0xc84c21ff
+0,          6,          6,        1,      572, 0xc84c21ff, F=0x0
 1,   13577924,   13577924,  1567346,      104, 0xe4cc34a1
-0,          7,          7,        1,      500, 0x0e6bf9f4
+0,          7,          7,        1,      500, 0x0e6bf9f4, F=0x0
 1,   15145270,   15145270,  1567346,      105, 0xea663711
-0,          8,          8,        1,      508, 0x2d6efe2a
+0,          8,          8,        1,      508, 0x2d6efe2a, F=0x0
 1,   16712616,   16712616,  1567346,      104, 0x3c583098
-0,          9,          9,        1,      436, 0x7d07d3c5
+0,          9,          9,        1,      436, 0x7d07d3c5, F=0x0
 1,   18279962,   18279962,  1567346,      105, 0xbe6c33ff
 1,   19847308,   19847308,  1567346,      104, 0x56de2d7a
-0,         10,         10,        1,      620, 0xa9313342
+0,         10,         10,        1,      620, 0xa9313342, F=0x0
 1,   21414654,   21414654,  1567346,      105, 0x4e80385d
 0,         11,         11,        1,     1384, 0x9b97c579
 1,   22982000,   22982000,  1567346,      104, 0x34eb340d
-0,         12,         12,        1,      760, 0xd1aa8183
+0,         12,         12,        1,      760, 0xd1aa8183, F=0x0
 1,   24549346,   24549346,  1567346,      105, 0x87e82f74
-0,         13,         13,        1,      836, 0x261da980
+0,         13,         13,        1,      836, 0x261da980, F=0x0
 1,   26116692,   26116692,  1567346,      104, 0xa546377d
 1,   27684038,   27684038,  1567346,      105, 0x92bd349d
-0,         14,         14,        1,      860, 0x52f0afa0
+0,         14,         14,        1,      860, 0x52f0afa0, F=0x0
 1,   29251384,   29251384,  1567346,      104, 0xdba53f3d
-0,         15,         15,        1,      696, 0x63845855
+0,         15,         15,        1,      696, 0x63845855, F=0x0
 1,   30818730,   30818730,  1567346,      105, 0xd3c3384e
-0,         16,         16,        1,      460, 0x2916e7be
+0,         16,         16,        1,      460, 0x2916e7be, F=0x0
 1,   32386076,   32386076,  1567346,      104, 0xdf7d30ce
 1,   33953422,   33953422,  1567346,      105, 0xae20344e
-0,         17,         17,        1,      328, 0xab8caaca
+0,         17,         17,        1,      328, 0xab8caaca, F=0x0
 1,   35520768,   35520768,  1567346,      104, 0xe4cc33b7
-0,         18,         18,        1,      396, 0xc775bc8e
+0,         18,         18,        1,      396, 0xc775bc8e, F=0x0
 1,   37088114,   37088114,  1567346,      105, 0xda993806
-0,         19,         19,        1,      344, 0x114ea25a
+0,         19,         19,        1,      344, 0x114ea25a, F=0x0
 1,   38655460,   38655460,  1567346,      104, 0xd6d12edd
 1,   40222806,   40222806,  1567346,      105, 0x6b9c2ed5
 1,   41790152,   41790152,  1567346,      104, 0xce6c3b04
-0,         21,         21,        1,      532, 0xd5650f54
+0,         21,         21,        1,      532, 0xd5650f54, F=0x0
 1,   43357498,   43357498,  1567346,      105, 0x31db399e
 1,   44924844,   44924844,  1567346,      104, 0xd50b347a
-0,         23,         23,        1,      476, 0x77f1f3a7
+0,         23,         23,        1,      476, 0x77f1f3a7, F=0x0
 1,   46492190,   46492190,  1567346,      105, 0xe87734d6
 1,   48059536,   48059536,  1567346,      104, 0x21873412
 0,         25,         25,        1,      976, 0x2f7cf7ae
 1,   50140000,   50140000,  1567346,      105, 0x29c03514
 1,   51707346,   51707346,  1567346,      104, 0x91a5347a
 1,   53274692,   53274692,  1567346,      105, 0xdbbf3696
-0,         27,         27,        1,      104, 0x8fbf2f65
+0,         27,         27,        1,      104, 0x8fbf2f65, F=0x0
 1,   54842038,   54842038,  1567346,      104, 0x3b463afc
 1,   56409384,   56409384,  1567346,      105, 0xddf53845
 1,   57976730,   57976730,  1567346,      104, 0x94c23d1a
-0,         29,         29,        1,      652, 0xa9244ac0
+0,         29,         29,        1,      652, 0xa9244ac0, F=0x0
 1,   59544076,   59544076,  1567346,      105, 0xc0fd36c4
 1,   61111422,   61111422,  1567346,      104, 0x36d535e0
-0,         31,         31,        1,      152, 0x97804cc1
+0,         31,         31,        1,      152, 0x97804cc1, F=0x0
 1,   62678768,   62678768,  1567346,      105, 0xe81a35da
 1,   64246114,   64246114,  1567346,      104, 0x2b4e3699
 1,   65813460,   65813460,  1567346,      105, 0x3978392c
-0,         33,         33,        1,      156, 0xca434d31
+0,         33,         33,        1,      156, 0xca434d31, F=0x0
 1,   67380806,   67380806,  1567346,      104, 0xca903459
-0,         34,         34,        1,      196, 0x1ff16161
+0,         34,         34,        1,      196, 0x1ff16161, F=0x0
 1,   68948152,   68948152,  1567346,      105, 0xedc4374a
-0,         35,         35,        1,      176, 0x9b455230
+0,         35,         35,        1,      176, 0x9b455230, F=0x0
 1,   70515498,   70515498,  1567346,      104, 0x0b3938d2
-0,         36,         36,        1,      156, 0xbbbf4bf3
+0,         36,         36,        1,      156, 0xbbbf4bf3, F=0x0
 1,   72082844,   72082844,  1567346,      105, 0xb2653246
 1,   73650190,   73650190,  1567346,      104, 0x76333479
-0,         37,         37,        1,      220, 0x77a97152
+0,         37,         37,        1,      220, 0x77a97152, F=0x0
 1,   75217536,   75217536,  1567346,      105, 0x779138c4
-0,         38,         38,        1,      204, 0x667d5ecf
+0,         38,         38,        1,      204, 0x667d5ecf, F=0x0
 1,   76784882,   76784882,  1567346,      104, 0xfe142f55
-0,         39,         39,        1,      232, 0x3a266ccd
+0,         39,         39,        1,      232, 0x3a266ccd, F=0x0
 1,   78352228,   78352228,  1567346,      105, 0x39aa3410
 1,   79919574,   79919574,  1567346,      104, 0x520f330d
-0,         40,         40,        1,      308, 0x844a95b7
+0,         40,         40,        1,      308, 0x844a95b7, F=0x0
 1,   81486920,   81486920,  1567346,      104, 0x1aad37b0
-0,         41,         41,        1,      384, 0x71d2c695
+0,         41,         41,        1,      384, 0x71d2c695, F=0x0
 1,   83054266,   83054266,  1567346,      105, 0x164038eb
 1,   84621612,   84621612,  1567346,      104, 0x21d434bd
-0,         43,         43,        1,      520, 0x4f9d012a
+0,         43,         43,        1,      520, 0x4f9d012a, F=0x0
 1,   86188958,   86188958,  1567346,      105, 0x9c1236d4
 1,   87756304,   87756304,  1567346,      104, 0x6aa933c3
 1,   89323650,   89323650,  1567346,      105, 0xec5c371e
-0,         45,         45,        1,      648, 0xabd13b29
+0,         45,         45,        1,      648, 0xabd13b29, F=0x0
 1,   90890996,   90890996,  1567346,      104, 0xedb33251
 1,   92458342,   92458342,  1567346,      105, 0x4f953476
 1,   94025688,   94025688,  1567346,      104, 0x7da13400
-0,         47,         47,        1,      604, 0x006b328f
+0,         47,         47,        1,      604, 0x006b328f, F=0x0
 1,   95593034,   95593034,  1567346,      105, 0x57a83aaa
 1,   97160380,   97160380,  1567346,      104, 0x8b822f2f
-0,         49,         49,        1,      492, 0xa150fac1
+0,         49,         49,        1,      492, 0xa150fac1, F=0x0
 1,   98727726,   98727726,  1567346,      105, 0x3b31341a
 1,  100295072,  100295072,  1567346,      104, 0x74a4316d
 1,  101862418,  101862418,  1567346,      105, 0x05013469
-0,         51,         51,        1,      456, 0xd3e9e52c
+0,         51,         51,        1,      456, 0xd3e9e52c, F=0x0
 1,  103429764,  103429764,  1567346,      104, 0xcc8932cb
 1,  104997110,  104997110,  1567346,      105, 0xd9233422
-0,         53,         53,        1,      340, 0x7229a1b7
+0,         53,         53,        1,      340, 0x7229a1b7, F=0x0
 1,  106564456,  106564456,  1567346,      104, 0x5c603350
 1,  108131802,  108131802,  1567346,      105, 0x76e631bc
 1,  109699148,  109699148,  1567346,      104, 0x657e3b35
-0,         55,         55,        1,      280, 0x48948b60
+0,         55,         55,        1,      280, 0x48948b60, F=0x0
 1,  111266494,  111266494,  1567346,      105, 0x9d283226
 1,  112833840,  112833840,  1567346,      104, 0x574936ef
-0,         57,         57,        1,      304, 0x3ae68dcf
+0,         57,         57,        1,      304, 0x3ae68dcf, F=0x0
 1,  114401186,  114401186,  1567346,      105, 0x1b923555
 1,  115968532,  115968532,  1567346,      104, 0x2a9f3583
 1,  117535878,  117535878,  1567346,      105, 0xb8cd306f
-0,         59,         59,        1,      324, 0x005da2ab
+0,         59,         59,        1,      324, 0x005da2ab, F=0x0
 1,  119103224,  119103224,  1567346,      104, 0xa21d3475
 1,  120670570,  120670570,  1567346,      105, 0x651539ea
-0,         61,         61,        1,      348, 0x3230a873
+0,         61,         61,        1,      348, 0x3230a873, F=0x0
 1,  122237916,  122237916,  1567346,      104, 0x7b7235b8
 1,  123805262,  123805262,  1567346,      105, 0x2bbb337a
 1,  125372608,  125372608,  1567346,      104, 0x26c332eb
-0,         63,         63,        1,      336, 0x8655ad2d
+0,         63,         63,        1,      336, 0x8655ad2d, F=0x0
 1,  126939954,  126939954,  1567346,      105, 0x990838d8
 1,  128507300,  128507300,  1567346,      104, 0x4dc63ad4
 1,  130074646,  130074646,  1567346,      105, 0xfb8e3418
-0,         65,         65,        1,      380, 0x742ebc44
+0,         65,         65,        1,      380, 0x742ebc44, F=0x0
 1,  131641992,  131641992,  1567346,      104, 0x1882388e
 1,  133209338,  133209338,  1567346,      105, 0xe6b534cc
-0,         67,         67,        1,      340, 0xfc1aa74e
+0,         67,         67,        1,      340, 0xfc1aa74e, F=0x0
 1,  134776684,  134776684,  1567346,      104, 0x60fe35d0
 1,  136344030,  136344030,  1567346,      105, 0x5164354a
 1,  137911376,  137911376,  1567346,      104, 0x92ee3115
-0,         69,         69,        1,      332, 0x3cfba56c
+0,         69,         69,        1,      332, 0x3cfba56c, F=0x0
 1,  139478722,  139478722,  1567346,      105, 0x9b32327e
 1,  141046068,  141046068,  1567346,      104, 0x9b9e394a
-0,         71,         71,        1,      332, 0xc024ad4c
+0,         71,         71,        1,      332, 0xc024ad4c, F=0x0
 1,  142613414,  142613414,  1567346,      105, 0xce3c337f
 1,  144180760,  144180760,  1567346,      104, 0x7a4e33c5
 0,         73,         73,        1,     3432, 0xcdfcd1c9
 1,  146956000,  146956000,  1567346,      105, 0x0e3d34eb
 1,  148523346,  148523346,  1567346,      104, 0xd23e338e
 1,  150090692,  150090692,  1567346,      105, 0x4abf340c
-0,         75,         75,        1,      792, 0xe7df949f
+0,         75,         75,        1,      792, 0xe7df949f, F=0x0
 1,  151658038,  151658038,  1567346,      104, 0xe7522e15
 1,  153225384,  153225384,  1567346,      105, 0x995037ba
-0,         77,         77,        1,      912, 0xbc61d549
+0,         77,         77,        1,      912, 0xbc61d549, F=0x0
 1,  154792730,  154792730,  1567346,      104, 0x5ef12e9b
 1,  156360076,  156360076,  1567346,      105, 0x5c3b3166
 1,  157927422,  157927422,  1567346,      104, 0xfc38314b
-0,         79,         79,        1,      956, 0x809bdff0
+0,         79,         79,        1,      956, 0x809bdff0, F=0x0
 1,  159494768,  159494768,  1567346,      104, 0x5e3636e4
 1,  161062114,  161062114,  1567346,      105, 0xae7b3345
-0,         81,         81,        1,      652, 0x88d3484f
+0,         81,         81,        1,      652, 0x88d3484f, F=0x0
 1,  162629460,  162629460,  1567346,      104, 0x635c317a
 1,  164196806,  164196806,  1567346,      105, 0xa90c361a
 1,  165764152,  165764152,  1567346,      104, 0x8f563594
 0,         83,         83,        1,     1284, 0xecc37164
 1,  167156000,  167156000,  1567346,      105, 0x028e3985
 1,  168723346,  168723346,  1567346,      104, 0x4fd135f6
-0,         85,         85,        1,      428, 0x4794e174
+0,         85,         85,        1,      428, 0x4794e174, F=0x0
 1,  170290692,  170290692,  1567346,      105, 0xaaf539ac
 1,  171858038,  171858038,  1567346,      104, 0x668b3265
 1,  173425384,  173425384,  1567346,      105, 0x74ad3b4b
-0,         87,         87,        1,      460, 0x7253d94a
+0,         87,         87,        1,      460, 0x7253d94a, F=0x0
 1,  174992730,  174992730,  1567346,      104, 0xbde5332f
 1,  176560076,  176560076,  1567346,      105, 0xdc3631e7
 1,  178127422,  178127422,  1567346,      104, 0x3e363a1e
-0,         89,         89,        1,       24, 0x664206ba
+0,         89,         89,        1,       24, 0x664206ba, F=0x0
 1,  179694768,  179694768,  1567346,      105, 0x48b63926
diff --git a/tests/ref/fate/nuv-rtjpeg b/tests/ref/fate/nuv-rtjpeg
index a5c9c4a6f3..e4a5be6263 100644
--- a/tests/ref/fate/nuv-rtjpeg
+++ b/tests/ref/fate/nuv-rtjpeg
@@ -1,9 +1,13 @@
-#tb 0: 1/1000
-0,        118,        118,        0,   460800, 0x54aedafe
-0,        152,        152,        0,   460800, 0xb7aa8b56
-0,        177,        177,        0,   460800, 0x283ea3b5
-0,        202,        202,        0,   460800, 0x283ea3b5
-0,        235,        235,        0,   460800, 0x10e577de
-0,        269,        269,        0,   460800, 0x4e091ee2
-0,        302,        302,        0,   460800, 0x2ea88828
-0,        335,        335,        0,   460800, 0x4b7f4df0
+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 1/1
+0,          4,          4,        1,   460800, 0x54aedafe
+0,          5,          5,        1,   460800, 0xb7aa8b56
+0,          6,          6,        1,   460800, 0x283ea3b5
+0,          7,          7,        1,   460800, 0x283ea3b5
+0,          8,          8,        1,   460800, 0x10e577de
+0,          9,          9,        1,   460800, 0x4e091ee2
+0,         10,         10,        1,   460800, 0x2ea88828
+0,         11,         11,        1,   460800, 0x4b7f4df0
diff --git a/tests/ref/fate/nuv-rtjpeg-fh b/tests/ref/fate/nuv-rtjpeg-fh
index 71e6bf9713..0d50b44977 100644
--- a/tests/ref/fate/nuv-rtjpeg-fh
+++ b/tests/ref/fate/nuv-rtjpeg-fh
@@ -1,51 +1,55 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   221184, 0xdaf54f83
-0,         40,         40,        0,   221184, 0xeea3e3b4
-0,         60,         60,        0,   221184, 0x5f1a8525
-0,         80,         80,        0,   221184, 0x950bb170
-0,        100,        100,        0,   221184, 0x6262e94c
-0,        120,        120,        0,   221184, 0x28752197
-0,        140,        140,        0,   221184, 0x0c2811e7
-0,        160,        160,        0,   221184, 0xb2c1a729
-0,        200,        200,        0,   221184, 0x998d6144
-0,        220,        220,        0,   221184, 0xf5d52311
-0,        240,        240,        0,   221184, 0xea9dd6bf
-0,        260,        260,        0,   221184, 0x0e2ed854
-0,        280,        280,        0,   221184, 0xe295ba58
-0,        300,        300,        0,   221184, 0x8aedbb69
-0,        320,        320,        0,   221184, 0x253c9aaa
-0,        340,        340,        0,   221184, 0x5eaf9fb1
-0,        360,        360,        0,   221184, 0xcdb5a0cb
-0,        380,        380,        0,   221184, 0xcdb5a0cb
-0,        400,        400,        0,   221184, 0x23f89994
-0,        420,        420,        0,   221184, 0x23f89994
-0,        440,        440,        0,   221184, 0x10dc98d6
-0,        460,        460,        0,   221184, 0x799b9d98
-0,        480,        480,        0,   221184, 0xb226996c
-0,        500,        500,        0,   221184, 0x0ac59a42
-0,        520,        520,        0,   221184, 0x87c2a654
-0,        540,        540,        0,   221184, 0xf4c1a711
-0,        560,        560,        0,   221184, 0xf60fa72e
-0,        580,        580,        0,   221184, 0xc8f8b6fc
-0,        600,        600,        0,   221184, 0xd709b813
-0,        620,        620,        0,   221184, 0x5fdfb76b
-0,        640,        640,        0,   221184, 0x5798b0aa
-0,        660,        660,        0,   221184, 0xf572b1c3
-0,        680,        680,        0,   221184, 0x14b0afdf
-0,        700,        700,        0,   221184, 0x0a66b5b8
-0,        720,        720,        0,   221184, 0xe316c620
-0,        740,        740,        0,   221184, 0xbc76c5c2
-0,        760,        760,        0,   221184, 0x77c7c5e5
-0,        780,        780,        0,   221184, 0xfc7ac63e
-0,        800,        800,        0,   221184, 0x05a29ffe
-0,        820,        820,        0,   221184, 0x9bffbf6c
-0,        840,        840,        0,   221184, 0x3c55be40
-0,        860,        860,        0,   221184, 0x6f46c14e
-0,        880,        880,        0,   221184, 0x9cf4ae70
-0,        900,        900,        0,   221184, 0xf205b2f8
-0,        920,        920,        0,   221184, 0x7180aff8
-0,        940,        940,        0,   221184, 0x125eaffe
-0,        960,        960,        0,   221184, 0x6970a32d
-0,        980,        980,        0,   221184, 0xaea79f62
-0,       1000,       1000,        0,   221184, 0x48d2a093
-0,       1020,       1020,        0,   221184, 0x10a59eb5
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x288
+#sar 0: 1/1
+0,         80,         80,        1,   221184, 0xdaf54f83
+0,         82,         82,        1,   221184, 0xeea3e3b4
+0,         83,         83,        1,   221184, 0x5f1a8525
+0,         84,         84,        1,   221184, 0x950bb170
+0,         85,         85,        1,   221184, 0x6262e94c
+0,         86,         86,        1,   221184, 0x28752197
+0,         87,         87,        1,   221184, 0x0c2811e7
+0,         88,         88,        1,   221184, 0xb2c1a729
+0,         90,         90,        1,   221184, 0x998d6144
+0,         91,         91,        1,   221184, 0xf5d52311
+0,         92,         92,        1,   221184, 0xea9dd6bf
+0,         93,         93,        1,   221184, 0x0e2ed854
+0,         94,         94,        1,   221184, 0xe295ba58
+0,         95,         95,        1,   221184, 0x8aedbb69
+0,         96,         96,        1,   221184, 0x253c9aaa
+0,         97,         97,        1,   221184, 0x5eaf9fb1
+0,         98,         98,        1,   221184, 0xcdb5a0cb
+0,         99,         99,        1,   221184, 0xcdb5a0cb
+0,        100,        100,        1,   221184, 0x23f89994
+0,        101,        101,        1,   221184, 0x23f89994
+0,        102,        102,        1,   221184, 0x10dc98d6
+0,        103,        103,        1,   221184, 0x799b9d98
+0,        104,        104,        1,   221184, 0xb226996c
+0,        105,        105,        1,   221184, 0x0ac59a42
+0,        106,        106,        1,   221184, 0x87c2a654
+0,        107,        107,        1,   221184, 0xf4c1a711
+0,        108,        108,        1,   221184, 0xf60fa72e
+0,        109,        109,        1,   221184, 0xc8f8b6fc
+0,        110,        110,        1,   221184, 0xd709b813
+0,        111,        111,        1,   221184, 0x5fdfb76b
+0,        112,        112,        1,   221184, 0x5798b0aa
+0,        113,        113,        1,   221184, 0xf572b1c3
+0,        114,        114,        1,   221184, 0x14b0afdf
+0,        115,        115,        1,   221184, 0x0a66b5b8
+0,        116,        116,        1,   221184, 0xe316c620
+0,        117,        117,        1,   221184, 0xbc76c5c2
+0,        118,        118,        1,   221184, 0x77c7c5e5
+0,        119,        119,        1,   221184, 0xfc7ac63e
+0,        120,        120,        1,   221184, 0x05a29ffe
+0,        121,        121,        1,   221184, 0x9bffbf6c
+0,        122,        122,        1,   221184, 0x3c55be40
+0,        123,        123,        1,   221184, 0x6f46c14e
+0,        124,        124,        1,   221184, 0x9cf4ae70
+0,        125,        125,        1,   221184, 0xf205b2f8
+0,        126,        126,        1,   221184, 0x7180aff8
+0,        127,        127,        1,   221184, 0x125eaffe
+0,        128,        128,        1,   221184, 0x6970a32d
+0,        129,        129,        1,   221184, 0xaea79f62
+0,        130,        130,        1,   221184, 0x48d2a093
+0,        131,        131,        1,   221184, 0x10a59eb5
diff --git a/tests/ref/fate/oggopus-demux b/tests/ref/fate/oggopus-demux
new file mode 100644
index 0000000000..9192760700
--- /dev/null
+++ b/tests/ref/fate/oggopus-demux
@@ -0,0 +1,48 @@
+#extradata 0:       19, 0x399c0471
+#tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: opus
+#sample_rate 0: 48000
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,       -356,       -356,      960,      402, 0x89b1c40f
+0,        604,        604,      960,      216, 0x7bf97146
+0,       1564,       1564,      960,      215, 0x6cb86d8b
+0,       2524,       2524,      960,      218, 0x9cfd691c
+0,       3484,       3484,      960,      218, 0xd7fe6a94
+0,       4444,       4444,      960,      194, 0x35735de6
+0,       5404,       5404,      960,      216, 0x3ee6705a
+0,       6364,       6364,      960,      218, 0x67eb6cb1
+0,       7324,       7324,      960,      218, 0x32d0700d
+0,       8284,       8284,      960,      219, 0xcb7f6c60
+0,       9244,       9244,      960,      218, 0x9c866b33
+0,      10204,      10204,      960,      217, 0xfe3e6a53
+0,      11164,      11164,      960,      218, 0x13586833
+0,      12124,      12124,      960,      222, 0xbcb2669e
+0,      13084,      13084,      960,      218, 0x8dfc6e33
+0,      14044,      14044,      960,      217, 0xf5957051
+0,      15004,      15004,      960,      210, 0xed126e6b
+0,      15964,      15964,      960,      216, 0xbf947249
+0,      16924,      16924,      960,      203, 0x6c7e680a
+0,      17884,      17884,      960,      209, 0xf78f6af4
+0,      18844,      18844,      960,      217, 0xd60c684d
+0,      19804,      19804,      960,      218, 0x89056a7a
+0,      20764,      20764,      960,      219, 0x0bc674ad
+0,      21724,      21724,      960,      217, 0xb1d86d1a
+0,      22684,      22684,      960,      220, 0x433d685a
+0,      23644,      23644,      960,      364, 0x0c88be84
+0,      24604,      24604,      960,      221, 0x804a733d
+0,      25564,      25564,      960,      215, 0x6e9d6e9b
+0,      26524,      26524,      960,      215, 0x63016a83
+0,      27484,      27484,      960,      218, 0xf9a46fbe
+0,      28444,      28444,      960,      216, 0xa0d66c08
+0,      29404,      29404,      960,      216, 0xa2ca6d0a
+0,      30364,      30364,      960,      216, 0xf50e6f1d
+0,      31324,      31324,      960,      215, 0x6aaa70b6
+0,      32284,      32284,      960,      219, 0x7ceb6ba0
+0,      33244,      33244,      960,      220, 0x398d6ca9
+0,      34204,      34204,      960,      218, 0x7bd06ed5
+0,      35164,      35164,      960,      219, 0xe2906c62
+0,      36124,      36124,      960,      217, 0xcf316ba1
+0,      37084,      37084,      960,      217, 0x470b6eea
+0,      38044,      38044,      356,      359, 0x36c2a18a, S=1,       10, 0x0232005e
diff --git a/tests/ref/fate/oggvp8-demux b/tests/ref/fate/oggvp8-demux
new file mode 100644
index 0000000000..fc686d4d95
--- /dev/null
+++ b/tests/ref/fate/oggvp8-demux
@@ -0,0 +1,75 @@
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: vp8
+#dimensions 0: 320x240
+#sar 0: 1/1
+0,          0,          0,        1,     5014, 0x4798fa33
+0,          1,          1,        1,      822, 0x596486c5, F=0x0
+0,          2,          2,        1,      840, 0xf06490ba, F=0x0
+0,          3,          3,        1,      853, 0x1db19d31, F=0x0
+0,          4,          4,        1,      885, 0x5a1aa91f, F=0x0
+0,          5,          5,        1,      902, 0xaabdb1ce, F=0x0
+0,          6,          6,        1,      854, 0x6eb1954e, F=0x0
+0,          7,          7,        1,     3086, 0xe4c12b4a, F=0x0
+0,          8,          8,        1,      732, 0x3c0868bc, F=0x0
+0,          9,          9,        1,      719, 0xa0995781, F=0x0
+0,         10,         10,        1,      749, 0xce2c6ce9, F=0x0
+0,         11,         11,        1,      869, 0x9080b554, F=0x0
+0,         12,         12,        1,      967, 0x8cd5e57a, F=0x0
+0,         13,         13,        1,     1581, 0xd0cc21d8, F=0x0
+0,         14,         14,        1,      934, 0x94facbdc, F=0x0
+0,         15,         15,        1,      841, 0xb00aa233, F=0x0
+0,         16,         16,        1,      820, 0xe93da769, F=0x0
+0,         17,         17,        1,      818, 0xa2ff91cb, F=0x0
+0,         18,         18,        1,     3113, 0x8e74377b, F=0x0
+0,         19,         19,        1,      733, 0xc88e7918, F=0x0
+0,         20,         20,        1,      745, 0x41116e83, F=0x0
+0,         21,         21,        1,      764, 0xc89a7652, F=0x0
+0,         22,         22,        1,      730, 0xe9586ef3, F=0x0
+0,         23,         23,        1,      736, 0x89437b6a, F=0x0
+0,         24,         24,        1,     1268, 0x0e985dc0, F=0x0
+0,         25,         25,        1,      805, 0x8f78897f, F=0x0
+0,         26,         26,        1,      769, 0xe5417a9b, F=0x0
+0,         27,         27,        1,      739, 0x5c0f72ea, F=0x0
+0,         28,         28,        1,      730, 0x0f556cb5, F=0x0
+0,         29,         29,        1,     3057, 0x8fb3e57c, F=0x0
+0,         30,         30,        1,      763, 0xc69479da, F=0x0
+0,         31,         31,        1,      745, 0x757b7265, F=0x0
+0,         32,         32,        1,      712, 0x20a75fc2, F=0x0
+0,         33,         33,        1,      723, 0x44016897, F=0x0
+0,         34,         34,        1,      716, 0x18f96229, F=0x0
+0,         35,         35,        1,     1132, 0xe1542e3e, F=0x0
+0,         36,         36,        1,      774, 0x0027865b, F=0x0
+0,         37,         37,        1,      770, 0x1bd67c7e, F=0x0
+0,         38,         38,        1,      755, 0xdb54746a, F=0x0
+0,         39,         39,        1,      726, 0x010973bd, F=0x0
+0,         40,         40,        1,     3078, 0x9971fe7a, F=0x0
+0,         41,         41,        1,      749, 0xcd7873de, F=0x0
+0,         42,         42,        1,      722, 0x05c86a36, F=0x0
+0,         43,         43,        1,      726, 0x4a356dd8, F=0x0
+0,         44,         44,        1,      710, 0x62176453, F=0x0
+0,         45,         45,        1,      707, 0xfb8b5c7c, F=0x0
+0,         46,         46,        1,     1143, 0x771832ff, F=0x0
+0,         47,         47,        1,      780, 0x3fb488a0, F=0x0
+0,         48,         48,        1,      720, 0xbbf27127, F=0x0
+0,         49,         49,        1,      740, 0xc6276dcb, F=0x0
+0,         50,         50,        1,      781, 0xa45586f4, F=0x0
+0,         51,         51,        1,     3122, 0x9e87222e, F=0x0
+0,         52,         52,        1,      748, 0xe5827d61, F=0x0
+0,         53,         53,        1,      740, 0x7b436f4c, F=0x0
+0,         54,         54,        1,      748, 0xa7b972fe, F=0x0
+0,         55,         55,        1,      731, 0x2a0a67d1, F=0x0
+0,         56,         56,        1,      733, 0x8c956ae1, F=0x0
+0,         57,         57,        1,     1132, 0x60f41eaa, F=0x0
+0,         58,         58,        1,      755, 0x72a276b8, F=0x0
+0,         59,         59,        1,      765, 0x4da18195, F=0x0
+0,         60,         60,        1,      715, 0x33b35877, F=0x0
+0,         61,         61,        1,      769, 0x16b6867e, F=0x0
+0,         62,         62,        1,     3219, 0x465f474f, F=0x0
+0,         63,         63,        1,      732, 0xb2f56da4, F=0x0
+0,         64,         64,        1,      808, 0xeca18ba7, F=0x0
+0,         65,         65,        1,      772, 0x7c978926, F=0x0
+0,         66,         66,        1,      791, 0x0c238441, F=0x0
+0,         67,         67,        1,      778, 0x55e0844e, F=0x0
+0,         68,         68,        1,     1443, 0x9cbed37b, F=0x0
+0,         69,         69,        1,      862, 0xbdcaa8b9, F=0x0
diff --git a/tests/ref/fate/on2avc b/tests/ref/fate/on2avc
index ac08dae9b8..a9d6cbcea9 100644
--- a/tests/ref/fate/on2avc
+++ b/tests/ref/fate/on2avc
@@ -1,4 +1,9 @@
 #tb 0: 1/16000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 16000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,     1024,     2048, 0x00000000
 0,       1024,       1024,     1024,     2048, 0x96ee1301
 0,       2048,       2048,     1024,     2048, 0xe2a81605
diff --git a/tests/ref/fate/opt b/tests/ref/fate/opt
new file mode 100644
index 0000000000..7b47d429c5
--- /dev/null
+++ b/tests/ref/fate/opt
@@ -0,0 +1,382 @@
+Testing default values
+num=0
+toggle=1
+string=default
+escape=\=,
+flags=1
+rational=1/1
+video_rate=25/1
+width=200 height=300
+pix_fmt=0bgr
+sample_fmt=s16
+duration=1000
+color=255 192 203 255
+channel_layout=311=311
+binary=62 69 6e 0
+binary_size=4
+num64=1
+flt=0.333333
+dbl=0.333333
+TestContext AVOptions:
+  -num               <int>        E....... set num (from 0 to 100) (default 0)
+  -toggle            <int>        E....... set toggle (from 0 to 1) (default 1)
+  -rational          <rational>   E....... set rational (from 0 to 10) (default 1/1)
+  -string            <string>     E....... set string (default "default")
+  -escape            <string>     E....... set escape str (default "\=,")
+  -flags             <flags>      E....... set flags (default cool)
+     cool                         E....... set cool flag
+     lame                         E....... set lame flag
+     mu                           E....... set mu flag
+  -size              <image_size> E....... set size (default "200x300")
+  -pix_fmt           <pix_fmt>    E....... set pixfmt (default 0bgr)
+  -sample_fmt        <sample_fmt> E....... set samplefmt (default s16)
+  -video_rate        <video_rate> E....... set videorate (default "25")
+  -duration          <duration>   E....... set duration (default 0.001)
+  -color             <color>      E....... set color (default "pink")
+  -cl                <channel_layout> E....... set channel layout (default 0x137)
+  -bin               <binary>     E....... set binary value
+  -bin1              <binary>     E....... set binary value
+  -bin2              <binary>     E....... set binary value
+  -num64             <int64>      E....... set num 64bit (from 0 to 100) (default 1)
+  -flt               <float>      E....... set float (from 0 to 100) (default 0.333333)
+  -dbl               <double>     E....... set double (from 0 to 100) (default 0.333333)
+  -bool1             <boolean>    E....... set boolean value (default auto)
+  -bool2             <boolean>    E....... set boolean value (default true)
+  -bool3             <boolean>    E....... set boolean value (default false)
+
+Testing av_opt_is_set_to_default()
+name:       num default:1 error:
+name:    toggle default:0 error:
+name:  rational default:0 error:
+name:    string default:0 error:
+name:    escape default:0 error:
+name:     flags default:0 error:
+name:      cool default:1 error:Option not found
+name:      lame default:1 error:Option not found
+name:        mu default:1 error:Option not found
+name:      size default:0 error:
+name:   pix_fmt default:0 error:
+name:sample_fmt default:0 error:
+name:video_rate default:0 error:
+name:  duration default:0 error:
+name:     color default:0 error:
+name:        cl default:0 error:
+name:       bin default:0 error:
+name:      bin1 default:1 error:
+name:      bin2 default:1 error:
+name:     num64 default:0 error:
+name:       flt default:0 error:
+name:       dbl default:0 error:
+name:     bool1 default:0 error:
+name:     bool2 default:0 error:
+name:     bool3 default:1 error:
+name:       num default:1 error:
+name:    toggle default:1 error:
+name:  rational default:1 error:
+name:    string default:1 error:
+name:    escape default:1 error:
+name:     flags default:1 error:
+name:      cool default:1 error:Option not found
+name:      lame default:1 error:Option not found
+name:        mu default:1 error:Option not found
+name:      size default:1 error:
+name:   pix_fmt default:1 error:
+name:sample_fmt default:1 error:
+name:video_rate default:1 error:
+name:  duration default:1 error:
+name:     color default:1 error:
+name:        cl default:1 error:
+name:       bin default:1 error:
+name:      bin1 default:1 error:
+name:      bin2 default:1 error:
+name:     num64 default:1 error:
+name:       flt default:1 error:
+name:       dbl default:1 error:
+name:     bool1 default:1 error:
+name:     bool2 default:1 error:
+name:     bool3 default:1 error:
+
+Test av_opt_serialize()
+num=0,toggle=1,rational=1/1,string=default,escape=\\\=\,,flags=0x00000001,size=200x300,pix_fmt=0bgr,sample_fmt=s16,video_rate=25/1,duration=0.001,color=0xffc0cbff,cl=0x137,bin=62696E00,bin1=,bin2=,num64=1,flt=0.333333,dbl=0.333333,bool1=auto,bool2=true,bool3=false
+Setting entry with key 'num' to value '0'
+Setting entry with key 'toggle' to value '1'
+Setting entry with key 'rational' to value '1/1'
+Setting entry with key 'string' to value 'default'
+Setting entry with key 'escape' to value '\=,'
+Setting entry with key 'flags' to value '0x00000001'
+Setting entry with key 'size' to value '200x300'
+Setting entry with key 'pix_fmt' to value '0bgr'
+Setting entry with key 'sample_fmt' to value 's16'
+Setting entry with key 'video_rate' to value '25/1'
+Setting entry with key 'duration' to value '0.001'
+Setting entry with key 'color' to value '0xffc0cbff'
+Setting entry with key 'cl' to value '0x137'
+Setting entry with key 'bin' to value '62696E00'
+Setting entry with key 'bin1' to value ''
+Setting entry with key 'bin2' to value ''
+Setting entry with key 'num64' to value '1'
+Setting entry with key 'flt' to value '0.333333'
+Setting entry with key 'dbl' to value '0.333333'
+Setting entry with key 'bool1' to value 'auto'
+Setting entry with key 'bool2' to value 'true'
+Setting entry with key 'bool3' to value 'false'
+num=0,toggle=1,rational=1/1,string=default,escape=\\\=\,,flags=0x00000001,size=200x300,pix_fmt=0bgr,sample_fmt=s16,video_rate=25/1,duration=0.001,color=0xffc0cbff,cl=0x137,bin=62696E00,bin1=,bin2=,num64=1,flt=0.333333,dbl=0.333333,bool1=auto,bool2=true,bool3=false
+
+Testing av_set_options_string()
+Setting options string ''
+OK    ''
+Setting options string ':'
+Missing key or no key/value separator found after key ':'
+Error ':'
+Setting options string '='
+Missing key or no key/value separator found after key ''
+Error '='
+Setting options string 'foo=:'
+Setting entry with key 'foo' to value ''
+Key 'foo' not found.
+Error 'foo=:'
+Setting options string ':=foo'
+Setting entry with key ':' to value 'foo'
+Key ':' not found.
+Error ':=foo'
+Setting options string '=foo'
+Missing key or no key/value separator found after key ''
+Error '=foo'
+Setting options string 'foo='
+Setting entry with key 'foo' to value ''
+Key 'foo' not found.
+Error 'foo='
+Setting options string 'foo'
+Missing key or no key/value separator found after key 'foo'
+Error 'foo'
+Setting options string 'foo=val'
+Setting entry with key 'foo' to value 'val'
+Key 'foo' not found.
+Error 'foo=val'
+Setting options string 'foo==val'
+Setting entry with key 'foo' to value '=val'
+Key 'foo' not found.
+Error 'foo==val'
+Setting options string 'toggle=:'
+Setting entry with key 'toggle' to value ''
+Undefined constant or missing '(' in ''
+Unable to parse option value ""
+Error 'toggle=:'
+Setting options string 'string=:'
+Setting entry with key 'string' to value ''
+OK    'string=:'
+Setting options string 'toggle=1 : foo'
+Setting entry with key 'toggle' to value '1'
+Missing key or no key/value separator found after key 'foo'
+Error 'toggle=1 : foo'
+Setting options string 'toggle=100'
+Setting entry with key 'toggle' to value '100'
+Value 100.000000 for parameter 'toggle' out of range [0 - 1]
+Error 'toggle=100'
+Setting options string 'toggle==1'
+Setting entry with key 'toggle' to value '=1'
+Undefined constant or missing '(' in '=1'
+Unable to parse option value "=1"
+Error 'toggle==1'
+Setting options string 'flags=+mu-lame : num=42: toggle=0'
+Setting entry with key 'flags' to value '+mu-lame'
+Setting entry with key 'num' to value '42'
+Setting entry with key 'toggle' to value '0'
+OK    'flags=+mu-lame : num=42: toggle=0'
+Setting options string 'num=42 : string=blahblah'
+Setting entry with key 'num' to value '42'
+Setting entry with key 'string' to value 'blahblah'
+OK    'num=42 : string=blahblah'
+Setting options string 'rational=0 : rational=1/2 : rational=1/-1'
+Setting entry with key 'rational' to value '0'
+Setting entry with key 'rational' to value '1/2'
+Setting entry with key 'rational' to value '1/-1'
+Value -1.000000 for parameter 'rational' out of range [0 - 10]
+Value -1.000000 for parameter 'rational' out of range [0 - 10]
+Error 'rational=0 : rational=1/2 : rational=1/-1'
+Setting options string 'rational=-1/0'
+Error 'rational=-1/0'
+Setting options string 'size=1024x768'
+Setting entry with key 'size' to value '1024x768'
+OK    'size=1024x768'
+Setting options string 'size=pal'
+Setting entry with key 'size' to value 'pal'
+OK    'size=pal'
+Setting options string 'size=bogus'
+Setting entry with key 'size' to value 'bogus'
+Unable to parse option value "bogus" as image size
+Error 'size=bogus'
+Setting options string 'pix_fmt=yuv420p'
+Setting entry with key 'pix_fmt' to value 'yuv420p'
+OK    'pix_fmt=yuv420p'
+Setting options string 'pix_fmt=2'
+Setting entry with key 'pix_fmt' to value '2'
+OK    'pix_fmt=2'
+Setting options string 'pix_fmt=bogus'
+Setting entry with key 'pix_fmt' to value 'bogus'
+Unable to parse option value "bogus" as pixel format
+Error 'pix_fmt=bogus'
+Setting options string 'sample_fmt=s16'
+Setting entry with key 'sample_fmt' to value 's16'
+OK    'sample_fmt=s16'
+Setting options string 'sample_fmt=2'
+Setting entry with key 'sample_fmt' to value '2'
+OK    'sample_fmt=2'
+Setting options string 'sample_fmt=bogus'
+Setting entry with key 'sample_fmt' to value 'bogus'
+Unable to parse option value "bogus" as sample format
+Error 'sample_fmt=bogus'
+Setting options string 'video_rate=pal'
+Setting entry with key 'video_rate' to value 'pal'
+OK    'video_rate=pal'
+Setting options string 'video_rate=25'
+Setting entry with key 'video_rate' to value '25'
+OK    'video_rate=25'
+Setting options string 'video_rate=30000/1001'
+Setting entry with key 'video_rate' to value '30000/1001'
+OK    'video_rate=30000/1001'
+Setting options string 'video_rate=30/1.001'
+Setting entry with key 'video_rate' to value '30/1.001'
+OK    'video_rate=30/1.001'
+Setting options string 'video_rate=bogus'
+Setting entry with key 'video_rate' to value 'bogus'
+Undefined constant or missing '(' in 'bogus'
+Unable to parse option value "bogus" as video rate
+Error 'video_rate=bogus'
+Setting options string 'duration=bogus'
+Setting entry with key 'duration' to value 'bogus'
+Unable to parse option value "bogus" as duration
+Error 'duration=bogus'
+Setting options string 'duration=123.45'
+Setting entry with key 'duration' to value '123.45'
+OK    'duration=123.45'
+Setting options string 'duration=1\:23\:45.67'
+Setting entry with key 'duration' to value '1:23:45.67'
+OK    'duration=1\:23\:45.67'
+Setting options string 'color=blue'
+Setting entry with key 'color' to value 'blue'
+OK    'color=blue'
+Setting options string 'color=0x223300'
+Setting entry with key 'color' to value '0x223300'
+OK    'color=0x223300'
+Setting options string 'color=0x42FF07AA'
+Setting entry with key 'color' to value '0x42FF07AA'
+OK    'color=0x42FF07AA'
+Setting options string 'cl=stereo+downmix'
+Setting entry with key 'cl' to value 'stereo+downmix'
+OK    'cl=stereo+downmix'
+Setting options string 'cl=foo'
+Setting entry with key 'cl' to value 'foo'
+Unable to parse option value "foo" as channel layout
+Error 'cl=foo'
+Setting options string 'bin=boguss'
+Setting entry with key 'bin' to value 'boguss'
+Error 'bin=boguss'
+Setting options string 'bin=111'
+Setting entry with key 'bin' to value '111'
+Error 'bin=111'
+Setting options string 'bin=ffff'
+Setting entry with key 'bin' to value 'ffff'
+OK    'bin=ffff'
+Setting options string 'num64=bogus'
+Setting entry with key 'num64' to value 'bogus'
+Undefined constant or missing '(' in 'bogus'
+Unable to parse option value "bogus"
+Error 'num64=bogus'
+Setting options string 'num64=44'
+Setting entry with key 'num64' to value '44'
+OK    'num64=44'
+Setting options string 'num64=44.4'
+Setting entry with key 'num64' to value '44.4'
+OK    'num64=44.4'
+Setting options string 'num64=-1'
+Setting entry with key 'num64' to value '-1'
+Value -1.000000 for parameter 'num64' out of range [0 - 100]
+Error 'num64=-1'
+Setting options string 'num64=101'
+Setting entry with key 'num64' to value '101'
+Value 101.000000 for parameter 'num64' out of range [0 - 100]
+Error 'num64=101'
+Setting options string 'flt=bogus'
+Setting entry with key 'flt' to value 'bogus'
+Undefined constant or missing '(' in 'bogus'
+Unable to parse option value "bogus"
+Error 'flt=bogus'
+Setting options string 'flt=2'
+Setting entry with key 'flt' to value '2'
+OK    'flt=2'
+Setting options string 'flt=2.2'
+Setting entry with key 'flt' to value '2.2'
+OK    'flt=2.2'
+Setting options string 'flt=-1'
+Setting entry with key 'flt' to value '-1'
+Value -1.000000 for parameter 'flt' out of range [0 - 100]
+Error 'flt=-1'
+Setting options string 'flt=101'
+Setting entry with key 'flt' to value '101'
+Value 101.000000 for parameter 'flt' out of range [0 - 100]
+Error 'flt=101'
+Setting options string 'dbl=bogus'
+Setting entry with key 'dbl' to value 'bogus'
+Undefined constant or missing '(' in 'bogus'
+Unable to parse option value "bogus"
+Error 'dbl=bogus'
+Setting options string 'dbl=2'
+Setting entry with key 'dbl' to value '2'
+OK    'dbl=2'
+Setting options string 'dbl=2.2'
+Setting entry with key 'dbl' to value '2.2'
+OK    'dbl=2.2'
+Setting options string 'dbl=-1'
+Setting entry with key 'dbl' to value '-1'
+Value -1.000000 for parameter 'dbl' out of range [0 - 100]
+Error 'dbl=-1'
+Setting options string 'dbl=101'
+Setting entry with key 'dbl' to value '101'
+Value 101.000000 for parameter 'dbl' out of range [0 - 100]
+Error 'dbl=101'
+Setting options string 'bool1=true'
+Setting entry with key 'bool1' to value 'true'
+OK    'bool1=true'
+Setting options string 'bool2=auto'
+Setting entry with key 'bool2' to value 'auto'
+OK    'bool2=auto'
+
+Testing av_opt_set_from_string()
+Setting options string ''
+OK    ''
+Setting options string '5'
+Setting 'num' to value '5'
+OK    '5'
+Setting options string '5:hello'
+Setting 'num' to value '5'
+Setting 'string' to value 'hello'
+OK    '5:hello'
+Setting options string '5:hello:size=pal'
+Setting 'num' to value '5'
+Setting 'string' to value 'hello'
+Setting 'size' to value 'pal'
+OK    '5:hello:size=pal'
+Setting options string '5:size=pal:hello'
+Setting 'num' to value '5'
+Setting 'size' to value 'pal'
+No option name near 'hello'
+Error '5:size=pal:hello'
+Setting options string ':'
+Setting 'num' to value ''
+Undefined constant or missing '(' in ''
+Unable to parse option value ""
+Error ':'
+Setting options string '='
+Setting '' to value ''
+Option '' not found
+Error '='
+Setting options string ' 5 : hello : size = pal '
+Setting 'num' to value '5'
+Setting 'string' to value 'hello'
+Setting 'size' to value 'pal'
+OK    ' 5 : hello : size = pal '
+Setting options string 'a_very_long_option_name_that_will_need_to_be_ellipsized_around_here=42'
+Setting 'a_very_long_option_name_that_will_need_to_be_ellipsized_around_here' to value '42'
+Option 'a_very_long_option_name_that_will_need_to_be_ellipsized_around_here' not found
+Error 'a_very_long_option_name_that_will_need_to_be_ellipsized_around_here=42'
diff --git a/tests/ref/fate/paf-audio b/tests/ref/fate/paf-audio
index ba47d5d85d..a9ed9e99fe 100644
--- a/tests/ref/fate/paf-audio
+++ b/tests/ref/fate/paf-audio
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,    57330,   229320, 0x062508b4
 0,      57330,      57330,    57330,   229320, 0x0a966cbf
 0,     114660,     114660,    57330,   229320, 0xee9bad45
diff --git a/tests/ref/fate/paf-demux b/tests/ref/fate/paf-demux
new file mode 100644
index 0000000000..6a66697af8
--- /dev/null
+++ b/tests/ref/fate/paf-demux
@@ -0,0 +1,169 @@
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: paf_video
+#dimensions 0: 256x192
+#sar 0: 0/1
+#tb 1: 1/22050
+#media_type 1: audio
+#codec_id 1: paf_audio
+#sample_rate 1: 22050
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,          0,          0,        1,   262144, 0x7f9a3c6a
+1,          0,          0,    57330,   131072, 0x255a6ac2
+0,          1,          1,        1,   260600, 0x0329e6f4, F=0x0
+0,          2,          2,        1,   259724, 0x2db0ad5e, F=0x0
+0,          3,          3,        1,   258616, 0xe666009d, F=0x0
+0,          4,          4,        1,   257364, 0xba42458c, F=0x0
+0,          5,          5,        1,   255964, 0xf7e04c83, F=0x0
+0,          6,          6,        1,   254192, 0xa04b49ff, F=0x0
+0,          7,          7,        1,   252232, 0x65d4ab4c, F=0x0
+0,          8,          8,        1,   249960, 0x8f0b3854, F=0x0
+0,          9,          9,        1,   247396, 0x16d70776, F=0x0
+0,         10,         10,        1,   244452, 0x8b0648f3, F=0x0
+0,         11,         11,        1,   240972, 0x07e3ef41, F=0x0
+0,         12,         12,        1,   237288, 0x197a1964, F=0x0
+0,         13,         13,        1,   233344, 0xd6c51f01, F=0x0
+0,         14,         14,        1,   229196, 0x48581a65, F=0x0
+0,         15,         15,        1,   224688, 0x710e1fdb, F=0x0
+0,         16,         16,        1,   219248, 0xcd96719d, F=0x0
+0,         17,         17,        1,   212712, 0x4de31fd8, F=0x0
+0,         18,         18,        1,   205864, 0x21a0a106, F=0x0
+0,         19,         19,        1,   199148, 0xd1d77c92, F=0x0
+0,         20,         20,        1,   192072, 0x620627a6, F=0x0
+0,         21,         21,        1,   184928, 0x81548454, F=0x0
+0,         22,         22,        1,   178296, 0x7bb40918, F=0x0
+0,         23,         23,        1,   171944, 0xa7b714bb, F=0x0
+0,         24,         24,        1,   165584, 0xa6246dba, F=0x0
+0,         25,         25,        1,   159468, 0x7bc54abb, F=0x0
+0,         26,         26,        1,   153524, 0xd2774028, F=0x0
+1,      57330,      57330,    57330,   131072, 0xcc38a5e5
+0,         27,         27,        1,   147568, 0xd94b2368, F=0x0
+0,         28,         28,        1,   141536, 0xb512eae6, F=0x0
+0,         29,         29,        1,   135368, 0x9b6ea2b3, F=0x0
+0,         30,         30,        1,   128296, 0x7c26d136, F=0x0
+0,         31,         31,        1,   120932, 0xccb8b273, F=0x0
+0,         32,         32,        1,   113432, 0x9f2bb997, F=0x0
+0,         33,         33,        1,   105724, 0x735519f6, F=0x0
+0,         34,         34,        1,    98428, 0xa2933dbb, F=0x0
+0,         35,         35,        1,    91136, 0xbe852457, F=0x0
+0,         36,         36,        1,    83844, 0xc471106a, F=0x0
+0,         37,         37,        1,    76648, 0x3f6e1c92, F=0x0
+0,         38,         38,        1,    69624, 0x00f86b27, F=0x0
+0,         39,         39,        1,    62436, 0xf360ccf0, F=0x0
+0,         40,         40,        1,    55268, 0x0373c2a3, F=0x0
+0,         41,         41,        1,    48220, 0xd5a5e0c1, F=0x0
+0,         42,         42,        1,    48216, 0x1da7e0ad, F=0x0
+0,         43,         43,        1,    48212, 0xa984e098, F=0x0
+0,         44,         44,        1,    48208, 0x7962e082, F=0x0
+0,         45,         45,        1,    48204, 0xc245e06e, F=0x0
+0,         46,         46,        1,    48200, 0x4f2de059, F=0x0
+0,         47,         47,        1,    48196, 0x2013e043, F=0x0
+0,         48,         48,        1,    48192, 0x34ffe02c, F=0x0
+0,         49,         49,        1,    48188, 0x7f22e018, F=0x0
+0,         50,         50,        1,    48184, 0x0d5ae003, F=0x0
+0,         51,         51,        1,    48180, 0xdf91dfed, F=0x0
+0,         52,         52,        1,    48176, 0xf5eddfd6, F=0x0
+1,     114660,     114660,    57330,   131072, 0x4d9c2c7e
+0,         53,         53,        1,    48172, 0x415fdfc2, F=0x0
+0,         54,         54,        1,    48168, 0xd0d8dfad, F=0x0
+0,         55,         55,        1,    48164, 0xa47edf97, F=0x0
+0,         56,         56,        1,    48160, 0xbc4adf80, F=0x0
+0,         57,         57,        1,    48156, 0x08fcdf6c, F=0x0
+0,         58,         58,        1,    48152, 0x99c5df57, F=0x0
+0,         59,         59,        1,    41116, 0x8c22a4c1, F=0x0
+0,         60,         60,        1,    34124, 0x33c9e476, F=0x0
+0,         61,         61,        1,    27272, 0x8069fb08, F=0x0
+0,         62,         62,        1,    20636, 0xa413e37e, F=0x0
+0,         63,         63,        1,    14072, 0x428a2075, F=0x0
+0,         64,         64,        1,     7712, 0x7c6b914f, F=0x0
+0,         65,         65,        1,   262144, 0x687484cb, F=0x0
+0,         66,         66,        1,   256292, 0x0dec8b5a, F=0x0
+0,         67,         67,        1,   250612, 0xd127f411, F=0x0
+0,         68,         68,        1,   245404, 0x4e760ddf, F=0x0
+0,         69,         69,        1,   241956, 0x0412f83d, F=0x0
+0,         70,         70,        1,   241184, 0x0de227e2, F=0x0
+0,         71,         71,        1,   241180, 0xebe9eafb, F=0x0
+0,         72,         72,        1,   241176, 0xf0c8eae5, F=0x0
+0,         73,         73,        1,   241172, 0x47bbeace, F=0x0
+0,         74,         74,        1,   241168, 0xfb8aeab9, F=0x0
+0,         75,         75,        1,   241164, 0x0180eaa3, F=0x0
+0,         76,         76,        1,   241160, 0x5978ea8c, F=0x0
+0,         77,         77,        1,   241156, 0xbc86ea78, F=0x0
+0,         78,         78,        1,   241152, 0x71b4ea63, F=0x0
+1,     171990,     171990,    57330,   131072, 0x1b512fb8
+0,         79,         79,        1,   241148, 0x78fbea4d, F=0x0
+0,         80,         80,        1,   241144, 0xd263ea36
+0,         81,         81,        1,   237912, 0xcb5839a6, F=0x0
+0,         82,         82,        1,   229296, 0x350f07b6, F=0x0
+0,         83,         83,        1,   214256, 0x3c954096, F=0x0
+0,         84,         84,        1,   198068, 0x1470ae1f, F=0x0
+0,         85,         85,        1,   180664, 0xa80de8b6, F=0x0
+0,         86,         86,        1,   164672, 0x11ecf816, F=0x0
+0,         87,         87,        1,   148996, 0x6346aa49, F=0x0
+0,         88,         88,        1,   134804, 0x8fe4699a, F=0x0
+0,         89,         89,        1,   124488, 0x63b82fa0, F=0x0
+0,         90,         90,        1,   116892, 0xac785c29, F=0x0
+0,         91,         91,        1,   109528, 0xc24da959, F=0x0
+0,         92,         92,        1,   102688, 0xba25eb56, F=0x0
+0,         93,         93,        1,    95192, 0x999820b3, F=0x0
+0,         94,         94,        1,    89980, 0xa81aee1a, F=0x0
+0,         95,         95,        1,    84696, 0xb274dad5, F=0x0
+0,         96,         96,        1,    79152, 0xd7936f6e, F=0x0
+0,         97,         97,        1,    74232, 0x1abdf78a, F=0x0
+0,         98,         98,        1,    69112, 0x212918e8, F=0x0
+0,         99,         99,        1,    63484, 0x45e36b2f, F=0x0
+0,        100,        100,        1,    58616, 0xef171a5a, F=0x0
+0,        101,        101,        1,    53396, 0xd16be9a0, F=0x0
+0,        102,        102,        1,    47388, 0xc602914b, F=0x0
+0,        103,        103,        1,    42276, 0x6b86b9dd, F=0x0
+0,        104,        104,        1,    36932, 0xea0d85cb, F=0x0
+1,     229320,     229320,    57330,   131072, 0x4e478505
+0,        105,        105,        1,    30408, 0xc7df6cba, F=0x0
+0,        106,        106,        1,    24468, 0x80007205, F=0x0
+0,        107,        107,        1,    18572, 0xb4aa84d2, F=0x0
+0,        108,        108,        1,    12632, 0x12c2efb8, F=0x0
+0,        109,        109,        1,     6604, 0x75002817, F=0x0
+0,        110,        110,        1,   262144, 0xf9544f5b, F=0x0
+0,        111,        111,        1,   255448, 0x9242877e, F=0x0
+0,        112,        112,        1,   248532, 0xef495999, F=0x0
+0,        113,        113,        1,   238032, 0xac29500b, F=0x0
+0,        114,        114,        1,   225424, 0x73035f24, F=0x0
+0,        115,        115,        1,   215860, 0xed94de14, F=0x0
+0,        116,        116,        1,   205996, 0x4d417b16, F=0x0
+0,        117,        117,        1,   191904, 0xc195d49f, F=0x0
+0,        118,        118,        1,   182596, 0x32a14954, F=0x0
+0,        119,        119,        1,   174988, 0xdc83fa02, F=0x0
+0,        120,        120,        1,   168008, 0x5e1d7302, F=0x0
+0,        121,        121,        1,   161032, 0xf503efb4, F=0x0
+0,        122,        122,        1,   154044, 0x1df06a7c, F=0x0
+0,        123,        123,        1,   147056, 0x4c22ec13, F=0x0
+0,        124,        124,        1,   140060, 0xede97385, F=0x0
+0,        125,        125,        1,   133064, 0x50eefee6, F=0x0
+0,        126,        126,        1,   126060, 0xc6478fb8, F=0x0
+0,        127,        127,        1,   119056, 0xf45a2080, F=0x0
+0,        128,        128,        1,   112044, 0x1d49b4ae, F=0x0
+0,        129,        129,        1,   105028, 0xd35649dd, F=0x0
+0,        130,        130,        1,    98012, 0x03ede949, F=0x0
+1,     286650,     286650,    57330,   131072, 0xb29e283e
+0,        131,        131,        1,    91000, 0x57128fb0, F=0x0
+0,        132,        132,        1,    84000, 0xf7ff39c0, F=0x0
+0,        133,        133,        1,    77004, 0xda18e580, F=0x0
+0,        134,        134,        1,    70004, 0x8eff8af4, F=0x0
+0,        135,        135,        1,    62992, 0x665831fd, F=0x0
+0,        136,        136,        1,    55976, 0x130ada75, F=0x0
+0,        137,        137,        1,    48956, 0x4cf47b2f, F=0x0
+0,        138,        138,        1,    41936, 0x7a8e2006, F=0x0
+0,        139,        139,        1,    34920, 0x9527ca2b, F=0x0
+0,        140,        140,        1,    27912, 0x4c8078df, F=0x0
+0,        141,        141,        1,    20884, 0x1e152e1f, F=0x0
+0,        142,        142,        1,    13848, 0xd358d51b, F=0x0
+0,        143,        143,        1,   262144, 0x38f14810, F=0x0
+0,        144,        144,        1,   255104, 0x579bf26b, F=0x0
+0,        145,        145,        1,   255100, 0x6488a2d4, F=0x0
+0,        146,        146,        1,   248096, 0xbe966730, F=0x0
+0,        147,        147,        1,   241144, 0xd8e3abf6, F=0x0
+0,        148,        148,        1,   234268, 0xde2bb38e, F=0x0
+0,        149,        149,        1,   227440, 0xb78f1aed, F=0x0
+0,        150,        150,        1,   220692, 0x86026588, F=0x0
+0,        151,        151,        1,   214000, 0x0fdbc796, F=0x0
diff --git a/tests/ref/fate/paf-video b/tests/ref/fate/paf-video
index ed37c288c3..aa1fa82f0e 100644
--- a/tests/ref/fate/paf-video
+++ b/tests/ref/fate/paf-video
@@ -1,4 +1,8 @@
 #tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x192
+#sar 0: 0/1
 0,          0,          0,        1,   147456, 0x00000000
 0,          1,          1,        1,   147456, 0x7be40798
 0,          2,          2,        1,   147456, 0x44bc2fc0
diff --git a/tests/ref/fate/parseutils b/tests/ref/fate/parseutils
index 01f6e08034..568b6d28be 100644
--- a/tests/ref/fate/parseutils
+++ b/tests/ref/fate/parseutils
@@ -9,10 +9,10 @@ Testing av_parse_video_rate()
 ' 123  /  321' -> 41/107 OK
 'foo/foo' -> 0/0 ERROR
 'foo/1' -> 0/0 ERROR
-'1/foo' -> 0/0 ERROR
+'1/foo' -> 1/0 ERROR
 '0/0' -> 0/0 ERROR
 '/0' -> 0/0 ERROR
-'1/' -> 0/0 ERROR
+'1/' -> 1/0 ERROR
 '1' -> 1/1 OK
 '0' -> 0/1 ERROR
 '-123/123' -> -1/1 ERROR
@@ -21,25 +21,223 @@ Testing av_parse_video_rate()
 '.23' -> 23/100 OK
 '-.23' -> -23/100 ERROR
 '-0.234' -> -117/500 ERROR
-'-0.0000001' -> 0/1 ERROR
+'-0.0000001' -> -1/10000000 ERROR
 '  21332.2324   ' -> 917286/43 OK
 ' -21332.2324   ' -> -917286/43 ERROR
 
 Testing av_parse_color()
+bikeshed -> R(80) G(64) B(140) A(59)
+RaNdOm -> R(185) G(88) B(148) A(94)
+foo -> error
 red -> R(255) G(0) B(0) A(255)
+Red  -> error
 RED -> R(255) G(0) B(0) A(255)
 Violet -> R(238) G(130) B(238) A(255)
 Yellow -> R(255) G(255) B(0) A(255)
 Red -> R(255) G(0) B(0) A(255)
 0x000000 -> R(0) G(0) B(0) A(255)
+0x0000000 -> error
 0xff000000 -> R(255) G(0) B(0) A(0)
 0x3e34ff -> R(62) G(52) B(255) A(255)
 0x3e34ffaa -> R(62) G(52) B(255) A(170)
+0xffXXee -> error
+0xfoobar -> error
+0xffffeeeeeeee -> error
 #ff0000 -> R(255) G(0) B(0) A(255)
+#ffXX00 -> error
 ff0000 -> R(255) G(0) B(0) A(255)
+ffXX00 -> error
+red@foo -> error
+random@10 -> error
 0xff0000@1.0 -> R(255) G(0) B(0) A(255)
+red@ -> error
+red@0xfff -> error
 red@0xf -> R(255) G(0) B(0) A(15)
+red@2 -> error
 red@0.1 -> R(255) G(0) B(0) A(25)
+red@-1 -> error
 red@0.5 -> R(255) G(0) B(0) A(127)
 red@1.0 -> R(255) G(0) B(0) A(255)
+red@256 -> error
+red@10foo -> error
+red@-1.0 -> error
 red@-0.0 -> R(255) G(0) B(0) A(0)
+
+Testing av_small_strptime()
+fmt:'%Y-%m-%d' spec:'2012-12-21' -> 2012-12-21 00:00:00
+fmt:'%Y - %m - %d' spec:'2012-12-21' -> 2012-12-21 00:00:00
+fmt:'%Y-%m-%d %H:%M:%S' spec:'2012-12-21 20:12:21' -> 2012-12-21 20:12:21
+fmt:'  %Y - %m - %d %H : %M : %S' spec:'   2012 - 12 -  21   20 : 12 : 21' -> 2012-12-21 20:12:21
+fmt:'  %Y - %b - %d %H : %M : %S' spec:'   2012 - nOV -  21   20 : 12 : 21' -> 2012-11-21 20:12:21
+fmt:'  %Y - %B - %d %H : %M : %S' spec:'   2012 - nOVemBeR -  21   20 : 12 : 21' -> 2012-11-21 20:12:21
+fmt:'  %Y - %B%d %H : %M : %S' spec:'   2012 - may21   20 : 12 : 21' -> 2012-05-21 20:12:21
+fmt:'  %Y - %B%d %H : %M : %S' spec:'   2012 - mby21   20 : 12 : 21' -> error
+fmt:'  %Y - %B - %d %H : %M : %S' spec:'   2012 - JunE -  21   20 : 12 : 21' -> 2012-06-21 20:12:21
+fmt:'  %Y - %B - %d %H : %M : %S' spec:'   2012 - Jane -  21   20 : 12 : 21' -> error
+fmt:'  %Y - %B - %d %H : %M : %S' spec:'   2012 - January -  21   20 : 12 : 21' -> 2012-01-21 20:12:21
+
+Testing av_parse_time()
+(now is 2012-03-17 09:14:13.2 +0100, local time is UTC+1)
+now                      ->     1331972053.200000 = 2012-03-17T08:14:13Z
+12:35:46                 ->     1331984146.000000 = 2012-03-17T11:35:46Z
+2000-12-20 0:02:47.5z    ->      977270567.500000 = 2000-12-20T00:02:47Z
+2012 - 02-22  17:44:07   ->     1329929047.000000 = 2012-02-22T16:44:07Z
+2000-12-20T010247.6      ->      977270567.600000 = 2000-12-20T00:02:47Z
+2000-12-12 1:35:46+05:30 ->      976565146.000000 = 2000-12-11T20:05:46Z
+2002-12-12 22:30:40-02   ->     1039739440.000000 = 2002-12-13T00:30:40Z
+2:34:56.79               ->           +9296790000
+-1:23:45.67              ->           -5025670000
+42.1729                  ->             +42172900
+-1729.42                 ->           -1729420000
+12:34                    ->            +754000000
+
+Testing av_get_known_color_name()
+AliceBlue -> R(240) G(248) B(255) A(0)
+AntiqueWhite -> R(250) G(235) B(215) A(0)
+Aqua -> R(0) G(255) B(255) A(0)
+Aquamarine -> R(127) G(255) B(212) A(0)
+Azure -> R(240) G(255) B(255) A(0)
+Beige -> R(245) G(245) B(220) A(0)
+Bisque -> R(255) G(228) B(196) A(0)
+Black -> R(0) G(0) B(0) A(0)
+BlanchedAlmond -> R(255) G(235) B(205) A(0)
+Blue -> R(0) G(0) B(255) A(0)
+BlueViolet -> R(138) G(43) B(226) A(0)
+Brown -> R(165) G(42) B(42) A(0)
+BurlyWood -> R(222) G(184) B(135) A(0)
+CadetBlue -> R(95) G(158) B(160) A(0)
+Chartreuse -> R(127) G(255) B(0) A(0)
+Chocolate -> R(210) G(105) B(30) A(0)
+Coral -> R(255) G(127) B(80) A(0)
+CornflowerBlue -> R(100) G(149) B(237) A(0)
+Cornsilk -> R(255) G(248) B(220) A(0)
+Crimson -> R(220) G(20) B(60) A(0)
+Cyan -> R(0) G(255) B(255) A(0)
+DarkBlue -> R(0) G(0) B(139) A(0)
+DarkCyan -> R(0) G(139) B(139) A(0)
+DarkGoldenRod -> R(184) G(134) B(11) A(0)
+DarkGray -> R(169) G(169) B(169) A(0)
+DarkGreen -> R(0) G(100) B(0) A(0)
+DarkKhaki -> R(189) G(183) B(107) A(0)
+DarkMagenta -> R(139) G(0) B(139) A(0)
+DarkOliveGreen -> R(85) G(107) B(47) A(0)
+Darkorange -> R(255) G(140) B(0) A(0)
+DarkOrchid -> R(153) G(50) B(204) A(0)
+DarkRed -> R(139) G(0) B(0) A(0)
+DarkSalmon -> R(233) G(150) B(122) A(0)
+DarkSeaGreen -> R(143) G(188) B(143) A(0)
+DarkSlateBlue -> R(72) G(61) B(139) A(0)
+DarkSlateGray -> R(47) G(79) B(79) A(0)
+DarkTurquoise -> R(0) G(206) B(209) A(0)
+DarkViolet -> R(148) G(0) B(211) A(0)
+DeepPink -> R(255) G(20) B(147) A(0)
+DeepSkyBlue -> R(0) G(191) B(255) A(0)
+DimGray -> R(105) G(105) B(105) A(0)
+DodgerBlue -> R(30) G(144) B(255) A(0)
+FireBrick -> R(178) G(34) B(34) A(0)
+FloralWhite -> R(255) G(250) B(240) A(0)
+ForestGreen -> R(34) G(139) B(34) A(0)
+Fuchsia -> R(255) G(0) B(255) A(0)
+Gainsboro -> R(220) G(220) B(220) A(0)
+GhostWhite -> R(248) G(248) B(255) A(0)
+Gold -> R(255) G(215) B(0) A(0)
+GoldenRod -> R(218) G(165) B(32) A(0)
+Gray -> R(128) G(128) B(128) A(0)
+Green -> R(0) G(128) B(0) A(0)
+GreenYellow -> R(173) G(255) B(47) A(0)
+HoneyDew -> R(240) G(255) B(240) A(0)
+HotPink -> R(255) G(105) B(180) A(0)
+IndianRed -> R(205) G(92) B(92) A(0)
+Indigo -> R(75) G(0) B(130) A(0)
+Ivory -> R(255) G(255) B(240) A(0)
+Khaki -> R(240) G(230) B(140) A(0)
+Lavender -> R(230) G(230) B(250) A(0)
+LavenderBlush -> R(255) G(240) B(245) A(0)
+LawnGreen -> R(124) G(252) B(0) A(0)
+LemonChiffon -> R(255) G(250) B(205) A(0)
+LightBlue -> R(173) G(216) B(230) A(0)
+LightCoral -> R(240) G(128) B(128) A(0)
+LightCyan -> R(224) G(255) B(255) A(0)
+LightGoldenRodYellow -> R(250) G(250) B(210) A(0)
+LightGreen -> R(144) G(238) B(144) A(0)
+LightGrey -> R(211) G(211) B(211) A(0)
+LightPink -> R(255) G(182) B(193) A(0)
+LightSalmon -> R(255) G(160) B(122) A(0)
+LightSeaGreen -> R(32) G(178) B(170) A(0)
+LightSkyBlue -> R(135) G(206) B(250) A(0)
+LightSlateGray -> R(119) G(136) B(153) A(0)
+LightSteelBlue -> R(176) G(196) B(222) A(0)
+LightYellow -> R(255) G(255) B(224) A(0)
+Lime -> R(0) G(255) B(0) A(0)
+LimeGreen -> R(50) G(205) B(50) A(0)
+Linen -> R(250) G(240) B(230) A(0)
+Magenta -> R(255) G(0) B(255) A(0)
+Maroon -> R(128) G(0) B(0) A(0)
+MediumAquaMarine -> R(102) G(205) B(170) A(0)
+MediumBlue -> R(0) G(0) B(205) A(0)
+MediumOrchid -> R(186) G(85) B(211) A(0)
+MediumPurple -> R(147) G(112) B(216) A(0)
+MediumSeaGreen -> R(60) G(179) B(113) A(0)
+MediumSlateBlue -> R(123) G(104) B(238) A(0)
+MediumSpringGreen -> R(0) G(250) B(154) A(0)
+MediumTurquoise -> R(72) G(209) B(204) A(0)
+MediumVioletRed -> R(199) G(21) B(133) A(0)
+MidnightBlue -> R(25) G(25) B(112) A(0)
+MintCream -> R(245) G(255) B(250) A(0)
+MistyRose -> R(255) G(228) B(225) A(0)
+Moccasin -> R(255) G(228) B(181) A(0)
+NavajoWhite -> R(255) G(222) B(173) A(0)
+Navy -> R(0) G(0) B(128) A(0)
+OldLace -> R(253) G(245) B(230) A(0)
+Olive -> R(128) G(128) B(0) A(0)
+OliveDrab -> R(107) G(142) B(35) A(0)
+Orange -> R(255) G(165) B(0) A(0)
+OrangeRed -> R(255) G(69) B(0) A(0)
+Orchid -> R(218) G(112) B(214) A(0)
+PaleGoldenRod -> R(238) G(232) B(170) A(0)
+PaleGreen -> R(152) G(251) B(152) A(0)
+PaleTurquoise -> R(175) G(238) B(238) A(0)
+PaleVioletRed -> R(216) G(112) B(147) A(0)
+PapayaWhip -> R(255) G(239) B(213) A(0)
+PeachPuff -> R(255) G(218) B(185) A(0)
+Peru -> R(205) G(133) B(63) A(0)
+Pink -> R(255) G(192) B(203) A(0)
+Plum -> R(221) G(160) B(221) A(0)
+PowderBlue -> R(176) G(224) B(230) A(0)
+Purple -> R(128) G(0) B(128) A(0)
+Red -> R(255) G(0) B(0) A(0)
+RosyBrown -> R(188) G(143) B(143) A(0)
+RoyalBlue -> R(65) G(105) B(225) A(0)
+SaddleBrown -> R(139) G(69) B(19) A(0)
+Salmon -> R(250) G(128) B(114) A(0)
+SandyBrown -> R(244) G(164) B(96) A(0)
+SeaGreen -> R(46) G(139) B(87) A(0)
+SeaShell -> R(255) G(245) B(238) A(0)
+Sienna -> R(160) G(82) B(45) A(0)
+Silver -> R(192) G(192) B(192) A(0)
+SkyBlue -> R(135) G(206) B(235) A(0)
+SlateBlue -> R(106) G(90) B(205) A(0)
+SlateGray -> R(112) G(128) B(144) A(0)
+Snow -> R(255) G(250) B(250) A(0)
+SpringGreen -> R(0) G(255) B(127) A(0)
+SteelBlue -> R(70) G(130) B(180) A(0)
+Tan -> R(210) G(180) B(140) A(0)
+Teal -> R(0) G(128) B(128) A(0)
+Thistle -> R(216) G(191) B(216) A(0)
+Tomato -> R(255) G(99) B(71) A(0)
+Turquoise -> R(64) G(224) B(208) A(0)
+Violet -> R(238) G(130) B(238) A(0)
+Wheat -> R(245) G(222) B(179) A(0)
+White -> R(255) G(255) B(255) A(0)
+WhiteSmoke -> R(245) G(245) B(245) A(0)
+Yellow -> R(255) G(255) B(0) A(0)
+YellowGreen -> R(154) G(205) B(50) A(0)
+
+Testing av_find_info_tag()
+0. tag1 found: val1
+1. tag2 found: val2
+2. tag3 found: val3
+3. tag4 not found
+4. tag41 found: value 41
+5. 41 not found
+6. random1 not found
diff --git a/tests/ref/fate/pcm-planar b/tests/ref/fate/pcm-planar
index 91b4a78cd4..8b6c96181a 100644
--- a/tests/ref/fate/pcm-planar
+++ b/tests/ref/fate/pcm-planar
@@ -1,4 +1,9 @@
 #tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,     1471,     5884, 0x00000000
 0,       1471,       1471,     1471,     5884, 0x00000000
 0,       2942,       2942,     1472,     5888, 0x00000000
diff --git a/tests/ref/fate/pcm_dvd b/tests/ref/fate/pcm_dvd
index 6037451006..2a24156284 100644
--- a/tests/ref/fate/pcm_dvd
+++ b/tests/ref/fate/pcm_dvd
@@ -1,4 +1,9 @@
 #tb 0: 1/48000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 48000
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
 0,          0,          0,      334,     1336, 0x8e3c0abc
 0,        400,        400,      334,     1336, 0x99c41108
 0,        720,        720,      334,     1336, 0xd65be322
diff --git a/tests/ref/fate/pcm_s16be-stereo b/tests/ref/fate/pcm_s16be-stereo
index 2500ba26f1..6d29a67e2b 100644
--- a/tests/ref/fate/pcm_s16be-stereo
+++ b/tests/ref/fate/pcm_s16be-stereo
@@ -1 +1 @@
-f0c0fd7615cdef66fa72f5816632ca9b
+759cf5d12a4b2fb653e61f5219331f14
diff --git a/tests/ref/fate/pict b/tests/ref/fate/pict
index 0b764fc41f..f0f2e217ec 100644
--- a/tests/ref/fate/pict
+++ b/tests/ref/fate/pict
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x64
+#sar 0: 0/1
 0,          0,          0,        1,    49152, 0x144804b0
diff --git a/tests/ref/fate/pictor b/tests/ref/fate/pictor
index 3dc4344758..2c7cf93050 100644
--- a/tests/ref/fate/pictor
+++ b/tests/ref/fate/pictor
@@ -1,2 +1,6 @@
 #tb 0: 1/25
-0,          0,          0,        1,   192816, 0xf97e2ba1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 312x206
+#sar 0: 0/1
+0,          0,          0,        1,   192816, 0x29b9c158
diff --git a/tests/ref/fate/pixelutils b/tests/ref/fate/pixelutils
new file mode 100644
index 0000000000..493497fb88
--- /dev/null
+++ b/tests/ref/fate/pixelutils
@@ -0,0 +1,48 @@
+[OK] [UU] SAD [random] 2x2=409 ref=409
+[OK] [UU] SAD [random] 4x4=1370 ref=1370
+[OK] [UU] SAD [random] 8x8=5178 ref=5178
+[OK] [UU] SAD [random] 16x16=20946 ref=20946
+[OK] [AU] SAD [random] 2x2=320 ref=320
+[OK] [AU] SAD [random] 4x4=1522 ref=1522
+[OK] [AU] SAD [random] 8x8=5821 ref=5821
+[OK] [AU] SAD [random] 16x16=21951 ref=21951
+[OK] [AA] SAD [random] 2x2=276 ref=276
+[OK] [AA] SAD [random] 4x4=1521 ref=1521
+[OK] [AA] SAD [random] 8x8=5130 ref=5130
+[OK] [AA] SAD [random] 16x16=20775 ref=20775
+[OK] [UU] SAD [max] 2x2=1020 ref=1020
+[OK] [UU] SAD [max] 4x4=4080 ref=4080
+[OK] [UU] SAD [max] 8x8=16320 ref=16320
+[OK] [UU] SAD [max] 16x16=65280 ref=65280
+[OK] [AU] SAD [max] 2x2=1020 ref=1020
+[OK] [AU] SAD [max] 4x4=4080 ref=4080
+[OK] [AU] SAD [max] 8x8=16320 ref=16320
+[OK] [AU] SAD [max] 16x16=65280 ref=65280
+[OK] [AA] SAD [max] 2x2=1020 ref=1020
+[OK] [AA] SAD [max] 4x4=4080 ref=4080
+[OK] [AA] SAD [max] 8x8=16320 ref=16320
+[OK] [AA] SAD [max] 16x16=65280 ref=65280
+[OK] [UU] SAD [min] 2x2=0 ref=0
+[OK] [UU] SAD [min] 4x4=0 ref=0
+[OK] [UU] SAD [min] 8x8=0 ref=0
+[OK] [UU] SAD [min] 16x16=0 ref=0
+[OK] [AU] SAD [min] 2x2=0 ref=0
+[OK] [AU] SAD [min] 4x4=0 ref=0
+[OK] [AU] SAD [min] 8x8=0 ref=0
+[OK] [AU] SAD [min] 16x16=0 ref=0
+[OK] [AA] SAD [min] 2x2=0 ref=0
+[OK] [AA] SAD [min] 4x4=0 ref=0
+[OK] [AA] SAD [min] 8x8=0 ref=0
+[OK] [AA] SAD [min] 16x16=0 ref=0
+[OK] [UU] SAD [small] 2x2=400 ref=400
+[OK] [AU] SAD [small] 2x2=384 ref=384
+[OK] [AA] SAD [small] 2x2=409 ref=409
+[OK] [UU] SAD [small] 4x4=1144 ref=1144
+[OK] [AU] SAD [small] 4x4=1156 ref=1156
+[OK] [AA] SAD [small] 4x4=1086 ref=1086
+[OK] [UU] SAD [small] 8x8=6510 ref=6510
+[OK] [AU] SAD [small] 8x8=5755 ref=5755
+[OK] [AA] SAD [small] 8x8=6156 ref=6156
+[OK] [UU] SAD [small] 16x16=19490 ref=19490
+[OK] [AU] SAD [small] 16x16=21037 ref=21037
+[OK] [AA] SAD [small] 16x16=22986 ref=22986
diff --git a/tests/ref/fate/pixfmt_best b/tests/ref/fate/pixfmt_best
new file mode 100644
index 0000000000..699e2e4213
--- /dev/null
+++ b/tests/ref/fate/pixfmt_best
@@ -0,0 +1 @@
+72 tests passed, 0 tests failed.
diff --git a/tests/ref/fate/pixlet b/tests/ref/fate/pixlet
deleted file mode 100644
index 0c10fca1de..0000000000
--- a/tests/ref/fate/pixlet
+++ /dev/null
@@ -1,2 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,  2764800, 0xe8eff295
diff --git a/tests/ref/fate/pixlet-rgb b/tests/ref/fate/pixlet-rgb
new file mode 100644
index 0000000000..a445fddfa7
--- /dev/null
+++ b/tests/ref/fate/pixlet-rgb
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 13x9
+#sar 0: 1/1
+0,          0,          0,        1,      374, 0x93f1ba6d
diff --git a/tests/ref/fate/pmp-demux b/tests/ref/fate/pmp-demux
new file mode 100644
index 0000000000..5c51b8b453
--- /dev/null
+++ b/tests/ref/fate/pmp-demux
@@ -0,0 +1,111 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: mp3
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+0,          0,          0,     1152,      417, 0xcb873fba
+0,       1152,       1152,     1152,      104, 0x6d521c5a
+0,       2304,       2304,     1152,      104, 0xb3af1d64
+0,       3456,       3456,     1152,      104, 0xc0f71d86
+0,       4608,       4608,     1152,      104, 0xce3f1da8
+0,       5760,       5760,     1152,      104, 0xdb871dca
+0,       6912,       6912,     1152,      104, 0xe8cf1dec
+0,       8064,       8064,     1152,      104, 0xf6171e0e
+0,       9216,       9216,     1152,      104, 0x036e1e30
+0,      10368,      10368,     1152,      104, 0x3b921ec1
+0,      11520,      11520,     1152,      104, 0x3b921ec1
+0,      12672,      12672,     1152,      104, 0x3b921ec1
+0,      13824,      13824,     1152,      104, 0x3b921ec1
+0,      14976,      14976,     1152,      104, 0x3b921ec1
+0,      16128,      16128,     1152,      104, 0x3b921ec1
+0,      17280,      17280,     1152,      104, 0x3b921ec1
+0,      18432,      18432,     1152,      104, 0x3b921ec1
+0,      19584,      19584,     1152,      104, 0x3b921ec1
+0,      20736,      20736,     1152,      104, 0x3b921ec1
+0,      21888,      21888,     1152,      104, 0x3b921ec1
+0,      23040,      23040,     1152,      104, 0x3b921ec1
+0,      24192,      24192,     1152,      104, 0x3b921ec1
+0,      25344,      25344,     1152,      104, 0x3b921ec1
+0,      26496,      26496,     1152,      104, 0x3b921ec1
+0,      27648,      27648,     1152,      104, 0x3b921ec1
+0,      28800,      28800,     1152,      104, 0x3b921ec1
+0,      29952,      29952,     1152,      104, 0x3b921ec1
+0,      31104,      31104,     1152,      104, 0x3b921ec1
+0,      32256,      32256,     1152,      104, 0x3b921ec1
+0,      33408,      33408,     1152,      104, 0x3b921ec1
+0,      34560,      34560,     1152,      104, 0x3b921ec1
+0,      35712,      35712,     1152,      104, 0x3b921ec1
+0,      36864,      36864,     1152,      104, 0x3b921ec1
+0,      38016,      38016,     1152,      104, 0x3b921ec1
+0,      39168,      39168,     1152,      104, 0x3b921ec1
+0,      40320,      40320,     1152,      104, 0x3b921ec1
+0,      41472,      41472,     1152,      104, 0x3b921ec1
+0,      42624,      42624,     1152,      104, 0x3b921ec1
+0,      43776,      43776,     1152,      104, 0x3b921ec1
+0,      44928,      44928,     1152,      104, 0x3b921ec1
+0,      46080,      46080,     1152,      104, 0x3b921ec1
+0,      47232,      47232,     1152,      104, 0x3b921ec1
+0,      48384,      48384,     1152,      104, 0x3b921ec1
+0,      49536,      49536,     1152,      104, 0x3b921ec1
+0,      50688,      50688,     1152,      104, 0x3b921ec1
+0,      51840,      51840,     1152,      104, 0x3b921ec1
+0,      52992,      52992,     1152,      104, 0x3b921ec1
+0,      54144,      54144,     1152,      104, 0x3b921ec1
+0,      55296,      55296,     1152,      104, 0x3b921ec1
+0,      56448,      56448,     1152,      104, 0x3b921ec1
+0,      57600,      57600,     1152,      104, 0x3b921ec1
+0,      58752,      58752,     1152,      104, 0x3b921ec1
+0,      59904,      59904,     1152,      104, 0x3b921ec1
+0,      61056,      61056,     1152,      104, 0x3b921ec1
+0,      62208,      62208,     1152,      104, 0x3b921ec1
+0,      63360,      63360,     1152,      104, 0x3b921ec1
+0,      64512,      64512,     1152,      104, 0x3b921ec1
+0,      65664,      65664,     1152,      104, 0x3b921ec1
+0,      66816,      66816,     1152,      104, 0x3b921ec1
+0,      67968,      67968,     1152,      104, 0x3b921ec1
+0,      69120,      69120,     1152,      104, 0x3b921ec1
+0,      70272,      70272,     1152,      104, 0x3b921ec1
+0,      71424,      71424,     1152,      104, 0x3b921ec1
+0,      72576,      72576,     1152,      104, 0x3b921ec1
+0,      73728,      73728,     1152,      104, 0x3b921ec1
+0,      74880,      74880,     1152,      104, 0x3b921ec1
+0,      76032,      76032,     1152,      104, 0x3b921ec1
+0,      77184,      77184,     1152,      104, 0x3b921ec1
+0,      78336,      78336,     1152,      104, 0x3b921ec1
+0,      79488,      79488,     1152,      104, 0x3b921ec1
+0,      80640,      80640,     1152,      104, 0x3b921ec1
+0,      81792,      81792,     1152,      104, 0x3b921ec1
+0,      82944,      82944,     1152,      104, 0x3b921ec1
+0,      84096,      84096,     1152,      104, 0x3b921ec1
+0,      85248,      85248,     1152,      104, 0x3b921ec1
+0,      86400,      86400,     1152,      104, 0x3b921ec1
+0,      87552,      87552,     1152,      104, 0xf0211aa6
+0,      88704,      88704,     1152,      104, 0xd34224a5
+0,      89856,      89856,     1152,      104, 0x7b78282c
+0,      91008,      91008,     1152,      104, 0x06e32789
+0,      92160,      92160,     1152,      104, 0x1c502696
+0,      93312,      93312,     1152,      104, 0xd7392a5e
+0,      94464,      94464,     1152,      104, 0xbc1b288e
+0,      95616,      95616,     1152,      104, 0xbbd8261f
+0,      96768,      96768,     1152,      104, 0xebbb2f1c
+0,      97920,      97920,     1152,      104, 0xf55b31cc
+0,      99072,      99072,     1152,      104, 0xbdb930e0
+0,     100224,     100224,     1152,      104, 0x36b72db9
+0,     101376,     101376,     1152,      156, 0xbef24bc7
+0,     102528,     102528,     1152,      261, 0xefec7b06
+0,     103680,     103680,     1152,      208, 0xadcd5f92
+0,     104832,     104832,     1152,      261, 0x7ea9792e
+0,     105984,     105984,     1152,      182, 0xf7ad5524
+0,     107136,     107136,     1152,      208, 0x8f325a0c
+0,     108288,     108288,     1152,      208, 0xe6795cde
+0,     109440,     109440,     1152,      208, 0xd4bc5e11
+0,     110592,     110592,     1152,      208, 0x6762553b
+0,     111744,     111744,     1152,      156, 0x47cc39cc
+0,     112896,     112896,     1152,      130, 0xcdcd2e7b
+0,     114048,     114048,     1152,      261, 0x3864753a
+0,     115200,     115200,     1152,      156, 0xc5d24270
+0,     116352,     116352,     1152,      156, 0x3b664195
+0,     117504,     117504,     1152,      130, 0xa928320e
+0,     118656,     118656,     1152,      156, 0x58e03f10
+0,     119808,     119808,     1152,      261, 0xf0707a4c
diff --git a/tests/ref/fate/png-gray16 b/tests/ref/fate/png-gray16
index 7bd73d84d0..cf0d9c270b 100644
--- a/tests/ref/fate/png-gray16
+++ b/tests/ref/fate/png-gray16
@@ -1,2 +1,6 @@
 #tb 0: 1/25
-0,          0,          0,        1,   203280, 0x56c92114
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    49152, 0xc71b77cd
diff --git a/tests/ref/fate/png-gray8 b/tests/ref/fate/png-gray8
index 5b3096826b..77541ca3e0 100644
--- a/tests/ref/fate/png-gray8
+++ b/tests/ref/fate/png-gray8
@@ -1,2 +1,6 @@
 #tb 0: 1/25
-0,          0,          0,        1,   203280, 0xe5df9033
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    49152, 0x55121b03
diff --git a/tests/ref/fate/png-int-rgb24 b/tests/ref/fate/png-int-rgb24
new file mode 100644
index 0000000000..a37aac810c
--- /dev/null
+++ b/tests/ref/fate/png-int-rgb24
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 2835/2835
+0,          0,          0,        1,    49152, 0xe0013dee
diff --git a/tests/ref/fate/png-rgb24 b/tests/ref/fate/png-rgb24
index ed819cef61..54c8df877f 100644
--- a/tests/ref/fate/png-rgb24
+++ b/tests/ref/fate/png-rgb24
@@ -1,2 +1,6 @@
 #tb 0: 1/25
-0,          0,          0,        1,   203280, 0x57fff840
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 72/72
+0,          0,          0,        1,    49152, 0xe0013dee
diff --git a/tests/ref/fate/png-rgb48 b/tests/ref/fate/png-rgb48
index 8bd0445663..dee849f232 100644
--- a/tests/ref/fate/png-rgb48
+++ b/tests/ref/fate/png-rgb48
@@ -1,2 +1,6 @@
 #tb 0: 1/25
-0,          0,          0,        1,   203280, 0x764801bb
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    49152, 0xcf0e902a
diff --git a/tests/ref/fate/png-rgba b/tests/ref/fate/png-rgba
index eb473ced21..e4d5bb8e23 100644
--- a/tests/ref/fate/png-rgba
+++ b/tests/ref/fate/png-rgba
@@ -1,2 +1,6 @@
 #tb 0: 1/25
-0,          0,          0,        1,   203280, 0xb30c9da7
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    49152, 0x5017bc21
diff --git a/tests/ref/fate/png-rgba64 b/tests/ref/fate/png-rgba64
new file mode 100644
index 0000000000..3a66f19b5b
--- /dev/null
+++ b/tests/ref/fate/png-rgba64
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    49152, 0x04f35063
diff --git a/tests/ref/fate/png-ya16 b/tests/ref/fate/png-ya16
index b932700295..2797ec8831 100644
--- a/tests/ref/fate/png-ya16
+++ b/tests/ref/fate/png-ya16
@@ -1,2 +1,6 @@
 #tb 0: 1/25
-0,          0,          0,        1,   203280, 0xf1b83aeb
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    49152, 0x0801ce78
diff --git a/tests/ref/fate/png-ya8 b/tests/ref/fate/png-ya8
index 9ce98f698d..6fca461fae 100644
--- a/tests/ref/fate/png-ya8
+++ b/tests/ref/fate/png-ya8
@@ -1,2 +1,6 @@
 #tb 0: 1/25
-0,          0,          0,        1,   203280, 0xe77c008e
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 1/1
+0,          0,          0,        1,    49152, 0x5a1481f8
diff --git a/tests/ref/fate/pngparser b/tests/ref/fate/pngparser
index b481dcd392..111c41df58 100644
--- a/tests/ref/fate/pngparser
+++ b/tests/ref/fate/pngparser
@@ -1,5 +1,9 @@
 #tb 0: 1/25
-0,          0,          0,        1,   271040, 0xffe62f5f
-0,          1,          1,        1,   271040, 0xcf502f5f
-0,          2,          2,        1,   271040, 0x72612f5f
-0,          3,          3,        1,   271040, 0x41cb2f5f
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 20x20
+#sar 0: 3543/3543
+0,          0,          0,        1,     1600, 0x01a481a9
+0,          1,          1,        1,     1600, 0x01a481a9
+0,          2,          2,        1,     1600, 0x01a481a9
+0,          3,          3,        1,     1600, 0x01a481a9
diff --git a/tests/ref/fate/prores-422 b/tests/ref/fate/prores-422
index 379739fa08..1ae4f5f77e 100644
--- a/tests/ref/fate/prores-422
+++ b/tests/ref/fate/prores-422
@@ -1,3 +1,7 @@
-#tb 0: 1/2997
-0,          0,          0,        0,  8294400, 0xe8e9d448
-0,        100,        100,        0,  8294400, 0xe8e9d448
+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0x57127dd9
+0,          1,          1,        1,  8294400, 0x57127dd9
diff --git a/tests/ref/fate/prores-422_hq b/tests/ref/fate/prores-422_hq
index dc93c33122..4b4010dfc8 100644
--- a/tests/ref/fate/prores-422_hq
+++ b/tests/ref/fate/prores-422_hq
@@ -1,3 +1,7 @@
-#tb 0: 1/2997
-0,          0,          0,        0,  8294400, 0x817063b0
-0,        100,        100,        0,  8294400, 0x817063b0
+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0x978851f4
+0,          1,          1,        1,  8294400, 0x978851f4
diff --git a/tests/ref/fate/prores-422_lt b/tests/ref/fate/prores-422_lt
index 1c508409d3..853c50035d 100644
--- a/tests/ref/fate/prores-422_lt
+++ b/tests/ref/fate/prores-422_lt
@@ -1,3 +1,7 @@
-#tb 0: 1/2997
-0,          0,          0,        0,  8294400, 0xcd4ccde1
-0,        100,        100,        0,  8294400, 0xcd4ccde1
+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0x4ca110c7
+0,          1,          1,        1,  8294400, 0x4ca110c7
diff --git a/tests/ref/fate/prores-422_proxy b/tests/ref/fate/prores-422_proxy
index 3763b001fa..b77af3be1f 100644
--- a/tests/ref/fate/prores-422_proxy
+++ b/tests/ref/fate/prores-422_proxy
@@ -1,3 +1,7 @@
-#tb 0: 1/2997
-0,          0,          0,        0,  8294400, 0x51d29320
-0,        100,        100,        0,  8294400, 0x51d29320
+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1,  8294400, 0x007ba770
+0,          1,          1,        1,  8294400, 0x007ba770
diff --git a/tests/ref/fate/prores-alpha b/tests/ref/fate/prores-alpha
index 97be6cf236..f451d83ae9 100644
--- a/tests/ref/fate/prores-alpha
+++ b/tests/ref/fate/prores-alpha
@@ -1,3 +1,7 @@
-#tb 0: 1/2997
-0,          0,          0,        0, 16588800, 0x8dcdb600
-0,        100,        100,        0, 16588800, 0x8dcdb600
+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1, 16588800, 0x8e4dac48
+0,          1,          1,        1, 16588800, 0x8e4dac48
diff --git a/tests/ref/fate/prores-alpha_skip b/tests/ref/fate/prores-alpha_skip
new file mode 100644
index 0000000000..a17cef810c
--- /dev/null
+++ b/tests/ref/fate/prores-alpha_skip
@@ -0,0 +1,7 @@
+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 0/1
+0,          0,          0,        1, 12441600, 0xf11685dd
+0,          1,          1,        1, 12441600, 0xf11685dd
diff --git a/tests/ref/fate/prores-gray b/tests/ref/fate/prores-gray
new file mode 100644
index 0000000000..a1a63fa945
--- /dev/null
+++ b/tests/ref/fate/prores-gray
@@ -0,0 +1,16 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 16/15
+#tb 1: 1/48000
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,          0,          0,        1,  1658880, 0x43d9c9e2
+1,          0,          0,     1024,     4096, 0x6c8a9a18
+1,       1024,       1024,     1024,     4096, 0x960dadcf
+0,          1,          1,        1,  1658880, 0xa2a72f9b
+1,       2048,       2048,     1024,     4096, 0xa913cd55
diff --git a/tests/ref/fate/prores-transparency b/tests/ref/fate/prores-transparency
new file mode 100644
index 0000000000..7b3efc6335
--- /dev/null
+++ b/tests/ref/fate/prores-transparency
@@ -0,0 +1,14 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
+#tb 1: 1/48000
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,          0,          0,        1, 16588800, 0x7163b01a
+1,          0,          0,     1024,     4096, 0x00000000
+1,       1024,       1024,      896,     3584, 0x00000000
diff --git a/tests/ref/fate/prores-transparency_skip b/tests/ref/fate/prores-transparency_skip
new file mode 100644
index 0000000000..5c98d3e438
--- /dev/null
+++ b/tests/ref/fate/prores-transparency_skip
@@ -0,0 +1,14 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
+#tb 1: 1/48000
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+0,          0,          0,        1, 12441600, 0x627d1548
+1,          0,          0,     1024,     4096, 0x00000000
+1,       1024,       1024,      896,     3584, 0x00000000
diff --git a/tests/ref/fate/psd-duo-tone-color b/tests/ref/fate/psd-duo-tone-color
new file mode 100644
index 0000000000..3490e005ea
--- /dev/null
+++ b/tests/ref/fate/psd-duo-tone-color
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    16384, 0xe0cfa680
diff --git a/tests/ref/fate/psd-gray16 b/tests/ref/fate/psd-gray16
new file mode 100644
index 0000000000..668af669ad
--- /dev/null
+++ b/tests/ref/fate/psd-gray16
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xce3477d3
diff --git a/tests/ref/fate/psd-gray8 b/tests/ref/fate/psd-gray8
new file mode 100644
index 0000000000..1d8dc49f8d
--- /dev/null
+++ b/tests/ref/fate/psd-gray8
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0x55121b03
diff --git a/tests/ref/fate/psd-lena-127x127-rgb24 b/tests/ref/fate/psd-lena-127x127-rgb24
new file mode 100644
index 0000000000..2644f40c12
--- /dev/null
+++ b/tests/ref/fate/psd-lena-127x127-rgb24
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x127
+#sar 0: 0/1
+0,          0,          0,        1,    48387, 0xd7b6bec4
diff --git a/tests/ref/fate/psd-lena-256c b/tests/ref/fate/psd-lena-256c
new file mode 100644
index 0000000000..fdf13900a1
--- /dev/null
+++ b/tests/ref/fate/psd-lena-256c
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    17408, 0x4d80bf4f
diff --git a/tests/ref/fate/psd-lena-bitmap b/tests/ref/fate/psd-lena-bitmap
new file mode 100644
index 0000000000..03725d5d3b
--- /dev/null
+++ b/tests/ref/fate/psd-lena-bitmap
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,     2048, 0x40a72c4f
diff --git a/tests/ref/fate/psd-lena-rgb-rle-127x127-16b b/tests/ref/fate/psd-lena-rgb-rle-127x127-16b
new file mode 100644
index 0000000000..c065939581
--- /dev/null
+++ b/tests/ref/fate/psd-lena-rgb-rle-127x127-16b
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x127
+#sar 0: 0/1
+0,          0,          0,        1,    96774, 0xaab6cc1d
diff --git a/tests/ref/fate/psd-lena-rgb-rle-127x127-8b b/tests/ref/fate/psd-lena-rgb-rle-127x127-8b
new file mode 100644
index 0000000000..ac3b4a9473
--- /dev/null
+++ b/tests/ref/fate/psd-lena-rgb-rle-127x127-8b
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 127x127
+#sar 0: 0/1
+0,          0,          0,        1,    48387, 0x35b27b60
diff --git a/tests/ref/fate/psd-lena-rgba-rle-128x128-8b b/tests/ref/fate/psd-lena-rgba-rle-128x128-8b
new file mode 100644
index 0000000000..f3a11b7c5c
--- /dev/null
+++ b/tests/ref/fate/psd-lena-rgba-rle-128x128-8b
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    65536, 0xaaacdff3
diff --git a/tests/ref/fate/psd-rgb24 b/tests/ref/fate/psd-rgb24
new file mode 100644
index 0000000000..7f8f550afe
--- /dev/null
+++ b/tests/ref/fate/psd-rgb24
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xe0013dee
diff --git a/tests/ref/fate/psd-rgb48 b/tests/ref/fate/psd-rgb48
new file mode 100644
index 0000000000..f60cbab078
--- /dev/null
+++ b/tests/ref/fate/psd-rgb48
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0x0bc6503a
diff --git a/tests/ref/fate/psd-rgba b/tests/ref/fate/psd-rgba
new file mode 100644
index 0000000000..672898093d
--- /dev/null
+++ b/tests/ref/fate/psd-rgba
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xb2563b4a
diff --git a/tests/ref/fate/psd-rgba64 b/tests/ref/fate/psd-rgba64
new file mode 100644
index 0000000000..e51686767e
--- /dev/null
+++ b/tests/ref/fate/psd-rgba64
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xb847fd73
diff --git a/tests/ref/fate/psd-ya16 b/tests/ref/fate/psd-ya16
new file mode 100644
index 0000000000..96582ebe7f
--- /dev/null
+++ b/tests/ref/fate/psd-ya16
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xe8f08af3
diff --git a/tests/ref/fate/psd-ya8 b/tests/ref/fate/psd-ya8
new file mode 100644
index 0000000000..9a59fbf5a8
--- /dev/null
+++ b/tests/ref/fate/psd-ya8
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xfa0ee1d0
diff --git a/tests/ref/fate/psx-str-demux b/tests/ref/fate/psx-str-demux
index 42c5731142..a47c86952f 100644
--- a/tests/ref/fate/psx-str-demux
+++ b/tests/ref/fate/psx-str-demux
@@ -1,5 +1,14 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: mdec
+#dimensions 0: 320x240
+#sar 0: 0/1
 #tb 1: 4/75
+#media_type 1: audio
+#codec_id 1: adpcm_xa
+#sample_rate 1: 37800
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
 0,          0,          0,        1,     8832, 0x01ad3eeb
 1,          0,          0,        1,     2304, 0xf0ad1000
 1,          1,          1,        1,     2304, 0x69269ce6
diff --git a/tests/ref/fate/ptx b/tests/ref/fate/ptx
index fad2a500fe..3dee9c21fd 100644
--- a/tests/ref/fate/ptx
+++ b/tests/ref/fate/ptx
@@ -1,2 +1,6 @@
 #tb 0: 1/25
-0,          0,          0,        1,   393216, 0xda280efc
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1024x128
+#sar 0: 0/1
+0,          0,          0,        1,   393216, 0x30479950
diff --git a/tests/ref/fate/pva-demux b/tests/ref/fate/pva-demux
index 69b1d4015f..3f1c74f366 100644
--- a/tests/ref/fate/pva-demux
+++ b/tests/ref/fate/pva-demux
@@ -1,26 +1,36 @@
-#tb 0: 1/90000
-0,          0,          0,     2160,      384, 0x071abcc8
-0,       2160,       2160,     2160,      384, 0x31c9aee0
-0,       4320,       4320,     2160,      384, 0xa50eaa94
-0,       6480,       6480,     2160,      384, 0x9e86ba0e
-0,       8640,       8640,     2160,      384, 0x2321b800
-0,      10800,      10800,     2160,      384, 0x2347afa8
-0,      12960,      12960,     2160,      384, 0x0831b8d3
-0,      15120,      15120,     2160,      384, 0xd5acafa1
-0,      17280,      17280,     2160,      384, 0xc975b9d2
-0,      19440,      19440,     2160,      384, 0x2e10b02a
-0,      21600,      21600,     2160,      384, 0x501eadd0
-0,      23760,      23760,     2160,      384, 0x153fc171
-0,      25920,      25920,     2160,      384, 0xc5f0b3c2
-0,      28080,      28080,     2160,      384, 0xf731b200
-0,      30240,      30240,     2160,      384, 0x2e16b713
-0,      32400,      32400,     2160,      384, 0x61f6bba9
-0,      34560,      34560,     2160,      384, 0x1b9eb0ff
-0,      36720,      36720,     2160,      384, 0x2ab4b7bd
-0,      38880,      38880,     2160,      384, 0xd66eb45c
-0,      41040,      41040,     2160,      384, 0x145ab426
-0,      43200,      43200,     2160,      384, 0x297cb370
-0,      45360,      45360,     2160,      384, 0x287bb6b7
-0,      47520,      47520,     2160,      384, 0xfddbb7df
-0,      49680,      49680,     2160,      384, 0xbbb2af0c
-0,      51840,      51840,     2160,      384, 0x8f03b5fc
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 544x576
+#sar 0: 24/17
+#tb 1: 1/90000
+#media_type 1: audio
+#codec_id 1: mp2
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
+1,          0,          0,     2160,      384, 0x071abcc8
+1,       2160,       2160,     2160,      384, 0x31c9aee0
+1,       4320,       4320,     2160,      384, 0xa50eaa94
+1,       6480,       6480,     2160,      384, 0x9e86ba0e
+1,       8640,       8640,     2160,      384, 0x2321b800
+1,      10800,      10800,     2160,      384, 0x2347afa8
+1,      12960,      12960,     2160,      384, 0x0831b8d3
+1,      15120,      15120,     2160,      384, 0xd5acafa1
+1,      17280,      17280,     2160,      384, 0xc975b9d2
+1,      19440,      19440,     2160,      384, 0x2e10b02a
+1,      21600,      21600,     2160,      384, 0x501eadd0
+1,      23760,      23760,     2160,      384, 0x153fc171
+1,      25920,      25920,     2160,      384, 0xc5f0b3c2
+1,      28080,      28080,     2160,      384, 0xf731b200
+1,      30240,      30240,     2160,      384, 0x2e16b713
+1,      32400,      32400,     2160,      384, 0x61f6bba9
+1,      34560,      34560,     2160,      384, 0x1b9eb0ff
+1,      36720,      36720,     2160,      384, 0x2ab4b7bd
+1,      38880,      38880,     2160,      384, 0xd66eb45c
+1,      41040,      41040,     2160,      384, 0x145ab426
+1,      43200,      43200,     2160,      384, 0x297cb370
+1,      45360,      45360,     2160,      384, 0x287bb6b7
+1,      47520,      47520,     2160,      384, 0xfddbb7df
+1,      49680,      49680,     2160,      384, 0xbbb2af0c
+1,      51840,      51840,     2160,      384, 0x8f03b5fc
diff --git a/tests/ref/fate/qpeg b/tests/ref/fate/qpeg
index eca2924af7..1a988874e2 100644
--- a/tests/ref/fate/qpeg
+++ b/tests/ref/fate/qpeg
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   230400, 0x0b712fba
 0,          1,          1,        1,   230400, 0x30252ac7
 0,          2,          2,        1,   230400, 0x6d98a787
diff --git a/tests/ref/fate/qtrle-16bit b/tests/ref/fate/qtrle-16bit
index d0d71b57c2..57651de396 100644
--- a/tests/ref/fate/qtrle-16bit
+++ b/tests/ref/fate/qtrle-16bit
@@ -1,84 +1,88 @@
-#tb 0: 1/600
-0,          0,          0,        1,    57600, 0xe6b0a48c
-0,         40,         40,        1,    57600, 0xe064d51c
-0,         80,         80,        1,    57600, 0xbfce6b33
-0,        120,        120,        1,    57600, 0x371bab02
-0,        160,        160,        1,    57600, 0x0d2d7456
-0,        200,        200,        1,    57600, 0x9184eecb
-0,        240,        240,        1,    57600, 0xb482e8db
-0,        280,        280,        1,    57600, 0x0f4cd4be
-0,        320,        320,        1,    57600, 0xe276cccb
-0,        360,        360,        1,    57600, 0x04c21c62
-0,        400,        400,        1,    57600, 0x848960a2
-0,        440,        440,        1,    57600, 0xc4c8cf03
-0,        480,        480,        1,    57600, 0xb4094866
-0,        520,        520,        1,    57600, 0xf22da043
-0,        560,        560,        1,    57600, 0x6517b67b
-0,        600,        600,        1,    57600, 0x23e39ccb
-0,        640,        640,        1,    57600, 0x41525ca3
-0,        680,        680,        1,    57600, 0xc3edc5f3
-0,        720,        720,        1,    57600, 0x8ce81c7e
-0,        760,        760,        1,    57600, 0x56829443
-0,        800,        800,        1,    57600, 0x511ce287
-0,        840,        840,        1,    57600, 0x8f029a5b
-0,        880,        880,        1,    57600, 0x2b47cf43
-0,        920,        920,        1,    57600, 0x8e7ecf4b
-0,        960,        960,        1,    57600, 0xd620317e
-0,       1000,       1000,        1,    57600, 0x5987646e
-0,       1040,       1040,        1,    57600, 0xcfedb7df
-0,       1080,       1080,        1,    57600, 0x33746e7b
-0,       1120,       1120,        1,    57600, 0x1d318573
-0,       1160,       1160,        1,    57600, 0xc851848b
-0,       1200,       1200,        1,    57600, 0x939db1d7
-0,       1240,       1240,        1,    57600, 0x1719aed3
-0,       1280,       1280,        1,    57600, 0x1ba3e18c
-0,       1320,       1320,        1,    57600, 0x04f355fb
-0,       1360,       1360,        1,    57600, 0x6fafd5f4
-0,       1400,       1400,        1,    57600, 0x434f800b
-0,       1440,       1440,        1,    57600, 0xed42179b
-0,       1480,       1480,        1,    57600, 0x3b33118b
-0,       1520,       1520,        1,    57600, 0xf81880cb
-0,       1560,       1560,        1,    57600, 0xd2c58e1b
-0,       1600,       1600,        1,    57600, 0xd96f50eb
-0,       1640,       1640,        1,    57600, 0x64ef63fb
-0,       1680,       1680,        1,    57600, 0x7b14b6fc
-0,       1720,       1720,        1,    57600, 0xeb1c9054
-0,       1760,       1760,        1,    57600, 0x3b30c97c
-0,       1800,       1800,        1,    57600, 0xc93e9484
-0,       1840,       1840,        1,    57600, 0xe012c0cc
-0,       1880,       1880,        1,    57600, 0x48e2dda4
-0,       1920,       1920,        1,    57600, 0x13eb55fb
-0,       1960,       1960,        1,    57600, 0xa5edbedc
-0,       2000,       2000,        1,    57600, 0x0123a484
-0,       2040,       2040,        1,    57600, 0xc624a7ac
-0,       2080,       2080,        1,    57600, 0xd83cf45c
-0,       2120,       2120,        1,    57600, 0x8f9bf4b4
-0,       2160,       2160,        1,    57600, 0x2d494b8c
-0,       2200,       2200,        1,    57600, 0xb246f07c
-0,       2240,       2240,        1,    57600, 0x5750e67c
-0,       2280,       2280,        1,    57600, 0x6643e9ac
-0,       2320,       2320,        1,    57600, 0x8d3b86b3
-0,       2360,       2360,        1,    57600, 0x4bb0546b
-0,       2400,       2400,        1,    57600, 0xfe439333
-0,       2440,       2440,        1,    57600, 0x0cc76233
-0,       2480,       2480,        1,    57600, 0xb6fe40ae
-0,       2520,       2520,        1,    57600, 0xf79fe0d7
-0,       2560,       2560,        1,    57600, 0xdc90dcbb
-0,       2600,       2600,        1,    57600, 0x371e7c2b
-0,       2640,       2640,        1,    57600, 0x7c4590bb
-0,       2680,       2680,        1,    57600, 0x66f5454b
-0,       2720,       2720,        1,    57600, 0x1678ae5b
-0,       2760,       2760,        1,    57600, 0x1ee8fdec
-0,       2800,       2800,        1,    57600, 0x98d2a083
-0,       2840,       2840,        1,    57600, 0x86d29e5b
-0,       2880,       2880,        1,    57600, 0x23d2bc83
-0,       2920,       2920,        1,    57600, 0x3fc729f2
-0,       2960,       2960,        1,    57600, 0x821d61da
-0,       3000,       3000,        1,    57600, 0xdd549e0e
-0,       3040,       3040,        1,    57600, 0x641234e2
-0,       3080,       3080,        1,    57600, 0x9a282112
-0,       3120,       3120,        1,    57600, 0x6587e2fb
-0,       3160,       3160,        1,    57600, 0x043d0cb2
-0,       3200,       3200,        1,    57600, 0x90328707
-0,       3240,       3240,        1,    57600, 0x5744d313
-0,       3280,       3280,        1,    57600, 0x6e1b95cb
+#tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
+0,          0,          0,        1,    57600, 0xcf2d39fc
+0,          1,          1,        1,    57600, 0xfc9f6bed
+0,          2,          2,        1,    57600, 0x3f5805bb
+0,          3,          3,        1,    57600, 0xcb34504e
+0,          4,          4,        1,    57600, 0x66b6f6e9
+0,          5,          5,        1,    57600, 0x18698e4d
+0,          6,          6,        1,    57600, 0x233288d7
+0,          7,          7,        1,    57600, 0x6b195ac5
+0,          8,          8,        1,    57600, 0x3b466b45
+0,          9,          9,        1,    57600, 0x9e3dbd75
+0,         10,         10,        1,    57600, 0x90ee04b7
+0,         11,         11,        1,    57600, 0x81096dda
+0,         12,         12,        1,    57600, 0xef24ca50
+0,         13,         13,        1,    57600, 0xea7a3da8
+0,         14,         14,        1,    57600, 0xc3f054c2
+0,         15,         15,        1,    57600, 0x34af39ec
+0,         16,         16,        1,    57600, 0xfc31f846
+0,         17,         17,        1,    57600, 0xa4606399
+0,         18,         18,        1,    57600, 0x4b8a9c88
+0,         19,         19,        1,    57600, 0x87db3195
+0,         20,         20,        1,    57600, 0x443b618d
+0,         21,         21,        1,    57600, 0x601e380e
+0,         22,         22,        1,    57600, 0x405c6e6f
+0,         23,         23,        1,    57600, 0xe6b66f29
+0,         24,         24,        1,    57600, 0xb8e4b2d1
+0,         25,         25,        1,    57600, 0x9fc8e7da
+0,         26,         26,        1,    57600, 0x3bdb363b
+0,         27,         27,        1,    57600, 0xacac0b6a
+0,         28,         28,        1,    57600, 0xff3022fb
+0,         29,         29,        1,    57600, 0x1e5721f3
+0,         30,         30,        1,    57600, 0x511a3071
+0,         31,         31,        1,    57600, 0xff6d4dc0
+0,         32,         32,        1,    57600, 0x5df97a35
+0,         33,         33,        1,    57600, 0x3877f1b1
+0,         34,         34,        1,    57600, 0xa9096dd2
+0,         35,         35,        1,    57600, 0xd36e1ccc
+0,         36,         36,        1,    57600, 0xdc94b124
+0,         37,         37,        1,    57600, 0x873fab49
+0,         38,         38,        1,    57600, 0x7f081dca
+0,         39,         39,        1,    57600, 0x7df52bc3
+0,         40,         40,        1,    57600, 0xf41feb99
+0,         41,         41,        1,    57600, 0xcf59ffeb
+0,         42,         42,        1,    57600, 0x0dd94dfe
+0,         43,         43,        1,    57600, 0xfbc52500
+0,         44,         44,        1,    57600, 0xc300606e
+0,         45,         45,        1,    57600, 0x01e529b4
+0,         46,         46,        1,    57600, 0x359a57b0
+0,         47,         47,        1,    57600, 0xcfee7511
+0,         48,         48,        1,    57600, 0x2189f139
+0,         49,         49,        1,    57600, 0xcc535558
+0,         50,         50,        1,    57600, 0xeed13a76
+0,         51,         51,        1,    57600, 0xfb5c3ddd
+0,         52,         52,        1,    57600, 0x36a98c53
+0,         53,         53,        1,    57600, 0xf4c38c4b
+0,         54,         54,        1,    57600, 0x53d5df15
+0,         55,         55,        1,    57600, 0x336d890c
+0,         56,         56,        1,    57600, 0x19967f1c
+0,         57,         57,        1,    57600, 0xa36b8224
+0,         58,         58,        1,    57600, 0xf6ec2490
+0,         59,         59,        1,    57600, 0x6ffff0d1
+0,         60,         60,        1,    57600, 0xfcb73114
+0,         61,         61,        1,    57600, 0x5f5fff35
+0,         62,         62,        1,    57600, 0xf113c4a0
+0,         63,         63,        1,    57600, 0x64ca6175
+0,         64,         64,        1,    57600, 0x3f6f7d15
+0,         65,         65,        1,    57600, 0x18b619df
+0,         66,         66,        1,    57600, 0xe6872ed7
+0,         67,         67,        1,    57600, 0x3641e174
+0,         68,         68,        1,    57600, 0x4c144d8c
+0,         69,         69,        1,    57600, 0x82529776
+0,         70,         70,        1,    57600, 0xd96f3ead
+0,         71,         71,        1,    57600, 0xce183c4e
+0,         72,         72,        1,    57600, 0xaa475b24
+0,         73,         73,        1,    57600, 0xf7c5cbf3
+0,         74,         74,        1,    57600, 0x798e0548
+0,         75,         75,        1,    57600, 0x1233241a
+0,         76,         76,        1,    57600, 0x1424d758
+0,         77,         77,        1,    57600, 0xa446c264
+0,         78,         78,        1,    57600, 0x66e082ae
+0,         79,         79,        1,    57600, 0xb58cacc8
+0,         80,         80,        1,    57600, 0x3d86431c
+0,         81,         81,        1,    57600, 0x601b724e
+0,         82,         82,        1,    57600, 0xbe9a32c8
diff --git a/tests/ref/fate/qtrle-1bit b/tests/ref/fate/qtrle-1bit
index a424e47765..d2f10bc9b8 100644
--- a/tests/ref/fate/qtrle-1bit
+++ b/tests/ref/fate/qtrle-1bit
@@ -1,39 +1,43 @@
-#tb 0: 1/1200
-0,          0,          0,        0,     9600, 0xc5921aa2
-0,        100,        100,        0,     9600, 0x9032fc52
-0,        200,        200,        0,     9600, 0x7db0038e
-0,        300,        300,        0,     9600, 0x95b73c41
-0,        400,        400,        0,     9600, 0x531e4189
-0,        500,        500,        0,     9600, 0xb73390ec
-0,        600,        600,        0,     9600, 0x958e8221
-0,        700,        700,        0,     9600, 0xd393f8a6
-0,        800,        800,        0,     9600, 0xa085da1c
-0,        900,        900,        0,     9600, 0x57ace74f
-0,       1000,       1000,        0,     9600, 0x5d11a308
-0,       1100,       1100,        0,     9600, 0x13e133b7
-0,       1200,       1200,        0,     9600, 0x494edb86
-0,       1300,       1300,        0,     9600, 0x43a448ea
-0,       1400,       1400,        0,     9600, 0x3562d35b
-0,       1500,       1500,        0,     9600, 0x0bc655d2
-0,       1600,       1600,        0,     9600, 0xbece73a1
-0,       1700,       1700,        0,     9600, 0x82e7cfa1
-0,       1800,       1800,        0,     9600, 0xda29fd8f
-0,       1900,       1900,        0,     9600, 0x70fb700b
-0,       2000,       2000,        0,     9600, 0xaf57a6b0
-0,       2100,       2100,        0,     9600, 0x0a5ed9b9
-0,       2200,       2200,        0,     9600, 0xf7c62c38
-0,       2300,       2300,        0,     9600, 0x0aa2ccfd
-0,       2400,       2400,        0,     9600, 0xc9adabae
-0,       2500,       2500,        0,     9600, 0x67ff0aba
-0,       2600,       2600,        0,     9600, 0xea79a465
-0,       2700,       2700,        0,     9600, 0x8928c626
-0,       2800,       2800,        0,     9600, 0x8dab4111
-0,       2900,       2900,        0,     9600, 0x81ef63f9
-0,       3000,       3000,        0,     9600, 0xf977bc5e
-0,       3100,       3100,        0,     9600, 0x9e6a3f4a
-0,       3200,       3200,        0,     9600, 0x77c92865
-0,       3300,       3300,        0,     9600, 0x3915170d
-0,       3400,       3400,        0,     9600, 0xbe19b995
-0,       3500,       3500,        0,     9600, 0x3e8a3077
-0,       3600,       3600,        0,     9600, 0x1331342e
-0,       3700,       3700,        0,     9600, 0x4d692175
+#tb 0: 1/12
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+0,          0,          0,        1,    77824, 0xc298c68b
+0,          1,          1,        1,    77824, 0x22f7c63e
+0,          2,          2,        1,    77824, 0x2aacc669
+0,          3,          3,        1,    77824, 0xb428c6e9
+0,          4,          4,        1,    77824, 0x5d50c786
+0,          5,          5,        1,    77824, 0x8ddbc9e9
+0,          6,          6,        1,    77824, 0x6dd5c9cf
+0,          7,          7,        1,    77824, 0x7a72c647
+0,          8,          8,        1,    77824, 0x0659c448
+0,          9,          9,        1,    77824, 0x228bc465
+0,         10,         10,        1,    77824, 0x87d9c3f9
+0,         11,         11,        1,    77824, 0xd07dbf9c
+0,         12,         12,        1,    77824, 0x9c91bc67
+0,         13,         13,        1,    77824, 0xf91fb881
+0,         14,         14,        1,    77824, 0x068eb41a
+0,         15,         15,        1,    77824, 0x4b52b03f
+0,         16,         16,        1,    77824, 0xc5e9b11b
+0,         17,         17,        1,    77824, 0xf0aeac90
+0,         18,         18,        1,    77824, 0x5700ad55
+0,         19,         19,        1,    77824, 0x4d93a895
+0,         20,         20,        1,    77824, 0x6df1aac7
+0,         21,         21,        1,    77824, 0xeee6b4ae
+0,         22,         22,        1,    77824, 0x6fe5bf5a
+0,         23,         23,        1,    77824, 0x8c1ac3d3
+0,         24,         24,        1,    77824, 0x5ab2c2da
+0,         25,         25,        1,    77824, 0x6141aeab
+0,         26,         26,        1,    77824, 0xbda0a2b8
+0,         27,         27,        1,    77824, 0x46fa932a
+0,         28,         28,        1,    77824, 0xed009680
+0,         29,         29,        1,    77824, 0xf3078f3e
+0,         30,         30,        1,    77824, 0x444f8b3c
+0,         31,         31,        1,    77824, 0x7b468685
+0,         32,         32,        1,    77824, 0x2b078646
+0,         33,         33,        1,    77824, 0x9165859b
+0,         34,         34,        1,    77824, 0xf96682c7
+0,         35,         35,        1,    77824, 0x239186d0
+0,         36,         36,        1,    77824, 0x499b8ec3
+0,         37,         37,        1,    77824, 0x20658ea8
diff --git a/tests/ref/fate/qtrle-24bit b/tests/ref/fate/qtrle-24bit
index 7a162b820e..545e82e3f1 100644
--- a/tests/ref/fate/qtrle-24bit
+++ b/tests/ref/fate/qtrle-24bit
@@ -1,35 +1,39 @@
-#tb 0: 1/600
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    57600, 0x3718ad00
-0,         60,         60,        1,    57600, 0x54861558
-0,        120,        120,        1,    57600, 0xea1d6233
-0,        180,        180,        1,    57600, 0xf669a2fd
-0,        240,        240,        1,    57600, 0xc9f76f31
-0,        300,        300,        1,    57600, 0xe23c6d7b
-0,        360,        360,        1,    57600, 0xbc9d6167
-0,        420,        420,        1,    57600, 0x0ca63477
-0,        480,        480,        1,    57600, 0xc0850d22
-0,        540,        540,        1,    57600, 0x735d10b2
-0,        600,        600,        1,    57600, 0x561f3c4a
-0,        660,        660,        1,    57600, 0x84db9cf1
-0,        720,        720,        1,    57600, 0x9fb841f4
-0,        780,        780,        1,    57600, 0xeaf262ab
-0,        840,        840,        1,    57600, 0x264886b4
-0,        900,        900,        1,    57600, 0x5edc5518
-0,        960,        960,        1,    57600, 0xd3e60c72
-0,       1020,       1020,        1,    57600, 0x9cabaed7
-0,       1080,       1080,        1,    57600, 0x616716cf
-0,       1140,       1140,        1,    57600, 0xa43f61aa
-0,       1200,       1200,        1,    57600, 0xdba3a0bd
-0,       1260,       1260,        1,    57600, 0xa7dd6dfa
-0,       1320,       1320,        1,    57600, 0xc3fa6c84
-0,       1380,       1380,        1,    57600, 0xb1275fb8
-0,       1440,       1440,        1,    57600, 0x2e39331f
-0,       1500,       1500,        1,    57600, 0x5b9e0bca
-0,       1560,       1560,        1,    57600, 0x0e760f5a
-0,       1620,       1620,        1,    57600, 0xc56c3e69
-0,       1680,       1680,        1,    57600, 0x51da9fb8
-0,       1740,       1740,        1,    57600, 0xe3a1432b
-0,       1800,       1800,        1,    57600, 0xe1b360a3
-0,       1860,       1860,        1,    57600, 0x30b383cd
-0,       1920,       1920,        1,    57600, 0x950c5439
-0,       1980,       1980,        1,    57600, 0x8f9d0ca2
+0,          1,          1,        1,    57600, 0x54861558
+0,          2,          2,        1,    57600, 0xea1d6233
+0,          3,          3,        1,    57600, 0xf669a2fd
+0,          4,          4,        1,    57600, 0xc9f76f31
+0,          5,          5,        1,    57600, 0xe23c6d7b
+0,          6,          6,        1,    57600, 0xbc9d6167
+0,          7,          7,        1,    57600, 0x0ca63477
+0,          8,          8,        1,    57600, 0xc0850d22
+0,          9,          9,        1,    57600, 0x735d10b2
+0,         10,         10,        1,    57600, 0x561f3c4a
+0,         11,         11,        1,    57600, 0x84db9cf1
+0,         12,         12,        1,    57600, 0x9fb841f4
+0,         13,         13,        1,    57600, 0xeaf262ab
+0,         14,         14,        1,    57600, 0x264886b4
+0,         15,         15,        1,    57600, 0x5edc5518
+0,         16,         16,        1,    57600, 0xd3e60c72
+0,         17,         17,        1,    57600, 0x9cabaed7
+0,         18,         18,        1,    57600, 0x616716cf
+0,         19,         19,        1,    57600, 0xa43f61aa
+0,         20,         20,        1,    57600, 0xdba3a0bd
+0,         21,         21,        1,    57600, 0xa7dd6dfa
+0,         22,         22,        1,    57600, 0xc3fa6c84
+0,         23,         23,        1,    57600, 0xb1275fb8
+0,         24,         24,        1,    57600, 0x2e39331f
+0,         25,         25,        1,    57600, 0x5b9e0bca
+0,         26,         26,        1,    57600, 0x0e760f5a
+0,         27,         27,        1,    57600, 0xc56c3e69
+0,         28,         28,        1,    57600, 0x51da9fb8
+0,         29,         29,        1,    57600, 0xe3a1432b
+0,         30,         30,        1,    57600, 0xe1b360a3
+0,         31,         31,        1,    57600, 0x30b383cd
+0,         32,         32,        1,    57600, 0x950c5439
+0,         33,         33,        1,    57600, 0x8f9d0ca2
diff --git a/tests/ref/fate/qtrle-2bit b/tests/ref/fate/qtrle-2bit
index 5866db5955..633dd1431d 100644
--- a/tests/ref/fate/qtrle-2bit
+++ b/tests/ref/fate/qtrle-2bit
@@ -1,39 +1,43 @@
-#tb 0: 1/1200
-0,          0,          0,        0,   230400, 0xb1ee55dc
-0,        100,        100,        0,   230400, 0x97c580bf
-0,        200,        200,        0,   230400, 0xd4bd57e8
-0,        300,        300,        0,   230400, 0x412b79aa
-0,        400,        400,        0,   230400, 0x928a44d1
-0,        500,        500,        0,   230400, 0x6bbdc0e4
-0,        600,        600,        0,   230400, 0x382e960f
-0,        700,        700,        0,   230400, 0x62c863ea
-0,        800,        800,        0,   230400, 0xbfccd3ce
-0,        900,        900,        0,   230400, 0x1987cdd4
-0,       1000,       1000,        0,   230400, 0x40279727
-0,       1100,       1100,        0,   230400, 0x9d4f6746
-0,       1200,       1200,        0,   230400, 0x7b8a77ec
-0,       1300,       1300,        0,   230400, 0x2ce7a781
-0,       1400,       1400,        0,   230400, 0xb749815e
-0,       1500,       1500,        0,   230400, 0x61c88610
-0,       1600,       1600,        0,   230400, 0x8449114d
-0,       1700,       1700,        0,   230400, 0x5f73e666
-0,       1800,       1800,        0,   230400, 0xbde53ce6
-0,       1900,       1900,        0,   230400, 0x8c7406fd
-0,       2000,       2000,        0,   230400, 0xf9e9a3ef
-0,       2100,       2100,        0,   230400, 0x7e0a3077
-0,       2200,       2200,        0,   230400, 0xd9245c5f
-0,       2300,       2300,        0,   230400, 0x6d077ea2
-0,       2400,       2400,        0,   230400, 0xf622bb2a
-0,       2500,       2500,        0,   230400, 0x35292dc8
-0,       2600,       2600,        0,   230400, 0xc0cea946
-0,       2700,       2700,        0,   230400, 0x98b27b60
-0,       2800,       2800,        0,   230400, 0x668ef6bd
-0,       2900,       2900,        0,   230400, 0x6c07a31c
-0,       3000,       3000,        0,   230400, 0x0b4a6ae1
-0,       3100,       3100,        0,   230400, 0x945b9878
-0,       3200,       3200,        0,   230400, 0xab28031c
-0,       3300,       3300,        0,   230400, 0x977252b0
-0,       3400,       3400,        0,   230400, 0x6c3d9706
-0,       3500,       3500,        0,   230400, 0xe053bc2a
-0,       3600,       3600,        0,   230400, 0x4cf2fc7c
-0,       3700,       3700,        0,   230400, 0x610beda7
+#tb 0: 1/12
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+0,          0,          0,        1,   230400, 0xb1ee55dc
+0,          1,          1,        1,   230400, 0x97c580bf
+0,          2,          2,        1,   230400, 0xd4bd57e8
+0,          3,          3,        1,   230400, 0x412b79aa
+0,          4,          4,        1,   230400, 0x928a44d1
+0,          5,          5,        1,   230400, 0x6bbdc0e4
+0,          6,          6,        1,   230400, 0x382e960f
+0,          7,          7,        1,   230400, 0x62c863ea
+0,          8,          8,        1,   230400, 0xbfccd3ce
+0,          9,          9,        1,   230400, 0x1987cdd4
+0,         10,         10,        1,   230400, 0x40279727
+0,         11,         11,        1,   230400, 0x9d4f6746
+0,         12,         12,        1,   230400, 0x7b8a77ec
+0,         13,         13,        1,   230400, 0x2ce7a781
+0,         14,         14,        1,   230400, 0xb749815e
+0,         15,         15,        1,   230400, 0x61c88610
+0,         16,         16,        1,   230400, 0x8449114d
+0,         17,         17,        1,   230400, 0x5f73e666
+0,         18,         18,        1,   230400, 0xbde53ce6
+0,         19,         19,        1,   230400, 0x8c7406fd
+0,         20,         20,        1,   230400, 0xf9e9a3ef
+0,         21,         21,        1,   230400, 0x7e0a3077
+0,         22,         22,        1,   230400, 0xd9245c5f
+0,         23,         23,        1,   230400, 0x6d077ea2
+0,         24,         24,        1,   230400, 0xf622bb2a
+0,         25,         25,        1,   230400, 0x35292dc8
+0,         26,         26,        1,   230400, 0xc0cea946
+0,         27,         27,        1,   230400, 0x98b27b60
+0,         28,         28,        1,   230400, 0x668ef6bd
+0,         29,         29,        1,   230400, 0x6c07a31c
+0,         30,         30,        1,   230400, 0x0b4a6ae1
+0,         31,         31,        1,   230400, 0x945b9878
+0,         32,         32,        1,   230400, 0xab28031c
+0,         33,         33,        1,   230400, 0x977252b0
+0,         34,         34,        1,   230400, 0x6c3d9706
+0,         35,         35,        1,   230400, 0xe053bc2a
+0,         36,         36,        1,   230400, 0x4cf2fc7c
+0,         37,         37,        1,   230400, 0x610beda7
diff --git a/tests/ref/fate/qtrle-32bit b/tests/ref/fate/qtrle-32bit
index bbdd464593..aaaf8d6470 100644
--- a/tests/ref/fate/qtrle-32bit
+++ b/tests/ref/fate/qtrle-32bit
@@ -1,27 +1,31 @@
-#tb 0: 1/2997
-0,          0,          0,        0,  1036800, 0x2a90d062
-0,        100,        100,        0,  1036800, 0x6565aded
-0,        200,        200,        0,  1036800, 0xf0b587d2
-0,        300,        300,        0,  1036800, 0xf0b4e53f
-0,        400,        400,        0,  1036800, 0x5ba4b96a
-0,        500,        500,        0,  1036800, 0x501df9c1
-0,        600,        600,        0,  1036800, 0xcf45b940
-0,        700,        700,        0,  1036800, 0xa454df07
-0,        800,        800,        0,  1036800, 0xc504d152
-0,        900,        900,        0,  1036800, 0xd90ecac7
-0,       1000,       1000,        0,  1036800, 0xe30368df
-0,       1100,       1100,        0,  1036800, 0x0ca35522
-0,       1200,       1200,        0,  1036800, 0xe76b8d43
-0,       1300,       1300,        0,  1036800, 0x7c85a447
-0,       1400,       1400,        0,  1036800, 0x3e2d1b5f
-0,       1500,       1500,        0,  1036800, 0x230fa5a6
-0,       1600,       1600,        0,  1036800, 0x4fad025e
-0,       1700,       1700,        0,  1036800, 0x7d3366ae
-0,       1800,       1800,        0,  1036800, 0xa83720f7
-0,       1900,       1900,        0,  1036800, 0x5dbd13b1
-0,       2000,       2000,        0,  1036800, 0xd0ebd56d
-0,       2100,       2100,        0,  1036800, 0x4d7c67f3
-0,       2200,       2200,        0,  1036800, 0x226baa3f
-0,       2300,       2300,        0,  1036800, 0xc0e93acf
-0,       2400,       2400,        0,  1036800, 0x5a466c17
-0,       2500,       2500,        0,  1036800, 0xfdb7d2ea
+#tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
+0,          0,          0,        1,  1036800, 0x2a90d062
+0,          1,          1,        1,  1036800, 0x6565aded
+0,          2,          2,        1,  1036800, 0xf0b587d2
+0,          3,          3,        1,  1036800, 0xf0b4e53f
+0,          4,          4,        1,  1036800, 0x5ba4b96a
+0,          5,          5,        1,  1036800, 0x501df9c1
+0,          6,          6,        1,  1036800, 0xcf45b940
+0,          7,          7,        1,  1036800, 0xa454df07
+0,          8,          8,        1,  1036800, 0xc504d152
+0,          9,          9,        1,  1036800, 0xd90ecac7
+0,         10,         10,        1,  1036800, 0xe30368df
+0,         11,         11,        1,  1036800, 0x0ca35522
+0,         12,         12,        1,  1036800, 0xe76b8d43
+0,         13,         13,        1,  1036800, 0x7c85a447
+0,         14,         14,        1,  1036800, 0x3e2d1b5f
+0,         15,         15,        1,  1036800, 0x230fa5a6
+0,         16,         16,        1,  1036800, 0x4fad025e
+0,         17,         17,        1,  1036800, 0x7d3366ae
+0,         18,         18,        1,  1036800, 0xa83720f7
+0,         19,         19,        1,  1036800, 0x5dbd13b1
+0,         20,         20,        1,  1036800, 0xd0ebd56d
+0,         21,         21,        1,  1036800, 0x4d7c67f3
+0,         22,         22,        1,  1036800, 0x226baa3f
+0,         23,         23,        1,  1036800, 0xc0e93acf
+0,         24,         24,        1,  1036800, 0x5a466c17
+0,         25,         25,        1,  1036800, 0xfdb7d2ea
diff --git a/tests/ref/fate/qtrle-4bit b/tests/ref/fate/qtrle-4bit
index cc09e78475..b09920b972 100644
--- a/tests/ref/fate/qtrle-4bit
+++ b/tests/ref/fate/qtrle-4bit
@@ -1,39 +1,43 @@
-#tb 0: 1/1200
-0,          0,          0,        0,   230400, 0x0655b3d9
-0,        100,        100,        0,   230400, 0x9c626fd3
-0,        200,        200,        0,   230400, 0x5bc95868
-0,        300,        300,        0,   230400, 0x55a38387
-0,        400,        400,        0,   230400, 0xd3495b60
-0,        500,        500,        0,   230400, 0xecdb2d15
-0,        600,        600,        0,   230400, 0x7f9b373e
-0,        700,        700,        0,   230400, 0x51caac22
-0,        800,        800,        0,   230400, 0x0f2ac153
-0,        900,        900,        0,   230400, 0xe5a6f9e7
-0,       1000,       1000,        0,   230400, 0xfc2b2250
-0,       1100,       1100,        0,   230400, 0x24e2da1b
-0,       1200,       1200,        0,   230400, 0x2723d7dd
-0,       1300,       1300,        0,   230400, 0x024a4989
-0,       1400,       1400,        0,   230400, 0xdbafb92d
-0,       1500,       1500,        0,   230400, 0x6b9b5056
-0,       1600,       1600,        0,   230400, 0x010cabb4
-0,       1700,       1700,        0,   230400, 0xf75bc1c0
-0,       1800,       1800,        0,   230400, 0x6c7fd744
-0,       1900,       1900,        0,   230400, 0xabe4371a
-0,       2000,       2000,        0,   230400, 0xe41fb781
-0,       2100,       2100,        0,   230400, 0x42c5649e
-0,       2200,       2200,        0,   230400, 0xf5511deb
-0,       2300,       2300,        0,   230400, 0xebf5ab32
-0,       2400,       2400,        0,   230400, 0x44398194
-0,       2500,       2500,        0,   230400, 0xfd63510c
-0,       2600,       2600,        0,   230400, 0xa013975e
-0,       2700,       2700,        0,   230400, 0xe0aa028d
-0,       2800,       2800,        0,   230400, 0x349f6f3b
-0,       2900,       2900,        0,   230400, 0x2446032c
-0,       3000,       3000,        0,   230400, 0x648f122c
-0,       3100,       3100,        0,   230400, 0xbda221fd
-0,       3200,       3200,        0,   230400, 0xf0f97642
-0,       3300,       3300,        0,   230400, 0x6a1737de
-0,       3400,       3400,        0,   230400, 0x808a8179
-0,       3500,       3500,        0,   230400, 0x121641cf
-0,       3600,       3600,        0,   230400, 0x275d11ea
-0,       3700,       3700,        0,   230400, 0x92adf2cf
+#tb 0: 1/12
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+0,          0,          0,        1,   230400, 0x0655b3d9
+0,          1,          1,        1,   230400, 0x9c626fd3
+0,          2,          2,        1,   230400, 0x5bc95868
+0,          3,          3,        1,   230400, 0x55a38387
+0,          4,          4,        1,   230400, 0xd3495b60
+0,          5,          5,        1,   230400, 0xecdb2d15
+0,          6,          6,        1,   230400, 0x7f9b373e
+0,          7,          7,        1,   230400, 0x51caac22
+0,          8,          8,        1,   230400, 0x0f2ac153
+0,          9,          9,        1,   230400, 0xe5a6f9e7
+0,         10,         10,        1,   230400, 0xfc2b2250
+0,         11,         11,        1,   230400, 0x24e2da1b
+0,         12,         12,        1,   230400, 0x2723d7dd
+0,         13,         13,        1,   230400, 0x024a4989
+0,         14,         14,        1,   230400, 0xdbafb92d
+0,         15,         15,        1,   230400, 0x6b9b5056
+0,         16,         16,        1,   230400, 0x010cabb4
+0,         17,         17,        1,   230400, 0xf75bc1c0
+0,         18,         18,        1,   230400, 0x6c7fd744
+0,         19,         19,        1,   230400, 0xabe4371a
+0,         20,         20,        1,   230400, 0xe41fb781
+0,         21,         21,        1,   230400, 0x42c5649e
+0,         22,         22,        1,   230400, 0xf5511deb
+0,         23,         23,        1,   230400, 0xebf5ab32
+0,         24,         24,        1,   230400, 0x44398194
+0,         25,         25,        1,   230400, 0xfd63510c
+0,         26,         26,        1,   230400, 0xa013975e
+0,         27,         27,        1,   230400, 0xe0aa028d
+0,         28,         28,        1,   230400, 0x349f6f3b
+0,         29,         29,        1,   230400, 0x2446032c
+0,         30,         30,        1,   230400, 0x648f122c
+0,         31,         31,        1,   230400, 0xbda221fd
+0,         32,         32,        1,   230400, 0xf0f97642
+0,         33,         33,        1,   230400, 0x6a1737de
+0,         34,         34,        1,   230400, 0x808a8179
+0,         35,         35,        1,   230400, 0x121641cf
+0,         36,         36,        1,   230400, 0x275d11ea
+0,         37,         37,        1,   230400, 0x92adf2cf
diff --git a/tests/ref/fate/qtrle-8bit b/tests/ref/fate/qtrle-8bit
index bef2358e94..8da113d83e 100644
--- a/tests/ref/fate/qtrle-8bit
+++ b/tests/ref/fate/qtrle-8bit
@@ -1,168 +1,172 @@
-#tb 0: 1/600
+#tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   921600, 0x1492e3ed
-0,         40,         40,        1,   921600, 0x1492e3ed
-0,         80,         80,        1,   921600, 0x1492e3ed
-0,        120,        120,        1,   921600, 0x23ef4fc7
-0,        160,        160,        1,   921600, 0x23ef4fc7
-0,        200,        200,        1,   921600, 0xe406d4be
-0,        240,        240,        1,   921600, 0xe406d4be
-0,        280,        280,        1,   921600, 0xe406d4be
-0,        320,        320,        1,   921600, 0x62b8b5a1
-0,        360,        360,        1,   921600, 0x62b8b5a1
-0,        400,        400,        1,   921600, 0x7d8ba674
-0,        440,        440,        1,   921600, 0x7d8ba674
-0,        480,        480,        1,   921600, 0x7d8ba674
-0,        520,        520,        1,   921600, 0xfe666be7
-0,        560,        560,        1,   921600, 0xfe666be7
-0,        600,        600,        1,   921600, 0x721baec0
-0,        640,        640,        1,   921600, 0x721baec0
-0,        680,        680,        1,   921600, 0x721baec0
-0,        720,        720,        1,   921600, 0xc237180a
-0,        760,        760,        1,   921600, 0xc237180a
-0,        800,        800,        1,   921600, 0xf03a7482
-0,        840,        840,        1,   921600, 0xf03a7482
-0,        880,        880,        1,   921600, 0xf03a7482
-0,        920,        920,        1,   921600, 0x5612a391
-0,        960,        960,        1,   921600, 0x5612a391
-0,       1000,       1000,        1,   921600, 0x9dbcc46a
-0,       1040,       1040,        1,   921600, 0x9dbcc46a
-0,       1080,       1080,        1,   921600, 0x9dbcc46a
-0,       1120,       1120,        1,   921600, 0xa128a5d5
-0,       1160,       1160,        1,   921600, 0xa128a5d5
-0,       1200,       1200,        1,   921600, 0x63e0025c
-0,       1240,       1240,        1,   921600, 0x63e0025c
-0,       1280,       1280,        1,   921600, 0x63e0025c
-0,       1320,       1320,        1,   921600, 0x262359ed
-0,       1360,       1360,        1,   921600, 0x262359ed
-0,       1400,       1400,        1,   921600, 0x343688e8
-0,       1440,       1440,        1,   921600, 0x343688e8
-0,       1480,       1480,        1,   921600, 0x343688e8
-0,       1520,       1520,        1,   921600, 0x343688e8
-0,       1560,       1560,        1,   921600, 0x343688e8
-0,       1600,       1600,        1,   921600, 0x343688e8
-0,       1640,       1640,        1,   921600, 0x343688e8
-0,       1680,       1680,        1,   921600, 0x343688e8
-0,       1720,       1720,        1,   921600, 0x343688e8
-0,       1760,       1760,        1,   921600, 0x343688e8
-0,       1800,       1800,        1,   921600, 0xe4b29d57
-0,       1840,       1840,        1,   921600, 0xe4b29d57
-0,       1880,       1880,        1,   921600, 0xe4b29d57
-0,       1920,       1920,        1,   921600, 0x198e8a4a
-0,       1960,       1960,        1,   921600, 0x198e8a4a
-0,       2000,       2000,        1,   921600, 0x0cad8dc9
-0,       2040,       2040,        1,   921600, 0x0cad8dc9
-0,       2080,       2080,        1,   921600, 0x0cad8dc9
-0,       2120,       2120,        1,   921600, 0x1f74cf3d
-0,       2160,       2160,        1,   921600, 0x1f74cf3d
-0,       2200,       2200,        1,   921600, 0xec5b5449
-0,       2240,       2240,        1,   921600, 0xec5b5449
-0,       2280,       2280,        1,   921600, 0xec5b5449
-0,       2320,       2320,        1,   921600, 0x39829711
-0,       2360,       2360,        1,   921600, 0x39829711
-0,       2400,       2400,        1,   921600, 0x6de5b9c6
-0,       2440,       2440,        1,   921600, 0x6de5b9c6
-0,       2480,       2480,        1,   921600, 0x6de5b9c6
-0,       2520,       2520,        1,   921600, 0x47b0e9d4
-0,       2560,       2560,        1,   921600, 0x47b0e9d4
-0,       2600,       2600,        1,   921600, 0x756452b8
-0,       2640,       2640,        1,   921600, 0x756452b8
-0,       2680,       2680,        1,   921600, 0x756452b8
-0,       2720,       2720,        1,   921600, 0x6fce3478
-0,       2760,       2760,        1,   921600, 0x6fce3478
-0,       2800,       2800,        1,   921600, 0x372397cd
-0,       2840,       2840,        1,   921600, 0x372397cd
-0,       2880,       2880,        1,   921600, 0x372397cd
-0,       2920,       2920,        1,   921600, 0xe3999ba1
-0,       2960,       2960,        1,   921600, 0xe3999ba1
-0,       3000,       3000,        1,   921600, 0x6ba26b43
-0,       3040,       3040,        1,   921600, 0x6ba26b43
-0,       3080,       3080,        1,   921600, 0x6ba26b43
-0,       3120,       3120,        1,   921600, 0x4e9ee49e
-0,       3160,       3160,        1,   921600, 0x4e9ee49e
-0,       3200,       3200,        1,   921600, 0xdb5fd6e7
-0,       3240,       3240,        1,   921600, 0xdb5fd6e7
-0,       3280,       3280,        1,   921600, 0xdb5fd6e7
-0,       3320,       3320,        1,   921600, 0x8f2254a5
-0,       3360,       3360,        1,   921600, 0x8f2254a5
-0,       3400,       3400,        1,   921600, 0x8f2254a5
-0,       3440,       3440,        1,   921600, 0x8f2254a5
-0,       3480,       3480,        1,   921600, 0x8f2254a5
-0,       3520,       3520,        1,   921600, 0x8f2254a5
-0,       3560,       3560,        1,   921600, 0x8f2254a5
-0,       3600,       3600,        1,   921600, 0x8f2254a5
-0,       3640,       3640,        1,   921600, 0x8f2254a5
-0,       3680,       3680,        1,   921600, 0x8f2254a5
-0,       3720,       3720,        1,   921600, 0x57e95c32
-0,       3760,       3760,        1,   921600, 0x57e95c32
-0,       3800,       3800,        1,   921600, 0x41627a9b
-0,       3840,       3840,        1,   921600, 0x41627a9b
-0,       3880,       3880,        1,   921600, 0x41627a9b
-0,       3920,       3920,        1,   921600, 0x7412dcee
-0,       3960,       3960,        1,   921600, 0x7412dcee
-0,       4000,       4000,        1,   921600, 0xaebe10ed
-0,       4040,       4040,        1,   921600, 0xaebe10ed
-0,       4080,       4080,        1,   921600, 0xaebe10ed
-0,       4120,       4120,        1,   921600, 0x411a91f6
-0,       4160,       4160,        1,   921600, 0x411a91f6
-0,       4200,       4200,        1,   921600, 0xb059df3f
-0,       4240,       4240,        1,   921600, 0xb059df3f
-0,       4280,       4280,        1,   921600, 0xb059df3f
-0,       4320,       4320,        1,   921600, 0x4d6f5a77
-0,       4360,       4360,        1,   921600, 0x4d6f5a77
-0,       4400,       4400,        1,   921600, 0xbbf06df4
-0,       4440,       4440,        1,   921600, 0xbbf06df4
-0,       4480,       4480,        1,   921600, 0xbbf06df4
-0,       4520,       4520,        1,   921600, 0xe27f7bf6
-0,       4560,       4560,        1,   921600, 0xe27f7bf6
-0,       4600,       4600,        1,   921600, 0xd7e8360e
-0,       4640,       4640,        1,   921600, 0xd7e8360e
-0,       4680,       4680,        1,   921600, 0xd7e8360e
-0,       4720,       4720,        1,   921600, 0x1dd4c344
-0,       4760,       4760,        1,   921600, 0x1dd4c344
-0,       4800,       4800,        1,   921600, 0x7995a7ce
-0,       4840,       4840,        1,   921600, 0x7995a7ce
-0,       4880,       4880,        1,   921600, 0x7995a7ce
-0,       4920,       4920,        1,   921600, 0x2ef3c566
-0,       4960,       4960,        1,   921600, 0x2ef3c566
-0,       5000,       5000,        1,   921600, 0xf296736e
-0,       5040,       5040,        1,   921600, 0xf296736e
-0,       5080,       5080,        1,   921600, 0xf296736e
-0,       5120,       5120,        1,   921600, 0xf296736e
-0,       5160,       5160,        1,   921600, 0xf296736e
-0,       5200,       5200,        1,   921600, 0xf296736e
-0,       5240,       5240,        1,   921600, 0xf296736e
-0,       5280,       5280,        1,   921600, 0xf296736e
-0,       5320,       5320,        1,   921600, 0xf296736e
-0,       5360,       5360,        1,   921600, 0xf296736e
-0,       5400,       5400,        1,   921600, 0x1a488311
-0,       5440,       5440,        1,   921600, 0x1a488311
-0,       5480,       5480,        1,   921600, 0x1a488311
-0,       5520,       5520,        1,   921600, 0x9e28011b
-0,       5560,       5560,        1,   921600, 0x9e28011b
-0,       5600,       5600,        1,   921600, 0x84d1ea80
-0,       5640,       5640,        1,   921600, 0x84d1ea80
-0,       5680,       5680,        1,   921600, 0x84d1ea80
-0,       5720,       5720,        1,   921600, 0x9ed41052
-0,       5760,       5760,        1,   921600, 0x9ed41052
-0,       5800,       5800,        1,   921600, 0xd4db7206
-0,       5840,       5840,        1,   921600, 0xd4db7206
-0,       5880,       5880,        1,   921600, 0xd4db7206
-0,       5920,       5920,        1,   921600, 0x55f695a9
-0,       5960,       5960,        1,   921600, 0x55f695a9
-0,       6000,       6000,        1,   921600, 0x9d8c667f
-0,       6040,       6040,        1,   921600, 0x9d8c667f
-0,       6080,       6080,        1,   921600, 0x9d8c667f
-0,       6120,       6120,        1,   921600, 0x9b6037ec
-0,       6160,       6160,        1,   921600, 0x9b6037ec
-0,       6200,       6200,        1,   921600, 0x57c5e835
-0,       6240,       6240,        1,   921600, 0x57c5e835
-0,       6280,       6280,        1,   921600, 0x57c5e835
-0,       6320,       6320,        1,   921600, 0x476dad89
-0,       6360,       6360,        1,   921600, 0x476dad89
-0,       6400,       6400,        1,   921600, 0xcfd6ad2b
-0,       6440,       6440,        1,   921600, 0xcfd6ad2b
-0,       6480,       6480,        1,   921600, 0xcfd6ad2b
-0,       6520,       6520,        1,   921600, 0x3b372379
-0,       6560,       6560,        1,   921600, 0x3b372379
-0,       6600,       6600,        1,   921600, 0x36f245f5
-0,       6620,       6620,        1,   921600, 0x36f245f5
+0,          1,          1,        1,   921600, 0x1492e3ed
+0,          2,          2,        1,   921600, 0x1492e3ed
+0,          3,          3,        1,   921600, 0x23ef4fc7
+0,          4,          4,        1,   921600, 0x23ef4fc7
+0,          5,          5,        1,   921600, 0xe406d4be
+0,          6,          6,        1,   921600, 0xe406d4be
+0,          7,          7,        1,   921600, 0xe406d4be
+0,          8,          8,        1,   921600, 0x62b8b5a1
+0,          9,          9,        1,   921600, 0x62b8b5a1
+0,         10,         10,        1,   921600, 0x7d8ba674
+0,         11,         11,        1,   921600, 0x7d8ba674
+0,         12,         12,        1,   921600, 0x7d8ba674
+0,         13,         13,        1,   921600, 0xfe666be7
+0,         14,         14,        1,   921600, 0xfe666be7
+0,         15,         15,        1,   921600, 0x721baec0
+0,         16,         16,        1,   921600, 0x721baec0
+0,         17,         17,        1,   921600, 0x721baec0
+0,         18,         18,        1,   921600, 0xc237180a
+0,         19,         19,        1,   921600, 0xc237180a
+0,         20,         20,        1,   921600, 0xf03a7482
+0,         21,         21,        1,   921600, 0xf03a7482
+0,         22,         22,        1,   921600, 0xf03a7482
+0,         23,         23,        1,   921600, 0x5612a391
+0,         24,         24,        1,   921600, 0x5612a391
+0,         25,         25,        1,   921600, 0x9dbcc46a
+0,         26,         26,        1,   921600, 0x9dbcc46a
+0,         27,         27,        1,   921600, 0x9dbcc46a
+0,         28,         28,        1,   921600, 0xa128a5d5
+0,         29,         29,        1,   921600, 0xa128a5d5
+0,         30,         30,        1,   921600, 0x63e0025c
+0,         31,         31,        1,   921600, 0x63e0025c
+0,         32,         32,        1,   921600, 0x63e0025c
+0,         33,         33,        1,   921600, 0x262359ed
+0,         34,         34,        1,   921600, 0x262359ed
+0,         35,         35,        1,   921600, 0x343688e8
+0,         36,         36,        1,   921600, 0x343688e8
+0,         37,         37,        1,   921600, 0x343688e8
+0,         38,         38,        1,   921600, 0x343688e8
+0,         39,         39,        1,   921600, 0x343688e8
+0,         40,         40,        1,   921600, 0x343688e8
+0,         41,         41,        1,   921600, 0x343688e8
+0,         42,         42,        1,   921600, 0x343688e8
+0,         43,         43,        1,   921600, 0x343688e8
+0,         44,         44,        1,   921600, 0x343688e8
+0,         45,         45,        1,   921600, 0xe4b29d57
+0,         46,         46,        1,   921600, 0xe4b29d57
+0,         47,         47,        1,   921600, 0xe4b29d57
+0,         48,         48,        1,   921600, 0x198e8a4a
+0,         49,         49,        1,   921600, 0x198e8a4a
+0,         50,         50,        1,   921600, 0x0cad8dc9
+0,         51,         51,        1,   921600, 0x0cad8dc9
+0,         52,         52,        1,   921600, 0x0cad8dc9
+0,         53,         53,        1,   921600, 0x1f74cf3d
+0,         54,         54,        1,   921600, 0x1f74cf3d
+0,         55,         55,        1,   921600, 0xec5b5449
+0,         56,         56,        1,   921600, 0xec5b5449
+0,         57,         57,        1,   921600, 0xec5b5449
+0,         58,         58,        1,   921600, 0x39829711
+0,         59,         59,        1,   921600, 0x39829711
+0,         60,         60,        1,   921600, 0x6de5b9c6
+0,         61,         61,        1,   921600, 0x6de5b9c6
+0,         62,         62,        1,   921600, 0x6de5b9c6
+0,         63,         63,        1,   921600, 0x47b0e9d4
+0,         64,         64,        1,   921600, 0x47b0e9d4
+0,         65,         65,        1,   921600, 0x756452b8
+0,         66,         66,        1,   921600, 0x756452b8
+0,         67,         67,        1,   921600, 0x756452b8
+0,         68,         68,        1,   921600, 0x6fce3478
+0,         69,         69,        1,   921600, 0x6fce3478
+0,         70,         70,        1,   921600, 0x372397cd
+0,         71,         71,        1,   921600, 0x372397cd
+0,         72,         72,        1,   921600, 0x372397cd
+0,         73,         73,        1,   921600, 0xe3999ba1
+0,         74,         74,        1,   921600, 0xe3999ba1
+0,         75,         75,        1,   921600, 0x6ba26b43
+0,         76,         76,        1,   921600, 0x6ba26b43
+0,         77,         77,        1,   921600, 0x6ba26b43
+0,         78,         78,        1,   921600, 0x4e9ee49e
+0,         79,         79,        1,   921600, 0x4e9ee49e
+0,         80,         80,        1,   921600, 0xdb5fd6e7
+0,         81,         81,        1,   921600, 0xdb5fd6e7
+0,         82,         82,        1,   921600, 0xdb5fd6e7
+0,         83,         83,        1,   921600, 0x8f2254a5
+0,         84,         84,        1,   921600, 0x8f2254a5
+0,         85,         85,        1,   921600, 0x8f2254a5
+0,         86,         86,        1,   921600, 0x8f2254a5
+0,         87,         87,        1,   921600, 0x8f2254a5
+0,         88,         88,        1,   921600, 0x8f2254a5
+0,         89,         89,        1,   921600, 0x8f2254a5
+0,         90,         90,        1,   921600, 0x8f2254a5
+0,         91,         91,        1,   921600, 0x8f2254a5
+0,         92,         92,        1,   921600, 0x8f2254a5
+0,         93,         93,        1,   921600, 0x57e95c32
+0,         94,         94,        1,   921600, 0x57e95c32
+0,         95,         95,        1,   921600, 0x41627a9b
+0,         96,         96,        1,   921600, 0x41627a9b
+0,         97,         97,        1,   921600, 0x41627a9b
+0,         98,         98,        1,   921600, 0x7412dcee
+0,         99,         99,        1,   921600, 0x7412dcee
+0,        100,        100,        1,   921600, 0xaebe10ed
+0,        101,        101,        1,   921600, 0xaebe10ed
+0,        102,        102,        1,   921600, 0xaebe10ed
+0,        103,        103,        1,   921600, 0x411a91f6
+0,        104,        104,        1,   921600, 0x411a91f6
+0,        105,        105,        1,   921600, 0xb059df3f
+0,        106,        106,        1,   921600, 0xb059df3f
+0,        107,        107,        1,   921600, 0xb059df3f
+0,        108,        108,        1,   921600, 0x4d6f5a77
+0,        109,        109,        1,   921600, 0x4d6f5a77
+0,        110,        110,        1,   921600, 0xbbf06df4
+0,        111,        111,        1,   921600, 0xbbf06df4
+0,        112,        112,        1,   921600, 0xbbf06df4
+0,        113,        113,        1,   921600, 0xe27f7bf6
+0,        114,        114,        1,   921600, 0xe27f7bf6
+0,        115,        115,        1,   921600, 0xd7e8360e
+0,        116,        116,        1,   921600, 0xd7e8360e
+0,        117,        117,        1,   921600, 0xd7e8360e
+0,        118,        118,        1,   921600, 0x1dd4c344
+0,        119,        119,        1,   921600, 0x1dd4c344
+0,        120,        120,        1,   921600, 0x7995a7ce
+0,        121,        121,        1,   921600, 0x7995a7ce
+0,        122,        122,        1,   921600, 0x7995a7ce
+0,        123,        123,        1,   921600, 0x2ef3c566
+0,        124,        124,        1,   921600, 0x2ef3c566
+0,        125,        125,        1,   921600, 0xf296736e
+0,        126,        126,        1,   921600, 0xf296736e
+0,        127,        127,        1,   921600, 0xf296736e
+0,        128,        128,        1,   921600, 0xf296736e
+0,        129,        129,        1,   921600, 0xf296736e
+0,        130,        130,        1,   921600, 0xf296736e
+0,        131,        131,        1,   921600, 0xf296736e
+0,        132,        132,        1,   921600, 0xf296736e
+0,        133,        133,        1,   921600, 0xf296736e
+0,        134,        134,        1,   921600, 0xf296736e
+0,        135,        135,        1,   921600, 0x1a488311
+0,        136,        136,        1,   921600, 0x1a488311
+0,        137,        137,        1,   921600, 0x1a488311
+0,        138,        138,        1,   921600, 0x9e28011b
+0,        139,        139,        1,   921600, 0x9e28011b
+0,        140,        140,        1,   921600, 0x84d1ea80
+0,        141,        141,        1,   921600, 0x84d1ea80
+0,        142,        142,        1,   921600, 0x84d1ea80
+0,        143,        143,        1,   921600, 0x9ed41052
+0,        144,        144,        1,   921600, 0x9ed41052
+0,        145,        145,        1,   921600, 0xd4db7206
+0,        146,        146,        1,   921600, 0xd4db7206
+0,        147,        147,        1,   921600, 0xd4db7206
+0,        148,        148,        1,   921600, 0x55f695a9
+0,        149,        149,        1,   921600, 0x55f695a9
+0,        150,        150,        1,   921600, 0x9d8c667f
+0,        151,        151,        1,   921600, 0x9d8c667f
+0,        152,        152,        1,   921600, 0x9d8c667f
+0,        153,        153,        1,   921600, 0x9b6037ec
+0,        154,        154,        1,   921600, 0x9b6037ec
+0,        155,        155,        1,   921600, 0x57c5e835
+0,        156,        156,        1,   921600, 0x57c5e835
+0,        157,        157,        1,   921600, 0x57c5e835
+0,        158,        158,        1,   921600, 0x476dad89
+0,        159,        159,        1,   921600, 0x476dad89
+0,        160,        160,        1,   921600, 0xcfd6ad2b
+0,        161,        161,        1,   921600, 0xcfd6ad2b
+0,        162,        162,        1,   921600, 0xcfd6ad2b
+0,        163,        163,        1,   921600, 0x3b372379
+0,        164,        164,        1,   921600, 0x3b372379
+0,        165,        165,        1,   921600, 0x36f245f5
+0,        166,        166,        1,   921600, 0x36f245f5
diff --git a/tests/ref/fate/quickdraw b/tests/ref/fate/quickdraw
index 9a55ad5084..5746929502 100644
--- a/tests/ref/fate/quickdraw
+++ b/tests/ref/fate/quickdraw
@@ -1,3 +1,17 @@
-#tb 0: 1/600
+#tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   921600, 0xc0e68764
-0,         80,         80,        1,   921600, 0x01a16629
+0,          1,          1,        1,   921600, 0xc0e68764
+0,          2,          2,        1,   921600, 0xc0e68764
+0,          3,          3,        1,   921600, 0xc0e68764
+0,          4,          4,        1,   921600, 0xc0e68764
+0,          5,          5,        1,   921600, 0xc0e68764
+0,          7,          7,        1,   921600, 0x01a16629
+0,          9,          9,        1,   921600, 0x01a16629
+0,         10,         10,        1,   921600, 0x01a16629
+0,         11,         11,        1,   921600, 0x01a16629
+0,         12,         12,        1,   921600, 0x01a16629
+0,         13,         13,        1,   921600, 0x01a16629
diff --git a/tests/ref/fate/r210 b/tests/ref/fate/r210
index 45bb10c2f4..e3686fe05d 100644
--- a/tests/ref/fate/r210
+++ b/tests/ref/fate/r210
@@ -1,4 +1,8 @@
 #tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,  1843200, 0xbd414b93
 0,          1,          1,        1,  1843200, 0x23298f1f
 0,          2,          2,        1,  1843200, 0x5a56df19
diff --git a/tests/ref/fate/ra3-144 b/tests/ref/fate/ra3-144
index 40bcaedba7..75e7bbfc7a 100644
--- a/tests/ref/fate/ra3-144
+++ b/tests/ref/fate/ra3-144
@@ -1,4 +1,9 @@
 #tb 0: 1/8000
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 8000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,      160,      320, 0x00000000
 0,        160,        160,      160,      320, 0x4cfd5d74
 0,        320,        320,      160,      320, 0xbb60fa3d
diff --git a/tests/ref/fate/random_seed b/tests/ref/fate/random_seed
new file mode 100644
index 0000000000..ef0eef2603
--- /dev/null
+++ b/tests/ref/fate/random_seed
@@ -0,0 +1,2 @@
+seeds OK
+seeds OK
diff --git a/tests/ref/fate/redcode-demux b/tests/ref/fate/redcode-demux
index 34a2924b94..45119ec71e 100644
--- a/tests/ref/fate/redcode-demux
+++ b/tests/ref/fate/redcode-demux
@@ -1,7 +1,16 @@
 #tb 0: 1/240000
+#media_type 0: video
+#codec_id 0: jpeg2000
+#dimensions 0: 2048x1152
+#sar 0: 0/1
 #tb 1: 1/240000
+#media_type 1: audio
+#codec_id 1: pcm_s32be
+#sample_rate 1: 48000
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,    10010,  1626280, 0x5768c7d6
 1,          0,          0,    18140,    14816, 0xd185e8c7
 0,      10010,      10010,    10010,  1626092, 0x070bd882
 1,      18140,      18140,    40920,    32736, 0x791b737a
-0,      20020,      20020,    10010,   893932, 0x8c7cd0a6
+0,      20020,      20020,    10010,   893932, 0x8c7cd0a6, F=0x3
diff --git a/tests/ref/fate/redspark-demux b/tests/ref/fate/redspark-demux
new file mode 100644
index 0000000000..fadfe933ed
--- /dev/null
+++ b/tests/ref/fate/redspark-demux
@@ -0,0 +1 @@
+CRC=0xc0fd1aa2
diff --git a/tests/ref/fate/rgb24-mkv b/tests/ref/fate/rgb24-mkv
new file mode 100644
index 0000000000..4c357accaf
--- /dev/null
+++ b/tests/ref/fate/rgb24-mkv
@@ -0,0 +1,8 @@
+55270be3b5d393d770a1dfcb19b68271 *tests/data/fate/rgb24-mkv.matroska
+58345 tests/data/fate/rgb24-mkv.matroska
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
+0,          0,          0,        1,    57600, 0x3718ad00
diff --git a/tests/ref/fate/rgbapng-4816 b/tests/ref/fate/rgbapng-4816
new file mode 100644
index 0000000000..99493bce94
--- /dev/null
+++ b/tests/ref/fate/rgbapng-4816
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 330x330
+#sar 0: 0/1
+0,          0,          0,        1,   435600, 0x961c0f09
diff --git a/tests/ref/fate/ripemd b/tests/ref/fate/ripemd
new file mode 100644
index 0000000000..947412de42
--- /dev/null
+++ b/tests/ref/fate/ripemd
@@ -0,0 +1,28 @@
+Testing RIPEMD-128
+C14A12199C66E4BA84636B0F69144C77
+A1AA0689D0FAFA2DDC22E88B49133A06
+4A7F5723F954EBA1216C9D8F6320431F
+c14a1219 9c66e4ba 84636b0f 69144c77
+a1aa0689 d0fafa2d dc22e88b 49133a06
+4a7f5723 f954eba1 216c9d8f 6320431f
+Testing RIPEMD-160
+8EB208F7E05D987A9B044A8E98C6B087F15A0BFC
+12A053384A9C0C88E405A06C27DCF49ADA62EB2B
+52783243C1697BDBE16D37F97F68F08325DC1528
+8eb208f7 e05d987a 9b044a8e 98c6b087 f15a0bfc
+12a05338 4a9c0c88 e405a06c 27dcf49a da62eb2b
+52783243 c1697bdb e16d37f9 7f68f083 25dc1528
+Testing RIPEMD-256
+AFBD6E228B9D8CBBCEF5CA2D03E6DBA10AC0BC7DCBE4680E1E42D2E975459B65
+3843045583AAC6C8C8D9128573E7A9809AFB2A0F34CCC36EA9E72F16F6368E3F
+AC953744E10E31514C150D4D8D7B677342E33399788296E43AE4850CE4F97978
+afbd6e22 8b9d8cbb cef5ca2d 03e6dba1 0ac0bc7d cbe4680e 1e42d2e9 75459b65
+38430455 83aac6c8 c8d91285 73e7a980 9afb2a0f 34ccc36e a9e72f16 f6368e3f
+ac953744 e10e3151 4c150d4d 8d7b6773 42e33399 788296e4 3ae4850c e4f97978
+Testing RIPEMD-320
+DE4C01B3054F8930A79D09AE738E92301E5A17085BEFFDC1B8D116713E74F82FA942D64CDBC4682D
+D034A7950CF722021BA4B84DF769A5DE2060E259DF4C9BB4A4268C0E935BBC7470A969C9D072A1AC
+BDEE37F4371E20646B8B0D862DDA16292AE36F40965E8C8509E63D1DBDDECC503E2B63EB9245BB66
+de4c01b3 054f8930 a79d09ae 738e9230 1e5a1708 5beffdc1 b8d11671 3e74f82f a942d64c dbc4682d
+d034a795 0cf72202 1ba4b84d f769a5de 2060e259 df4c9bb4 a4268c0e 935bbc74 70a969c9 d072a1ac
+bdee37f4 371e2064 6b8b0d86 2dda1629 2ae36f40 965e8c85 09e63d1d bddecc50 3e2b63eb 9245bb66
diff --git a/tests/ref/fate/rl2 b/tests/ref/fate/rl2
index d7dd23dd20..9189822503 100644
--- a/tests/ref/fate/rl2
+++ b/tests/ref/fate/rl2
@@ -1,4 +1,8 @@
 #tb 0: 1171/11025
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
 0,          0,          0,        1,   192000, 0x7112a667
 0,          1,          1,        1,   192000, 0x6936abf3
 0,          2,          2,        1,   192000, 0xb1f08981
diff --git a/tests/ref/fate/roqvideo b/tests/ref/fate/roqvideo
index 9febedba0d..36eec54539 100644
--- a/tests/ref/fate/roqvideo
+++ b/tests/ref/fate/roqvideo
@@ -1,4 +1,8 @@
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,   393216, 0x56995aac
 0,          1,          1,        1,   393216, 0xf9ed5d6c
 0,          2,          2,        1,   393216, 0xd3285d75
diff --git a/tests/ref/fate/rpza b/tests/ref/fate/rpza
index a1c5333069..3ad7e4cce1 100644
--- a/tests/ref/fate/rpza
+++ b/tests/ref/fate/rpza
@@ -1,31 +1,35 @@
-#tb 0: 1/600
-0,          0,          0,        1,   230400, 0x4aec80a3
-0,         40,         40,        1,   230400, 0xb6c41452
-0,         80,         80,        1,   230400, 0xa6c27f12
-0,        120,        120,        1,   230400, 0x309bd2d2
-0,        160,        160,        1,   230400, 0x597a7341
-0,        200,        200,        1,   230400, 0x597a7341
-0,        240,        240,        1,   230400, 0xd6d6c569
-0,        280,        280,        1,   230400, 0x31413d89
-0,        320,        320,        1,   230400, 0x464e42e9
-0,        360,        360,        1,   230400, 0x502d7c71
-0,        400,        400,        1,   230400, 0x502d7c71
-0,        440,        440,        1,   230400, 0xc96f23d1
-0,        480,        480,        1,   230400, 0xc96f23d1
-0,        520,        520,        1,   230400, 0x5bfd2bc7
-0,        560,        560,        1,   230400, 0x821640a7
-0,        600,        600,        1,   230400, 0x8f001967
-0,        640,        640,        1,   230400, 0x406ba109
-0,        680,        680,        1,   230400, 0x85d99b50
-0,        720,        720,        1,   230400, 0x2fdb4018
-0,        760,        760,        1,   230400, 0xfa127259
-0,        800,        800,        1,   230400, 0xe6427b9b
-0,        840,        840,        1,   230400, 0xe6427b9b
-0,        880,        880,        1,   230400, 0x3a279000
-0,        920,        920,        1,   230400, 0x710755ee
-0,        960,        960,        1,   230400, 0x76549d35
-0,       1000,       1000,        1,   230400, 0xf4d0132c
-0,       1040,       1040,        1,   230400, 0xf4d0132c
-0,       1080,       1080,        1,   230400, 0x19d7ec14
-0,       1120,       1120,        1,   230400, 0x19d7ec14
-0,       1160,       1160,        1,   230400, 0x5f24b7e1
+#tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+0,          0,          0,        1,   230400, 0x26a4728c
+0,          1,          1,        1,   230400, 0xa5ff0a21
+0,          2,          2,        1,   230400, 0x479d767d
+0,          3,          3,        1,   230400, 0xc619cd01
+0,          4,          4,        1,   230400, 0x1d377157
+0,          5,          5,        1,   230400, 0x1d377157
+0,          6,          6,        1,   230400, 0x0941c629
+0,          7,          7,        1,   230400, 0xe64b3a93
+0,          8,          8,        1,   230400, 0x28493fd7
+0,          9,          9,        1,   230400, 0x18c77af2
+0,         10,         10,        1,   230400, 0x18c77af2
+0,         11,         11,        1,   230400, 0x5a542008
+0,         12,         12,        1,   230400, 0x5a542008
+0,         13,         13,        1,   230400, 0x3b1a34fd
+0,         14,         14,        1,   230400, 0x77d34944
+0,         15,         15,        1,   230400, 0x50ac218c
+0,         16,         16,        1,   230400, 0xcb999f16
+0,         17,         17,        1,   230400, 0xe1ce9f19
+0,         18,         18,        1,   230400, 0xb10b4264
+0,         19,         19,        1,   230400, 0x61207031
+0,         20,         20,        1,   230400, 0x81626d5b
+0,         21,         21,        1,   230400, 0x81626d5b
+0,         22,         22,        1,   230400, 0x1cb59751
+0,         23,         23,        1,   230400, 0x316e6962
+0,         24,         24,        1,   230400, 0x4c01b829
+0,         25,         25,        1,   230400, 0x276e32bc
+0,         26,         26,        1,   230400, 0x276e32bc
+0,         27,         27,        1,   230400, 0xe251117a
+0,         28,         28,        1,   230400, 0xe251117a
+0,         29,         29,        1,   230400, 0x41b7f098
diff --git a/tests/ref/fate/rscc-16bit b/tests/ref/fate/rscc-16bit
index 85d5494940..357196492b 100644
--- a/tests/ref/fate/rscc-16bit
+++ b/tests/ref/fate/rscc-16bit
@@ -1,4 +1,8 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   153600, 0x33759daf
 0,          1,          1,        1,   153600, 0x43e0c910
 0,          2,          2,        1,   153600, 0x6c75a8f0
diff --git a/tests/ref/fate/rscc-24bit b/tests/ref/fate/rscc-24bit
index e38702c733..c61ebd3224 100644
--- a/tests/ref/fate/rscc-24bit
+++ b/tests/ref/fate/rscc-24bit
@@ -1,2 +1,6 @@
 #tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 854x480
+#sar 0: 0/1
 0,          0,          0,        1,  1229760, 0x9c99ba99
diff --git a/tests/ref/fate/rscc-32bit b/tests/ref/fate/rscc-32bit
index a4431865ab..b55b4b9abf 100644
--- a/tests/ref/fate/rscc-32bit
+++ b/tests/ref/fate/rscc-32bit
@@ -1,4 +1,8 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   307200, 0xe36c2c38
 0,          1,          1,        1,   307200, 0xa2e3476b
 0,          2,          2,        1,   307200, 0x65167c95
diff --git a/tests/ref/fate/rscc-8bit b/tests/ref/fate/rscc-8bit
index b6371ace87..8a9ffe3f07 100644
--- a/tests/ref/fate/rscc-8bit
+++ b/tests/ref/fate/rscc-8bit
@@ -1,2 +1,6 @@
 #tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 854x480
+#sar 0: 0/1
 0,          0,          0,        1,  1229760, 0xfdf2e538
diff --git a/tests/ref/fate/rsd-demux b/tests/ref/fate/rsd-demux
new file mode 100644
index 0000000000..3aa2573f78
--- /dev/null
+++ b/tests/ref/fate/rsd-demux
@@ -0,0 +1 @@
+CRC=0x7b7807d8
diff --git a/tests/ref/fate/rv20-1239 b/tests/ref/fate/rv20-1239
new file mode 100644
index 0000000000..3be1b8bc66
--- /dev/null
+++ b/tests/ref/fate/rv20-1239
@@ -0,0 +1,95 @@
+#tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
+0,          0,          0,        1,    28800, 0xe41c0ee2
+0,          1,          1,        1,    28800, 0x08054520
+0,          2,          2,        1,    28800, 0x272b3ed7
+0,          3,          3,        1,    28800, 0x456551d0
+0,          4,          4,        1,    28800, 0x4f96457f
+0,          5,          5,        1,    28800, 0x4e78568a
+0,          6,          6,        1,    28800, 0xe79151f3
+0,          7,          7,        1,    28800, 0x6d7350d8
+0,          8,          8,        1,    28800, 0x397250b2
+0,          9,          9,        1,    28800, 0x518750ae
+0,         10,         10,        1,    28800, 0x4bfa4aa2
+0,         11,         11,        1,    28800, 0x085a5490
+0,         12,         12,        1,    28800, 0x7da56e74
+0,         13,         13,        1,    28800, 0xfdd08146
+0,         14,         14,        1,    28800, 0x99c295bd
+0,         15,         15,        1,    28800, 0xc8bc88f2
+0,         16,         16,        1,    28800, 0x986eaa72
+0,         17,         17,        1,    28800, 0xa3f9aa6f
+0,         18,         18,        1,    28800, 0xc1b4bed4
+0,         19,         19,        1,    28800, 0xf9a767bb
+0,         20,         20,        1,    28800, 0x72e6b420
+0,         21,         21,        1,    28800, 0x30e7eabd
+0,         22,         22,        1,    28800, 0xca100206
+0,         23,         23,        1,    28800, 0xe433f7b9
+0,         24,         24,        1,    28800, 0x1f70f4f2
+0,         25,         25,        1,    28800, 0x2e58f182
+0,         26,         26,        1,    28800, 0x4514cca8
+0,         27,         27,        1,    28800, 0xc0e1e144
+0,         28,         28,        1,    28800, 0x1a79e36a
+0,         29,         29,        1,    28800, 0x0729de0b
+0,         30,         30,        1,    28800, 0xd61ccbb1
+0,         31,         31,        1,    28800, 0x877aa65d
+0,         32,         32,        1,    28800, 0x7cabbc37
+0,         33,         33,        1,    28800, 0x6591b87c
+0,         34,         34,        1,    28800, 0x097dd8bc
+0,         35,         35,        1,    28800, 0xa4549f78
+0,         36,         36,        1,    28800, 0x109f91ef
+0,         37,         37,        1,    28800, 0x96a2c41b
+0,         38,         38,        1,    28800, 0x3b71e985
+0,         39,         39,        1,    28800, 0xbb76ff57
+0,         40,         40,        1,    28800, 0x26701ae1
+0,         41,         41,        1,    28800, 0x9da03e9b
+0,         42,         42,        1,    28800, 0x58fc3d9a
+0,         43,         43,        1,    28800, 0x67947735
+0,         44,         44,        1,    28800, 0x3961cea4
+0,         45,         45,        1,    28800, 0x68fe0f3a
+0,         46,         46,        1,    28800, 0x6623d61f
+0,         47,         47,        1,    28800, 0x7df2c4ff
+0,         48,         48,        1,    28800, 0xe9b9eaa6
+0,         49,         49,        1,    28800, 0xeec8c115
+0,         50,         50,        1,    28800, 0xbfd96ba4
+0,         51,         51,        1,    28800, 0x4d6dff71
+0,         52,         52,        1,    28800, 0x3ffbd6fe
+0,         53,         53,        1,    28800, 0x7aa5e42e
+0,         54,         54,        1,    28800, 0x4d05cf80
+0,         55,         55,        1,    28800, 0x9fb3b152
+0,         56,         56,        1,    28800, 0xc62b05b2
+0,         57,         57,        1,    28800, 0x82a2e7dd
+0,         58,         58,        1,    28800, 0x4611b76f
+0,         59,         59,        1,    28800, 0xc7f5acee
+0,         60,         60,        1,    28800, 0x19149cc8
+0,         61,         61,        1,    28800, 0xe97d5933
+0,         62,         62,        1,    28800, 0x92960b73
+0,         63,         63,        1,    28800, 0x2369d90f
+0,         64,         64,        1,    28800, 0x1d58d518
+0,         65,         65,        1,    28800, 0x2b29b6ee
+0,         66,         66,        1,    28800, 0xbfbb8b66
+0,         67,         67,        1,    28800, 0x6bf759d4
+0,         68,         68,        1,    28800, 0x8ccf3a60
+0,         69,         69,        1,    28800, 0x4b1b4623
+0,         70,         70,        1,    28800, 0xc1da9fc6
+0,         71,         71,        1,    28800, 0xb9bc1eed
+0,         72,         72,        1,    28800, 0x50f7d1eb
+0,         73,         73,        1,    28800, 0xf8c53f59
+0,         74,         74,        1,    28800, 0x950e3515
+0,         75,         75,        1,    28800, 0xe5dff457
+0,         76,         76,        1,    28800, 0x2dc3ad6a
+0,         77,         77,        1,    28800, 0x0559b63c
+0,         78,         78,        1,    28800, 0xa475bf46
+0,         79,         79,        1,    28800, 0x7861bbcf
+0,         80,         80,        1,    28800, 0x3e4ac44c
+0,         81,         81,        1,    28800, 0xfb5b99a0
+0,         82,         82,        1,    28800, 0x99299648
+0,         83,         83,        1,    28800, 0x384d48ac
+0,         84,         84,        1,    28800, 0xf17e18f7
+0,         85,         85,        1,    28800, 0xa9e00e3f
+0,         86,         86,        1,    28800, 0x5d110bb3
+0,         87,         87,        1,    28800, 0x337d3e31
+0,         88,         88,        1,    28800, 0xfea3737b
+0,         89,         89,        1,    28800, 0xce7d6020
diff --git a/tests/ref/fate/rv30 b/tests/ref/fate/rv30
index 89a9d8c978..c54aeea561 100644
--- a/tests/ref/fate/rv30
+++ b/tests/ref/fate/rv30
@@ -1,110 +1,114 @@
-#tb 0: 1/1000
-0,          1,          1,        0,   126720, 0xcefaec47
-0,         33,         33,        0,   126720, 0xa416ece5
-0,         66,         66,        0,   126720, 0xa416ece5
-0,        100,        100,        0,   126720, 0xa416ece5
-0,        133,        133,        0,   126720, 0x60d6ed27
-0,        166,        166,        0,   126720, 0x259af497
-0,        200,        200,        0,   126720, 0x5e6ff4d7
-0,        233,        233,        0,   126720, 0xcc10f4b7
-0,        266,        266,        0,   126720, 0x763ab817
-0,        300,        300,        0,   126720, 0xe95fb8d7
-0,        333,        333,        0,   126720, 0xe2b1b917
-0,        367,        367,        0,   126720, 0x11abb8f7
-0,        400,        400,        0,   126720, 0x4b62b947
-0,        433,        433,        0,   126720, 0xcaf2bbb7
-0,        467,        467,        0,   126720, 0x2953bc37
-0,        500,        500,        0,   126720, 0x1dd9bbd7
-0,        533,        533,        0,   126720, 0x105eb927
-0,        567,        567,        0,   126720, 0x7fa3ae27
-0,        600,        600,        0,   126720, 0x722e99f7
-0,        633,        633,        0,   126720, 0x5ac9a827
-0,        667,        667,        0,   126720, 0x07beba77
-0,        700,        700,        0,   126720, 0x29d6a887
-0,        734,        734,        0,   126720, 0xa5caab87
-0,        767,        767,        0,   126720, 0x9ca7aac7
-0,        800,        800,        0,   126720, 0xb7debcd7
-0,        834,        834,        0,   126720, 0xd115a757
-0,        867,        867,        0,   126720, 0x6ddaef32
-0,        900,        900,        0,   126720, 0xde1bb900
-0,        934,        934,        0,   126720, 0xac6c071b
-0,        967,        967,        0,   126720, 0x4a9f897c
-0,       1000,       1000,        0,   126720, 0xd8fa050f
-0,       1034,       1034,        0,   126720, 0x5d06be59
-0,       1067,       1067,        0,   126720, 0xdc3e0837
-0,       1101,       1101,        0,   126720, 0xcac6da2b
-0,       1134,       1134,        0,   126720, 0x6672dfc9
-0,       1167,       1167,        0,   126720, 0x7491b176
-0,       1201,       1201,        0,   126720, 0xa9477df0
-0,       1234,       1234,        0,   126720, 0xe976c34f
-0,       1267,       1267,        0,   126720, 0xdb7ab0e2
-0,       1301,       1301,        0,   126720, 0x1b42db35
-0,       1334,       1334,        0,   126720, 0xc6e10f9f
-0,       1368,       1368,        0,   126720, 0x169d61b6
-0,       1401,       1401,        0,   126720, 0xc7623119
-0,       1434,       1434,        0,   126720, 0x5b9b7543
-0,       1468,       1468,        0,   126720, 0x68c27aca
-0,       1501,       1501,        0,   126720, 0xa0e4e1c9
-0,       1534,       1534,        0,   126720, 0xbbdae87e
-0,       1568,       1568,        0,   126720, 0xe67e00a1
-0,       1601,       1601,        0,   126720, 0x648ea605
-0,       1634,       1634,        0,   126720, 0x5becb718
-0,       1668,       1668,        0,   126720, 0xb79ab1da
-0,       1701,       1701,        0,   126720, 0x0d52d1dc
-0,       1735,       1735,        0,   126720, 0x1277b853
-0,       1768,       1768,        0,   126720, 0xc57cbc83
-0,       1801,       1801,        0,   126720, 0x2126bdc3
-0,       1835,       1835,        0,   126720, 0x4c1ef41f
-0,       1868,       1868,        0,   126720, 0x185f6a2c
-0,       1901,       1901,        0,   126720, 0xb2b5a7d3
-0,       1935,       1935,        0,   126720, 0x32d7a26d
-0,       1968,       1968,        0,   126720, 0x0bffd118
-0,       2001,       2001,        0,   126720, 0x2eed823a
-0,       2035,       2035,        0,   126720, 0xc4c0147c
-0,       2068,       2068,        0,   126720, 0x1f8bf8ac
-0,       2102,       2102,        0,   126720, 0xfcb715e8
-0,       2135,       2135,        0,   126720, 0xc3e9fa9c
-0,       2168,       2168,        0,   126720, 0x9ad8572c
-0,       2202,       2202,        0,   126720, 0x2800596d
-0,       2235,       2235,        0,   126720, 0x3caa5094
-0,       2268,       2268,        0,   126720, 0x6162e000
-0,       2302,       2302,        0,   126720, 0x18200f2c
-0,       2335,       2335,        0,   126720, 0x649e699f
-0,       2369,       2369,        0,   126720, 0x5f513367
-0,       2402,       2402,        0,   126720, 0x71fbf4a8
-0,       2435,       2435,        0,   126720, 0x5bff7b97
-0,       2469,       2469,        0,   126720, 0xbad453d4
-0,       2502,       2502,        0,   126720, 0x56e6161d
-0,       2535,       2535,        0,   126720, 0x524f2980
-0,       2569,       2569,        0,   126720, 0x0589405a
-0,       2602,       2602,        0,   126720, 0x5c264043
-0,       2635,       2635,        0,   126720, 0x2394696f
-0,       2669,       2669,        0,   126720, 0x1aa0cd15
-0,       2702,       2702,        0,   126720, 0xd6ec7840
-0,       2736,       2736,        0,   126720, 0xde5531f0
-0,       2769,       2769,        0,   126720, 0x03a42c3a
-0,       2802,       2802,        0,   126720, 0xbdee0efb
-0,       2836,       2836,        0,   126720, 0xa6012736
-0,       2869,       2869,        0,   126720, 0x448f5ae6
-0,       2902,       2902,        0,   126720, 0x8a2550c3
-0,       2936,       2936,        0,   126720, 0x143104e7
-0,       2969,       2969,        0,   126720, 0x75db363d
-0,       3002,       3002,        0,   126720, 0x906d2f9d
-0,       3036,       3036,        0,   126720, 0xfc7b30ab
-0,       3069,       3069,        0,   126720, 0xd3edaa62
-0,       3103,       3103,        0,   126720, 0x6267f3fc
-0,       3136,       3136,        0,   126720, 0x87b6c67f
-0,       3169,       3169,        0,   126720, 0x84da3b79
-0,       3203,       3203,        0,   126720, 0x72fbae15
-0,       3236,       3236,        0,   126720, 0xb8474a80
-0,       3269,       3269,        0,   126720, 0xbeae088b
-0,       3303,       3303,        0,   126720, 0x538b1a14
-0,       3336,       3336,        0,   126720, 0x07bbddcd
-0,       3370,       3370,        0,   126720, 0x807ddf8f
-0,       3403,       3403,        0,   126720, 0x325bb46d
-0,       3436,       3436,        0,   126720, 0xd80c2f2a
-0,       3470,       3470,        0,   126720, 0xfc1b0dec
-0,       3503,       3503,        0,   126720, 0x46068ebc
-0,       3536,       3536,        0,   126720, 0xcd987941
-0,       3570,       3570,        0,   126720, 0x52f37f2e
-0,       3603,       3603,        0,   126720, 0xc96931a2
+#tb 0: 32768/982057
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x240
+#sar 0: 0/1
+0,          0,          0,        1,   126720, 0xcefaec47
+0,          1,          1,        1,   126720, 0xa416ece5
+0,          2,          2,        1,   126720, 0xa416ece5
+0,          3,          3,        1,   126720, 0xa416ece5
+0,          4,          4,        1,   126720, 0x60d6ed27
+0,          5,          5,        1,   126720, 0x259af497
+0,          6,          6,        1,   126720, 0x5e6ff4d7
+0,          7,          7,        1,   126720, 0xcc10f4b7
+0,          8,          8,        1,   126720, 0x763ab817
+0,          9,          9,        1,   126720, 0xe95fb8d7
+0,         10,         10,        1,   126720, 0xe2b1b917
+0,         11,         11,        1,   126720, 0x11abb8f7
+0,         12,         12,        1,   126720, 0x4b62b947
+0,         13,         13,        1,   126720, 0xcaf2bbb7
+0,         14,         14,        1,   126720, 0x2953bc37
+0,         15,         15,        1,   126720, 0x1dd9bbd7
+0,         16,         16,        1,   126720, 0x105eb927
+0,         17,         17,        1,   126720, 0x7fa3ae27
+0,         18,         18,        1,   126720, 0x722e99f7
+0,         19,         19,        1,   126720, 0x5ac9a827
+0,         20,         20,        1,   126720, 0x07beba77
+0,         21,         21,        1,   126720, 0x29d6a887
+0,         22,         22,        1,   126720, 0xa5caab87
+0,         23,         23,        1,   126720, 0x9ca7aac7
+0,         24,         24,        1,   126720, 0xb7debcd7
+0,         25,         25,        1,   126720, 0xd115a757
+0,         26,         26,        1,   126720, 0x6ddaef32
+0,         27,         27,        1,   126720, 0xde1bb900
+0,         28,         28,        1,   126720, 0xac6c071b
+0,         29,         29,        1,   126720, 0x4a9f897c
+0,         30,         30,        1,   126720, 0xd8fa050f
+0,         31,         31,        1,   126720, 0x5d06be59
+0,         32,         32,        1,   126720, 0xdc3e0837
+0,         33,         33,        1,   126720, 0xcac6da2b
+0,         34,         34,        1,   126720, 0x6672dfc9
+0,         35,         35,        1,   126720, 0x7491b176
+0,         36,         36,        1,   126720, 0xa9477df0
+0,         37,         37,        1,   126720, 0xe976c34f
+0,         38,         38,        1,   126720, 0xdb7ab0e2
+0,         39,         39,        1,   126720, 0x1b42db35
+0,         40,         40,        1,   126720, 0xc6e10f9f
+0,         41,         41,        1,   126720, 0x169d61b6
+0,         42,         42,        1,   126720, 0xc7623119
+0,         43,         43,        1,   126720, 0x5b9b7543
+0,         44,         44,        1,   126720, 0x68c27aca
+0,         45,         45,        1,   126720, 0xa0e4e1c9
+0,         46,         46,        1,   126720, 0xbbdae87e
+0,         47,         47,        1,   126720, 0xe67e00a1
+0,         48,         48,        1,   126720, 0x648ea605
+0,         49,         49,        1,   126720, 0x5becb718
+0,         50,         50,        1,   126720, 0xb79ab1da
+0,         51,         51,        1,   126720, 0x0d52d1dc
+0,         52,         52,        1,   126720, 0x1277b853
+0,         53,         53,        1,   126720, 0xc57cbc83
+0,         54,         54,        1,   126720, 0x2126bdc3
+0,         55,         55,        1,   126720, 0x4c1ef41f
+0,         56,         56,        1,   126720, 0x185f6a2c
+0,         57,         57,        1,   126720, 0xb2b5a7d3
+0,         58,         58,        1,   126720, 0x32d7a26d
+0,         59,         59,        1,   126720, 0x0bffd118
+0,         60,         60,        1,   126720, 0x2eed823a
+0,         61,         61,        1,   126720, 0xc4c0147c
+0,         62,         62,        1,   126720, 0x1f8bf8ac
+0,         63,         63,        1,   126720, 0xfcb715e8
+0,         64,         64,        1,   126720, 0xc3e9fa9c
+0,         65,         65,        1,   126720, 0x9ad8572c
+0,         66,         66,        1,   126720, 0x2800596d
+0,         67,         67,        1,   126720, 0x3caa5094
+0,         68,         68,        1,   126720, 0x6162e000
+0,         69,         69,        1,   126720, 0x18200f2c
+0,         70,         70,        1,   126720, 0x649e699f
+0,         71,         71,        1,   126720, 0x5f513367
+0,         72,         72,        1,   126720, 0x71fbf4a8
+0,         73,         73,        1,   126720, 0x5bff7b97
+0,         74,         74,        1,   126720, 0xbad453d4
+0,         75,         75,        1,   126720, 0x56e6161d
+0,         76,         76,        1,   126720, 0x524f2980
+0,         77,         77,        1,   126720, 0x0589405a
+0,         78,         78,        1,   126720, 0x5c264043
+0,         79,         79,        1,   126720, 0x2394696f
+0,         80,         80,        1,   126720, 0x1aa0cd15
+0,         81,         81,        1,   126720, 0xd6ec7840
+0,         82,         82,        1,   126720, 0xde5531f0
+0,         83,         83,        1,   126720, 0x03a42c3a
+0,         84,         84,        1,   126720, 0xbdee0efb
+0,         85,         85,        1,   126720, 0xa6012736
+0,         86,         86,        1,   126720, 0x448f5ae6
+0,         87,         87,        1,   126720, 0x8a2550c3
+0,         88,         88,        1,   126720, 0x143104e7
+0,         89,         89,        1,   126720, 0x75db363d
+0,         90,         90,        1,   126720, 0x906d2f9d
+0,         91,         91,        1,   126720, 0xfc7b30ab
+0,         92,         92,        1,   126720, 0xd3edaa62
+0,         93,         93,        1,   126720, 0x6267f3fc
+0,         94,         94,        1,   126720, 0x87b6c67f
+0,         95,         95,        1,   126720, 0x84da3b79
+0,         96,         96,        1,   126720, 0x72fbae15
+0,         97,         97,        1,   126720, 0xb8474a80
+0,         98,         98,        1,   126720, 0xbeae088b
+0,         99,         99,        1,   126720, 0x538b1a14
+0,        100,        100,        1,   126720, 0x07bbddcd
+0,        101,        101,        1,   126720, 0x807ddf8f
+0,        102,        102,        1,   126720, 0x325bb46d
+0,        103,        103,        1,   126720, 0xd80c2f2a
+0,        104,        104,        1,   126720, 0xfc1b0dec
+0,        105,        105,        1,   126720, 0x46068ebc
+0,        106,        106,        1,   126720, 0xcd987941
+0,        107,        107,        1,   126720, 0x52f37f2e
+0,        108,        108,        1,   126720, 0xc96931a2
diff --git a/tests/ref/fate/rv40 b/tests/ref/fate/rv40
index d5cb265a00..9cbb8440aa 100644
--- a/tests/ref/fate/rv40
+++ b/tests/ref/fate/rv40
@@ -1,240 +1,245 @@
-#tb 0: 1/1000
-0,        -41,        -41,        0,   276480, 0x5f7a0d4f
-0,         42,         42,        0,   276480, 0x5f7a0d4f
-0,         83,         83,        0,   276480, 0x5f7a0d4f
-0,        125,        125,        0,   276480, 0x5f7a0d4f
-0,        167,        167,        0,   276480, 0x5f7a0d4f
-0,        209,        209,        0,   276480, 0x5f7a0d4f
-0,        250,        250,        0,   276480, 0x5f7a0d4f
-0,        292,        292,        0,   276480, 0x5f7a0d4f
-0,        334,        334,        0,   276480, 0x5f7a0d4f
-0,        375,        375,        0,   276480, 0x5f7a0d4f
-0,        417,        417,        0,   276480, 0x5f7a0d4f
-0,        459,        459,        0,   276480, 0x5f7a0d4f
-0,        501,        501,        0,   276480, 0x5f7a0d4f
-0,        542,        542,        0,   276480, 0x5f7a0d4f
-0,        584,        584,        0,   276480, 0x5f7a0d4f
-0,        626,        626,        0,   276480, 0x5f7a0d4f
-0,        667,        667,        0,   276480, 0x5f7a0d4f
-0,        709,        709,        0,   276480, 0x5f7a0d4f
-0,        751,        751,        0,   276480, 0x5f7a0d4f
-0,        792,        792,        0,   276480, 0x5f7a0d4f
-0,        834,        834,        0,   276480, 0x5f7a0d4f
-0,        876,        876,        0,   276480, 0x5f7a0d4f
-0,        918,        918,        0,   276480, 0x5f7a0d4f
-0,        959,        959,        0,   276480, 0x5f7a0d4f
-0,       1001,       1001,        0,   276480, 0x5f7a0d4f
-0,       1043,       1043,        0,   276480, 0x5f7a0d4f
-0,       1084,       1084,        0,   276480, 0x5f7a0d4f
-0,       1126,       1126,        0,   276480, 0x5f7a0d4f
-0,       1168,       1168,        0,   276480, 0x5f7a0d4f
-0,       1210,       1210,        0,   276480, 0x5f7a0d4f
-0,       1251,       1251,        0,   276480, 0x5f7a0d4f
-0,       1293,       1293,        0,   276480, 0x5f7a0d4f
-0,       1335,       1335,        0,   276480, 0x5f7a0d4f
-0,       1376,       1376,        0,   276480, 0x75641594
-0,       1418,       1418,        0,   276480, 0x32ee3526
-0,       1460,       1460,        0,   276480, 0xcb53479a
-0,       1502,       1502,        0,   276480, 0x7ca9658e
-0,       1543,       1543,        0,   276480, 0x5ce39368
-0,       1585,       1585,        0,   276480, 0x4ec1e418
-0,       1627,       1627,        0,   276480, 0xb3790499
-0,       1668,       1668,        0,   276480, 0xa9f1506f
-0,       1710,       1710,        0,   276480, 0x85cbc3b5
-0,       1752,       1752,        0,   276480, 0x377c7b46
-0,       1793,       1793,        0,   276480, 0x1a61d8db
-0,       1835,       1835,        0,   276480, 0xe1de7f0a
-0,       1877,       1877,        0,   276480, 0x756a4a2e
-0,       1919,       1919,        0,   276480, 0xcb379547
-0,       1960,       1960,        0,   276480, 0xbae14484
-0,       2002,       2002,        0,   276480, 0x8e12331c
-0,       2044,       2044,        0,   276480, 0x99c085be
-0,       2085,       2085,        0,   276480, 0xe479ffed
-0,       2127,       2127,        0,   276480, 0x99c82949
-0,       2169,       2169,        0,   276480, 0xac7672dd
-0,       2211,       2211,        0,   276480, 0x1e4fae19
-0,       2252,       2252,        0,   276480, 0x776412ef
-0,       2294,       2294,        0,   276480, 0x7d9b579f
-0,       2336,       2336,        0,   276480, 0x1cd1ab29
-0,       2377,       2377,        0,   276480, 0x58ce0f38
-0,       2419,       2419,        0,   276480, 0x5ab69b27
-0,       2461,       2461,        0,   276480, 0x0afad610
-0,       2503,       2503,        0,   276480, 0x9eca3f11
-0,       2544,       2544,        0,   276480, 0xc3db9706
-0,       2586,       2586,        0,   276480, 0xc9c57884
-0,       2628,       2628,        0,   276480, 0xd9fbb2cf
-0,       2669,       2669,        0,   276480, 0xdc07f3c9
-0,       2711,       2711,        0,   276480, 0x000b5269
-0,       2753,       2753,        0,   276480, 0x27ff7a5d
-0,       2794,       2794,        0,   276480, 0xd92e2017
-0,       2836,       2836,        0,   276480, 0x18d4b27d
-0,       2878,       2878,        0,   276480, 0x70647530
-0,       2920,       2920,        0,   276480, 0x97612c4b
-0,       2961,       2961,        0,   276480, 0xc9d4ac78
-0,       3003,       3003,        0,   276480, 0x4ec4d57f
-0,       3045,       3045,        0,   276480, 0xdf4e04d7
-0,       3086,       3086,        0,   276480, 0xbd98f57c
-0,       3128,       3128,        0,   276480, 0x7247ea3e
-0,       3170,       3170,        0,   276480, 0xa5d670ec
-0,       3212,       3212,        0,   276480, 0x5163b29b
-0,       3253,       3253,        0,   276480, 0x99170e64
-0,       3295,       3295,        0,   276480, 0x37f4c0b0
-0,       3337,       3337,        0,   276480, 0x7a4f2561
-0,       3378,       3378,        0,   276480, 0x8a4e991f
-0,       3420,       3420,        0,   276480, 0x6a45425f
-0,       3462,       3462,        0,   276480, 0x1f0e2bb6
-0,       3504,       3504,        0,   276480, 0xd75482c6
-0,       3545,       3545,        0,   276480, 0x7bf6b1ef
-0,       3587,       3587,        0,   276480, 0x6de1e34b
-0,       3629,       3629,        0,   276480, 0x4526c89b
-0,       3670,       3670,        0,   276480, 0xf964e18e
-0,       3712,       3712,        0,   276480, 0xdcaaa99a
-0,       3754,       3754,        0,   276480, 0xd1e98808
-0,       3795,       3795,        0,   276480, 0x556b2365
-0,       3837,       3837,        0,   276480, 0x0cf65540
-0,       3879,       3879,        0,   276480, 0x6e2d524e
-0,       3921,       3921,        0,   276480, 0x22c50a3d
-0,       3962,       3962,        0,   276480, 0x293f19af
-0,       4004,       4004,        0,   276480, 0xf4b1c461
-0,       4046,       4046,        0,   276480, 0x62b76407
-0,       4087,       4087,        0,   276480, 0x51e9b3eb
-0,       4129,       4129,        0,   276480, 0x7b910bc7
-0,       4171,       4171,        0,   276480, 0x6dd14ca6
-0,       4213,       4213,        0,   276480, 0x441f7afd
-0,       4254,       4254,        0,   276480, 0xfb01efc6
-0,       4296,       4296,        0,   276480, 0x4f73ccea
-0,       4338,       4338,        0,   276480, 0x5ac8e06f
-0,       4379,       4379,        0,   276480, 0x294bb441
-0,       4421,       4421,        0,   276480, 0xe04ac45e
-0,       4463,       4463,        0,   276480, 0xa7a38d41
-0,       4505,       4505,        0,   276480, 0xf688a3ed
-0,       4546,       4546,        0,   276480, 0x58f275ea
-0,       4588,       4588,        0,   276480, 0xf0b3b71b
-0,       4630,       4630,        0,   276480, 0x3ce773bf
-0,       4671,       4671,        0,   276480, 0x01840548
-0,       4713,       4713,        0,   276480, 0x674e34e4
-0,       4755,       4755,        0,   276480, 0x41dda2d9
-0,       4796,       4796,        0,   276480, 0xc5b60838
-0,       4838,       4838,        0,   276480, 0x9b209f41
-0,       4880,       4880,        0,   276480, 0xf46ba7fb
-0,       4922,       4922,        0,   276480, 0x28b54815
-0,       4963,       4963,        0,   276480, 0xb605a933
-0,       5005,       5005,        0,   276480, 0x34484aff
-0,       5047,       5047,        0,   276480, 0xaf2b5d89
-0,       5088,       5088,        0,   276480, 0x8facba58
-0,       5130,       5130,        0,   276480, 0xbbe3e99f
-0,       5172,       5172,        0,   276480, 0x02162c7c
-0,       5214,       5214,        0,   276480, 0x28a63236
-0,       5255,       5255,        0,   276480, 0x1ad43fd7
-0,       5297,       5297,        0,   276480, 0xe37883e5
-0,       5339,       5339,        0,   276480, 0x2b8a89c5
-0,       5380,       5380,        0,   276480, 0x71507bd2
-0,       5422,       5422,        0,   276480, 0x35626022
-0,       5464,       5464,        0,   276480, 0x461fc3e7
-0,       5506,       5506,        0,   276480, 0xce5af1ec
-0,       5547,       5547,        0,   276480, 0x7c1139b3
-0,       5589,       5589,        0,   276480, 0x7fd73a99
-0,       5631,       5631,        0,   276480, 0x4ae4c3a6
-0,       5672,       5672,        0,   276480, 0xcb60725a
-0,       5714,       5714,        0,   276480, 0xb52e1aa2
-0,       5756,       5756,        0,   276480, 0xd6f82cae
-0,       5797,       5797,        0,   276480, 0x6310e665
-0,       5839,       5839,        0,   276480, 0xfa88a483
-0,       5881,       5881,        0,   276480, 0xf88f75d4
-0,       5923,       5923,        0,   276480, 0x04a8e3ee
-0,       5964,       5964,        0,   276480, 0x54766a12
-0,       6006,       6006,        0,   276480, 0x0b41f0d7
-0,       6048,       6048,        0,   276480, 0xa29f5b01
-0,       6089,       6089,        0,   276480, 0x754ceaf5
-0,       6131,       6131,        0,   276480, 0x150c0423
-0,       6173,       6173,        0,   276480, 0xde084059
-0,       6215,       6215,        0,   276480, 0x5a38b4af
-0,       6256,       6256,        0,   276480, 0xfcebc261
-0,       6298,       6298,        0,   276480, 0x0eb9770d
-0,       6340,       6340,        0,   276480, 0x046394ae
-0,       6381,       6381,        0,   276480, 0x3d3ca985
-0,       6423,       6423,        0,   276480, 0x94a03c75
-0,       6465,       6465,        0,   276480, 0x800eea2d
-0,       6507,       6507,        0,   276480, 0x6a841f41
-0,       6548,       6548,        0,   276480, 0x2f98911c
-0,       6590,       6590,        0,   276480, 0x923b9937
-0,       6632,       6632,        0,   276480, 0xe82f8e0f
-0,       6673,       6673,        0,   276480, 0xee82d657
-0,       6715,       6715,        0,   276480, 0xefab7ffd
-0,       6757,       6757,        0,   276480, 0x6b9fbc80
-0,       6798,       6798,        0,   276480, 0x4a1ada47
-0,       6840,       6840,        0,   276480, 0x6d4b49d7
-0,       6882,       6882,        0,   276480, 0xe4bdbd1e
-0,       6924,       6924,        0,   276480, 0x225a56c0
-0,       6965,       6965,        0,   276480, 0xd4adadad
-0,       7007,       7007,        0,   276480, 0xff4e1a8c
-0,       7049,       7049,        0,   276480, 0xf58b1b7c
-0,       7090,       7090,        0,   276480, 0xbaffcdcc
-0,       7132,       7132,        0,   276480, 0x374f88f0
-0,       7174,       7174,        0,   276480, 0x3d861ae6
-0,       7216,       7216,        0,   276480, 0xeb6eb88f
-0,       7257,       7257,        0,   276480, 0xdb753d35
-0,       7299,       7299,        0,   276480, 0x9aa543af
-0,       7341,       7341,        0,   276480, 0xb24c8016
-0,       7382,       7382,        0,   276480, 0xea80a82e
-0,       7424,       7424,        0,   276480, 0x2aae902a
-0,       7466,       7466,        0,   276480, 0x5bba3cfb
-0,       7508,       7508,        0,   276480, 0x5c6e97a9
-0,       7549,       7549,        0,   276480, 0x9b9ee961
-0,       7591,       7591,        0,   276480, 0xaa12b6fd
-0,       7633,       7633,        0,   276480, 0xe9d2439f
-0,       7674,       7674,        0,   276480, 0xbf09053c
-0,       7716,       7716,        0,   276480, 0x50c31e73
-0,       7758,       7758,        0,   276480, 0xdd9fb89f
-0,       7799,       7799,        0,   276480, 0x3e4e5aec
-0,       7841,       7841,        0,   276480, 0x0b752d28
-0,       7883,       7883,        0,   276480, 0xaf82399a
-0,       7925,       7925,        0,   276480, 0x7ce5f23c
-0,       7966,       7966,        0,   276480, 0xad135d0f
-0,       8008,       8008,        0,   276480, 0x55dadd30
-0,       8050,       8050,        0,   276480, 0x5aaa7519
-0,       8091,       8091,        0,   276480, 0xe45a5599
-0,       8133,       8133,        0,   276480, 0xc8e89913
-0,       8175,       8175,        0,   276480, 0x2f447fd3
-0,       8217,       8217,        0,   276480, 0x704411fb
-0,       8258,       8258,        0,   276480, 0x9d7430a1
-0,       8300,       8300,        0,   276480, 0x24dd5fd3
-0,       8342,       8342,        0,   276480, 0x51cb657c
-0,       8383,       8383,        0,   276480, 0x2c230702
-0,       8425,       8425,        0,   276480, 0x4a4f76cd
-0,       8467,       8467,        0,   276480, 0xdcd71e88
-0,       8509,       8509,        0,   276480, 0x87160f99
-0,       8550,       8550,        0,   276480, 0x27f54854
-0,       8592,       8592,        0,   276480, 0x694d76e3
-0,       8634,       8634,        0,   276480, 0xcbe93c19
-0,       8675,       8675,        0,   276480, 0x50742e1b
-0,       8717,       8717,        0,   276480, 0x525463e2
-0,       8759,       8759,        0,   276480, 0x819898f9
-0,       8800,       8800,        0,   276480, 0x08fac755
-0,       8842,       8842,        0,   276480, 0x35c46927
-0,       8884,       8884,        0,   276480, 0xeeed00fc
-0,       8926,       8926,        0,   276480, 0xb6f99ee3
-0,       8967,       8967,        0,   276480, 0xd87f4c73
-0,       9009,       9009,        0,   276480, 0xde97d9fd
-0,       9051,       9051,        0,   276480, 0xefc83107
-0,       9092,       9092,        0,   276480, 0xbb22e024
-0,       9134,       9134,        0,   276480, 0x53a7cfcb
-0,       9176,       9176,        0,   276480, 0xbe1fbb19
-0,       9218,       9218,        0,   276480, 0x300f922a
-0,       9259,       9259,        0,   276480, 0x826fc3bd
-0,       9301,       9301,        0,   276480, 0x679aa57a
-0,       9343,       9343,        0,   276480, 0x5497097b
-0,       9384,       9384,        0,   276480, 0x679a53f8
-0,       9426,       9426,        0,   276480, 0x976c9e93
-0,       9468,       9468,        0,   276480, 0xe80f87f2
-0,       9510,       9510,        0,   276480, 0xdc2d7c6c
-0,       9551,       9551,        0,   276480, 0xb194656e
-0,       9593,       9593,        0,   276480, 0xf002c5ca
-0,       9635,       9635,        0,   276480, 0x43fc1c64
-0,       9676,       9676,        0,   276480, 0xf62d8581
-0,       9718,       9718,        0,   276480, 0xb243dda5
-0,       9760,       9760,        0,   276480, 0x1700efbb
-0,       9801,       9801,        0,   276480, 0x9ebe6ba2
-0,       9843,       9843,        0,   276480, 0x8f316c66
-0,       9885,       9885,        0,   276480, 0x6348ecf5
-0,       9927,       9927,        0,   276480, 0x34b5b78a
+#tb 0: 32768/785647
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 576x320
+#sar 0: 0/1
+0,          0,          0,        1,   276480, 0x5f7a0d4f
+0,          1,          1,        1,   276480, 0x5f7a0d4f
+0,          2,          2,        1,   276480, 0x5f7a0d4f
+0,          3,          3,        1,   276480, 0x5f7a0d4f
+0,          4,          4,        1,   276480, 0x5f7a0d4f
+0,          5,          5,        1,   276480, 0x5f7a0d4f
+0,          6,          6,        1,   276480, 0x5f7a0d4f
+0,          7,          7,        1,   276480, 0x5f7a0d4f
+0,          8,          8,        1,   276480, 0x5f7a0d4f
+0,          9,          9,        1,   276480, 0x5f7a0d4f
+0,         10,         10,        1,   276480, 0x5f7a0d4f
+0,         11,         11,        1,   276480, 0x5f7a0d4f
+0,         12,         12,        1,   276480, 0x5f7a0d4f
+0,         13,         13,        1,   276480, 0x5f7a0d4f
+0,         14,         14,        1,   276480, 0x5f7a0d4f
+0,         15,         15,        1,   276480, 0x5f7a0d4f
+0,         16,         16,        1,   276480, 0x5f7a0d4f
+0,         17,         17,        1,   276480, 0x5f7a0d4f
+0,         18,         18,        1,   276480, 0x5f7a0d4f
+0,         19,         19,        1,   276480, 0x5f7a0d4f
+0,         20,         20,        1,   276480, 0x5f7a0d4f
+0,         21,         21,        1,   276480, 0x5f7a0d4f
+0,         22,         22,        1,   276480, 0x5f7a0d4f
+0,         23,         23,        1,   276480, 0x5f7a0d4f
+0,         24,         24,        1,   276480, 0x5f7a0d4f
+0,         25,         25,        1,   276480, 0x5f7a0d4f
+0,         26,         26,        1,   276480, 0x5f7a0d4f
+0,         27,         27,        1,   276480, 0x5f7a0d4f
+0,         28,         28,        1,   276480, 0x5f7a0d4f
+0,         29,         29,        1,   276480, 0x5f7a0d4f
+0,         30,         30,        1,   276480, 0x5f7a0d4f
+0,         31,         31,        1,   276480, 0x5f7a0d4f
+0,         32,         32,        1,   276480, 0x5f7a0d4f
+0,         33,         33,        1,   276480, 0x75641594
+0,         34,         34,        1,   276480, 0x32ee3526
+0,         35,         35,        1,   276480, 0xcb53479a
+0,         36,         36,        1,   276480, 0x7ca9658e
+0,         37,         37,        1,   276480, 0x5ce39368
+0,         38,         38,        1,   276480, 0x4ec1e418
+0,         39,         39,        1,   276480, 0xb3790499
+0,         40,         40,        1,   276480, 0xa9f1506f
+0,         41,         41,        1,   276480, 0x85cbc3b5
+0,         42,         42,        1,   276480, 0x377c7b46
+0,         43,         43,        1,   276480, 0x1a61d8db
+0,         44,         44,        1,   276480, 0xe1de7f0a
+0,         45,         45,        1,   276480, 0x756a4a2e
+0,         46,         46,        1,   276480, 0xcb379547
+0,         47,         47,        1,   276480, 0xbae14484
+0,         48,         48,        1,   276480, 0x8e12331c
+0,         49,         49,        1,   276480, 0x99c085be
+0,         50,         50,        1,   276480, 0xe479ffed
+0,         51,         51,        1,   276480, 0x99c82949
+0,         52,         52,        1,   276480, 0xac7672dd
+0,         53,         53,        1,   276480, 0x1e4fae19
+0,         54,         54,        1,   276480, 0x776412ef
+0,         55,         55,        1,   276480, 0x7d9b579f
+0,         56,         56,        1,   276480, 0x1cd1ab29
+0,         57,         57,        1,   276480, 0x58ce0f38
+0,         58,         58,        1,   276480, 0x5ab69b27
+0,         59,         59,        1,   276480, 0x0afad610
+0,         60,         60,        1,   276480, 0x9eca3f11
+0,         61,         61,        1,   276480, 0xc3db9706
+0,         62,         62,        1,   276480, 0xc9c57884
+0,         63,         63,        1,   276480, 0xd9fbb2cf
+0,         64,         64,        1,   276480, 0xdc07f3c9
+0,         65,         65,        1,   276480, 0x000b5269
+0,         66,         66,        1,   276480, 0x27ff7a5d
+0,         67,         67,        1,   276480, 0xd92e2017
+0,         68,         68,        1,   276480, 0x18d4b27d
+0,         69,         69,        1,   276480, 0x70647530
+0,         70,         70,        1,   276480, 0x97612c4b
+0,         71,         71,        1,   276480, 0xc9d4ac78
+0,         72,         72,        1,   276480, 0x4ec4d57f
+0,         73,         73,        1,   276480, 0xdf4e04d7
+0,         74,         74,        1,   276480, 0xbd98f57c
+0,         75,         75,        1,   276480, 0x7247ea3e
+0,         76,         76,        1,   276480, 0xa5d670ec
+0,         77,         77,        1,   276480, 0x5163b29b
+0,         78,         78,        1,   276480, 0x99170e64
+0,         79,         79,        1,   276480, 0x37f4c0b0
+0,         80,         80,        1,   276480, 0x7a4f2561
+0,         81,         81,        1,   276480, 0x8a4e991f
+0,         82,         82,        1,   276480, 0x6a45425f
+0,         83,         83,        1,   276480, 0x1f0e2bb6
+0,         84,         84,        1,   276480, 0xd75482c6
+0,         85,         85,        1,   276480, 0x7bf6b1ef
+0,         86,         86,        1,   276480, 0x6de1e34b
+0,         87,         87,        1,   276480, 0x4526c89b
+0,         88,         88,        1,   276480, 0xf964e18e
+0,         89,         89,        1,   276480, 0xdcaaa99a
+0,         90,         90,        1,   276480, 0xd1e98808
+0,         91,         91,        1,   276480, 0x556b2365
+0,         92,         92,        1,   276480, 0x0cf65540
+0,         93,         93,        1,   276480, 0x6e2d524e
+0,         94,         94,        1,   276480, 0x22c50a3d
+0,         95,         95,        1,   276480, 0x293f19af
+0,         96,         96,        1,   276480, 0xf4b1c461
+0,         97,         97,        1,   276480, 0x62b76407
+0,         98,         98,        1,   276480, 0x51e9b3eb
+0,         99,         99,        1,   276480, 0x7b910bc7
+0,        100,        100,        1,   276480, 0x6dd14ca6
+0,        101,        101,        1,   276480, 0x441f7afd
+0,        102,        102,        1,   276480, 0xfb01efc6
+0,        103,        103,        1,   276480, 0x4f73ccea
+0,        104,        104,        1,   276480, 0x5ac8e06f
+0,        105,        105,        1,   276480, 0x294bb441
+0,        106,        106,        1,   276480, 0xe04ac45e
+0,        107,        107,        1,   276480, 0xa7a38d41
+0,        108,        108,        1,   276480, 0xf688a3ed
+0,        109,        109,        1,   276480, 0x58f275ea
+0,        110,        110,        1,   276480, 0xf0b3b71b
+0,        111,        111,        1,   276480, 0x3ce773bf
+0,        112,        112,        1,   276480, 0x01840548
+0,        113,        113,        1,   276480, 0x674e34e4
+0,        114,        114,        1,   276480, 0x41dda2d9
+0,        115,        115,        1,   276480, 0xc5b60838
+0,        116,        116,        1,   276480, 0x9b209f41
+0,        117,        117,        1,   276480, 0xf46ba7fb
+0,        118,        118,        1,   276480, 0x28b54815
+0,        119,        119,        1,   276480, 0xb605a933
+0,        120,        120,        1,   276480, 0x34484aff
+0,        121,        121,        1,   276480, 0xaf2b5d89
+0,        122,        122,        1,   276480, 0x8facba58
+0,        123,        123,        1,   276480, 0xbbe3e99f
+0,        124,        124,        1,   276480, 0x02162c7c
+0,        125,        125,        1,   276480, 0x28a63236
+0,        126,        126,        1,   276480, 0x1ad43fd7
+0,        127,        127,        1,   276480, 0xe37883e5
+0,        128,        128,        1,   276480, 0x2b8a89c5
+0,        129,        129,        1,   276480, 0x71507bd2
+0,        130,        130,        1,   276480, 0x35626022
+0,        131,        131,        1,   276480, 0x461fc3e7
+0,        132,        132,        1,   276480, 0xce5af1ec
+0,        133,        133,        1,   276480, 0x7c1139b3
+0,        134,        134,        1,   276480, 0x7fd73a99
+0,        135,        135,        1,   276480, 0x4ae4c3a6
+0,        136,        136,        1,   276480, 0xcb60725a
+0,        137,        137,        1,   276480, 0xb52e1aa2
+0,        138,        138,        1,   276480, 0xd6f82cae
+0,        139,        139,        1,   276480, 0x6310e665
+0,        140,        140,        1,   276480, 0xfa88a483
+0,        141,        141,        1,   276480, 0xf88f75d4
+0,        142,        142,        1,   276480, 0x04a8e3ee
+0,        143,        143,        1,   276480, 0x54766a12
+0,        144,        144,        1,   276480, 0x0b41f0d7
+0,        145,        145,        1,   276480, 0xa29f5b01
+0,        146,        146,        1,   276480, 0x754ceaf5
+0,        147,        147,        1,   276480, 0x150c0423
+0,        148,        148,        1,   276480, 0xde084059
+0,        149,        149,        1,   276480, 0x5a38b4af
+0,        150,        150,        1,   276480, 0xfcebc261
+0,        151,        151,        1,   276480, 0x0eb9770d
+0,        152,        152,        1,   276480, 0x046394ae
+0,        153,        153,        1,   276480, 0x3d3ca985
+0,        154,        154,        1,   276480, 0x94a03c75
+0,        155,        155,        1,   276480, 0x800eea2d
+0,        156,        156,        1,   276480, 0x6a841f41
+0,        157,        157,        1,   276480, 0x2f98911c
+0,        158,        158,        1,   276480, 0x923b9937
+0,        159,        159,        1,   276480, 0xe82f8e0f
+0,        160,        160,        1,   276480, 0xee82d657
+0,        161,        161,        1,   276480, 0xefab7ffd
+0,        162,        162,        1,   276480, 0x6b9fbc80
+0,        163,        163,        1,   276480, 0x4a1ada47
+0,        164,        164,        1,   276480, 0x6d4b49d7
+0,        165,        165,        1,   276480, 0xe4bdbd1e
+0,        166,        166,        1,   276480, 0x225a56c0
+0,        167,        167,        1,   276480, 0xd4adadad
+0,        168,        168,        1,   276480, 0xff4e1a8c
+0,        169,        169,        1,   276480, 0xf58b1b7c
+0,        170,        170,        1,   276480, 0xbaffcdcc
+0,        171,        171,        1,   276480, 0x374f88f0
+0,        172,        172,        1,   276480, 0x3d861ae6
+0,        173,        173,        1,   276480, 0xeb6eb88f
+0,        174,        174,        1,   276480, 0xdb753d35
+0,        175,        175,        1,   276480, 0x9aa543af
+0,        176,        176,        1,   276480, 0xb24c8016
+0,        177,        177,        1,   276480, 0xea80a82e
+0,        178,        178,        1,   276480, 0x2aae902a
+0,        179,        179,        1,   276480, 0x5bba3cfb
+0,        180,        180,        1,   276480, 0x5c6e97a9
+0,        181,        181,        1,   276480, 0x9b9ee961
+0,        182,        182,        1,   276480, 0xaa12b6fd
+0,        183,        183,        1,   276480, 0xe9d2439f
+0,        184,        184,        1,   276480, 0xbf09053c
+0,        185,        185,        1,   276480, 0x50c31e73
+0,        186,        186,        1,   276480, 0xdd9fb89f
+0,        187,        187,        1,   276480, 0x3e4e5aec
+0,        188,        188,        1,   276480, 0x0b752d28
+0,        189,        189,        1,   276480, 0xaf82399a
+0,        190,        190,        1,   276480, 0x7ce5f23c
+0,        191,        191,        1,   276480, 0xad135d0f
+0,        192,        192,        1,   276480, 0x55dadd30
+0,        193,        193,        1,   276480, 0x5aaa7519
+0,        194,        194,        1,   276480, 0xe45a5599
+0,        195,        195,        1,   276480, 0xc8e89913
+0,        196,        196,        1,   276480, 0x2f447fd3
+0,        197,        197,        1,   276480, 0x704411fb
+0,        198,        198,        1,   276480, 0x9d7430a1
+0,        199,        199,        1,   276480, 0x24dd5fd3
+0,        200,        200,        1,   276480, 0x51cb657c
+0,        201,        201,        1,   276480, 0x2c230702
+0,        202,        202,        1,   276480, 0x4a4f76cd
+0,        203,        203,        1,   276480, 0xdcd71e88
+0,        204,        204,        1,   276480, 0x87160f99
+0,        205,        205,        1,   276480, 0x27f54854
+0,        206,        206,        1,   276480, 0x694d76e3
+0,        207,        207,        1,   276480, 0xcbe93c19
+0,        208,        208,        1,   276480, 0x50742e1b
+0,        209,        209,        1,   276480, 0x525463e2
+0,        210,        210,        1,   276480, 0x819898f9
+0,        211,        211,        1,   276480, 0x08fac755
+0,        212,        212,        1,   276480, 0x35c46927
+0,        213,        213,        1,   276480, 0xeeed00fc
+0,        214,        214,        1,   276480, 0xb6f99ee3
+0,        215,        215,        1,   276480, 0xd87f4c73
+0,        216,        216,        1,   276480, 0xde97d9fd
+0,        217,        217,        1,   276480, 0xefc83107
+0,        218,        218,        1,   276480, 0xbb22e024
+0,        219,        219,        1,   276480, 0x53a7cfcb
+0,        220,        220,        1,   276480, 0xbe1fbb19
+0,        221,        221,        1,   276480, 0x300f922a
+0,        222,        222,        1,   276480, 0x826fc3bd
+0,        223,        223,        1,   276480, 0x679aa57a
+0,        224,        224,        1,   276480, 0x5497097b
+0,        225,        225,        1,   276480, 0x679a53f8
+0,        226,        226,        1,   276480, 0x976c9e93
+0,        227,        227,        1,   276480, 0xe80f87f2
+0,        228,        228,        1,   276480, 0xdc2d7c6c
+0,        229,        229,        1,   276480, 0xb194656e
+0,        230,        230,        1,   276480, 0xf002c5ca
+0,        231,        231,        1,   276480, 0x43fc1c64
+0,        232,        232,        1,   276480, 0xf62d8581
+0,        233,        233,        1,   276480, 0xb243dda5
+0,        234,        234,        1,   276480, 0x1700efbb
+0,        235,        235,        1,   276480, 0x9ebe6ba2
+0,        236,        236,        1,   276480, 0x8f316c66
+0,        237,        237,        1,   276480, 0x6348ecf5
+0,        238,        238,        1,   276480, 0x34b5b78a
+0,        239,        239,        1,   276480, 0xcbf66922
diff --git a/tests/ref/fate/sanm b/tests/ref/fate/sanm
index 078d1c280f..7a6690f13b 100644
--- a/tests/ref/fate/sanm
+++ b/tests/ref/fate/sanm
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   921600, 0x00000000
 0,          1,          1,        1,   921600, 0x00000000
 0,          2,          2,        1,   921600, 0x00000000
@@ -9,8 +13,8 @@
 0,          7,          7,        1,   921600, 0x00000000
 0,          8,          8,        1,   921600, 0x00000000
 0,          9,          9,        1,   921600, 0x00000000
-0,         10,         10,        1,   921600, 0x0870b171
-0,         11,         11,        1,   921600, 0xad557f05
-0,         12,         12,        1,   921600, 0xb06498e0
-0,         13,         13,        1,   921600, 0x156eaccf
-0,         14,         14,        1,   921600, 0x3d48e8e8
+0,         10,         10,        1,   921600, 0x0aa05443
+0,         11,         11,        1,   921600, 0x81d2a7fe
+0,         12,         12,        1,   921600, 0x769f303b
+0,         13,         13,        1,   921600, 0xcd68d0cd
+0,         14,         14,        1,   921600, 0x4cb4894a
diff --git a/tests/ref/fate/screenpresso-16bit b/tests/ref/fate/screenpresso-16bit
index d9a7d89769..88c33a662d 100644
--- a/tests/ref/fate/screenpresso-16bit
+++ b/tests/ref/fate/screenpresso-16bit
@@ -1,4 +1,8 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   153600, 0x69a234de
 0,          1,          1,        1,   153600, 0x7f43aee5
 0,          2,          2,        1,   153600, 0x81030634
diff --git a/tests/ref/fate/screenpresso-24bit b/tests/ref/fate/screenpresso-24bit
index bbdffb4433..74195d487d 100644
--- a/tests/ref/fate/screenpresso-24bit
+++ b/tests/ref/fate/screenpresso-24bit
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x360
+#sar 0: 0/1
 0,          0,          0,        1,   691200, 0xfdbdfad6
 0,          1,          1,        1,   691200, 0xc5feb961
 0,          4,          4,        1,   691200, 0x4c8c7e23
diff --git a/tests/ref/fate/screenpresso-32bit b/tests/ref/fate/screenpresso-32bit
index 5e1a3b55e3..fc06ec228e 100644
--- a/tests/ref/fate/screenpresso-32bit
+++ b/tests/ref/fate/screenpresso-32bit
@@ -1,4 +1,8 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   307200, 0xa01f27cc
 0,          1,          1,        1,   307200, 0x5d83c4d0
 0,          2,          2,        1,   307200, 0xb7d7919f
diff --git a/tests/ref/fate/segment-adts-to-mkv-header-000 b/tests/ref/fate/segment-adts-to-mkv-header-000
new file mode 100644
index 0000000000..294aa2346f
--- /dev/null
+++ b/tests/ref/fate/segment-adts-to-mkv-header-000
@@ -0,0 +1,22 @@
+#extradata 0:        2, 0x0030001c
+#tb 0: 1/1000
+#media_type 0: audio
+#codec_id 0: aac
+#sample_rate 0: 16000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+0,          0,          0,       64,        4, 0x02f70117
+0,         64,         64,       64,      163, 0xd5f85007
+0,        128,        128,       64,      127, 0x66484065
+0,        192,        192,       64,       94, 0x55222bd6
+0,        256,        256,       64,      314, 0x3c7e923a
+0,        320,        320,       64,      207, 0x1efc5d1b
+0,        384,        384,       64,      119, 0xb2a13601
+0,        448,        448,       64,      184, 0xcafc6091
+0,        512,        512,       64,      132, 0xddd33c0b
+0,        576,        576,       64,      152, 0x83935031
+0,        640,        640,       64,      227, 0x32a86bc4
+0,        704,        704,       64,      122, 0xd04e3571
+0,        768,        768,       64,      163, 0x57d44d16
+0,        832,        832,       64,      147, 0x226043d7
+0,        896,        896,       64,      119, 0x8ad931ed
diff --git a/tests/ref/fate/segment-adts-to-mkv-header-001 b/tests/ref/fate/segment-adts-to-mkv-header-001
new file mode 100644
index 0000000000..ec4669f12c
--- /dev/null
+++ b/tests/ref/fate/segment-adts-to-mkv-header-001
@@ -0,0 +1,23 @@
+#extradata 0:        2, 0x0030001c
+#tb 0: 1/1000
+#media_type 0: audio
+#codec_id 0: aac
+#sample_rate 0: 16000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+0,          0,          0,       64,      153, 0xbb6e432f
+0,         64,         64,       64,      185, 0xa01f4ff3
+0,        128,        128,       64,      126, 0x85503ce6
+0,        192,        192,       64,      246, 0x652c7b59
+0,        256,        256,       64,      162, 0xc9f04da0
+0,        320,        320,       64,      135, 0x71fa3be0
+0,        384,        384,       64,      246, 0x7a6f7788
+0,        448,        448,       64,      262, 0xd3097781
+0,        512,        512,       64,       60, 0x09a118f5
+0,        576,        576,       64,      255, 0xbab5793c
+0,        640,        640,       64,      153, 0x6b6a44fb
+0,        704,        704,       64,      160, 0x550e4530
+0,        768,        768,       64,      215, 0x7fe66144
+0,        832,        832,       64,      144, 0xcd723f7d
+0,        896,        896,       64,      187, 0x2a0b5c1b
+0,        960,        960,       64,      177, 0xb8c355d5
diff --git a/tests/ref/fate/segment-adts-to-mkv-header-002 b/tests/ref/fate/segment-adts-to-mkv-header-002
new file mode 100644
index 0000000000..06df824565
--- /dev/null
+++ b/tests/ref/fate/segment-adts-to-mkv-header-002
@@ -0,0 +1,10 @@
+#extradata 0:        2, 0x0030001c
+#tb 0: 1/1000
+#media_type 0: audio
+#codec_id 0: aac
+#sample_rate 0: 16000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+0,          0,          0,       64,      156, 0x867d4f3a
+0,         64,         64,       64,      201, 0x62745ff9
+0,        128,        128,       64,      137, 0x90c639e0
diff --git a/tests/ref/fate/segment-adts-to-mkv-header-all b/tests/ref/fate/segment-adts-to-mkv-header-all
new file mode 100644
index 0000000000..9c78d33477
--- /dev/null
+++ b/tests/ref/fate/segment-adts-to-mkv-header-all
@@ -0,0 +1,41 @@
+#extradata 0:        2, 0x0030001c
+#tb 0: 1/1000
+#media_type 0: audio
+#codec_id 0: aac
+#sample_rate 0: 16000
+#channel_layout 0: 4
+#channel_layout_name 0: mono
+0,          0,          0,       64,        4, 0x02f70117
+0,         64,         64,       64,      163, 0xd5f85007
+0,        128,        128,       64,      127, 0x66484065
+0,        192,        192,       64,       94, 0x55222bd6
+0,        256,        256,       64,      314, 0x3c7e923a
+0,        320,        320,       64,      207, 0x1efc5d1b
+0,        384,        384,       64,      119, 0xb2a13601
+0,        448,        448,       64,      184, 0xcafc6091
+0,        512,        512,       64,      132, 0xddd33c0b
+0,        576,        576,       64,      152, 0x83935031
+0,        640,        640,       64,      227, 0x32a86bc4
+0,        704,        704,       64,      122, 0xd04e3571
+0,        768,        768,       64,      163, 0x57d44d16
+0,        832,        832,       64,      147, 0x226043d7
+0,        896,        896,       64,      119, 0x8ad931ed
+0,        960,        960,       64,      153, 0xbb6e432f
+0,       1024,       1024,       64,      185, 0xa01f4ff3
+0,       1088,       1088,       64,      126, 0x85503ce6
+0,       1152,       1152,       64,      246, 0x652c7b59
+0,       1216,       1216,       64,      162, 0xc9f04da0
+0,       1280,       1280,       64,      135, 0x71fa3be0
+0,       1344,       1344,       64,      246, 0x7a6f7788
+0,       1408,       1408,       64,      262, 0xd3097781
+0,       1472,       1472,       64,       60, 0x09a118f5
+0,       1536,       1536,       64,      255, 0xbab5793c
+0,       1600,       1600,       64,      153, 0x6b6a44fb
+0,       1664,       1664,       64,      160, 0x550e4530
+0,       1728,       1728,       64,      215, 0x7fe66144
+0,       1792,       1792,       64,      144, 0xcd723f7d
+0,       1856,       1856,       64,      187, 0x2a0b5c1b
+0,       1920,       1920,       64,      177, 0xb8c355d5
+0,       1984,       1984,       64,      156, 0x867d4f3a
+0,       2048,       2048,       64,      201, 0x62745ff9
+0,       2112,       2112,       64,      137, 0x90c639e0
diff --git a/tests/ref/fate/segment-mp4-to-ts b/tests/ref/fate/segment-mp4-to-ts
new file mode 100644
index 0000000000..847c1a297d
--- /dev/null
+++ b/tests/ref/fate/segment-mp4-to-ts
@@ -0,0 +1,132 @@
+#extradata 0:       50, 0x4f1b0df9
+#tb 0: 1/90000
+#media_type 0: video
+#codec_id 0: h264
+#dimensions 0: 640x360
+#sar 0: 1/1
+0,      -7200,          0,        0,    22630, 0x9b109541, S=1,        1, 0x00e000e0
+0,      -3600,      14400,        0,     4021, 0xbf7cdb02, F=0x0, S=1,        1, 0x00e000e0
+0,          0,       7200,        0,     1096, 0x4f162690, F=0x0, S=1,        1, 0x00e000e0
+0,       3600,       3600,        0,      687, 0x00394b95, F=0x0, S=1,        1, 0x00e000e0
+0,       7200,      10800,        0,      445, 0x08c3d065, F=0x0, S=1,        1, 0x00e000e0
+0,      10800,      28800,        0,     4212, 0x56d12b8f, F=0x0, S=1,        1, 0x00e000e0
+0,      14400,      21600,        0,     1117, 0xd521260b, F=0x0, S=1,        1, 0x00e000e0
+0,      18000,      18000,        0,      892, 0x4262bdbc, F=0x0, S=1,        1, 0x00e000e0
+0,      21600,      25200,        0,      480, 0x3be1ef0b, F=0x0, S=1,        1, 0x00e000e0
+0,      25200,      43200,        0,     4065, 0x40dee237, F=0x0, S=1,        1, 0x00e000e0
+0,      28800,      36000,        0,      962, 0x31a4ceb1, F=0x0, S=1,        1, 0x00e000e0
+0,      32400,      32400,        0,      651, 0xb2aa317a, F=0x0, S=1,        1, 0x00e000e0
+0,      36000,      39600,        0,      543, 0x9c4e0024, F=0x0, S=1,        1, 0x00e000e0
+0,      39600,      57600,        0,     4221, 0x77c23977, F=0x0, S=1,        1, 0x00e000e0
+0,      43200,      50400,        0,     1040, 0x482cfa34, F=0x0, S=1,        1, 0x00e000e0
+0,      46800,      46800,        0,      576, 0x2686136a, F=0x0, S=1,        1, 0x00e000e0
+0,      50400,      54000,        0,      607, 0xc53c2339, F=0x0, S=1,        1, 0x00e000e0
+0,      54000,      72000,        0,     4755, 0x2f642b58, F=0x0, S=1,        1, 0x00e000e0
+0,      57600,      64800,        0,     1182, 0xbe1a4847, F=0x0, S=1,        1, 0x00e000e0
+0,      61200,      61200,        0,      809, 0x8d948a4e, F=0x0, S=1,        1, 0x00e000e0
+0,      64800,      68400,        0,      656, 0x4fa03c2b, F=0x0, S=1,        1, 0x00e000e0
+0,      68400,      86400,        0,    26555, 0x5629b584, S=1,        1, 0x00e000e0
+0,      72000,      79200,        0,     1141, 0x761b31e8, F=0x0, S=1,        1, 0x00e000e0
+0,      75600,      75600,        0,      717, 0x57746351, F=0x0, S=1,        1, 0x00e000e0
+0,      79200,      82800,        0,      693, 0x78b24263, F=0x0, S=1,        1, 0x00e000e0
+0,      82800,     100800,        0,     3417, 0x560dbc89, F=0x0, S=1,        1, 0x00e000e0
+0,      86400,      93600,        0,     1128, 0xc0f1383c, F=0x0, S=1,        1, 0x00e000e0
+0,      90000,      90000,        0,      650, 0xc3ad485e, F=0x0, S=1,        1, 0x00e000e0
+0,      93600,      97200,        0,      766, 0xd3e9757d, F=0x0, S=1,        1, 0x00e000e0
+0,      97200,     115200,     3600,     4268, 0xec1235b5, F=0x0, S=1,        1, 0x00e000e0
+0,     100800,     108000,     3600,     1119, 0x65f51fb7, F=0x0, S=1,        1, 0x00e000e0
+0,     104400,     104400,     3600,      766, 0x213b78d3, F=0x0, S=1,        1, 0x00e000e0
+0,     108000,     111600,     3600,      770, 0xa7537e6d, F=0x0, S=1,        1, 0x00e000e0
+0,     111600,     129600,     3600,     6349, 0xec225cf9, F=0x0, S=1,        1, 0x00e000e0
+0,     115200,     122400,     3600,     1188, 0x9dea396c, F=0x0, S=1,        1, 0x00e000e0
+0,     118800,     118800,     3600,      805, 0xdd9e88d0, F=0x0, S=1,        1, 0x00e000e0
+0,     122400,     126000,     3600,      752, 0x1f93730a, F=0x0, S=1,        1, 0x00e000e0
+0,     126000,     144000,     3600,     5502, 0x501bda5c, F=0x0, S=1,        1, 0x00e000e0
+0,     129600,     136800,     3600,     1240, 0x7e3661ea, F=0x0, S=1,        1, 0x00e000e0
+0,     133200,     133200,     3600,      830, 0xa8249f38, F=0x0, S=1,        1, 0x00e000e0
+0,     136800,     140400,     3600,      754, 0xab1c815e, F=0x0, S=1,        1, 0x00e000e0
+0,     140400,     158400,     3600,     5328, 0xd2c55ac6, F=0x0, S=1,        1, 0x00e000e0
+0,     144000,     151200,     3600,     1271, 0x46006870, F=0x0, S=1,        1, 0x00e000e0
+0,     147600,     147600,     3600,      849, 0x94dc99c7, F=0x0, S=1,        1, 0x00e000e0
+0,     151200,     154800,     3600,      753, 0xf4236cab, F=0x0, S=1,        1, 0x00e000e0
+0,     154800,     172800,     3600,    25825, 0xd5464dee, S=1,        1, 0x00e000e0
+0,     158400,     165600,     3600,     1206, 0x8ce84344, F=0x0, S=1,        1, 0x00e000e0
+0,     162000,     162000,     3600,      867, 0x312fa07d, F=0x0, S=1,        1, 0x00e000e0
+0,     165600,     169200,     3600,      719, 0x810666d1, F=0x0, S=1,        1, 0x00e000e0
+0,     169200,     187200,     3600,     3786, 0xa96a6825, F=0x0, S=1,        1, 0x00e000e0
+0,     172800,     180000,     3600,     1187, 0x77e649a2, F=0x0, S=1,        1, 0x00e000e0
+0,     176400,     176400,     3600,      750, 0x86da6d2e, F=0x0, S=1,        1, 0x00e000e0
+0,     180000,     183600,     3600,      815, 0xf09a9881, F=0x0, S=1,        1, 0x00e000e0
+0,     183600,     201600,     3600,     5275, 0xee3450bb, F=0x0, S=1,        1, 0x00e000e0
+0,     187200,     194400,     3600,     1352, 0x150a96e1, F=0x0, S=1,        1, 0x00e000e0
+0,     190800,     190800,     3600,      877, 0x6062a120, F=0x0, S=1,        1, 0x00e000e0
+0,     194400,     198000,     3600,      829, 0x5180988c, F=0x0, S=1,        1, 0x00e000e0
+0,     198000,     216000,     3600,     4421, 0x623aad33, F=0x0, S=1,        1, 0x00e000e0
+0,     201600,     208800,     3600,     1464, 0xd34dc851, F=0x0, S=1,        1, 0x00e000e0
+0,     205200,     205200,     3600,      903, 0xf63bbed0, F=0x0, S=1,        1, 0x00e000e0
+0,     208800,     212400,     3600,      717, 0xc17054b8, F=0x0, S=1,        1, 0x00e000e0
+0,     212400,     230400,     3600,     4787, 0x75e9400e, F=0x0, S=1,        1, 0x00e000e0
+0,     216000,     223200,     3600,     1435, 0xb01ccabb, F=0x0, S=1,        1, 0x00e000e0
+0,     219600,     219600,     3600,      851, 0x54bda291, F=0x0, S=1,        1, 0x00e000e0
+0,     223200,     226800,     3600,      809, 0x84e37fee, F=0x0, S=1,        1, 0x00e000e0
+0,     226800,     244800,     3600,     4541, 0xd4e5c0de, F=0x0, S=1,        1, 0x00e000e0
+0,     230400,     237600,     3600,     1545, 0x0099fc98, F=0x0, S=1,        1, 0x00e000e0
+0,     234000,     234000,     3600,      929, 0xfd72d049, F=0x0, S=1,        1, 0x00e000e0
+0,     237600,     241200,     3600,      829, 0xcfda9e96, F=0x0, S=1,        1, 0x00e000e0
+0,     241200,     259200,     3600,    24220, 0x5ca21d71, S=1,        1, 0x00e000e0
+0,     244800,     252000,     3600,     1422, 0xcde6cc34, F=0x0, S=1,        1, 0x00e000e0
+0,     248400,     248400,     3600,      883, 0xedacbe25, F=0x0, S=1,        1, 0x00e000e0
+0,     252000,     255600,     3600,      768, 0x89d774bc, F=0x0, S=1,        1, 0x00e000e0
+0,     255600,     273600,     3600,     3802, 0xea1d70d4, F=0x0, S=1,        1, 0x00e000e0
+0,     259200,     266400,     3600,     1284, 0x2c927097, F=0x0, S=1,        1, 0x00e000e0
+0,     262800,     262800,     3600,      745, 0x81076a7f, F=0x0, S=1,        1, 0x00e000e0
+0,     266400,     270000,     3600,      931, 0x3675dbfe, F=0x0, S=1,        1, 0x00e000e0
+0,     270000,     288000,     3600,     4830, 0x7a807a68, F=0x0, S=1,        1, 0x00e000e0
+0,     273600,     280800,     3600,     1446, 0x6224bc81, F=0x0, S=1,        1, 0x00e000e0
+0,     277200,     277200,     3600,      833, 0x56f78ae2, F=0x0, S=1,        1, 0x00e000e0
+0,     280800,     284400,     3600,      873, 0x9caeaf00, F=0x0, S=1,        1, 0x00e000e0
+0,     284400,     302400,     3600,     5167, 0x1703151f, F=0x0, S=1,        1, 0x00e000e0
+0,     288000,     295200,     3600,     1449, 0x0881b0d6, F=0x0, S=1,        1, 0x00e000e0
+0,     291600,     291600,     3600,      866, 0x0bffa719, F=0x0, S=1,        1, 0x00e000e0
+0,     295200,     298800,     3600,      874, 0xc243a65f, F=0x0, S=1,        1, 0x00e000e0
+0,     298800,     316800,     3600,     5426, 0x7c899c30, F=0x0, S=1,        1, 0x00e000e0
+0,     302400,     309600,     3600,     1574, 0x03b00f0d, F=0x0, S=1,        1, 0x00e000e0
+0,     306000,     306000,     3600,      860, 0x65cea74e, F=0x0, S=1,        1, 0x00e000e0
+0,     309600,     313200,     3600,      829, 0xffd795cd, F=0x0, S=1,        1, 0x00e000e0
+0,     313200,     331200,     3600,     5352, 0x59997996, F=0x0, S=1,        1, 0x00e000e0
+0,     316800,     324000,     3600,     1501, 0xb3b8f001, F=0x0, S=1,        1, 0x00e000e0
+0,     320400,     320400,     3600,      941, 0x92b0cb18, F=0x0, S=1,        1, 0x00e000e0
+0,     324000,     327600,     3600,      823, 0x3d548355, F=0x0, S=1,        1, 0x00e000e0
+0,     327600,     345600,     3600,    24042, 0x441e94fb, S=1,        1, 0x00e000e0
+0,     331200,     338400,     3600,     1582, 0x4f5d1049, F=0x0, S=1,        1, 0x00e000e0
+0,     334800,     334800,     3600,      945, 0x4f3cc9e8, F=0x0, S=1,        1, 0x00e000e0
+0,     338400,     342000,     3600,      815, 0x0ca790a4, F=0x0, S=1,        1, 0x00e000e0
+0,     342000,     360000,     3600,     4425, 0x1db2a088, F=0x0, S=1,        1, 0x00e000e0
+0,     345600,     352800,     3600,     1492, 0x881ce798, F=0x0, S=1,        1, 0x00e000e0
+0,     349200,     349200,     3600,      905, 0xbdd9c278, F=0x0, S=1,        1, 0x00e000e0
+0,     352800,     356400,     3600,      870, 0x64fbb0e1, F=0x0, S=1,        1, 0x00e000e0
+0,     356400,     374400,     3600,     5194, 0x138b1e1d, F=0x0, S=1,        1, 0x00e000e0
+0,     360000,     367200,     3600,     1483, 0xc5c9d717, F=0x0, S=1,        1, 0x00e000e0
+0,     363600,     363600,     3600,      977, 0x3648d9fc, F=0x0, S=1,        1, 0x00e000e0
+0,     367200,     370800,     3600,      834, 0x6c5d8969, F=0x0, S=1,        1, 0x00e000e0
+0,     370800,     388800,     3600,     6956, 0x6a548e0b, F=0x0, S=1,        1, 0x00e000e0
+0,     374400,     381600,     3600,     1187, 0x795f4163, F=0x0, S=1,        1, 0x00e000e0
+0,     378000,     378000,     3600,      925, 0x92bfc2fb, F=0x0, S=1,        1, 0x00e000e0
+0,     381600,     385200,     3600,      747, 0xea9978fc, F=0x0, S=1,        1, 0x00e000e0
+0,     385200,     403200,     3600,     5005, 0xc558c189, F=0x0, S=1,        1, 0x00e000e0
+0,     388800,     396000,     3600,      452, 0x7d92d9d8, F=0x0, S=1,        1, 0x00e000e0
+0,     392400,     392400,     3600,      784, 0xfd597a5f, F=0x0, S=1,        1, 0x00e000e0
+0,     396000,     399600,     3600,      199, 0x79b06355, F=0x0, S=1,        1, 0x00e000e0
+0,     399600,     417600,     3600,     1862, 0x22a2a06c, F=0x0, S=1,        1, 0x00e000e0
+0,     403200,     410400,     3600,      359, 0x11bdae52, F=0x0, S=1,        1, 0x00e000e0
+0,     406800,     406800,     3600,      235, 0xbec26964, F=0x0, S=1,        1, 0x00e000e0
+0,     410400,     414000,     3600,      221, 0x8380682c, F=0x0, S=1,        1, 0x00e000e0
+0,     414000,     432000,     3600,    22588, 0xf0ecf072, S=1,        1, 0x00e000e0
+0,     417600,     424800,     3600,      383, 0x4f3bb571, F=0x0, S=1,        1, 0x00e000e0
+0,     421200,     421200,     3600,      257, 0x22e87802, F=0x0, S=1,        1, 0x00e000e0
+0,     424800,     428400,     3600,      261, 0xdb988134, F=0x0, S=1,        1, 0x00e000e0
+0,     428400,     435600,     3600,      156, 0xd2c3406c, F=0x0, S=1,        1, 0x00e000e0
+0,     432000,     439200,     3600,      330, 0x150d9b60, F=0x0, S=1,        1, 0x00e000e0
+0,     435600,     446400,     3600,      324, 0x558194ee, F=0x0, S=1,        1, 0x00e000e0
+0,     439200,     442800,     3600,      191, 0x108e54d1, F=0x0, S=1,        1, 0x00e000e0
+0,     442800,     450000,     3600,      233, 0xac5b6486, F=0x0
diff --git a/tests/ref/fate/sgi-gray16 b/tests/ref/fate/sgi-gray16
index 0908746a76..8dba0f49c9 100644
--- a/tests/ref/fate/sgi-gray16
+++ b/tests/ref/fate/sgi-gray16
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,   262144, 0x6c27f084
diff --git a/tests/ref/fate/sgi-gray16-rle b/tests/ref/fate/sgi-gray16-rle
index 09903d5ba9..472835a1d1 100644
--- a/tests/ref/fate/sgi-gray16-rle
+++ b/tests/ref/fate/sgi-gray16-rle
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,   262144, 0x65ef57ff
diff --git a/tests/ref/fate/sgi-gray8 b/tests/ref/fate/sgi-gray8
index b0e060699c..55c12dcb66 100644
--- a/tests/ref/fate/sgi-gray8
+++ b/tests/ref/fate/sgi-gray8
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,   131072, 0xb0702a94
diff --git a/tests/ref/fate/sgi-gray8-rle b/tests/ref/fate/sgi-gray8-rle
index b0e060699c..55c12dcb66 100644
--- a/tests/ref/fate/sgi-gray8-rle
+++ b/tests/ref/fate/sgi-gray8-rle
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,   131072, 0xb0702a94
diff --git a/tests/ref/fate/sgi-rgb24 b/tests/ref/fate/sgi-rgb24
index 30aca1cead..4326cabe00 100644
--- a/tests/ref/fate/sgi-rgb24
+++ b/tests/ref/fate/sgi-rgb24
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,   393216, 0xa9b28fd9
diff --git a/tests/ref/fate/sgi-rgb24-rle b/tests/ref/fate/sgi-rgb24-rle
index 1128de56d9..d21bde15ba 100644
--- a/tests/ref/fate/sgi-rgb24-rle
+++ b/tests/ref/fate/sgi-rgb24-rle
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,   393216, 0xe96e1de2
diff --git a/tests/ref/fate/sgi-rgb48 b/tests/ref/fate/sgi-rgb48
index 8f3ca50b10..29fe302514 100644
--- a/tests/ref/fate/sgi-rgb48
+++ b/tests/ref/fate/sgi-rgb48
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,   786432, 0xee4aa667
diff --git a/tests/ref/fate/sgi-rgb48-rle b/tests/ref/fate/sgi-rgb48-rle
index 2cf0259695..49fc973017 100644
--- a/tests/ref/fate/sgi-rgb48-rle
+++ b/tests/ref/fate/sgi-rgb48-rle
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,   786432, 0xbc743bc4
diff --git a/tests/ref/fate/sgi-rgba b/tests/ref/fate/sgi-rgba
index 058f5f99c3..6a2d176582 100644
--- a/tests/ref/fate/sgi-rgba
+++ b/tests/ref/fate/sgi-rgba
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,   524288, 0x4ee5adbb
diff --git a/tests/ref/fate/sgi-rgba-rle b/tests/ref/fate/sgi-rgba-rle
index 058f5f99c3..6a2d176582 100644
--- a/tests/ref/fate/sgi-rgba-rle
+++ b/tests/ref/fate/sgi-rgba-rle
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,   524288, 0x4ee5adbb
diff --git a/tests/ref/fate/sgi-rgba64 b/tests/ref/fate/sgi-rgba64
index f4e939ec73..00181dcb3b 100644
--- a/tests/ref/fate/sgi-rgba64
+++ b/tests/ref/fate/sgi-rgba64
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,  1048576, 0xc657e22b
diff --git a/tests/ref/fate/sgi-rgba64-rle b/tests/ref/fate/sgi-rgba64-rle
index cdf5fd0e32..354d391826 100644
--- a/tests/ref/fate/sgi-rgba64-rle
+++ b/tests/ref/fate/sgi-rgba64-rle
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x256
+#sar 0: 0/1
 0,          0,          0,        1,  1048576, 0xb619d0f1
diff --git a/tests/ref/fate/sha512 b/tests/ref/fate/sha512
new file mode 100644
index 0000000000..6009115350
--- /dev/null
+++ b/tests/ref/fate/sha512
@@ -0,0 +1,28 @@
+Testing SHA-512/224
+4634270F707B6A54DAAE7530460842E20E37ED265CEEE9A43E8924AA
+23FEC5BB94D60B23308192640B0C453335D664734FE40E7268674AF9
+37AB331D76F0D36DE422BD0EDEB22A28ACCD487B7A8453AE965DD287
+4634270f 707b6a54 daae7530 460842e2 0e37ed26 5ceee9a4 3e8924aa
+23fec5bb 94d60b23 30819264 0b0c4533 35d66473 4fe40e72 68674af9
+37ab331d 76f0d36d e422bd0e deb22a28 accd487b 7a8453ae 965dd287
+Testing SHA-512/256
+53048E2681941EF99B2E29B76B4C7DABE4C2D0C634FC6D46E0E2F13107E7AF23
+3928E184FB8690F840DA3988121D31BE65CB9D3EF83EE6146FEAC861E19B563A
+9A59A052930187A97038CAE692F30708AA6491923EF5194394DC68D56C74FB21
+53048e26 81941ef9 9b2e29b7 6b4c7dab e4c2d0c6 34fc6d46 e0e2f131 07e7af23
+3928e184 fb8690f8 40da3988 121d31be 65cb9d3e f83ee614 6feac861 e19b563a
+9a59a052 930187a9 7038cae6 92f30708 aa649192 3ef51943 94dc68d5 6c74fb21
+Testing SHA-384
+CB00753F45A35E8BB5A03D699AC65007272C32AB0EDED1631A8B605A43FF5BED8086072BA1E7CC2358BAECA134C825A7
+09330C33F71147E83D192FC782CD1B4753111B173B3B05D22FA08086E3B0F712FCC7C71A557E2DB966C3E9FA91746039
+9D0E1809716474CB086E834E310A4A1CED149E9C00F248527972CEC5704C2A5B07B8B3DC38ECC4EBAE97DDD87F3D8985
+cb00753f 45a35e8b b5a03d69 9ac65007 272c32ab 0eded163 1a8b605a 43ff5bed 8086072b a1e7cc23 58baeca1 34c825a7
+09330c33 f71147e8 3d192fc7 82cd1b47 53111b17 3b3b05d2 2fa08086 e3b0f712 fcc7c71a 557e2db9 66c3e9fa 91746039
+9d0e1809 716474cb 086e834e 310a4a1c ed149e9c 00f24852 7972cec5 704c2a5b 07b8b3dc 38ecc4eb ae97ddd8 7f3d8985
+Testing SHA-512
+DDAF35A193617ABACC417349AE20413112E6FA4E89A97EA20A9EEEE64B55D39A2192992A274FC1A836BA3C23A3FEEBBD454D4423643CE80E2A9AC94FA54CA49F
+8E959B75DAE313DA8CF4F72814FC143F8F7779C6EB9F7FA17299AEADB6889018501D289E4900F7E4331B99DEC4B5433AC7D329EEB6DD26545E96E55B874BE909
+E718483D0CE769644E2E42C7BC15B4638E1F98B13B2044285632A803AFA973EBDE0FF244877EA60A4CB0432CE577C31BEB009C5C2C49AA2E4EADB217AD8CC09B
+ddaf35a1 93617aba cc417349 ae204131 12e6fa4e 89a97ea2 0a9eeee6 4b55d39a 2192992a 274fc1a8 36ba3c23 a3feebbd 454d4423 643ce80e 2a9ac94f a54ca49f
+8e959b75 dae313da 8cf4f728 14fc143f 8f7779c6 eb9f7fa1 7299aead b6889018 501d289e 4900f7e4 331b99de c4b5433a c7d329ee b6dd2654 5e96e55b 874be909
+e718483d 0ce76964 4e2e42c7 bc15b463 8e1f98b1 3b204428 5632a803 afa973eb de0ff244 877ea60a 4cb0432c e577c31b eb009c5c 2c49aa2e 4eadb217 ad8cc09b
diff --git a/tests/ref/fate/sierra-vmd-audio b/tests/ref/fate/sierra-vmd-audio
index 13d3567e11..9c0e6b2db1 100644
--- a/tests/ref/fate/sierra-vmd-audio
+++ b/tests/ref/fate/sierra-vmd-audio
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,    61740,   123480, 0x3a794c13
 0,      61740,      61740,     2205,     4410, 0x109d04e0
 0,      63945,      63945,     2205,     4410, 0x224d244f
diff --git a/tests/ref/fate/sierra-vmd-video b/tests/ref/fate/sierra-vmd-video
index 5b9dde1b32..b1b22e34e1 100644
--- a/tests/ref/fate/sierra-vmd-video
+++ b/tests/ref/fate/sierra-vmd-video
@@ -1,118 +1,122 @@
 #tb 0: 1/10
-0,          0,          0,        1,   230400, 0x0224ab01
-0,          1,          1,        1,   230400, 0x449e4d81
-0,          2,          2,        1,   230400, 0x3e15e07a
-0,          3,          3,        1,   230400, 0xdabe4172
-0,          4,          4,        1,   230400, 0x0947b7db
-0,          5,          5,        1,   230400, 0x934e243b
-0,          6,          6,        1,   230400, 0x6b5c5b6c
-0,          7,          7,        1,   230400, 0x4bf7bbb5
-0,          8,          8,        1,   230400, 0x423eec8e
-0,          9,          9,        1,   230400, 0x63663b5e
-0,         10,         10,        1,   230400, 0x9c258a67
-0,         11,         11,        1,   230400, 0x1c92b6e0
-0,         12,         12,        1,   230400, 0xdd0a0e28
-0,         13,         13,        1,   230400, 0x51d64af1
-0,         14,         14,        1,   230400, 0x5776ac12
-0,         15,         15,        1,   230400, 0x49070132
-0,         16,         16,        1,   230400, 0xa59635ab
-0,         17,         17,        1,   230400, 0xb1f99504
-0,         18,         18,        1,   230400, 0x61fac725
-0,         19,         19,        1,   230400, 0xc32c28d5
-0,         20,         20,        1,   230400, 0x2b7a91d6
-0,         21,         21,        1,   230400, 0x917be717
-0,         22,         22,        1,   230400, 0xd3c5a2ff
-0,         23,         23,        1,   230400, 0x0678a707
-0,         24,         24,        1,   230400, 0x122504e6
-0,         25,         25,        1,   230400, 0x76aebdae
-0,         26,         26,        1,   230400, 0x81357545
-0,         27,         27,        1,   230400, 0x38baeebd
-0,         28,         28,        1,   230400, 0x1c5c44d4
-0,         29,         29,        1,   230400, 0x60e189cc
-0,         30,         30,        1,   230400, 0xb1f4381c
-0,         31,         31,        1,   230400, 0xb5048fed
-0,         32,         32,        1,   230400, 0xc947c30e
-0,         33,         33,        1,   230400, 0xe8e31c07
-0,         34,         34,        1,   230400, 0x6d49dd02
-0,         35,         35,        1,   230400, 0x293e15d3
-0,         36,         36,        1,   230400, 0x354d792e
-0,         37,         37,        1,   230400, 0x35468780
-0,         38,         38,        1,   230400, 0x365d3991
-0,         39,         39,        1,   230400, 0xc9debef2
-0,         40,         40,        1,   230400, 0x4c4634c2
-0,         41,         41,        1,   230400, 0x347c2dca
-0,         42,         42,        1,   230400, 0x1efa0aaa
-0,         43,         43,        1,   230400, 0xa79a0b5a
-0,         44,         44,        1,   230400, 0xfdb2dcdb
-0,         45,         45,        1,   230400, 0x42dbea33
-0,         46,         46,        1,   230400, 0x2a207e43
-0,         47,         47,        1,   230400, 0x86573783
-0,         48,         48,        1,   230400, 0xc3968473
-0,         49,         49,        1,   230400, 0x8f62a7b4
-0,         50,         50,        1,   230400, 0x5a2e3073
-0,         51,         51,        1,   230400, 0xd24f5e2c
-0,         52,         52,        1,   230400, 0x1df3c67d
-0,         53,         53,        1,   230400, 0xe4fd884d
-0,         57,         57,        1,   230400, 0x9a228555
-0,         58,         58,        1,   230400, 0x9eba8ed5
-0,         59,         59,        1,   230400, 0x3d808a3d
-0,         60,         60,        1,   230400, 0xf57e866d
-0,         61,         61,        1,   230400, 0x85f594f5
-0,         62,         62,        1,   230400, 0xb09f99dd
-0,         63,         63,        1,   230400, 0x2b368475
-0,         64,         64,        1,   230400, 0xa2417afd
-0,         65,         65,        1,   230400, 0x590b709d
-0,         66,         66,        1,   230400, 0x5d617705
-0,         67,         67,        1,   230400, 0xabf981ad
-0,         68,         68,        1,   230400, 0x5a8590cd
-0,         69,         69,        1,   230400, 0x1bff853d
-0,         70,         70,        1,   230400, 0x71d08055
-0,         71,         71,        1,   230400, 0x2ebd817d
-0,         72,         72,        1,   230400, 0x6e838255
-0,         73,         73,        1,   230400, 0x043984cd
-0,         74,         74,        1,   230400, 0x7ff18495
-0,         75,         75,        1,   230400, 0xa43b8385
-0,         76,         76,        1,   230400, 0x72b5825d
-0,         77,         77,        1,   230400, 0x3a178085
-0,         78,         78,        1,   230400, 0x67748245
-0,         79,         79,        1,   230400, 0xeddf81d5
-0,         80,         80,        1,   230400, 0x8b088665
-0,         81,         81,        1,   230400, 0x6c408e15
-0,         82,         82,        1,   230400, 0x81f196dd
-0,         83,         83,        1,   230400, 0xab9f953d
-0,         84,         84,        1,   230400, 0xa5f69795
-0,         85,         85,        1,   230400, 0xa772950d
-0,         86,         86,        1,   230400, 0x6a5596d5
-0,         87,         87,        1,   230400, 0x1355958d
-0,         88,         88,        1,   230400, 0x4134981d
-0,         89,         89,        1,   230400, 0x8b929515
-0,         90,         90,        1,   230400, 0x482f95c5
-0,         91,         91,        1,   230400, 0x7a9795d5
-0,         92,         92,        1,   230400, 0x21c29abd
-0,         93,         93,        1,   230400, 0x9ae6a475
-0,         94,         94,        1,   230400, 0x3734aee5
-0,         95,         95,        1,   230400, 0xa0a1b365
-0,         96,         96,        1,   230400, 0x2dcab1c5
-0,         97,         97,        1,   230400, 0x9c8b6c44
-0,         98,         98,        1,   230400, 0x5da75feb
-0,         99,         99,        1,   230400, 0x4d02f8e3
-0,        100,        100,        1,   230400, 0x66824f3a
-0,        101,        101,        1,   230400, 0x0c9257e2
-0,        102,        102,        1,   230400, 0xb2927092
-0,        103,        103,        1,   230400, 0xb5dc6e9a
-0,        104,        104,        1,   230400, 0x6e567bc6
-0,        105,        105,        1,   230400, 0xbf9e0f7a
-0,        106,        106,        1,   230400, 0xb16f684a
-0,        107,        107,        1,   230400, 0xf9e55e81
-0,        108,        108,        1,   230400, 0xd8d0bcba
-0,        109,        109,        1,   230400, 0x44720ac0
-0,        110,        110,        1,   230400, 0x7d4c2058
-0,        113,        113,        1,   230400, 0xb0973eb9
-0,        114,        114,        1,   230400, 0x405a13ce
-0,        115,        115,        1,   230400, 0x6422f00a
-0,        116,        116,        1,   230400, 0x924b6c1e
-0,        145,        145,        1,   230400, 0xcf7809c0
-0,        146,        146,        1,   230400, 0x883a3863
-0,        147,        147,        1,   230400, 0x6adc9e03
-0,        148,        148,        1,   230400, 0x4f5ab7a8
-0,        214,        214,        1,   230400, 0xdc0aab94
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+0,          0,          0,        1,   230400, 0x54b4bfe2
+0,          1,          1,        1,   230400, 0x9e1460e3
+0,          2,          2,        1,   230400, 0x8136f21c
+0,          3,          3,        1,   230400, 0xadfc5089
+0,          4,          4,        1,   230400, 0x76f2c4bc
+0,          5,          5,        1,   230400, 0x73862ec8
+0,          6,          6,        1,   230400, 0xba2562e3
+0,          7,          7,        1,   230400, 0xf908c0b6
+0,          8,          8,        1,   230400, 0x3596ee56
+0,          9,          9,        1,   230400, 0x97cc3a1e
+0,         10,         10,        1,   230400, 0xe2c585f9
+0,         11,         11,        1,   230400, 0x1732aedb
+0,         12,         12,        1,   230400, 0xa6d20354
+0,         13,         13,        1,   230400, 0x0e1e3d11
+0,         14,         14,        1,   230400, 0xe4f09bbd
+0,         15,         15,        1,   230400, 0x5c15ee1a
+0,         16,         16,        1,   230400, 0x33f51f69
+0,         17,         17,        1,   230400, 0xb6067c26
+0,         18,         18,        1,   230400, 0x985faab2
+0,         19,         19,        1,   230400, 0x3f0a09ae
+0,         20,         20,        1,   230400, 0x4052702f
+0,         21,         21,        1,   230400, 0xcd7fc29c
+0,         22,         22,        1,   230400, 0x73c97d9f
+0,         23,         23,        1,   230400, 0xf0fb8235
+0,         24,         24,        1,   230400, 0x7651e231
+0,         25,         25,        1,   230400, 0x3e749ecf
+0,         26,         26,        1,   230400, 0x20515985
+0,         27,         27,        1,   230400, 0xd086d4b0
+0,         28,         28,        1,   230400, 0x343c2c77
+0,         29,         29,        1,   230400, 0xb9a47309
+0,         30,         30,        1,   230400, 0x39de2037
+0,         31,         31,        1,   230400, 0x9fc2745a
+0,         32,         32,        1,   230400, 0x0868a2f3
+0,         33,         33,        1,   230400, 0xfe53f34d
+0,         34,         34,        1,   230400, 0xf2abaa57
+0,         35,         35,        1,   230400, 0x2dafdc4b
+0,         36,         36,        1,   230400, 0xf7d6353a
+0,         37,         37,        1,   230400, 0x8aa63c0a
+0,         38,         38,        1,   230400, 0xd1afe885
+0,         39,         39,        1,   230400, 0x64626c50
+0,         40,         40,        1,   230400, 0x2654dfca
+0,         41,         41,        1,   230400, 0x6183d8c7
+0,         42,         42,        1,   230400, 0xededb578
+0,         43,         43,        1,   230400, 0xadeeb629
+0,         44,         44,        1,   230400, 0x0009873a
+0,         45,         45,        1,   230400, 0xe2ec94eb
+0,         46,         46,        1,   230400, 0x62132788
+0,         47,         47,        1,   230400, 0x8cc5e014
+0,         48,         48,        1,   230400, 0x2ded2ecd
+0,         49,         49,        1,   230400, 0x81204eec
+0,         50,         50,        1,   230400, 0x4f9fda58
+0,         51,         51,        1,   230400, 0x9d7f073b
+0,         52,         52,        1,   230400, 0x607a6ee6
+0,         53,         53,        1,   230400, 0xed1c305c
+0,         57,         57,        1,   230400, 0x52b52d62
+0,         58,         58,        1,   230400, 0x4ae0370a
+0,         59,         59,        1,   230400, 0xe437326a
+0,         60,         60,        1,   230400, 0xefb82e8c
+0,         61,         61,        1,   230400, 0xa0f13d4b
+0,         62,         62,        1,   230400, 0x473a424a
+0,         63,         63,        1,   230400, 0x205a2c84
+0,         64,         64,        1,   230400, 0xe83022e5
+0,         65,         65,        1,   230400, 0x5db21854
+0,         66,         66,        1,   230400, 0x11991ed7
+0,         67,         67,        1,   230400, 0x649429b1
+0,         68,         68,        1,   230400, 0x840a3912
+0,         69,         69,        1,   230400, 0x8bb72d49
+0,         70,         70,        1,   230400, 0xedfc2850
+0,         71,         71,        1,   230400, 0x1b9b2977
+0,         72,         72,        1,   230400, 0x63912a4f
+0,         73,         73,        1,   230400, 0x971c2ccc
+0,         74,         74,        1,   230400, 0x1f022c98
+0,         75,         75,        1,   230400, 0x5dc42b8c
+0,         76,         76,        1,   230400, 0x25172a53
+0,         77,         77,        1,   230400, 0x31fd287f
+0,         78,         78,        1,   230400, 0x95182a44
+0,         79,         79,        1,   230400, 0xbf7d29ea
+0,         80,         80,        1,   230400, 0xdeb82e84
+0,         81,         81,        1,   230400, 0xc3ad3659
+0,         82,         82,        1,   230400, 0xfef23f36
+0,         83,         83,        1,   230400, 0xf4a23d8c
+0,         84,         84,        1,   230400, 0x90713fef
+0,         85,         85,        1,   230400, 0x5fad3d58
+0,         86,         86,        1,   230400, 0x69283f2e
+0,         87,         87,        1,   230400, 0x8f3d3dde
+0,         88,         88,        1,   230400, 0x3129407a
+0,         89,         89,        1,   230400, 0x266e3d64
+0,         90,         90,        1,   230400, 0xc41b3e19
+0,         91,         91,        1,   230400, 0x64203e29
+0,         92,         92,        1,   230400, 0x3f7e4328
+0,         93,         93,        1,   230400, 0xacef4d0e
+0,         94,         94,        1,   230400, 0xf0ca57a7
+0,         95,         95,        1,   230400, 0x87c75c41
+0,         96,         96,        1,   230400, 0x9db75a9c
+0,         97,         97,        1,   230400, 0x4152164c
+0,         98,         98,        1,   230400, 0x8a330ac8
+0,         99,         99,        1,   230400, 0x5113a45d
+0,        100,        100,        1,   230400, 0x60effb12
+0,        101,        101,        1,   230400, 0x01dc03c5
+0,        102,        102,        1,   230400, 0x7ae81caf
+0,        103,        103,        1,   230400, 0x35c31ab0
+0,        104,        104,        1,   230400, 0xd59e171e
+0,        105,        105,        1,   230400, 0x35c3989e
+0,        106,        106,        1,   230400, 0xf93656a5
+0,        107,        107,        1,   230400, 0x0962745c
+0,        108,        108,        1,   230400, 0x6a90cdb2
+0,        109,        109,        1,   230400, 0x4bc2216d
+0,        110,        110,        1,   230400, 0x7a6d3744
+0,        113,        113,        1,   230400, 0xf16a5742
+0,        114,        114,        1,   230400, 0x1495ce79
+0,        115,        115,        1,   230400, 0x3b4397b0
+0,        116,        116,        1,   230400, 0x33ed8506
+0,        145,        145,        1,   230400, 0xf953256d
+0,        146,        146,        1,   230400, 0xd7faaef9
+0,        147,        147,        1,   230400, 0xb37e6161
+0,        148,        148,        1,   230400, 0x526b6797
+0,        214,        214,        1,   230400, 0x8ec35bc5
diff --git a/tests/ref/fate/siff-demux b/tests/ref/fate/siff-demux
index 692e504755..f8e9897931 100644
--- a/tests/ref/fate/siff-demux
+++ b/tests/ref/fate/siff-demux
@@ -1,5 +1,14 @@
 #tb 0: 1/12
+#media_type 0: video
+#codec_id 0: vb
+#dimensions 0: 320x240
+#sar 0: 0/1
 #tb 1: 1/22050
+#media_type 1: audio
+#codec_id 1: pcm_u8
+#sample_rate 1: 22050
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,    15152, 0x14fc0f1f
 1,          0,          0,    22050,    22050, 0xa7d60d27
 0,          1,          1,        1,    15344, 0x31614bd7
diff --git a/tests/ref/fate/smacker-audio b/tests/ref/fate/smacker-audio
index 442f479dd8..6b867874d9 100644
--- a/tests/ref/fate/smacker-audio
+++ b/tests/ref/fate/smacker-audio
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: pcm_s16le
+#sample_rate 0: 22050
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,    23620,    47240, 0x9974897c
 0,      23620,      23620,     1564,     3128, 0x7e4064b4
 0,      25184,      25184,     1564,     3128, 0x80883301
diff --git a/tests/ref/fate/smacker-video b/tests/ref/fate/smacker-video
index 8bd307159f..9325d91a22 100644
--- a/tests/ref/fate/smacker-video
+++ b/tests/ref/fate/smacker-video
@@ -1,4 +1,8 @@
 #tb 0: 71/1000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
 0,          0,          0,        1,   192000, 0x8926d7fc
 0,          1,          1,        1,   192000, 0x2506d384
 0,          2,          2,        1,   192000, 0x9a8dc93a
diff --git a/tests/ref/fate/smc b/tests/ref/fate/smc
index cdfc3d5594..4802407c73 100644
--- a/tests/ref/fate/smc
+++ b/tests/ref/fate/smc
@@ -1,121 +1,125 @@
-#tb 0: 1/30
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   230400, 0xf814fc90
-0,          3,          3,        1,   230400, 0xe1b13137
-0,          6,          6,        1,   230400, 0xa7f4d408
-0,          9,          9,        1,   230400, 0x4b86e1d5
-0,         12,         12,        1,   230400, 0xc663af5a
-0,         15,         15,        1,   230400, 0x943b5757
-0,         18,         18,        1,   230400, 0x0d7ee496
-0,         21,         21,        1,   230400, 0x78792de4
-0,         24,         24,        1,   230400, 0xd102fb8d
-0,         27,         27,        1,   230400, 0xf9006139
-0,         30,         30,        1,   230400, 0x216bd87d
-0,         33,         33,        1,   230400, 0x1e4c902c
-0,         36,         36,        1,   230400, 0x5aaa7742
-0,         39,         39,        1,   230400, 0x48699d93
-0,         42,         42,        1,   230400, 0xd1e22a5c
-0,         45,         45,        1,   230400, 0x18929315
-0,         48,         48,        1,   230400, 0x680dd4d3
-0,         51,         51,        1,   230400, 0x4cdbcbcb
-0,         54,         54,        1,   230400, 0x6f810d98
-0,         57,         57,        1,   230400, 0xb4f68204
-0,         60,         60,        1,   230400, 0xbd3bb19e
-0,         63,         63,        1,   230400, 0xab27b424
-0,         66,         66,        1,   230400, 0xe5dd675d
-0,         69,         69,        1,   230400, 0x811e45a1
-0,         72,         72,        1,   230400, 0x951011f7
-0,         75,         75,        1,   230400, 0x2f1e2b99
-0,         78,         78,        1,   230400, 0x6657c0d6
-0,         81,         81,        1,   230400, 0xfd29177d
-0,         84,         84,        1,   230400, 0x4b4c01d7
-0,         87,         87,        1,   230400, 0x9af286aa
-0,         90,         90,        1,   230400, 0xc4e9b193
-0,         93,         93,        1,   230400, 0x05dc28ec
-0,         96,         96,        1,   230400, 0x68352119
-0,         99,         99,        1,   230400, 0x0b87e79c
-0,        102,        102,        1,   230400, 0x8358b180
-0,        105,        105,        1,   230400, 0x8debbc9d
-0,        108,        108,        1,   230400, 0x961c58ce
-0,        111,        111,        1,   230400, 0xd8a809c8
-0,        114,        114,        1,   230400, 0x5351789d
-0,        117,        117,        1,   230400, 0xa7ca598c
-0,        120,        120,        1,   230400, 0xc5ce1812
-0,        123,        123,        1,   230400, 0x74496550
-0,        126,        126,        1,   230400, 0x326e366e
-0,        129,        129,        1,   230400, 0x27ae9a92
-0,        132,        132,        1,   230400, 0xadbc8794
-0,        135,        135,        1,   230400, 0x7f3587d8
-0,        138,        138,        1,   230400, 0xf0400ca6
-0,        141,        141,        1,   230400, 0x59a5138e
-0,        144,        144,        1,   230400, 0x456d62a5
-0,        147,        147,        1,   230400, 0xf1a5e5f1
-0,        150,        150,        1,   230400, 0x75c712e4
-0,        153,        153,        1,   230400, 0xd160780a
-0,        156,        156,        1,   230400, 0xc6c23cf0
-0,        159,        159,        1,   230400, 0x0339a2ac
-0,        162,        162,        1,   230400, 0x0e27a2e2
-0,        165,        165,        1,   230400, 0x84976300
-0,        168,        168,        1,   230400, 0xb368f3c4
-0,        171,        171,        1,   230400, 0xa5231fb8
-0,        174,        174,        1,   230400, 0x17c036d4
-0,        177,        177,        1,   230400, 0xfc81a2c0
-0,        180,        180,        1,   230400, 0x99faa403
-0,        183,        183,        1,   230400, 0xff59efd3
-0,        186,        186,        1,   230400, 0xcece1d23
-0,        189,        189,        1,   230400, 0x56c785d9
-0,        192,        192,        1,   230400, 0xe5a9f222
-0,        195,        195,        1,   230400, 0xb80946f8
-0,        198,        198,        1,   230400, 0xf6b642c6
-0,        201,        201,        1,   230400, 0x69573aed
-0,        204,        204,        1,   230400, 0xfb69a1fd
-0,        207,        207,        1,   230400, 0x100b47f4
-0,        210,        210,        1,   230400, 0x6edf9543
-0,        213,        213,        1,   230400, 0x11fdf43c
-0,        216,        216,        1,   230400, 0xd143bf2a
-0,        219,        219,        1,   230400, 0x7ca747c4
-0,        222,        222,        1,   230400, 0xd984bd73
-0,        225,        225,        1,   230400, 0xc5477e8d
-0,        228,        228,        1,   230400, 0xf7d58300
-0,        231,        231,        1,   230400, 0x7a1b9463
-0,        234,        234,        1,   230400, 0x47a29342
-0,        237,        237,        1,   230400, 0xdf437f9d
-0,        240,        240,        1,   230400, 0xf836ef5d
-0,        243,        243,        1,   230400, 0xc98937af
-0,        246,        246,        1,   230400, 0x9258695b
-0,        249,        249,        1,   230400, 0xd4fe179c
-0,        252,        252,        1,   230400, 0x35d524d3
-0,        255,        255,        1,   230400, 0xd9ce5484
-0,        258,        258,        1,   230400, 0xdef776ed
-0,        261,        261,        1,   230400, 0x154c4057
-0,        264,        264,        1,   230400, 0xf5c764f1
-0,        267,        267,        1,   230400, 0x41979b13
-0,        270,        270,        1,   230400, 0xae4e83db
-0,        273,        273,        1,   230400, 0x09fc0f83
-0,        276,        276,        1,   230400, 0x60267fdf
-0,        279,        279,        1,   230400, 0xeaafc525
-0,        282,        282,        1,   230400, 0x80cc35e5
-0,        285,        285,        1,   230400, 0xd82c6164
-0,        288,        288,        1,   230400, 0xd68b8111
-0,        291,        291,        1,   230400, 0x96f874a3
-0,        294,        294,        1,   230400, 0x7fc861c4
-0,        297,        297,        1,   230400, 0xb911f310
-0,        300,        300,        1,   230400, 0x35bbf5aa
-0,        303,        303,        1,   230400, 0xa922b683
-0,        306,        306,        1,   230400, 0xbf6ae353
-0,        309,        309,        1,   230400, 0x6bd3984c
-0,        312,        312,        1,   230400, 0xe51768c0
-0,        315,        315,        1,   230400, 0xee691624
-0,        318,        318,        1,   230400, 0xd546fed7
-0,        321,        321,        1,   230400, 0x98d375e6
-0,        324,        324,        1,   230400, 0x3b9ca990
-0,        327,        327,        1,   230400, 0x27128ad1
-0,        330,        330,        1,   230400, 0x2788e38c
-0,        333,        333,        1,   230400, 0xb0cf3381
-0,        336,        336,        1,   230400, 0x4fc86d39
-0,        339,        339,        1,   230400, 0xf5632fff
-0,        342,        342,        1,   230400, 0x7fa1e6c2
-0,        345,        345,        1,   230400, 0xffeef044
-0,        348,        348,        1,   230400, 0x932af385
-0,        351,        351,        1,   230400, 0x76738428
-0,        354,        354,        1,   230400, 0xf6771ba2
-0,        357,        357,        1,   230400, 0x17e2ff27
+0,          1,          1,        1,   230400, 0xe1b13137
+0,          2,          2,        1,   230400, 0xa7f4d408
+0,          3,          3,        1,   230400, 0x4b86e1d5
+0,          4,          4,        1,   230400, 0xc663af5a
+0,          5,          5,        1,   230400, 0x943b5757
+0,          6,          6,        1,   230400, 0x0d7ee496
+0,          7,          7,        1,   230400, 0x78792de4
+0,          8,          8,        1,   230400, 0xd102fb8d
+0,          9,          9,        1,   230400, 0xf9006139
+0,         10,         10,        1,   230400, 0x216bd87d
+0,         11,         11,        1,   230400, 0x1e4c902c
+0,         12,         12,        1,   230400, 0x5aaa7742
+0,         13,         13,        1,   230400, 0x48699d93
+0,         14,         14,        1,   230400, 0xd1e22a5c
+0,         15,         15,        1,   230400, 0x18929315
+0,         16,         16,        1,   230400, 0x680dd4d3
+0,         17,         17,        1,   230400, 0x4cdbcbcb
+0,         18,         18,        1,   230400, 0x6f810d98
+0,         19,         19,        1,   230400, 0xb4f68204
+0,         20,         20,        1,   230400, 0xbd3bb19e
+0,         21,         21,        1,   230400, 0xab27b424
+0,         22,         22,        1,   230400, 0xe5dd675d
+0,         23,         23,        1,   230400, 0x811e45a1
+0,         24,         24,        1,   230400, 0x951011f7
+0,         25,         25,        1,   230400, 0x2f1e2b99
+0,         26,         26,        1,   230400, 0x6657c0d6
+0,         27,         27,        1,   230400, 0xfd29177d
+0,         28,         28,        1,   230400, 0x4b4c01d7
+0,         29,         29,        1,   230400, 0x9af286aa
+0,         30,         30,        1,   230400, 0xc4e9b193
+0,         31,         31,        1,   230400, 0x05dc28ec
+0,         32,         32,        1,   230400, 0x68352119
+0,         33,         33,        1,   230400, 0x0b87e79c
+0,         34,         34,        1,   230400, 0x8358b180
+0,         35,         35,        1,   230400, 0x8debbc9d
+0,         36,         36,        1,   230400, 0x961c58ce
+0,         37,         37,        1,   230400, 0xd8a809c8
+0,         38,         38,        1,   230400, 0x5351789d
+0,         39,         39,        1,   230400, 0xa7ca598c
+0,         40,         40,        1,   230400, 0xc5ce1812
+0,         41,         41,        1,   230400, 0x74496550
+0,         42,         42,        1,   230400, 0x326e366e
+0,         43,         43,        1,   230400, 0x27ae9a92
+0,         44,         44,        1,   230400, 0xadbc8794
+0,         45,         45,        1,   230400, 0x7f3587d8
+0,         46,         46,        1,   230400, 0xf0400ca6
+0,         47,         47,        1,   230400, 0x59a5138e
+0,         48,         48,        1,   230400, 0x456d62a5
+0,         49,         49,        1,   230400, 0xf1a5e5f1
+0,         50,         50,        1,   230400, 0x75c712e4
+0,         51,         51,        1,   230400, 0xd160780a
+0,         52,         52,        1,   230400, 0xc6c23cf0
+0,         53,         53,        1,   230400, 0x0339a2ac
+0,         54,         54,        1,   230400, 0x0e27a2e2
+0,         55,         55,        1,   230400, 0x84976300
+0,         56,         56,        1,   230400, 0xb368f3c4
+0,         57,         57,        1,   230400, 0xa5231fb8
+0,         58,         58,        1,   230400, 0x17c036d4
+0,         59,         59,        1,   230400, 0xfc81a2c0
+0,         60,         60,        1,   230400, 0x99faa403
+0,         61,         61,        1,   230400, 0xff59efd3
+0,         62,         62,        1,   230400, 0xcece1d23
+0,         63,         63,        1,   230400, 0x56c785d9
+0,         64,         64,        1,   230400, 0xe5a9f222
+0,         65,         65,        1,   230400, 0xb80946f8
+0,         66,         66,        1,   230400, 0xf6b642c6
+0,         67,         67,        1,   230400, 0x69573aed
+0,         68,         68,        1,   230400, 0xfb69a1fd
+0,         69,         69,        1,   230400, 0x100b47f4
+0,         70,         70,        1,   230400, 0x6edf9543
+0,         71,         71,        1,   230400, 0x11fdf43c
+0,         72,         72,        1,   230400, 0xd143bf2a
+0,         73,         73,        1,   230400, 0x7ca747c4
+0,         74,         74,        1,   230400, 0xd984bd73
+0,         75,         75,        1,   230400, 0xc5477e8d
+0,         76,         76,        1,   230400, 0xf7d58300
+0,         77,         77,        1,   230400, 0x7a1b9463
+0,         78,         78,        1,   230400, 0x47a29342
+0,         79,         79,        1,   230400, 0xdf437f9d
+0,         80,         80,        1,   230400, 0xf836ef5d
+0,         81,         81,        1,   230400, 0xc98937af
+0,         82,         82,        1,   230400, 0x9258695b
+0,         83,         83,        1,   230400, 0xd4fe179c
+0,         84,         84,        1,   230400, 0x35d524d3
+0,         85,         85,        1,   230400, 0xd9ce5484
+0,         86,         86,        1,   230400, 0xdef776ed
+0,         87,         87,        1,   230400, 0x154c4057
+0,         88,         88,        1,   230400, 0xf5c764f1
+0,         89,         89,        1,   230400, 0x41979b13
+0,         90,         90,        1,   230400, 0xae4e83db
+0,         91,         91,        1,   230400, 0x09fc0f83
+0,         92,         92,        1,   230400, 0x60267fdf
+0,         93,         93,        1,   230400, 0xeaafc525
+0,         94,         94,        1,   230400, 0x80cc35e5
+0,         95,         95,        1,   230400, 0xd82c6164
+0,         96,         96,        1,   230400, 0xd68b8111
+0,         97,         97,        1,   230400, 0x96f874a3
+0,         98,         98,        1,   230400, 0x7fc861c4
+0,         99,         99,        1,   230400, 0xb911f310
+0,        100,        100,        1,   230400, 0x35bbf5aa
+0,        101,        101,        1,   230400, 0xa922b683
+0,        102,        102,        1,   230400, 0xbf6ae353
+0,        103,        103,        1,   230400, 0x6bd3984c
+0,        104,        104,        1,   230400, 0xe51768c0
+0,        105,        105,        1,   230400, 0xee691624
+0,        106,        106,        1,   230400, 0xd546fed7
+0,        107,        107,        1,   230400, 0x98d375e6
+0,        108,        108,        1,   230400, 0x3b9ca990
+0,        109,        109,        1,   230400, 0x27128ad1
+0,        110,        110,        1,   230400, 0x2788e38c
+0,        111,        111,        1,   230400, 0xb0cf3381
+0,        112,        112,        1,   230400, 0x4fc86d39
+0,        113,        113,        1,   230400, 0xf5632fff
+0,        114,        114,        1,   230400, 0x7fa1e6c2
+0,        115,        115,        1,   230400, 0xffeef044
+0,        116,        116,        1,   230400, 0x932af385
+0,        117,        117,        1,   230400, 0x76738428
+0,        118,        118,        1,   230400, 0xf6771ba2
+0,        119,        119,        1,   230400, 0x17e2ff27
diff --git a/tests/ref/fate/smjpeg b/tests/ref/fate/smjpeg
new file mode 100644
index 0000000000..7aac52febc
--- /dev/null
+++ b/tests/ref/fate/smjpeg
@@ -0,0 +1,425 @@
+#tb 0: 1/1000
+#tb 1: 1/22050
+0,          0,          0,        0,      734, 0x5a042c2c
+1,          0,          0,      512,     1024, 0x00000000
+1,        507,        507,      512,     1024, 0x00000000
+1,       1014,       1014,      512,     1024, 0xd89a448e
+1,       1521,       1521,      512,     1024, 0x695b369c
+1,       2029,       2029,      512,     1024, 0xc8ba5707
+0,        111,        111,        0,      763, 0xb5893f2f
+1,       2558,       2558,      512,     1024, 0xdf241fc6
+1,       3065,       3065,      512,     1024, 0x61cf4166
+1,       3572,       3572,      512,     1024, 0x97cbc386
+1,       4079,       4079,      512,     1024, 0x44899d04
+1,       4586,       4586,      512,     1024, 0xa7cbaa62
+0,        222,        222,        0,     3023, 0x0f3907d3
+1,       5116,       5116,      512,     1024, 0xa7aea60c
+1,       5623,       5623,      512,     1024, 0xd7b18a89
+1,       6130,       6130,      512,     1024, 0x268e81f6
+1,       6637,       6637,      512,     1024, 0x9cf83a2f
+1,       7166,       7166,      512,     1024, 0x5559b508
+0,        333,        333,        0,     4800, 0x22e6e18a
+1,       7673,       7673,      512,     1024, 0xe1b9e71c
+1,       8181,       8181,      512,     1024, 0xdcee733e
+1,       8688,       8688,      512,     1024, 0xe5918f60
+1,       9195,       9195,      512,     1024, 0x29dbd209
+1,       9724,       9724,      512,     1024, 0x9bcbcf16
+0,        444,        444,        0,     6417, 0x427adde5
+1,      10231,      10231,      512,     1024, 0x86f5f458
+1,      10738,      10738,      512,     1024, 0xabcbda86
+1,      11246,      11246,      512,     1024, 0xc51f77b9
+1,      11775,      11775,      512,     1024, 0xf6b3a504
+0,        555,        555,        0,     6776, 0x7a74c6ad
+1,      12282,      12282,      512,     1024, 0x1af3e40e
+1,      12789,      12789,      512,     1024, 0x3866b03b
+1,      13296,      13296,      512,     1024, 0xbc005403
+1,      13803,      13803,      512,     1024, 0xe9dfcc51
+1,      14333,      14333,      512,     1024, 0x83c837cb
+0,        666,        666,        0,     6808, 0x1f6eb7c3
+1,      14840,      14840,      512,     1024, 0xfa649580
+1,      15347,      15347,      512,     1024, 0x519452ea
+1,      15854,      15854,      512,     1024, 0xd4978774
+1,      16383,      16383,      512,     1024, 0xe2a3b1cd
+1,      16890,      16890,      512,     1024, 0x9a9472ad
+0,        777,        777,        0,     6726, 0x452087e6
+1,      17397,      17397,      512,     1024, 0xa12d4060
+1,      17905,      17905,      512,     1024, 0x31fb0646
+1,      18412,      18412,      512,     1024, 0xfc44343f
+1,      18941,      18941,      512,     1024, 0x0847751a
+1,      19448,      19448,      512,     1024, 0x227968a2
+0,        888,        888,        0,     6829, 0xee82b109
+1,      19955,      19955,      512,     1024, 0x7cce9f1c
+1,      20462,      20462,      512,     1024, 0xb8356713
+1,      20992,      20992,      512,     1024, 0xb29f6e6f
+1,      21499,      21499,      512,     1024, 0x9e1430ab
+1,      22006,      22006,      512,     1024, 0x26d85423
+0,        999,        999,        0,     7055, 0xf41f1108
+1,      22513,      22513,      512,     1024, 0x6496547d
+1,      23020,      23020,      512,     1024, 0x316b1a86
+1,      23549,      23549,      512,     1024, 0x3cd83afc
+1,      24057,      24057,      512,     1024, 0x993ff633
+0,       1111,       1111,        0,     6977, 0xf8fe1ede
+1,      24564,      24564,      512,     1024, 0x0708d1a2
+1,      25071,      25071,      512,     1024, 0xd7230db9
+1,      25578,      25578,      512,     1024, 0xbb0779ca
+1,      26107,      26107,      512,     1024, 0xc6094e1b
+1,      26614,      26614,      512,     1024, 0x15a8b039
+0,       1222,       1222,        0,     6942, 0x9ad105c6
+1,      27122,      27122,      512,     1024, 0xd6dbe88c
+1,      27629,      27629,      512,     1024, 0x7e8d1140
+1,      28158,      28158,      512,     1024, 0xef88e525
+1,      28665,      28665,      512,     1024, 0x44e21149
+1,      29172,      29172,      512,     1024, 0x65b0f5f4
+0,       1333,       1333,        0,     6926, 0xe239dad6
+1,      29679,      29679,      512,     1024, 0xb955f687
+1,      30186,      30186,      512,     1024, 0xc85fba9c
+1,      30716,      30716,      512,     1024, 0xf59655ad
+1,      31223,      31223,      512,     1024, 0x6de80bf1
+1,      31730,      31730,      512,     1024, 0x2dcf6e41
+0,       1444,       1444,        0,     6966, 0x81dcfab1
+1,      32237,      32237,      512,     1024, 0xd0ddcf8a
+1,      32766,      32766,      512,     1024, 0x00135c2d
+1,      33273,      33273,      512,     1024, 0x697f8efd
+1,      33781,      33781,      512,     1024, 0x7a9bada5
+0,       1555,       1555,        0,     6896, 0x31e6cc02
+1,      34288,      34288,      512,     1024, 0x0d22783c
+1,      34795,      34795,      512,     1024, 0x7726d07d
+1,      35324,      35324,      512,     1024, 0xa2f14f67
+1,      35831,      35831,      512,     1024, 0x7f51060d
+1,      36338,      36338,      512,     1024, 0xc4ec6aea
+0,       1666,       1666,        0,     6889, 0x1cc1006e
+1,      36846,      36846,      512,     1024, 0x9bb37ca4
+1,      37375,      37375,      512,     1024, 0x9b085577
+1,      37882,      37882,      512,     1024, 0x8812f8af
+1,      38389,      38389,      512,     1024, 0x788f5221
+1,      38896,      38896,      512,     1024, 0x3a2ce642
+0,       1777,       1777,        0,     6933, 0xc303f87f
+1,      39403,      39403,      512,     1024, 0x72415692
+1,      39933,      39933,      512,     1024, 0xe3dcc105
+1,      40440,      40440,      512,     1024, 0xb26c0599
+1,      40947,      40947,      512,     1024, 0x5c9e55eb
+1,      41454,      41454,      512,     1024, 0x8fe88707
+0,       1888,       1888,        0,     7034, 0xb4970a20
+1,      41983,      41983,      512,     1024, 0xc5d7beb6
+1,      42490,      42490,      512,     1024, 0xe1d3a3b4
+1,      42998,      42998,      512,     1024, 0x012da0c6
+1,      43505,      43505,      512,     1024, 0x8d010922
+1,      44012,      44012,      512,     1024, 0x3366eb0d
+0,       1999,       1999,        0,     6961, 0xf064095d
+1,      44541,      44541,      512,     1024, 0xc9381a27
+1,      45048,      45048,      512,     1024, 0x0774f685
+1,      45555,      45555,      512,     1024, 0xc5cae0a5
+1,      46062,      46062,      512,     1024, 0xa6f4737c
+0,       2111,       2111,        0,     7089, 0x5ba350f9
+1,      46592,      46592,      512,     1024, 0x8fb6d0d1
+1,      47099,      47099,      512,     1024, 0x05f579c2
+1,      47606,      47606,      512,     1024, 0x56905d99
+1,      48113,      48113,      512,     1024, 0x002ee18d
+1,      48620,      48620,      512,     1024, 0xeb37ef51
+0,       2222,       2222,        0,     7078, 0xa83f3e88
+1,      49149,      49149,      512,     1024, 0x38025635
+1,      49657,      49657,      512,     1024, 0x4fe643c8
+1,      50164,      50164,      512,     1024, 0x11d66ab1
+1,      50671,      50671,      512,     1024, 0xcc3051e9
+1,      51178,      51178,      512,     1024, 0xcd93e854
+0,       2333,       2333,        0,     7147, 0xcda66cfc
+1,      51707,      51707,      512,     1024, 0x38f1196d
+1,      52214,      52214,      512,     1024, 0x657a15fc
+1,      52722,      52722,      512,     1024, 0x669ce2a9
+1,      53229,      53229,      512,     1024, 0x95862dda
+1,      53758,      53758,      512,     1024, 0x1726a7b2
+0,       2444,       2444,        0,     7173, 0xb7455859
+1,      54265,      54265,      512,     1024, 0xd6ece2a1
+1,      54772,      54772,      512,     1024, 0x33ab9553
+1,      55279,      55279,      512,     1024, 0xd50c73a6
+1,      55787,      55787,      512,     1024, 0xfe25b63a
+1,      56316,      56316,      512,     1024, 0x7e2959e3
+0,       2555,       2555,        0,     7213, 0x97b89994
+1,      56823,      56823,      512,     1024, 0xa4c07b34
+1,      57330,      57330,      512,     1024, 0xd6d8f15c
+1,      57837,      57837,      512,     1024, 0x1eccddd7
+1,      58366,      58366,      512,     1024, 0x2b69f9cb
+0,       2666,       2666,        0,     7170, 0xca8b2948
+1,      58874,      58874,      512,     1024, 0x667b775f
+1,      59381,      59381,      512,     1024, 0xad3b84e9
+1,      59888,      59888,      512,     1024, 0x4f29fc67
+1,      60395,      60395,      512,     1024, 0x8d611ab7
+1,      60924,      60924,      512,     1024, 0x278966ea
+0,       2777,       2777,        0,     7174, 0xc7cc6bbb
+1,      61431,      61431,      512,     1024, 0xaf33812b
+1,      61938,      61938,      512,     1024, 0xa55f4265
+1,      62446,      62446,      512,     1024, 0x023cb51c
+1,      62975,      62975,      512,     1024, 0x1d1f1005
+1,      63482,      63482,      512,     1024, 0x874cccf7
+0,       2888,       2888,        0,     7235, 0xc2e68d2b
+1,      63989,      63989,      512,     1024, 0xda705428
+1,      64496,      64496,      512,     1024, 0x48d9b440
+1,      65003,      65003,      512,     1024, 0xa14e0712
+1,      65533,      65533,      512,     1024, 0x7efbad1f
+1,      66040,      66040,      512,     1024, 0xdb82c17f
+0,       3000,       3000,        0,     7261, 0x8204a423
+1,      66547,      66547,      512,     1024, 0xcbe87613
+1,      67054,      67054,      512,     1024, 0x3a63df1d
+1,      67583,      67583,      512,     1024, 0xd5636bba
+1,      68090,      68090,      512,     1024, 0x9397af23
+0,       3111,       3111,        0,     7353, 0xacc7e7c0
+1,      68598,      68598,      512,     1024, 0x32a07c98
+1,      69105,      69105,      512,     1024, 0x202ca667
+1,      69612,      69612,      512,     1024, 0xdf969011
+1,      70141,      70141,      512,     1024, 0xc434d238
+1,      70648,      70648,      512,     1024, 0xe9ad7562
+0,       3222,       3222,        0,     7065, 0x45035c5c
+1,      71155,      71155,      512,     1024, 0xb51b6b50
+1,      71663,      71663,      512,     1024, 0xe70aecd3
+1,      72192,      72192,      512,     1024, 0x03c816b2
+1,      72699,      72699,      512,     1024, 0x869fdf25
+1,      73206,      73206,      512,     1024, 0xd40a0a62
+0,       3333,       3333,        0,     7269, 0x72edbb76
+1,      73713,      73713,      512,     1024, 0x5af7dd35
+1,      74220,      74220,      512,     1024, 0x891ffc72
+1,      74750,      74750,      512,     1024, 0x1ff68a08
+1,      75257,      75257,      512,     1024, 0x5a7517a9
+1,      75764,      75764,      512,     1024, 0x0f959f74
+0,       3444,       3444,        0,     7220, 0xb926772f
+1,      76271,      76271,      512,     1024, 0xe92a12a2
+1,      76778,      76778,      512,     1024, 0x38000e55
+1,      77307,      77307,      512,     1024, 0x39fbdd70
+1,      77814,      77814,      512,     1024, 0xca3d9184
+1,      78322,      78322,      512,     1024, 0x66c8995b
+0,       3555,       3555,        0,     7326, 0x0a66c632
+1,      78829,      78829,      512,     1024, 0xac25acea
+1,      79358,      79358,      512,     1024, 0x3cd1046c
+1,      79865,      79865,      512,     1024, 0x6a1df31c
+1,      80372,      80372,      512,     1024, 0x21ca10a1
+0,       3666,       3666,        0,     7225, 0xe39076ab
+1,      80879,      80879,      512,     1024, 0x1aeccedc
+1,      81387,      81387,      512,     1024, 0xddea1335
+1,      81916,      81916,      512,     1024, 0x19f5ca9f
+1,      82423,      82423,      512,     1024, 0x88e95e43
+1,      82930,      82930,      512,     1024, 0x726284fe
+0,       3777,       3777,        0,     7265, 0xe0209036
+1,      83437,      83437,      512,     1024, 0x6b85b40e
+1,      83966,      83966,      512,     1024, 0x111fee2a
+1,      84474,      84474,      512,     1024, 0x3656b588
+1,      84981,      84981,      512,     1024, 0xa5a2b552
+1,      85488,      85488,      512,     1024, 0x38fb2467
+0,       3888,       3888,        0,     7337, 0x7a5dc093
+1,      85995,      85995,      512,     1024, 0xaa919ccc
+1,      86524,      86524,      512,     1024, 0x15993dbc
+1,      87031,      87031,      512,     1024, 0xbe01a7b9
+1,      87539,      87539,      512,     1024, 0xefe93c09
+1,      88046,      88046,      512,     1024, 0x1bb566e5
+0,       4000,       4000,        0,     7246, 0x519a7a3c
+1,      88575,      88575,      512,     1024, 0x15ce6237
+1,      89082,      89082,      512,     1024, 0xa8552e66
+1,      89589,      89589,      512,     1024, 0x9d80187e
+1,      90096,      90096,      512,     1024, 0x5df3fc30
+1,      90603,      90603,      512,     1024, 0x1a312aa5
+0,       4111,       4111,        0,     7266, 0x352c8078
+1,      91133,      91133,      512,     1024, 0x6bb8e302
+1,      91640,      91640,      512,     1024, 0xbd9684bb
+1,      92147,      92147,      512,     1024, 0x78b0b166
+1,      92654,      92654,      512,     1024, 0xd9af5eae
+0,       4222,       4222,        0,     7323, 0xcaf69d7c
+1,      93183,      93183,      512,     1024, 0xdb90fe82
+1,      93690,      93690,      512,     1024, 0x327614e9
+1,      94198,      94198,      512,     1024, 0x1f19b7fe
+1,      94705,      94705,      512,     1024, 0x46c53f96
+1,      95212,      95212,      512,     1024, 0x921b2189
+0,       4333,       4333,        0,     7309, 0x98c1e6f7
+1,      95741,      95741,      512,     1024, 0xa8fbc85a
+1,      96248,      96248,      512,     1024, 0xabfdaaae
+1,      96755,      96755,      512,     1024, 0x6acc7387
+1,      97263,      97263,      512,     1024, 0x0d9c27b5
+1,      97792,      97792,      512,     1024, 0xba4dd809
+0,       4444,       4444,        0,     7121, 0x913d5bd6
+1,      98299,      98299,      512,     1024, 0x2a2ad521
+1,      98806,      98806,      512,     1024, 0x892de38a
+1,      99313,      99313,      512,     1024, 0xdc97a2eb
+1,      99820,      99820,      512,     1024, 0x4f614ca4
+1,     100350,     100350,      512,     1024, 0x9c8a77ea
+0,       4555,       4555,      111,     7088, 0x56302362
+1,     100857,     100857,      512,     1024, 0x2d30e646
+1,     101364,     101364,      512,     1024, 0x74e800a7
+1,     101871,     101871,      512,     1024, 0x1e01fb02
+1,     102378,     102378,      512,     1024, 0x4ed2c1d8
+0,       4666,       4666,      111,     7104, 0xc0d14f78
+1,     102907,     102907,      512,     1024, 0xf2fdbe63
+1,     103415,     103415,      512,     1024, 0x8d6f63a1
+1,     103922,     103922,      512,     1024, 0xded468d9
+1,     104429,     104429,      512,     1024, 0xccad839e
+1,     104958,     104958,      512,     1024, 0xdde7c082
+0,       4777,       4777,      111,     7169, 0xd03c825b
+1,     105465,     105465,      512,     1024, 0x548613c5
+1,     105972,     105972,      512,     1024, 0x383909bd
+1,     106479,     106479,      512,     1024, 0xfd37627b
+1,     106987,     106987,      512,     1024, 0x6d95a481
+1,     107516,     107516,      512,     1024, 0x56aa87fa
+0,       4888,       4888,      111,     7038, 0x1ecc201d
+1,     108023,     108023,      512,     1024, 0x7b67258c
+1,     108530,     108530,      512,     1024, 0x7dd99a92
+1,     109037,     109037,      512,     1024, 0x4a66d102
+1,     109566,     109566,      512,     1024, 0x7b3fce51
+1,     110074,     110074,      512,     1024, 0xbbd968aa
+0,       5000,       5000,      111,     7015, 0x83c94454
+1,     110581,     110581,      512,     1024, 0x8283ec36
+1,     111088,     111088,      512,     1024, 0x3c96493d
+1,     111595,     111595,      512,     1024, 0xfa4f8cf8
+1,     112124,     112124,      512,     1024, 0xe2cf872d
+1,     112631,     112631,      512,     1024, 0x0a9e7aa6
+0,       5111,       5111,      111,     6983, 0x9e51f54d
+1,     113139,     113139,      512,     1024, 0x6e7a0550
+1,     113646,     113646,      512,     1024, 0x3acfea2f
+1,     114175,     114175,      512,     1024, 0x7111d0fa
+1,     114682,     114682,      512,     1024, 0xe9a1eca9
+0,       5222,       5222,      111,     7088, 0x70d33de1
+1,     115189,     115189,      512,     1024, 0x24da6c46
+1,     115696,     115696,      512,     1024, 0x117cff37
+1,     116204,     116204,      512,     1024, 0x0f27cab6
+1,     116733,     116733,      512,     1024, 0x69b6b4e6
+1,     117240,     117240,      512,     1024, 0x1e6cc841
+0,       5333,       5333,      111,     7096, 0x4d0f81b5
+1,     117747,     117747,      512,     1024, 0xb01e2365
+1,     118254,     118254,      512,     1024, 0x14e200d3
+1,     118783,     118783,      512,     1024, 0xd1184c98
+1,     119291,     119291,      512,     1024, 0xef9140e9
+1,     119798,     119798,      512,     1024, 0x4cbb645e
+0,       5444,       5444,      111,     7106, 0xd1a83ddc
+1,     120305,     120305,      512,     1024, 0xe7fe2f06
+1,     120812,     120812,      512,     1024, 0xf8c45028
+1,     121341,     121341,      512,     1024, 0x561358f4
+1,     121848,     121848,      512,     1024, 0xd0129b77
+1,     122355,     122355,      512,     1024, 0xcc636e88
+0,       5555,       5555,      111,     7219, 0x20f47fe4
+1,     122863,     122863,      512,     1024, 0xe9406321
+1,     123392,     123392,      512,     1024, 0x9f16a041
+1,     123899,     123899,      512,     1024, 0x468bf409
+1,     124406,     124406,      512,     1024, 0x3df70f7b
+1,     124913,     124913,      512,     1024, 0xa880b11b
+0,       5666,       5666,      111,     7184, 0x45dc6a0e
+1,     125420,     125420,      512,     1024, 0x3286c489
+1,     125950,     125950,      512,     1024, 0x39fe9ebc
+1,     126457,     126457,      512,     1024, 0xc533d83b
+1,     126964,     126964,      512,     1024, 0x153b195d
+0,       5777,       5777,      111,     7222, 0x488c6499
+1,     127471,     127471,      512,     1024, 0xd84786a1
+1,     127978,     127978,      512,     1024, 0xdc295aaa
+1,     128507,     128507,      512,     1024, 0xfb764d8c
+1,     129015,     129015,      512,     1024, 0xeebc9db9
+1,     129522,     129522,      512,     1024, 0x7ba9403e
+0,       5888,       5888,      111,     7254, 0xbd097ba7
+1,     130029,     130029,      512,     1024, 0x4e5571ec
+1,     130558,     130558,      512,     1024, 0xd965fad4
+1,     131065,     131065,      512,     1024, 0x87e259f2
+1,     131572,     131572,      512,     1024, 0xae7e533b
+1,     132080,     132080,      512,     1024, 0x313cf4d6
+0,       6000,       6000,      111,     7189, 0x46e06d43
+1,     132587,     132587,      512,     1024, 0xe1844c90
+1,     133116,     133116,      512,     1024, 0xbb057b44
+1,     133623,     133623,      512,     1024, 0xa5099687
+1,     134130,     134130,      512,     1024, 0xbff10707
+1,     134637,     134637,      512,     1024, 0x37c4ffc0
+0,       6111,       6111,      111,     7283, 0x19dd7319
+1,     135167,     135167,      512,     1024, 0xf9fb6caa
+1,     135674,     135674,      512,     1024, 0x3b6a3a1f
+1,     136181,     136181,      512,     1024, 0x83431edb
+1,     136688,     136688,      512,     1024, 0x1eb713cf
+1,     137195,     137195,      512,     1024, 0xd7b07a6d
+0,       6222,       6222,      111,     7161, 0x23171d02
+1,     137724,     137724,      512,     1024, 0x81ae3391
+1,     138231,     138231,      512,     1024, 0xf150130a
+1,     138739,     138739,      512,     1024, 0x09678eaa
+1,     139246,     139246,      512,     1024, 0xb94e06f1
+0,       6333,       6333,      111,     6976, 0xcc610c26
+1,     139775,     139775,      512,     1024, 0x67b1dbc9
+1,     140282,     140282,      512,     1024, 0xd6edc235
+1,     140789,     140789,      512,     1024, 0x34e4c499
+1,     141296,     141296,      512,     1024, 0xeefd89c0
+1,     141804,     141804,      512,     1024, 0x38afdaf1
+0,       6444,       6444,      111,     7056, 0x6cd917b0
+1,     142333,     142333,      512,     1024, 0x29a60d76
+1,     142840,     142840,      512,     1024, 0xe28a4372
+1,     143347,     143347,      512,     1024, 0x7089454d
+1,     143854,     143854,      512,     1024, 0x0c01bb7b
+1,     144383,     144383,      512,     1024, 0xbd776a72
+0,       6555,       6555,      111,     6736, 0x02b78951
+1,     144891,     144891,      512,     1024, 0x86776fd0
+1,     145398,     145398,      512,     1024, 0xb37c88f7
+1,     145905,     145905,      512,     1024, 0x5f90aaf8
+1,     146412,     146412,      512,     1024, 0x203d4222
+1,     146941,     146941,      512,     1024, 0x382692a6
+0,       6666,       6666,      111,     6540, 0x767e0854
+1,     147448,     147448,      512,     1024, 0xf37c95fd
+1,     147956,     147956,      512,     1024, 0x6c0b8877
+1,     148463,     148463,      512,     1024, 0x2e54a8b6
+1,     148992,     148992,      512,     1024, 0x7f266488
+0,       6777,       6777,      111,     6170, 0xc84962fb
+1,     149499,     149499,      512,     1024, 0xfbf20f9a
+1,     150006,     150006,      512,     1024, 0xf2985cc0
+1,     150513,     150513,      512,     1024, 0xc7075340
+1,     151020,     151020,      512,     1024, 0xe4585695
+1,     151550,     151550,      512,     1024, 0xbdffa380
+0,       6888,       6888,      111,     6169, 0x27e06c03
+1,     152057,     152057,      512,     1024, 0x2422a8a9
+1,     152564,     152564,      512,     1024, 0x59cbd75f
+1,     153071,     153071,      512,     1024, 0x04ad1a8c
+1,     153578,     153578,      512,     1024, 0x33c09191
+1,     154107,     154107,      512,     1024, 0x55efa6fd
+0,       7000,       7000,      111,     5864, 0xd14db83f
+1,     154615,     154615,      512,     1024, 0xf73d0e5d
+1,     155122,     155122,      512,     1024, 0x6141ebae
+1,     155629,     155629,      512,     1024, 0x7db17a68
+1,     156158,     156158,      512,     1024, 0xa6c690b6
+1,     156665,     156665,      512,     1024, 0xa6fd6725
+0,       7111,       7111,      111,     5375, 0x4a21055d
+1,     157172,     157172,      512,     1024, 0x50a90b9b
+1,     157680,     157680,      512,     1024, 0xef990dc8
+1,     158187,     158187,      512,     1024, 0x75adf6b5
+1,     158716,     158716,      512,     1024, 0x61eac43e
+1,     159223,     159223,      512,     1024, 0x67797a19
+0,       7222,       7222,      111,     5206, 0x95ead3cb
+1,     159730,     159730,      512,     1024, 0xf325277a
+1,     160237,     160237,      512,     1024, 0x18bf254a
+1,     160767,     160767,      512,     1024, 0x2ce6bee3
+1,     161274,     161274,      512,     1024, 0x8d320860
+0,       7333,       7333,      111,     5220, 0xcfdcc37e
+1,     161781,     161781,      512,     1024, 0xc979b6e8
+1,     162288,     162288,      512,     1024, 0xdb644b41
+1,     162795,     162795,      512,     1024, 0xe1b368ba
+1,     163324,     163324,      512,     1024, 0xacc53d15
+1,     163832,     163832,      512,     1024, 0x42ea8c18
+0,       7444,       7444,      111,     4946, 0x2d864a77
+1,     164339,     164339,      512,     1024, 0xe52c99a4
+1,     164846,     164846,      512,     1024, 0xd7db54a6
+1,     165375,     165375,      512,     1024, 0x7f27a7e3
+1,     165882,     165882,      512,     1024, 0xf7ffeaa9
+1,     166389,     166389,      512,     1024, 0x792b6088
+0,       7555,       7555,      111,     4390, 0x2ab9f462
+1,     166896,     166896,      512,     1024, 0x61d99724
+1,     167404,     167404,      512,     1024, 0x5213720e
+1,     167933,     167933,      512,     1024, 0xac09dd30
+1,     168440,     168440,      512,     1024, 0x960bf6bb
+1,     168947,     168947,      512,     1024, 0xc90168e1
+0,       7666,       7666,      111,     4051, 0x1d09592e
+1,     169454,     169454,      512,     1024, 0x43b45768
+1,     169983,     169983,      512,     1024, 0x935d60a1
+1,     170491,     170491,      512,     1024, 0x9a342ef2
+1,     170998,     170998,      512,     1024, 0xc894709f
+0,       7777,       7777,      111,     3680, 0x39bd6a12
+1,     171505,     171505,      512,     1024, 0x59b43b07
+1,     172012,     172012,      512,     1024, 0x36a1a98d
+1,     172541,     172541,      512,     1024, 0x9e1a121c
+1,     173048,     173048,      512,     1024, 0x02208b78
+1,     173556,     173556,      512,     1024, 0xd1d7b274
+0,       7888,       7888,      111,     2910, 0x6337ece9
+1,     174063,     174063,      512,     1024, 0xdacd5096
+1,     174592,     174592,      512,     1024, 0x51b71ead
+1,     175099,     175099,      512,     1024, 0xd009a7ca
+1,     175606,     175606,      512,     1024, 0xb6d5a938
+1,     176113,     176113,      512,     1024, 0xf3d45e47
+0,       8000,       8000,      111,     2153, 0xf4e3bc17
+1,     176621,     176621,      512,     1024, 0xea8e04fc
+1,     177150,     177150,      512,     1024, 0x0b928bd8
+1,     177657,     177657,      512,     1024, 0x0f02caec
+1,     178164,     178164,      512,     1024, 0xe2b137a8
+1,     178671,     178671,      512,     1024, 0xd5f94892
diff --git a/tests/ref/fate/smjpeg-demux b/tests/ref/fate/smjpeg-demux
index 4fcd6149d4..042f9ff9ec 100644
--- a/tests/ref/fate/smjpeg-demux
+++ b/tests/ref/fate/smjpeg-demux
@@ -1,5 +1,14 @@
 #tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: mjpeg
+#dimensions 0: 320x240
+#sar 0: 1/1
 #tb 1: 1/1000
+#media_type 1: audio
+#codec_id 1: adpcm_ima_smjpeg
+#sample_rate 1: 22050
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        0,      734, 0x5a042c2c
 1,          0,          0,       23,      260, 0x00000000
 1,         23,         23,       23,      260, 0x00000000
@@ -232,7 +241,7 @@
 1,       4388,       4388,       23,      260, 0x06ad6a93
 1,       4411,       4411,       23,      260, 0xdd1b6c91
 1,       4435,       4435,       23,      260, 0x05b94d27
-0,       4444,       4444,      111,     7121, 0x913d5bd6
+0,       4444,       4444,        0,     7121, 0x913d5bd6
 1,       4458,       4458,       23,      260, 0x12cc5062
 1,       4481,       4481,       23,      260, 0x44526d0f
 1,       4504,       4504,       23,      260, 0xf2ac6d95
diff --git a/tests/ref/fate/smvjpeg b/tests/ref/fate/smvjpeg
new file mode 100644
index 0000000000..360fad6595
--- /dev/null
+++ b/tests/ref/fate/smvjpeg
@@ -0,0 +1,17 @@
+#tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x160
+#sar 0: 0/1
+0,          0,          0,        1,    30720, 0x3a821807
+0,          1,          1,        1,    30720, 0x95168e5d
+0,          2,          2,        1,    30720, 0xd4d98e45
+0,          3,          3,        1,    30720, 0xe340a7ea
+0,          4,          4,        1,    30720, 0xb832a22d
+0,          5,          5,        1,    30720, 0x1f3eb488
+0,          6,          6,        1,    30720, 0x6429ce43
+0,          7,          7,        1,    30720, 0x3a3da232
+0,          8,          8,        1,    30720, 0x5c02aeff
+0,          9,          9,        1,    30720, 0x4c7b1c9a
+0,         10,         10,        1,    30720, 0x6f7a8313
+0,         11,         11,        1,    30720, 0xaa32fd72
diff --git a/tests/ref/fate/source b/tests/ref/fate/source
new file mode 100644
index 0000000000..2def03495b
--- /dev/null
+++ b/tests/ref/fate/source
@@ -0,0 +1,34 @@
+Files without standard license headers:
+compat/avisynth/windowsPorts/basicDataTypeConversions.h
+compat/avisynth/windowsPorts/windows2linux.h
+libavcodec/file_open.c
+libavcodec/interplayacm.c
+libavcodec/log2_tab.c
+libavcodec/reverse.c
+libavdevice/file_open.c
+libavdevice/reverse.c
+libavfilter/log2_tab.c
+libavformat/file_open.c
+libavformat/golomb_tab.c
+libavformat/log2_tab.c
+libswresample/log2_tab.c
+libswscale/log2_tab.c
+tools/uncoded_frame.c
+tools/yuvcmp.c
+Headers without standard inclusion guards:
+compat/avisynth/avisynth_c.h
+compat/avisynth/avs/capi.h
+compat/avisynth/avs/config.h
+compat/avisynth/avs/types.h
+compat/avisynth/avxsynth_c.h
+compat/avisynth/windowsPorts/basicDataTypeConversions.h
+compat/avisynth/windowsPorts/windows2linux.h
+compat/cuda/dynlink_cuda.h
+compat/cuda/dynlink_cuviddec.h
+compat/cuda/dynlink_loader.h
+compat/cuda/dynlink_nvcuvid.h
+compat/float/float.h
+compat/float/limits.h
+compat/nvenc/nvEncodeAPI.h
+Use of av_clip() where av_clip_uintp2() could be used:
+Use of av_clip() where av_clip_intp2() could be used:
diff --git a/tests/ref/fate/sp5x b/tests/ref/fate/sp5x
index 986c111981..2ca79815ee 100644
--- a/tests/ref/fate/sp5x
+++ b/tests/ref/fate/sp5x
@@ -1,5 +1,14 @@
 #tb 0: 513/5000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 #tb 1: 1/8000
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 8000
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   115200, 0x8ebcb7f8
 1,          0,          0,     1024,     2048, 0x366ee71c
 0,          1,          1,        1,   115200, 0x1fa8e673
diff --git a/tests/ref/fate/speedhq-422 b/tests/ref/fate/speedhq-422
new file mode 100644
index 0000000000..7bb0d2388d
--- /dev/null
+++ b/tests/ref/fate/speedhq-422
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 112x64
+#sar 0: 0/1
+0,          0,          0,        1,    14336, 0x9bb6dc6d
diff --git a/tests/ref/fate/speedhq-422-singlefield b/tests/ref/fate/speedhq-422-singlefield
new file mode 100644
index 0000000000..343c52645c
--- /dev/null
+++ b/tests/ref/fate/speedhq-422-singlefield
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 112x32
+#sar 0: 0/1
+0,          0,          0,        1,     7168, 0x75de4109
diff --git a/tests/ref/fate/sub-aqtitle b/tests/ref/fate/sub-aqtitle
new file mode 100644
index 0000000000..87253c9a2d
--- /dev/null
+++ b/tests/ref/fate/sub-aqtitle
@@ -0,0 +1,45 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:03:29.92,0:03:31.28,Default,,0,0,0,,Dougu?

+Dialogue: 0,0:03:33.36,0:03:35.76,Default,,0,0,0,,Zlato, jseš v pořádku?

+Dialogue: 0,0:03:37.72,0:03:39.12,Default,,0,0,0,,Měl jsi sny.

+Dialogue: 0,0:03:41.44,0:03:43.32,Default,,0,0,0,,Byly o Marsu?

+Dialogue: 0,0:03:48.92,0:03:50.52,Default,,0,0,0,,Je to lepší?

+Dialogue: 0,0:03:53.12,0:03:54.72,Default,,0,0,0,,Chudinko moje.

+Dialogue: 0,0:03:55.76,0:03:58.08,Default,,0,0,0,,Začíná to být\Nposedlost.

+Dialogue: 0,0:04:05.92,0:04:07.16,Default,,0,0,0,,Byla tam i ona?

+Dialogue: 0,0:04:09.12,0:04:10.48,Default,,0,0,0,,Kdo?

+Dialogue: 0,0:04:12.44,0:04:15.16,Default,,0,0,0,,Ta, o které jsi mi vyprávěl.\NTa bruneta.

+Dialogue: 0,0:04:16.32,0:04:17.52,Default,,0,0,0,,Lori.

+Dialogue: 0,0:04:20.32,0:04:23.16,Default,,0,0,0,,Nemůžu uvěřit\Nže žárlíš na sen.

+Dialogue: 0,0:04:23.84,0:04:26.60,Default,,0,0,0,,- Kdo je ona?\N- Nikdo.

+Dialogue: 0,0:04:26.60,0:04:28.80,Default,,0,0,0,,"Nikdo"? Jak se jmenuje?

+Dialogue: 0,0:04:28.80,0:04:30.24,Default,,0,0,0,,Nevím.

+Dialogue: 0,0:04:31.52,0:04:33.20,Default,,0,0,0,,- Pověz!\N- Nevím!

+Dialogue: 0,0:04:33.20,0:04:35.48,Default,,0,0,0,,Radši bys mi to měl říct!

+Dialogue: 0,0:04:35.48,0:04:39.16,Default,,0,0,0,,To není legrace Dougu.\NZdá se ti o ní každou noc.

+Dialogue: 0,0:04:39.16,0:04:41.84,Default,,0,0,0,,Ale vždy se ráno probudím.

+Dialogue: 0,0:04:41.84,0:04:43.28,Default,,0,0,0,,Nech mě být!

+Dialogue: 0,0:04:45.72,0:04:47.76,Default,,0,0,0,,No tak, zlato.

+Dialogue: 0,0:04:47.76,0:04:50.72,Default,,0,0,0,,Ty víš, že jsi dívkou\Nmých snů.

+Dialogue: 0,0:04:50.72,0:04:52.40,Default,,0,0,0,,Myslíš to vážně?

+Dialogue: 0,0:04:53.48,0:04:55.32,Default,,0,0,0,,To víš že ano.

+Dialogue: 0,0:05:04.40,0:05:07.20,Default,,0,0,0,,Dám ti něco\No čem budeš snít.

+Dialogue: 0,0:05:16.76,0:05:16.92,Default,,0,0,0,,Premiér se útoku ubránil\Na řekl, že zbraně založené na vesmírných...

+Dialogue: 0,0:05:16.92,0:05:20.36,Default,,0,0,0,,Premiér se útoku ubránil\Na řekl, že zbraně založené na vesmírných...

+Dialogue: 0,0:05:20.36,0:05:24.36,Default,,0,0,0,,jsou naše jediná obrana proti\Npočetní převaze z jižního bloku.

+Dialogue: 0,0:05:24.36,0:05:26.76,Default,,0,0,0,,A další násilí na Marsu...

+Dialogue: 0,0:05:26.76,1:44:16.00,Default,,0,0,0,,[...]

+Dialogue: 0,1:44:16.00,1:44:17.60,Default,,0,0,0,,Co se děje?

+Dialogue: 0,1:44:17.60,1:44:21.28,Default,,0,0,0,,Měl jsem jenom hroznou představu.\NCo když tohle je jenom sen?

+Dialogue: 0,1:44:22.76,1:44:25.68,Default,,0,0,0,,Tak mi dej ryhcle pusu\Nnež se probudíš.

diff --git a/tests/ref/fate/sub-ass-to-ass-transcode b/tests/ref/fate/sub-ass-to-ass-transcode
new file mode 100644
index 0000000000..bfc4e95419
--- /dev/null
+++ b/tests/ref/fate/sub-ass-to-ass-transcode
@@ -0,0 +1,62 @@
+[Script Info]

+; Script generated by Aegisub 3.2.2

+; http://www.aegisub.org/

+Title: Default Aegisub file

+ScriptType: v4.00+

+WrapStyle: 0

+PlayResX: 1280

+PlayResY: 720

+ScaledBorderAndShadow: yes

+Video Zoom: 4

+Video Colorspace: BT.601

+Video Aspect Ratio: c1.77778

+YCbCr Matrix: TV.709

+

+[Aegisub Project Garbage]

+Automation Scripts: ~../../../../Aegisub autoload folder/New Folder/cmconv.lua

+Last Style Storage: Default1

+Audio File: kamisama05-premux.mkv

+Video File: kamisama05-premux.mkv

+Keyframes File: ../Desktop/Keyframe Raws/kamisama05-wr.keyframes.txt

+Video AR Mode: 4

+Video AR Value: 1.777778

+Video Zoom Percent: 0.875000

+Video Position: 306

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Luxi Sub Sans,48,&H00F9FDFB,&H00003FFF,&H0A093346,&HDC0A0E10,-1,0,0,0,99,100,0,0,1,2.5,1,2,110,110,40,0

+Style: Default2,Luxi Sub Sans,48,&H00F9FDFB,&H00003FFF,&H0A093346,&HDC0A0E10,-1,0,0,0,99,100,0,0,1,2.5,1,2,60,60,40,0

+Style: Default - Alt,Luxi Sub Sans,48,&H00F9FDFB,&H00003FFF,&H0A673308,&HDC0A0E10,-1,0,0,0,99,100,0,0,1,2.5,1,8,110,110,40,0

+Style: OP2-Romaji-furigana,Chinacat,21,&H003B1A9A,&H00CBCB9F,&H00FFFFFF,&H00000000,0,0,0,0,96,114,0,0,1,2.5,0,8,40,40,30,1

+Style: OP1-Eng-furigana,Chinacat,20,&H003B1A9A,&H000019FF,&H00FFFFFF,&H007857D5,0,0,0,0,96,114,0.5,0,1,2.5,0.05,2,40,40,30,1

+Style: OP1-Romaji-furigana,Chinacat,21,&H003B1A9A,&H00CBCB9F,&H00FFFFFF,&H00000000,0,0,0,0,96,114,0,0,1,2.5,0,8,40,40,30,1

+Style: OP1-Romaji,Chinacat,42,&H003B1A9A,&H00CBCB9F,&H00FFFFFF,&H00000000,0,0,0,0,96,114,0,0,1,5,0,8,40,40,30,1

+Style: OP1-Eng,Chinacat,39,&H003B1A9A,&H000019FF,&H00FFFFFF,&H007857D5,0,0,0,0,96,114,0.5,0,1,5,0.1,2,40,40,30,1

+Style: OP2-Romaji,Chinacat,42,&H003B1A9A,&H00CBCB9F,&H00FFFFFF,&H00000000,0,0,0,0,96,114,0,0,1,5,0,8,40,40,30,1

+Style: ED1-Romaji,Agency FB,44,&H00000000,&H00EBDCCD,&H00FFFFFF,&H00000000,0,0,0,0,98,115,0,0,1,3,0,7,40,40,30,1

+Style: ED1-Eng,ClaudeSansPlain,40,&H00000000,&H00EBDCCD,&H00FFFFFF,&H007857D5,0,0,0,0,90,115,0,0,1,4,0,3,40,40,30,1

+Style: ED1-Eng-furigana,ClaudeSansPlain,20,&H00000000,&H00EBDCCD,&H00FFFFFF,&H007857D5,0,0,0,0,90,115,0,0,1,2,0,3,40,40,30,1

+Style: ED1-Romaji-furigana,Agency FB,22,&H00000000,&H00EBDCCD,&H00FFFFFF,&H00000000,0,0,0,0,98,115,0,0,1,1.5,0,7,40,40,30,1

+Style: Signs,Arial,46,&H00FFFFFF,&H000000FF,&H00000000,&H00000000,0,0,0,0,100,100,0,0,1,0,0,5,10,10,10,1

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 3,0:00:12.74,0:00:13.49,OP1-Romaji,,0,0,0,fx,{\an5\pos(352,54)\move(352,-101,352,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}i

+Dialogue: 3,0:00:12.78,0:00:14.28,OP1-Romaji,,0,0,0,fx,{\an5\pos(365,54)\move(365,-101,365,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}t

+Dialogue: 3,0:00:12.78,0:00:14.28,OP1-Romaji,,0,0,0,fx,{\an5\pos(383,54)\move(383,-101,383,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}t

+Dialogue: 3,0:00:12.78,0:00:14.28,OP1-Romaji,,0,0,0,fx,{\an5\pos(402,54)\move(402,-101,402,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}a

+Dialogue: 3,0:00:12.78,0:00:14.28,OP1-Romaji,,0,0,0,fx,{\an5\pos(416,54)\move(416,-101,416,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}i

+Dialogue: 3,0:00:12.78,0:00:15.11,OP1-Romaji,,0,0,0,fx,{\an5\pos(438,54)\move(438,-101,438,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}k

+Dialogue: 3,0:00:12.78,0:00:15.11,OP1-Romaji,,0,0,0,fx,{\an5\pos(455,54)\move(455,-101,455,54,0,400)\bord3\blur2\2c&HD4B5CB&\fad(300,0)}o

+Dialogue: 10,0:23:52.82,0:23:54.80,Default,,0,0,100,,Wing Fling Hazard!

+

+

+[Aegisub Extradata]

+Data: 5,a-mo,e{"uuid"#3A"3386f06e-e9b4-40e2-8412-3fb75759e716"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur0.6\\c&H454C38&\\fneveryone\\b1\\3c&H454C38&\\frz20.87\\pos(241.27#2C441.97)\\fscy101.1\\fscx101.1\\bord1\\1a&HFF&\\3a&HFF&\\4a&HFF&\\t(0#2C233#2C1#2C\\1a&HFF&\\3a&H00&\\4a&H00&)}Oh"}

+Data: 6,a-mo,e{"uuid"#3A"599d1dca-62d7-4732-9983-729119494e29"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur0.6\\c&H454C38&\\fneveryone\\b1\\3c&H454C38&\\frz20.87\\pos(251.27#2C441.97)\\fscy101.1\\fscx101.1\\bord1\\1a&HFF&\\3a&HFF&\\4a&HFF&\\t(0#2C233#2C1#2C\\1a&HFF&\\3a&H00&\\4a&H00&)}Oh"}

+Data: 7,a-mo,e{"uuid"#3A"6f1637e2-25f1-44e5-98d8-0e63a7b72c10"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur0.6\\c&H454C38&\\fneveryone\\b1\\3c&H454C38&\\frz20.87\\pos(246.27#2C435.97)\\fscy101.1\\fscx101.1\\bord1\\1a&HFF&\\3a&HFF&\\4a&HFF&\\t(0#2C233#2C1#2C\\1a&HFF&\\3a&H00&\\4a&H00&)}Oh"}

+Data: 8,a-mo,e{"uuid"#3A"4d9840e0-62db-4bb4-b6a3-87f376a9009c"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur0.7\\c&H454C38&\\fneveryone\\b1\\3c&H454C38&\\frz20.87\\pos(244.27#2C440.97)\\fscy101.1\\fscx101.1\\bord3.2\\alpha&HFF&\\t(0#2C233#2C1#2C\\alpha&H00&)}Oh"}

+Data: 9,a-mo,e{"uuid"#3A"65a47c5f-8cc5-403f-9b1d-fb1912311891"#2C"originalText"#3A"{\\fs65\\xbord4\\fsp2\\blur1\\c&H8FE2CF&\\fneveryone\\b1\\frz20.87\\pos(244.27#2C440.97)\\fscy101.1\\fscx101.1\\bord0\\alpha&HFF&\\t(0#2C233#2C1#2C\\alpha&H00&)}Oh"}

+

+

diff --git a/tests/ref/fate/sub-cc b/tests/ref/fate/sub-cc
new file mode 100644
index 0000000000..4cc02d1d17
--- /dev/null
+++ b/tests/ref/fate/sub-cc
@@ -0,0 +1,14 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,3,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:12.36,0:00:40.83,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chatter{\i0} )

+Dialogue: 0,0:00:40.83,0:00:59.07,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our number one

diff --git a/tests/ref/fate/sub-cc-realtime b/tests/ref/fate/sub-cc-realtime
new file mode 100644
index 0000000000..be800a4d29
--- /dev/null
+++ b/tests/ref/fate/sub-cc-realtime
@@ -0,0 +1,42 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,3,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:14.14,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}(

+Dialogue: 0,0:00:15.47,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} in

+Dialogue: 0,0:00:15.92,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inau

+Dialogue: 0,0:00:16.36,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudi

+Dialogue: 0,0:00:16.81,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudibl

+Dialogue: 0,0:00:17.25,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible 

+Dialogue: 0,0:00:17.70,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible ra

+Dialogue: 0,0:00:18.14,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radi

+Dialogue: 0,0:00:18.59,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio 

+Dialogue: 0,0:00:19.03,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio ch

+Dialogue: 0,0:00:19.48,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chat

+Dialogue: 0,0:00:19.92,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chatte

+Dialogue: 0,0:00:20.36,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chatter

+Dialogue: 0,0:00:21.70,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,44)}({\i1} inaudible radio chatter{\i0} )

+Dialogue: 0,0:00:42.61,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>>

+Dialogue: 0,0:00:43.05,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> S

+Dialogue: 0,0:00:43.50,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Saf

+Dialogue: 0,0:00:43.94,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safet

+Dialogue: 0,0:00:44.39,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety 

+Dialogue: 0,0:00:44.83,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety re

+Dialogue: 0,0:00:45.28,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety rema

+Dialogue: 0,0:00:45.72,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remain

+Dialogue: 0,0:00:46.17,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains 

+Dialogue: 0,0:00:46.61,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains ou

+Dialogue: 0,0:00:47.06,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our 

+Dialogue: 0,0:00:47.50,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our nu

+Dialogue: 0,0:00:47.95,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our numb

+Dialogue: 0,0:00:48.39,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our number

+Dialogue: 0,0:00:48.84,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our number o

+Dialogue: 0,0:00:49.28,9:59:59.99,Default,,0,0,0,,{\an7}{\pos(38,28)}({\i1} inaudible radio chatter{\i0} )\N{\an7}{\pos(38,44)}>> Safety remains our number one

diff --git a/tests/ref/fate/sub-charenc b/tests/ref/fate/sub-charenc
new file mode 100644
index 0000000000..a056cd1092
--- /dev/null
+++ b/tests/ref/fate/sub-charenc
@@ -0,0 +1,62 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:32.95,0:00:38.25,Default,,0,0,0,,КОЛУМБИА ПИКЧЪРС - АЗИЯ\NСОНИ ПИКЧЪРС и Е.Е. Co.\Nпредставят

+Dialogue: 0,0:00:52.76,0:00:58.60,Default,,0,0,0,,Т И Г Ъ Р   И   Д Р А К О Н

+Dialogue: 0,0:01:22.17,0:01:24.05,Default,,0,0,0,,Учителят Ли е тук.

+Dialogue: 0,0:01:45.48,0:01:47.32,Default,,0,0,0,,Шу Лиен!

+Dialogue: 0,0:01:54.53,0:01:57.24,Default,,0,0,0,,Ли Му Бай е тук.

+Dialogue: 0,0:02:05.83,0:02:09.00,Default,,0,0,0,,- Как вървят нещата?\N- Добре. Моля, влезте!

+Dialogue: 0,0:02:23.48,0:02:26.53,Default,,0,0,0,,Му Бай...\NМина много време.

+Dialogue: 0,0:02:26.73,0:02:28.11,Default,,0,0,0,,Така е.

+Dialogue: 0,0:02:28.57,0:02:31.41,Default,,0,0,0,,- Как върви бизнесът?\N- Добре.

+Dialogue: 0,0:02:31.61,0:02:33.90,Default,,0,0,0,,- А ти как си?\N- Добре.

+Dialogue: 0,0:02:40.16,0:02:42.79,Default,,0,0,0,,Монахът Дзенг каза,\Nче си в планината Удан.

+Dialogue: 0,0:02:43.04,0:02:46.54,Default,,0,0,0,,Каза, че практикуваш\Nдълбока медитация.

+Dialogue: 0,0:02:48.84,0:02:50.68,Default,,0,0,0,,Сигурно в планината\Nе много спокойно.

+Dialogue: 0,0:02:51.25,0:02:53.46,Default,,0,0,0,,Завиждам ти.

+Dialogue: 0,0:02:53.67,0:02:58.34,Default,,0,0,0,,Имам толкова много работа,\Nпочти не ми остава\Nвреме за почивка.

+Dialogue: 0,0:03:00.26,0:03:03.89,Default,,0,0,0,,Оставих обучението рано.

+Dialogue: 0,0:03:05.69,0:03:11.28,Default,,0,0,0,,Защо? Ти си боец на Удан.\NОбучението е всичко.

+Dialogue: 0,0:03:11.90,0:03:14.86,Default,,0,0,0,,По време на медитация…

+Dialogue: 0,0:03:15.07,0:03:18.49,Default,,0,0,0,,стигнах до място,\Nкъдето имаше дълбока тишина...

+Dialogue: 0,0:03:19.87,0:03:22.79,Default,,0,0,0,,бях обграден от светлина...

+Dialogue: 0,0:03:23.41,0:03:28.08,Default,,0,0,0,,времето и пространството изчезнаха.

+Dialogue: 0,0:03:28.71,0:03:34.09,Default,,0,0,0,,Достигнах до състояние, за което\Nучителят не ми беше казвал.

+Dialogue: 0,0:03:37.05,0:03:39.14,Default,,0,0,0,,Постигнал си просветление?

+Dialogue: 0,0:03:39.34,0:03:41.22,Default,,0,0,0,,Не.

+Dialogue: 0,0:03:41.72,0:03:45.81,Default,,0,0,0,,Не почувствах блаженството\Nна просветлението.

+Dialogue: 0,0:03:46.02,0:03:52.86,Default,,0,0,0,,Вместо това... ме обгърна\Nбезкрайна мъка.

+Dialogue: 0,0:03:53.40,0:03:56.57,Default,,0,0,0,,Не можах да издържа.

+Dialogue: 0,0:03:57.49,0:03:59.74,Default,,0,0,0,,Прекъснах медитацията си.

+Dialogue: 0,0:03:59.95,0:04:02.24,Default,,0,0,0,,Не можах да продължа.

+Dialogue: 0,0:04:03.20,0:04:07.79,Default,,0,0,0,,Нещо...\Nме дърпаше назад.

+Dialogue: 0,0:04:09.62,0:04:10.91,Default,,0,0,0,,Какво беше?

+Dialogue: 0,0:04:15.46,0:04:18.00,Default,,0,0,0,,Нещо, от което не\Nмога да се освободя.

+Dialogue: 0,0:04:23.39,0:04:24.68,Default,,0,0,0,,Скоро ли ще тръгваш?

+Dialogue: 0,0:04:26.77,0:04:30.27,Default,,0,0,0,,Подготвяме охрана\Nза една доставка...

+Dialogue: 0,0:04:30.48,0:04:31.94,Default,,0,0,0,,за Пекин.

+Dialogue: 0,0:04:32.56,0:04:34.10,Default,,0,0,0,,Мога ли да те помоля...

+Dialogue: 0,0:04:35.07,0:04:38.82,Default,,0,0,0,,да занесеш нещо на господин Те.

+Dialogue: 0,0:04:44.28,0:04:48.12,Default,,0,0,0,,Зеленият меч на Съдбата!?\NДаваш го на господин Те!?

+Dialogue: 0,0:04:48.37,0:04:52.67,Default,,0,0,0,,Да. Той винаги е бил\Nнашият най-голям покровител.

+Dialogue: 0,0:04:52.88,0:04:56.55,Default,,0,0,0,,Не разбирам.\NКак можеш да се разделиш с него?

+Dialogue: 0,0:04:56.76,0:04:59.93,Default,,0,0,0,,Той винаги е бил с теб.

+Dialogue: 0,0:05:01.18,0:05:05.52,Default,,0,0,0,,Твърде много хора са\Nзагинали от това острие.

+Dialogue: 0,0:05:09.68,0:05:14.52,Default,,0,0,0,,Чисто е единствено защото\Nкръвта се отмива лесно.

+Dialogue: 0,0:05:15.40,0:05:20.61,Default,,0,0,0,,Ти го използваш справедливо.\NДостоен си за него.

+Dialogue: 0,0:05:23.66,0:05:27.37,Default,,0,0,0,,Дойде време\Nда го оставя.

+Dialogue: 0,0:05:27.58,0:05:31.21,Default,,0,0,0,,Е, какво ще правиш\Nот сега нататък?

+Dialogue: 0,0:05:34.71,0:05:37.50,Default,,0,0,0,,Ела с мен в Пекин.

+Dialogue: 0,0:05:37.71,0:05:41.42,Default,,0,0,0,,Лично ще дадеш меча\Nна господин Те.

+Dialogue: 0,0:05:41.68,0:05:44.89,Default,,0,0,0,,Ще бъде както преди.

+Dialogue: 0,0:05:47.01,0:05:51.68,Default,,0,0,0,,Първо трябва да отида\Nна гроба на учителя си.

diff --git a/tests/ref/fate/sub-jacosub b/tests/ref/fate/sub-jacosub
new file mode 100644
index 0000000000..a30fe4a196
--- /dev/null
+++ b/tests/ref/fate/sub-jacosub
@@ -0,0 +1,23 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:00.12,0:00:04.36,Default,,0,0,0,,{\an5}JACOsub\N\NThis script demonstrates some of the capabilities of JACOsub.

+Dialogue: 0,0:00:04.12,0:00:14.86,Default,,0,0,0,,{\an8}Text may be positioned at the top,

+Dialogue: 0,0:00:05.12,0:00:17.46,Default,,0,0,0,,{\an5}middle,

+Dialogue: 0,0:00:06.12,0:00:20.06,Default,,0,0,0,,{\an2}or bottom of the screen.

+Dialogue: 0,0:00:08.12,0:00:27.36,Default,,0,0,0,,{\an5}{this is a comment} (And, you just saw, {another comment} timing ranges for different lines of text.

+Dialogue: 0,0:00:11.12,0:00:35.86,Default,,0,0,0,,{\an1}Within margin constraints\Nthat you set, text may be\Nleft justified,

+Dialogue: 0,0:00:13.62,0:00:42.11,Default,,0,0,0,,{\an2}{the JC is redundant - it's the default}center\Njustified,

+Dialogue: 0,0:00:14.87,0:00:45.86,Default,,0,0,0,,{\an3}and also\Nright justified.

+Dialogue: 0,0:00:22.42,0:01:12.76,Default,,0,0,0,,Text may appear in different styles\N(Normal, {\b1}Bold{\r}, {\i1}Italic{\r})

+Dialogue: 0,0:01:16.12,0:03:53.36,Default,,0,0,0,,{\an5}\N\NAt that time, you may press any key to return to the Editor.

+Dialogue: 0,0:01:16.12,0:03:53.36,Default,,0,0,0,,OK, this script will be finished when the screen goes blank.

diff --git a/tests/ref/fate/sub-microdvd b/tests/ref/fate/sub-microdvd
new file mode 100644
index 0000000000..d2170bc2a4
--- /dev/null
+++ b/tests/ref/fate/sub-microdvd
@@ -0,0 +1,22 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Comic Sans MS,30,&H123456,&H123456,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:40.00,0:00:52.00,Default,,0,0,0,,{\c&H345678&}foo{\c}\N{\c&HABCDEF&}bar{\c}\Nbla

+Dialogue: 0,0:00:52.00,0:00:56.00,Default,,0,0,0,,{\u1}{\s1}{\i1}{\b1}italic bold underline strike{\s0}{\u0}\Nitalic bold no-underline no-strike

+Dialogue: 0,0:00:56.00,0:01:00.00,Default,,0,0,0,,back to

+Dialogue: 0,0:01:00.00,0:01:04.00,Default,,0,0,0,,the future

+Dialogue: 0,0:01:20.00,0:01:24.92,Default,,0,0,0,,{\pos(10,20)}Some more crazy stuff

+Dialogue: 0,0:02:14.00,0:02:15.60,Default,,0,0,0,,this subtitle...

+Dialogue: 0,0:02:15.60,0:02:40.00,Default,,0,0,0,,...continues up to...

+Dialogue: 0,0:02:40.00,0:03:00.00,Default,,0,0,0,,this one.

+Dialogue: 0,0:03:04.00,0:03:12.00,Default,,0,0,0,,and now...

+Dialogue: 0,0:03:12.00,9:59:59.99,Default,,0,0,0,,...to the end of the presentation

diff --git a/tests/ref/fate/sub-microdvd-remux b/tests/ref/fate/sub-microdvd-remux
new file mode 100644
index 0000000000..a71da99031
--- /dev/null
+++ b/tests/ref/fate/sub-microdvd-remux
diff --git a/tests/ref/fate/sub-movtext b/tests/ref/fate/sub-movtext
new file mode 100644
index 0000000000..94ed22d318
--- /dev/null
+++ b/tests/ref/fate/sub-movtext
@@ -0,0 +1,15 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Serif,18,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:00.97,0:00:02.54,Default,,0,0,0,,- Test 1.\N- Test 2.

+Dialogue: 0,0:00:03.05,0:00:04.74,Default,,0,0,0,,Test 3.

+Dialogue: 0,0:00:05.85,0:00:08.14,Default,,0,0,0,,- Test 4.\N- Test 5.

diff --git a/tests/ref/fate/sub-mpl2 b/tests/ref/fate/sub-mpl2
new file mode 100644
index 0000000000..72fc0fccd7
--- /dev/null
+++ b/tests/ref/fate/sub-mpl2
@@ -0,0 +1,16 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:00.00,0:00:01.20,Default,,0,0,0,,Foo\Nbar\Nbla

+Dialogue: 0,0:00:04.10,0:00:05.30,Default,,0,0,0,,{\i1}italic{\r}\N{\b1}bold{\r}\N{\b1}{\i1}italicbold

+Dialogue: 0,0:00:05.30,0:00:07.20,Default,,0,0,0,,{\u1}underline{\r}\Nnormal

+Dialogue: 0,0:00:08.40,0:00:12.80,Default,,0,0,0,,hello

diff --git a/tests/ref/fate/sub-mpsub b/tests/ref/fate/sub-mpsub
new file mode 100644
index 0000000000..890ceb08a2
--- /dev/null
+++ b/tests/ref/fate/sub-mpsub
@@ -0,0 +1,33 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:15.00,0:00:18.00,Default,,0,0,0,,A long, long time ago...

+Dialogue: 0,0:00:18.00,0:00:21.00,Default,,0,0,0,,in a galaxy far away...

+Dialogue: 0,0:00:21.00,0:00:24.00,Default,,0,0,0,,Naboo was under an attack.

+Dialogue: 0,0:00:25.00,0:00:27.50,Default,,0,0,0,,And I thought me and\NQui-Gon Jinn could

+Dialogue: 0,0:00:27.50,0:00:30.00,Default,,0,0,0,,talk the Federation into

+Dialogue: 0,0:00:30.00,0:00:34.00,Default,,0,0,0,,...maybe cutting them a\Nlittle slack.

+Dialogue: 0,0:00:36.00,0:00:39.00,Default,,0,0,0,,But their response, it\Ndidn't thrill us,

+Dialogue: 0,0:00:39.00,0:00:42.00,Default,,0,0,0,,They locked the doors,\Nand tried to kill us.

+Dialogue: 0,0:00:42.00,0:00:44.50,Default,,0,0,0,,We escaped from that gas,

+Dialogue: 0,0:00:44.50,0:00:48.00,Default,,0,0,0,,then met Jar-jar and\NBoss-Nass.

+Dialogue: 0,0:00:49.00,0:00:55.00,Default,,0,0,0,,We took a bongo from the\Nscene and we went to\NTheed to see the Queen.

+Dialogue: 0,0:00:55.00,0:01:00.00,Default,,0,0,0,,We all wound' up on\NTatooine.

+Dialogue: 0,0:01:00.00,0:01:06.00,Default,,0,0,0,,That's where, we've found\Nthis boy.

+Dialogue: 0,0:01:06.00,0:01:10.00,Default,,0,0,0,,Oh my, my this here\NAnakin guy,

+Dialogue: 0,0:01:10.00,0:01:15.00,Default,,0,0,0,,maybe Vader someday\Nlater now he's just\Na small fry.

+Dialogue: 0,0:01:15.00,0:01:19.00,Default,,0,0,0,,And he left his home and\Nkissed his mommy goodbye,

+Dialogue: 0,0:01:19.00,0:01:24.00,Default,,0,0,0,,singing "Soon I'm gonna be\Na Jedi!"

+Dialogue: 0,0:01:30.00,0:01:36.00,Default,,0,0,0,,Did you know this junkyard\Nslave isn't even old enough\Nto shave,

+Dialogue: 0,0:01:36.00,0:01:39.00,Default,,0,0,0,,but he can use the Force,\Nthey say.

+Dialogue: 0,0:01:40.00,0:01:46.00,Default,,0,0,0,,Ahh, do you see him hitting\Non the queen though he's\Njust nine and she's fourteen

+Dialogue: 0,0:01:46.00,0:01:52.00,Default,,0,0,0,,yeah, he's probably gonna\Nmarry her, someday!

diff --git a/tests/ref/fate/sub-mpsub-frames b/tests/ref/fate/sub-mpsub-frames
new file mode 100644
index 0000000000..64528ec70e
--- /dev/null
+++ b/tests/ref/fate/sub-mpsub-frames
@@ -0,0 +1,14 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:01.00,0:00:02.48,Default,,0,0,0,,Start at 1sec,\Nlast 1.5 seconds

+Dialogue: 0,0:00:02.52,0:00:11.52,Default,,0,0,0,,One frame later,\Nduring 9 seconds

diff --git a/tests/ref/fate/sub-pjs b/tests/ref/fate/sub-pjs
new file mode 100644
index 0000000000..799c62b2a3
--- /dev/null
+++ b/tests/ref/fate/sub-pjs
@@ -0,0 +1,15 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:04:04.70,0:04:11.30,Default,,0,0,0,,You should come to the Drama Club, too.

+Dialogue: 0,0:04:11.30,0:04:19.40,Default,,0,0,0,,Yeah. The Drama Club is worried\Nthat you haven't been coming.

+Dialogue: 0,0:04:20.30,0:04:27.50,Default,,0,0,0,,I see. Sorry, I'll drop by next time.

diff --git a/tests/ref/fate/sub-realtext b/tests/ref/fate/sub-realtext
new file mode 100644
index 0000000000..cd9aa5a294
--- /dev/null
+++ b/tests/ref/fate/sub-realtext
@@ -0,0 +1,17 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0,0,0,,Mary had a little lamb, \N

+Dialogue: 0,0:00:03.00,0:00:18.00,Default,,0,0,0,,little lamb, \N

+Dialogue: 0,0:00:06.99,0:00:21.99,Default,,0,0,0,,little lamb, \N

+Dialogue: 0,0:00:09.00,0:00:23.00,Default,,0,0,0,,Mary had a little lamb \N

+Dialogue: 0,0:00:12.34,0:00:27.34,Default,,0,0,0,,whose fleece was white as snow. 

diff --git a/tests/ref/fate/sub-sami b/tests/ref/fate/sub-sami
new file mode 100644
index 0000000000..3a013908d5
--- /dev/null
+++ b/tests/ref/fate/sub-sami
@@ -0,0 +1,21 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:00.00,0:00:00.01,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\N

+Dialogue: 0,0:00:00.01,0:00:08.80,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\NLet the word go forth, from this time and place to friend and foe alike that the torch

+Dialogue: 0,0:00:08.80,0:00:19.50,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Nhas been passed to a new generation of Americans, born in this century, tempered by war,

+Dialogue: 0,0:00:19.50,0:00:28.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Ndisciplined by a hard and bitter peace, proud of our ancient heritage, and unwilling to witness

+Dialogue: 0,0:00:28.00,0:00:38.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Nor permit the slow undoing of those human rights to which this nation has always

+Dialogue: 0,0:00:38.00,0:00:46.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Nbeen committed and to which we are committed today at home and around the world.

+Dialogue: 0,0:00:46.00,0:01:01.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\NLet every nation know, whether it wishes us well or ill, that we shall pay any price, bear any burden,

+Dialogue: 0,0:01:01.00,0:01:13.00,Default,,0,0,0,,{\i1}Pres. John F. Kennedy{\i0}\Nmeet any hardship, support any friend, oppose any foe, to ensure the survival and success of liberty.

+Dialogue: 0,0:01:13.00,9:59:59.99,Default,,0,0,0,,{\i1}End of:{\i0}\NPresident John F. Kennedy Speech

diff --git a/tests/ref/fate/sub-sami2 b/tests/ref/fate/sub-sami2
new file mode 100644
index 0000000000..64656f06cb
--- /dev/null
+++ b/tests/ref/fate/sub-sami2
@@ -0,0 +1,91 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:01.51,0:00:01.51,Default,,0,0,0,,by Psyence Fictionist\Npsyencefictionist@gmail.com

+Dialogue: 0,0:00:01.51,0:00:08.61,Default,,0,0,0,,Sync by: honeybunny and Kerensky\Nwww.Addic7ed.com

+Dialogue: 0,0:00:10.11,0:00:10.11,Default,,0,0,0,,\N{\b1}사랑과 배신\N탐욕과 살육의 이야기죠{\b0}

+Dialogue: 0,0:00:10.11,0:00:13.98,Default,,0,0,0,,\N{\c&H800080&}The{\c}{\c&HCBC0FF&}re{\c} {\c&HFF&}is{\c} {\c&HA5FF&}lo{\c}{\c&HFFFF&}ve{\c} {\c&H8000&}and{\c}{\c&HFFFF00&} bet{\c}{\c&HFF0000&}rayal{\c},\N{\b1}{\c&H808080&}g{\c}r{\c&H808080&}e{\c}e{\c&H808080&}d{\c} and {\c&HFF&}m{\c}{\c&H808080&}u{\c}{\c&HFF&}rder{\c}{\b0}.

+Dialogue: 0,0:00:17.67,0:00:17.67,Default,,0,0,0,,\N{\c&HFFFF&}선악의 정의에 대해서\N대립하는 가치관을 가진{\c}

+Dialogue: 0,0:00:17.67,0:00:21.72,Default,,0,0,0,,\N{\c&HCBC0FF&}{\fs6}It's{\fs} {\fs8}set{\fs}{\fs10} in {\fs}{\fs12}this{\fs}{\fs14} intere{\fs}{\fs14}sting{\fs}\N{\fs16} world{\fs}{\fs18} of{\fs} {\fs20}cont{\fs}{\fs22}rasting{\fs}{\fs24} ideology{\fs}{\c}

+Dialogue: 0,0:00:21.84,0:00:21.84,Default,,0,0,0,,\N{\u1}매력적인 세계에서\N이 모든 것이 펼쳐집니다{\u1}

+Dialogue: 0,0:00:21.84,0:00:23.58,Default,,0,0,0,,\N{\i1}{\c&H9966CC&}of{\c}{\c&HC2A3E0&} what's{\c} {\c&HE0D1F0&}right{\c} {\c&HFCFAFE&}and{\c} wrong.{\i0}

+Dialogue: 0,0:00:23.69,0:00:23.69,Default,,0,0,0,,\N{\i1}이 주제를 심오한 철학으로\N담아내고 있어요{\i0}

+Dialogue: 0,0:00:23.69,0:00:25.67,Default,,0,0,0,,\N{\c&HFF0000&}{\fs20}{\s1}It{\s0}{\fs}{\c} has {\c&HFFFF00&}{\fs15}a{\fs}{\c} great {\c&HFFCC00&}{\fs16}philosophy{\fs}{\c} about it.

+Dialogue: 0,0:00:40.22,0:00:40.22,Default,,0,0,0,,\N{\s1}"왕좌의 게임"은 웨스테로스라는 가상왕국의\N권력 분쟁 이야기입니다{\s0}

+Dialogue: 0,0:00:40.22,0:00:47.94,Default,,0,0,0,,\N{\c&HA5FF&}{\fs26}"Game of Thrones"{\fs}{\c} {\c&H2A2AA5&}{\b1}is{\b0}{\c}{\c&HFFFF&}{\fs24}{\i1} about{\i0}{\fs}{\c} {\c&H336699&}{\fs14}power{\fs}{\c}{\c&HFF&} struggles{\c}\N{\c&HA5FF&}{\fs8}in a fantasy{\fs}{\c&HCBC0FF&} kingdom{\c&HA5FF&}, called {\fs6}Westeros.{\fs}{\c}

+Dialogue: 0,0:00:48.06,0:00:48.06,Default,,0,0,0,,\N철의 왕좌를 둘러싼\N권력 분쟁이죠

+Dialogue: 0,0:00:48.06,0:00:50.76,Default,,0,0,0,,\N{\c&H8000&}And it's a power struggle\Nfor the Iron Throne,{\c}

+Dialogue: 0,0:00:50.88,0:00:50.88,Default,,0,0,0,,\N{\fs20}왕국의 권력 정점이라고\N할 수 있는 자리에요{\fs}

+Dialogue: 0,0:00:50.88,0:00:53.13,Default,,0,0,0,,\Nwhich is the seat of power\Nin this kingdom.

+Dialogue: 0,0:00:53.25,0:00:53.25,Default,,0,0,0,,\N전운이 감도네, 네드

+Dialogue: 0,0:00:53.25,0:00:55.07,Default,,0,0,0,,\NThere's a war coming, Ned.

+Dialogue: 0,0:00:56.01,0:00:56.01,Default,,0,0,0,, \N언제 누구와 싸우게 될지는 몰라\N하지만 분명 전쟁이 일어날걸세

+Dialogue: 0,0:00:56.01,0:01:00.09,Default,,0,0,0,,\NI don't know when, I don't know who\Nwould be fighting, but it's coming.

+Dialogue: 0,0:01:01.10,0:01:01.10,Default,,0,0,0,,\N이야기의 핵심은 두 주요 가문의\N권력을 둘러싼 갈등입니다

+Dialogue: 0,0:01:01.10,0:01:07.04,Default,,0,0,0,,\N{\i1}At the core of it there's a conflict for\Npower between two great houses initially.{\i0}

+Dialogue: 0,0:01:07.16,0:01:07.16,Default,,0,0,0,,\N스타크 가문과 라니스터 가문이죠

+Dialogue: 0,0:01:07.16,0:01:10.04,Default,,0,0,0,,\NHouse Stark and House Lannister.

+Dialogue: 0,0:01:10.16,0:01:10.16,Default,,0,0,0,,\N그 외에 여러 가문이\N서로 경쟁합니다

+Dialogue: 0,0:01:10.16,0:01:13.25,Default,,0,0,0,,\NThe other major houses are\Nall contenders as well.

+Dialogue: 0,0:01:13.37,0:01:13.37,Default,,0,0,0,,\N흥미진진하게 정치적으로\N얽혀있는 상황이죠

+Dialogue: 0,0:01:13.37,0:01:16.11,Default,,0,0,0,,\NIt's a suitably complicated\Npolitical situation.

+Dialogue: 0,0:01:16.34,0:01:16.34,Default,,0,0,0,,\N옛 말에 "권력은 부패한다"라죠

+Dialogue: 0,0:01:16.34,0:01:18.80,Default,,0,0,0,,\NThe old truth "the power corrupts",\NI think

+Dialogue: 0,0:01:18.92,0:01:18.92,Default,,0,0,0,,\N옳은 말입니다\N이 작품에서도 드러나죠

+Dialogue: 0,0:01:18.92,0:01:21.66,Default,,0,0,0,,\Nit's very valid and it\Nshows in this series.

+Dialogue: 0,0:01:21.78,0:01:21.78,Default,,0,0,0,,\N권력을 얻은 등장인물들이\N어떻게 변해가는지 보시게 될겁니다

+Dialogue: 0,0:01:21.78,0:01:24.59,Default,,0,0,0,,\NYou see characters come into\Npower and how they change.

+Dialogue: 0,0:01:24.71,0:01:24.71,Default,,0,0,0,,\N그렇게 등장인물들은\N대의를 보는 시야를 잃어가고

+Dialogue: 0,0:01:24.71,0:01:28.86,Default,,0,0,0,,\NIn a way it's about how people\Nforget to see the bigger picture,

+Dialogue: 0,0:01:28.98,0:01:28.98,Default,,0,0,0,,\N사리사욕을 쫒는데 정신이 팔려\N공공의 위협을 외면하게 되죠

+Dialogue: 0,0:01:28.98,0:01:33.89,Default,,0,0,0,,\N{\u1}this common threat, that everybody\Nkind of ignores, because they're too busy{\u0}

+Dialogue: 0,0:01:34.01,0:01:35.24,Default,,0,0,0,,\Npursuing their own interests.

+Dialogue: 0,0:01:35.36,0:01:35.36,Default,,0,0,0,,\N한편, 일곱 왕국의 밖에서는\N두 개의 거대한 위협이 부상합니다

+Dialogue: 0,0:01:35.36,0:01:40.23,Default,,0,0,0,,\N{\fs30}And meanwhile, outside the Seven\NKingdoms, two great threats arising.{\fs}

+Dialogue: 0,0:01:40.35,0:01:40.35,Default,,0,0,0,,\N하나는 바다 건너\N타가리엔 일족 유배자들이며

+Dialogue: 0,0:01:40.35,0:01:44.06,Default,,0,0,0,,\NOne across the sea, in the exile\NTargaryen siblings,

+Dialogue: 0,0:01:44.17,0:01:44.17,Default,,0,0,0,,\N또 하나는 일곱 왕국의\N국경이 자리잡은

+Dialogue: 0,0:01:44.17,0:01:47.39,Default,,0,0,0,,\Nand another far to the north,\Nbeyond the Wall,

+Dialogue: 0,0:01:47.51,0:01:47.51,Default,,0,0,0,,\N저 멀리 북쪽 장벽 너머\N초자연적인 존재들이 도사리는

+Dialogue: 0,0:01:47.51,0:01:50.07,Default,,0,0,0,,\Nwhich is the boundary\Nof the Seven Kingdoms,

+Dialogue: 0,0:01:50.18,0:01:50.18,Default,,0,0,0,,\N춥디 추운 땅에서 일어납니다

+Dialogue: 0,0:01:50.18,0:01:55.28,Default,,0,0,0,,\Nin lands of perpetual ice and cold,\Nwhere supernatural threat is stirring.

+Dialogue: 0,0:01:56.45,0:01:56.45,Default,,0,0,0,,\N기존의 어떤 작품과도 다릅니다

+Dialogue: 0,0:01:56.45,0:02:00.45,Default,,0,0,0,,\NIt's very different from\Nanything that's been done.

+Dialogue: 0,0:02:00.58,0:02:00.58,Default,,0,0,0,,\N이 작품처럼 어두운 판타지는\N없을거라고 봅니다

+Dialogue: 0,0:02:00.58,0:02:03.97,Default,,0,0,0,,\NI can't think of another fantasy\Nwhich is as dark as this one is,

+Dialogue: 0,0:02:04.09,0:02:04.09,Default,,0,0,0,,\N아주 적나라하고 현실적이죠

+Dialogue: 0,0:02:04.09,0:02:05.65,Default,,0,0,0,,\Nwhich is as gritty and as real.

+Dialogue: 0,0:02:05.77,0:02:05.77,Default,,0,0,0,,\N등장인물 하나 하나가\N매우 심도깊습니다

+Dialogue: 0,0:02:05.77,0:02:08.18,Default,,0,0,0,,\NEvery single character\Nis incredibly complex.

+Dialogue: 0,0:02:08.30,0:02:08.30,Default,,0,0,0,,\N보여주는 모습만으로\N생기는 고정관념으로는

+Dialogue: 0,0:02:08.30,0:02:09.33,Default,,0,0,0,,\NYou think you know them.

+Dialogue: 0,0:02:09.45,0:02:09.45,Default,,0,0,0,,\N등장인물을 제대로 이해했다고\N할 수 없습니다

+Dialogue: 0,0:02:09.45,0:02:14.14,Default,,0,0,0,,\NYou think you got them pegged as what\Nthey seemingly are but they really aren't.

+Dialogue: 0,0:02:14.25,0:02:14.25,Default,,0,0,0,,\N신하 중에서 전적으로\N신뢰할 수 있는 이가 있습니까?

+Dialogue: 0,0:02:14.25,0:02:17.66,Default,,0,0,0,,\NIs there someone in your service\Nwhom you trust completely?

+Dialogue: 0,0:02:17.78,0:02:17.78,Default,,0,0,0,,\N있네

+Dialogue: 0,0:02:17.78,0:02:18.84,Default,,0,0,0,,\NYes.

+Dialogue: 0,0:02:18.96,0:02:18.96,Default,,0,0,0,,\N"없다"라고 대답하셔야\N현명하신겁니다, 전하

+Dialogue: 0,0:02:18.96,0:02:21.27,Default,,0,0,0,,\NThe wiser answer was "no", my lord.

+Dialogue: 0,0:02:21.53,0:02:21.53,Default,,0,0,0,,\N이분법적인 선악의\N이야기가 아닙니다

+Dialogue: 0,0:02:21.53,0:02:23.63,Default,,0,0,0,,\NIt's not a good guys/bad guys story.

+Dialogue: 0,0:02:23.75,0:02:23.75,Default,,0,0,0,,\N모두가 나름의 가치를\N추구하고

+Dialogue: 0,0:02:23.75,0:02:26.40,Default,,0,0,0,,\NIt's a story where everybody is\Npursuing their own interests

+Dialogue: 0,0:02:26.52,0:02:26.52,Default,,0,0,0,,\N나름의 규칙을 따르면서

+Dialogue: 0,0:02:26.52,0:02:29.67,Default,,0,0,0,,\Nand everybody's following their own\Ncode and it's about those interests

+Dialogue: 0,0:02:29.79,0:02:29.79,Default,,0,0,0,,\N서로의 가치와 윤리가\N충돌하게 되는 이야기입니다

+Dialogue: 0,0:02:29.79,0:02:33.35,Default,,0,0,0,,\Nand those ethics coming into\Nconflict with each other.

+Dialogue: 0,0:02:33.47,0:02:33.47,Default,,0,0,0,,\N영웅이 악당을 물리치는 이야기보다

+Dialogue: 0,0:02:33.47,0:02:37.58,Default,,0,0,0,,\NAnd it provides a much richer story\Nthan the guys in white

+Dialogue: 0,0:02:38.58,0:02:38.58,Default,,0,0,0,,\Nby Psyence Fictionist\Npsyencefictionist@gmail.com

+Dialogue: 0,0:02:38.58,0:02:39.58,Default,,0,0,0,,\NSync by: honeybunny and Kerensky\Nwww.Addic7ed.com

diff --git a/tests/ref/fate/sub-scc b/tests/ref/fate/sub-scc
new file mode 100644
index 0000000000..5c3e1880af
--- /dev/null
+++ b/tests/ref/fate/sub-scc
@@ -0,0 +1,104 @@
+[Script Info]
+; Script generated by FFmpeg/Lavc
+ScriptType: v4.00+
+PlayResX: 384
+PlayResY: 288
+
+[V4+ Styles]
+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
+Style: Default,Monospace,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,3,1,0,2,10,10,10,0
+
+[Events]
+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
+Dialogue: 0,0:00:-2.-47,0:00:00.70,Default,,0,0,0,,{\an7}{\pos(76,228)}WE HAVE FOUND A WITCH !\N{\an7}{\pos(76,243)}MAY WE BURN HER ?
+Dialogue: 0,0:00:00.69,0:00:03.29,Default,,0,0,0,,{\an7}{\pos(115,228)}[ Crowd ]\N{\an7}{\pos(115,243)}BURN HER !  BURN HER !
+Dialogue: 0,0:00:03.30,0:00:07.07,Default,,0,0,0,,{\an7}{\pos(38,197)}HOW DO YOU KNOW\N{\an7}{\pos(38,213)}SHE IS A WITCH ?\N{\an7}{\pos(153,243)}SHE LOOKS LIKE ONE !
+Dialogue: 0,0:00:07.07,0:00:09.27,Default,,0,0,0,,{\an7}{\pos(192,228)}[ Shouting\N{\an7}{\pos(192,243)}\h\hAffirmations ]
+Dialogue: 0,0:00:09.26,0:00:11.06,Default,,0,0,0,,{\an7}{\pos(38,243)}BRING HER FORWARD.
+Dialogue: 0,0:00:11.07,0:00:14.27,Default,,0,0,0,,{\an7}{\pos(115,228)}I’M NOT A WITCH.\N{\an7}{\pos(115,243)}\hI’M{\i1} NOT{\i0} A WITCH.
+Dialogue: 0,0:00:14.26,0:00:16.03,Default,,0,0,0,,{\an7}{\pos(38,228)}BUT YOU ARE DRESSED\N{\an7}{\pos(38,243)}AS ONE.
+Dialogue: 0,0:00:16.03,0:00:19.03,Default,,0,0,0,,{\an7}{\pos(76,197)}THEY DRESSED ME UP\N{\an7}{\pos(76,213)}LIKE THIS.\N{\an7}{\pos(76,243)}\h\h\h\h\h\h\h\hNO !  WE DIDN’T !
+Dialogue: 0,0:00:19.03,0:00:22.95,Default,,0,0,0,,{\an7}{\pos(115,228)}AND THIS ISN’T MY NOSE.\N{\an7}{\pos(115,243)}IT’S A FALSE ONE.
+Dialogue: 0,0:00:25.30,0:00:28.43,Default,,0,0,0,,{\an7}{\pos(76,197)}WELL ?\N{\an7}{\pos(76,228)}\h\h\h\h\h\h\h\hWELL, WE DID\N{\an7}{\pos(76,243)}\h\h\h\h\h\h\h\hDO THE NOSE.
+Dialogue: 0,0:00:28.43,0:00:30.07,Default,,0,0,0,,{\an7}{\pos(76,197)}THE NOSE ?\N{\an7}{\pos(76,243)}\h\h\h\h\h\h\h\hAND THE HAT.
+Dialogue: 0,0:00:30.07,0:00:35.50,Default,,0,0,0,,{\an7}{\pos(115,197)}BUT SHE IS A WITCH.\N{\an7}{\pos(115,228)}YEAH !  BURN HER !\N{\an7}{\pos(115,243)}BURN HER !  BURN HER !
+Dialogue: 0,0:00:35.50,0:00:38.47,Default,,0,0,0,,{\an7}{\pos(76,213)}- DID YOU DRESS HER UP\N{\an7}{\pos(76,228)}\h\hLIKE THIS ?\N{\an7}{\pos(76,243)}- NO !
+Dialogue: 0,0:00:38.46,0:00:39.86,Default,,0,0,0,,{\an7}{\pos(192,197)}\h\h\h\h\h\h\h\hNO !\N{\an7}{\pos(192,213)}NO !\N{\an7}{\pos(192,243)}\h\h\h\hNO !
+Dialogue: 0,0:00:39.86,0:00:41.63,Default,,0,0,0,,{\an7}{\pos(153,228)}YES.  YES.\N{\an7}{\pos(153,243)}YEAH, A BIT.
+Dialogue: 0,0:00:41.63,0:00:44.83,Default,,0,0,0,,{\an7}{\pos(153,197)}\h\h\h\h\h\h\h\hA BIT.\N{\an7}{\pos(153,213)}\h\h\h\h\h\h\h\h\hA BIT.\N{\an7}{\pos(153,243)}SHE HAS GOT A WART.
+Dialogue: 0,0:00:44.83,0:00:47.04,Default,,0,0,0,,{\an7}{\pos(38,228)}WHAT MAKES YOU THINK\N{\an7}{\pos(38,243)}SHE IS A WITCH ?
+Dialogue: 0,0:00:47.03,0:00:49.53,Default,,0,0,0,,{\an7}{\pos(115,228)}WELL, SHE TURNED ME\N{\an7}{\pos(115,243)}INTO A NEWT !
+Dialogue: 0,0:00:49.53,0:00:52.30,Default,,0,0,0,,{\an7}{\pos(76,243)}A NEWT ?
+Dialogue: 0,0:00:55.46,0:00:57.39,Default,,0,0,0,,{\an7}{\pos(115,243)}I GOT BETTER.
+Dialogue: 0,0:00:57.40,0:00:58.90,Default,,0,0,0,,{\an7}{\pos(153,243)}BURN HER ANYWAY !
+Dialogue: 0,0:00:58.89,0:01:01.03,Default,,0,0,0,,{\an7}{\pos(76,197)}BURN HER !\N{\an7}{\pos(76,228)}\h\h\h\h\h\h\h\hBURN HER !\N{\an7}{\pos(76,243)}\h\h\h\h\h\h\h\hCRACKLE, CRACKLE !
+Dialogue: 0,0:01:01.03,0:01:04.00,Default,,0,0,0,,{\an7}{\pos(38,197)}\h\h\h\h[ Shouting\N{\an7}{\pos(38,213)}\h\h\h\h\h\hContinues ]\N{\an7}{\pos(38,243)}QUIET.  QUIET.
+Dialogue: 0,0:01:04.00,0:01:05.43,Default,,0,0,0,,{\an7}{\pos(38,228)}QUIET !\N{\an7}{\pos(48,243)}QUIET !
+Dialogue: 0,0:01:05.43,0:01:09.13,Default,,0,0,0,,{\an7}{\pos(38,228)}THERE ARE WAYS OF TELLING\N{\an7}{\pos(38,243)}WHETHER SHE IS A WITCH.
+Dialogue: 0,0:01:09.13,0:01:10.96,Default,,0,0,0,,{\an7}{\pos(38,228)}ARE THERE ?\N{\an7}{\pos(38,243)}WHAT ARE THEY ?
+Dialogue: 0,0:01:10.96,0:01:13.30,Default,,0,0,0,,{\an7}{\pos(38,197)}TELL US !\N{\an7}{\pos(153,213)}TELL US !\N{\an7}{\pos(153,243)}\h\h\h\hDO THEY HURT ?
+Dialogue: 0,0:01:13.30,0:01:16.23,Default,,0,0,0,,{\an7}{\pos(38,228)}TELL ME,\N{\an7}{\pos(38,243)}WHAT DO YOU DO WITH WITCHES ?
+Dialogue: 0,0:01:16.23,0:01:19.20,Default,,0,0,0,,{\an7}{\pos(76,213)}\h\h\h\h\h\h\h\h\h\h\h\hBURN THEM !\N{\an7}{\pos(76,228)}\h\h\h\h\h\h\h\h\h\h\h\h\hBURN THEM UP !\N{\an7}{\pos(76,243)}BURN !
+Dialogue: 0,0:01:19.20,0:01:22.33,Default,,0,0,0,,{\an7}{\pos(38,228)}AND WHAT DO YOU BURN,\N{\an7}{\pos(38,243)}APART FROM WITCHES ?
+Dialogue: 0,0:01:22.33,0:01:24.59,Default,,0,0,0,,{\an7}{\pos(38,197)}MORE WITCHES !\N{\an7}{\pos(153,243)}SHH !
+Dialogue: 0,0:01:24.59,0:01:25.62,Default,,0,0,0,,{\an7}{\pos(192,243)}WOOD !
+Dialogue: 0,0:01:25.63,0:01:29.33,Default,,0,0,0,,{\an7}{\pos(38,228)}SO,\N{\an7}{\pos(38,243)}WHY DO WITCHES BURN ?
+Dialogue: 0,0:01:32.69,0:01:35.03,Default,,0,0,0,,{\an7}{\pos(192,243)}B--
+Dialogue: 0,0:01:39.13,0:01:42.46,Default,,0,0,0,,{\an7}{\pos(76,213)}- ’CAUSE THEY’RE\N{\an7}{\pos(76,228)}\h\hMADE OF W-- WOOD ?\N{\an7}{\pos(76,243)}- GOOD !
+Dialogue: 0,0:01:42.46,0:01:44.00,Default,,0,0,0,,{\an7}{\pos(192,213)}OH, YEAH.\N{\an7}{\pos(192,243)}[ Murmuring ]
+Dialogue: 0,0:01:44.00,0:01:48.50,Default,,0,0,0,,{\an7}{\pos(38,213)}SO, HOW DO WE TELL\N{\an7}{\pos(38,228)}WHETHER SHE\N{\an7}{\pos(38,243)}IS MADE OF WOOD ?
+Dialogue: 0,0:01:48.50,0:01:50.10,Default,,0,0,0,,{\an7}{\pos(153,228)}BUILD A BRIDGE\N{\an7}{\pos(153,243)}OUT OF HER !
+Dialogue: 0,0:01:50.10,0:01:54.13,Default,,0,0,0,,{\an7}{\pos(38,228)}AH, BUT CAN YOU NOT ALSO\N{\an7}{\pos(38,243)}MAKE BRIDGES OUT OF STONE ?
+Dialogue: 0,0:01:54.13,0:01:57.26,Default,,0,0,0,,{\an7}{\pos(76,197)}OH, YEAH.\N{\an7}{\pos(76,228)}\h\h\h\h\h\h\h\hOH, YEAH.\N{\an7}{\pos(76,243)}\h\h\h\h\h\h\h\hTRUE.  UH--
+Dialogue: 0,0:01:57.26,0:01:59.72,Default,,0,0,0,,{\an7}{\pos(38,228)}{\i1}DOES WOOD\N{\an7}{\pos(38,243)}SINK IN WATER ?
+Dialogue: 0,0:01:59.73,0:02:02.17,Default,,0,0,0,,{\an7}{\pos(76,197)}NO, NO.\N{\an7}{\pos(76,228)}\h\h\h\h\h\h\h\hNO, IT FLOATS !\N{\an7}{\pos(76,243)}\h\h\h\h\h\h\h\hIT FLOATS !
+Dialogue: 0,0:02:02.17,0:02:07.04,Default,,0,0,0,,{\an7}{\pos(76,197)}THROW HER INTO THE POND !\N{\an7}{\pos(76,243)}\h\h\h\h\h\h\h\h[ All Shouting ]
+Dialogue: 0,0:02:07.36,0:02:10.49,Default,,0,0,0,,{\an7}{\pos(38,228)}WHAT ALSO FLOATS\N{\an7}{\pos(38,243)}IN WATER ?
+Dialogue: 0,0:02:10.50,0:02:12.14,Default,,0,0,0,,{\an7}{\pos(76,197)}BREAD !\N{\an7}{\pos(76,243)}\h\h\h\h\h\h\h\h\h\h\h\hAPPLES !
+Dialogue: 0,0:02:12.13,0:02:13.23,Default,,0,0,0,,{\an7}{\pos(76,243)}UH, VERY SMALL ROCKS.
+Dialogue: 0,0:02:13.23,0:02:16.49,Default,,0,0,0,,{\an7}{\pos(86,228)}{\i1}- CIDER !  CHERRIES !\N{\an7}{\pos(86,243)}{\i0}- UH, GRA-- GRAVY !  MUD !
+Dialogue: 0,0:02:16.50,0:02:18.76,Default,,0,0,0,,{\an7}{\pos(86,228)}- CHURCHES !  CHURCHES !\N{\an7}{\pos(86,243)}{\i1}- LEAD !  LEAD !
+Dialogue: 0,0:02:18.76,0:02:22.30,Default,,0,0,0,,{\an7}{\pos(76,228)}- A DUCK !\N{\an7}{\pos(76,243)}- [ Crowd Gasps, Murmurs ]
+Dialogue: 0,0:02:22.30,0:02:24.63,Default,,0,0,0,,{\an7}{\pos(115,243)}EXACTLY !
+Dialogue: 0,0:02:25.36,0:02:27.59,Default,,0,0,0,,{\an7}{\pos(76,243)}SO, LOGICALLY--
+Dialogue: 0,0:02:27.59,0:02:29.76,Default,,0,0,0,,{\an7}{\pos(192,243)}IF... SHE...
+Dialogue: 0,0:02:29.76,0:02:33.56,Default,,0,0,0,,{\an7}{\pos(192,213)}WEIGHS...\N{\an7}{\pos(192,228)}THE SAME\N{\an7}{\pos(192,243)}AS A DUCK...
+Dialogue: 0,0:02:34.40,0:02:36.50,Default,,0,0,0,,{\an7}{\pos(153,243)}SHE’S MADE OF WOOD !
+Dialogue: 0,0:02:36.50,0:02:38.47,Default,,0,0,0,,{\an7}{\pos(38,243)}AND THEREFORE ?
+Dialogue: 0,0:02:39.50,0:02:42.17,Default,,0,0,0,,{\an7}{\pos(38,228)}- A WITCH !\N{\an7}{\pos(38,243)}{\i1}- [ All ]  A WITCH !  A WITCH !
+Dialogue: 0,0:02:42.17,0:02:44.07,Default,,0,0,0,,{\an7}{\pos(76,243)}[ Shouting Continues ]
+Dialogue: 0,0:02:44.07,0:02:45.76,Default,,0,0,0,,{\an7}{\pos(192,213)}HERE’S A DUCK !\N{\an7}{\pos(192,243)}[ Quacking ]
+Dialogue: 0,0:02:45.76,0:02:49.79,Default,,0,0,0,,{\an7}{\pos(76,213)}VERY GOOD.\N{\an7}{\pos(76,228)}WE SHALL USE\N{\an7}{\pos(76,243)}MY LARGEST SCALES.
+Dialogue: 0,0:02:49.79,0:02:52.72,Default,,0,0,0,,{\an7}{\pos(76,243)}[ Shouting Continues ]
+Dialogue: 0,0:02:52.73,0:02:55.17,Default,,0,0,0,,{\an7}{\pos(115,228)}BURN !\N{\an7}{\pos(115,243)}\hBURN THE WITCH !
+Dialogue: 0,0:02:55.17,0:02:57.63,Default,,0,0,0,,{\an7}{\pos(153,228)}BURN HER !\N{\an7}{\pos(153,243)}\hBURN THE WITCH !
+Dialogue: 0,0:02:57.63,0:03:01.63,Default,,0,0,0,,{\an7}{\pos(115,228)}BURN HER !\N{\an7}{\pos(115,243)}\hBURN HER !  BURN HER !
+Dialogue: 0,0:03:01.63,0:03:04.14,Default,,0,0,0,,{\an7}{\pos(115,228)}BURN HER !\N{\an7}{\pos(115,243)}\hBURN HER !
+Dialogue: 0,0:03:04.13,0:03:06.59,Default,,0,0,0,,{\an7}{\pos(230,228)}BURN HER !\N{\an7}{\pos(230,243)}\hBURN HER !
+Dialogue: 0,0:03:06.59,0:03:08.00,Default,,0,0,0,,{\an7}{\pos(201,243)}{\i1}[ Man Grunts ]
+Dialogue: 0,0:03:08.00,0:03:14.30,Default,,0,0,0,,{\an7}{\pos(38,228)}{\i1}RIGHT !\N{\an7}{\pos(38,243)}REMOVE THE SUPPORTS !
+Dialogue: 0,0:03:17.07,0:03:19.17,Default,,0,0,0,,{\an7}{\pos(38,197)}A WITCH !\N{\an7}{\pos(230,243)}A WITCH !
+Dialogue: 0,0:03:19.17,0:03:20.04,Default,,0,0,0,,{\an7}{\pos(76,243)}IT’S A FAIR COP.
+Dialogue: 0,0:03:20.03,0:03:25.29,Default,,0,0,0,,{\an7}{\pos(38,213)}- BURN HER !\N{\an7}{\pos(38,228)}- [ Crowd Continues Shouting ]\N{\an7}{\pos(57,243)}BURN HER !  BURN HER !
+Dialogue: 0,0:03:28.86,0:03:32.73,Default,,0,0,0,,{\an7}{\pos(38,213)}WHO ARE YOU,\N{\an7}{\pos(38,228)}WHO ARE SO WISE\N{\an7}{\pos(38,243)}IN THE WAYS OF SCIENCE ?
+Dialogue: 0,0:03:32.73,0:03:35.76,Default,,0,0,0,,{\an7}{\pos(153,228)}I AM ARTHUR,\N{\an7}{\pos(153,243)}KING OF THE BRITONS.
+Dialogue: 0,0:03:35.76,0:03:36.96,Default,,0,0,0,,{\an7}{\pos(76,243)}MY LIEGE !
+Dialogue: 0,0:03:36.96,0:03:40.37,Default,,0,0,0,,{\an7}{\pos(115,213)}GOOD SIR KNIGHT,\N{\an7}{\pos(115,228)}WILL YOU COME WITH ME\N{\an7}{\pos(115,243)}TO CAMELOT...
+Dialogue: 0,0:03:40.36,0:03:43.39,Default,,0,0,0,,{\an7}{\pos(153,228)}AND JOIN US\N{\an7}{\pos(153,243)}AT THE ROUND TABLE ?
+Dialogue: 0,0:03:43.40,0:03:45.53,Default,,0,0,0,,{\an7}{\pos(38,228)}MY LIEGE,\N{\an7}{\pos(38,243)}I WOULD BE HONORED !
+Dialogue: 0,0:03:45.53,0:03:48.70,Default,,0,0,0,,{\an7}{\pos(38,197)}\h\h\h\h\h\h\h\h\h\h\h\hWHAT IS YOUR NAME ?\N{\an7}{\pos(38,243)}BEDEVERE, MY LIEGE.
+Dialogue: 0,0:03:48.69,0:03:52.49,Default,,0,0,0,,{\an7}{\pos(163,228)}THEN I DUB YOU\N{\an7}{\pos(163,243)}{\i1}SIR{\i0} BEDEVERE,
+Dialogue: 0,0:03:52.50,0:03:54.86,Default,,0,0,0,,{\an7}{\pos(153,228)}KNIGHT\N{\an7}{\pos(153,243)}OF THE ROUND TABLE.
+Dialogue: 0,0:03:54.86,0:03:56.76,Default,,0,0,0,,{\an7}{\pos(38,228)}{\i1}[ Narrator ]\N{\an7}{\pos(38,243)}THE WISE SIR BEDEVERE...
+Dialogue: 0,0:03:56.76,0:03:59.69,Default,,0,0,0,,{\an7}{\pos(38,228)}{\i1}WAS THE FIRST TO JOIN\N{\an7}{\pos(38,243)}KING ARTHUR’S KNIGHTS.
+Dialogue: 0,0:03:59.69,0:04:03.26,Default,,0,0,0,,{\an7}{\pos(38,228)}{\i1}BUT OTHER ILLUSTRIOUS NAMES\N{\an7}{\pos(38,243)}WERE SOON TO FOLLOW:
+Dialogue: 0,0:04:03.26,0:04:06.03,Default,,0,0,0,,{\an7}{\pos(38,243)}{\i1}SIR LAUNCELOT THE BRAVE;
+Dialogue: 0,0:04:06.03,0:04:07.95,Default,,0,0,0,,{\an7}{\pos(38,243)}{\i1}SIR GALAHAD THE PURE;
+Dialogue: 0,0:04:07.96,0:04:11.27,Default,,0,0,0,,{\an7}{\pos(38,213)}{\i1}AND SIR ROBIN\N{\an7}{\pos(38,228)}THE NOT-QUITE-SO-BRAVE-\N{\an7}{\pos(38,243)}AS-SIR-LAUNCELOT,
+Dialogue: 0,0:04:11.26,0:04:13.92,Default,,0,0,0,,{\an7}{\pos(38,228)}{\i1}WHO HAD NEARLY FOUGHT\N{\an7}{\pos(38,243)}THE DRAGON OF ANGNOR,
+Dialogue: 0,0:04:13.92,0:04:16.89,Default,,0,0,0,,{\an7}{\pos(38,213)}{\i1}WHO HAD NEARLY\N{\an7}{\pos(38,228)}STOOD UP TO THE VICIOUS\N{\an7}{\pos(38,243)}CHICKEN OF BRISTOL...
+Dialogue: 0,0:04:16.89,0:04:20.73,Default,,0,0,0,,{\an7}{\pos(38,213)}{\i1}AND WHO HAD\N{\an7}{\pos(38,228)}PERSONALLY WET HIMSELF\N{\an7}{\pos(38,243)}AT THE BATTLE OF BADON HILL;
+Dialogue: 0,0:04:20.73,0:04:25.43,Default,,0,0,0,,{\an7}{\pos(38,228)}{\i1}AND THE APTLY NAMED\N{\an7}{\pos(38,243)}SIR NOT-APPEARING-IN-THIS-FILM.
+Dialogue: 0,0:04:25.59,0:04:29.03,Default,,0,0,0,,{\an7}{\pos(38,228)}{\i1}TOGETHER THEY FORMED A BAND\N{\an7}{\pos(38,243)}WHOSE NAMES AND DEEDS...
+Dialogue: 0,0:04:29.03,0:04:31.72,Default,,0,0,0,,{\an7}{\pos(38,228)}{\i1}WERE TO BE RETOLD\N{\an7}{\pos(38,243)}THROUGHOUT THE CENTURIES.
+Dialogue: 0,0:04:31.73,0:04:33.86,Default,,0,0,0,,{\an7}{\pos(38,228)}{\i1}THE KNIGHTS\N{\an7}{\pos(38,243)}OF THE ROUND TABLE.
diff --git a/tests/ref/fate/sub-srt b/tests/ref/fate/sub-srt
index 5a1466437e..fd60290929 100644
--- a/tests/ref/fate/sub-srt
+++ b/tests/ref/fate/sub-srt
@@ -1 +1,49 @@
-03b2a3f7e7e83624c8e4d1b5569df758
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0,0,0,,Don't show this text it may be used to insert hidden data

+Dialogue: 0,0:00:01.50,0:00:04.50,Default,,0,0,0,,SubRip subtitles capability tester 1.3o by ale5000\N{\b1}{\i1}Use VLC 1.1 or higher as reference for most things and MPC Home Cinema for others{\i0}{\b0}\N{\c&HFF0000&}This text should be blue{\c}\N{\c&HFF&}This text should be red{\c}\N{\c&H0&}This text should be black{\c}\N{\fnWebdings}If you see this with the normal font, the player don't (fully) support font face{\fn}

+Dialogue: 0,0:00:04.50,0:00:04.50,Default,,0,0,0,,Hidden

+Dialogue: 0,0:00:04.50,0:00:07.50,Default,,0,0,0,,{\fs8}This text should be small{\fs}\NThis text should be normal\N{\fs35}This text should be big{\fs}

+Dialogue: 0,0:00:07.50,0:00:11.50,Default,,0,0,0,,This should be an E with an accent: È\N日本語\N{\fs30}{\b1}{\i1}{\u1}This text should be bold, italics and underline{\u0}{\i0}{\b0}{\fs}\N{\fs9}{\c&HFF00&}This text should be small and green{\fs}{\c}\N{\c&HFF&}{\fs9}This text should be small and red{\fs}{\c}\N{\c&H2A2AA5&}{\fs24}This text should be big and brown{\fs}{\c}

+Dialogue: 0,0:00:11.50,0:00:14.50,Default,,0,0,0,,{\b1}This line should be bold{\b0}\N{\i1}This line should be italics{\i0}\N{\u1}This line should be underline{\u0}\N{\s1}This line should be strikethrough{\s0}\N{\u1}Both lines\Nshould be underline{\u0}

+Dialogue: 0,0:00:14.50,0:00:17.50,Default,,0,0,0,,>\NIt would be a good thing to\Nhide invalid html tags that are closed and show the text in them\Nbut show un-closed invalid html tags\NShow not opened tags\N<

+Dialogue: 0,0:00:17.50,0:00:20.50,Default,,0,0,0,,and also\Nhide invalid html tags with parameters that are closed and show the text in them\Nbut show un-closed invalid html tags\N{\u1}This text should be showed underlined without problems also: 2<3,5>1,4<6{\u0}\NThis shouldn't be underlined

+Dialogue: 0,0:00:20.50,0:00:21.50,Default,,0,0,0,,This text should be in the normal position...

+Dialogue: 0,0:00:21.50,0:00:22.50,Default,,0,0,0,,{\an5}{\pos(0,45)}This text should NOT be in the normal position

+Dialogue: 0,0:00:22.50,0:00:24.50,Default,,0,0,0,,Implementation is the same of the ASS tag\N{\an8}This text should be at the\Ntop and horizontally centered

+Dialogue: 0,0:00:22.50,0:00:24.50,Default,,0,0,0,,{\an5}This text should be at the\Nmiddle and horizontally centered

+Dialogue: 0,0:00:22.50,0:00:24.50,Default,,0,0,0,,{\an2}This text should be at the\Nbottom and horizontally centered

+Dialogue: 0,0:00:24.50,0:00:26.50,Default,,0,0,0,,This text should be at the\Ntop and horizontally at the left{\an7}

+Dialogue: 0,0:00:24.50,0:00:26.50,Default,,0,0,0,,{\an4}This text should be at the\Nmiddle and horizontally at the left\N(The second position must be ignored)

+Dialogue: 0,0:00:24.50,0:00:26.50,Default,,0,0,0,,{\an1}This text should be at the\Nbottom and horizontally at the left

+Dialogue: 0,0:00:26.50,0:00:28.50,Default,,0,0,0,,{\an9}This text should be at the\Ntop and horizontally at the right

+Dialogue: 0,0:00:26.50,0:00:28.50,Default,,0,0,0,,{\an6}This text should be at the\Nmiddle and horizontally at the right

+Dialogue: 0,0:00:26.50,0:00:28.50,Default,,0,0,0,,{\an3}This text should be at the\Nbottom and horizontally at the right

+Dialogue: 0,0:00:28.50,0:00:31.50,Default,,0,0,0,,{\c&HFF00&}{\fs6}This could be the {\fs35}m{\c&H0&}o{\c&HFF00&}st{\fs6} difficult thing to implement{\fs}{\c}

+Dialogue: 0,0:00:31.50,0:00:50.50,Default,,0,0,0,,First text

+Dialogue: 0,0:00:33.50,0:00:35.50,Default,,0,0,0,,Second, it shouldn't overlap first

+Dialogue: 0,0:00:35.50,0:00:37.50,Default,,0,0,0,,Third, it should replace second

+Dialogue: 0,0:00:36.50,0:00:50.50,Default,,0,0,0,,Fourth, it shouldn't overlap first and third

+Dialogue: 0,0:00:40.50,0:00:45.50,Default,,0,0,0,,Fifth, it should replace third

+Dialogue: 0,0:00:45.50,0:00:50.50,Default,,0,0,0,,Sixth, it shouldn't be\Nshowed overlapped

+Dialogue: 0,0:00:50.50,0:00:52.50,Default,,0,0,0,,TEXT 1 (bottom)

+Dialogue: 0,0:00:50.50,0:00:52.50,Default,,0,0,0,,text 2

+Dialogue: 0,0:00:52.50,0:00:54.50,Default,,0,0,0,,Hide these tags:\Nalso hide these tags:\Nbut show this: {normal text}

+Dialogue: 0,0:00:54.50,0:01:00.50,Default,,0,0,0,,{\an8}\N\ N is a forced line break\N\ h is a hard space\NNormal spaces at the start and at the end of the line are trimmed while hard spaces are not trimmed.\NThe\hline\hwill\hnever\hbreak\hautomatically\hright\hbefore\hor\hafter\ha\hhard\hspace.\h:-D

+Dialogue: 0,0:00:54.50,0:00:56.50,Default,,0,0,0,,{\an1}\N\h\h\h\h\hA (05 hard spaces followed by a letter)\NA (Normal  spaces followed by a letter)\NA (No hard spaces followed by a letter)

+Dialogue: 0,0:00:56.50,0:00:58.50,Default,,0,0,0,,\h\h\h\h\hA (05 hard spaces followed by a letter)\NA (Normal  spaces followed by a letter)\NA (No hard spaces followed by a letter)\NShow this: \TEST and this: \-)

+Dialogue: 0,0:00:58.50,0:01:00.50,Default,,0,0,0,,{\an3}\NA letter followed by 05 hard spaces: A\h\h\h\h\h\NA letter followed by normal  spaces: A\NA letter followed by no hard spaces: A\N05 hard  spaces between letters: A\h\h\h\h\hA\N5 normal spaces between letters: A     A\N\N^--Forced line break

+Dialogue: 0,0:01:00.50,0:01:02.50,Default,,0,0,0,,{\s1}Both line should be strikethrough,\Nyes.{\s0}\NCorrectly closed tags\Nshould be hidden.

+Dialogue: 0,0:01:02.50,0:01:04.50,Default,,0,0,0,,It shouldn't be strikethrough,\Nnot opened tag showed as text.{\s0}\NNot opened tag showed as text.

+Dialogue: 0,0:01:04.50,0:01:06.50,Default,,0,0,0,,{\s1}Three lines should be strikethrough,\Nyes.\NNot closed tags showed as text

+Dialogue: 0,0:01:06.50,0:01:08.50,Default,,0,0,0,,{\s1}Both line should be strikethrough but\Nthe wrong closing tag should be showed{\b0}

diff --git a/tests/ref/fate/sub-srt-badsyntax b/tests/ref/fate/sub-srt-badsyntax
new file mode 100644
index 0000000000..1561d3f2f2
--- /dev/null
+++ b/tests/ref/fate/sub-srt-badsyntax
@@ -0,0 +1,22 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:01.00,0:00:02.31,Default,,0,0,0,,<<<<<< Antes <<<<<<\NEla é hum...

+Dialogue: 0,0:01:10.00,0:01:14.50,Default,,0,0,0,,>>> RebelSubTeam <<<

+Dialogue: 0,0:02:37.75,0:02:43.70,Default,,0,0,0,,{\b1}~ASUKO MARCH!~\N>>:<<\Ntranslation by: cangii\NRetiming by: furransu{\b0}

+Dialogue: 0,0:03:38.32,0:03:42.78,Default,,0,0,0,,<<THE HIGH ROLLERS>>\N<<Grandes Jogadores>>

+Dialogue: 0,0:04:50.43,0:05:01.03,Default,,0,0,0,,<<flash gordon\Npisode 4\Nsaison 1>\Nwww.SeriesSub.com>

+Dialogue: 0,0:20:31.85,0:20:56.84,Default,,0,0,0,,{\c&HFFFF&}\N<<<<www.egfire.com>>>>{\c}

+Dialogue: 0,0:37:59.69,0:38:01.59,Default,,0,0,0,,mint asztalt foglaltatni\Na <<>Le Cirque-ben.

+Dialogue: 0,0:53:43.78,0:53:45.94,Default,,0,0,0,,<<That's OK, >> - he calmed himself.

+Dialogue: 0,0:53:46.22,0:53:49.09,Default,,0,0,0,,<<lt's not a long way to the hotel,\Nthe hotel is within easy reach.

+Dialogue: 0,2:11:00.74,2:11:05.54,Default,,0,0,0,,{\b1}<<< ÓÍÀÊÑ ÒÈÉÌ < 2015 > UNACS TEAM >>>{\b0}

diff --git a/tests/ref/fate/sub-srt-empty-events b/tests/ref/fate/sub-srt-empty-events
new file mode 100644
index 0000000000..11af2da955
--- /dev/null
+++ b/tests/ref/fate/sub-srt-empty-events
@@ -0,0 +1,24 @@
+1
+00:00:51,940 --> 00:00:53,320
+我们期待一些事
+
+2
+00:00:53,340 --> 00:00:56,020
+比从前更好的事
+
+3
+00:00:56,140 --> 00:00:58,920
+我们期待的更多
+
+4
+00:00:59,540 --> 00:01:02,020
+你真以为藏到壁画后面
+
+5
+02:09:09,350 --> 02:09:10,850
+就失去你
+
+6
+02:11:34,350 --> 02:11:37,850
+（怀念我们的朋友“面具”小查尔斯·刘易斯）
+
diff --git a/tests/ref/fate/sub-srt-madness-timeshift b/tests/ref/fate/sub-srt-madness-timeshift
new file mode 100644
index 0000000000..13a308594c
--- /dev/null
+++ b/tests/ref/fate/sub-srt-madness-timeshift
@@ -0,0 +1,36 @@
+1
+00:00:04,251 --> 00:00:05,362
+okay, let's make things easy
+
+2
+00:00:05,160 --> 00:00:05,263
+31 i'm a number but the only payload so please keep me :)
+
+3
+00:00:06,473 --> 00:00:07,584
+hello
+5
+don't forget me.
+
+4
+00:00:08,695 --> 00:00:09,806
+no.
+let's add some fun
+
+5
+00:00:10,917 --> 00:00:12,028
+let's do it in reverse bc wtf not
+45 yes this is a number but i'm actually part of the sub
+
+6
+00:00:12,028 --> 00:00:13,139
+1
+0
+next is negative, not a chapnum ;)
+-1
+
+7
+00:00:13,241 --> 00:00:13,263
+credits
+2015
+
diff --git a/tests/ref/fate/sub-srt-rrn-remux b/tests/ref/fate/sub-srt-rrn-remux
new file mode 100644
index 0000000000..1cb66d21bc
--- /dev/null
+++ b/tests/ref/fate/sub-srt-rrn-remux
@@ -0,0 +1,2113 @@
+1
+00:00:01,000 --> 00:00:04,074
+Subtitles downloaded from Podnapisi.NET
+
+2
+00:00:17,317 --> 00:00:19,551
+Wooldoor: who's it gonna
+be?! Who's it gonna be?!
+
+3
+00:00:19,552 --> 00:00:21,053
+Wheeeeee!
+
+4
+00:00:21,054 --> 00:00:23,122
+Wooldoor:
+the producers decided
+to surprise one of us
+
+5
+00:00:23,123 --> 00:00:24,990
+With a visit from
+a family member.
+
+6
+00:00:24,991 --> 00:00:26,191
+I hope it's someone
+from my family
+
+7
+00:00:26,192 --> 00:00:27,493
+Like flagfred cheesewheel,
+
+8
+00:00:27,494 --> 00:00:30,262
+Lintsue brickshade,
+or prom-queen dumpsterbaby.
+
+9
+00:00:30,263 --> 00:00:32,197
+[speaking japanese]
+
+10
+00:00:38,905 --> 00:00:41,407
+Look, everyone!
+Someone's coming!
+
+11
+00:00:41,408 --> 00:00:43,575
+Clara: the second I saw
+the horse and carriage,
+
+12
+00:00:43,576 --> 00:00:47,079
+I just knew it had
+to be someone from
+my kingdom.
+
+13
+00:00:47,080 --> 00:00:50,683
+But when I saw it was
+the short carriage,
+my heart sank.
+
+14
+00:00:50,684 --> 00:00:53,786
+Why?! Why did she
+have to come?!
+
+15
+00:00:55,221 --> 00:00:56,588
+Oh, fuck me.
+
+16
+00:00:56,589 --> 00:00:58,223
+[garbled speech]
+
+17
+00:00:58,224 --> 00:01:03,362
+Um, everyone, this is
+my special cousin bleh.
+
+18
+00:01:03,363 --> 00:01:04,530
+Foxxy: no one knew clara
+
+19
+00:01:04,531 --> 00:01:07,132
+Had a mentally-challenged
+cousin, but it was cool.
+
+20
+00:01:07,133 --> 00:01:10,269
+The foxxy five used to perform
+for special needs kids,
+
+21
+00:01:10,270 --> 00:01:14,306
+And those people got
+hearts as big as they
+oversized foreheads.
+
+22
+00:01:14,307 --> 00:01:18,610
+<i>"I am sam is a well-written
+and exceptionally well-acted
+tearjerker,"</i>
+
+23
+00:01:18,611 --> 00:01:21,213
+<i>Raves adam nayman
+of eye weekly.</i>
+
+24
+00:01:23,149 --> 00:01:25,250
+What the shoebazzle
+was that?
+
+25
+00:01:25,251 --> 00:01:29,755
+<i>She, um, only
+quotes reviews from
+the movie I am sam.</i>
+
+26
+00:01:29,756 --> 00:01:31,690
+Huh?
+Hmm.
+
+27
+00:01:31,691 --> 00:01:33,525
+Well, this has
+been fun. Bye!
+
+28
+00:01:35,195 --> 00:01:38,397
+Well, i've never seen
+someone that slow
+go that fast.
+
+29
+00:01:38,398 --> 00:01:40,132
+Oh, yeah! Give it up!
+
+30
+00:01:40,133 --> 00:01:41,066
+Yeah!
+
+31
+00:01:45,705 --> 00:01:47,639
+[speaking japanese]
+
+32
+00:01:55,215 --> 00:01:59,952
+Oh, poor ling-ling.
+He's so disappointed
+his father didn't show.
+
+33
+00:01:59,953 --> 00:02:01,387
+Oh!
+
+34
+00:02:01,388 --> 00:02:04,590
+Oh, sweetie,
+i'm so sorry your
+father's not coming.
+
+35
+00:02:04,591 --> 00:02:08,127
+We still love ya!
+Don't we, toot?!
+
+36
+00:02:08,128 --> 00:02:10,963
+Fine!
+
+37
+00:02:10,964 --> 00:02:12,197
+[kiss]
+
+38
+00:02:12,198 --> 00:02:16,035
+Ling-ling,
+you taste so weird.
+
+39
+00:02:17,470 --> 00:02:19,204
+[giggling]
+
+40
+00:02:19,205 --> 00:02:21,140
+[giggling]
+
+41
+00:02:22,208 --> 00:02:25,177
+Let's go, bleh.
+The coast is clear.
+
+42
+00:02:25,178 --> 00:02:27,746
+But after this,
+no more potty breaks.
+
+43
+00:02:27,747 --> 00:02:30,082
+<i>"I am sam plays like
+a made-for-tv weep--"</i>
+
+44
+00:02:30,083 --> 00:02:31,316
+Shh!
+
+45
+00:02:31,317 --> 00:02:33,786
+I know it seemed
+like I was ashamed
+of my cousin,
+
+46
+00:02:33,787 --> 00:02:35,921
+But nothing could be
+further from the truth.
+
+47
+00:02:35,922 --> 00:02:39,591
+Aah!
+Foxxy:
+hey, clara!
+
+48
+00:02:39,592 --> 00:02:41,060
+What's up, girlfriend?
+
+49
+00:02:41,061 --> 00:02:43,062
+You know,
+none of us have
+really had a chance
+
+50
+00:02:43,063 --> 00:02:44,763
+To hang out
+with bleh yet.
+
+51
+00:02:44,764 --> 00:02:47,232
+Bleh? What's a bleh?
+
+52
+00:02:47,233 --> 00:02:49,835
+Is that one of your
+jive words like
+"emancipation"?
+
+53
+00:02:49,836 --> 00:02:51,603
+No, bleh your cousin.
+
+54
+00:02:51,604 --> 00:02:55,808
+Uh, clara?
+Why is the lamp drooling?
+
+55
+00:02:55,809 --> 00:02:59,044
+I guess to remind us
+to conserve electricity.
+
+56
+00:02:59,045 --> 00:03:03,248
+Clara, there is
+no reason to be
+embarrassed by your cousin.
+
+57
+00:03:03,249 --> 00:03:06,085
+Embarrassed?
+I'm not embarrassed.
+
+58
+00:03:06,086 --> 00:03:09,321
+Stop pretending
+bleh is a lamp.
+
+59
+00:03:09,322 --> 00:03:11,824
+She is not a lamp,
+clara.
+
+60
+00:03:11,825 --> 00:03:15,160
+She is a real person
+with real feelings.
+
+61
+00:03:15,161 --> 00:03:17,096
+Foxxy was probably right.
+
+62
+00:03:17,097 --> 00:03:18,864
+Damn that ms. Know-it-all!
+
+63
+00:03:18,865 --> 00:03:21,400
+I should have killed her
+when I had the chance.
+
+64
+00:03:21,401 --> 00:03:22,835
+Give me your hand!
+
+65
+00:03:22,836 --> 00:03:24,603
+First, give me the ring!
+
+66
+00:03:24,604 --> 00:03:27,206
+[kisses]
+
+67
+00:03:27,207 --> 00:03:29,208
+Xandir:
+it just didn't make sense.
+
+68
+00:03:29,209 --> 00:03:30,709
+When we licked ling-ling
+last time,
+
+69
+00:03:30,710 --> 00:03:31,877
+We got all [bleep]ed up.
+
+70
+00:03:31,878 --> 00:03:33,479
+But this time, nothing happened.
+
+71
+00:03:33,480 --> 00:03:35,047
+Well, we got a little aroused,
+
+72
+00:03:35,048 --> 00:03:36,982
+But not [bleep]ed up.
+
+73
+00:03:36,983 --> 00:03:38,517
+Uhh! What's the deal-e-o?
+
+74
+00:03:38,518 --> 00:03:40,085
+I don't feel
+anything. You?
+
+75
+00:03:40,086 --> 00:03:41,086
+Nothing.
+
+76
+00:03:41,087 --> 00:03:42,755
+[kisses]
+
+77
+00:03:42,756 --> 00:03:45,858
+Hmm. Maybe we have to
+eat ling-ling.
+
+78
+00:03:45,859 --> 00:03:47,326
+Why is it when
+something doesn't work,
+
+79
+00:03:47,327 --> 00:03:49,228
+Your first reaction
+is to eat it?
+
+80
+00:03:49,229 --> 00:03:52,631
+What?! What
+are you doing?
+
+81
+00:03:52,632 --> 00:03:55,067
+I couldn't find
+the remote.
+
+82
+00:03:55,068 --> 00:03:56,735
+You know,
+there is one person
+
+83
+00:03:56,736 --> 00:03:58,203
+Who can figure this out.
+
+84
+00:03:58,204 --> 00:03:59,705
+The professor!
+The professor!
+
+85
+00:03:59,706 --> 00:04:01,674
+[hums]
+
+86
+00:04:01,675 --> 00:04:02,675
+Ooh!
+
+87
+00:04:02,676 --> 00:04:03,876
+Aha!
+[whistle blows]
+
+88
+00:04:03,877 --> 00:04:05,577
+Got it.
+Hit the lights.
+
+89
+00:04:09,416 --> 00:04:11,717
+Here you see
+the african camel toad.
+
+90
+00:04:11,718 --> 00:04:13,118
+It secretes
+a hallucinogen
+
+91
+00:04:13,119 --> 00:04:14,153
+Whenever it's scared.
+
+92
+00:04:14,154 --> 00:04:15,320
+Ahh!
+
+93
+00:04:15,321 --> 00:04:17,423
+Yeah, that's--oh,
+I didn't know that.
+
+94
+00:04:17,424 --> 00:04:21,360
+When "cool" kids feel
+like catching a "buzz,"
+
+95
+00:04:21,361 --> 00:04:25,064
+They scare the amphibian
+and then lick its skin.
+
+96
+00:04:25,065 --> 00:04:27,166
+All the cool kids,
+you say?
+
+97
+00:04:27,167 --> 00:04:31,036
+Now take ling-ling,
+the asian trading card
+battle monster.
+
+98
+00:04:31,037 --> 00:04:32,638
+It creates a similar
+hallucinogen
+
+99
+00:04:32,639 --> 00:04:34,807
+Whenever it's
+disappointed.
+
+100
+00:04:34,808 --> 00:04:37,443
+Ahh!
+Oh, I want to
+be cool!
+
+101
+00:04:37,444 --> 00:04:40,946
+So, ling-ling
+was experiencing
+disappointment
+
+102
+00:04:40,947 --> 00:04:42,614
+Due to its
+father's absence,
+
+103
+00:04:42,615 --> 00:04:44,183
+Then, upon kissing
+ling-ling,
+
+104
+00:04:44,184 --> 00:04:47,186
+You became...[wacky
+noises] technically
+speaking.
+
+105
+00:04:47,187 --> 00:04:53,692
+So, only when ling-ling
+is disappointed, eh? Hmm.
+
+106
+00:04:55,662 --> 00:04:59,932
+[screaming]
+[alarm]
+[siren]
+
+107
+00:04:59,933 --> 00:05:02,067
+[bagpipes playing]
+
+108
+00:05:02,068 --> 00:05:03,635
+[harps playing]
+
+109
+00:05:03,636 --> 00:05:05,938
+[crickets chirping]
+
+110
+00:05:05,939 --> 00:05:09,942
+Oh! Don't look,
+but corky at 3:00.
+
+111
+00:05:09,943 --> 00:05:13,045
+Foxxy: it looked like I got
+through to the princess.
+
+112
+00:05:13,046 --> 00:05:15,881
+Clara would see that
+there ain't no reason
+to be ashamed of bleh.
+
+113
+00:05:15,882 --> 00:05:17,316
+We all adults.
+
+114
+00:05:17,317 --> 00:05:19,985
+Dude, let's egg
+the trainable.
+
+115
+00:05:19,986 --> 00:05:21,854
+Mind if we
+join you guys?
+
+116
+00:05:21,855 --> 00:05:24,189
+No, no, no.
+Of course not.
+
+117
+00:05:24,190 --> 00:05:25,891
+Don't be stupid.
+
+118
+00:05:25,892 --> 00:05:28,027
+[both snicker]
+
+119
+00:05:43,176 --> 00:05:44,543
+[eggshells crack]
+
+120
+00:05:48,915 --> 00:05:52,217
+Man, clara's cousin
+is so hot!
+
+121
+00:05:52,218 --> 00:05:55,454
+<i>Damn! She's like
+retarded hot!</i>
+
+122
+00:06:01,127 --> 00:06:03,595
+[whimpers] sam! Aah!
+
+123
+00:06:05,432 --> 00:06:06,365
+Clara: i'm really glad
+I brought bleh
+
+124
+00:06:06,366 --> 00:06:08,367
+Down to hang out
+with everyone.
+
+125
+00:06:08,368 --> 00:06:10,803
+They treated her
+like she was one
+of the gang.
+
+126
+00:06:10,804 --> 00:06:12,771
+I hadn't seen bleh
+have this much fun
+
+127
+00:06:12,772 --> 00:06:15,207
+<i>Since they cancelled
+the pretty, shiny
+object show.</i>
+
+128
+00:06:15,208 --> 00:06:18,210
+You sure you don't
+want to stay and
+play a few rounds?
+
+129
+00:06:18,211 --> 00:06:21,280
+Nah, it's getting late,
+and we don't want to
+intrude on guy time.
+
+130
+00:06:21,281 --> 00:06:22,648
+'night!
+
+131
+00:06:22,649 --> 00:06:25,751
+<i>"I am sam works magic
+'cause of penn,"</i>
+
+132
+00:06:25,752 --> 00:06:28,153
+<i>Raves lou lumenick
+of the new york post.</i>
+
+133
+00:06:28,154 --> 00:06:30,022
+I go first.
+Whee!
+
+134
+00:06:30,023 --> 00:06:32,291
+Holy shit!
+
+135
+00:06:32,292 --> 00:06:34,293
+She is so hot!
+
+136
+00:06:34,294 --> 00:06:36,161
+Oh, spanky.
+
+137
+00:06:36,162 --> 00:06:38,564
+What? Oh. Ok.
+
+138
+00:06:38,565 --> 00:06:39,498
+[kiss]
+
+139
+00:06:40,700 --> 00:06:42,568
+Oh, that bleh, man.
+
+140
+00:06:42,569 --> 00:06:45,037
+I would totally dip
+my wick in that.
+
+141
+00:06:45,038 --> 00:06:47,906
+Listen, dude. No matter
+how hot she is,
+
+142
+00:06:47,907 --> 00:06:50,009
+You would not
+punch holes in a sped.
+
+143
+00:06:50,010 --> 00:06:51,210
+Oh, hell,
+yeah, I would.
+
+144
+00:06:51,211 --> 00:06:52,544
+I mean, she's
+the perfect girl.
+
+145
+00:06:52,545 --> 00:06:54,480
+All the sweater meat
+of a regular chick
+
+146
+00:06:54,481 --> 00:06:56,181
+And half
+the pillow talk.
+
+147
+00:06:58,385 --> 00:06:59,752
+[kiss]
+
+148
+00:06:59,753 --> 00:07:01,987
+Man, you're all talk.
+
+149
+00:07:01,988 --> 00:07:04,757
+Look, I got 20 large
+that says you won't
+sleep with her.
+
+150
+00:07:04,758 --> 00:07:07,659
+Make it 50
+and you're on.
+
+151
+00:07:07,660 --> 00:07:10,262
+Oh, ha ha!
+Wheeeeeee!
+
+152
+00:07:10,263 --> 00:07:13,198
+Hey, if you're gonna
+be gay about this,
+you can't play.
+
+153
+00:07:13,199 --> 00:07:14,333
+Sorry.
+
+154
+00:07:15,402 --> 00:07:16,635
+[kiss]
+
+155
+00:07:16,636 --> 00:07:20,205
+Fine. 50 bucks says you
+won't have sex with bleh.
+
+156
+00:07:20,206 --> 00:07:22,207
+Easy money.
+
+157
+00:07:22,208 --> 00:07:24,076
+Captain hero is
+gonna show you guys
+
+158
+00:07:24,077 --> 00:07:26,679
+What being a real man
+is all about.
+
+159
+00:07:26,680 --> 00:07:28,681
+All: triple kiss!
+
+160
+00:07:28,682 --> 00:07:30,516
+[kisses]
+
+161
+00:07:37,657 --> 00:07:41,293
+[snarls]
+
+162
+00:07:41,294 --> 00:07:43,228
+[speaking japanese]
+
+163
+00:07:48,601 --> 00:07:52,571
+¶ ling-ling
+into battle go ¶
+
+164
+00:07:52,572 --> 00:07:55,140
+¶ fulfill destiny
+of the soul ¶
+
+165
+00:07:55,141 --> 00:07:56,542
+¶ all the children sing ¶
+
+166
+00:07:56,543 --> 00:08:00,045
+Kids: ¶ kill,
+kill, kill, kill,
+die, die, die ¶
+
+167
+00:08:00,046 --> 00:08:01,580
+¶ kill, kill,
+kill, kill... ¶
+
+168
+00:08:01,581 --> 00:08:04,583
+Wait, ling-ling.
+It's just us.
+
+169
+00:08:04,584 --> 00:08:08,087
+We're not really
+a 3-headed, acid-spitting
+needle monster.
+
+170
+00:08:08,088 --> 00:08:11,190
+[speaking japanese]
+
+171
+00:08:11,191 --> 00:08:12,825
+Oh.
+
+172
+00:08:12,826 --> 00:08:14,960
+Oh, no, ling-ling.
+
+173
+00:08:14,961 --> 00:08:16,228
+Instead of
+cheering you up,
+
+174
+00:08:16,229 --> 00:08:21,367
+We accidentally
+disappointed you.
+
+175
+00:08:21,368 --> 00:08:24,069
+Oh, poor baby.
+
+176
+00:08:24,070 --> 00:08:25,471
+Triple kiss!
+
+177
+00:08:25,472 --> 00:08:27,373
+Oh! Hee hee!
+[kisses]
+
+178
+00:08:27,374 --> 00:08:31,310
+[sighing and giggling]
+
+179
+00:08:38,184 --> 00:08:39,585
+[knocks]
+
+180
+00:08:39,586 --> 00:08:41,420
+Clara:
+I found it a bit odd
+
+181
+00:08:41,421 --> 00:08:44,023
+That captain hero
+wanted to take bleh
+out on a date,
+
+182
+00:08:44,024 --> 00:08:45,691
+And it was
+my responsibility
+
+183
+00:08:45,692 --> 00:08:48,127
+To make sure his
+intentions were pure.
+
+184
+00:08:48,128 --> 00:08:50,329
+So, captain hero, is it?
+
+185
+00:08:50,330 --> 00:08:52,464
+Oh. Heh heh! Yeah?
+
+186
+00:08:52,465 --> 00:08:53,966
+Coming to take
+my little bleh out
+
+187
+00:08:53,967 --> 00:08:55,634
+For a night
+on the town, eh?
+
+188
+00:08:55,635 --> 00:08:57,770
+You know, I don't
+know what'd I do
+
+189
+00:08:57,771 --> 00:08:59,805
+If anything happened
+to my little bleh.
+
+190
+00:08:59,806 --> 00:09:02,341
+Yes, ma'am.
+I mean, no, ma'am.
+
+191
+00:09:02,342 --> 00:09:04,943
+Son, do you know
+what it's like
+
+192
+00:09:04,944 --> 00:09:08,147
+To kill a man with
+your bare hands?
+
+193
+00:09:08,148 --> 00:09:09,748
+I do.
+
+194
+00:09:09,749 --> 00:09:10,883
+I...
+
+195
+00:09:10,884 --> 00:09:12,151
+Oh!
+
+196
+00:09:12,152 --> 00:09:13,986
+Here's bleh now!
+
+197
+00:09:13,987 --> 00:09:16,155
+¶ there she is... ¶
+
+198
+00:09:16,156 --> 00:09:19,825
+Wow! You look...
+Stunning.
+
+199
+00:09:19,826 --> 00:09:25,497
+<i>"I am sam's dakota
+fanning is worth the
+price of admission."</i>
+
+200
+00:09:25,498 --> 00:09:27,700
+[blow dart]
+
+201
+00:09:27,701 --> 00:09:29,501
+Ow! What the hell?!
+
+202
+00:09:29,502 --> 00:09:31,904
+A little
+added protection.
+
+203
+00:09:31,905 --> 00:09:34,807
+You'll get the antidote
+when I get my bleh back.
+
+204
+00:09:34,808 --> 00:09:39,311
+[all giggling]
+
+205
+00:09:39,312 --> 00:09:42,748
+Hey, ling-ling,
+you excited for
+christmas?
+
+206
+00:09:42,749 --> 00:09:45,317
+Too bad there's
+no such thing
+as santa claus!
+
+207
+00:09:45,318 --> 00:09:46,985
+I bet you're
+disappointed.
+
+208
+00:09:46,986 --> 00:09:48,153
+Oh.
+
+209
+00:09:48,154 --> 00:09:50,889
+[laughs]
+
+210
+00:09:50,890 --> 00:09:53,659
+Hey, look what
+I found in your ear!
+
+211
+00:09:53,660 --> 00:09:55,427
+Is it a quarter?
+
+212
+00:09:55,428 --> 00:09:58,330
+Oh, no!
+It's a tumor!
+
+213
+00:09:58,331 --> 00:09:59,765
+Oh.
+
+214
+00:09:59,766 --> 00:10:02,601
+[slurps]
+
+215
+00:10:02,602 --> 00:10:04,370
+[giggles]
+
+216
+00:10:04,371 --> 00:10:09,008
+Hey, ling-ling,
+you excited for
+christmas?
+
+217
+00:10:09,009 --> 00:10:11,443
+Oh, no!
+It's a tumor!
+
+218
+00:10:11,444 --> 00:10:12,845
+Oh.
+
+219
+00:10:12,846 --> 00:10:16,181
+[slurps]
+
+220
+00:10:16,182 --> 00:10:19,418
+¶ girly, girly,
+girly, girly... ¶
+
+221
+00:10:19,419 --> 00:10:23,689
+[bleh shouts happily
+and incoherently]
+
+222
+00:10:23,690 --> 00:10:25,357
+Captain hero:
+yes, I was confident
+
+223
+00:10:25,358 --> 00:10:28,327
+That by the end of the
+night, i'd have another
+notch on my utility belt
+
+224
+00:10:28,328 --> 00:10:30,095
+And 50 bucks in my pocket.
+
+225
+00:10:30,096 --> 00:10:33,565
+Then I realized
+something. Bleh...
+
+226
+00:10:33,566 --> 00:10:35,034
+She was really special,
+
+227
+00:10:35,035 --> 00:10:36,635
+But not like in
+a retarded way,
+
+228
+00:10:36,636 --> 00:10:39,004
+In a traditionally
+special way.
+
+229
+00:10:39,005 --> 00:10:44,943
+¶ did you ever know
+that you're my hero? ¶
+
+230
+00:10:44,944 --> 00:10:46,245
+Oh!
+
+231
+00:10:46,246 --> 00:10:47,546
+Ok!
+
+232
+00:10:47,547 --> 00:10:53,352
+¶ you're everything
+I wish I could be ¶
+
+233
+00:10:53,353 --> 00:10:56,088
+¶ I could fly higher
+than an eagle ¶
+
+234
+00:10:56,089 --> 00:10:57,556
+[both giggle]
+
+235
+00:10:57,557 --> 00:10:59,558
+Sam.
+
+236
+00:10:59,559 --> 00:11:02,761
+I don't like
+these things.
+They scare me!
+
+237
+00:11:02,762 --> 00:11:05,631
+¶ beneath my wings ¶
+
+238
+00:11:05,632 --> 00:11:09,468
+Eeeeeeh! Aah! Sam!
+¶ oh, oh, fly ¶
+
+239
+00:11:09,469 --> 00:11:14,340
+¶ so high
+against the sky ¶
+
+240
+00:11:14,341 --> 00:11:16,942
+¶ so high I almost... ¶
+
+241
+00:11:16,943 --> 00:11:20,646
+Bleh, you are the wind
+beneath my wings.
+
+242
+00:11:20,647 --> 00:11:22,681
+"contrived, manipulative,
+
+243
+00:11:22,682 --> 00:11:28,721
+<i>And shamelessly
+sentimental," raves peter
+travers from rolling stone.</i>
+
+244
+00:11:34,627 --> 00:11:37,596
+Hey, ling-ling,
+I got a penny.
+No, I don't.
+
+245
+00:11:37,597 --> 00:11:39,198
+[licks dry fur]
+
+246
+00:11:39,199 --> 00:11:40,866
+[rattles]
+
+247
+00:11:40,867 --> 00:11:41,867
+[bam bam]
+
+248
+00:11:41,868 --> 00:11:43,702
+[licks dry fur]
+
+249
+00:11:43,703 --> 00:11:46,138
+Whoa, guys. Guys!
+
+250
+00:11:46,139 --> 00:11:47,840
+Ling-ling is
+totally kicked!
+
+251
+00:11:47,841 --> 00:11:48,841
+What?!
+
+252
+00:11:48,842 --> 00:11:50,209
+[pants]
+
+253
+00:11:50,210 --> 00:11:52,978
+[licks dry fur]
+
+254
+00:11:52,979 --> 00:11:54,747
+Don't hold out
+on me, man.
+
+255
+00:11:54,748 --> 00:11:57,449
+I need my fix.
+Come on! Please,
+man, come on!
+
+256
+00:11:57,450 --> 00:11:59,618
+What do you want?
+I'll do anything!
+
+257
+00:11:59,619 --> 00:12:01,253
+I'll suck your dick!
+
+258
+00:12:03,156 --> 00:12:04,556
+Ooh! Ooh, sam!
+
+259
+00:12:04,557 --> 00:12:05,991
+Hee hee!
+Shh!
+
+260
+00:12:05,992 --> 00:12:08,861
+Are you crazy?
+They'll hear us!
+
+261
+00:12:08,862 --> 00:12:11,764
+Captain hero:
+bleh and I got home way
+past midnight.
+
+262
+00:12:11,765 --> 00:12:15,701
+I was like, we are gonna
+get in so much trouble!
+
+263
+00:12:15,702 --> 00:12:19,672
+So, this was
+really fantastic.
+
+264
+00:12:19,673 --> 00:12:23,842
+Um, I,
+uh...Good night.
+
+265
+00:12:23,843 --> 00:12:24,777
+[kiss]
+
+266
+00:12:25,879 --> 00:12:27,513
+¶ girly, girly,
+girly, girly... ¶
+
+267
+00:12:27,514 --> 00:12:29,415
+Ahh!
+
+268
+00:12:29,416 --> 00:12:32,951
+Hey, super stud.
+Did you sleep
+with her?
+
+269
+00:12:32,952 --> 00:12:34,453
+Dude, back off!
+
+270
+00:12:34,454 --> 00:12:36,922
+I did not, as you
+so crudely put it...
+
+271
+00:12:36,923 --> 00:12:38,857
+"nail her
+in the stink tube."
+
+272
+00:12:38,858 --> 00:12:40,592
+It's not like that.
+
+273
+00:12:40,593 --> 00:12:42,961
+So you kids are
+taking it slow?
+
+274
+00:12:42,962 --> 00:12:43,996
+See what I did
+there? I--
+
+275
+00:12:43,997 --> 00:12:45,998
+You just don't get it,
+spanky.
+
+276
+00:12:45,999 --> 00:12:47,299
+Nobody gets it!
+
+277
+00:12:47,300 --> 00:12:48,467
+[wails]
+
+278
+00:12:48,468 --> 00:12:50,069
+[door slams]
+
+279
+00:12:50,070 --> 00:12:51,470
+Captain hero:
+I was lying in bed,
+
+280
+00:12:51,471 --> 00:12:54,273
+Replaying the date over
+and over in my head,
+
+281
+00:12:54,274 --> 00:12:56,842
+When there was a knock
+at the door.
+[knocks]
+
+282
+00:12:56,843 --> 00:12:57,776
+Who's there?
+
+283
+00:12:58,845 --> 00:13:01,080
+Bleh! What are you--
+
+284
+00:13:02,415 --> 00:13:04,983
+Listen, bleh,
+i'm not that kind of guy.
+
+285
+00:13:04,984 --> 00:13:05,984
+[pulls pants down]
+
+286
+00:13:05,985 --> 00:13:08,153
+Oh, my!
+
+287
+00:13:08,154 --> 00:13:12,057
+Oh, no, no, no...
+
+288
+00:13:12,058 --> 00:13:14,293
+Leave the helmet on.
+
+289
+00:13:17,330 --> 00:13:18,697
+Ahh.
+
+290
+00:13:18,698 --> 00:13:21,433
+Clara: that morning,
+I woke up feeling great.
+
+291
+00:13:21,434 --> 00:13:24,269
+Everyone had accepted
+me and my cousin,
+
+292
+00:13:24,270 --> 00:13:25,971
+And that was swell.
+
+293
+00:13:25,972 --> 00:13:29,875
+Oh, what a glorious day,
+isn't it, bleh?
+
+294
+00:13:29,876 --> 00:13:31,877
+Bleh?
+
+295
+00:13:31,878 --> 00:13:33,612
+Bleh?!
+
+296
+00:13:33,613 --> 00:13:37,683
+Captain hero!
+Clara, it's not
+what you think!
+
+297
+00:13:37,684 --> 00:13:38,684
+[gibberish]
+
+298
+00:13:38,685 --> 00:13:40,552
+Get up! Get up
+right now!
+
+299
+00:13:40,553 --> 00:13:43,856
+<i>"I am sam reduces penn to
+a mugging embarrassment,"</i>
+
+300
+00:13:43,857 --> 00:13:46,091
+<i>Raves mike clark
+of usa today.</i>
+
+301
+00:13:46,092 --> 00:13:47,860
+I don't care.
+Let's go!
+
+302
+00:13:47,861 --> 00:13:49,561
+Yeeeh...
+
+303
+00:13:49,562 --> 00:13:52,297
+Go back to your
+cage right now!
+
+304
+00:13:52,298 --> 00:13:55,434
+Spanky: well,
+look who's doing
+the limp of shame!
+
+305
+00:13:55,435 --> 00:13:57,169
+You bastard!
+
+306
+00:13:57,170 --> 00:13:59,338
+Captain hero:
+clara totally overreacted.
+
+307
+00:13:59,339 --> 00:14:00,639
+I mean, bleh was an adult,
+
+308
+00:14:00,640 --> 00:14:02,374
+And completely capable
+of making her own decisions.
+
+309
+00:14:02,375 --> 00:14:03,809
+Or not.
+
+310
+00:14:03,810 --> 00:14:06,945
+Still, I needed to
+sit clara down and
+explain what happened.
+
+311
+00:14:06,946 --> 00:14:09,948
+Clara, I never expected
+this to happen.
+
+312
+00:14:09,949 --> 00:14:14,720
+It's just that I have
+real feelings for her.
+
+313
+00:14:14,721 --> 00:14:17,389
+Well...
+
+314
+00:14:17,390 --> 00:14:20,025
+¶ there she is ¶
+
+315
+00:14:20,026 --> 00:14:23,295
+¶ she's a girl ¶
+
+316
+00:14:23,296 --> 00:14:25,497
+If that is the truth--
+
+317
+00:14:25,498 --> 00:14:26,932
+It is.
+
+318
+00:14:26,933 --> 00:14:28,967
+Then i'm truly happy
+for the two of you.
+
+319
+00:14:28,968 --> 00:14:31,170
+You're a good man,
+captain hero.
+
+320
+00:14:31,171 --> 00:14:33,005
+I knew I could
+trust you.
+
+321
+00:14:33,006 --> 00:14:35,107
+Here's the antidote.
+
+322
+00:14:35,108 --> 00:14:36,342
+[gulp]
+
+323
+00:14:36,343 --> 00:14:38,977
+Well, nice work,
+captain hero.
+
+324
+00:14:38,978 --> 00:14:41,980
+Here's the $50
+I bet you to have
+sex with bleh.
+
+325
+00:14:41,981 --> 00:14:42,981
+[gasps]
+
+326
+00:14:42,982 --> 00:14:44,049
+Yeeeeeh!
+
+327
+00:14:44,050 --> 00:14:45,184
+Oh, um, I mean, uh...
+
+328
+00:14:45,185 --> 00:14:49,655
+Here is the $50
+captain hero won off me
+
+329
+00:14:49,656 --> 00:14:52,291
+Because I bet him
+he would not have sex
+
+330
+00:14:52,292 --> 00:14:53,926
+With your
+special cousin bleh.
+
+331
+00:14:53,927 --> 00:14:56,128
+But he did, in fact,
+have sex with her.
+
+332
+00:14:56,129 --> 00:14:58,564
+Oh, yes, he did.
+For $50.
+
+333
+00:14:58,565 --> 00:15:01,133
+Oh, man. Saved it.
+
+334
+00:15:01,134 --> 00:15:07,539
+Captain hero, I forbid you
+to see my cousin ever again!
+
+335
+00:15:07,540 --> 00:15:08,774
+Uhh!
+
+336
+00:15:08,775 --> 00:15:10,676
+I would have been
+more pissed at spanky,
+
+337
+00:15:10,677 --> 00:15:13,679
+But you know,
+I just won $50!
+
+338
+00:15:13,680 --> 00:15:16,382
+[cash register bell]
+ah! Who's your daddy?
+
+339
+00:15:16,383 --> 00:15:19,485
+Ooh, I like the big one
+and that one over there
+
+340
+00:15:19,486 --> 00:15:20,986
+And...Ooh!
+
+341
+00:15:20,987 --> 00:15:25,057
+Yeah. Hell, yeah!
+[girls talking and laughing]
+
+342
+00:15:25,058 --> 00:15:26,925
+Ehhhh.
+
+343
+00:15:26,926 --> 00:15:28,394
+Ehhhh.
+
+344
+00:15:28,395 --> 00:15:30,362
+Ehhhh.
+
+345
+00:15:30,363 --> 00:15:32,164
+Oh, look at
+poor ling-ling.
+
+346
+00:15:32,165 --> 00:15:33,932
+We've licked
+the life out of it.
+
+347
+00:15:33,933 --> 00:15:35,234
+What should we do?
+
+348
+00:15:35,235 --> 00:15:36,235
+Poke it harder.
+
+349
+00:15:36,236 --> 00:15:37,236
+Uhh!
+
+350
+00:15:37,237 --> 00:15:38,237
+[gasps]
+
+351
+00:15:38,238 --> 00:15:39,571
+Look at me!
+
+352
+00:15:39,572 --> 00:15:42,608
+I've become the very
+thing I hate most.
+
+353
+00:15:42,609 --> 00:15:44,576
+A guy who pokes things
+with sticks?
+
+354
+00:15:44,577 --> 00:15:49,181
+Oh, we've abused ling-ling
+to the point where the
+little guy is just numb.
+
+355
+00:15:49,182 --> 00:15:50,649
+And for what?
+
+356
+00:15:50,650 --> 00:15:52,551
+To catch a buzz?!
+
+357
+00:15:52,552 --> 00:15:55,654
+I guess being cool
+just isn't worth it.
+
+358
+00:15:55,655 --> 00:15:59,024
+["what you already know"
+jingle plays]
+
+359
+00:15:59,025 --> 00:16:01,293
+Come on. We've got to
+make this right!
+
+360
+00:16:02,529 --> 00:16:04,396
+Sorry, wooldoor.
+You stay here
+
+361
+00:16:04,397 --> 00:16:06,899
+Until all that ling-ling
+is out of your system.
+
+362
+00:16:06,900 --> 00:16:10,135
+It's gonna be
+the hardest thing
+you've ever done.
+
+363
+00:16:10,136 --> 00:16:11,136
+Toodles!
+
+364
+00:16:11,137 --> 00:16:13,405
+[slam]
+
+365
+00:16:13,406 --> 00:16:15,474
+Aah! I can't take it!
+
+366
+00:16:15,475 --> 00:16:18,477
+[wacky noises]
+
+367
+00:16:21,047 --> 00:16:24,416
+Ha ha ha ha ha ha!
+Wooldoor: I can't take it!
+
+368
+00:16:24,417 --> 00:16:26,285
+Aaaaaaaaaaaaaaaah!
+
+369
+00:16:26,286 --> 00:16:29,154
+Captain hero:
+oh, sure, the money
+helped dull the pain,
+
+370
+00:16:29,155 --> 00:16:33,692
+But later, you know, when
+the stores are all closed,
+
+371
+00:16:33,693 --> 00:16:35,294
+Who do I have
+to share it with?
+
+372
+00:16:35,295 --> 00:16:41,433
+Bleh? No. Not anymore.
+Not anymore.
+
+373
+00:16:41,434 --> 00:16:43,635
+It just wasn't
+worth it, spanky!
+
+374
+00:16:43,636 --> 00:16:46,705
+Bleh, she--
+she was special.
+
+375
+00:16:46,706 --> 00:16:48,807
+What are you--
+what are you saying?
+
+376
+00:16:48,808 --> 00:16:52,678
+Oh, spanky,
+I love her.
+
+377
+00:16:53,880 --> 00:16:59,018
+Then go to her.
+
+378
+00:16:59,019 --> 00:17:00,719
+Xandir:
+we knew what we had done
+to ling-ling was wrong.
+
+379
+00:17:00,720 --> 00:17:02,488
+Hopefully, this was gonna
+
+380
+00:17:02,489 --> 00:17:03,622
+Make it up to that lovable,
+
+381
+00:17:03,623 --> 00:17:06,258
+Fortune cookie cat thing.
+
+382
+00:17:06,259 --> 00:17:11,096
+Ling-ling, there's
+a special warrior
+here to see you.
+
+383
+00:17:11,097 --> 00:17:15,567
+[japanese song playing]
+
+384
+00:17:15,568 --> 00:17:17,503
+[speaking japanese]
+
+385
+00:17:19,739 --> 00:17:21,674
+[speaking japanese]
+
+386
+00:17:33,086 --> 00:17:35,654
+Toot:
+sure, we have our issues,
+
+387
+00:17:35,655 --> 00:17:39,224
+But really, this is
+a house drawn together
+
+388
+00:17:39,225 --> 00:17:40,659
+With love.
+
+389
+00:17:40,660 --> 00:17:43,595
+[speaking japanese]
+
+390
+00:18:05,752 --> 00:18:07,753
+Yah!
+Uhh!
+
+391
+00:18:07,754 --> 00:18:10,189
+[slurping]
+
+392
+00:18:10,190 --> 00:18:12,991
+All right, clara,
+where is she?!
+
+393
+00:18:12,992 --> 00:18:15,828
+Hah! You're too late,
+captain jerko!
+
+394
+00:18:15,829 --> 00:18:18,630
+She left for the front door
+well over 2 minutes ago!
+
+395
+00:18:18,631 --> 00:18:21,066
+You'll never catch her!
+Never!
+
+396
+00:18:21,067 --> 00:18:23,202
+Oh. Oh, well.
+
+397
+00:18:23,203 --> 00:18:24,903
+I guess it wasn't
+meant to be.
+
+398
+00:18:24,904 --> 00:18:26,939
+Easy come, easy go.
+
+399
+00:18:26,940 --> 00:18:28,807
+Well, i'll be
+seeing you, clara.
+
+400
+00:18:28,808 --> 00:18:31,143
+Wait! Damn you!
+I've got to try!
+
+401
+00:18:31,144 --> 00:18:32,578
+Yahh!
+
+402
+00:18:34,447 --> 00:18:36,448
+Captain hero: bleh!
+Wait! I'm coming!
+
+403
+00:18:36,449 --> 00:18:37,950
+Dude, where are you--uhh!
+
+404
+00:18:37,951 --> 00:18:39,518
+Watch it, pig!
+
+405
+00:18:39,519 --> 00:18:41,086
+Go get her, man.
+
+406
+00:18:41,087 --> 00:18:42,087
+Uhh!
+
+407
+00:18:42,088 --> 00:18:43,355
+Watch it,
+hot black girl!
+
+408
+00:18:43,356 --> 00:18:45,157
+Go get her, man.
+
+409
+00:18:45,158 --> 00:18:49,895
+[muzak playing]
+
+410
+00:18:49,896 --> 00:18:56,168
+[blissful sighs and moans]
+
+411
+00:18:56,169 --> 00:18:57,770
+Oh, come on!
+
+412
+00:19:00,206 --> 00:19:05,444
+Bleh! Bleh!
+Bleh! Bleh!
+
+413
+00:19:05,445 --> 00:19:06,812
+Oh.
+
+414
+00:19:06,813 --> 00:19:08,747
+Bleh! Bleh, wait!
+
+415
+00:19:08,748 --> 00:19:11,350
+Listen, I don't know
+what clara told you,
+
+416
+00:19:11,351 --> 00:19:14,453
+But I love you.
+
+417
+00:19:14,454 --> 00:19:16,555
+Yehhhhhhhh.
+
+418
+00:19:18,458 --> 00:19:20,192
+[splat]
+
+419
+00:19:20,193 --> 00:19:22,127
+"one of the year's
+10 best!"
+
+420
+00:19:22,128 --> 00:19:25,631
+"delivers in ways
+you never expected!"
+
+421
+00:19:25,632 --> 00:19:29,134
+Yes, well, maybe
+it wouldn't work out.
+
+422
+00:19:29,135 --> 00:19:31,637
+I mean, we come
+from different worlds.
+
+423
+00:19:31,638 --> 00:19:33,772
+I come from
+planet zebulon
+
+424
+00:19:33,773 --> 00:19:36,909
+And you come from
+a mom who drank when
+she was pregnant.
+
+425
+00:19:36,910 --> 00:19:40,446
+Well, farewell,
+my sweet.
+
+426
+00:19:40,447 --> 00:19:41,947
+Mwah!
+
+427
+00:19:41,948 --> 00:19:44,983
+Mnnnh deh
+nnnh.
+
+428
+00:19:44,984 --> 00:19:47,186
+Yeah! She kissed him!
+
+429
+00:19:47,187 --> 00:19:49,488
+She kissed him!
+
+430
+00:19:49,489 --> 00:19:51,657
+Ha ha! Ha ha!
+
+431
+00:19:51,658 --> 00:19:55,994
+Bleh, you nailed
+the dry-mouth
+from reality tv show!
+
+432
+00:19:55,995 --> 00:19:59,264
+Well, I guess I owe you
+that 50 bucks now.
+
+433
+00:19:59,265 --> 00:20:02,801
+Oh! 50 bucks! Yeah!
+
+434
+00:20:02,802 --> 00:20:06,438
+[cash register bell]
+ooh, yeah,
+who's your daddy?
+
+435
+00:20:06,439 --> 00:20:09,908
+I like the big one
+and I like the one
+over there. Ooh!
+
+436
+00:20:09,909 --> 00:20:13,245
+Yeah. Hell, yeah!
+[girls talking and laughing]
+
+437
+00:20:13,246 --> 00:20:14,880
+Bleh: sam, bye-bye!
+
+438
+00:20:14,881 --> 00:20:16,048
+Bye-bye, sam!
+
+439
+00:20:16,049 --> 00:20:18,150
+[choked up] bye.
+
+440
+00:20:19,786 --> 00:20:21,854
+Good-bye.
+
+441
+00:20:23,189 --> 00:20:24,823
+You ok, man?
+
+442
+00:20:24,824 --> 00:20:28,560
+I...Don't know
+if i'll ever be ok.
+
+443
+00:20:28,561 --> 00:20:30,062
+Yeah, i'm sorry.
+
+444
+00:20:30,063 --> 00:20:32,031
+Hey, you want to go
+grab a beer,
+
+445
+00:20:32,032 --> 00:20:34,533
+Spin it, and kiss
+whoever it points to?
+
+446
+00:20:34,534 --> 00:20:39,271
+No. Not now, spanky.
+Not now.
+
+447
+00:20:43,543 --> 00:20:44,543
+How about now?
+
+448
+00:20:44,544 --> 00:20:45,811
+Yeah. Ok.
+
+449
+00:20:45,812 --> 00:20:51,550
+¶ girly, girly,
+girly, girly girl ¶
+
+450
+00:20:51,551 --> 00:20:53,052
+¶ girl ¶
+
+451
+00:20:53,053 --> 00:20:55,954
+¶ girly, girly girl-- ¶
+
diff --git a/tests/ref/fate/sub-ssa-to-ass-remux b/tests/ref/fate/sub-ssa-to-ass-remux
new file mode 100644
index 0000000000..f4405df117
--- /dev/null
+++ b/tests/ref/fate/sub-ssa-to-ass-remux
@@ -0,0 +1,84 @@
+[Script Info]

+; Script generated by Aegisub 2.1.7

+; http://www.aegisub.net

+ScriptType: v4.00

+Collisions: Normal

+PlayResY: 534

+PlayResX: 720

+WrapStyle: 0

+ScaledBorderAndShadow: no

+Video File: 01-.mkv

+Video Aspect Ratio: 1

+Video Zoom: 8

+Video Position: 36805

+Last Style Storage: Default

+Export Encoding: UTF-8

+Export filters: Karaoke template

+Title: Alien Nine 01

+Original Script: ?

+Original Translation: ?

+Original Editing: ?

+Original Timing: ?

+Synch Point: ?

+Script Updated By: lM

+Update Details: Kareoke by Pahndamonium

+

+[V4 Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, TertiaryColour, BackColour, Bold, Italic, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding

+Style: Song (romaji) ED-furigana,Verdana,15,7363111,8454016,0,16777215,-1,-1,1,1,0,6,30,30,16,0,0

+Style: SongED-furigana,Verdana,15,1393701,8454016,0,16777215,-1,-1,1,1,0,2,30,30,26,0,0

+Style: Song (romaji) OP-furigana,Verdana,15,7363111,8454016,0,16777215,-1,-1,1,1,0,2,30,30,18,0,0

+Style: SongOP-furigana,Verdana,15,3305768,8454016,0,16777215,-1,0,1,1,0,2,30,30,30,0,0

+Style: Signs-furigana,Arial,14,16777215,65535,0,0,-1,0,1,1,0,2,40,40,28,0,0

+Style: CF2-furigana,Verdana,14,16777215,16777215,0,0,-1,-1,1,1,0,2,30,30,30,0,0

+Style: Default-furigana,Verdana,14,16777215,65535,0,0,-1,0,1,1,0,2,30,30,28,0,0

+Style: Default,Verdana,28,16777215,65535,0,0,-1,0,1,2,0,2,30,30,28,0,0

+Style: CF2,Verdana,28,16777215,16777215,0,0,-1,-1,1,2,0,2,30,30,30,0,0

+Style: Signs,Arial,28,16777215,65535,0,0,-1,0,1,2,0,2,40,40,28,0,0

+Style: SongOP,Verdana,30,3305768,8454016,0,16777215,-1,0,1,2,0,2,30,30,30,0,0

+Style: Song (romaji) OP,Verdana,30,7363111,8454016,0,16777215,-1,-1,1,2,0,2,30,30,18,0,0

+Style: SongED,Verdana,30,1393701,8454016,0,16777215,-1,-1,1,2,0,2,30,30,26,0,0

+Style: Song (romaji) ED,Verdana,30,7363111,8454016,0,16777215,-1,-1,1,2,0,6,30,30,16,0,0

+

+[Events]

+Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: Marked=0,0:00:02.42,0:00:03.00,*Default,,0000,0000 ,0000,,{\fnComic Sans MS\c&HFF80FF&}All Japan Boys Soccer Tournament Opens!

+Dialogue: Marked=0,0:00:59.60,0:01:00.60,Default,NTP,0000,0000,0000,,Tak tady jsi...

+Dialogue: Marked=0,0:01:00.81,0:01:01.39,Default,NTP,0000,0000,0000,,Ahoj.

+Dialogue: Marked=0,0:01:01.52,0:01:03.98,Default,NTP,0000,0000,0000,,Pojď se mnou.

+Dialogue: Marked=0,0:01:19.71,0:01:30.26,*Default,SONG,0000,0000,0092,,When you hear the bell of Chirin,...

+Dialogue: Marked=0,0:01:30.26,0:01:40.46,*Default,SONG,0000,0000,0000,,YASASHII MATSUGE WO HOHOEMI WO

+Dialogue: Marked=0,0:01:30.26,0:01:40.46,*Default,SONG,0000,0000,0092,,...recall those soft lashes and that gentle smile.

+Dialogue: Marked=0,0:01:40.46,0:01:50.72,*Default,SONG,0000,0000,0000,,CHIRIN NO SUZU DE OMOIDASU

+Dialogue: Marked=0,0:04:45.67,0:04:48.37,*Default,,0000,0000,0000,,{My Eight-Six turned into an Eight-Five ? !}¡¿Mi Hachi-Roku se ha\nconvertido en un Hachi-Go?!

+Dialogue: Marked=0,0:04:48.97,0:04:51.70,*Default,,0000,0000,0000,,{\c&HFFFFFF&}Tomé el auto prestado,\nte dejé un sustituto.

+Dialogue: Marked=0,0:05:01.52,0:05:04.12,*Default,,0000,0000,0000,,{Takumi,Your dad must be really surprised by now. . .}Ahora mismo tu padre\ndebe estar en shock.

+Dialogue: Marked=0,0:00:15.15,0:00:16.30,Default,Voice,0000,0000,0000,,Otani-san...

+Dialogue: Marked=0,0:00:16.93,0:00:18.17,Default,,0000,0000,0000,,Otani-san...

+Dialogue: Marked=0,0:00:18.00,0:00:21.18,Signs,Sign,0000,0000,0000,,{\a6}Sixth Grade Camellia Class

+Dialogue: Marked=0,0:00:18.58,0:00:19.80,Default,Voice,0000,0000,0000,,Otani-san...

+Dialogue: Marked=0,0:00:20.45,0:00:21.64,Default,,0000,0000,0000,,Otani-san...

+Dialogue: Marked=0,0:00:21.38,0:00:25.88,Signs,Chalkboard,0000,0000,0000,,{\a6}Alien Counter-Measure Officer

+Dialogue: Marked=0,0:00:22.55,0:00:23.91,Default,Voice,0000,0000,0000,,Otani-san...

+Dialogue: Marked=0,0:00:24.35,0:00:25.46,Default,,0000,0000,0000,,Furukawa-san...

+Dialogue: Marked=0,0:00:26.05,0:00:27.23,Signs,Board,0000,0000,0000,,{\a6}Otani                 Furukawa                 Tatsuta

+Dialogue: Marked=0,0:01:04.66,0:01:05.87,Song (romaji) OP,,0000,0000,0000,,{2c&H5D8FC3&\c&H75BADB&\2c&H5F7CC3&}{\k15}Fu{\k22}tsu{\k11}u {\k25}ja {\k13}na{\k39}i

+Dialogue: Marked=0,0:01:05.93,0:01:07.43,Song (romaji) OP,,0000,0000,0000,,{2c&H5D8FC3&\c&H75BADB&\2c&H5F7CC3&}{\k30}A{\k30}sa {\k17}ga {\k23}ki{\k50}te

+Dialogue: Marked=0,0:01:07.60,0:01:10.60,Song (romaji) OP,,0000,0000,0000,,{2c&H5D8FC3&\c&H75BADB&\2c&H5F7CC3&}{\k27}Na{\k8}i{\k23}fu {\k19}no {\k18}sa{\k32}sa{\k9}t{\k28}ta {\k18}ha{\k9}a{\k28}to {\k18}ga {\k14}u{\k27}zu{\k22}ku

+Dialogue: Marked=0,0:01:10.71,0:01:11.99,Song (romaji) OP,,0000,0000,0000,,{2c&H5D8FC3&\c&H75BADB&\2c&H5F7CC3&}{\k22}Ne{\k21}bo{\k8}u {\k29}shi{\k23}ta{\k25}i

+Dialogue: Marked=0,0:25:19.73,0:25:23.58,Signs,Text,0029,0427,0322,,{\pos(169,215)}Elementary School #9

+Dialogue: Marked=0,0:25:19.73,0:25:23.58,Signs,,0030,0279,0371,,{\pos(220,251)}Alien Counter-Measure Officers

+Dialogue: Marked=0,0:25:19.73,0:25:23.58,Signs,,0398,0209,0038,,{\pos(617,413)}The End

+Dialogue: Marked=0,0:25:35.06,0:25:36.67,Song (romaji) ED,,0000,0000,0000,,{\c&H9C6348&\2c&H372824&\fs24\pos(92,470)}{0}{\k25}To{\k43}ki-{\k32}do{\kf61}ki

+Dialogue: Marked=0,0:25:36.68,0:25:40.69,Song (romaji) ED,,0000,0000,0000,,{\c&H9C6348&\2c&H372824&\fs24\pos(125,471)}{0}{\k46}Ko{\k27}no {\k46}ka{\k36}ra{\k47}da {\kf200}ga

+Dialogue: Marked=0,0:25:45.04,0:25:47.97,Song (romaji) ED,,0000,0000,0000,,{\c&H9C6348&\2c&H372824&\fs24\pos(132,471)}{\k35}Yo{\k28}ro{\k41}ko{\k35}bi {\k28}na {\k26}no {\k100}ka

+Dialogue: Marked=0,0:25:47.98,0:25:50.22,Song (romaji) ED,,0000,0000,0000,,{\c&H9C6348&\2c&H372824&\fs24\pos(143,473)}{\k14}Ka{\k20}na{\k26}shi{\k15}mi {\k32}na {\k65}no {\k52}ka

+Dialogue: Marked=0,0:25:35.06,0:25:36.67,SongED,,0000,0000,0000,,{\fs24\pos(100,521)}Sometimes

+Dialogue: Marked=0,0:25:36.68,0:25:40.69,SongED,,0000,0000,0000,,{\fs24\pos(136,522)}Whether this body

+Dialogue: Marked=0,0:25:45.04,0:25:47.97,SongED,,0000,0000,0000,,{\fs24\pos(107,520)}Is happiness

+Dialogue: Marked=0,0:25:47.98,0:25:50.22,SongED,,0000,0000,0000,,{\fs24\pos(100,521)}Or sadness

+

+

+

+

+

diff --git a/tests/ref/fate/sub-stl b/tests/ref/fate/sub-stl
new file mode 100644
index 0000000000..cde33cd7cd
--- /dev/null
+++ b/tests/ref/fate/sub-stl
@@ -0,0 +1,29 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:31.02,0:00:33.00,Default,,0,0,0,,Hello, my name is Axel Kornmesser.

+Dialogue: 0,0:00:45.02,0:00:49.13,Default,,0,0,0,,It is always a pleasure to work with ESA astronomers.

+Dialogue: 0,0:00:49.13,0:00:52.03,Default,,0,0,0,,The "Eyes on The Skies" documentary

+Dialogue: 0,0:00:52.03,0:00:55.09,Default,,0,0,0,,was our second collaboration

+Dialogue: 0,0:00:55.09,0:00:58.07,Default,,0,0,0,,after a great \Nexperience in 2005,

+Dialogue: 0,0:00:58.07,0:00:59.20,Default,,0,0,0,,when \Nwe did the story about the

+Dialogue: 0,0:00:59.20,0:01:04.01,Default,,0,0,0,,Hubble Telescope "15 Years of Discovery".

+Dialogue: 0,0:01:04.16,0:01:07.04,Default,,0,0,0,,It was a lot of fun again.

+Dialogue: 0,0:01:15.04,0:01:18.16,Default,,0,0,0,,We usually \N don't get the final film \Nbefore we start composing

+Dialogue: 0,0:01:18.21,0:01:22.02,Default,,0,0,0,,We had a script and many details about the story,

+Dialogue: 0,0:01:22.10,0:01:26.08,Default,,0,0,0,,and so we worked\N in parallel \Nin the movie production

+Dialogue: 0,0:01:27.04,0:01:30.17,Default,,0,0,0,,The largest part of \N the soundtrack \Nwas done without seeing a movie

+Dialogue: 0,0:01:30.17,0:01:36.06,Default,,0,0,0,,It was no problem, but very inspiring \Nand a free working process.

+Dialogue: 0,0:02:08.13,0:02:10.23,Default,,0,0,0,,Galileo's theme is one of my favourites.

+Dialogue: 0,0:02:10.23,0:02:14.10,Default,,0,0,0,,We did a lot of different versions \Nabout the central theme.

+Dialogue: 0,0:02:14.10,0:02:18.02,Default,,0,0,0,,For the 17th century \N we used a nice harpsichord

+Dialogue: 0,0:02:19.05,0:02:22.09,Default,,0,0,0,,and so we landed directly into Galileo's time.

diff --git a/tests/ref/fate/sub-subripenc b/tests/ref/fate/sub-subripenc
new file mode 100644
index 0000000000..7f35ae9b49
--- /dev/null
+++ b/tests/ref/fate/sub-subripenc
@@ -0,0 +1,14 @@
+1
+00:00:00,970 --> 00:00:02,540
+<font face="Serif" size="18">- Test 1.

+- Test 2.</font>
+
+2
+00:00:03,050 --> 00:00:04,740
+<font face="Serif" size="18">Test 3.</font>
+
+3
+00:00:05,850 --> 00:00:08,140
+<font face="Serif" size="18">- Test 4.

+- Test 5.</font>
+
diff --git a/tests/ref/fate/sub-subviewer b/tests/ref/fate/sub-subviewer
new file mode 100644
index 0000000000..19944f6416
--- /dev/null
+++ b/tests/ref/fate/sub-subviewer
@@ -0,0 +1,15 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:01:00.10,0:02:00.20,Default,,0,0,0,,Hello.\NWorld!

+Dialogue: 0,0:02:00.30,0:03:00.40,Default,,0,0,0,,\Nfoo\Nbar\Nbla\Nmixed with br

+Dialogue: 0,0:03:04.12,0:03:10.20,Default,,0,0,0,,Another event.

diff --git a/tests/ref/fate/sub-subviewer1 b/tests/ref/fate/sub-subviewer1
new file mode 100644
index 0000000000..a75406b857
--- /dev/null
+++ b/tests/ref/fate/sub-subviewer1
@@ -0,0 +1,22 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:03:45.00,0:03:48.00,Default,,0,0,0,,- ToIerábiIis?\N- Azt jeIenti: tűrhető.

+Dialogue: 0,0:03:48.00,0:03:51.00,Default,,0,0,0,,Tudom, mit jeIent. Megnézhetem?

+Dialogue: 0,0:03:52.00,0:03:54.00,Default,,0,0,0,,TiszteIt bírónő.

+Dialogue: 0,0:03:57.00,0:04:00.00,Default,,0,0,0,,KépzeIje magát\Na környékbeIi gyermekek heIyébe.

+Dialogue: 0,0:04:01.00,0:04:05.00,Default,,0,0,0,,Naphosszat monoton, döngöIő zaj\Nszaggatja a dobhártyájukat.

+Dialogue: 0,0:04:05.00,0:04:10.00,Default,,0,0,0,,Ahogy egyre föIébük tornyosuI,\Nrájuk veti sötét árnyékát.

+Dialogue: 0,0:04:10.00,0:04:15.00,Default,,0,0,0,,Ez a feIhőkarcoIó, az emberi\Nmohóság újabb emIékműve.

+Dialogue: 0,1:50:38.00,1:50:41.00,Default,,0,0,0,,készen áIIok.

+Dialogue: 0,1:51:00.00,1:51:03.00,Default,,0,0,0,,Joe ... Miguel keres.

+Dialogue: 0,2:00:18.00,9:59:59.99,Default,,0,0,0,,Magyar szöveg: Nikowvitz Oszkár

diff --git a/tests/ref/fate/sub-textenc b/tests/ref/fate/sub-textenc
new file mode 100644
index 0000000000..3ea56b38f0
--- /dev/null
+++ b/tests/ref/fate/sub-textenc
@@ -0,0 +1,213 @@
+1
+00:00:00,000 --> 00:00:00,000
+Don't show this text it may be used to insert hidden data
+
+2
+00:00:01,500 --> 00:00:04,500
+SubRip subtitles capability tester 1.3o by ale5000

+Use VLC 1.1 or higher as reference for most things and MPC Home Cinema for others

+This text should be blue

+This text should be red

+This text should be black

+If you see this with the normal font, the player don't (fully) support font face
+
+3
+00:00:04,500 --> 00:00:04,500
+Hidden
+
+4
+00:00:04,501 --> 00:00:07,500
+This text should be small

+This text should be normal

+This text should be big
+
+5
+00:00:07,501 --> 00:00:11,500
+This should be an E with an accent: È

+日本語

+This text should be bold, italics and underline

+This text should be small and green

+This text should be small and red

+This text should be big and brown
+
+6
+00:00:11,501 --> 00:00:14,500
+This line should be bold

+This line should be italics

+This line should be underline

+This line should be strikethrough

+Both lines

+should be underline
+
+7
+00:00:14,501 --> 00:00:17,500
+>

+It would be a good thing to

+hide invalid html tags that are closed and show the text in them

+but show un-closed invalid html tags

+Show not opened tags

+<
+
+8
+00:00:17,501 --> 00:00:20,500
+and also

+hide invalid html tags with parameters that are closed and show the text in them

+but show un-closed invalid html tags

+This text should be showed underlined without problems also: 2<3,5>1,4<6

+This shouldn't be underlined
+
+9
+00:00:20,501 --> 00:00:21,500
+This text should be in the normal position...
+
+10
+00:00:21,501 --> 00:00:22,500
+This text should NOT be in the normal position
+
+11
+00:00:22,501 --> 00:00:24,500
+Implementation is the same of the ASS tag

+This text should be at the

+top and horizontally centered
+
+12
+00:00:22,501 --> 00:00:24,500
+This text should be at the

+middle and horizontally centered
+
+13
+00:00:22,501 --> 00:00:24,500
+This text should be at the

+bottom and horizontally centered
+
+14
+00:00:24,501 --> 00:00:26,500
+This text should be at the

+top and horizontally at the left
+
+15
+00:00:24,501 --> 00:00:26,500
+This text should be at the

+middle and horizontally at the left

+(The second position must be ignored)
+
+16
+00:00:24,501 --> 00:00:26,500
+This text should be at the

+bottom and horizontally at the left
+
+17
+00:00:26,501 --> 00:00:28,500
+This text should be at the

+top and horizontally at the right
+
+18
+00:00:26,501 --> 00:00:28,500
+This text should be at the

+middle and horizontally at the right
+
+19
+00:00:26,501 --> 00:00:28,500
+This text should be at the

+bottom and horizontally at the right
+
+20
+00:00:28,501 --> 00:00:31,500
+This could be the most difficult thing to implement
+
+21
+00:00:31,501 --> 00:00:50,500
+First text
+
+22
+00:00:33,500 --> 00:00:35,500
+Second, it shouldn't overlap first
+
+23
+00:00:35,501 --> 00:00:37,500
+Third, it should replace second
+
+24
+00:00:36,501 --> 00:00:50,500
+Fourth, it shouldn't overlap first and third
+
+25
+00:00:40,501 --> 00:00:45,500
+Fifth, it should replace third
+
+26
+00:00:45,501 --> 00:00:50,500
+Sixth, it shouldn't be

+showed overlapped
+
+27
+00:00:50,501 --> 00:00:52,500
+TEXT 1 (bottom)
+
+28
+00:00:50,501 --> 00:00:52,500
+text 2
+
+29
+00:00:52,501 --> 00:00:54,500
+Hide these tags:

+also hide these tags:

+but show this: {normal text}
+
+30
+00:00:54,501 --> 00:01:00,500
+

+\ N is a forced line break

+\ h is a hard space

+Normal spaces at the start and at the end of the line are trimmed while hard spaces are not trimmed.

+The\hline\hwill\hnever\hbreak\hautomatically\hright\hbefore\hor\hafter\ha\hhard\hspace.\h:-D
+
+31
+00:00:54,501 --> 00:00:56,500
+

+\h\h\h\h\hA (05 hard spaces followed by a letter)

+A (Normal  spaces followed by a letter)

+A (No hard spaces followed by a letter)
+
+32
+00:00:56,501 --> 00:00:58,500
+\h\h\h\h\hA (05 hard spaces followed by a letter)

+A (Normal  spaces followed by a letter)

+A (No hard spaces followed by a letter)

+Show this: \TEST and this: \-)
+
+33
+00:00:58,501 --> 00:01:00,500
+

+A letter followed by 05 hard spaces: A\h\h\h\h\h

+A letter followed by normal  spaces: A

+A letter followed by no hard spaces: A

+05 hard  spaces between letters: A\h\h\h\h\hA

+5 normal spaces between letters: A     A

+

+^--Forced line break
+
+34
+00:01:00,501 --> 00:01:02,500
+Both line should be strikethrough,

+yes.

+Correctly closed tags

+should be hidden.
+
+35
+00:01:02,501 --> 00:01:04,500
+It shouldn't be strikethrough,

+not opened tag showed as text.

+Not opened tag showed as text.
+
+36
+00:01:04,501 --> 00:01:06,500
+Three lines should be strikethrough,

+yes.

+Not closed tags showed as text
+
+37
+00:01:06,501 --> 00:01:08,500
+Both line should be strikethrough but

+the wrong closing tag should be showed
+
diff --git a/tests/ref/fate/sub-vplayer b/tests/ref/fate/sub-vplayer
new file mode 100644
index 0000000000..6e804f6c22
--- /dev/null
+++ b/tests/ref/fate/sub-vplayer
@@ -0,0 +1,15 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:00.12,0:00:23.51,Default,,0,0,0,,Hello

+Dialogue: 0,0:00:23.51,0:01:02.05,Default,,0,0,0,,World

+Dialogue: 0,0:01:02.05,9:59:59.99,Default,,0,0,0,,!\Nnewline

diff --git a/tests/ref/fate/sub-webvtt b/tests/ref/fate/sub-webvtt
new file mode 100644
index 0000000000..8c63a90279
--- /dev/null
+++ b/tests/ref/fate/sub-webvtt
@@ -0,0 +1,27 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:11.00,0:00:13.00,Default,,0,0,0,,We are in New York City\NRandom line added

+Dialogue: 0,0:00:13.00,0:00:16.00,Default,,0,0,0,,We're actually at the Lucern Hotel, just down the street

+Dialogue: 0,0:00:16.00,0:00:18.00,Default,,0,0,0,,from the American Museum of Natural History

+Dialogue: 0,0:00:18.00,0:00:20.00,Default,,0,0,0,,And with me is Neil deGrasse Tyson

+Dialogue: 0,0:00:20.00,0:00:22.00,Default,,0,0,0,,Astrophysicist, Director of the Hayden Planetarium

+Dialogue: 0,0:00:22.00,0:00:24.00,Default,,0,0,0,,at the AMNH.

+Dialogue: 0,0:00:24.00,0:00:26.00,Default,,0,0,0,,Thank you for walking down here.

+Dialogue: 0,0:00:27.00,0:00:30.00,Default,,0,0,0,,And I want to do a follow-up on the last conversation we did.\Nmultiple lines\Nagain

+Dialogue: 0,0:00:30.00,0:00:31.50,Default,,0,0,0,,When we e-mailed—

+Dialogue: 0,0:00:30.50,0:00:32.50,Default,,0,0,0,,Didn't we {\b1}talk {\i1}about\N{\i0} enough{\b0} in that conversation? \{I'm not an ASS comment\}

+Dialogue: 0,0:00:32.00,0:00:35.50,Default,,0,0,0,,No! No no no no; 'cos 'cos obviously 'cos

+Dialogue: 0,0:00:32.50,0:00:33.50,Default,,0,0,0,,{\i1}Laughs{\i0}

+Dialogue: 0,0:00:35.50,0:00:38.00,Default,,0,0,0,,You know I'm so excited my glasses are falling off here.

+Dialogue: 0,0:00:50.00,0:00:51.13,Default,,0,0,0,,This event and the following\None have CLRF

+Dialogue: 0,0:59:00.12,1:23:45.68,Default,,0,0,0,,Obiwan Kenobi

diff --git a/tests/ref/fate/sub-webvtt2 b/tests/ref/fate/sub-webvtt2
new file mode 100644
index 0000000000..9f7827d66f
--- /dev/null
+++ b/tests/ref/fate/sub-webvtt2
@@ -0,0 +1,24 @@
+[Script Info]

+; Script generated by FFmpeg/Lavc

+ScriptType: v4.00+

+PlayResX: 384

+PlayResY: 288

+

+[V4+ Styles]

+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding

+Style: Default,Arial,16,&Hffffff,&Hffffff,&H0,&H0,0,0,0,0,100,100,0,0,1,1,0,2,10,10,10,0

+

+[Events]

+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text

+Dialogue: 0,0:00:00.00,0:00:20.00,Default,,0,0,0,,Hi, my name is Fred

+Dialogue: 0,0:00:02.50,0:00:22.50,Default,,0,0,0,,Hi, I’m Bill

+Dialogue: 0,0:00:05.00,0:00:25.00,Default,,0,0,0,,Would you like to get a coffee?

+Dialogue: 0,0:00:07.50,0:00:27.50,Default,,0,0,0,,Sure! I’ve only had one today.

+Dialogue: 0,0:00:10.00,0:00:30.00,Default,,0,0,0,,This is my fourth!

+Dialogue: 0,0:00:12.50,0:00:32.50,Default,,0,0,0,,OK, let’s go.

+Dialogue: 0,0:00:38.00,0:00:43.00,Default,,0,0,0,,I want to 愛あい love you\NThat's not proper English!

+Dialogue: 0,0:00:43.00,0:00:46.00,Default,,0,0,0,,{\i1}キツネ{\i0}じゃない　キツネじゃない\N乙女おとめは

+Dialogue: 0,0:00:50.00,0:00:55.00,Default,,0,0,0,,Some time ago in a rather distant place....

+Dialogue: 0,0:00:55.00,0:01:00.00,Default,,0,0,0,,Descending: 123456\NAscending: 123456

+Dialogue: 0,0:01:00.00,0:01:05.00,Default,,0,0,0,,>> Never gonna give you up Never gonna let you down\NNever\hgonna\hrun\haround & desert\hyou

+Dialogue: 0,0:55:00.00,1:00:00.00,Default,,0,0,0,,Transcrit par Célestes™

diff --git a/tests/ref/fate/sub-webvttenc b/tests/ref/fate/sub-webvttenc
new file mode 100644
index 0000000000..45ae0b6131
--- /dev/null
+++ b/tests/ref/fate/sub-webvttenc
@@ -0,0 +1,177 @@
+WEBVTT
+
+00:00.000 --> 00:00.000
+Don't show this text it may be used to insert hidden data
+
+00:01.500 --> 00:04.500
+SubRip subtitles capability tester 1.3o by ale5000
+<b><i>Use VLC 1.1 or higher as reference for most things and MPC Home Cinema for others</i></b>
+This text should be blue
+This text should be red
+This text should be black
+If you see this with the normal font, the player don't (fully) support font face
+
+00:04.500 --> 00:04.500
+Hidden
+
+00:04.501 --> 00:07.500
+This text should be small
+This text should be normal
+This text should be big
+
+00:07.501 --> 00:11.500
+This should be an E with an accent: È
+日本語
+<b><i><u>This text should be bold, italics and underline</u></i></b>
+This text should be small and green
+This text should be small and red
+This text should be big and brown
+
+00:11.501 --> 00:14.500
+<b>This line should be bold</b>
+<i>This line should be italics</i>
+<u>This line should be underline</u>
+This line should be strikethrough
+<u>Both lines
+should be underline</u>
+
+00:14.501 --> 00:17.500
+>
+It would be a good thing to
+hide invalid html tags that are closed and show the text in them
+but show un-closed invalid html tags
+Show not opened tags
+<
+
+00:17.501 --> 00:20.500
+and also
+hide invalid html tags with parameters that are closed and show the text in them
+but show un-closed invalid html tags
+<u>This text should be showed underlined without problems also: 2<3,5>1,4<6</u>
+This shouldn't be underlined
+
+00:20.501 --> 00:21.500
+This text should be in the normal position...
+
+00:21.501 --> 00:22.500
+This text should NOT be in the normal position
+
+00:22.501 --> 00:24.500
+Implementation is the same of the ASS tag
+This text should be at the
+top and horizontally centered
+
+00:22.501 --> 00:24.500
+This text should be at the
+middle and horizontally centered
+
+00:22.501 --> 00:24.500
+This text should be at the
+bottom and horizontally centered
+
+00:24.501 --> 00:26.500
+This text should be at the
+top and horizontally at the left
+
+00:24.501 --> 00:26.500
+This text should be at the
+middle and horizontally at the left
+(The second position must be ignored)
+
+00:24.501 --> 00:26.500
+This text should be at the
+bottom and horizontally at the left
+
+00:26.501 --> 00:28.500
+This text should be at the
+top and horizontally at the right
+
+00:26.501 --> 00:28.500
+This text should be at the
+middle and horizontally at the right
+
+00:26.501 --> 00:28.500
+This text should be at the
+bottom and horizontally at the right
+
+00:28.501 --> 00:31.500
+This could be the most difficult thing to implement
+
+00:31.501 --> 00:50.500
+First text
+
+00:33.500 --> 00:35.500
+Second, it shouldn't overlap first
+
+00:35.501 --> 00:37.500
+Third, it should replace second
+
+00:36.501 --> 00:50.500
+Fourth, it shouldn't overlap first and third
+
+00:40.501 --> 00:45.500
+Fifth, it should replace third
+
+00:45.501 --> 00:50.500
+Sixth, it shouldn't be
+showed overlapped
+
+00:50.501 --> 00:52.500
+TEXT 1 (bottom)
+
+00:50.501 --> 00:52.500
+text 2
+
+00:52.501 --> 00:54.500
+Hide these tags:
+also hide these tags:
+but show this: {normal text}
+
+00:54.501 --> 01:00.500
+
+\ N is a forced line break
+\ h is a hard space
+Normal spaces at the start and at the end of the line are trimmed while hard spaces are not trimmed.
+The\hline\hwill\hnever\hbreak\hautomatically\hright\hbefore\hor\hafter\ha\hhard\hspace.\h:-D
+
+00:54.501 --> 00:56.500
+
+\h\h\h\h\hA (05 hard spaces followed by a letter)
+A (Normal  spaces followed by a letter)
+A (No hard spaces followed by a letter)
+
+00:56.501 --> 00:58.500
+\h\h\h\h\hA (05 hard spaces followed by a letter)
+A (Normal  spaces followed by a letter)
+A (No hard spaces followed by a letter)
+Show this: \TEST and this: \-)
+
+00:58.501 --> 01:00.500
+
+A letter followed by 05 hard spaces: A\h\h\h\h\h
+A letter followed by normal  spaces: A
+A letter followed by no hard spaces: A
+05 hard  spaces between letters: A\h\h\h\h\hA
+5 normal spaces between letters: A     A
+
+^--Forced line break
+
+01:00.501 --> 01:02.500
+Both line should be strikethrough,
+yes.
+Correctly closed tags
+should be hidden.
+
+01:02.501 --> 01:04.500
+It shouldn't be strikethrough,
+not opened tag showed as text.
+Not opened tag showed as text.
+
+01:04.501 --> 01:06.500
+Three lines should be strikethrough,
+yes.
+Not closed tags showed as text
+
+01:06.501 --> 01:08.500
+Both line should be strikethrough but
+the wrong closing tag should be showed
diff --git a/tests/ref/fate/sub2video b/tests/ref/fate/sub2video
new file mode 100644
index 0000000000..4e034a5e91
--- /dev/null
+++ b/tests/ref/fate/sub2video
@@ -0,0 +1,186 @@
+#extradata 1:      150, 0x7c99258b
+#tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 0/1
+#tb 1: 1/1000000
+#media_type 1: subtitle
+#codec_id 1: dvd_subtitle
+0,          0,          0,        1,   518400, 0x83c27b82
+0,          1,          1,        1,   518400, 0x4051c7f9
+0,          2,          2,        1,   518400, 0xfb00e17e
+1,     499000,     499000,  4960000,     1015, 0x19e092d2, F=0x0
+0,          3,          3,        1,   518400, 0x192abb74
+0,          4,          4,        1,   518400, 0x4669a88b
+0,          5,          5,        1,   518400, 0xaababe00
+0,          6,          6,        1,   518400, 0x98a211a5
+0,          7,          7,        1,   518400, 0x440e7547
+0,          8,          8,        1,   518400, 0xca5bb496
+0,          9,          9,        1,   518400, 0xf86e0b0a
+0,         10,         10,        1,   518400, 0xb80fa020
+0,         11,         11,        1,   518400, 0x41c2a54b
+0,         12,         12,        1,   518400, 0x51baf353
+0,         13,         13,        1,   518400, 0x967ea7f3
+0,         14,         14,        1,   518400, 0x819e7f89
+0,         15,         15,        1,   518400, 0x192233e1
+0,         16,         16,        1,   518400, 0xc80a0eb3
+0,         17,         17,        1,   518400, 0x08260a23
+0,         18,         18,        1,   518400, 0xc92e2caf
+0,         19,         19,        1,   518400, 0x3fe36eea
+0,         20,         20,        1,   518400, 0x0891e8d5
+0,         21,         21,        1,   518400, 0x84655095
+0,         22,         22,        1,   518400, 0x9c7fa014
+0,         23,         23,        1,   518400, 0x9c43b656
+0,         24,         24,        1,   518400, 0x2cf46221
+0,         25,         25,        1,   518400, 0x7322e11c
+0,         26,         26,        1,   518400, 0x45af1a84
+0,         27,         27,        1,   518400, 0x7b781071
+0,         28,         28,        1,   518400, 0x4f7c706c
+0,         29,         29,        1,   518400, 0xb227603b
+0,         30,         30,        1,   518400, 0x7b4b89c2
+0,         31,         31,        1,   518400, 0x456da21e
+0,         32,         32,        1,   518400, 0xb691979f
+0,         33,         33,        1,   518400, 0x0dfaa66d
+0,         34,         34,        1,   518400, 0x191a6f23
+0,         35,         35,        1,   518400, 0xa03b2605
+0,         36,         36,        1,   518400, 0xb36aff87
+0,         37,         37,        1,   518400, 0xf5f0bc4a
+0,         38,         38,        1,   518400, 0x863d701a
+0,         39,         39,        1,   518400, 0xd11b4dce
+0,         40,         40,        1,   518400, 0x969236bd
+0,         41,         41,        1,   518400, 0xb60a485c
+0,         42,         42,        1,   518400, 0xe9796621
+0,         43,         43,        1,   518400, 0x3e8fc04b
+0,         44,         44,        1,   518400, 0xac9944e3
+0,         45,         45,        1,   518400, 0x01452b4d
+0,         46,         46,        1,   518400, 0xb384f6d2
+0,         47,         47,        1,   518400, 0xde69683f
+0,         48,         48,        1,   518400, 0x7df08fba
+0,         49,         49,        1,   518400, 0xbab197ea
+1,   15355000,   15355000,  4733000,     2094, 0x3c171425, F=0x0
+0,         77,         77,        1,   518400, 0x902285d9
+0,        100,        100,        1,   518400, 0xbab197ea
+1,   48797000,   48797000,  2560000,     2480, 0x7c0edf21, F=0x0
+0,        244,        244,        1,   518400, 0x7a11c812
+0,        257,        257,        1,   518400, 0xbab197ea
+1,   51433000,   51433000,  2366000,     3059, 0xc95b8a05, F=0x0
+0,        258,        258,        1,   518400, 0x34cdddee
+0,        269,        269,        1,   518400, 0xbab197ea
+1,   53910000,   53910000,  2696000,     2095, 0x61bb15ed, F=0x0
+0,        270,        270,        1,   518400, 0x4db4ce51
+0,        283,        283,        1,   518400, 0xbab197ea
+1,   56663000,   56663000,  1262000,     1013, 0xc9ae89b7, F=0x0
+0,        284,        284,        1,   518400, 0xe6bc0ea9
+0,        290,        290,        1,   518400, 0xbab197ea
+1,   58014000,   58014000,  1661000,      969, 0xe01878f0, F=0x0
+0,        291,        291,        1,   518400, 0xa8643af7
+0,        298,        298,        1,   518400, 0xbab197ea
+1,   67724000,   67724000,  1365000,      844, 0xe7db4fc1, F=0x0
+0,        339,        339,        1,   518400, 0xb1885c67
+0,        345,        345,        1,   518400, 0xbab197ea
+1,   69175000,   69175000,  1558000,      802, 0xf48531ba, F=0x0
+0,        346,        346,        1,   518400, 0x378e3fd0
+0,        354,        354,        1,   518400, 0xbab197ea
+1,   70819000,   70819000,  1865000,     1709, 0xb4d5a1bd, F=0x0
+0,        355,        355,        1,   518400, 0xa3782469
+0,        363,        363,        1,   518400, 0xbab197ea
+1,   72762000,   72762000,  1968000,     2438, 0x99d7bc82, F=0x0
+0,        364,        364,        1,   518400, 0xba23a0d5
+0,        374,        374,        1,   518400, 0xbab197ea
+1,   74806000,   74806000,  1831000,     2116, 0x96514097, F=0x0
+0,        375,        375,        1,   518400, 0x129de2f8
+0,        383,        383,        1,   518400, 0xbab197ea
+1,   76716000,   76716000,  1262000,     1822, 0xefccc72e, F=0x0
+0,        384,        384,        1,   518400, 0x19772f0f
+0,        390,        390,        1,   518400, 0xbab197ea
+1,   78051000,   78051000,  1524000,      987, 0x7b927a27, F=0x0
+0,        391,        391,        1,   518400, 0x56f54e73
+0,        398,        398,        1,   518400, 0xbab197ea
+1,   79644000,   79644000,  2662000,     2956, 0x190778f7, F=0x0
+0,        399,        399,        1,   518400, 0x300b5247
+1,   82380000,   82380000,  2764000,     3094, 0xc021b7d3, F=0x0
+0,        412,        412,        1,   518400, 0xbab197ea
+0,        413,        413,        1,   518400, 0x6fd028fa
+0,        426,        426,        1,   518400, 0xbab197ea
+1,   85225000,   85225000,  2366000,     2585, 0x74d0048f, F=0x0
+0,        427,        427,        1,   518400, 0x01f80e9d
+0,        438,        438,        1,   518400, 0xbab197ea
+1,   87652000,   87652000,  1831000,      634, 0x8832fda1, F=0x0
+0,        439,        439,        1,   518400, 0xb48d90c0
+0,        447,        447,        1,   518400, 0xbab197ea
+1,   91531000,   91531000,  2332000,     2080, 0x97a1146f, F=0x0
+0,        458,        458,        1,   518400, 0xcb5a0173
+0,        469,        469,        1,   518400, 0xbab197ea
+1,   95510000,   95510000,  3299000,     2964, 0x8b8f6684, F=0x0
+0,        478,        478,        1,   518400, 0xb8a323e4
+0,        494,        494,        1,   518400, 0xbab197ea
+1,   98872000,   98872000,  2161000,     1875, 0x9002ef71, F=0x0
+0,        495,        495,        1,   518400, 0xc43518ba
+0,        505,        505,        1,   518400, 0xbab197ea
+1,  101124000,  101124000,  4096000,     3872, 0x20c6ed9c, F=0x0
+0,        506,        506,        1,   518400, 0x04e38692
+0,        526,        526,        1,   518400, 0xbab197ea
+1,  105303000,  105303000,  2730000,     3094, 0xf203a663, F=0x0
+0,        527,        527,        1,   518400, 0x856b0ee5
+0,        540,        540,        1,   518400, 0xbab197ea
+1,  108106000,  108106000,  2059000,     2404, 0x41a7b429, F=0x0
+0,        541,        541,        1,   518400, 0x3e5beee2
+0,        551,        551,        1,   518400, 0xbab197ea
+1,  141556000,  141556000,  1661000,     1088, 0xde20aa20, F=0x0
+0,        708,        708,        1,   518400, 0xb8bc1365
+0,        716,        716,        1,   518400, 0xbab197ea
+0,        817,        817,        1,   518400, 0x83efa32d
+1,  163445000,  163445000,  1331000,      339, 0x8bd186ef, F=0x0
+0,        824,        824,        1,   518400, 0xbab197ea
+0,        840,        840,        1,   518400, 0x03ea0e90
+1,  168049000,  168049000,  1900000,     1312, 0x0bf20e8d, F=0x0
+0,        850,        850,        1,   518400, 0xbab197ea
+1,  170035000,  170035000,  1524000,     1279, 0xb6c2dafe, F=0x0
+0,        851,        851,        1,   518400, 0x8780239e
+0,        858,        858,        1,   518400, 0xbab197ea
+0,        861,        861,        1,   518400, 0x6eb72347
+1,  172203000,  172203000,  1695000,     1826, 0x9a1ac769, F=0x0
+0,        869,        869,        1,   518400, 0xbab197ea
+1,  173947000,  173947000,  1934000,     1474, 0xa9b03cdc, F=0x0
+0,        870,        870,        1,   518400, 0x9c4a3a3d
+0,        879,        879,        1,   518400, 0xbab197ea
+1,  175957000,  175957000,  1763000,     1019, 0x20409355, F=0x0
+0,        880,        880,        1,   518400, 0xc9ebfa89
+0,        889,        889,        1,   518400, 0xbab197ea
+0,        946,        946,        1,   518400, 0xbaf801ef
+1,  189295000,  189295000,  1968000,     1596, 0x408c726e, F=0x0
+0,        956,        956,        1,   518400, 0xbab197ea
+1,  191356000,  191356000,  1228000,     1517, 0xae8c5c2b, F=0x0
+0,        957,        957,        1,   518400, 0x59f4e72f
+0,        963,        963,        1,   518400, 0xbab197ea
+1,  192640000,  192640000,  1763000,     2506, 0xa458d6d4, F=0x0
+0,        964,        964,        1,   518400, 0x9d5b9d69
+0,        972,        972,        1,   518400, 0xbab197ea
+1,  195193000,  195193000,  1092000,     1074, 0x397ba9a8, F=0x0
+0,        976,        976,        1,   518400, 0x923d1ce7
+0,        981,        981,        1,   518400, 0xbab197ea
+1,  196361000,  196361000,  1524000,     1715, 0x695ca41e, F=0x0
+0,        982,        982,        1,   518400, 0x6e652cd2
+0,        989,        989,        1,   518400, 0xbab197ea
+1,  197946000,  197946000,  1160000,      789, 0xc63a189e, F=0x0
+0,        990,        990,        1,   518400, 0x25113966
+0,        996,        996,        1,   518400, 0xbab197ea
+1,  199230000,  199230000,  1627000,     1846, 0xeea8c599, F=0x0
+0,        997,        997,        1,   518400, 0x2dc83609
+0,       1004,       1004,        1,   518400, 0xbab197ea
+1,  200924000,  200924000,  1763000,      922, 0xd4a87222, F=0x0
+0,       1005,       1005,        1,   518400, 0x90483bc6
+0,       1013,       1013,        1,   518400, 0xbab197ea
+0,       1053,       1053,        1,   518400, 0x3de86ab7
+1,  210600000,  210600000,  1831000,      665, 0x55580135, F=0x0
+0,       1062,       1062,        1,   518400, 0xbab197ea
+1,  214771000,  214771000,  1558000,     1216, 0x50d1f6c5, F=0x0
+0,       1074,       1074,        1,   518400, 0x8c320e68
+0,       1082,       1082,        1,   518400, 0xbab197ea
+0,       1128,       1128,        1,   518400, 0x81e977b2
+1,  225640000,  225640000,  2127000,     2133, 0x670c11a5, F=0x0
+0,       1139,       1139,        1,   518400, 0xbab197ea
+1,  227834000,  227834000,  1262000,     1264, 0xc1d9fc57, F=0x0
+0,       1140,       1140,        1,   518400, 0xb046dd30
+0,       1145,       1145,        1,   518400, 0xbab197ea
diff --git a/tests/ref/fate/sunraster-1bit-raw b/tests/ref/fate/sunraster-1bit-raw
index 123e245217..a55a541ed1 100644
--- a/tests/ref/fate/sunraster-1bit-raw
+++ b/tests/ref/fate/sunraster-1bit-raw
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x512
+#sar 0: 0/1
 0,          0,          0,        1,    32768, 0x6d16e246
diff --git a/tests/ref/fate/sunraster-1bit-rle b/tests/ref/fate/sunraster-1bit-rle
index 123e245217..a55a541ed1 100644
--- a/tests/ref/fate/sunraster-1bit-rle
+++ b/tests/ref/fate/sunraster-1bit-rle
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x512
+#sar 0: 0/1
 0,          0,          0,        1,    32768, 0x6d16e246
diff --git a/tests/ref/fate/sunraster-24bit-raw b/tests/ref/fate/sunraster-24bit-raw
index fa059ef320..dc966098eb 100644
--- a/tests/ref/fate/sunraster-24bit-raw
+++ b/tests/ref/fate/sunraster-24bit-raw
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x512
+#sar 0: 0/1
 0,          0,          0,        1,   786432, 0xb4d417bf
diff --git a/tests/ref/fate/sunraster-24bit-rle b/tests/ref/fate/sunraster-24bit-rle
index fa059ef320..dc966098eb 100644
--- a/tests/ref/fate/sunraster-24bit-rle
+++ b/tests/ref/fate/sunraster-24bit-rle
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x512
+#sar 0: 0/1
 0,          0,          0,        1,   786432, 0xb4d417bf
diff --git a/tests/ref/fate/sunraster-8bit-raw b/tests/ref/fate/sunraster-8bit-raw
index 659b433047..94a1014acc 100644
--- a/tests/ref/fate/sunraster-8bit-raw
+++ b/tests/ref/fate/sunraster-8bit-raw
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x512
+#sar 0: 0/1
 0,          0,          0,        1,   786432, 0xf4364008
diff --git a/tests/ref/fate/sunraster-8bit-rle b/tests/ref/fate/sunraster-8bit-rle
index 659b433047..94a1014acc 100644
--- a/tests/ref/fate/sunraster-8bit-rle
+++ b/tests/ref/fate/sunraster-8bit-rle
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x512
+#sar 0: 0/1
 0,          0,          0,        1,   786432, 0xf4364008
diff --git a/tests/ref/fate/sunraster-8bit_gray-raw b/tests/ref/fate/sunraster-8bit_gray-raw
index 455af5f612..d33a13c57c 100644
--- a/tests/ref/fate/sunraster-8bit_gray-raw
+++ b/tests/ref/fate/sunraster-8bit_gray-raw
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1024x768
+#sar 0: 0/1
 0,          0,          0,        1,   786432, 0x5859b48e
diff --git a/tests/ref/fate/svq1 b/tests/ref/fate/svq1
index 3b26d1ffa5..d53e2952e4 100644
--- a/tests/ref/fate/svq1
+++ b/tests/ref/fate/svq1
@@ -1,151 +1,155 @@
-#tb 0: 1/600
+#tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    21600, 0x7f9389e3
-0,         40,         40,        1,    21600, 0xcebb8896
-0,         80,         80,        1,    21600, 0xef51860a
-0,        120,        120,        1,    21600, 0x88d97e7d
-0,        160,        160,        1,    21600, 0xc7757c88
-0,        200,        200,        1,    21600, 0x2f537ade
-0,        240,        240,        1,    21600, 0xd50a7eff
-0,        280,        280,        1,    21600, 0xdcfb7fc6
-0,        320,        320,        1,    21600, 0x0d608299
-0,        360,        360,        1,    21600, 0x97ca81b4
-0,        400,        400,        1,    21600, 0x791f80e7
-0,        440,        440,        1,    21600, 0x96ae7d33
-0,        480,        480,        1,    21600, 0x4d7474a8
-0,        520,        520,        1,    21600, 0x2ae76f37
-0,        560,        560,        1,    21600, 0x7da76265
-0,        600,        600,        1,    21600, 0x93ae3eb6
-0,        640,        640,        1,    21600, 0xebfd3868
-0,        680,        680,        1,    21600, 0x54f82ffa
-0,        720,        720,        1,    21600, 0x8d5b2ad0
-0,        760,        760,        1,    21600, 0xe67128e6
-0,        800,        800,        1,    21600, 0xb7bf613e
-0,        840,        840,        1,    21600, 0xefd0f51b
-0,        880,        880,        1,    21600, 0x31b7da59
-0,        920,        920,        1,    21600, 0x7a84a8f7
-0,        960,        960,        1,    21600, 0x0351ad27
-0,       1000,       1000,        1,    21600, 0xed6f434d
-0,       1040,       1040,        1,    21600, 0x0e771127
-0,       1080,       1080,        1,    21600, 0x37bf0b95
-0,       1120,       1120,        1,    21600, 0x30e10a77
-0,       1160,       1160,        1,    21600, 0x1a48288a
-0,       1200,       1200,        1,    21600, 0xf43c6770
-0,       1240,       1240,        1,    21600, 0x3c43ae68
-0,       1280,       1280,        1,    21600, 0x04dc0949
-0,       1320,       1320,        1,    21600, 0x7920758d
-0,       1360,       1360,        1,    21600, 0x6c12bab5
-0,       1400,       1400,        1,    21600, 0x1ac23706
-0,       1440,       1440,        1,    21600, 0x7a95cb5f
-0,       1480,       1480,        1,    21600, 0xf1bfbb46
-0,       1520,       1520,        1,    21600, 0x773d1d0c
-0,       1560,       1560,        1,    21600, 0x2e7bea65
-0,       1600,       1600,        1,    21600, 0xdb1a086f
-0,       1640,       1640,        1,    21600, 0x5b36b78d
-0,       1680,       1680,        1,    21600, 0x7b533ca6
-0,       1720,       1720,        1,    21600, 0x65d75105
-0,       1760,       1760,        1,    21600, 0xfe6f6207
-0,       1800,       1800,        1,    21600, 0x44c4ce57
-0,       1840,       1840,        1,    21600, 0x220f3dae
-0,       1880,       1880,        1,    21600, 0xb4d20ffb
-0,       1920,       1920,        1,    21600, 0x8907ad72
-0,       1960,       1960,        1,    21600, 0xc6418998
-0,       2000,       2000,        1,    21600, 0x395b6670
-0,       2040,       2040,        1,    21600, 0x83495b88
-0,       2080,       2080,        1,    21600, 0x8920d683
-0,       2120,       2120,        1,    21600, 0xd7fc64ea
-0,       2160,       2160,        1,    21600, 0x21a3b222
-0,       2200,       2200,        1,    21600, 0xc11f2dbd
-0,       2240,       2240,        1,    21600, 0xd1d5495d
-0,       2280,       2280,        1,    21600, 0x70f2de20
-0,       2320,       2320,        1,    21600, 0x10adc9a9
-0,       2360,       2360,        1,    21600, 0xf713c0ec
-0,       2400,       2400,        1,    21600, 0xa346b3fe
-0,       2440,       2440,        1,    21600, 0x7945c29b
-0,       2480,       2480,        1,    21600, 0xb07ceb91
-0,       2520,       2520,        1,    21600, 0xe1eaf9ef
-0,       2560,       2560,        1,    21600, 0x6fa915c7
-0,       2600,       2600,        1,    21600, 0x61952055
-0,       2640,       2640,        1,    21600, 0x4bca2382
-0,       2680,       2680,        1,    21600, 0x36161fe2
-0,       2720,       2720,        1,    21600, 0xf93a28f7
-0,       2760,       2760,        1,    21600, 0xa02a3d47
-0,       2800,       2800,        1,    21600, 0x925b3609
-0,       2840,       2840,        1,    21600, 0x5b6941db
-0,       2880,       2880,        1,    21600, 0x33154a91
-0,       2920,       2920,        1,    21600, 0xb1d75c50
-0,       2960,       2960,        1,    21600, 0x1cb369bd
-0,       3000,       3000,        1,    21600, 0x3be4eff2
-0,       3040,       3040,        1,    21600, 0xbb89c301
-0,       3080,       3080,        1,    21600, 0xc7630d85
-0,       3120,       3120,        1,    21600, 0xf7441c67
-0,       3160,       3160,        1,    21600, 0xc23611ef
-0,       3200,       3200,        1,    21600, 0x840efb21
-0,       3240,       3240,        1,    21600, 0x7d470a0f
-0,       3280,       3280,        1,    21600, 0xfe093210
-0,       3320,       3320,        1,    21600, 0x0f3ea098
-0,       3360,       3360,        1,    21600, 0xcd72286f
-0,       3400,       3400,        1,    21600, 0x826f8030
-0,       3440,       3440,        1,    21600, 0xcda3ace8
-0,       3480,       3480,        1,    21600, 0x39cb4cd0
-0,       3520,       3520,        1,    21600, 0xa86a60ac
-0,       3560,       3560,        1,    21600, 0xcd32ed8e
-0,       3600,       3600,        1,    21600, 0x769b285d
-0,       3640,       3640,        1,    21600, 0x10234cd0
-0,       3680,       3680,        1,    21600, 0x951036b8
-0,       3720,       3720,        1,    21600, 0xaef248fa
-0,       3760,       3760,        1,    21600, 0x74e36e84
-0,       3800,       3800,        1,    21600, 0x3908531b
-0,       3840,       3840,        1,    21600, 0x342f2a9d
-0,       3880,       3880,        1,    21600, 0x291d58f3
-0,       3920,       3920,        1,    21600, 0xcf24b1e5
-0,       3960,       3960,        1,    21600, 0x3e7c7959
-0,       4000,       4000,        1,    21600, 0x6517e573
-0,       4040,       4040,        1,    21600, 0x304cc6db
-0,       4080,       4080,        1,    21600, 0x272895e4
-0,       4120,       4120,        1,    21600, 0x52325837
-0,       4160,       4160,        1,    21600, 0xd01344bd
-0,       4200,       4200,        1,    21600, 0xd25a370b
-0,       4240,       4240,        1,    21600, 0x274e0ae9
-0,       4280,       4280,        1,    21600, 0x6f66138f
-0,       4320,       4320,        1,    21600, 0xd35a0f60
-0,       4360,       4360,        1,    21600, 0xe0610863
-0,       4400,       4400,        1,    21600, 0x920b05fb
-0,       4440,       4440,        1,    21600, 0x5befe39d
-0,       4480,       4480,        1,    21600, 0xd167bd58
-0,       4520,       4520,        1,    21600, 0x653ac504
-0,       4560,       4560,        1,    21600, 0x8372c6d7
-0,       4600,       4600,        1,    21600, 0x0302c276
-0,       4640,       4640,        1,    21600, 0xa176b694
-0,       4680,       4680,        1,    21600, 0x4c2e935a
-0,       4720,       4720,        1,    21600, 0xf7ea844e
-0,       4760,       4760,        1,    21600, 0x76d6c07b
-0,       4800,       4800,        1,    21600, 0x0a14d610
-0,       4840,       4840,        1,    21600, 0x0ec9f3f3
-0,       4880,       4880,        1,    21600, 0xdc90f6ea
-0,       4920,       4920,        1,    21600, 0xc841f9ef
-0,       4960,       4960,        1,    21600, 0x7ab5f9b9
-0,       5000,       5000,        1,    21600, 0xda40f3c2
-0,       5040,       5040,        1,    21600, 0x0040fb72
-0,       5080,       5080,        1,    21600, 0x705b0786
-0,       5120,       5120,        1,    21600, 0x26d5198d
-0,       5160,       5160,        1,    21600, 0x6f5153ad
-0,       5200,       5200,        1,    21600, 0x9f26624b
-0,       5240,       5240,        1,    21600, 0x0d3ea7af
-0,       5280,       5280,        1,    21600, 0xb957ca79
-0,       5320,       5320,        1,    21600, 0x03a60612
-0,       5360,       5360,        1,    21600, 0x3ddc4ff1
-0,       5400,       5400,        1,    21600, 0x8fe5697f
-0,       5440,       5440,        1,    21600, 0x3d199b09
-0,       5480,       5480,        1,    21600, 0x97e2b504
-0,       5520,       5520,        1,    21600, 0x7563f784
-0,       5560,       5560,        1,    21600, 0x9a473879
-0,       5600,       5600,        1,    21600, 0x2e2054e5
-0,       5640,       5640,        1,    21600, 0x06b3658b
-0,       5680,       5680,        1,    21600, 0xa37ee249
-0,       5720,       5720,        1,    21600, 0xa527efa1
-0,       5760,       5760,        1,    21600, 0x12791532
-0,       5800,       5800,        1,    21600, 0xc5350145
-0,       5840,       5840,        1,    21600, 0xcd44f1ac
-0,       5880,       5880,        1,    21600, 0xe610edfb
-0,       5920,       5920,        1,    21600, 0x5642f672
-0,       5960,       5960,        1,    21600, 0xf2bc3e5b
+0,          1,          1,        1,    21600, 0xcebb8896
+0,          2,          2,        1,    21600, 0xef51860a
+0,          3,          3,        1,    21600, 0x88d97e7d
+0,          4,          4,        1,    21600, 0xc7757c88
+0,          5,          5,        1,    21600, 0x2f537ade
+0,          6,          6,        1,    21600, 0xd50a7eff
+0,          7,          7,        1,    21600, 0xdcfb7fc6
+0,          8,          8,        1,    21600, 0x0d608299
+0,          9,          9,        1,    21600, 0x97ca81b4
+0,         10,         10,        1,    21600, 0x791f80e7
+0,         11,         11,        1,    21600, 0x96ae7d33
+0,         12,         12,        1,    21600, 0x4d7474a8
+0,         13,         13,        1,    21600, 0x2ae76f37
+0,         14,         14,        1,    21600, 0x7da76265
+0,         15,         15,        1,    21600, 0x93ae3eb6
+0,         16,         16,        1,    21600, 0xebfd3868
+0,         17,         17,        1,    21600, 0x54f82ffa
+0,         18,         18,        1,    21600, 0x8d5b2ad0
+0,         19,         19,        1,    21600, 0xe67128e6
+0,         20,         20,        1,    21600, 0xb7bf613e
+0,         21,         21,        1,    21600, 0xefd0f51b
+0,         22,         22,        1,    21600, 0x31b7da59
+0,         23,         23,        1,    21600, 0x7a84a8f7
+0,         24,         24,        1,    21600, 0x0351ad27
+0,         25,         25,        1,    21600, 0xed6f434d
+0,         26,         26,        1,    21600, 0x0e771127
+0,         27,         27,        1,    21600, 0x37bf0b95
+0,         28,         28,        1,    21600, 0x30e10a77
+0,         29,         29,        1,    21600, 0x1a48288a
+0,         30,         30,        1,    21600, 0xf43c6770
+0,         31,         31,        1,    21600, 0x3c43ae68
+0,         32,         32,        1,    21600, 0x04dc0949
+0,         33,         33,        1,    21600, 0x7920758d
+0,         34,         34,        1,    21600, 0x6c12bab5
+0,         35,         35,        1,    21600, 0x1ac23706
+0,         36,         36,        1,    21600, 0x7a95cb5f
+0,         37,         37,        1,    21600, 0xf1bfbb46
+0,         38,         38,        1,    21600, 0x773d1d0c
+0,         39,         39,        1,    21600, 0x2e7bea65
+0,         40,         40,        1,    21600, 0xdb1a086f
+0,         41,         41,        1,    21600, 0x5b36b78d
+0,         42,         42,        1,    21600, 0x7b533ca6
+0,         43,         43,        1,    21600, 0x65d75105
+0,         44,         44,        1,    21600, 0xfe6f6207
+0,         45,         45,        1,    21600, 0x44c4ce57
+0,         46,         46,        1,    21600, 0x220f3dae
+0,         47,         47,        1,    21600, 0xb4d20ffb
+0,         48,         48,        1,    21600, 0x8907ad72
+0,         49,         49,        1,    21600, 0xc6418998
+0,         50,         50,        1,    21600, 0x395b6670
+0,         51,         51,        1,    21600, 0x83495b88
+0,         52,         52,        1,    21600, 0x8920d683
+0,         53,         53,        1,    21600, 0xd7fc64ea
+0,         54,         54,        1,    21600, 0x21a3b222
+0,         55,         55,        1,    21600, 0xc11f2dbd
+0,         56,         56,        1,    21600, 0xd1d5495d
+0,         57,         57,        1,    21600, 0x70f2de20
+0,         58,         58,        1,    21600, 0x10adc9a9
+0,         59,         59,        1,    21600, 0xf713c0ec
+0,         60,         60,        1,    21600, 0xa346b3fe
+0,         61,         61,        1,    21600, 0x7945c29b
+0,         62,         62,        1,    21600, 0xb07ceb91
+0,         63,         63,        1,    21600, 0xe1eaf9ef
+0,         64,         64,        1,    21600, 0x6fa915c7
+0,         65,         65,        1,    21600, 0x61952055
+0,         66,         66,        1,    21600, 0x4bca2382
+0,         67,         67,        1,    21600, 0x36161fe2
+0,         68,         68,        1,    21600, 0xf93a28f7
+0,         69,         69,        1,    21600, 0xa02a3d47
+0,         70,         70,        1,    21600, 0x925b3609
+0,         71,         71,        1,    21600, 0x5b6941db
+0,         72,         72,        1,    21600, 0x33154a91
+0,         73,         73,        1,    21600, 0xb1d75c50
+0,         74,         74,        1,    21600, 0x1cb369bd
+0,         75,         75,        1,    21600, 0x3be4eff2
+0,         76,         76,        1,    21600, 0xbb89c301
+0,         77,         77,        1,    21600, 0xc7630d85
+0,         78,         78,        1,    21600, 0xf7441c67
+0,         79,         79,        1,    21600, 0xc23611ef
+0,         80,         80,        1,    21600, 0x840efb21
+0,         81,         81,        1,    21600, 0x7d470a0f
+0,         82,         82,        1,    21600, 0xfe093210
+0,         83,         83,        1,    21600, 0x0f3ea098
+0,         84,         84,        1,    21600, 0xcd72286f
+0,         85,         85,        1,    21600, 0x826f8030
+0,         86,         86,        1,    21600, 0xcda3ace8
+0,         87,         87,        1,    21600, 0x39cb4cd0
+0,         88,         88,        1,    21600, 0xa86a60ac
+0,         89,         89,        1,    21600, 0xcd32ed8e
+0,         90,         90,        1,    21600, 0x769b285d
+0,         91,         91,        1,    21600, 0x10234cd0
+0,         92,         92,        1,    21600, 0x951036b8
+0,         93,         93,        1,    21600, 0xaef248fa
+0,         94,         94,        1,    21600, 0x74e36e84
+0,         95,         95,        1,    21600, 0x3908531b
+0,         96,         96,        1,    21600, 0x342f2a9d
+0,         97,         97,        1,    21600, 0x291d58f3
+0,         98,         98,        1,    21600, 0xcf24b1e5
+0,         99,         99,        1,    21600, 0x3e7c7959
+0,        100,        100,        1,    21600, 0x6517e573
+0,        101,        101,        1,    21600, 0x304cc6db
+0,        102,        102,        1,    21600, 0x272895e4
+0,        103,        103,        1,    21600, 0x52325837
+0,        104,        104,        1,    21600, 0xd01344bd
+0,        105,        105,        1,    21600, 0xd25a370b
+0,        106,        106,        1,    21600, 0x274e0ae9
+0,        107,        107,        1,    21600, 0x6f66138f
+0,        108,        108,        1,    21600, 0xd35a0f60
+0,        109,        109,        1,    21600, 0xe0610863
+0,        110,        110,        1,    21600, 0x920b05fb
+0,        111,        111,        1,    21600, 0x5befe39d
+0,        112,        112,        1,    21600, 0xd167bd58
+0,        113,        113,        1,    21600, 0x653ac504
+0,        114,        114,        1,    21600, 0x8372c6d7
+0,        115,        115,        1,    21600, 0x0302c276
+0,        116,        116,        1,    21600, 0xa176b694
+0,        117,        117,        1,    21600, 0x4c2e935a
+0,        118,        118,        1,    21600, 0xf7ea844e
+0,        119,        119,        1,    21600, 0x76d6c07b
+0,        120,        120,        1,    21600, 0x0a14d610
+0,        121,        121,        1,    21600, 0x0ec9f3f3
+0,        122,        122,        1,    21600, 0xdc90f6ea
+0,        123,        123,        1,    21600, 0xc841f9ef
+0,        124,        124,        1,    21600, 0x7ab5f9b9
+0,        125,        125,        1,    21600, 0xda40f3c2
+0,        126,        126,        1,    21600, 0x0040fb72
+0,        127,        127,        1,    21600, 0x705b0786
+0,        128,        128,        1,    21600, 0x26d5198d
+0,        129,        129,        1,    21600, 0x6f5153ad
+0,        130,        130,        1,    21600, 0x9f26624b
+0,        131,        131,        1,    21600, 0x0d3ea7af
+0,        132,        132,        1,    21600, 0xb957ca79
+0,        133,        133,        1,    21600, 0x03a60612
+0,        134,        134,        1,    21600, 0x3ddc4ff1
+0,        135,        135,        1,    21600, 0x8fe5697f
+0,        136,        136,        1,    21600, 0x3d199b09
+0,        137,        137,        1,    21600, 0x97e2b504
+0,        138,        138,        1,    21600, 0x7563f784
+0,        139,        139,        1,    21600, 0x9a473879
+0,        140,        140,        1,    21600, 0x2e2054e5
+0,        141,        141,        1,    21600, 0x06b3658b
+0,        142,        142,        1,    21600, 0xa37ee249
+0,        143,        143,        1,    21600, 0xa527efa1
+0,        144,        144,        1,    21600, 0x12791532
+0,        145,        145,        1,    21600, 0xc5350145
+0,        146,        146,        1,    21600, 0xcd44f1ac
+0,        147,        147,        1,    21600, 0xe610edfb
+0,        148,        148,        1,    21600, 0x5642f672
+0,        149,        149,        1,    21600, 0xf2bc3e5b
diff --git a/tests/ref/fate/svq1-headerswap b/tests/ref/fate/svq1-headerswap
index f5ffe4d652..81df22754a 100644
--- a/tests/ref/fate/svq1-headerswap
+++ b/tests/ref/fate/svq1-headerswap
@@ -1,5 +1,9 @@
-#tb 0: 1/600
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 293x178
+#sar 0: 0/1
 0,          0,          0,        1,    58814, 0x5caad04b
-0,         60,         60,        1,    58814, 0x98d8ceb8
-0,        120,        120,        1,    58814, 0x8925cdb0
-0,        180,        180,        1,    58814, 0x6ffc02c3
+0,          1,          1,        1,    58814, 0x98d8ceb8
+0,          2,          2,        1,    58814, 0x8925cdb0
+0,          3,          3,        1,    58814, 0x6ffc02c3
diff --git a/tests/ref/fate/svq3-1 b/tests/ref/fate/svq3-1
index 141300ac17..5d90c6b57a 100644
--- a/tests/ref/fate/svq3-1
+++ b/tests/ref/fate/svq3-1
@@ -1,181 +1,185 @@
-#tb 0: 1/600
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   115200, 0x2c810465
-0,         20,         20,        1,   115200, 0x010b5765
-0,         40,         40,        1,   115200, 0x2be11a4e
-0,         60,         60,        1,   115200, 0x99445d06
-0,         80,         80,        1,   115200, 0x6b54d83c
-0,        100,        100,        1,   115200, 0x3832b76a
-0,        120,        120,        1,   115200, 0x3832b76a
-0,        140,        140,        1,   115200, 0xe18385db
-0,        160,        160,        1,   115200, 0x847d4bf0
-0,        180,        180,        1,   115200, 0x0d650f50
-0,        200,        200,        1,   115200, 0x4b85c44c
-0,        220,        220,        1,   115200, 0xce1927a6
-0,        240,        240,        1,   115200, 0x89353747
-0,        260,        260,        1,   115200, 0x58da43f2
-0,        280,        280,        1,   115200, 0xee9a4eef
-0,        300,        300,        1,   115200, 0xce9453d9
-0,        320,        320,        1,   115200, 0x804a5eb0
-0,        340,        340,        1,   115200, 0xb3d46605
-0,        360,        360,        1,   115200, 0x45b5668e
-0,        380,        380,        1,   115200, 0xdd0d4c5a
-0,        400,        400,        1,   115200, 0x99101301
-0,        420,        420,        1,   115200, 0xf0c3f272
-0,        440,        440,        1,   115200, 0xea21f8b1
-0,        460,        460,        1,   115200, 0xd8e7fbb1
-0,        480,        480,        1,   115200, 0x89d90aa1
-0,        500,        500,        1,   115200, 0x882e19da
-0,        520,        520,        1,   115200, 0xfc0f2709
-0,        540,        540,        1,   115200, 0x9b732f3f
-0,        560,        560,        1,   115200, 0xec453cda
-0,        580,        580,        1,   115200, 0xa77e4989
-0,        600,        600,        1,   115200, 0xad935834
-0,        620,        620,        1,   115200, 0x3a5a6177
-0,        640,        640,        1,   115200, 0xd3c07999
-0,        660,        660,        1,   115200, 0xfad388dd
-0,        680,        680,        1,   115200, 0xaf6e9520
-0,        700,        700,        1,   115200, 0xdb64a4b3
-0,        720,        720,        1,   115200, 0xc6f9b49e
-0,        740,        740,        1,   115200, 0x4446c315
-0,        760,        760,        1,   115200, 0x660bd01c
-0,        780,        780,        1,   115200, 0x963fdd7d
-0,        800,        800,        1,   115200, 0x8733e7b3
-0,        820,        820,        1,   115200, 0x41aaf1d5
-0,        840,        840,        1,   115200, 0xa803fd81
-0,        860,        860,        1,   115200, 0xe2b4077f
-0,        880,        880,        1,   115200, 0xfe6707cb
-0,        900,        900,        1,   115200, 0x027c122d
-0,        920,        920,        1,   115200, 0xbcb81ea8
-0,        940,        940,        1,   115200, 0xd2ac2405
-0,        960,        960,        1,   115200, 0x3d893006
-0,        980,        980,        1,   115200, 0xbdcc3ba8
-0,       1000,       1000,        1,   115200, 0x83ed4c6b
-0,       1020,       1020,        1,   115200, 0x69ee5e7c
-0,       1040,       1040,        1,   115200, 0xfe317411
-0,       1060,       1060,        1,   115200, 0x849e84e6
-0,       1080,       1080,        1,   115200, 0x040f945f
-0,       1100,       1100,        1,   115200, 0x6481ac89
-0,       1120,       1120,        1,   115200, 0x8a48be9e
-0,       1140,       1140,        1,   115200, 0xb162ce94
-0,       1160,       1160,        1,   115200, 0x178dd69a
-0,       1180,       1180,        1,   115200, 0x64fdecaa
-0,       1200,       1200,        1,   115200, 0x4b51297e
-0,       1220,       1220,        1,   115200, 0x3d39a1ae
-0,       1240,       1240,        1,   115200, 0x900fd939
-0,       1260,       1260,        1,   115200, 0x7704fb19
-0,       1280,       1280,        1,   115200, 0xa426137e
-0,       1300,       1300,        1,   115200, 0x9a112706
-0,       1320,       1320,        1,   115200, 0x294931f7
-0,       1340,       1340,        1,   115200, 0x0d0e4372
-0,       1360,       1360,        1,   115200, 0x33bd50e4
-0,       1380,       1380,        1,   115200, 0x9c86e3e2
-0,       1400,       1400,        1,   115200, 0x714af5d5
-0,       1420,       1420,        1,   115200, 0xc5f9fcd0
-0,       1440,       1440,        1,   115200, 0x184602bb
-0,       1460,       1460,        1,   115200, 0x6958e9e6
-0,       1480,       1480,        1,   115200, 0x5a214952
-0,       1500,       1500,        1,   115200, 0x706cca0e
-0,       1520,       1520,        1,   115200, 0x67689363
-0,       1540,       1540,        1,   115200, 0x459f410c
-0,       1560,       1560,        1,   115200, 0xa8f4c365
-0,       1580,       1580,        1,   115200, 0xf1fc50c5
-0,       1600,       1600,        1,   115200, 0xc22af545
-0,       1620,       1620,        1,   115200, 0xd39802a2
-0,       1640,       1640,        1,   115200, 0xb76c04b6
-0,       1660,       1660,        1,   115200, 0x7a548db4
-0,       1680,       1680,        1,   115200, 0x79e56765
-0,       1700,       1700,        1,   115200, 0x3f273a17
-0,       1720,       1720,        1,   115200, 0xe04366db
-0,       1740,       1740,        1,   115200, 0x8e10939b
-0,       1760,       1760,        1,   115200, 0x49220ea2
-0,       1780,       1780,        1,   115200, 0x35361889
-0,       1800,       1800,        1,   115200, 0x9b20bdfa
-0,       1820,       1820,        1,   115200, 0x5d472eaf
-0,       1840,       1840,        1,   115200, 0xeda43081
-0,       1860,       1860,        1,   115200, 0x59bae8b4
-0,       1880,       1880,        1,   115200, 0xf126d6a4
-0,       1900,       1900,        1,   115200, 0x18106464
-0,       1920,       1920,        1,   115200, 0x85530c73
-0,       1940,       1940,        1,   115200, 0xcef32c78
-0,       1960,       1960,        1,   115200, 0xfd6233a0
-0,       1980,       1980,        1,   115200, 0xae9d6fc3
-0,       2000,       2000,        1,   115200, 0x3d0cce10
-0,       2020,       2020,        1,   115200, 0xfce5f124
-0,       2040,       2040,        1,   115200, 0x90b10802
-0,       2060,       2060,        1,   115200, 0xeea44201
-0,       2080,       2080,        1,   115200, 0x1cefb56d
-0,       2100,       2100,        1,   115200, 0xd6daa0b1
-0,       2120,       2120,        1,   115200, 0xd700cef4
-0,       2140,       2140,        1,   115200, 0x36dbf58f
-0,       2160,       2160,        1,   115200, 0xdb20d060
-0,       2180,       2180,        1,   115200, 0x5ca61fd5
-0,       2200,       2200,        1,   115200, 0x4f271361
-0,       2220,       2220,        1,   115200, 0xcaf03743
-0,       2240,       2240,        1,   115200, 0x520f351a
-0,       2260,       2260,        1,   115200, 0x40bc7b89
-0,       2280,       2280,        1,   115200, 0xd0af0b08
-0,       2300,       2300,        1,   115200, 0x6a45290c
-0,       2320,       2320,        1,   115200, 0x57210c14
-0,       2340,       2340,        1,   115200, 0xc1e233f9
-0,       2360,       2360,        1,   115200, 0x96fdfc54
-0,       2380,       2380,        1,   115200, 0x43a8359c
-0,       2400,       2400,        1,   115200, 0xd493bfde
-0,       2420,       2420,        1,   115200, 0xd5339d13
-0,       2440,       2440,        1,   115200, 0x7542baa0
-0,       2460,       2460,        1,   115200, 0x268d2cb9
-0,       2480,       2480,        1,   115200, 0xaf3888bb
-0,       2500,       2500,        1,   115200, 0xb82f520a
-0,       2520,       2520,        1,   115200, 0x0feb2981
-0,       2540,       2540,        1,   115200, 0x45314b58
-0,       2560,       2560,        1,   115200, 0xb26a193a
-0,       2580,       2580,        1,   115200, 0xdfdffc38
-0,       2600,       2600,        1,   115200, 0xec6a55f5
-0,       2620,       2620,        1,   115200, 0xf6e35716
-0,       2640,       2640,        1,   115200, 0x5ce8544e
-0,       2660,       2660,        1,   115200, 0x3e38ddce
-0,       2680,       2680,        1,   115200, 0x964a2006
-0,       2700,       2700,        1,   115200, 0xaba138d6
-0,       2720,       2720,        1,   115200, 0x2f46949c
-0,       2740,       2740,        1,   115200, 0xbdbdb587
-0,       2760,       2760,        1,   115200, 0x1bf11e1d
-0,       2780,       2780,        1,   115200, 0x2632f558
-0,       2800,       2800,        1,   115200, 0x0e58078b
-0,       2820,       2820,        1,   115200, 0x2ab2f9be
-0,       2840,       2840,        1,   115200, 0x9205f1d8
-0,       2860,       2860,        1,   115200, 0x6a4bd949
-0,       2880,       2880,        1,   115200, 0xedc1552f
-0,       2900,       2900,        1,   115200, 0x0a60974d
-0,       2920,       2920,        1,   115200, 0xe1a1400e
-0,       2940,       2940,        1,   115200, 0x45f06952
-0,       2960,       2960,        1,   115200, 0xc5163125
-0,       2980,       2980,        1,   115200, 0x151da156
-0,       3000,       3000,        1,   115200, 0x3f34b048
-0,       3020,       3020,        1,   115200, 0xcf7c1e5d
-0,       3040,       3040,        1,   115200, 0xed9c4e1c
-0,       3060,       3060,        1,   115200, 0x47e06453
-0,       3080,       3080,        1,   115200, 0xc8ce6f19
-0,       3100,       3100,        1,   115200, 0xac619619
-0,       3120,       3120,        1,   115200, 0x64711e2d
-0,       3140,       3140,        1,   115200, 0x1f502b52
-0,       3160,       3160,        1,   115200, 0x39592c9d
-0,       3180,       3180,        1,   115200, 0x7dffb901
-0,       3200,       3200,        1,   115200, 0xc75fa3ce
-0,       3220,       3220,        1,   115200, 0x625bc977
-0,       3240,       3240,        1,   115200, 0x15c7fda3
-0,       3260,       3260,        1,   115200, 0x6e5d35b5
-0,       3280,       3280,        1,   115200, 0xf847cf88
-0,       3300,       3300,        1,   115200, 0xc10867fe
-0,       3320,       3320,        1,   115200, 0xae07fbfc
-0,       3340,       3340,        1,   115200, 0xc1571542
-0,       3360,       3360,        1,   115200, 0x4c7d5602
-0,       3380,       3380,        1,   115200, 0xbe7045aa
-0,       3400,       3400,        1,   115200, 0xc8b4835b
-0,       3420,       3420,        1,   115200, 0xf9b7d427
-0,       3440,       3440,        1,   115200, 0x7fa7c112
-0,       3460,       3460,        1,   115200, 0xe0105feb
-0,       3480,       3480,        1,   115200, 0x70784740
-0,       3500,       3500,        1,   115200, 0xa6801ef5
-0,       3520,       3520,        1,   115200, 0x9cf35921
-0,       3540,       3540,        1,   115200, 0x4d956630
-0,       3560,       3560,        1,   115200, 0x717a25c1
-0,       3580,       3580,        1,   115200, 0x8f5e39de
+0,          1,          1,        1,   115200, 0x010b5765
+0,          2,          2,        1,   115200, 0x2be11a4e
+0,          3,          3,        1,   115200, 0x99445d06
+0,          4,          4,        1,   115200, 0x6b54d83c
+0,          5,          5,        1,   115200, 0x3832b76a
+0,          6,          6,        1,   115200, 0x3832b76a
+0,          7,          7,        1,   115200, 0xe18385db
+0,          8,          8,        1,   115200, 0x847d4bf0
+0,          9,          9,        1,   115200, 0x0d650f50
+0,         10,         10,        1,   115200, 0x4b85c44c
+0,         11,         11,        1,   115200, 0xce1927a6
+0,         12,         12,        1,   115200, 0x89353747
+0,         13,         13,        1,   115200, 0x58da43f2
+0,         14,         14,        1,   115200, 0xee9a4eef
+0,         15,         15,        1,   115200, 0xce9453d9
+0,         16,         16,        1,   115200, 0x804a5eb0
+0,         17,         17,        1,   115200, 0xb3d46605
+0,         18,         18,        1,   115200, 0x45b5668e
+0,         19,         19,        1,   115200, 0xdd0d4c5a
+0,         20,         20,        1,   115200, 0x99101301
+0,         21,         21,        1,   115200, 0xf0c3f272
+0,         22,         22,        1,   115200, 0xea21f8b1
+0,         23,         23,        1,   115200, 0xd8e7fbb1
+0,         24,         24,        1,   115200, 0x89d90aa1
+0,         25,         25,        1,   115200, 0x882e19da
+0,         26,         26,        1,   115200, 0xfc0f2709
+0,         27,         27,        1,   115200, 0x9b732f3f
+0,         28,         28,        1,   115200, 0xec453cda
+0,         29,         29,        1,   115200, 0xa77e4989
+0,         30,         30,        1,   115200, 0xad935834
+0,         31,         31,        1,   115200, 0x3a5a6177
+0,         32,         32,        1,   115200, 0xd3c07999
+0,         33,         33,        1,   115200, 0xfad388dd
+0,         34,         34,        1,   115200, 0xaf6e9520
+0,         35,         35,        1,   115200, 0xdb64a4b3
+0,         36,         36,        1,   115200, 0xc6f9b49e
+0,         37,         37,        1,   115200, 0x4446c315
+0,         38,         38,        1,   115200, 0x660bd01c
+0,         39,         39,        1,   115200, 0x963fdd7d
+0,         40,         40,        1,   115200, 0x8733e7b3
+0,         41,         41,        1,   115200, 0x41aaf1d5
+0,         42,         42,        1,   115200, 0xa803fd81
+0,         43,         43,        1,   115200, 0xe2b4077f
+0,         44,         44,        1,   115200, 0xfe6707cb
+0,         45,         45,        1,   115200, 0x027c122d
+0,         46,         46,        1,   115200, 0xbcb81ea8
+0,         47,         47,        1,   115200, 0xd2ac2405
+0,         48,         48,        1,   115200, 0x3d893006
+0,         49,         49,        1,   115200, 0xbdcc3ba8
+0,         50,         50,        1,   115200, 0x83ed4c6b
+0,         51,         51,        1,   115200, 0x69ee5e7c
+0,         52,         52,        1,   115200, 0xfe317411
+0,         53,         53,        1,   115200, 0x849e84e6
+0,         54,         54,        1,   115200, 0x040f945f
+0,         55,         55,        1,   115200, 0x6481ac89
+0,         56,         56,        1,   115200, 0x8a48be9e
+0,         57,         57,        1,   115200, 0xb162ce94
+0,         58,         58,        1,   115200, 0x178dd69a
+0,         59,         59,        1,   115200, 0x64fdecaa
+0,         60,         60,        1,   115200, 0x4b51297e
+0,         61,         61,        1,   115200, 0x3d39a1ae
+0,         62,         62,        1,   115200, 0x900fd939
+0,         63,         63,        1,   115200, 0x7704fb19
+0,         64,         64,        1,   115200, 0xa426137e
+0,         65,         65,        1,   115200, 0x9a112706
+0,         66,         66,        1,   115200, 0x294931f7
+0,         67,         67,        1,   115200, 0x0d0e4372
+0,         68,         68,        1,   115200, 0x33bd50e4
+0,         69,         69,        1,   115200, 0x9c86e3e2
+0,         70,         70,        1,   115200, 0x714af5d5
+0,         71,         71,        1,   115200, 0xc5f9fcd0
+0,         72,         72,        1,   115200, 0x184602bb
+0,         73,         73,        1,   115200, 0x6958e9e6
+0,         74,         74,        1,   115200, 0x5a214952
+0,         75,         75,        1,   115200, 0x706cca0e
+0,         76,         76,        1,   115200, 0x67689363
+0,         77,         77,        1,   115200, 0x459f410c
+0,         78,         78,        1,   115200, 0xa8f4c365
+0,         79,         79,        1,   115200, 0xf1fc50c5
+0,         80,         80,        1,   115200, 0xc22af545
+0,         81,         81,        1,   115200, 0xd39802a2
+0,         82,         82,        1,   115200, 0xb76c04b6
+0,         83,         83,        1,   115200, 0x7a548db4
+0,         84,         84,        1,   115200, 0x79e56765
+0,         85,         85,        1,   115200, 0x3f273a17
+0,         86,         86,        1,   115200, 0xe04366db
+0,         87,         87,        1,   115200, 0x8e10939b
+0,         88,         88,        1,   115200, 0x49220ea2
+0,         89,         89,        1,   115200, 0x35361889
+0,         90,         90,        1,   115200, 0x9b20bdfa
+0,         91,         91,        1,   115200, 0x5d472eaf
+0,         92,         92,        1,   115200, 0xeda43081
+0,         93,         93,        1,   115200, 0x59bae8b4
+0,         94,         94,        1,   115200, 0xf126d6a4
+0,         95,         95,        1,   115200, 0x18106464
+0,         96,         96,        1,   115200, 0x85530c73
+0,         97,         97,        1,   115200, 0xcef32c78
+0,         98,         98,        1,   115200, 0xfd6233a0
+0,         99,         99,        1,   115200, 0xae9d6fc3
+0,        100,        100,        1,   115200, 0x3d0cce10
+0,        101,        101,        1,   115200, 0xfce5f124
+0,        102,        102,        1,   115200, 0x90b10802
+0,        103,        103,        1,   115200, 0xeea44201
+0,        104,        104,        1,   115200, 0x1cefb56d
+0,        105,        105,        1,   115200, 0xd6daa0b1
+0,        106,        106,        1,   115200, 0xd700cef4
+0,        107,        107,        1,   115200, 0x36dbf58f
+0,        108,        108,        1,   115200, 0xdb20d060
+0,        109,        109,        1,   115200, 0x5ca61fd5
+0,        110,        110,        1,   115200, 0x4f271361
+0,        111,        111,        1,   115200, 0xcaf03743
+0,        112,        112,        1,   115200, 0x520f351a
+0,        113,        113,        1,   115200, 0x40bc7b89
+0,        114,        114,        1,   115200, 0xd0af0b08
+0,        115,        115,        1,   115200, 0x6a45290c
+0,        116,        116,        1,   115200, 0x57210c14
+0,        117,        117,        1,   115200, 0xc1e233f9
+0,        118,        118,        1,   115200, 0x96fdfc54
+0,        119,        119,        1,   115200, 0x43a8359c
+0,        120,        120,        1,   115200, 0xd493bfde
+0,        121,        121,        1,   115200, 0xd5339d13
+0,        122,        122,        1,   115200, 0x7542baa0
+0,        123,        123,        1,   115200, 0x268d2cb9
+0,        124,        124,        1,   115200, 0xaf3888bb
+0,        125,        125,        1,   115200, 0xb82f520a
+0,        126,        126,        1,   115200, 0x0feb2981
+0,        127,        127,        1,   115200, 0x45314b58
+0,        128,        128,        1,   115200, 0xb26a193a
+0,        129,        129,        1,   115200, 0xdfdffc38
+0,        130,        130,        1,   115200, 0xec6a55f5
+0,        131,        131,        1,   115200, 0xf6e35716
+0,        132,        132,        1,   115200, 0x5ce8544e
+0,        133,        133,        1,   115200, 0x3e38ddce
+0,        134,        134,        1,   115200, 0x964a2006
+0,        135,        135,        1,   115200, 0xaba138d6
+0,        136,        136,        1,   115200, 0x2f46949c
+0,        137,        137,        1,   115200, 0xbdbdb587
+0,        138,        138,        1,   115200, 0x1bf11e1d
+0,        139,        139,        1,   115200, 0x2632f558
+0,        140,        140,        1,   115200, 0x0e58078b
+0,        141,        141,        1,   115200, 0x2ab2f9be
+0,        142,        142,        1,   115200, 0x9205f1d8
+0,        143,        143,        1,   115200, 0x6a4bd949
+0,        144,        144,        1,   115200, 0xedc1552f
+0,        145,        145,        1,   115200, 0x0a60974d
+0,        146,        146,        1,   115200, 0xe1a1400e
+0,        147,        147,        1,   115200, 0x45f06952
+0,        148,        148,        1,   115200, 0xc5163125
+0,        149,        149,        1,   115200, 0x151da156
+0,        150,        150,        1,   115200, 0x3f34b048
+0,        151,        151,        1,   115200, 0xcf7c1e5d
+0,        152,        152,        1,   115200, 0xed9c4e1c
+0,        153,        153,        1,   115200, 0x47e06453
+0,        154,        154,        1,   115200, 0xc8ce6f19
+0,        155,        155,        1,   115200, 0xac619619
+0,        156,        156,        1,   115200, 0x64711e2d
+0,        157,        157,        1,   115200, 0x1f502b52
+0,        158,        158,        1,   115200, 0x39592c9d
+0,        159,        159,        1,   115200, 0x7dffb901
+0,        160,        160,        1,   115200, 0xc75fa3ce
+0,        161,        161,        1,   115200, 0x625bc977
+0,        162,        162,        1,   115200, 0x15c7fda3
+0,        163,        163,        1,   115200, 0x6e5d35b5
+0,        164,        164,        1,   115200, 0xf847cf88
+0,        165,        165,        1,   115200, 0xc10867fe
+0,        166,        166,        1,   115200, 0xae07fbfc
+0,        167,        167,        1,   115200, 0xc1571542
+0,        168,        168,        1,   115200, 0x4c7d5602
+0,        169,        169,        1,   115200, 0xbe7045aa
+0,        170,        170,        1,   115200, 0xc8b4835b
+0,        171,        171,        1,   115200, 0xf9b7d427
+0,        172,        172,        1,   115200, 0x7fa7c112
+0,        173,        173,        1,   115200, 0xe0105feb
+0,        174,        174,        1,   115200, 0x70784740
+0,        175,        175,        1,   115200, 0xa6801ef5
+0,        176,        176,        1,   115200, 0x9cf35921
+0,        177,        177,        1,   115200, 0x4d956630
+0,        178,        178,        1,   115200, 0x717a25c1
+0,        179,        179,        1,   115200, 0x8f5e39de
diff --git a/tests/ref/fate/svq3-2 b/tests/ref/fate/svq3-2
index 575e472a18..1d89c05971 100644
--- a/tests/ref/fate/svq3-2
+++ b/tests/ref/fate/svq3-2
@@ -1,20 +1,24 @@
-#tb 0: 1/19200
-0,     -20000,     -20000,        0,   185280, 0x061c0d85
-0,     -19200,     -19200,        0,   185280, 0x427ef9a7
-0,     -18400,     -18400,        0,   185280, 0x64c74d6a
-0,     -17600,     -17600,        0,   185280, 0x5bfd0e5b
-0,     -16800,     -16800,        0,   185280, 0x9da221c6
-0,     -16000,     -16000,        0,   185280, 0x25aaa51b
-0,     -15200,     -15200,        0,   185280, 0x26848298
-0,     -14400,     -14400,        0,   185280, 0xd9bd03ea
-0,     -13600,     -13600,        0,   185280, 0xe1a7e39f
-0,     -12800,     -12800,        0,   185280, 0x92763708
-0,     -12000,     -12000,        0,   185280, 0x76137106
-0,     -11200,     -11200,        0,   185280, 0x32b184c9
-0,     -10400,     -10400,        0,   185280, 0xe5d6ec11
-0,      -9600,      -9600,        0,   185280, 0x6344ec88
-0,      -8800,      -8800,        0,   185280, 0xa8875cb9
-0,      -8000,      -8000,        0,   185280, 0x6cfc8687
-0,      -7200,      -7200,        0,   185280, 0xcbc5bb85
-0,      -6400,      -6400,        0,   185280, 0x5a0c1b38
-0,      -5600,      -5600,        0,   185280, 0x887a7fb2
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 480x257
+#sar 0: 0/1
+0,          1,          1,        1,   185280, 0x044209c4
+0,          2,          2,        1,   185280, 0x427ef9a7
+0,          3,          3,        1,   185280, 0x8f771cc8
+0,          4,          4,        1,   185280, 0xb40d0e52
+0,          5,          5,        1,   185280, 0x2e6ee461
+0,          6,          6,        1,   185280, 0x681ba513
+0,          7,          7,        1,   185280, 0x998c5676
+0,          8,          8,        1,   185280, 0xf91003ec
+0,          9,          9,        1,   185280, 0x322ed3de
+0,         10,         10,        1,   185280, 0xb1c9370a
+0,         11,         11,        1,   185280, 0x41423b36
+0,         12,         12,        1,   185280, 0x0b9284e4
+0,         13,         13,        1,   185280, 0x185789b2
+0,         14,         14,        1,   185280, 0x8f0bece0
+0,         15,         15,        1,   185280, 0xfcd9450e
+0,         16,         16,        1,   185280, 0x509d868b
+0,         17,         17,        1,   185280, 0x71fd9ae3
+0,         18,         18,        1,   185280, 0x3dad1b3c
+0,         19,         19,        1,   185280, 0x69ba37dd
diff --git a/tests/ref/fate/svq3-watermark b/tests/ref/fate/svq3-watermark
new file mode 100644
index 0000000000..f4068c612e
--- /dev/null
+++ b/tests/ref/fate/svq3-watermark
@@ -0,0 +1,14 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 284x240
+#sar 0: 0/1
+0,          0,          0,        1,   102240, 0xb3cbf83b
+0,          1,          1,        1,   102240, 0xc8c2a704
+0,          3,          3,        1,   102240, 0x19dd0989
+0,          4,          4,        1,   102240, 0xc34717eb
+0,          5,          5,        1,   102240, 0x37828a99
+0,          6,          6,        1,   102240, 0xcadc0f69
+0,          7,          7,        1,   102240, 0x342bf32f
+0,          8,          8,        1,   102240, 0x7b311bf1
+0,          9,          9,        1,   102240, 0xf56e0cd3
diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query
new file mode 100644
index 0000000000..0adfdcaf98
--- /dev/null
+++ b/tests/ref/fate/sws-pixdesc-query
@@ -0,0 +1,832 @@
+is16BPS:
+  ayuv64be
+  ayuv64le
+  bgr48be
+  bgr48le
+  bgra64be
+  bgra64le
+  gbrap16be
+  gbrap16le
+  gbrp16be
+  gbrp16le
+  gray16be
+  gray16le
+  p016be
+  p016le
+  rgb48be
+  rgb48le
+  rgba64be
+  rgba64le
+  ya16be
+  ya16le
+  yuv420p16be
+  yuv420p16le
+  yuv422p16be
+  yuv422p16le
+  yuv444p16be
+  yuv444p16le
+  yuva420p16be
+  yuva420p16le
+  yuva422p16be
+  yuva422p16le
+  yuva444p16be
+  yuva444p16le
+
+isNBPS:
+  gbrap10be
+  gbrap10le
+  gbrap12be
+  gbrap12le
+  gbrp10be
+  gbrp10le
+  gbrp12be
+  gbrp12le
+  gbrp14be
+  gbrp14le
+  gbrp9be
+  gbrp9le
+  gray10be
+  gray10le
+  gray12be
+  gray12le
+  gray9be
+  gray9le
+  nv20be
+  nv20le
+  p010be
+  p010le
+  xyz12be
+  xyz12le
+  yuv420p10be
+  yuv420p10le
+  yuv420p12be
+  yuv420p12le
+  yuv420p14be
+  yuv420p14le
+  yuv420p9be
+  yuv420p9le
+  yuv422p10be
+  yuv422p10le
+  yuv422p12be
+  yuv422p12le
+  yuv422p14be
+  yuv422p14le
+  yuv422p9be
+  yuv422p9le
+  yuv440p10be
+  yuv440p10le
+  yuv440p12be
+  yuv440p12le
+  yuv444p10be
+  yuv444p10le
+  yuv444p12be
+  yuv444p12le
+  yuv444p14be
+  yuv444p14le
+  yuv444p9be
+  yuv444p9le
+  yuva420p10be
+  yuva420p10le
+  yuva420p9be
+  yuva420p9le
+  yuva422p10be
+  yuva422p10le
+  yuva422p9be
+  yuva422p9le
+  yuva444p10be
+  yuva444p10le
+  yuva444p9be
+  yuva444p9le
+
+isBE:
+  ayuv64be
+  bayer_bggr16be
+  bayer_gbrg16be
+  bayer_grbg16be
+  bayer_rggb16be
+  bgr444be
+  bgr48be
+  bgr555be
+  bgr565be
+  bgra64be
+  gbrap10be
+  gbrap12be
+  gbrap16be
+  gbrapf32be
+  gbrp10be
+  gbrp12be
+  gbrp14be
+  gbrp16be
+  gbrp9be
+  gbrpf32be
+  gray10be
+  gray12be
+  gray16be
+  gray9be
+  nv20be
+  p010be
+  p016be
+  rgb444be
+  rgb48be
+  rgb555be
+  rgb565be
+  rgba64be
+  xyz12be
+  ya16be
+  yuv420p10be
+  yuv420p12be
+  yuv420p14be
+  yuv420p16be
+  yuv420p9be
+  yuv422p10be
+  yuv422p12be
+  yuv422p14be
+  yuv422p16be
+  yuv422p9be
+  yuv440p10be
+  yuv440p12be
+  yuv444p10be
+  yuv444p12be
+  yuv444p14be
+  yuv444p16be
+  yuv444p9be
+  yuva420p10be
+  yuva420p16be
+  yuva420p9be
+  yuva422p10be
+  yuva422p16be
+  yuva422p9be
+  yuva444p10be
+  yuva444p16be
+  yuva444p9be
+
+isYUV:
+  ayuv64be
+  ayuv64le
+  nv12
+  nv16
+  nv20be
+  nv20le
+  nv21
+  p010be
+  p010le
+  p016be
+  p016le
+  uyvy422
+  uyyvyy411
+  xyz12be
+  xyz12le
+  ya16be
+  ya16le
+  ya8
+  yuv410p
+  yuv411p
+  yuv420p
+  yuv420p10be
+  yuv420p10le
+  yuv420p12be
+  yuv420p12le
+  yuv420p14be
+  yuv420p14le
+  yuv420p16be
+  yuv420p16le
+  yuv420p9be
+  yuv420p9le
+  yuv422p
+  yuv422p10be
+  yuv422p10le
+  yuv422p12be
+  yuv422p12le
+  yuv422p14be
+  yuv422p14le
+  yuv422p16be
+  yuv422p16le
+  yuv422p9be
+  yuv422p9le
+  yuv440p
+  yuv440p10be
+  yuv440p10le
+  yuv440p12be
+  yuv440p12le
+  yuv444p
+  yuv444p10be
+  yuv444p10le
+  yuv444p12be
+  yuv444p12le
+  yuv444p14be
+  yuv444p14le
+  yuv444p16be
+  yuv444p16le
+  yuv444p9be
+  yuv444p9le
+  yuva420p
+  yuva420p10be
+  yuva420p10le
+  yuva420p16be
+  yuva420p16le
+  yuva420p9be
+  yuva420p9le
+  yuva422p
+  yuva422p10be
+  yuva422p10le
+  yuva422p16be
+  yuva422p16le
+  yuva422p9be
+  yuva422p9le
+  yuva444p
+  yuva444p10be
+  yuva444p10le
+  yuva444p16be
+  yuva444p16le
+  yuva444p9be
+  yuva444p9le
+  yuvj411p
+  yuvj420p
+  yuvj422p
+  yuvj440p
+  yuvj444p
+  yuyv422
+  yvyu422
+
+isPlanarYUV:
+  nv12
+  nv16
+  nv20be
+  nv20le
+  nv21
+  p010be
+  p010le
+  p016be
+  p016le
+  yuv410p
+  yuv411p
+  yuv420p
+  yuv420p10be
+  yuv420p10le
+  yuv420p12be
+  yuv420p12le
+  yuv420p14be
+  yuv420p14le
+  yuv420p16be
+  yuv420p16le
+  yuv420p9be
+  yuv420p9le
+  yuv422p
+  yuv422p10be
+  yuv422p10le
+  yuv422p12be
+  yuv422p12le
+  yuv422p14be
+  yuv422p14le
+  yuv422p16be
+  yuv422p16le
+  yuv422p9be
+  yuv422p9le
+  yuv440p
+  yuv440p10be
+  yuv440p10le
+  yuv440p12be
+  yuv440p12le
+  yuv444p
+  yuv444p10be
+  yuv444p10le
+  yuv444p12be
+  yuv444p12le
+  yuv444p14be
+  yuv444p14le
+  yuv444p16be
+  yuv444p16le
+  yuv444p9be
+  yuv444p9le
+  yuva420p
+  yuva420p10be
+  yuva420p10le
+  yuva420p16be
+  yuva420p16le
+  yuva420p9be
+  yuva420p9le
+  yuva422p
+  yuva422p10be
+  yuva422p10le
+  yuva422p16be
+  yuva422p16le
+  yuva422p9be
+  yuva422p9le
+  yuva444p
+  yuva444p10be
+  yuva444p10le
+  yuva444p16be
+  yuva444p16le
+  yuva444p9be
+  yuva444p9le
+  yuvj411p
+  yuvj420p
+  yuvj422p
+  yuvj440p
+  yuvj444p
+
+isRGB:
+  0bgr
+  0rgb
+  bayer_bggr16be
+  bayer_bggr16le
+  bayer_bggr8
+  bayer_gbrg16be
+  bayer_gbrg16le
+  bayer_gbrg8
+  bayer_grbg16be
+  bayer_grbg16le
+  bayer_grbg8
+  bayer_rggb16be
+  bayer_rggb16le
+  bayer_rggb8
+  bgr0
+  bgr24
+  bgr32
+  bgr32_1
+  bgr4
+  bgr444be
+  bgr444le
+  bgr48be
+  bgr48le
+  bgr4_byte
+  bgr555be
+  bgr555le
+  bgr565be
+  bgr565le
+  bgr8
+  bgra64be
+  bgra64le
+  gbrap
+  gbrap10be
+  gbrap10le
+  gbrap12be
+  gbrap12le
+  gbrap16be
+  gbrap16le
+  gbrapf32be
+  gbrapf32le
+  gbrp
+  gbrp10be
+  gbrp10le
+  gbrp12be
+  gbrp12le
+  gbrp14be
+  gbrp14le
+  gbrp16be
+  gbrp16le
+  gbrp9be
+  gbrp9le
+  gbrpf32be
+  gbrpf32le
+  rgb0
+  rgb24
+  rgb32
+  rgb32_1
+  rgb4
+  rgb444be
+  rgb444le
+  rgb48be
+  rgb48le
+  rgb4_byte
+  rgb555be
+  rgb555le
+  rgb565be
+  rgb565le
+  rgb8
+  rgba64be
+  rgba64le
+
+Gray:
+  gray
+  gray10be
+  gray10le
+  gray12be
+  gray12le
+  gray16be
+  gray16le
+  gray9be
+  gray9le
+  ya16be
+  ya16le
+  ya8
+
+RGBinInt:
+  monob
+  monow
+  rgb24
+  rgb32
+  rgb32_1
+  rgb4
+  rgb444be
+  rgb444le
+  rgb48be
+  rgb48le
+  rgb4_byte
+  rgb555be
+  rgb555le
+  rgb565be
+  rgb565le
+  rgb8
+  rgba64be
+  rgba64le
+
+BGRinInt:
+  bgr24
+  bgr32
+  bgr32_1
+  bgr4
+  bgr444be
+  bgr444le
+  bgr48be
+  bgr48le
+  bgr4_byte
+  bgr555be
+  bgr555le
+  bgr565be
+  bgr565le
+  bgr8
+  bgra64be
+  bgra64le
+  monob
+  monow
+
+Bayer:
+  bayer_bggr16be
+  bayer_bggr16le
+  bayer_bggr8
+  bayer_gbrg16be
+  bayer_gbrg16le
+  bayer_gbrg8
+  bayer_grbg16be
+  bayer_grbg16le
+  bayer_grbg8
+  bayer_rggb16be
+  bayer_rggb16le
+  bayer_rggb8
+
+AnyRGB:
+  0bgr
+  0rgb
+  bayer_bggr16be
+  bayer_bggr16le
+  bayer_bggr8
+  bayer_gbrg16be
+  bayer_gbrg16le
+  bayer_gbrg8
+  bayer_grbg16be
+  bayer_grbg16le
+  bayer_grbg8
+  bayer_rggb16be
+  bayer_rggb16le
+  bayer_rggb8
+  bgr0
+  bgr24
+  bgr32
+  bgr32_1
+  bgr4
+  bgr444be
+  bgr444le
+  bgr48be
+  bgr48le
+  bgr4_byte
+  bgr555be
+  bgr555le
+  bgr565be
+  bgr565le
+  bgr8
+  bgra64be
+  bgra64le
+  gbrap
+  gbrap10be
+  gbrap10le
+  gbrap12be
+  gbrap12le
+  gbrap16be
+  gbrap16le
+  gbrapf32be
+  gbrapf32le
+  gbrp
+  gbrp10be
+  gbrp10le
+  gbrp12be
+  gbrp12le
+  gbrp14be
+  gbrp14le
+  gbrp16be
+  gbrp16le
+  gbrp9be
+  gbrp9le
+  gbrpf32be
+  gbrpf32le
+  monob
+  monow
+  rgb0
+  rgb24
+  rgb32
+  rgb32_1
+  rgb4
+  rgb444be
+  rgb444le
+  rgb48be
+  rgb48le
+  rgb4_byte
+  rgb555be
+  rgb555le
+  rgb565be
+  rgb565le
+  rgb8
+  rgba64be
+  rgba64le
+
+ALPHA:
+  ayuv64be
+  ayuv64le
+  bgr32
+  bgr32_1
+  bgra64be
+  bgra64le
+  gbrap
+  gbrap10be
+  gbrap10le
+  gbrap12be
+  gbrap12le
+  gbrap16be
+  gbrap16le
+  gbrapf32be
+  gbrapf32le
+  pal8
+  rgb32
+  rgb32_1
+  rgba64be
+  rgba64le
+  ya16be
+  ya16le
+  ya8
+  yuva420p
+  yuva420p10be
+  yuva420p10le
+  yuva420p16be
+  yuva420p16le
+  yuva420p9be
+  yuva420p9le
+  yuva422p
+  yuva422p10be
+  yuva422p10le
+  yuva422p16be
+  yuva422p16le
+  yuva422p9be
+  yuva422p9le
+  yuva444p
+  yuva444p10be
+  yuva444p10le
+  yuva444p16be
+  yuva444p16le
+  yuva444p9be
+  yuva444p9le
+
+Packed:
+  0bgr
+  0rgb
+  ayuv64be
+  ayuv64le
+  bayer_bggr16be
+  bayer_bggr16le
+  bayer_bggr8
+  bayer_gbrg16be
+  bayer_gbrg16le
+  bayer_gbrg8
+  bayer_grbg16be
+  bayer_grbg16le
+  bayer_grbg8
+  bayer_rggb16be
+  bayer_rggb16le
+  bayer_rggb8
+  bgr0
+  bgr24
+  bgr32
+  bgr32_1
+  bgr4
+  bgr444be
+  bgr444le
+  bgr48be
+  bgr48le
+  bgr4_byte
+  bgr555be
+  bgr555le
+  bgr565be
+  bgr565le
+  bgr8
+  bgra64be
+  bgra64le
+  monob
+  monow
+  pal8
+  rgb0
+  rgb24
+  rgb32
+  rgb32_1
+  rgb4
+  rgb444be
+  rgb444le
+  rgb48be
+  rgb48le
+  rgb4_byte
+  rgb555be
+  rgb555le
+  rgb565be
+  rgb565le
+  rgb8
+  rgba64be
+  rgba64le
+  uyvy422
+  uyyvyy411
+  xyz12be
+  xyz12le
+  ya16be
+  ya16le
+  ya8
+  yuyv422
+  yvyu422
+
+Planar:
+  gbrap
+  gbrap10be
+  gbrap10le
+  gbrap12be
+  gbrap12le
+  gbrap16be
+  gbrap16le
+  gbrapf32be
+  gbrapf32le
+  gbrp
+  gbrp10be
+  gbrp10le
+  gbrp12be
+  gbrp12le
+  gbrp14be
+  gbrp14le
+  gbrp16be
+  gbrp16le
+  gbrp9be
+  gbrp9le
+  gbrpf32be
+  gbrpf32le
+  nv12
+  nv16
+  nv20be
+  nv20le
+  nv21
+  p010be
+  p010le
+  p016be
+  p016le
+  yuv410p
+  yuv411p
+  yuv420p
+  yuv420p10be
+  yuv420p10le
+  yuv420p12be
+  yuv420p12le
+  yuv420p14be
+  yuv420p14le
+  yuv420p16be
+  yuv420p16le
+  yuv420p9be
+  yuv420p9le
+  yuv422p
+  yuv422p10be
+  yuv422p10le
+  yuv422p12be
+  yuv422p12le
+  yuv422p14be
+  yuv422p14le
+  yuv422p16be
+  yuv422p16le
+  yuv422p9be
+  yuv422p9le
+  yuv440p
+  yuv440p10be
+  yuv440p10le
+  yuv440p12be
+  yuv440p12le
+  yuv444p
+  yuv444p10be
+  yuv444p10le
+  yuv444p12be
+  yuv444p12le
+  yuv444p14be
+  yuv444p14le
+  yuv444p16be
+  yuv444p16le
+  yuv444p9be
+  yuv444p9le
+  yuva420p
+  yuva420p10be
+  yuva420p10le
+  yuva420p16be
+  yuva420p16le
+  yuva420p9be
+  yuva420p9le
+  yuva422p
+  yuva422p10be
+  yuva422p10le
+  yuva422p16be
+  yuva422p16le
+  yuva422p9be
+  yuva422p9le
+  yuva444p
+  yuva444p10be
+  yuva444p10le
+  yuva444p16be
+  yuva444p16le
+  yuva444p9be
+  yuva444p9le
+  yuvj411p
+  yuvj420p
+  yuvj422p
+  yuvj440p
+  yuvj444p
+
+PackedRGB:
+  0bgr
+  0rgb
+  bayer_bggr16be
+  bayer_bggr16le
+  bayer_bggr8
+  bayer_gbrg16be
+  bayer_gbrg16le
+  bayer_gbrg8
+  bayer_grbg16be
+  bayer_grbg16le
+  bayer_grbg8
+  bayer_rggb16be
+  bayer_rggb16le
+  bayer_rggb8
+  bgr0
+  bgr24
+  bgr32
+  bgr32_1
+  bgr4
+  bgr444be
+  bgr444le
+  bgr48be
+  bgr48le
+  bgr4_byte
+  bgr555be
+  bgr555le
+  bgr565be
+  bgr565le
+  bgr8
+  bgra64be
+  bgra64le
+  rgb0
+  rgb24
+  rgb32
+  rgb32_1
+  rgb4
+  rgb444be
+  rgb444le
+  rgb48be
+  rgb48le
+  rgb4_byte
+  rgb555be
+  rgb555le
+  rgb565be
+  rgb565le
+  rgb8
+  rgba64be
+  rgba64le
+
+PlanarRGB:
+  gbrap
+  gbrap10be
+  gbrap10le
+  gbrap12be
+  gbrap12le
+  gbrap16be
+  gbrap16le
+  gbrapf32be
+  gbrapf32le
+  gbrp
+  gbrp10be
+  gbrp10le
+  gbrp12be
+  gbrp12le
+  gbrp14be
+  gbrp14le
+  gbrp16be
+  gbrp16le
+  gbrp9be
+  gbrp9le
+  gbrpf32be
+  gbrpf32le
+
+usePal:
+  bgr4_byte
+  bgr8
+  gray
+  pal8
+  rgb4_byte
+  rgb8
+
diff --git a/tests/ref/fate/targa-conformance-CBW8 b/tests/ref/fate/targa-conformance-CBW8
index 60270d7996..be4bdc3b28 100644
--- a/tests/ref/fate/targa-conformance-CBW8
+++ b/tests/ref/fate/targa-conformance-CBW8
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x267e21ef
diff --git a/tests/ref/fate/targa-conformance-CCM8 b/tests/ref/fate/targa-conformance-CCM8
index 45bb18167b..d30fa724f6 100644
--- a/tests/ref/fate/targa-conformance-CCM8
+++ b/tests/ref/fate/targa-conformance-CCM8
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    65536, 0x47e97fe9
diff --git a/tests/ref/fate/targa-conformance-CTC16 b/tests/ref/fate/targa-conformance-CTC16
index e848ff8668..15dfafdeb3 100644
--- a/tests/ref/fate/targa-conformance-CTC16
+++ b/tests/ref/fate/targa-conformance-CTC16
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    32768, 0xa6b3d20d
diff --git a/tests/ref/fate/targa-conformance-CTC24 b/tests/ref/fate/targa-conformance-CTC24
index c95f406b8e..d0b7d6695f 100644
--- a/tests/ref/fate/targa-conformance-CTC24
+++ b/tests/ref/fate/targa-conformance-CTC24
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    49152, 0xaca4bc29
diff --git a/tests/ref/fate/targa-conformance-CTC32 b/tests/ref/fate/targa-conformance-CTC32
index aad3bfc955..1c43896a3b 100644
--- a/tests/ref/fate/targa-conformance-CTC32
+++ b/tests/ref/fate/targa-conformance-CTC32
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    65536, 0xcf98bc29
diff --git a/tests/ref/fate/targa-conformance-UBW8 b/tests/ref/fate/targa-conformance-UBW8
index 60270d7996..be4bdc3b28 100644
--- a/tests/ref/fate/targa-conformance-UBW8
+++ b/tests/ref/fate/targa-conformance-UBW8
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x267e21ef
diff --git a/tests/ref/fate/targa-conformance-UCM8 b/tests/ref/fate/targa-conformance-UCM8
index 45bb18167b..d30fa724f6 100644
--- a/tests/ref/fate/targa-conformance-UCM8
+++ b/tests/ref/fate/targa-conformance-UCM8
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    65536, 0x47e97fe9
diff --git a/tests/ref/fate/targa-conformance-UTC16 b/tests/ref/fate/targa-conformance-UTC16
index e848ff8668..15dfafdeb3 100644
--- a/tests/ref/fate/targa-conformance-UTC16
+++ b/tests/ref/fate/targa-conformance-UTC16
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    32768, 0xa6b3d20d
diff --git a/tests/ref/fate/targa-conformance-UTC24 b/tests/ref/fate/targa-conformance-UTC24
index c95f406b8e..d0b7d6695f 100644
--- a/tests/ref/fate/targa-conformance-UTC24
+++ b/tests/ref/fate/targa-conformance-UTC24
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    49152, 0xaca4bc29
diff --git a/tests/ref/fate/targa-conformance-UTC32 b/tests/ref/fate/targa-conformance-UTC32
index aad3bfc955..1c43896a3b 100644
--- a/tests/ref/fate/targa-conformance-UTC32
+++ b/tests/ref/fate/targa-conformance-UTC32
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
 0,          0,          0,        1,    65536, 0xcf98bc29
diff --git a/tests/ref/fate/targa-top-to-bottom b/tests/ref/fate/targa-top-to-bottom
index 4d9577ae74..6cf1c958e6 100644
--- a/tests/ref/fate/targa-top-to-bottom
+++ b/tests/ref/fate/targa-top-to-bottom
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 0/1
 0,          0,          0,        1,   196608, 0xb29ec51a
diff --git a/tests/ref/fate/tdsc b/tests/ref/fate/tdsc
index 945933fdcd..de9f362690 100644
--- a/tests/ref/fate/tdsc
+++ b/tests/ref/fate/tdsc
@@ -1,42 +1,46 @@
-#tb 0: 1/1000
-0,          0,          0,        0,  3888000, 0x9c498657
-0,        233,        233,        0,  3888000, 0x72a2ae22
-0,        266,        266,        0,  3888000, 0x72a2ae22
-0,        333,        333,        0,  3888000, 0x72a2ae22
-0,        533,        533,        0,  3888000, 0x72a2ae22
-0,        566,        566,        0,  3888000, 0x72a2ae22
-0,        666,        666,        0,  3888000, 0x550e417b
-0,        966,        966,        0,  3888000, 0x550e417b
-0,        999,        999,        0,  3888000, 0x550e417b
-0,       1033,       1033,        0,  3888000, 0x550e417b
-0,       1066,       1066,        0,  3888000, 0x550e417b
-0,       1133,       1133,        0,  3888000, 0x550e417b
-0,       1166,       1166,        0,  3888000, 0x38dcde13
-0,       1566,       1566,        0,  3888000, 0x2b7c0edd
-0,       1599,       1599,        0,  3888000, 0xaaaf3c7b
-0,       1633,       1633,        0,  3888000, 0x26d1710f
-0,       1666,       1666,        0,  3888000, 0xa6609f3f
-0,       1699,       1699,        0,  3888000, 0xaa41c6f3
-0,       1733,       1733,        0,  3888000, 0xc0ffd4d5
-0,       1766,       1766,        0,  3888000, 0x44d4f383
-0,       1833,       1833,        0,  3888000, 0x517047eb
-0,       1866,       1866,        0,  3888000, 0x1d5a4d5b
-0,       1899,       1899,        0,  3888000, 0x7d2da2f6
-0,       1933,       1933,        0,  3888000, 0x27f7a2f6
-0,       1966,       1966,        0,  3888000, 0x9de49edb
-0,       1999,       1999,        0,  3888000, 0x5ccb9f38
-0,       2033,       2033,        0,  3888000, 0x88069fb2
-0,       2066,       2066,        0,  3888000, 0x1d059fd3
-0,       2099,       2099,        0,  3888000, 0xe16d9fd3
-0,       2133,       2133,        0,  3888000, 0xb6a69fd3
-0,       2166,       2166,        0,  3888000, 0xb6a69fd3
-0,       2199,       2199,        0,  3888000, 0x61709fd3
-0,       2233,       2233,        0,  3888000, 0xb6f59fd3
-0,       2266,       2266,        0,  3888000, 0x5c7b9fd3
-0,       2299,       2299,        0,  3888000, 0x57869fd3
-0,       2333,       2333,        0,  3888000, 0x9d3f9fd3
-0,       2433,       2433,        0,  3888000, 0x5e6082a5
-0,       2466,       2466,        0,  3888000, 0x5e6082a5
-0,       2499,       2499,        0,  3888000, 0x5e6082a5
-0,       2533,       2533,        0,  3888000, 0x48ce82f3
-0,       2566,       2566,        0,  3888000, 0x4c5ebeaf
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1440x900
+#sar 0: 0/1
+0,          0,          0,        1,  3888000, 0x9c498657
+0,          7,          7,        1,  3888000, 0x72a2ae22
+0,          8,          8,        1,  3888000, 0x72a2ae22
+0,         10,         10,        1,  3888000, 0x72a2ae22
+0,         16,         16,        1,  3888000, 0x72a2ae22
+0,         17,         17,        1,  3888000, 0x72a2ae22
+0,         20,         20,        1,  3888000, 0x550e417b
+0,         29,         29,        1,  3888000, 0x550e417b
+0,         30,         30,        1,  3888000, 0x550e417b
+0,         31,         31,        1,  3888000, 0x550e417b
+0,         32,         32,        1,  3888000, 0x550e417b
+0,         34,         34,        1,  3888000, 0x550e417b
+0,         35,         35,        1,  3888000, 0x38dcde13
+0,         47,         47,        1,  3888000, 0x2b7c0edd
+0,         48,         48,        1,  3888000, 0xaaaf3c7b
+0,         49,         49,        1,  3888000, 0x26d1710f
+0,         50,         50,        1,  3888000, 0xa6609f3f
+0,         51,         51,        1,  3888000, 0xaa41c6f3
+0,         52,         52,        1,  3888000, 0xc0ffd4d5
+0,         53,         53,        1,  3888000, 0x44d4f383
+0,         55,         55,        1,  3888000, 0x517047eb
+0,         56,         56,        1,  3888000, 0x1d5a4d5b
+0,         57,         57,        1,  3888000, 0x7d2da2f6
+0,         58,         58,        1,  3888000, 0x27f7a2f6
+0,         59,         59,        1,  3888000, 0x9de49edb
+0,         60,         60,        1,  3888000, 0x5ccb9f38
+0,         61,         61,        1,  3888000, 0x88069fb2
+0,         62,         62,        1,  3888000, 0x1d059fd3
+0,         63,         63,        1,  3888000, 0xe16d9fd3
+0,         64,         64,        1,  3888000, 0xb6a69fd3
+0,         65,         65,        1,  3888000, 0xb6a69fd3
+0,         66,         66,        1,  3888000, 0x61709fd3
+0,         67,         67,        1,  3888000, 0xb6f59fd3
+0,         68,         68,        1,  3888000, 0x5c7b9fd3
+0,         69,         69,        1,  3888000, 0x57869fd3
+0,         70,         70,        1,  3888000, 0x9d3f9fd3
+0,         73,         73,        1,  3888000, 0x5e6082a5
+0,         74,         74,        1,  3888000, 0x5e6082a5
+0,         75,         75,        1,  3888000, 0x5e6082a5
+0,         76,         76,        1,  3888000, 0x48ce82f3
+0,         77,         77,        1,  3888000, 0x4c5ebeaf
diff --git a/tests/ref/fate/tea b/tests/ref/fate/tea
new file mode 100644
index 0000000000..fed0b4dd3b
--- /dev/null
+++ b/tests/ref/fate/tea
@@ -0,0 +1 @@
+Test encryption/decryption success.
diff --git a/tests/ref/fate/theora-coeff-level64 b/tests/ref/fate/theora-coeff-level64
index d6abb62f70..cc64bccf64 100644
--- a/tests/ref/fate/theora-coeff-level64
+++ b/tests/ref/fate/theora-coeff-level64
@@ -1,9 +1,13 @@
-#tb 0: 1/1000
-0,          0,          0,        0,  4617600, 0x4ba6df50
-0,         66,         66,        0,  4617600, 0x419fdeaf
-0,        132,        132,        0,  4617600, 0xeb2edced
-0,        198,        198,        0,  4617600, 0xa2bb3a1a
-0,        264,        264,        0,  4617600, 0x411cfb36
-0,        330,        330,        0,  4617600, 0xb2dc22ed
-0,        396,        396,        0,  4617600, 0x236d23b5
-0,        462,        462,        0,  4617600, 0x7fef275e
+#tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 2960x1040
+#sar 0: 1/1
+0,          0,          0,        1,  4617600, 0x4ba6df50
+0,          1,          1,        1,  4617600, 0x419fdeaf
+0,          2,          2,        1,  4617600, 0xeb2edced
+0,          3,          3,        1,  4617600, 0xa2bb3a1a
+0,          4,          4,        1,  4617600, 0x411cfb36
+0,          5,          5,        1,  4617600, 0xb2dc22ed
+0,          6,          6,        1,  4617600, 0x236d23b5
+0,          7,          7,        1,  4617600, 0x7fef275e
diff --git a/tests/ref/fate/theora-offset b/tests/ref/fate/theora-offset
index 5921657541..b9a6e083c4 100644
--- a/tests/ref/fate/theora-offset
+++ b/tests/ref/fate/theora-offset
@@ -1,4 +1,8 @@
 #tb 0: 1/1
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x512
+#sar 0: 0/1
 0,          0,          0,        1,   393216, 0xdc998fa2
 0,          1,          1,        1,   393216, 0x979a8fbd
 0,          2,          2,        1,   393216, 0x979a8fbd
diff --git a/tests/ref/fate/thp b/tests/ref/fate/thp
index 52dd059027..4323ac91c9 100644
--- a/tests/ref/fate/thp
+++ b/tests/ref/fate/thp
@@ -1,4 +1,8 @@
 #tb 0: 524288/15712911
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 608x320
+#sar 0: 0/1
 0,          0,          0,        1,   291840, 0xbd7e0b22
 0,          1,          1,        1,   291840, 0xf6e12ca5
 0,          2,          2,        1,   291840, 0x528c7049
diff --git a/tests/ref/fate/tiertex-seq b/tests/ref/fate/tiertex-seq
index 74407e7674..1db906ad33 100644
--- a/tests/ref/fate/tiertex-seq
+++ b/tests/ref/fate/tiertex-seq
@@ -1,5 +1,14 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x128
+#sar 0: 0/1
 #tb 1: 1/22050
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 22050
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 1,          0,          0,      882,     1764, 0x00000000
 1,        882,        882,      882,     1764, 0x80a253d9
 0,          2,          2,        1,    98304, 0x2e5db4a4
diff --git a/tests/ref/fate/tiff-fax-g3 b/tests/ref/fate/tiff-fax-g3
index fa7bc2f79f..ac1fff9142 100644
--- a/tests/ref/fate/tiff-fax-g3
+++ b/tests/ref/fate/tiff-fax-g3
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 2464x3248
+#sar 0: 1/1
 0,          0,          0,        1,  1000384, 0xb758eb8b
diff --git a/tests/ref/fate/tiff-fax-g3s b/tests/ref/fate/tiff-fax-g3s
index fa7bc2f79f..ac1fff9142 100644
--- a/tests/ref/fate/tiff-fax-g3s
+++ b/tests/ref/fate/tiff-fax-g3s
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 2464x3248
+#sar 0: 1/1
 0,          0,          0,        1,  1000384, 0xb758eb8b
diff --git a/tests/ref/fate/time_base b/tests/ref/fate/time_base
new file mode 100644
index 0000000000..7923556b35
--- /dev/null
+++ b/tests/ref/fate/time_base
@@ -0,0 +1 @@
+d26a35b141551b36c5b8bd716451cfcb
diff --git a/tests/ref/fate/timefilter b/tests/ref/fate/timefilter
index 57c1209042..2fa88c9b3b 100644
--- a/tests/ref/fate/timefilter
+++ b/tests/ref/fate/timefilter
@@ -1,6 +1,6 @@
- [0.800000 0.000800  0.000000] [1.021025 0.998922  0.000000] [1.021025 0.998922  0.000000] [1.021025 0.998922  0.000000]
- [0.001003 0.000000  0.004341] [0.041562 0.000996  0.045245] [0.081175 0.002874  0.074431] [0.118380 0.006568  0.108913]
- [0.001003 0.000000  0.039073] [0.013619 0.000455  0.224390] [0.041562 0.000996  0.407205] [0.068719 0.002305  0.600848]
- [0.001003 0.000000  0.212729] [0.022518 0.000060  0.941262] [0.015889 0.000507  1.391585] [0.041562 0.000996  2.217003]
- [0.001003 0.000000  0.976818] [0.014412 0.000021  2.712350] [0.013691 0.000370  4.648765] [0.018915 0.000542  6.709646]
- [0.001003 0.000000  4.172097] [0.010677 0.000007  7.809261] [0.018915 0.000032 14.578784] [0.013619 0.000387 20.628496]
+ [80000.000000    0.800000  0.000000] [80000.000000    0.800000  0.000000] [80000.000000    0.800000  0.000000] [80000.000000    0.800000  0.000000]
+ [ 1688.672234    0.000000  0.018551] [   21.026792    0.000401  0.068856] [    1.162481    0.008576  0.121287] [    0.803356    0.016078  0.153518]
+ [ 1218.378235    0.000000  0.167011] [   12.908626    0.000281  0.296858] [   21.026792    0.000401  0.619608] [    2.064064    0.004760  1.020336]
+ [ 1218.378235    0.000000  0.909282] [   10.047626    0.000191  0.873495] [   14.909464    0.000297  1.935407] [   21.026792    0.000401  3.373312]
+ [  177.634056    0.000002  4.988477] [    5.363801    0.000176  2.102302] [   12.879355    0.000195  5.029066] [   15.615799    0.000298  9.292377]
+ [   43.713191    0.000007 63.605530] [    1.345385    0.000213 13.918138] [    6.800629    0.000142 13.284614] [   14.909464    0.000142 21.761697]
diff --git a/tests/ref/fate/tmv b/tests/ref/fate/tmv
index 6203e863b9..09198fab2b 100644
--- a/tests/ref/fate/tmv
+++ b/tests/ref/fate/tmv
@@ -1,5 +1,14 @@
 #tb 0: 184/11029
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
 #tb 1: 1/22058
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 22058
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   192000, 0xc698297a
 1,          0,          0,      368,      736, 0xf63db497
 0,          1,          1,        1,   192000, 0x8d5bd6be
diff --git a/tests/ref/fate/truemotion1-15 b/tests/ref/fate/truemotion1-15
index 6b5281decf..24d4c2c5bc 100644
--- a/tests/ref/fate/truemotion1-15
+++ b/tests/ref/fate/truemotion1-15
@@ -1,106 +1,110 @@
 #tb 0: 1/15
-0,          0,          0,        1,   161280, 0x7041748d
-0,          1,          1,        1,   161280, 0x3cc4dfb5
-0,          2,          2,        1,   161280, 0xca3af22d
-0,          3,          3,        1,   161280, 0x23ad1d85
-0,          4,          4,        1,   161280, 0x9c9cf364
-0,          5,          5,        1,   161280, 0x1551d6a8
-0,          6,          6,        1,   161280, 0xc39f6b95
-0,          7,          7,        1,   161280, 0x3b036dcc
-0,          8,          8,        1,   161280, 0xa6fac1db
-0,          9,          9,        1,   161280, 0x67656b62
-0,         10,         10,        1,   161280, 0xb41f47d1
-0,         11,         11,        1,   161280, 0xc207249e
-0,         12,         12,        1,   161280, 0xbee8f843
-0,         13,         13,        1,   161280, 0x092acf46
-0,         14,         14,        1,   161280, 0x8d9e2680
-0,         15,         15,        1,   161280, 0x8becc20c
-0,         16,         16,        1,   161280, 0x655e444e
-0,         17,         17,        1,   161280, 0x5c112da0
-0,         18,         18,        1,   161280, 0x232fa9eb
-0,         19,         19,        1,   161280, 0x9721745d
-0,         20,         20,        1,   161280, 0x92f1d880
-0,         21,         21,        1,   161280, 0x16233978
-0,         22,         22,        1,   161280, 0x19a27e69
-0,         23,         23,        1,   161280, 0x7b6ad73a
-0,         24,         24,        1,   161280, 0xa7a674aa
-0,         25,         25,        1,   161280, 0x4e434abb
-0,         26,         26,        1,   161280, 0xb96eea14
-0,         27,         27,        1,   161280, 0x1350188c
-0,         28,         28,        1,   161280, 0x79c6f305
-0,         29,         29,        1,   161280, 0xa9c7782d
-0,         30,         30,        1,   161280, 0x40a4f456
-0,         31,         31,        1,   161280, 0xaf291ed6
-0,         32,         32,        1,   161280, 0xab29b4e1
-0,         33,         33,        1,   161280, 0xbfcd2712
-0,         34,         34,        1,   161280, 0xff22a0d7
-0,         35,         35,        1,   161280, 0xb0ae88a9
-0,         36,         36,        1,   161280, 0x811d1259
-0,         37,         37,        1,   161280, 0x593c39a1
-0,         38,         38,        1,   161280, 0x5a5a97f8
-0,         39,         39,        1,   161280, 0xa5639ecf
-0,         40,         40,        1,   161280, 0x543920c6
-0,         41,         41,        1,   161280, 0xb41689ee
-0,         42,         42,        1,   161280, 0xc0ad83de
-0,         43,         43,        1,   161280, 0x9e9e7456
-0,         44,         44,        1,   161280, 0x777ccbfe
-0,         45,         45,        1,   161280, 0x9c2df916
-0,         46,         46,        1,   161280, 0xe0c13b35
-0,         47,         47,        1,   161280, 0x39bfa5a5
-0,         48,         48,        1,   161280, 0x35dfb264
-0,         49,         49,        1,   161280, 0x43018613
-0,         50,         50,        1,   161280, 0x43584b8a
-0,         51,         51,        1,   161280, 0xa5cd230a
-0,         52,         52,        1,   161280, 0x6fe2cfb3
-0,         53,         53,        1,   161280, 0x88a7c0db
-0,         54,         54,        1,   161280, 0x476f1cd2
-0,         55,         55,        1,   161280, 0x96401d49
-0,         56,         56,        1,   161280, 0x7d932919
-0,         57,         57,        1,   161280, 0x06465481
-0,         58,         58,        1,   161280, 0x39631520
-0,         59,         59,        1,   161280, 0xc3fff780
-0,         60,         60,        1,   161280, 0xa81faf28
-0,         61,         61,        1,   161280, 0x7a311f4f
-0,         62,         62,        1,   161280, 0x52f9b931
-0,         63,         63,        1,   161280, 0x938cf016
-0,         64,         64,        1,   161280, 0xf8f6e19c
-0,         65,         65,        1,   161280, 0xca90561b
-0,         66,         66,        1,   161280, 0x8594d06b
-0,         67,         67,        1,   161280, 0xea32bf3b
-0,         68,         68,        1,   161280, 0x4646111a
-0,         69,         69,        1,   161280, 0xee891162
-0,         70,         70,        1,   161280, 0xcfc32082
-0,         71,         71,        1,   161280, 0x863c281a
-0,         72,         72,        1,   161280, 0x01b591aa
-0,         73,         73,        1,   161280, 0x211fbc62
-0,         74,         74,        1,   161280, 0xae2bafe2
-0,         75,         75,        1,   161280, 0xcfe46dca
-0,         76,         76,        1,   161280, 0xcf8fe8a3
-0,         77,         77,        1,   161280, 0x3f8474eb
-0,         78,         78,        1,   161280, 0x06da345a
-0,         79,         79,        1,   161280, 0xbd4d3280
-0,         80,         80,        1,   161280, 0xb5e70fea
-0,         81,         81,        1,   161280, 0x0c99c804
-0,         82,         82,        1,   161280, 0x19841ed4
-0,         83,         83,        1,   161280, 0xf81dea50
-0,         84,         84,        1,   161280, 0x7777d81c
-0,         85,         85,        1,   161280, 0x0497cfd8
-0,         86,         86,        1,   161280, 0x50b6eb64
-0,         87,         87,        1,   161280, 0x5071fc07
-0,         88,         88,        1,   161280, 0xbb7527fb
-0,         89,         89,        1,   161280, 0x13054f1f
-0,         90,         90,        1,   161280, 0x4b78fb27
-0,         91,         91,        1,   161280, 0xf504968f
-0,         92,         92,        1,   161280, 0x555b10b7
-0,         93,         93,        1,   161280, 0xcc0dde40
-0,         94,         94,        1,   161280, 0xcc0dde40
-0,         95,         95,        1,   161280, 0x367f60c8
-0,         96,         96,        1,   161280, 0x367f60c8
-0,         97,         97,        1,   161280, 0x367f60c8
-0,         98,         98,        1,   161280, 0x367f60c8
-0,         99,         99,        1,   161280, 0x367f60c8
-0,        100,        100,        1,   161280, 0x367f60c8
-0,        101,        101,        1,   161280, 0x367f60c8
-0,        102,        102,        1,   161280, 0x367f60c8
-0,        103,        103,        1,   161280, 0x367f60c8
-0,        104,        104,        1,   161280, 0x367f60c8
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x168
+#sar 0: 1/1
+0,          0,          0,        1,   161280, 0x677c9fb3
+0,          1,          1,        1,   161280, 0xaa280e0a
+0,          2,          2,        1,   161280, 0x8a4d2225
+0,          3,          3,        1,   161280, 0xf10f46a8
+0,          4,          4,        1,   161280, 0x98d9eab6
+0,          5,          5,        1,   161280, 0xa543ae1e
+0,          6,          6,        1,   161280, 0x79d717ae
+0,          7,          7,        1,   161280, 0x1a87e2cb
+0,          8,          8,        1,   161280, 0xe5c000ac
+0,          9,          9,        1,   161280, 0xa5827077
+0,         10,         10,        1,   161280, 0xfd0615ee
+0,         11,         11,        1,   161280, 0xc6fdc861
+0,         12,         12,        1,   161280, 0xaa007c7e
+0,         13,         13,        1,   161280, 0xf15e3a96
+0,         14,         14,        1,   161280, 0xce827ae1
+0,         15,         15,        1,   161280, 0xf379fc13
+0,         16,         16,        1,   161280, 0x89686a0c
+0,         17,         17,        1,   161280, 0x7e8342bd
+0,         18,         18,        1,   161280, 0x640dab86
+0,         19,         19,        1,   161280, 0xc6a86456
+0,         20,         20,        1,   161280, 0xe360b538
+0,         21,         21,        1,   161280, 0xbcc21064
+0,         22,         22,        1,   161280, 0x95bc4e63
+0,         23,         23,        1,   161280, 0x390fa1bd
+0,         24,         24,        1,   161280, 0xa35b3bb9
+0,         25,         25,        1,   161280, 0x730b0779
+0,         26,         26,        1,   161280, 0xf3c3a3eb
+0,         27,         27,        1,   161280, 0x676ecbaa
+0,         28,         28,        1,   161280, 0x06c4a4e5
+0,         29,         29,        1,   161280, 0x177d26d9
+0,         30,         30,        1,   161280, 0xdaf69ebe
+0,         31,         31,        1,   161280, 0xabadc296
+0,         32,         32,        1,   161280, 0xec144665
+0,         33,         33,        1,   161280, 0x6785aa48
+0,         34,         34,        1,   161280, 0x2a0cfcaf
+0,         35,         35,        1,   161280, 0x9288d513
+0,         36,         36,        1,   161280, 0x1d295ad0
+0,         37,         37,        1,   161280, 0xb9fd8406
+0,         38,         38,        1,   161280, 0x98bced49
+0,         39,         39,        1,   161280, 0x42e6fbae
+0,         40,         40,        1,   161280, 0xfd218209
+0,         41,         41,        1,   161280, 0x21c2ef31
+0,         42,         42,        1,   161280, 0xce4be932
+0,         43,         43,        1,   161280, 0xd5c0d5fc
+0,         44,         44,        1,   161280, 0xf8d13076
+0,         45,         45,        1,   161280, 0xdbf86007
+0,         46,         46,        1,   161280, 0x9475a651
+0,         47,         47,        1,   161280, 0x41bf1542
+0,         48,         48,        1,   161280, 0x6945297f
+0,         49,         49,        1,   161280, 0x2282025e
+0,         50,         50,        1,   161280, 0x55aace0c
+0,         51,         51,        1,   161280, 0xc78aa51c
+0,         52,         52,        1,   161280, 0xb4b84e6c
+0,         53,         53,        1,   161280, 0x3bbb3e44
+0,         54,         54,        1,   161280, 0x4dd89d80
+0,         55,         55,        1,   161280, 0xa446a5c5
+0,         56,         56,        1,   161280, 0x8f56b1d6
+0,         57,         57,        1,   161280, 0xa170df87
+0,         58,         58,        1,   161280, 0x4740a4df
+0,         59,         59,        1,   161280, 0x86608ee7
+0,         60,         60,        1,   161280, 0x629b4543
+0,         61,         61,        1,   161280, 0x697fb952
+0,         62,         62,        1,   161280, 0x98e84a51
+0,         63,         63,        1,   161280, 0x97949a90
+0,         64,         64,        1,   161280, 0x6a8c9b96
+0,         65,         65,        1,   161280, 0xafa714ab
+0,         66,         66,        1,   161280, 0x0cf39314
+0,         67,         67,        1,   161280, 0x9ccc8171
+0,         68,         68,        1,   161280, 0x8232d5a8
+0,         69,         69,        1,   161280, 0x250dd5cb
+0,         70,         70,        1,   161280, 0xf764e43a
+0,         71,         71,        1,   161280, 0x2f4bec00
+0,         72,         72,        1,   161280, 0x76f1598b
+0,         73,         73,        1,   161280, 0xa91b84da
+0,         74,         74,        1,   161280, 0x011a77fb
+0,         75,         75,        1,   161280, 0xdbf5341c
+0,         76,         76,        1,   161280, 0x40d5abfa
+0,         77,         77,        1,   161280, 0x9fb8360c
+0,         78,         78,        1,   161280, 0xabc5fba8
+0,         79,         79,        1,   161280, 0x98090909
+0,         80,         80,        1,   161280, 0x9a3613bd
+0,         81,         81,        1,   161280, 0x9071024f
+0,         82,         82,        1,   161280, 0x4df39487
+0,         83,         83,        1,   161280, 0x17658524
+0,         84,         84,        1,   161280, 0xbcd794df
+0,         85,         85,        1,   161280, 0x2a14ae05
+0,         86,         86,        1,   161280, 0x664feab2
+0,         87,         87,        1,   161280, 0xf6b721f4
+0,         88,         88,        1,   161280, 0xfec565f3
+0,         89,         89,        1,   161280, 0xd39aabee
+0,         90,         90,        1,   161280, 0x1f3d5de7
+0,         91,         91,        1,   161280, 0xaf97f50c
+0,         92,         92,        1,   161280, 0xe34b6b6a
+0,         93,         93,        1,   161280, 0x4117371e
+0,         94,         94,        1,   161280, 0x4117371e
+0,         95,         95,        1,   161280, 0xe555b55e
+0,         96,         96,        1,   161280, 0xe555b55e
+0,         97,         97,        1,   161280, 0xe555b55e
+0,         98,         98,        1,   161280, 0xe555b55e
+0,         99,         99,        1,   161280, 0xe555b55e
+0,        100,        100,        1,   161280, 0xe555b55e
+0,        101,        101,        1,   161280, 0xe555b55e
+0,        102,        102,        1,   161280, 0xe555b55e
+0,        103,        103,        1,   161280, 0xe555b55e
+0,        104,        104,        1,   161280, 0xe555b55e
diff --git a/tests/ref/fate/truemotion1-24 b/tests/ref/fate/truemotion1-24
index 73bb9e7de4..b41eae0dfa 100644
--- a/tests/ref/fate/truemotion1-24
+++ b/tests/ref/fate/truemotion1-24
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 144x160
+#sar 0: 2/1
 0,          0,          0,        1,    69120, 0x68beb30f
 0,          1,          1,        1,    69120, 0x3976f5cf
 0,          2,          2,        1,    69120, 0xf815bc3c
diff --git a/tests/ref/fate/truemotion2 b/tests/ref/fate/truemotion2
index c263ba4580..df25f618c3 100644
--- a/tests/ref/fate/truemotion2
+++ b/tests/ref/fate/truemotion2
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   230400, 0x135cb509
 0,          1,          1,        1,   230400, 0x919a1ab7
 0,          2,          2,        1,   230400, 0x0af8722b
diff --git a/tests/ref/fate/truemotion2rt-high b/tests/ref/fate/truemotion2rt-high
index 1b08f6f45d..2947857f4c 100644
--- a/tests/ref/fate/truemotion2rt-high
+++ b/tests/ref/fate/truemotion2rt-high
@@ -1,2 +1,6 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
 0,          0,          0,        1,    54288, 0xbb88db84
diff --git a/tests/ref/fate/truemotion2rt-low b/tests/ref/fate/truemotion2rt-low
index 5251a793bd..843e826d27 100644
--- a/tests/ref/fate/truemotion2rt-low
+++ b/tests/ref/fate/truemotion2rt-low
@@ -1,2 +1,6 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x232
+#sar 0: 0/1
 0,          0,          0,        1,    54288, 0x94310459
diff --git a/tests/ref/fate/truemotion2rt-mid b/tests/ref/fate/truemotion2rt-mid
index f99efca0bd..98ec6f015b 100644
--- a/tests/ref/fate/truemotion2rt-mid
+++ b/tests/ref/fate/truemotion2rt-mid
@@ -1,2 +1,6 @@
 #tb 0: 100/2397
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x196
+#sar 0: 0/1
 0,          0,          0,        1,    45864, 0x6c39a9e0
diff --git a/tests/ref/fate/ts-demux b/tests/ref/fate/ts-demux
new file mode 100644
index 0000000000..e2931af427
--- /dev/null
+++ b/tests/ref/fate/ts-demux
@@ -0,0 +1,32 @@
+#extradata 0:      150, 0xb4192fb9
+#tb 0: 1/90000
+#media_type 0: video
+#codec_id 0: mpeg2video
+#dimensions 0: 1280x720
+#sar 0: 1/1
+#tb 1: 1/90000
+#media_type 1: audio
+#codec_id 1: ac3
+#sample_rate 1: 48000
+#channel_layout 1: 60f
+#channel_layout_name 1: 5.1(side)
+1,          0,          0,     2880,     1536, 0x773ffeea, S=1,        1, 0x00bd00bd
+1,       2880,       2880,     2880,     1536, 0x6dc10748
+1,       5760,       5760,     2880,     1536, 0xbab5129c
+1,       8640,       8640,     2880,     1536, 0x602f034b
+1,      11520,      11520,     2880,      906, 0x69cdcbcd
+0,      32037,      36541,     1501,   114336, 0x37a215a8, S=1,        1, 0x00e000e0
+0,      33538,      33538,     1501,    12560, 0xb559a3d4, F=0x0, S=1,        1, 0x00e000e0
+0,      35040,      35040,     1501,    12704, 0x2614adf4, F=0x0, S=1,        1, 0x00e000e0
+0,      36541,      41046,     1501,    51976, 0x9ff1dbfe, F=0x0, S=1,        1, 0x00e000e0
+0,      38043,      38043,     1501,    13096, 0x4ff9ea23, F=0x0, S=1,        1, 0x00e000e0
+0,      39544,      39544,     1501,    13744, 0xf2b2402a, F=0x0, S=1,        1, 0x00e000e0
+0,      41046,      45550,     1501,    56568, 0x65f5aee1, F=0x0, S=1,        1, 0x00e000e0
+0,      42547,      42547,     1501,    14720, 0x8855866c, F=0x0, S=1,        1, 0x00e000e0
+0,      44049,      44049,     1501,    15216, 0x83cbc4fc, F=0x0, S=1,        1, 0x00e000e0
+0,      45550,      50055,     1501,    61720, 0xecda6b05, F=0x0, S=1,        1, 0x00e000e0
+0,      47052,      47052,     1501,    17416, 0xdf480c6d, F=0x0, S=1,        1, 0x00e000e0
+0,      48553,      48553,     1501,    18144, 0x1950624c, F=0x0, S=1,        1, 0x00e000e0
+0,      50055,      54559,     1501,    56848, 0xd4f315be, F=0x0, S=1,        1, 0x00e000e0
+0,      51556,      51556,     1501,    16296, 0xd391a1d0, F=0x0, S=1,        1, 0x00e000e0
+0,      53058,      53058,     1501,     4944, 0x4d88640e, F=0x0
diff --git a/tests/ref/fate/ts-opus-demux b/tests/ref/fate/ts-opus-demux
new file mode 100644
index 0000000000..3c5edffb2c
--- /dev/null
+++ b/tests/ref/fate/ts-opus-demux
@@ -0,0 +1,519 @@
+#extradata 0:       30, 0x53be0347
+#tb 0: 1/90000
+#media_type 0: audio
+#codec_id 0: opus
+#sample_rate 0: 48000
+#channel_layout 0: 63f
+#channel_layout_name 0: 7.1
+0,          0,          0,     1800,      744, 0x172b615b, S=1,        1, 0x00bd00bd
+0,       1800,       1800,     1800,      743, 0x3f5b673d, S=1,        1, 0x00bd00bd
+0,       3600,       3600,     1800,      747, 0xe54e735d, S=1,        1, 0x00bd00bd
+0,       5400,       5400,     1800,      742, 0x5d0d8393, S=1,        1, 0x00bd00bd
+0,       7200,       7200,     1800,      752, 0x39267814, S=1,        1, 0x00bd00bd
+0,       9000,       9000,     1800,      753, 0x2131765e, S=1,        1, 0x00bd00bd
+0,      10800,      10800,     1800,      756, 0x5132827f, S=1,        1, 0x00bd00bd
+0,      12600,      12600,     1800,      761, 0x4857760b, S=1,        1, 0x00bd00bd
+0,      14400,      14400,     1800,      755, 0x87ab75d6, S=1,        1, 0x00bd00bd
+0,      16200,      16200,     1800,      760, 0xb8137907, S=1,        1, 0x00bd00bd
+0,      18000,      18000,     1800,      759, 0x722d7908, S=1,        1, 0x00bd00bd
+0,      19800,      19800,     1800,      760, 0x738674a6, S=1,        1, 0x00bd00bd
+0,      21600,      21600,     1800,      762, 0x4f807c28, S=1,        1, 0x00bd00bd
+0,      23400,      23400,     1800,      761, 0xea117c65, S=1,        1, 0x00bd00bd
+0,      25200,      25200,     1800,      758, 0xa8ad7d2f, S=1,        1, 0x00bd00bd
+0,      27000,      27000,     1800,      756, 0xbea5747a, S=1,        1, 0x00bd00bd
+0,      28800,      28800,     1800,      762, 0x62ce8ab7, S=1,        1, 0x00bd00bd
+0,      30600,      30600,     1800,      763, 0xd7d36ee9, S=1,        1, 0x00bd00bd
+0,      32400,      32400,     1800,      765, 0x068b7b14, S=1,        1, 0x00bd00bd
+0,      34200,      34200,     1800,      772, 0x7c4086f7, S=1,        1, 0x00bd00bd
+0,      36000,      36000,     1800,      817, 0x81828e8c, S=1,        1, 0x00bd00bd
+0,      37800,      37800,     1800,      828, 0x182d9622, S=1,        1, 0x00bd00bd
+0,      39600,      39600,     1800,      952, 0xcb36d7f3, S=1,        1, 0x00bd00bd
+0,      41400,      41400,     1800,      819, 0x94049c46, S=1,        1, 0x00bd00bd
+0,      43200,      43200,     1800,      816, 0x9a0794de, S=1,        1, 0x00bd00bd
+0,      45000,      45000,     1800,      825, 0x2745a0b5, S=1,        1, 0x00bd00bd
+0,      46800,      46800,     1800,      814, 0x4abc994c, S=1,        1, 0x00bd00bd
+0,      48600,      48600,     1800,      824, 0xe49b89ea, S=1,        1, 0x00bd00bd
+0,      50400,      50400,     1800,      815, 0x2f4b8673, S=1,        1, 0x00bd00bd
+0,      52200,      52200,     1800,      824, 0x703da79a, S=1,        1, 0x00bd00bd
+0,      54000,      54000,     1800,      822, 0x41e59285, S=1,        1, 0x00bd00bd
+0,      55800,      55800,     1800,      819, 0xbc4c8f4d, S=1,        1, 0x00bd00bd
+0,      57600,      57600,     1800,      817, 0xba7f9614, S=1,        1, 0x00bd00bd
+0,      59400,      59400,     1800,      826, 0x74cb9b10, S=1,        1, 0x00bd00bd
+0,      61200,      61200,     1800,      822, 0xab4ba435, S=1,        1, 0x00bd00bd
+0,      63000,      63000,     1800,      815, 0xf1209eeb, S=1,        1, 0x00bd00bd
+0,      64800,      64800,     1800,      820, 0x302b8f4a, S=1,        1, 0x00bd00bd
+0,      66600,      66600,     1800,      828, 0x16e29b1b, S=1,        1, 0x00bd00bd
+0,      68400,      68400,     1800,      828, 0x21dba353, S=1,        1, 0x00bd00bd
+0,      70200,      70200,     1800,      942, 0xf51cd517, S=1,        1, 0x00bd00bd
+0,      72000,      72000,     1800,      809, 0x22b29687, S=1,        1, 0x00bd00bd
+0,      73800,      73800,     1800,      823, 0x5a549e20, S=1,        1, 0x00bd00bd
+0,      75600,      75600,     1800,      827, 0x51bc9130, S=1,        1, 0x00bd00bd
+0,      77400,      77400,     1800,      823, 0x9a2d9334, S=1,        1, 0x00bd00bd
+0,      79200,      79200,     1800,      825, 0x6b2c8a1f, S=1,        1, 0x00bd00bd
+0,      81000,      81000,     1800,      828, 0xf11695c9, S=1,        1, 0x00bd00bd
+0,      82800,      82800,     1800,      823, 0xcdb79edf, S=1,        1, 0x00bd00bd
+0,      84600,      84600,     1800,      817, 0x5586950d, S=1,        1, 0x00bd00bd
+0,      86400,      86400,     1800,      813, 0xb4f79688, S=1,        1, 0x00bd00bd
+0,      88200,      88200,     1800,      809, 0xef8e9548, S=1,        1, 0x00bd00bd
+0,      90000,      90000,     1800,      813, 0x08e18b6c, S=1,        1, 0x00bd00bd
+0,      91800,      91800,     1800,      820, 0x94759346, S=1,        1, 0x00bd00bd
+0,      93600,      93600,     1800,      818, 0x7ba198dc, S=1,        1, 0x00bd00bd
+0,      95400,      95400,     1800,      825, 0x96d095fe, S=1,        1, 0x00bd00bd
+0,      97200,      97200,     1800,      808, 0xa72fa0ac, S=1,        1, 0x00bd00bd
+0,      99000,      99000,     1800,      774, 0x36c67f3c, S=1,        1, 0x00bd00bd
+0,     100800,     100800,     1800,      774, 0x08ac8292, S=1,        1, 0x00bd00bd
+0,     102600,     102600,     1800,      777, 0x866591ea, S=1,        1, 0x00bd00bd
+0,     104400,     104400,     1800,      776, 0xd3cb7ec6, S=1,        1, 0x00bd00bd
+0,     106200,     106200,     1800,      779, 0xc6927a93, S=1,        1, 0x00bd00bd
+0,     108000,     108000,     1800,      779, 0x73d182ca, S=1,        1, 0x00bd00bd
+0,     109800,     109800,     1800,      774, 0xd97871d2, S=1,        1, 0x00bd00bd
+0,     111600,     111600,     1800,      772, 0x37228529, S=1,        1, 0x00bd00bd
+0,     113400,     113400,     1800,      779, 0x9f618562, S=1,        1, 0x00bd00bd
+0,     115200,     115200,     1800,      774, 0xee078bd8, S=1,        1, 0x00bd00bd
+0,     117000,     117000,     1800,      772, 0xceed8003, S=1,        1, 0x00bd00bd
+0,     118800,     118800,     1800,      771, 0x8e478da2, S=1,        1, 0x00bd00bd
+0,     120600,     120600,     1800,      776, 0x4fae8319, S=1,        1, 0x00bd00bd
+0,     122400,     122400,     1800,      776, 0xea5d91ab, S=1,        1, 0x00bd00bd
+0,     124200,     124200,     1800,      777, 0x52b988f2, S=1,        1, 0x00bd00bd
+0,     126000,     126000,     1800,      779, 0xb25187e2, S=1,        1, 0x00bd00bd
+0,     127800,     127800,     1800,      779, 0xbe0c88de, S=1,        1, 0x00bd00bd
+0,     129600,     129600,     1800,      774, 0xaab58263, S=1,        1, 0x00bd00bd
+0,     131400,     131400,     1800,      779, 0xd1b58090, S=1,        1, 0x00bd00bd
+0,     133200,     133200,     1800,      782, 0x46229193, S=1,        1, 0x00bd00bd
+0,     135000,     135000,     1800,      776, 0x873c8e09, S=1,        1, 0x00bd00bd
+0,     136800,     136800,     1800,      778, 0x3ea578e8, S=1,        1, 0x00bd00bd
+0,     138600,     138600,     1800,      777, 0xebf88d2c, S=1,        1, 0x00bd00bd
+0,     140400,     140400,     1800,      785, 0x9a8886e2, S=1,        1, 0x00bd00bd
+0,     142200,     142200,     1800,      782, 0x000283d0, S=1,        1, 0x00bd00bd
+0,     144000,     144000,     1800,      782, 0x7c7f7e7f, S=1,        1, 0x00bd00bd
+0,     145800,     145800,     1800,      780, 0xdba17e74, S=1,        1, 0x00bd00bd
+0,     147600,     147600,     1800,      776, 0x7a77823a, S=1,        1, 0x00bd00bd
+0,     149400,     149400,     1800,      780, 0x570e8459, S=1,        1, 0x00bd00bd
+0,     151200,     151200,     1800,      784, 0x13008da0, S=1,        1, 0x00bd00bd
+0,     153000,     153000,     1800,      776, 0xf97b85bb, S=1,        1, 0x00bd00bd
+0,     154800,     154800,     1800,      777, 0x7ea88b95, S=1,        1, 0x00bd00bd
+0,     156600,     156600,     1800,      783, 0x45a07db2, S=1,        1, 0x00bd00bd
+0,     158400,     158400,     1800,      780, 0xc3598deb, S=1,        1, 0x00bd00bd
+0,     160200,     160200,     1800,      782, 0x4aee86d5, S=1,        1, 0x00bd00bd
+0,     162000,     162000,     1800,      848, 0x2ade9d75, S=1,        1, 0x00bd00bd
+0,     163800,     163800,     1800,      849, 0xc617a90e, S=1,        1, 0x00bd00bd
+0,     165600,     165600,     1800,      783, 0xc99d8348, S=1,        1, 0x00bd00bd
+0,     167400,     167400,     1800,      784, 0x01938414, S=1,        1, 0x00bd00bd
+0,     169200,     169200,     1800,      785, 0xaa1e7f3a, S=1,        1, 0x00bd00bd
+0,     171000,     171000,     1800,      783, 0x373984e5, S=1,        1, 0x00bd00bd
+0,     172800,     172800,     1800,      876, 0x30c3b045, S=1,        1, 0x00bd00bd
+0,     174600,     174600,     1800,      776, 0x54b58475, S=1,        1, 0x00bd00bd
+0,     176400,     176400,     1800,      787, 0x76e7856f, S=1,        1, 0x00bd00bd
+0,     178200,     178200,     1800,      781, 0xf1f680c2, S=1,        1, 0x00bd00bd
+0,     180000,     180000,     1800,      852, 0xae8baec5, S=1,        1, 0x00bd00bd
+0,     181800,     181800,     1800,      849, 0x270d9d75, S=1,        1, 0x00bd00bd
+0,     183600,     183600,     1800,      873, 0x3d20ae97, S=1,        1, 0x00bd00bd
+0,     185400,     185400,     1800,      843, 0x0ef4a2e0, S=1,        1, 0x00bd00bd
+0,     187200,     187200,     1800,      841, 0xf2c5ad85, S=1,        1, 0x00bd00bd
+0,     189000,     189000,     1800,      777, 0xebf88dbf, S=1,        1, 0x00bd00bd
+0,     190800,     190800,     1800,      846, 0x77bda358, S=1,        1, 0x00bd00bd
+0,     192600,     192600,     1800,      782, 0x47958532, S=1,        1, 0x00bd00bd
+0,     194400,     194400,     1800,      869, 0xa1c1ae39, S=1,        1, 0x00bd00bd
+0,     196200,     196200,     1800,      778, 0xa7428581, S=1,        1, 0x00bd00bd
+0,     198000,     198000,     1800,      777, 0x550e85c4, S=1,        1, 0x00bd00bd
+0,     199800,     199800,     1800,      870, 0x46c8c374, S=1,        1, 0x00bd00bd
+0,     201600,     201600,     1800,      782, 0x6a44850b, S=1,        1, 0x00bd00bd
+0,     203400,     203400,     1800,      777, 0xb956775e, S=1,        1, 0x00bd00bd
+0,     205200,     205200,     1800,      869, 0x3fc4b23a, S=1,        1, 0x00bd00bd
+0,     207000,     207000,     1800,      772, 0x81568572, S=1,        1, 0x00bd00bd
+0,     208800,     208800,     1800,      775, 0x77688738, S=1,        1, 0x00bd00bd
+0,     210600,     210600,     1800,      771, 0x1f2276f1, S=1,        1, 0x00bd00bd
+0,     212400,     212400,     1800,      778, 0x82ec7e07, S=1,        1, 0x00bd00bd
+0,     214200,     214200,     1800,      867, 0x1042acb8, S=1,        1, 0x00bd00bd
+0,     216000,     216000,     1800,      778, 0x3f007d1a, S=1,        1, 0x00bd00bd
+0,     217800,     217800,     1800,      774, 0x66a08780, S=1,        1, 0x00bd00bd
+0,     219600,     219600,     1800,      775, 0xebdc822d, S=1,        1, 0x00bd00bd
+0,     221400,     221400,     1800,      774, 0x33d7894e, S=1,        1, 0x00bd00bd
+0,     223200,     223200,     1800,      774, 0x734c7623, S=1,        1, 0x00bd00bd
+0,     225000,     225000,     1800,      772, 0xbb9977d2, S=1,        1, 0x00bd00bd
+0,     226800,     226800,     1800,      774, 0x8f8670d1, S=1,        1, 0x00bd00bd
+0,     228600,     228600,     1800,      775, 0x23857f28, S=1,        1, 0x00bd00bd
+0,     230400,     230400,     1800,      773, 0x709f6731, S=1,        1, 0x00bd00bd
+0,     232200,     232200,     1800,      773, 0xc1fa752e, S=1,        1, 0x00bd00bd
+0,     234000,     234000,     1800,      769, 0x2e337fe4, S=1,        1, 0x00bd00bd
+0,     235800,     235800,     1800,      774, 0x4ab07b6f, S=1,        1, 0x00bd00bd
+0,     237600,     237600,     1800,      779, 0x95d386f8, S=1,        1, 0x00bd00bd
+0,     239400,     239400,     1800,      782, 0x38637dc5, S=1,        1, 0x00bd00bd
+0,     241200,     241200,     1800,      779, 0x78a778d5, S=1,        1, 0x00bd00bd
+0,     243000,     243000,     1800,      778, 0xb945760f, S=1,        1, 0x00bd00bd
+0,     244800,     244800,     1800,      771, 0x6749751a, S=1,        1, 0x00bd00bd
+0,     246600,     246600,     1800,      775, 0x05cd7c6d, S=1,        1, 0x00bd00bd
+0,     248400,     248400,     1800,      777, 0x25587463, S=1,        1, 0x00bd00bd
+0,     250200,     250200,     1800,      773, 0x6ab97c1d, S=1,        1, 0x00bd00bd
+0,     252000,     252000,     1800,      777, 0x2b947d43, S=1,        1, 0x00bd00bd
+0,     253800,     253800,     1800,      777, 0x3f337893, S=1,        1, 0x00bd00bd
+0,     255600,     255600,     1800,      908, 0x64b1be4e, S=1,        1, 0x00bd00bd
+0,     257400,     257400,     1800,      777, 0xb480873e, S=1,        1, 0x00bd00bd
+0,     259200,     259200,     1800,      772, 0xb3ec76c2, S=1,        1, 0x00bd00bd
+0,     261000,     261000,     1800,      778, 0x4e7c7ef9, S=1,        1, 0x00bd00bd
+0,     262800,     262800,     1800,      776, 0xcdc6837f, S=1,        1, 0x00bd00bd
+0,     264600,     264600,     1800,      775, 0xf2508942, S=1,        1, 0x00bd00bd
+0,     266400,     266400,     1800,      772, 0x12907489, S=1,        1, 0x00bd00bd
+0,     268200,     268200,     1800,      778, 0x9c6f7ec4, S=1,        1, 0x00bd00bd
+0,     270000,     270000,     1800,      808, 0x00b68b53, S=1,        1, 0x00bd00bd
+0,     271800,     271800,     1800,      836, 0x5eafa13b, S=1,        1, 0x00bd00bd
+0,     273600,     273600,     1800,      913, 0x41bbb8ef, S=1,        1, 0x00bd00bd
+0,     275400,     275400,     1800,      837, 0xc87c9722, S=1,        1, 0x00bd00bd
+0,     277200,     277200,     1800,      834, 0x0f6a9e6b, S=1,        1, 0x00bd00bd
+0,     279000,     279000,     1800,      836, 0x4447af84, S=1,        1, 0x00bd00bd
+0,     280800,     280800,     1800,      832, 0x95bea5c4, S=1,        1, 0x00bd00bd
+0,     282600,     282600,     1800,      826, 0x17b7ab77, S=1,        1, 0x00bd00bd
+0,     284400,     284400,     1800,      817, 0x85eb9dec, S=1,        1, 0x00bd00bd
+0,     286200,     286200,     1800,      825, 0xe21489b4, S=1,        1, 0x00bd00bd
+0,     288000,     288000,     1800,      824, 0xa2719501, S=1,        1, 0x00bd00bd
+0,     289800,     289800,     1800,      828, 0xad3d8dfc, S=1,        1, 0x00bd00bd
+0,     291600,     291600,     1800,      833, 0x39419a9f, S=1,        1, 0x00bd00bd
+0,     293400,     293400,     1800,      832, 0x7b46b0d0, S=1,        1, 0x00bd00bd
+0,     295200,     295200,     1800,      896, 0x351aa129, S=1,        1, 0x00bd00bd
+0,     297000,     297000,     1800,      824, 0x215ba6a6, S=1,        1, 0x00bd00bd
+0,     298800,     298800,     1800,      812, 0x523aa6e4, S=1,        1, 0x00bd00bd
+0,     300600,     300600,     1800,      821, 0x3f3fa6df, S=1,        1, 0x00bd00bd
+0,     302400,     302400,     1800,      883, 0xa87a9886, S=1,        1, 0x00bd00bd
+0,     304200,     304200,     1800,      820, 0xe097a7ee, S=1,        1, 0x00bd00bd
+0,     306000,     306000,     1800,      835, 0xf3a3a496, S=1,        1, 0x00bd00bd
+0,     307800,     307800,     1800,      833, 0xa7d1a13e, S=1,        1, 0x00bd00bd
+0,     309600,     309600,     1800,      830, 0xab719f25, S=1,        1, 0x00bd00bd
+0,     311400,     311400,     1800,      820, 0x80599754, S=1,        1, 0x00bd00bd
+0,     313200,     313200,     1800,      815, 0x517e8dec, S=1,        1, 0x00bd00bd
+0,     315000,     315000,     1800,      827, 0x8e33855b, S=1,        1, 0x00bd00bd
+0,     316800,     316800,     1800,      819, 0x6a7d88a3, S=1,        1, 0x00bd00bd
+0,     318600,     318600,     1800,      828, 0x69b09497, S=1,        1, 0x00bd00bd
+0,     320400,     320400,     1800,      830, 0x72cb9f2a, S=1,        1, 0x00bd00bd
+0,     322200,     322200,     1800,      828, 0xb7299897, S=1,        1, 0x00bd00bd
+0,     324000,     324000,     1800,      829, 0x9dcaa4b8, S=1,        1, 0x00bd00bd
+0,     325800,     325800,     1800,      820, 0x6303a6bd, S=1,        1, 0x00bd00bd
+0,     327600,     327600,     1800,      823, 0xf1d694e7, S=1,        1, 0x00bd00bd
+0,     329400,     329400,     1800,      798, 0x6add8cfc, S=1,        1, 0x00bd00bd
+0,     331200,     331200,     1800,      772, 0xd7927331, S=1,        1, 0x00bd00bd
+0,     333000,     333000,     1800,      779, 0x82eb7660, S=1,        1, 0x00bd00bd
+0,     334800,     334800,     1800,      774, 0x50217e2b, S=1,        1, 0x00bd00bd
+0,     336600,     336600,     1800,      907, 0xfcd7bc7e, S=1,        1, 0x00bd00bd
+0,     338400,     338400,     1800,      772, 0x433b6c19, S=1,        1, 0x00bd00bd
+0,     340200,     340200,     1800,      777, 0xf3737c93, S=1,        1, 0x00bd00bd
+0,     342000,     342000,     1800,      777, 0x74c18580, S=1,        1, 0x00bd00bd
+0,     343800,     343800,     1800,      777, 0xb4d97b39, S=1,        1, 0x00bd00bd
+0,     345600,     345600,     1800,      775, 0xde3a85fd, S=1,        1, 0x00bd00bd
+0,     347400,     347400,     1800,      773, 0xf2fc8d11, S=1,        1, 0x00bd00bd
+0,     349200,     349200,     1800,      777, 0xac3f86d0, S=1,        1, 0x00bd00bd
+0,     351000,     351000,     1800,      777, 0x6a138265, S=1,        1, 0x00bd00bd
+0,     352800,     352800,     1800,      776, 0xfbb58ca1, S=1,        1, 0x00bd00bd
+0,     354600,     354600,     1800,      780, 0xd28a84cf, S=1,        1, 0x00bd00bd
+0,     356400,     356400,     1800,      776, 0x623a7e56, S=1,        1, 0x00bd00bd
+0,     358200,     358200,     1800,      778, 0xccb17d51, S=1,        1, 0x00bd00bd
+0,     360000,     360000,     1800,      774, 0x15747fcb, S=1,        1, 0x00bd00bd
+0,     361800,     361800,     1800,      778, 0xebf48852, S=1,        1, 0x00bd00bd
+0,     363600,     363600,     1800,      777, 0xec0d71f5, S=1,        1, 0x00bd00bd
+0,     365400,     365400,     1800,      773, 0xea328055, S=1,        1, 0x00bd00bd
+0,     367200,     367200,     1800,      782, 0xc47c8ba6, S=1,        1, 0x00bd00bd
+0,     369000,     369000,     1800,      780, 0x9de38ea5, S=1,        1, 0x00bd00bd
+0,     370800,     370800,     1800,      777, 0xa1d989c3, S=1,        1, 0x00bd00bd
+0,     372600,     372600,     1800,      775, 0xff8e829b, S=1,        1, 0x00bd00bd
+0,     374400,     374400,     1800,      777, 0x7f4685bd, S=1,        1, 0x00bd00bd
+0,     376200,     376200,     1800,      776, 0x911090ef, S=1,        1, 0x00bd00bd
+0,     378000,     378000,     1800,      778, 0x47a086b1, S=1,        1, 0x00bd00bd
+0,     379800,     379800,     1800,      775, 0x83f081f4, S=1,        1, 0x00bd00bd
+0,     381600,     381600,     1800,      775, 0xf7d48741, S=1,        1, 0x00bd00bd
+0,     383400,     383400,     1800,      779, 0x2c087a7b, S=1,        1, 0x00bd00bd
+0,     385200,     385200,     1800,      779, 0x5c77857a, S=1,        1, 0x00bd00bd
+0,     387000,     387000,     1800,      778, 0x46907b70, S=1,        1, 0x00bd00bd
+0,     388800,     388800,     1800,      780, 0xc3a88f68, S=1,        1, 0x00bd00bd
+0,     390600,     390600,     1800,      778, 0x35aa818b, S=1,        1, 0x00bd00bd
+0,     392400,     392400,     1800,      776, 0xfb3d749c, S=1,        1, 0x00bd00bd
+0,     394200,     394200,     1800,      777, 0x95e37fda, S=1,        1, 0x00bd00bd
+0,     396000,     396000,     1800,      841, 0xbfffa393, S=1,        1, 0x00bd00bd
+0,     397800,     397800,     1800,      777, 0x63858f67, S=1,        1, 0x00bd00bd
+0,     399600,     399600,     1800,      780, 0xe277884b, S=1,        1, 0x00bd00bd
+0,     401400,     401400,     1800,      777, 0x1e658659, S=1,        1, 0x00bd00bd
+0,     403200,     403200,     1800,      777, 0x0ed17df3, S=1,        1, 0x00bd00bd
+0,     405000,     405000,     1800,      778, 0x804b6fad, S=1,        1, 0x00bd00bd
+0,     406800,     406800,     1800,      778, 0x6b2c8512, S=1,        1, 0x00bd00bd
+0,     408600,     408600,     1800,      779, 0x6ca776d3, S=1,        1, 0x00bd00bd
+0,     410400,     410400,     1800,      776, 0x6a8b8ea9, S=1,        1, 0x00bd00bd
+0,     412200,     412200,     1800,      784, 0x1a367f43, S=1,        1, 0x00bd00bd
+0,     414000,     414000,     1800,      776, 0x19d2865a, S=1,        1, 0x00bd00bd
+0,     415800,     415800,     1800,      778, 0xb00d860f, S=1,        1, 0x00bd00bd
+0,     417600,     417600,     1800,      775, 0x9d4f7b80, S=1,        1, 0x00bd00bd
+0,     419400,     419400,     1800,      781, 0x42f1863b, S=1,        1, 0x00bd00bd
+0,     421200,     421200,     1800,      779, 0x6b669d4e, S=1,        1, 0x00bd00bd
+0,     423000,     423000,     1800,      846, 0x9a3fab04, S=1,        1, 0x00bd00bd
+0,     424800,     424800,     1800,      776, 0x2db875e2, S=1,        1, 0x00bd00bd
+0,     426600,     426600,     1800,      781, 0xbadf8580, S=1,        1, 0x00bd00bd
+0,     428400,     428400,     1800,      783, 0xed878378, S=1,        1, 0x00bd00bd
+0,     430200,     430200,     1800,      971, 0xf23af2a9, S=1,        1, 0x00bd00bd
+0,     432000,     432000,     1800,      970, 0xcecfee4f, S=1,        1, 0x00bd00bd
+0,     433800,     433800,     1800,      967, 0xc737eee7, S=1,        1, 0x00bd00bd
+0,     435600,     435600,     1800,      776, 0x113d8458, S=1,        1, 0x00bd00bd
+0,     437400,     437400,     1800,      971, 0xd8a3e77e, S=1,        1, 0x00bd00bd
+0,     439200,     439200,     1800,      962, 0xe454e344, S=1,        1, 0x00bd00bd
+0,     441000,     441000,     1800,      964, 0x01bce383, S=1,        1, 0x00bd00bd
+0,     442800,     442800,     1800,      773, 0xb257800b, S=1,        1, 0x00bd00bd
+0,     444600,     444600,     1800,      770, 0x390a8fc9, S=1,        1, 0x00bd00bd
+0,     446400,     446400,     1800,      964, 0xb377dc40, S=1,        1, 0x00bd00bd
+0,     448200,     448200,     1800,      958, 0x725dd1bc, S=1,        1, 0x00bd00bd
+0,     450000,     450000,     1800,      775, 0x71676ef9, S=1,        1, 0x00bd00bd
+0,     451800,     451800,     1800,      775, 0x302f7be4, S=1,        1, 0x00bd00bd
+0,     453600,     453600,     1800,      966, 0x15e2ddfc, S=1,        1, 0x00bd00bd
+0,     455400,     455400,     1800,      843, 0xa374a091, S=1,        1, 0x00bd00bd
+0,     457200,     457200,     1800,      846, 0xfeeea12f, S=1,        1, 0x00bd00bd
+0,     459000,     459000,     1800,      775, 0xba4278d4, S=1,        1, 0x00bd00bd
+0,     460800,     460800,     1800,      901, 0xc135cbd2, S=1,        1, 0x00bd00bd
+0,     462600,     462600,     1800,      958, 0x7785ce8a, S=1,        1, 0x00bd00bd
+0,     464400,     464400,     1800,      770, 0x93ff72e0, S=1,        1, 0x00bd00bd
+0,     466200,     466200,     1800,      773, 0x4b858520, S=1,        1, 0x00bd00bd
+0,     468000,     468000,     1800,      768, 0xf9718bc1, S=1,        1, 0x00bd00bd
+0,     469800,     469800,     1800,      776, 0x42978a5d, S=1,        1, 0x00bd00bd
+0,     471600,     471600,     1800,      771, 0xd40f85f4, S=1,        1, 0x00bd00bd
+0,     473400,     473400,     1800,      772, 0x9e39814e, S=1,        1, 0x00bd00bd
+0,     475200,     475200,     1800,      958, 0xa402dd54, S=1,        1, 0x00bd00bd
+0,     477000,     477000,     1800,      771, 0xef48765c, S=1,        1, 0x00bd00bd
+0,     478800,     478800,     1800,      770, 0x20367c7c, S=1,        1, 0x00bd00bd
+0,     480600,     480600,     1800,      959, 0xd855ce75, S=1,        1, 0x00bd00bd
+0,     482400,     482400,     1800,      769, 0x44e9805f, S=1,        1, 0x00bd00bd
+0,     484200,     484200,     1800,      840, 0x0ceb90b9, S=1,        1, 0x00bd00bd
+0,     486000,     486000,     1800,      769, 0xeb0b7c25, S=1,        1, 0x00bd00bd
+0,     487800,     487800,     1800,      767, 0x5c278027, S=1,        1, 0x00bd00bd
+0,     489600,     489600,     1800,      951, 0xa9b6dc3f, S=1,        1, 0x00bd00bd
+0,     491400,     491400,     1800,      769, 0x4082825f, S=1,        1, 0x00bd00bd
+0,     493200,     493200,     1800,      958, 0xd71fe68a, S=1,        1, 0x00bd00bd
+0,     495000,     495000,     1800,      773, 0x35f789cd, S=1,        1, 0x00bd00bd
+0,     496800,     496800,     1800,      771, 0xa15d7ecb, S=1,        1, 0x00bd00bd
+0,     498600,     498600,     1800,      768, 0x35e77aca, S=1,        1, 0x00bd00bd
+0,     500400,     500400,     1800,      765, 0xe23f73a5, S=1,        1, 0x00bd00bd
+0,     502200,     502200,     1800,      774, 0xa2ef7cac, S=1,        1, 0x00bd00bd
+0,     504000,     504000,     1800,      837, 0x235494f2, S=1,        1, 0x00bd00bd
+0,     505800,     505800,     1800,      773, 0x88538175, S=1,        1, 0x00bd00bd
+0,     507600,     507600,     1800,      773, 0x177981fa, S=1,        1, 0x00bd00bd
+0,     509400,     509400,     1800,      770, 0x273d7364, S=1,        1, 0x00bd00bd
+0,     511200,     511200,     1800,      770, 0x3e837bf6, S=1,        1, 0x00bd00bd
+0,     513000,     513000,     1800,      774, 0x08219078, S=1,        1, 0x00bd00bd
+0,     514800,     514800,     1800,      767, 0xeb5f797c, S=1,        1, 0x00bd00bd
+0,     516600,     516600,     1800,      774, 0x8eaa7a45, S=1,        1, 0x00bd00bd
+0,     518400,     518400,     1800,      833, 0x73249305, S=1,        1, 0x00bd00bd
+0,     520200,     520200,     1800,      774, 0x97e585d5, S=1,        1, 0x00bd00bd
+0,     522000,     522000,     1800,      768, 0x45b278fe, S=1,        1, 0x00bd00bd
+0,     523800,     523800,     1800,      773, 0xacf47d25, S=1,        1, 0x00bd00bd
+0,     525600,     525600,     1800,      768, 0xd382773d, S=1,        1, 0x00bd00bd
+0,     527400,     527400,     1800,      769, 0x20e97a5f, S=1,        1, 0x00bd00bd
+0,     529200,     529200,     1800,      767, 0x0ef67dab, S=1,        1, 0x00bd00bd
+0,     531000,     531000,     1800,      773, 0x5fa98693, S=1,        1, 0x00bd00bd
+0,     532800,     532800,     1800,      774, 0xd27686ab, S=1,        1, 0x00bd00bd
+0,     534600,     534600,     1800,      769, 0xc3d67ac2, S=1,        1, 0x00bd00bd
+0,     536400,     536400,     1800,      833, 0x80c89f70, S=1,        1, 0x00bd00bd
+0,     538200,     538200,     1800,      768, 0x5000776f, S=1,        1, 0x00bd00bd
+0,     540000,     540000,     1800,      772, 0x79b2812e, S=1,        1, 0x00bd00bd
+0,     541800,     541800,     1800,      839, 0x5276ad2b, S=1,        1, 0x00bd00bd
+0,     543600,     543600,     1800,      769, 0xa58279b1, S=1,        1, 0x00bd00bd
+0,     545400,     545400,     1800,      769, 0x826f8c2c, S=1,        1, 0x00bd00bd
+0,     547200,     547200,     1800,      771, 0x5a508980, S=1,        1, 0x00bd00bd
+0,     549000,     549000,     1800,      770, 0x659a7e09, S=1,        1, 0x00bd00bd
+0,     550800,     550800,     1800,      771, 0x30ef74db, S=1,        1, 0x00bd00bd
+0,     552600,     552600,     1800,      767, 0xc75d84cd, S=1,        1, 0x00bd00bd
+0,     554400,     554400,     1800,      899, 0x9881c627, S=1,        1, 0x00bd00bd
+0,     556200,     556200,     1800,      953, 0x0c90bd10, S=1,        1, 0x00bd00bd
+0,     558000,     558000,     1800,      770, 0x2cdf8498, S=1,        1, 0x00bd00bd
+0,     559800,     559800,     1800,      770, 0x0fdc7c67, S=1,        1, 0x00bd00bd
+0,     561600,     561600,     1800,      771, 0x721a7d42, S=1,        1, 0x00bd00bd
+0,     563400,     563400,     1800,      770, 0x164c71fc, S=1,        1, 0x00bd00bd
+0,     565200,     565200,     1800,      769, 0xc36f7c71, S=1,        1, 0x00bd00bd
+0,     567000,     567000,     1800,      896, 0xfad5bc39, S=1,        1, 0x00bd00bd
+0,     568800,     568800,     1800,      957, 0x08c8e4ff, S=1,        1, 0x00bd00bd
+0,     570600,     570600,     1800,      773, 0x009b81a0, S=1,        1, 0x00bd00bd
+0,     572400,     572400,     1800,      774, 0xa26d83e9, S=1,        1, 0x00bd00bd
+0,     574200,     574200,     1800,      956, 0x0544dde1, S=1,        1, 0x00bd00bd
+0,     576000,     576000,     1800,      768, 0x3e4887f3, S=1,        1, 0x00bd00bd
+0,     577800,     577800,     1800,      770, 0x24007a3a, S=1,        1, 0x00bd00bd
+0,     579600,     579600,     1800,      771, 0x14508287, S=1,        1, 0x00bd00bd
+0,     581400,     581400,     1800,      955, 0xa0f3de18, S=1,        1, 0x00bd00bd
+0,     583200,     583200,     1800,      953, 0xcb75d2ff, S=1,        1, 0x00bd00bd
+0,     585000,     585000,     1800,      767, 0x85ec747e, S=1,        1, 0x00bd00bd
+0,     586800,     586800,     1800,      768, 0x8b2971a1, S=1,        1, 0x00bd00bd
+0,     588600,     588600,     1800,      774, 0xc73b8a85, S=1,        1, 0x00bd00bd
+0,     590400,     590400,     1800,      835, 0xe77e9333, S=1,        1, 0x00bd00bd
+0,     592200,     592200,     1800,      768, 0x52428713, S=1,        1, 0x00bd00bd
+0,     594000,     594000,     1800,      769, 0xf62377f5, S=1,        1, 0x00bd00bd
+0,     595800,     595800,     1800,      771, 0xb0827990, S=1,        1, 0x00bd00bd
+0,     597600,     597600,     1800,      771, 0xb93a8522, S=1,        1, 0x00bd00bd
+0,     599400,     599400,     1800,      770, 0x9e748d23, S=1,        1, 0x00bd00bd
+0,     601200,     601200,     1800,      768, 0x92d6779e, S=1,        1, 0x00bd00bd
+0,     603000,     603000,     1800,      951, 0x371ae535, S=1,        1, 0x00bd00bd
+0,     604800,     604800,     1800,      950, 0xe273dfb9, S=1,        1, 0x00bd00bd
+0,     606600,     606600,     1800,      947, 0xe806d1f7, S=1,        1, 0x00bd00bd
+0,     608400,     608400,     1800,      956, 0x9c61d286, S=1,        1, 0x00bd00bd
+0,     610200,     610200,     1800,      951, 0x76b5ee35, S=1,        1, 0x00bd00bd
+0,     612000,     612000,     1800,      943, 0xcfe7e11b, S=1,        1, 0x00bd00bd
+0,     613800,     613800,     1800,      766, 0xcc83760a, S=1,        1, 0x00bd00bd
+0,     615600,     615600,     1800,      890, 0xafbbbb4d, S=1,        1, 0x00bd00bd
+0,     617400,     617400,     1800,      952, 0x6fbade31, S=1,        1, 0x00bd00bd
+0,     619200,     619200,     1800,      766, 0x49ba84d4, S=1,        1, 0x00bd00bd
+0,     621000,     621000,     1800,      767, 0xb29e6f83, S=1,        1, 0x00bd00bd
+0,     622800,     622800,     1800,      760, 0xffe47a95, S=1,        1, 0x00bd00bd
+0,     624600,     624600,     1800,      946, 0x768cddda, S=1,        1, 0x00bd00bd
+0,     626400,     626400,     1800,      769, 0x1a228c70, S=1,        1, 0x00bd00bd
+0,     628200,     628200,     1800,      760, 0xa6287fd7, S=1,        1, 0x00bd00bd
+0,     630000,     630000,     1800,      762, 0x1d2d76b1, S=1,        1, 0x00bd00bd
+0,     631800,     631800,     1800,      767, 0x047c845c, S=1,        1, 0x00bd00bd
+0,     633600,     633600,     1800,      767, 0xea6c7a91, S=1,        1, 0x00bd00bd
+0,     635400,     635400,     1800,      763, 0x49d47134, S=1,        1, 0x00bd00bd
+0,     637200,     637200,     1800,      760, 0xb29a6ea7, S=1,        1, 0x00bd00bd
+0,     639000,     639000,     1800,      763, 0x14458825, S=1,        1, 0x00bd00bd
+0,     640800,     640800,     1800,      764, 0x6f437f87, S=1,        1, 0x00bd00bd
+0,     642600,     642600,     1800,      764, 0xa1757bce, S=1,        1, 0x00bd00bd
+0,     644400,     644400,     1800,      763, 0x77b8863b, S=1,        1, 0x00bd00bd
+0,     646200,     646200,     1800,      763, 0x2edf70dd, S=1,        1, 0x00bd00bd
+0,     648000,     648000,     1800,      764, 0x96177b9f, S=1,        1, 0x00bd00bd
+0,     649800,     649800,     1800,      766, 0xa75168cf, S=1,        1, 0x00bd00bd
+0,     651600,     651600,     1800,      767, 0xba19756f, S=1,        1, 0x00bd00bd
+0,     653400,     653400,     1800,      765, 0x7e0676dd, S=1,        1, 0x00bd00bd
+0,     655200,     655200,     1800,      767, 0x60a18dbd, S=1,        1, 0x00bd00bd
+0,     657000,     657000,     1800,      763, 0x094d7636, S=1,        1, 0x00bd00bd
+0,     658800,     658800,     1800,      767, 0x0cfa8023, S=1,        1, 0x00bd00bd
+0,     660600,     660600,     1800,      768, 0x69ec81c5, S=1,        1, 0x00bd00bd
+0,     662400,     662400,     1800,      764, 0x153f78ff, S=1,        1, 0x00bd00bd
+0,     664200,     664200,     1800,      765, 0x08f98ede, S=1,        1, 0x00bd00bd
+0,     666000,     666000,     1800,      764, 0xb0547fe9, S=1,        1, 0x00bd00bd
+0,     667800,     667800,     1800,      769, 0x7b687865, S=1,        1, 0x00bd00bd
+0,     669600,     669600,     1800,      766, 0x238e80e1, S=1,        1, 0x00bd00bd
+0,     671400,     671400,     1800,      766, 0x684183f2, S=1,        1, 0x00bd00bd
+0,     673200,     673200,     1800,      829, 0xe9e0995d, S=1,        1, 0x00bd00bd
+0,     675000,     675000,     1800,      765, 0xa0047b3a, S=1,        1, 0x00bd00bd
+0,     676800,     676800,     1800,      766, 0x5afb7c11, S=1,        1, 0x00bd00bd
+0,     678600,     678600,     1800,      766, 0xce5f7f35, S=1,        1, 0x00bd00bd
+0,     680400,     680400,     1800,      898, 0x467ac6b9, S=1,        1, 0x00bd00bd
+0,     682200,     682200,     1800,      767, 0x594c7b13, S=1,        1, 0x00bd00bd
+0,     684000,     684000,     1800,      896, 0x79e8b3c6, S=1,        1, 0x00bd00bd
+0,     685800,     685800,     1800,      764, 0x1f9264c5, S=1,        1, 0x00bd00bd
+0,     687600,     687600,     1800,      762, 0x068c830f, S=1,        1, 0x00bd00bd
+0,     689400,     689400,     1800,      762, 0xd940760a, S=1,        1, 0x00bd00bd
+0,     691200,     691200,     1800,      763, 0xbad583c4, S=1,        1, 0x00bd00bd
+0,     693000,     693000,     1800,      947, 0xf61ed65c, S=1,        1, 0x00bd00bd
+0,     694800,     694800,     1800,      767, 0x03a078ea, S=1,        1, 0x00bd00bd
+0,     696600,     696600,     1800,      957, 0x7762e49b, S=1,        1, 0x00bd00bd
+0,     698400,     698400,     1800,      955, 0x1541d660, S=1,        1, 0x00bd00bd
+0,     700200,     700200,     1800,      767, 0xd6798911, S=1,        1, 0x00bd00bd
+0,     702000,     702000,     1800,      767, 0x4f317dff, S=1,        1, 0x00bd00bd
+0,     703800,     703800,     1800,      764, 0x47e17b33, S=1,        1, 0x00bd00bd
+0,     705600,     705600,     1800,      763, 0x0c0c86b8, S=1,        1, 0x00bd00bd
+0,     707400,     707400,     1800,      769, 0x18558aee, S=1,        1, 0x00bd00bd
+0,     709200,     709200,     1800,      766, 0xe0aa764b, S=1,        1, 0x00bd00bd
+0,     711000,     711000,     1800,      762, 0x87357d81, S=1,        1, 0x00bd00bd
+0,     712800,     712800,     1800,      766, 0xdc8b7167, S=1,        1, 0x00bd00bd
+0,     714600,     714600,     1800,      768, 0x7dbe92db, S=1,        1, 0x00bd00bd
+0,     716400,     716400,     1800,      765, 0xb451867e, S=1,        1, 0x00bd00bd
+0,     718200,     718200,     1800,      953, 0x12d7d687, S=1,        1, 0x00bd00bd
+0,     720000,     720000,     1800,      769, 0x649c7d28, S=1,        1, 0x00bd00bd
+0,     721800,     721800,     1800,      955, 0xce1fd2aa, S=1,        1, 0x00bd00bd
+0,     723600,     723600,     1800,      952, 0x247dd870, S=1,        1, 0x00bd00bd
+0,     725400,     725400,     1800,      951, 0x36d4da18, S=1,        1, 0x00bd00bd
+0,     727200,     727200,     1800,      954, 0xbe6bd18f, S=1,        1, 0x00bd00bd
+0,     729000,     729000,     1800,      948, 0xc770ca89, S=1,        1, 0x00bd00bd
+0,     730800,     730800,     1800,      761, 0x9c5d77ea, S=1,        1, 0x00bd00bd
+0,     732600,     732600,     1800,      763, 0xdedd88e0, S=1,        1, 0x00bd00bd
+0,     734400,     734400,     1800,      760, 0x742a8286, S=1,        1, 0x00bd00bd
+0,     736200,     736200,     1800,      764, 0x89917053, S=1,        1, 0x00bd00bd
+0,     738000,     738000,     1800,      764, 0x77447622, S=1,        1, 0x00bd00bd
+0,     739800,     739800,     1800,      946, 0x9ebad2bd, S=1,        1, 0x00bd00bd
+0,     741600,     741600,     1800,      758, 0x638a836d, S=1,        1, 0x00bd00bd
+0,     743400,     743400,     1800,      950, 0x285ec904, S=1,        1, 0x00bd00bd
+0,     745200,     745200,     1800,      769, 0x43107232, S=1,        1, 0x00bd00bd
+0,     747000,     747000,     1800,      764, 0x996b7a0f, S=1,        1, 0x00bd00bd
+0,     748800,     748800,     1800,      757, 0xa5356f50, S=1,        1, 0x00bd00bd
+0,     750600,     750600,     1800,      761, 0x628e7c55, S=1,        1, 0x00bd00bd
+0,     752400,     752400,     1800,      761, 0xcbcc7416, S=1,        1, 0x00bd00bd
+0,     754200,     754200,     1800,      759, 0x34bc71ba, S=1,        1, 0x00bd00bd
+0,     756000,     756000,     1800,      758, 0xcca27ff3, S=1,        1, 0x00bd00bd
+0,     757800,     757800,     1800,      767, 0x7ab882b6, S=1,        1, 0x00bd00bd
+0,     759600,     759600,     1800,      761, 0xcbd7854a, S=1,        1, 0x00bd00bd
+0,     761400,     761400,     1800,      828, 0x55be93e0, S=1,        1, 0x00bd00bd
+0,     763200,     763200,     1800,      759, 0xb6fb804c, S=1,        1, 0x00bd00bd
+0,     765000,     765000,     1800,      761, 0x331d7b48, S=1,        1, 0x00bd00bd
+0,     766800,     766800,     1800,      762, 0xa84e7e9b, S=1,        1, 0x00bd00bd
+0,     768600,     768600,     1800,      761, 0x97448037, S=1,        1, 0x00bd00bd
+0,     770400,     770400,     1800,      757, 0xc82186bc, S=1,        1, 0x00bd00bd
+0,     772200,     772200,     1800,      759, 0x82ab8746, S=1,        1, 0x00bd00bd
+0,     774000,     774000,     1800,      759, 0x884f6d1a, S=1,        1, 0x00bd00bd
+0,     775800,     775800,     1800,      761, 0xf2906fa9, S=1,        1, 0x00bd00bd
+0,     777600,     777600,     1800,      756, 0x3eb76a17, S=1,        1, 0x00bd00bd
+0,     779400,     779400,     1800,      765, 0x4de67a40, S=1,        1, 0x00bd00bd
+0,     781200,     781200,     1800,      759, 0x2e7c7b1e, S=1,        1, 0x00bd00bd
+0,     783000,     783000,     1800,      759, 0xdac278fa, S=1,        1, 0x00bd00bd
+0,     784800,     784800,     1800,      761, 0x5caf700e, S=1,        1, 0x00bd00bd
+0,     786600,     786600,     1800,      762, 0xd4107b13, S=1,        1, 0x00bd00bd
+0,     788400,     788400,     1800,      771, 0xe4f16cd4, S=1,        1, 0x00bd00bd
+0,     790200,     790200,     1800,      758, 0x96088772, S=1,        1, 0x00bd00bd
+0,     792000,     792000,     1800,      759, 0x68fd798d, S=1,        1, 0x00bd00bd
+0,     793800,     793800,     1800,      760, 0x7c896c77, S=1,        1, 0x00bd00bd
+0,     795600,     795600,     1800,      762, 0x10f07df6, S=1,        1, 0x00bd00bd
+0,     797400,     797400,     1800,      760, 0x902373b8, S=1,        1, 0x00bd00bd
+0,     799200,     799200,     1800,      760, 0xd9db8045, S=1,        1, 0x00bd00bd
+0,     801000,     801000,     1800,      757, 0x5164796e, S=1,        1, 0x00bd00bd
+0,     802800,     802800,     1800,      762, 0x41f278ba, S=1,        1, 0x00bd00bd
+0,     804600,     804600,     1800,      763, 0x04e676b1, S=1,        1, 0x00bd00bd
+0,     806400,     806400,     1800,      835, 0x035899d3, S=1,        1, 0x00bd00bd
+0,     808200,     808200,     1800,      758, 0x90b7828e, S=1,        1, 0x00bd00bd
+0,     810000,     810000,     1800,      761, 0x2f446e0e, S=1,        1, 0x00bd00bd
+0,     811800,     811800,     1800,      888, 0x3c6cb74c, S=1,        1, 0x00bd00bd
+0,     813600,     813600,     1800,      758, 0x8f267d72, S=1,        1, 0x00bd00bd
+0,     815400,     815400,     1800,      765, 0xaa2f7f16, S=1,        1, 0x00bd00bd
+0,     817200,     817200,     1800,      761, 0x8b3d7e23, S=1,        1, 0x00bd00bd
+0,     819000,     819000,     1800,      764, 0xd4d981fb, S=1,        1, 0x00bd00bd
+0,     820800,     820800,     1800,      762, 0xa98d740b, S=1,        1, 0x00bd00bd
+0,     822600,     822600,     1800,      767, 0xad358079, S=1,        1, 0x00bd00bd
+0,     824400,     824400,     1800,      759, 0x165875cb, S=1,        1, 0x00bd00bd
+0,     826200,     826200,     1800,      761, 0x65d17adf, S=1,        1, 0x00bd00bd
+0,     828000,     828000,     1800,      762, 0x89927901, S=1,        1, 0x00bd00bd
+0,     829800,     829800,     1800,      763, 0xdee4742c, S=1,        1, 0x00bd00bd
+0,     831600,     831600,     1800,      760, 0xd6197581, S=1,        1, 0x00bd00bd
+0,     833400,     833400,     1800,      832, 0x83398c5a, S=1,        1, 0x00bd00bd
+0,     835200,     835200,     1800,      761, 0x90a48500, S=1,        1, 0x00bd00bd
+0,     837000,     837000,     1800,      887, 0xf8fbc1cf, S=1,        1, 0x00bd00bd
+0,     838800,     838800,     1800,      765, 0x196f800a, S=1,        1, 0x00bd00bd
+0,     840600,     840600,     1800,      763, 0x70e581d8, S=1,        1, 0x00bd00bd
+0,     842400,     842400,     1800,      763, 0x79087b7d, S=1,        1, 0x00bd00bd
+0,     844200,     844200,     1800,      952, 0x5862f4fe, S=1,        1, 0x00bd00bd
+0,     846000,     846000,     1800,      953, 0x2c00dc09, S=1,        1, 0x00bd00bd
+0,     847800,     847800,     1800,      945, 0x66cbe386, S=1,        1, 0x00bd00bd
+0,     849600,     849600,     1800,      948, 0xe77fdca7, S=1,        1, 0x00bd00bd
+0,     851400,     851400,     1800,      951, 0xe532d54f, S=1,        1, 0x00bd00bd
+0,     853200,     853200,     1800,      826, 0xd0028f8f, S=1,        1, 0x00bd00bd
+0,     855000,     855000,     1800,      763, 0xd2a5722c, S=1,        1, 0x00bd00bd
+0,     856800,     856800,     1800,      763, 0x798090ab, S=1,        1, 0x00bd00bd
+0,     858600,     858600,     1800,      766, 0xbb498e19, S=1,        1, 0x00bd00bd
+0,     860400,     860400,     1800,      946, 0x463fc5aa, S=1,        1, 0x00bd00bd
+0,     862200,     862200,     1800,      762, 0xea638f8b, S=1,        1, 0x00bd00bd
+0,     864000,     864000,     1800,      765, 0x0eed7bd2, S=1,        1, 0x00bd00bd
+0,     865800,     865800,     1800,      763, 0xfb1b6eae, S=1,        1, 0x00bd00bd
+0,     867600,     867600,     1800,      761, 0xa48a7407, S=1,        1, 0x00bd00bd
+0,     869400,     869400,     1800,      760, 0xcd737c43, S=1,        1, 0x00bd00bd
+0,     871200,     871200,     1800,      757, 0xeffd7c1a, S=1,        1, 0x00bd00bd
+0,     873000,     873000,     1800,      757, 0x2f6272cb, S=1,        1, 0x00bd00bd
+0,     874800,     874800,     1800,      762, 0xe2a28223, S=1,        1, 0x00bd00bd
+0,     876600,     876600,     1800,      760, 0xecb47548, S=1,        1, 0x00bd00bd
+0,     878400,     878400,     1800,      763, 0x80ac8293, S=1,        1, 0x00bd00bd
+0,     880200,     880200,     1800,      764, 0x5a067114, S=1,        1, 0x00bd00bd
+0,     882000,     882000,     1800,      946, 0x7af2c695, S=1,        1, 0x00bd00bd
+0,     883800,     883800,     1800,      946, 0xaadeddb9, S=1,        1, 0x00bd00bd
+0,     885600,     885600,     1800,      949, 0x75bdd657, S=1,        1, 0x00bd00bd
+0,     887400,     887400,     1800,      946, 0x3fcdd17a, S=1,        1, 0x00bd00bd
+0,     889200,     889200,     1800,      940, 0x8441e164, S=1,        1, 0x00bd00bd
+0,     891000,     891000,     1800,      762, 0x062782a9, S=1,        1, 0x00bd00bd
+0,     892800,     892800,     1800,      759, 0xfda97d5b, S=1,        1, 0x00bd00bd
+0,     894600,     894600,     1800,      942, 0x030eda68, S=1,        1, 0x00bd00bd
+0,     896400,     896400,     1800,      764, 0x1be87f32, S=1,        1, 0x00bd00bd
+0,     898200,     898200,     1800,      759, 0x9dd577e7, S=1,        1, 0x00bd00bd
+0,     900000,     900000,     1800,      760, 0x321f7312, S=1,        1, 0x00bd00bd
+0,     901800,     901800,     1800,      757, 0xd81b7513, S=1,        1, 0x00bd00bd
+0,     903600,     903600,     1800,      941, 0x088cd7e7, S=1,        1, 0x00bd00bd
+0,     905400,     905400,     1800,      943, 0xc7efddbe, S=1,        1, 0x00bd00bd
+0,     907200,     907200,     1800,      759, 0x31ed7bd4, S=1,        1, 0x00bd00bd
+0,     909000,     909000,     1800,      759, 0xddd47489, S=1,        1, 0x00bd00bd
+0,     910800,     910800,     1800,      762, 0xb76a7c1f, S=1,        1, 0x00bd00bd
+0,     912600,     912600,     1800,      831, 0x88389ce4, S=1,        1, 0x00bd00bd
+0,     914400,     914400,     1800,      756, 0x961878d2, S=1,        1, 0x00bd00bd
+0,     916200,     916200,     1800,      760, 0xb4e583bc, S=1,        1, 0x00bd00bd
+0,     918000,     918000,     1800,      761, 0x2f597c42, S=1,        1, 0x00bd00bd
+0,     919800,     919800,     1800,      759, 0x43e972f1, S=1,        1, 0x00bd00bd
diff --git a/tests/ref/fate/tscc-15bit b/tests/ref/fate/tscc-15bit
index 372b165850..abfe6a6aee 100644
--- a/tests/ref/fate/tscc-15bit
+++ b/tests/ref/fate/tscc-15bit
@@ -1,242 +1,251 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 548x400
+#sar 0: 0/1
 #tb 1: 1/11025
-0,          0,          0,        1,   657600, 0xaf456809
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 11025
+#channel_layout 1: 4
+#channel_layout_name 1: mono
+0,          0,          0,        1,   657600, 0x50b3a0c2
 1,          0,          0,    11025,    22050, 0x1740aaec
-0,          1,          1,        1,   657600, 0xaf456809
-0,          2,          2,        1,   657600, 0xaf456809
-0,          3,          3,        1,   657600, 0x2dbe6889
-0,          4,          4,        1,   657600, 0x2dbe6889
-0,          5,          5,        1,   657600, 0x2dbe6889
-0,          6,          6,        1,   657600, 0x2dbe6889
-0,          7,          7,        1,   657600, 0x2dbe6889
-0,          8,          8,        1,   657600, 0x2dbe6889
-0,          9,          9,        1,   657600, 0x2dbe6889
-0,         10,         10,        1,   657600, 0x2dbe6889
-0,         11,         11,        1,   657600, 0x2dbe6889
-0,         12,         12,        1,   657600, 0x2dbe6889
-0,         13,         13,        1,   657600, 0x2dbe6889
-0,         14,         14,        1,   657600, 0x2dbe6889
-0,         15,         15,        1,   657600, 0x2dbe6889
+0,          1,          1,        1,   657600, 0x50b3a0c2
+0,          2,          2,        1,   657600, 0x50b3a0c2
+0,          3,          3,        1,   657600, 0x661aa145
+0,          4,          4,        1,   657600, 0x661aa145
+0,          5,          5,        1,   657600, 0x661aa145
+0,          6,          6,        1,   657600, 0x661aa145
+0,          7,          7,        1,   657600, 0x661aa145
+0,          8,          8,        1,   657600, 0x661aa145
+0,          9,          9,        1,   657600, 0x661aa145
+0,         10,         10,        1,   657600, 0x661aa145
+0,         11,         11,        1,   657600, 0x661aa145
+0,         12,         12,        1,   657600, 0x661aa145
+0,         13,         13,        1,   657600, 0x661aa145
+0,         14,         14,        1,   657600, 0x661aa145
+0,         15,         15,        1,   657600, 0x661aa145
 1,      11025,      11025,    11025,    22050, 0x75ed6086
-0,         16,         16,        1,   657600, 0x2dbe6889
-0,         17,         17,        1,   657600, 0x2dbe6889
-0,         18,         18,        1,   657600, 0x2dbe6889
-0,         19,         19,        1,   657600, 0x2dbe6889
-0,         20,         20,        1,   657600, 0x2dbe6889
-0,         21,         21,        1,   657600, 0x92796e59
-0,         22,         22,        1,   657600, 0x92796e59
-0,         23,         23,        1,   657600, 0x92796e59
-0,         24,         24,        1,   657600, 0x64cb6889
-0,         25,         25,        1,   657600, 0x64cb6889
-0,         26,         26,        1,   657600, 0x64cb6889
-0,         27,         27,        1,   657600, 0x64cb6889
-0,         28,         28,        1,   657600, 0x64cb6889
-0,         29,         29,        1,   657600, 0x64cb6889
-0,         30,         30,        1,   657600, 0x42036b71
+0,         16,         16,        1,   657600, 0x661aa145
+0,         17,         17,        1,   657600, 0x661aa145
+0,         18,         18,        1,   657600, 0x661aa145
+0,         19,         19,        1,   657600, 0x661aa145
+0,         20,         20,        1,   657600, 0x661aa145
+0,         21,         21,        1,   657600, 0x3c29a73f
+0,         22,         22,        1,   657600, 0x3c29a73f
+0,         23,         23,        1,   657600, 0x3c29a73f
+0,         24,         24,        1,   657600, 0xee2ca145
+0,         25,         25,        1,   657600, 0xee2ca145
+0,         26,         26,        1,   657600, 0xee2ca145
+0,         27,         27,        1,   657600, 0xee2ca145
+0,         28,         28,        1,   657600, 0xee2ca145
+0,         29,         29,        1,   657600, 0xee2ca145
+0,         30,         30,        1,   657600, 0xeb6fa442
 1,      22050,      22050,    11025,    22050, 0xca52a4e9
-0,         31,         31,        1,   657600, 0x42036b71
-0,         32,         32,        1,   657600, 0x42036b71
-0,         33,         33,        1,   657600, 0xc40a6889
-0,         34,         34,        1,   657600, 0xc40a6889
-0,         35,         35,        1,   657600, 0xc40a6889
-0,         36,         36,        1,   657600, 0xaa6f7429
-0,         37,         37,        1,   657600, 0xaa6f7429
-0,         38,         38,        1,   657600, 0xaa6f7429
-0,         39,         39,        1,   657600, 0x854172d9
-0,         40,         40,        1,   657600, 0x854172d9
-0,         41,         41,        1,   657600, 0x854172d9
-0,         42,         42,        1,   657600, 0x22d10de0
-0,         43,         43,        1,   657600, 0xa75f0d60
-0,         44,         44,        1,   657600, 0x7a440be0
-0,         45,         45,        1,   657600, 0x40095d50
+0,         31,         31,        1,   657600, 0xeb6fa442
+0,         32,         32,        1,   657600, 0xeb6fa442
+0,         33,         33,        1,   657600, 0xb235a145
+0,         34,         34,        1,   657600, 0xb235a145
+0,         35,         35,        1,   657600, 0xb235a145
+0,         36,         36,        1,   657600, 0x39f7ad39
+0,         37,         37,        1,   657600, 0x39f7ad39
+0,         38,         38,        1,   657600, 0x39f7ad39
+0,         39,         39,        1,   657600, 0xb851abda
+0,         40,         40,        1,   657600, 0xb851abda
+0,         41,         41,        1,   657600, 0xb851abda
+0,         42,         42,        1,   657600, 0xf6574b22
+0,         43,         43,        1,   657600, 0x1a154a9f
+0,         44,         44,        1,   657600, 0x3de64916
+0,         45,         45,        1,   657600, 0xca3d9cd5
 1,      33075,      33075,    11025,    22050, 0xb306d419
-0,         46,         46,        1,   657600, 0x40095d50
-0,         47,         47,        1,   657600, 0x64766320
-0,         48,         48,        1,   657600, 0x64766320
-0,         49,         49,        1,   657600, 0x64766320
-0,         50,         50,        1,   657600, 0x64766320
-0,         51,         51,        1,   657600, 0x64766320
-0,         52,         52,        1,   657600, 0x64766320
-0,         53,         53,        1,   657600, 0x64766320
-0,         54,         54,        1,   657600, 0x64766320
-0,         55,         55,        1,   657600, 0x64766320
-0,         56,         56,        1,   657600, 0x64766320
-0,         57,         57,        1,   657600, 0xf51adc49
-0,         58,         58,        1,   657600, 0xf51adc49
-0,         59,         59,        1,   657600, 0xf51adc49
-0,         60,         60,        1,   657600, 0xdd47af59
+0,         46,         46,        1,   657600, 0xca3d9cd5
+0,         47,         47,        1,   657600, 0x4779a2cf
+0,         48,         48,        1,   657600, 0x4779a2cf
+0,         49,         49,        1,   657600, 0x4779a2cf
+0,         50,         50,        1,   657600, 0x4779a2cf
+0,         51,         51,        1,   657600, 0x4779a2cf
+0,         52,         52,        1,   657600, 0x4779a2cf
+0,         53,         53,        1,   657600, 0x4779a2cf
+0,         54,         54,        1,   657600, 0x4779a2cf
+0,         55,         55,        1,   657600, 0x4779a2cf
+0,         56,         56,        1,   657600, 0x4779a2cf
+0,         57,         57,        1,   657600, 0x29af1818
+0,         58,         58,        1,   657600, 0x29af1818
+0,         59,         59,        1,   657600, 0x29af1818
+0,         60,         60,        1,   657600, 0x77ace9c5
 1,      44100,      44100,    11025,    22050, 0x8cbb9625
-0,         61,         61,        1,   657600, 0xdd47af59
-0,         62,         62,        1,   657600, 0xffa8acf1
-0,         63,         63,        1,   657600, 0x5994b059
-0,         64,         64,        1,   657600, 0x5994b059
-0,         65,         65,        1,   657600, 0x5994b059
-0,         66,         66,        1,   657600, 0x03ffae71
-0,         67,         67,        1,   657600, 0x03ffae71
-0,         68,         68,        1,   657600, 0x03ffae71
-0,         69,         69,        1,   657600, 0xe33ab89e
-0,         70,         70,        1,   657600, 0xe33ab89e
-0,         71,         71,        1,   657600, 0xe33ab89e
-0,         72,         72,        1,   657600, 0xbe37b549
-0,         73,         73,        1,   657600, 0xbe37b549
-0,         74,         74,        1,   657600, 0x1d395bf9
-0,         75,         75,        1,   657600, 0x1d395bf9
+0,         61,         61,        1,   657600, 0x77ace9c5
+0,         62,         62,        1,   657600, 0x61b8e74b
+0,         63,         63,        1,   657600, 0x8c6deace
+0,         64,         64,        1,   657600, 0x8c6deace
+0,         65,         65,        1,   657600, 0x8c6deace
+0,         66,         66,        1,   657600, 0xbe1fe8d7
+0,         67,         67,        1,   657600, 0xbe1fe8d7
+0,         68,         68,        1,   657600, 0xbe1fe8d7
+0,         69,         69,        1,   657600, 0x633209db
+0,         70,         70,        1,   657600, 0x633209db
+0,         71,         71,        1,   657600, 0x633209db
+0,         72,         72,        1,   657600, 0x3148adb5
+0,         73,         73,        1,   657600, 0x3148adb5
+0,         74,         74,        1,   657600, 0x3b5f5216
+0,         75,         75,        1,   657600, 0x3b5f5216
 1,      55125,      55125,    11025,    22050, 0x34a11f66
-0,         76,         76,        1,   657600, 0x1d395bf9
-0,         77,         77,        1,   657600, 0x1d395bf9
-0,         78,         78,        1,   657600, 0x2ec36f37
-0,         79,         79,        1,   657600, 0x2ec36f37
-0,         80,         80,        1,   657600, 0xb04a6eb7
-0,         81,         81,        1,   657600, 0x66610458
-0,         82,         82,        1,   657600, 0x66610458
-0,         83,         83,        1,   657600, 0xaf8901f0
-0,         84,         84,        1,   657600, 0x3ae41c48
-0,         85,         85,        1,   657600, 0x5b870b70
-0,         86,         86,        1,   657600, 0x11490c60
-0,         87,         87,        1,   657600, 0x70064801
-0,         88,         88,        1,   657600, 0x80d54519
-0,         89,         89,        1,   657600, 0xe8c942b1
-0,         90,         90,        1,   657600, 0x830d8c24
+0,         76,         76,        1,   657600, 0x3b5f5216
+0,         77,         77,        1,   657600, 0x3b5f5216
+0,         78,         78,        1,   657600, 0x5e51fb89
+0,         79,         79,        1,   657600, 0x5e51fb89
+0,         80,         80,        1,   657600, 0x48eafb06
+0,         81,         81,        1,   657600, 0x9f7a8653
+0,         82,         82,        1,   657600, 0x9f7a8653
+0,         83,         83,        1,   657600, 0x29fc83d9
+0,         84,         84,        1,   657600, 0xe7689f10
+0,         85,         85,        1,   657600, 0x9f788dba
+0,         86,         86,        1,   657600, 0x0e808eb2
+0,         87,         87,        1,   657600, 0x3ec53d79
+0,         88,         88,        1,   657600, 0x67ca3a7c
+0,         89,         89,        1,   657600, 0xf7583802
+0,         90,         90,        1,   657600, 0x239e2fc6
 1,      66150,      66150,    11025,    22050, 0x1ae81230
-0,         91,         91,        1,   657600, 0x830d8c24
-0,         92,         92,        1,   657600, 0x830d8c24
-0,         93,         93,        1,   657600, 0xf3c4707c
-0,         94,         94,        1,   657600, 0x6ace707c
-0,         95,         95,        1,   657600, 0x6ace707c
-0,         96,         96,        1,   657600, 0x6ace707c
-0,         97,         97,        1,   657600, 0x6ace707c
-0,         98,         98,        1,   657600, 0x6ace707c
-0,         99,         99,        1,   657600, 0x5f461aae
-0,        100,        100,        1,   657600, 0x5f461aae
-0,        101,        101,        1,   657600, 0x221ceecf
-0,        102,        102,        1,   657600, 0x221ceecf
-0,        103,        103,        1,   657600, 0x221ceecf
-0,        104,        104,        1,   657600, 0x221ceecf
-0,        105,        105,        1,   657600, 0x221ceecf
+0,         91,         91,        1,   657600, 0x239e2fc6
+0,         92,         92,        1,   657600, 0x239e2fc6
+0,         93,         93,        1,   657600, 0x001c134c
+0,         94,         94,        1,   657600, 0x5c85134c
+0,         95,         95,        1,   657600, 0x5c85134c
+0,         96,         96,        1,   657600, 0x5c85134c
+0,         97,         97,        1,   657600, 0x5c85134c
+0,         98,         98,        1,   657600, 0x5c85134c
+0,         99,         99,        1,   657600, 0x5fef8bea
+0,        100,        100,        1,   657600, 0x5fef8bea
+0,        101,        101,        1,   657600, 0x23135efa
+0,        102,        102,        1,   657600, 0x23135efa
+0,        103,        103,        1,   657600, 0x23135efa
+0,        104,        104,        1,   657600, 0x23135efa
+0,        105,        105,        1,   657600, 0x23135efa
 1,      77175,      77175,    11025,    22050, 0x1217eeba
-0,        106,        106,        1,   657600, 0x221ceecf
-0,        107,        107,        1,   657600, 0x221ceecf
-0,        108,        108,        1,   657600, 0x3bf6f39f
-0,        109,        109,        1,   657600, 0x3bf6f39f
-0,        110,        110,        1,   657600, 0x3bf6f39f
-0,        111,        111,        1,   657600, 0xc2caeecf
-0,        112,        112,        1,   657600, 0xc2caeecf
-0,        113,        113,        1,   657600, 0xc2caeecf
-0,        114,        114,        1,   657600, 0xc316d63e
-0,        115,        115,        1,   657600, 0xc316d63e
-0,        116,        116,        1,   657600, 0xc316d63e
-0,        117,        117,        1,   657600, 0x41f6218d
-0,        118,        118,        1,   657600, 0x41f6218d
-0,        119,        119,        1,   657600, 0x41f6218d
-0,        120,        120,        1,   657600, 0xff43ec36
+0,        106,        106,        1,   657600, 0x23135efa
+0,        107,        107,        1,   657600, 0x23135efa
+0,        108,        108,        1,   657600, 0x50cf63ee
+0,        109,        109,        1,   657600, 0x50cf63ee
+0,        110,        110,        1,   657600, 0x50cf63ee
+0,        111,        111,        1,   657600, 0x2f5c5efa
+0,        112,        112,        1,   657600, 0x2f5c5efa
+0,        113,        113,        1,   657600, 0x2f5c5efa
+0,        114,        114,        1,   657600, 0x9980d3c1
+0,        115,        115,        1,   657600, 0x9980d3c1
+0,        116,        116,        1,   657600, 0x9980d3c1
+0,        117,        117,        1,   657600, 0x23f02141
+0,        118,        118,        1,   657600, 0x23f02141
+0,        119,        119,        1,   657600, 0x23f02141
+0,        120,        120,        1,   657600, 0x3d31ea57
 1,      88200,      88200,    11025,    22050, 0x50e70baa
-0,        121,        121,        1,   657600, 0x0b10eb16
-0,        122,        122,        1,   657600, 0x0b10eb16
-0,        123,        123,        1,   657600, 0xbdf41aa5
-0,        124,        124,        1,   657600, 0xbdf41aa5
-0,        125,        125,        1,   657600, 0xbdf41aa5
-0,        126,        126,        1,   657600, 0xd502ca06
-0,        127,        127,        1,   657600, 0xd502ca06
-0,        128,        128,        1,   657600, 0xd502ca06
-0,        129,        129,        1,   657600, 0x8446f89e
-0,        130,        130,        1,   657600, 0x8446f89e
-0,        131,        131,        1,   657600, 0x8446f89e
-0,        132,        132,        1,   657600, 0x3d4ccf06
-0,        133,        133,        1,   657600, 0x0897d1de
-0,        134,        134,        1,   657600, 0x0897d1de
-0,        135,        135,        1,   657600, 0x3e27e01e
+0,        121,        121,        1,   657600, 0x1e9be92f
+0,        122,        122,        1,   657600, 0x1e9be92f
+0,        123,        123,        1,   657600, 0x05091a2e
+0,        124,        124,        1,   657600, 0x05091a2e
+0,        125,        125,        1,   657600, 0x05091a2e
+0,        126,        126,        1,   657600, 0xd214c71a
+0,        127,        127,        1,   657600, 0xd214c71a
+0,        128,        128,        1,   657600, 0xd214c71a
+0,        129,        129,        1,   657600, 0x3b07f720
+0,        130,        130,        1,   657600, 0x3b07f720
+0,        131,        131,        1,   657600, 0x3b07f720
+0,        132,        132,        1,   657600, 0x02becc42
+0,        133,        133,        1,   657600, 0x3d8fcf2e
+0,        134,        134,        1,   657600, 0x3d8fcf2e
+0,        135,        135,        1,   657600, 0xec51ddd7
 1,      99225,      99225,    11025,    22050, 0xb19e89c0
-0,        136,        136,        1,   657600, 0x3e27e01e
-0,        137,        137,        1,   657600, 0x3e27e01e
-0,        138,        138,        1,   657600, 0x3e27e01e
-0,        139,        139,        1,   657600, 0x3e27e01e
-0,        140,        140,        1,   657600, 0x3e27e01e
-0,        141,        141,        1,   657600, 0xe51078a8
-0,        142,        142,        1,   657600, 0xe51078a8
-0,        143,        143,        1,   657600, 0xe9967a40
-0,        144,        144,        1,   657600, 0xe9967a40
-0,        145,        145,        1,   657600, 0xe9967a40
-0,        146,        146,        1,   657600, 0xe9967a40
-0,        147,        147,        1,   657600, 0xe9967a40
-0,        148,        148,        1,   657600, 0xe9967a40
-0,        149,        149,        1,   657600, 0xe9967a40
-0,        150,        150,        1,   657600, 0x726cb6b8
+0,        136,        136,        1,   657600, 0xec51ddd7
+0,        137,        137,        1,   657600, 0xec51ddd7
+0,        138,        138,        1,   657600, 0xec51ddd7
+0,        139,        139,        1,   657600, 0xec51ddd7
+0,        140,        140,        1,   657600, 0xec51ddd7
+0,        141,        141,        1,   657600, 0x40a3b905
+0,        142,        142,        1,   657600, 0x40a3b905
+0,        143,        143,        1,   657600, 0xbfc5baa9
+0,        144,        144,        1,   657600, 0xbfc5baa9
+0,        145,        145,        1,   657600, 0xbfc5baa9
+0,        146,        146,        1,   657600, 0xbfc5baa9
+0,        147,        147,        1,   657600, 0xbfc5baa9
+0,        148,        148,        1,   657600, 0xbfc5baa9
+0,        149,        149,        1,   657600, 0xbfc5baa9
+0,        150,        150,        1,   657600, 0x54a2f8dd
 1,     110250,     110250,    11025,    22050, 0x78526696
-0,        151,        151,        1,   657600, 0x2960b6e8
-0,        152,        152,        1,   657600, 0x2960b6e8
-0,        153,        153,        1,   657600, 0x1637d6c8
-0,        154,        154,        1,   657600, 0x6f2fd9b0
-0,        155,        155,        1,   657600, 0x27a7d6c8
-0,        156,        156,        1,   657600, 0xe855d6c8
-0,        157,        157,        1,   657600, 0xe855d6c8
-0,        158,        158,        1,   657600, 0xe855d6c8
-0,        159,        159,        1,   657600, 0x1a8ad6c8
-0,        160,        160,        1,   657600, 0x9c11d648
-0,        161,        161,        1,   657600, 0x6136d648
-0,        162,        162,        1,   657600, 0xdfa0d6c8
-0,        163,        163,        1,   657600, 0xdfa0d6c8
-0,        164,        164,        1,   657600, 0xdfa0d6c8
-0,        165,        165,        1,   657600, 0xdfa0d6c8
+0,        151,        151,        1,   657600, 0x0b96f90d
+0,        152,        152,        1,   657600, 0x0b96f90d
+0,        153,        153,        1,   657600, 0xa18119e9
+0,        154,        154,        1,   657600, 0x70a11ce6
+0,        155,        155,        1,   657600, 0xb36f19e9
+0,        156,        156,        1,   657600, 0xeb2219e9
+0,        157,        157,        1,   657600, 0xeb2219e9
+0,        158,        158,        1,   657600, 0xeb2219e9
+0,        159,        159,        1,   657600, 0xb98f19e9
+0,        160,        160,        1,   657600, 0xa4281966
+0,        161,        161,        1,   657600, 0xf0e61966
+0,        162,        162,        1,   657600, 0x065c19e9
+0,        163,        163,        1,   657600, 0x065c19e9
+0,        164,        164,        1,   657600, 0x065c19e9
+0,        165,        165,        1,   657600, 0x065c19e9
 1,     121275,     121275,    11025,    22050, 0x48e3bb21
-0,        166,        166,        1,   657600, 0xdfa0d6c8
-0,        167,        167,        1,   657600, 0xdfa0d6c8
-0,        168,        168,        1,   657600, 0xdfa0d6c8
-0,        169,        169,        1,   657600, 0xdfa0d6c8
-0,        170,        170,        1,   657600, 0xdfa0d6c8
-0,        171,        171,        1,   657600, 0x125cd9b0
-0,        172,        172,        1,   657600, 0x125cd9b0
-0,        173,        173,        1,   657600, 0x8a7ed6c8
-0,        174,        174,        1,   657600, 0x09a6d9b0
-0,        175,        175,        1,   657600, 0x09a6d9b0
-0,        176,        176,        1,   657600, 0x09a6d9b0
-0,        177,        177,        1,   657600, 0x85e87a68
-0,        178,        178,        1,   657600, 0x85e87a68
-0,        179,        179,        1,   657600, 0x85e87a68
-0,        180,        180,        1,   657600, 0xb0a141a8
+0,        166,        166,        1,   657600, 0x065c19e9
+0,        167,        167,        1,   657600, 0x065c19e9
+0,        168,        168,        1,   657600, 0x065c19e9
+0,        169,        169,        1,   657600, 0x065c19e9
+0,        170,        170,        1,   657600, 0x065c19e9
+0,        171,        171,        1,   657600, 0x2f1d1ce6
+0,        172,        172,        1,   657600, 0x2f1d1ce6
+0,        173,        173,        1,   657600, 0x181719e9
+0,        174,        174,        1,   657600, 0x938d1ce6
+0,        175,        175,        1,   657600, 0x938d1ce6
+0,        176,        176,        1,   657600, 0x938d1ce6
+0,        177,        177,        1,   657600, 0xf0acbabf
+0,        178,        178,        1,   657600, 0xf0acbabf
+0,        179,        179,        1,   657600, 0xf0acbabf
+0,        180,        180,        1,   657600, 0x0f47804f
 1,     132300,     132300,    11025,    22050, 0xbc32204a
-0,        181,        181,        1,   657600, 0xb0a141a8
-0,        182,        182,        1,   657600, 0xf3333bd8
-0,        183,        183,        1,   657600, 0xea090688
-0,        184,        184,        1,   657600, 0xa017fe41
-0,        185,        185,        1,   657600, 0xa017fe41
-0,        186,        186,        1,   657600, 0x32e93bd8
-0,        187,        187,        1,   657600, 0x7fe640c0
-0,        188,        188,        1,   657600, 0x7fe640c0
-0,        189,        189,        1,   657600, 0xcd8995b2
-0,        190,        190,        1,   657600, 0x84278a92
-0,        191,        191,        1,   657600, 0x84278a92
-0,        192,        192,        1,   657600, 0xf1d2874a
-0,        193,        193,        1,   657600, 0xf1d2874a
-0,        194,        194,        1,   657600, 0xf1d2874a
-0,        195,        195,        1,   657600, 0xa58d6742
+0,        181,        181,        1,   657600, 0x0f47804f
+0,        182,        182,        1,   657600, 0x5e0c7a55
+0,        183,        183,        1,   657600, 0x0c8f4374
+0,        184,        184,        1,   657600, 0x709a3b00
+0,        185,        185,        1,   657600, 0x709a3b00
+0,        186,        186,        1,   657600, 0xf57b7a0f
+0,        187,        187,        1,   657600, 0x99427f1b
+0,        188,        188,        1,   657600, 0x99427f1b
+0,        189,        189,        1,   657600, 0xcb3608e7
+0,        190,        190,        1,   657600, 0x0992fd64
+0,        191,        191,        1,   657600, 0x0992fd64
+0,        192,        192,        1,   657600, 0x7a95fa02
+0,        193,        193,        1,   657600, 0x7a95fa02
+0,        194,        194,        1,   657600, 0x7a95fa02
+0,        195,        195,        1,   657600, 0xb97dd910
 1,     143325,     143325,    11025,    22050, 0xdf6f1e46
-0,        196,        196,        1,   657600, 0xa58d6742
-0,        197,        197,        1,   657600, 0xa58d6742
-0,        198,        198,        1,   657600, 0xb0cd11bb
-0,        199,        199,        1,   657600, 0xb0cd11bb
-0,        200,        200,        1,   657600, 0xc55610bb
-0,        201,        201,        1,   657600, 0x4ee1168b
-0,        202,        202,        1,   657600, 0x61c513a3
-0,        203,        203,        1,   657600, 0xd26410bb
-0,        204,        204,        1,   657600, 0xe7c410bb
-0,        205,        205,        1,   657600, 0x444a0dd3
-0,        206,        206,        1,   657600, 0x444a0dd3
-0,        207,        207,        1,   657600, 0x97ac10bb
-0,        208,        208,        1,   657600, 0x97ac10bb
-0,        209,        209,        1,   657600, 0xe8b30dd3
-0,        210,        210,        1,   657600, 0x3d0c10bb
+0,        196,        196,        1,   657600, 0xb97dd910
+0,        197,        197,        1,   657600, 0xb97dd910
+0,        198,        198,        1,   657600, 0x3be07a66
+0,        199,        199,        1,   657600, 0x3be07a66
+0,        200,        200,        1,   657600, 0x1ae77960
+0,        201,        201,        1,   657600, 0x62177f5a
+0,        202,        202,        1,   657600, 0xf57c7c5d
+0,        203,        203,        1,   657600, 0x600e7960
+0,        204,        204,        1,   657600, 0xe15d7960
+0,        205,        205,        1,   657600, 0x79427663
+0,        206,        206,        1,   657600, 0x79427663
+0,        207,        207,        1,   657600, 0xa7c77960
+0,        208,        208,        1,   657600, 0xa7c77960
+0,        209,        209,        1,   657600, 0x75f67663
+0,        210,        210,        1,   657600, 0x3a157960
 1,     154350,     154350,    11025,    22050, 0x4c91da9d
-0,        211,        211,        1,   657600, 0x8d2b0dd3
-0,        212,        212,        1,   657600, 0x8d2b0dd3
-0,        213,        213,        1,   657600, 0xa5760dd3
-0,        214,        214,        1,   657600, 0xa5760dd3
-0,        215,        215,        1,   657600, 0xa5760dd3
-0,        216,        216,        1,   657600, 0x31a30dd3
-0,        217,        217,        1,   657600, 0x31a30dd3
-0,        218,        218,        1,   657600, 0x31a30dd3
-0,        219,        219,        1,   657600, 0x31a30dd3
-0,        220,        220,        1,   657600, 0x31a30dd3
-0,        221,        221,        1,   657600, 0x31a30dd3
-0,        222,        222,        1,   657600, 0x31a30dd3
-0,        223,        223,        1,   657600, 0x31a30dd3
-0,        224,        224,        1,   657600, 0x31a30dd3
+0,        211,        211,        1,   657600, 0x72aa7663
+0,        212,        212,        1,   657600, 0x72aa7663
+0,        213,        213,        1,   657600, 0x1b277663
+0,        214,        214,        1,   657600, 0x1b277663
+0,        215,        215,        1,   657600, 0x1b277663
+0,        216,        216,        1,   657600, 0x6f5e7663
+0,        217,        217,        1,   657600, 0x6f5e7663
+0,        218,        218,        1,   657600, 0x6f5e7663
+0,        219,        219,        1,   657600, 0x6f5e7663
+0,        220,        220,        1,   657600, 0x6f5e7663
+0,        221,        221,        1,   657600, 0x6f5e7663
+0,        222,        222,        1,   657600, 0x6f5e7663
+0,        223,        223,        1,   657600, 0x6f5e7663
+0,        224,        224,        1,   657600, 0x6f5e7663
diff --git a/tests/ref/fate/tscc-32bit b/tests/ref/fate/tscc-32bit
index 4eef49009d..dfb37a9be8 100644
--- a/tests/ref/fate/tscc-32bit
+++ b/tests/ref/fate/tscc-32bit
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1024x768
+#sar 0: 0/1
 0,          0,          0,        1,  2359296, 0x76cccaa7
 0,          1,          1,        1,  2359296, 0x09c52bbf
 0,          2,          2,        1,  2359296, 0xc8746009
diff --git a/tests/ref/fate/tscc2-avi b/tests/ref/fate/tscc2-avi
index ad71b8254d..09ed897337 100644
--- a/tests/ref/fate/tscc2-avi
+++ b/tests/ref/fate/tscc2-avi
@@ -1,33 +1,29 @@
 #tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   230400, 0x7a2103c0
 0,          1,          1,        1,   230400, 0xd381c279
-0,          2,          2,        1,   230400, 0xd381c279
 0,          3,          3,        1,   230400, 0x110aec27
 0,          4,          4,        1,   230400, 0x4be67ee7
 0,          5,          5,        1,   230400, 0xd87fe4b4
-0,          6,          6,        1,   230400, 0xd87fe4b4
 0,          7,          7,        1,   230400, 0x9bc6a398
 0,          8,          8,        1,   230400, 0xd67d92db
 0,          9,          9,        1,   230400, 0x3df6559e
-0,         10,         10,        1,   230400, 0x3df6559e
 0,         11,         11,        1,   230400, 0x2136ff25
 0,         12,         12,        1,   230400, 0x94573fe6
 0,         13,         13,        1,   230400, 0xbf67d3f5
-0,         14,         14,        1,   230400, 0xbf67d3f5
 0,         15,         15,        1,   230400, 0x2592b5cf
 0,         16,         16,        1,   230400, 0x5b23cd93
 0,         17,         17,        1,   230400, 0x9b76d079
-0,         18,         18,        1,   230400, 0x9b76d079
 0,         19,         19,        1,   230400, 0x771a017e
 0,         20,         20,        1,   230400, 0xacfee1d0
 0,         21,         21,        1,   230400, 0x6b9ff4eb
-0,         22,         22,        1,   230400, 0x6b9ff4eb
 0,         23,         23,        1,   230400, 0xbaf643e1
 0,         24,         24,        1,   230400, 0x052efe59
 0,         25,         25,        1,   230400, 0xd751f901
-0,         26,         26,        1,   230400, 0xd751f901
 0,         27,         27,        1,   230400, 0x6f94e11f
 0,         28,         28,        1,   230400, 0x17eeabb9
 0,         29,         29,        1,   230400, 0x3733a035
-0,         30,         30,        1,   230400, 0x3733a035
 0,         31,         31,        1,   230400, 0xb0829f45
diff --git a/tests/ref/fate/tscc2-mov b/tests/ref/fate/tscc2-mov
index d73ff3f4f3..679f5bb63c 100644
--- a/tests/ref/fate/tscc2-mov
+++ b/tests/ref/fate/tscc2-mov
@@ -1,16 +1,10 @@
 #tb 0: 1/5
-0,          0,          0,        1,  1180116, 0x01d01336
-0,          1,          1,        1,  1180116, 0x01d01336
-0,          2,          2,        1,  1180116, 0x01d01336
-0,          3,          3,        1,  1180116, 0x01d01336
-0,          4,          4,        1,  1180116, 0x01d01336
-0,          5,          5,        1,  1180116, 0x01d01336
-0,          6,          6,        1,  1180116, 0x01d01336
-0,          7,          7,        1,  1180116, 0x01d01336
-0,          8,          8,        1,  1180116, 0x01d01336
-0,          9,          9,        1,  1180116, 0x01d01336
-0,         10,         10,        1,  1180116, 0x056fdadd
-0,         11,         11,        1,  1180116, 0x6f73e080
-0,         12,         12,        1,  1180116, 0x5244d9e5
-0,         13,         13,        1,  1180116, 0x629bf10f
-0,         14,         14,        1,  1180116, 0x97c726cb
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 892x441
+#sar 0: 0/1
+0,          0,          0,        1,  1180116, 0x056fdadd
+0,          1,          1,        1,  1180116, 0x6f73e080
+0,          2,          2,        1,  1180116, 0x5244d9e5
+0,          3,          3,        1,  1180116, 0x629bf10f
+0,          4,          4,        1,  1180116, 0x97c726cb
diff --git a/tests/ref/fate/txd-16bpp b/tests/ref/fate/txd-16bpp
index 33943f90ef..a3b1e2359c 100644
--- a/tests/ref/fate/txd-16bpp
+++ b/tests/ref/fate/txd-16bpp
@@ -1,4 +1,8 @@
 #tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 0/1
 0,          0,          0,        1,    16384, 0x4d39b4cb
 0,          1,          1,        1,    16384, 0x2a8d14b4
 0,          2,          2,        1,    16384, 0xe26793cb
diff --git a/tests/ref/fate/txd-odd b/tests/ref/fate/txd-odd
index fe7c615e4f..6ea581140a 100644
--- a/tests/ref/fate/txd-odd
+++ b/tests/ref/fate/txd-odd
@@ -1,2 +1,6 @@
 #tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 387x249
+#sar 0: 0/1
 0,          0,          0,        1,   385452, 0x055a14d6
diff --git a/tests/ref/fate/txd-pal8 b/tests/ref/fate/txd-pal8
index 61fee80fb0..2c36668ff6 100644
--- a/tests/ref/fate/txd-pal8
+++ b/tests/ref/fate/txd-pal8
@@ -1,2 +1,6 @@
 #tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x512
+#sar 0: 0/1
 0,          0,          0,        1,   786432, 0x56654d61
diff --git a/tests/ref/fate/ulti b/tests/ref/fate/ulti
index 4e9968b6df..4b3a762809 100644
--- a/tests/ref/fate/ulti
+++ b/tests/ref/fate/ulti
@@ -1,4 +1,8 @@
 #tb 0: 1/12
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,    86400, 0x5d58253d
 0,          1,          1,        1,    86400, 0x0626d90d
 0,          2,          2,        1,    86400, 0x4ecb5048
diff --git a/tests/ref/fate/unknown_layout-ac3 b/tests/ref/fate/unknown_layout-ac3
new file mode 100644
index 0000000000..d332efcec4
--- /dev/null
+++ b/tests/ref/fate/unknown_layout-ac3
@@ -0,0 +1 @@
+bbb7550d6d93973c10f4ee13c87cf799
diff --git a/tests/ref/fate/unknown_layout-pcm b/tests/ref/fate/unknown_layout-pcm
new file mode 100644
index 0000000000..73c6a2dbab
--- /dev/null
+++ b/tests/ref/fate/unknown_layout-pcm
@@ -0,0 +1 @@
+4dada0795adf50f7a0e60861658f86ea
diff --git a/tests/ref/fate/utvideo_rgb_left b/tests/ref/fate/utvideo_rgb_left
index d19a6b1ead..23e48c426d 100644
--- a/tests/ref/fate/utvideo_rgb_left
+++ b/tests/ref/fate/utvideo_rgb_left
@@ -1,5 +1,9 @@
 #tb 0: 1001/30000
-0,          0,          0,        1,   921600, 0x27e6001e
-0,          1,          1,        1,   921600, 0x7c0a92bc
-0,          2,          2,        1,   921600, 0x4d2be42c
-0,          3,          3,        1,   921600, 0x58ddd0be
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+0,          0,          0,        1,   921600, 0xb457001e
+0,          1,          1,        1,   921600, 0xceff92bc
+0,          2,          2,        1,   921600, 0x762de42c
+0,          3,          3,        1,   921600, 0xef14d0be
diff --git a/tests/ref/fate/utvideo_rgb_median b/tests/ref/fate/utvideo_rgb_median
index f041285352..e7c623a8da 100644
--- a/tests/ref/fate/utvideo_rgb_median
+++ b/tests/ref/fate/utvideo_rgb_median
@@ -1,6 +1,10 @@
 #tb 0: 1001/30000
-0,          0,          0,        1,   921600, 0x9776611f
-0,          1,          1,        1,   921600, 0xdbfa64f4
-0,          2,          2,        1,   921600, 0xed2a0580
-0,          3,          3,        1,   921600, 0x6ecc80bc
-0,          4,          4,        1,   921600, 0x58ddd0be
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+0,          0,          0,        1,   921600, 0x85af611f
+0,          1,          1,        1,   921600, 0xc97a64f4
+0,          2,          2,        1,   921600, 0xb1db0580
+0,          3,          3,        1,   921600, 0xa18d80bc
+0,          4,          4,        1,   921600, 0xef14d0be
diff --git a/tests/ref/fate/utvideo_rgba_left b/tests/ref/fate/utvideo_rgba_left
index a7e0ed43b4..b24b7f4bfa 100644
--- a/tests/ref/fate/utvideo_rgba_left
+++ b/tests/ref/fate/utvideo_rgba_left
@@ -1,6 +1,10 @@
 #tb 0: 1001/30000
-0,          0,          0,        1,  1228800, 0xf1bc9432
-0,          1,          1,        1,  1228800, 0x8480d1e5
-0,          2,          2,        1,  1228800, 0xb01d5fb2
-0,          3,          3,        1,  1228800, 0x53cb42c4
-0,          4,          4,        1,  1228800, 0x2b2ea176
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+0,          0,          0,        1,  1228800, 0xf9f49432
+0,          1,          1,        1,  1228800, 0xf089d1e5
+0,          2,          2,        1,  1228800, 0xbd025fb2
+0,          3,          3,        1,  1228800, 0x17bf42c4
+0,          4,          4,        1,  1228800, 0xe31ea176
diff --git a/tests/ref/fate/utvideo_rgba_median b/tests/ref/fate/utvideo_rgba_median
index a7e0ed43b4..b24b7f4bfa 100644
--- a/tests/ref/fate/utvideo_rgba_median
+++ b/tests/ref/fate/utvideo_rgba_median
@@ -1,6 +1,10 @@
 #tb 0: 1001/30000
-0,          0,          0,        1,  1228800, 0xf1bc9432
-0,          1,          1,        1,  1228800, 0x8480d1e5
-0,          2,          2,        1,  1228800, 0xb01d5fb2
-0,          3,          3,        1,  1228800, 0x53cb42c4
-0,          4,          4,        1,  1228800, 0x2b2ea176
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
+0,          0,          0,        1,  1228800, 0xf9f49432
+0,          1,          1,        1,  1228800, 0xf089d1e5
+0,          2,          2,        1,  1228800, 0xbd025fb2
+0,          3,          3,        1,  1228800, 0x17bf42c4
+0,          4,          4,        1,  1228800, 0xe31ea176
diff --git a/tests/ref/fate/utvideo_rgba_single_symbol b/tests/ref/fate/utvideo_rgba_single_symbol
index c0e0d98d1f..a20dc3dda4 100644
--- a/tests/ref/fate/utvideo_rgba_single_symbol
+++ b/tests/ref/fate/utvideo_rgba_single_symbol
@@ -1,2 +1,6 @@
 #tb 0: 1/24
-0,          0,          0,        1,  3145728, 0xac95c593
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1024x768
+#sar 0: 0/1
+0,          0,          0,        1,  3145728, 0xa07dc593
diff --git a/tests/ref/fate/utvideo_yuv420_left b/tests/ref/fate/utvideo_yuv420_left
index 026f8fb981..3d12d7eef1 100644
--- a/tests/ref/fate/utvideo_yuv420_left
+++ b/tests/ref/fate/utvideo_yuv420_left
@@ -1,4 +1,8 @@
 #tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   460800, 0xece98fc8
 0,          1,          1,        1,   460800, 0x9baf786b
 0,          2,          2,        1,   460800, 0x8e8e0510
diff --git a/tests/ref/fate/utvideo_yuv420_median b/tests/ref/fate/utvideo_yuv420_median
index 5662d8c66c..ccca7f8ce5 100644
--- a/tests/ref/fate/utvideo_yuv420_median
+++ b/tests/ref/fate/utvideo_yuv420_median
@@ -1,4 +1,8 @@
 #tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   460800, 0x6a817987
 0,          1,          1,        1,   460800, 0x2f713ec2
 0,          2,          2,        1,   460800, 0x003b560e
diff --git a/tests/ref/fate/utvideo_yuv422_left b/tests/ref/fate/utvideo_yuv422_left
index 438b32a9c9..4e66cfc20f 100644
--- a/tests/ref/fate/utvideo_yuv422_left
+++ b/tests/ref/fate/utvideo_yuv422_left
@@ -1,4 +1,8 @@
 #tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   614400, 0x9a6b8802
 0,          1,          1,        1,   614400, 0xaa8687e2
 0,          2,          2,        1,   614400, 0x2fe5bd40
diff --git a/tests/ref/fate/utvideo_yuv422_median b/tests/ref/fate/utvideo_yuv422_median
index 438b32a9c9..4e66cfc20f 100644
--- a/tests/ref/fate/utvideo_yuv422_median
+++ b/tests/ref/fate/utvideo_yuv422_median
@@ -1,4 +1,8 @@
 #tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x480
+#sar 0: 0/1
 0,          0,          0,        1,   614400, 0x9a6b8802
 0,          1,          1,        1,   614400, 0xaa8687e2
 0,          2,          2,        1,   614400, 0x2fe5bd40
diff --git a/tests/ref/fate/utvideoenc_rgb_left b/tests/ref/fate/utvideoenc_rgb_left
index 99d1182f73..a1d200096a 100644
--- a/tests/ref/fate/utvideoenc_rgb_left
+++ b/tests/ref/fate/utvideoenc_rgb_left
@@ -1,4 +1,13 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#extradata 0,                              16, c9a1741fb293b9ad21876492b5425a3b
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: utvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,   182328, cd084b244939d7e0008d8e5ab3429dc1
 0,          1,          1,        1,   182336, c9c40672750f372134185901147fb776
 0,          2,          2,        1,   182956, c728911ca73225f2dc7453533c9be95e
@@ -40,7 +49,7 @@
 0,         38,         38,        1,   179776, 01d407ed0b86eeb2c3ee3c24dd452d8d
 0,         39,         39,        1,   180100, 062e4af150100d7accf86a907a4b99b5
 0,         40,         40,        1,   180228, 23c617b76ef8f274bd089016fb8516c7
-0,         41,         41,        1,   180592, 55f538ae5e44b60209138b7536d5c199
+0,         41,         41,        1,   180592, 5cd3d93597325196079dc019556f6933
 0,         42,         42,        1,   181188, d39d52f5b690661434b1abd8717b3e30
 0,         43,         43,        1,   181300, 9e202444287234bafd103fab83b1a974
 0,         44,         44,        1,   180812, 602165271de71594132cce98af56a7b2
diff --git a/tests/ref/fate/utvideoenc_rgb_median b/tests/ref/fate/utvideoenc_rgb_median
index 5983ddf4b3..b1558d7f53 100644
--- a/tests/ref/fate/utvideoenc_rgb_median
+++ b/tests/ref/fate/utvideoenc_rgb_median
@@ -1,4 +1,13 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#extradata 0,                              16, c9a1741fb293b9ad21876492b5425a3b
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: utvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,   182160, abcf4f477f74b696faca2fcff1f62aa9
 0,          1,          1,        1,   182104, 7cbcf339fa40c24522067295b39d637f
 0,          2,          2,        1,   183108, dfc2c418f4379a89654c16b34ff19446
diff --git a/tests/ref/fate/utvideoenc_rgb_none b/tests/ref/fate/utvideoenc_rgb_none
index d6c69625fa..403c807a4a 100644
--- a/tests/ref/fate/utvideoenc_rgb_none
+++ b/tests/ref/fate/utvideoenc_rgb_none
@@ -1,51 +1,60 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#extradata 0,                              16, c9a1741fb293b9ad21876492b5425a3b
 #tb 0: 1/25
-0,          0,          0,        1,   301052, 8645cb98470205cceea3c2026223b69f
-0,          1,          1,        1,   301068, 9123c3c31ac0bc0832bb07e8c6d5b372
-0,          2,          2,        1,   300840, 394aa034eba2b306efa8171efc5fb960
-0,          3,          3,        1,   300904, 1abc4512d268bb7bb4b9f467aa19e5a8
-0,          4,          4,        1,   300912, e117d6f8d2bbd89bdce86cd5c4cf6206
-0,          5,          5,        1,   300936, d6a6c100e6dfd0e4dcdaa67ec59a757a
-0,          6,          6,        1,   300944, 3a0bf05461965bf2e538f5ed1067e784
-0,          7,          7,        1,   301044, 66e2fef970e8d997bb52f28eed9ad6fe
-0,          8,          8,        1,   301076, 6ae8f26125255c46be8c6da07d21ba35
-0,          9,          9,        1,   301044, 024d41f9d3b217b58ad6ba2a8f3b680d
-0,         10,         10,        1,   300944, 5dc0387f32b68e365c467f9dcc62b923
-0,         11,         11,        1,   300912, 47db16c6118feb2143fe0d1ec909bb51
-0,         12,         12,        1,   301044, 7161af85d2c85529b83548a701c6f5b7
-0,         13,         13,        1,   300964, 2dd90b4edcfc8d2b84168f42c7a47785
-0,         14,         14,        1,   300868, 76b296949227e7b22f204bec90dd02af
-0,         15,         15,        1,   300880, 44f9c830be2c9efdda335bf774f3b6c6
-0,         16,         16,        1,   301020, 70c1883ae4ff2ae8b0d5a608a75c839c
-0,         17,         17,        1,   301072, bac10cb932595594e4e8146831bbe00b
-0,         18,         18,        1,   301192, 46c2aa31dc33baa4d37f71f9873cbe6f
-0,         19,         19,        1,   301224, 396c406acf79cbe79c064ccbe7a3b648
-0,         20,         20,        1,   301180, 8d5d2071ddc79335f6785a921851905e
-0,         21,         21,        1,   301180, 9767bc30cadd23f0625e665e9b70ac31
-0,         22,         22,        1,   301116, fba702e0ab727d9446a7796790a10545
-0,         23,         23,        1,   301060, 9a08113dd947874b57d4cc85d56343ca
-0,         24,         24,        1,   301128, a58b1ebeb28fac3c88f64c8ba15f0591
-0,         25,         25,        1,   301144, e071b28b961f8d9c5da9b1ff41c24c2a
-0,         26,         26,        1,   301088, d19bed9054db25a718724d746d22c800
-0,         27,         27,        1,   301232, 70b2832bb0eb5f8a74e0bee411f66a46
-0,         28,         28,        1,   301152, 470bd72096d3ef6b5490b03cfdea438d
-0,         29,         29,        1,   301224, f3c285eb28a3c5b820276d3a68976df4
-0,         30,         30,        1,   301224, a432bfc1e022f189a70cbc963d716596
-0,         31,         31,        1,   301160, fbde0ac1bb6e5dbd870c1c6d8f03190c
-0,         32,         32,        1,   301120, 61f251db3d73483206609718063cfbb9
-0,         33,         33,        1,   301096, 6c1908eac263c8c3368683ced8078da4
-0,         34,         34,        1,   301000, 4b8df4fa83c085ea36369dbdd37f58bd
-0,         35,         35,        1,   301152, e2ceb9ff6b72b815e4b511a85dc0ae38
-0,         36,         36,        1,   301232, 27cc508ff5081f9c901c4eabd62e5835
-0,         37,         37,        1,   301228, bdb62b975b1cfe4ba8be08be1e8b1a5e
-0,         38,         38,        1,   301296, 13fc07f3935b70e98922233cf81bc7a4
-0,         39,         39,        1,   301296, 5fe19496257987b809e56e3c11192c43
-0,         40,         40,        1,   301308, a86115cd10e74c795739e8e325403ac6
-0,         41,         41,        1,   301268, 6c1f7bbf077ff58486f256e2ce9d01e6
-0,         42,         42,        1,   301344, 3fda739956dfa07a15cc5bd7e054568d
-0,         43,         43,        1,   301308, 54584061bcce46feb19aafa37922f923
-0,         44,         44,        1,   301292, 092e08d230dcfe4abd1460ef26c31421
-0,         45,         45,        1,   301344, 39ca46f9f38434aee15660263921f392
-0,         46,         46,        1,   301432, f7b76bebcfc614537c20bd6b20096d78
-0,         47,         47,        1,   301440, 86c97147d03bf7aee71073127c7fad32
-0,         48,         48,        1,   301460, 3fdbe5ae0b7e6b7ec0bc5668ba50a491
-0,         49,         49,        1,   301444, 8ef2e62af67f91e886b8f25456b38869
+#media_type 0: video
+#codec_id 0: utvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   301024, 44de62472f485410819707c44b53f276
+0,          1,          1,        1,   301036, ff3c28c23b15834a84c57b304610924f
+0,          2,          2,        1,   300812, 72f02a697464f5fdd54ae2e054c131d1
+0,          3,          3,        1,   300876, 8879becf8b3d5001b196f45b7817ef6b
+0,          4,          4,        1,   300880, 2edeed55c4d84dea1fc9386553d7503f
+0,          5,          5,        1,   300904, f799f26eae30e1796bd62f9cdbcb2b17
+0,          6,          6,        1,   300908, bc606ee3ab284d3567a3fbd476d674f0
+0,          7,          7,        1,   301012, 404f55be9ec860a1ab3d15711965c9ba
+0,          8,          8,        1,   301048, 112394db28656101b4e8ba3621b437ae
+0,          9,          9,        1,   301008, 8945bb7668b4a529844e68e1f6b6522b
+0,         10,         10,        1,   300908, a9097c5f0bd7ddea711a25aa74696f70
+0,         11,         11,        1,   300876, 579de317d166295088530c78f403611d
+0,         12,         12,        1,   301012, d97e3627c494012d6167a30ec8192360
+0,         13,         13,        1,   300928, fd20066b7f31363751328aefedfae04c
+0,         14,         14,        1,   300836, d9bdd5606f4426b503f19a674e8058a3
+0,         15,         15,        1,   300848, 6c8f2cbd75646592876f8138a017c1ce
+0,         16,         16,        1,   300988, 54e19940011b3bfed809a0edc12c3dd7
+0,         17,         17,        1,   301040, b1d5f39215f305953a846fb01dbc2f24
+0,         18,         18,        1,   301164, 9dde74f0ee3626eeea41c538fd80e1fb
+0,         19,         19,        1,   301196, fdf22d2c35c7ab72416a268bf6612650
+0,         20,         20,        1,   301148, 275261bc1c1dec0bf712dcf05213def2
+0,         21,         21,        1,   301144, 66ccea6fce9d6d7016dafb3b349fa163
+0,         22,         22,        1,   301080, d6dc6ce0708dfdf74e936271a98c19e9
+0,         23,         23,        1,   301028, 48e610b9d798e0642825919fab233524
+0,         24,         24,        1,   301100, aed8f8f0a9d96ab9906ea8175e18c9ff
+0,         25,         25,        1,   301116, fe9e1eccb9ccc92b4041228ea2c56c8e
+0,         26,         26,        1,   301052, 3ec2f76b41fd8a6eafaa6bb14b94c153
+0,         27,         27,        1,   301200, 60d608bbe0ca285a7d8a1a4822a84c4d
+0,         28,         28,        1,   301120, 6d2cec50ee32e76eb6dff76a4976d221
+0,         29,         29,        1,   301188, 8faa69fd62e0646e4eb85c1601827364
+0,         30,         30,        1,   301192, eb1fa109c5e9b89f29be7cf363649acd
+0,         31,         31,        1,   301128, 32ba1797f5dee6643712688621984326
+0,         32,         32,        1,   301088, a1bfa70314c40f60a0823beef74e233e
+0,         33,         33,        1,   301064, b18d84efa0091199dd9167bbdb36b873
+0,         34,         34,        1,   300964, a2ae8d3dd655403bcfdace40aaa1d78b
+0,         35,         35,        1,   301124, 8ece60df0f0ef4f3d887eac16c23cad6
+0,         36,         36,        1,   301200, 13eb4b5ec7471837aadce38848e48cb2
+0,         37,         37,        1,   301196, b5fdef211755134f8e7998793a0ab0c0
+0,         38,         38,        1,   301260, 2f7e2046bae9e664e74bc56a3596743c
+0,         39,         39,        1,   301264, 2cfc013c9e66a5dd0229c6551febd658
+0,         40,         40,        1,   301272, 47e8ff02a8f054c66687e2b613e46cf5
+0,         41,         41,        1,   301236, f4d766155eeeb7b03687a3141840bf32
+0,         42,         42,        1,   301312, 8fe134aefc02b6910dc2054447fd9c37
+0,         43,         43,        1,   301272, 9ec57db275fca2b596734c48a50c28bc
+0,         44,         44,        1,   301256, 17bae207d8d6f5b2b500885e3058185f
+0,         45,         45,        1,   301308, 9f8e91f3fbbdd0ca17b2ad0ffe888d5a
+0,         46,         46,        1,   301400, 8184e55eb5432516547df512175c15fc
+0,         47,         47,        1,   301408, dd0c0aa1426427549e9cbb22ef82f930
+0,         48,         48,        1,   301424, c65025dc3fa21fad98118ab0386b910e
+0,         49,         49,        1,   301408, 2982b49e94aa25b8ef30f81769650f15
diff --git a/tests/ref/fate/utvideoenc_rgba_left b/tests/ref/fate/utvideoenc_rgba_left
index 757febe833..eb3305d61a 100644
--- a/tests/ref/fate/utvideoenc_rgba_left
+++ b/tests/ref/fate/utvideoenc_rgba_left
@@ -1,51 +1,60 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#extradata 0,                              16, 9881f4423f0a3b5da25a0574d3451eef
 #tb 0: 1/25
-0,          0,          0,        1,   195264, 5869dee2126d98ecc1fab1e69720906a
-0,          1,          1,        1,   195272, 1bd08dcde1061b0d9273bdc6dd901382
-0,          2,          2,        1,   195892, 2b3fc3632bcd1cc44f777fb97a56f79b
-0,          3,          3,        1,   195320, 792870fc50a4145ad561b1004a8b6451
-0,          4,          4,        1,   194640, c3d4031c46d6dc64e632e2d38b48fc96
-0,          5,          5,        1,   195072, 27e4b09e7f8446a8dd8dd7dcbc578e2b
-0,          6,          6,        1,   194488, e44441beb8d3e358112e2776a0116ea9
-0,          7,          7,        1,   195228, 0519afd694512aea2c839fe0456e518c
-0,          8,          8,        1,   194360, 7296944c86296fb256188975db6e5620
-0,          9,          9,        1,   195252, 40b53999a36ce413256c7a81c3aa0c44
-0,         10,         10,        1,   195000, 925fe520c460f94ae7a05cf0e6cf8dd8
-0,         11,         11,        1,   195532, af417aac106af9b4e8c04cf1a84d3bd8
-0,         12,         12,        1,   193836, 0eadf04f475a93ebef3979d32c13ee92
-0,         13,         13,        1,   194856, 5814ff44b233d68e4c991703c0fa6f44
-0,         14,         14,        1,   195760, e9a66bbeadeab4ed3f34296346eafc27
-0,         15,         15,        1,   195388, 17d33cd676c8b464d1b97ce0f0234716
-0,         16,         16,        1,   195248, 1054b945cd6e11e70d8b348e540e4dd5
-0,         17,         17,        1,   194792, f0a6ceee9014f6cf8a999f344897ad3e
-0,         18,         18,        1,   194044, 4fbf2b9fd8b7e8233f65b5bf61e326c0
-0,         19,         19,        1,   194324, eb90b72edafab7bbe5e9ff561313927c
-0,         20,         20,        1,   193872, 6ebc973b9f66e1ebdb3029f1aadd9a24
-0,         21,         21,        1,   193836, cde713fba6bede0361779c45f7a6d80b
-0,         22,         22,        1,   194872, 64225b7d92c8371ed0335d7693902f60
-0,         23,         23,        1,   195240, b11e0b10b4e713caffec706d952edb7b
-0,         24,         24,        1,   195516, 932244aee01b068f1bfb5132f092675b
-0,         25,         25,        1,   195508, 2745faafa2ec34dcf2cec2f5f791f49b
-0,         26,         26,        1,   195292, 6ff67783eabad9c72b146d510ffa0b7e
-0,         27,         27,        1,   194468, cc5aa248fe507ac3fbb839b9388856bc
-0,         28,         28,        1,   192516, 13063bb195380953743ab24a73ff6ddd
-0,         29,         29,        1,   192464, a391b0d795b2f565cc3e351975fb528d
-0,         30,         30,        1,   193696, 4239c695d1b9eaa44c2d037a9c39da20
-0,         31,         31,        1,   194500, 5857b4c4cc86a9a0f38d833c236e396c
-0,         32,         32,        1,   194364, ad0eeec7622c76bd996deac7e99390e5
-0,         33,         33,        1,   195916, b98da9283eef85f6dffe308774161441
-0,         34,         34,        1,   195560, 32f924fc40bb777c951481b623a8f46b
-0,         35,         35,        1,   195288, 96a7bb386420902fbb98b8267d4496ca
-0,         36,         36,        1,   194272, 98b88d6092708ffff416417d8f628477
-0,         37,         37,        1,   194464, 3c8295490b77415c2e4ebb7ce9b8cc53
-0,         38,         38,        1,   192712, 17798a13ba5f82939d98dfd619a68e18
-0,         39,         39,        1,   193036, b92ab54b363c1bd29042feeb3b9f5631
-0,         40,         40,        1,   193164, a971b68bb49148afdf510be5f5793933
-0,         41,         41,        1,   193528, 6fbf07d240e0073e57d295bdd0d32465
-0,         42,         42,        1,   194124, 4b1ddea464b8e40da48418e77b4fdf7a
-0,         43,         43,        1,   194236, d46914a9e2bdda30bf84b3282924bb3d
-0,         44,         44,        1,   193748, 3d4587081c6d73366d85e5df42c87810
-0,         45,         45,        1,   191752, 996274b3852ac6af30db8f9e242895e0
-0,         46,         46,        1,   191132, 5a1e47e4d1cc9e18e94041b4357a5de4
-0,         47,         47,        1,   191708, e3048c5ba2b9a494791cad3cbf843780
-0,         48,         48,        1,   191588, dbc63170a9b7be348497162c42a1b9f1
-0,         49,         49,        1,   191448, db923a15f424e69bbf8c8af2a2f7e157
+#media_type 0: video
+#codec_id 0: utvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   195260, a8fdb226460f210542e7aca6c12b0874
+0,          1,          1,        1,   195268, 45f098764ccba85dc641b7e401461c0a
+0,          2,          2,        1,   195888, e922261672c7de46a302abad3a3fe450
+0,          3,          3,        1,   195316, f8febd5af0fed000fab2943cc649975f
+0,          4,          4,        1,   194636, d90985ad8afd2f969afa842510085852
+0,          5,          5,        1,   195068, 909adb44bd049186a959f2803e641520
+0,          6,          6,        1,   194484, 547772233e653daccc6610fcb6369da7
+0,          7,          7,        1,   195224, aa82b75f6230b2e948abdfe36bce1150
+0,          8,          8,        1,   194356, d67fb1208532137252701ddcbf7bfc2e
+0,          9,          9,        1,   195248, 7b08698d2a911fba5231c0fef0ded4c2
+0,         10,         10,        1,   194996, 570e7d9caec52975dec1c2a5dbf7cdef
+0,         11,         11,        1,   195528, 7309c0531b942902c691781f2a6da1a1
+0,         12,         12,        1,   193832, 40954ceb87370cac3db5c8c2d7c001d1
+0,         13,         13,        1,   194852, 538382c377f0c6e9070ec0b8c5fb3e39
+0,         14,         14,        1,   195756, d002a80346f3460380abb794f2d56a62
+0,         15,         15,        1,   195384, 1a4f58b3c710f2fedaf746c281556b4c
+0,         16,         16,        1,   195244, 218832dab1251e1dc852e6839a48b3fc
+0,         17,         17,        1,   194788, a035acf428bd9565a4c3fec25dfc6f4f
+0,         18,         18,        1,   194040, 6dbfeb949bdeeb055a4f7ebf78af9a85
+0,         19,         19,        1,   194320, 8b4aa3f6f05aa684d9e4adfa4cdce814
+0,         20,         20,        1,   193868, 98cd8b150784f6695f8dea163cecf286
+0,         21,         21,        1,   193832, 27a8db33014c4bc6a8da356c4b1a3e4f
+0,         22,         22,        1,   194868, f1e1460dca9127197c0a40e659924616
+0,         23,         23,        1,   195236, a012f8548e92243334edcd7c8f57aa52
+0,         24,         24,        1,   195512, bf3d4e968d126231baa6618d3344ef81
+0,         25,         25,        1,   195504, adf4b49d8721f1b323fa518f2f0d4750
+0,         26,         26,        1,   195288, aa16dd087a73a9cadc5abfc0a46ccdd4
+0,         27,         27,        1,   194464, 2e3f07244999cbe949495b57adcabe69
+0,         28,         28,        1,   192512, 2d6ce0d29a929e0208e1578e95c9d388
+0,         29,         29,        1,   192460, 081d18cd138eead0cd4b25f54a7c7540
+0,         30,         30,        1,   193692, 546b6ad28b612c2f601c7d87b265ba95
+0,         31,         31,        1,   194496, b2b2ae3b1d67e332295456e6c7bdd381
+0,         32,         32,        1,   194360, 0837b122d85abc4d704d40629266c58d
+0,         33,         33,        1,   195912, b7a4bbe436d63394cee70d40e8a8a4cf
+0,         34,         34,        1,   195556, 1b9a3eb6cda9bbd44bbdd0dc26a74252
+0,         35,         35,        1,   195284, f28d780d43fa6979379dd21fcb12e906
+0,         36,         36,        1,   194268, 5508989dad06fa05ee4054e759cdfd4b
+0,         37,         37,        1,   194460, cb65a0e97c03b2fbe69caa6ac1660070
+0,         38,         38,        1,   192708, 4125ee86cf4b8ca6d891c176662e584f
+0,         39,         39,        1,   193032, 096ee24b3e35049480e28171693fbd85
+0,         40,         40,        1,   193160, c01aef63b8bc792d08355ce6d68affee
+0,         41,         41,        1,   193524, 57af47b7bfe132cf58eab2807996b3fe
+0,         42,         42,        1,   194120, 9a4e2d72f4526815b253b3acce2dd49c
+0,         43,         43,        1,   194232, e575508ffbd2a53871e817cd8947e2d2
+0,         44,         44,        1,   193744, 95d8eefbfbf5a7354ecbf35835243e44
+0,         45,         45,        1,   191748, de2eedebb28491e59700300635af1f90
+0,         46,         46,        1,   191128, 652670f6881419be5068f2de6ac2d91e
+0,         47,         47,        1,   191704, 070f46dc278230528aa6b40256a6d891
+0,         48,         48,        1,   191584, e4b76fcf344e125729c339e360a14b15
+0,         49,         49,        1,   191444, 6a33b374a8b48549094a24543d81d999
diff --git a/tests/ref/fate/utvideoenc_rgba_median b/tests/ref/fate/utvideoenc_rgba_median
index 1198a337cb..0cdab8d41a 100644
--- a/tests/ref/fate/utvideoenc_rgba_median
+++ b/tests/ref/fate/utvideoenc_rgba_median
@@ -1,51 +1,60 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#extradata 0,                              16, 9881f4423f0a3b5da25a0574d3451eef
 #tb 0: 1/25
-0,          0,          0,        1,   195096, 29ad3287ab4d7f4d46968c6d38ba049b
-0,          1,          1,        1,   195040, 2c7b4f5f0aee96dca6dc30ce01b3c74d
-0,          2,          2,        1,   196044, 7ffc6ab3c4a2eee436ef6a59c72ffb04
-0,          3,          3,        1,   195256, f4453470d77c246cbb30d00c13512359
-0,          4,          4,        1,   194856, b84c4d56bf28033db539e4e0cad3d342
-0,          5,          5,        1,   195360, d2d3371b96f679f9b7c62d98b5d54af9
-0,          6,          6,        1,   195184, 8e3782bc12b24023a5899eb4806ffed6
-0,          7,          7,        1,   194812, 4fcf24a0660606304c58c93db2baf7de
-0,          8,          8,        1,   195040, 6ab57a9dcb4c99df7848a0971335a6b4
-0,          9,          9,        1,   195476, 66a3d66c3dc2f5b0847266a21927fa77
-0,         10,         10,        1,   195056, 530b251a8497af21bc56cd73af5c7ddf
-0,         11,         11,        1,   195072, 2904d24eca3db9734ed78dc8d557a334
-0,         12,         12,        1,   194232, 97566b596b113bf94a12ee1c02058a95
-0,         13,         13,        1,   195072, dceefd5df6efc5fefc8cfa1543b1a20e
-0,         14,         14,        1,   195348, d5b75f298fa6d474435333467b3497ae
-0,         15,         15,        1,   195668, 519f63be313f311cbb3fb48970a19f15
-0,         16,         16,        1,   194880, ab2da22767f540f8adea7e43dd6c1d0c
-0,         17,         17,        1,   195168, 667b85c19dd2d8ae105594f1294297b9
-0,         18,         18,        1,   194448, 575bc4b46f6158e76e503e8028902aaa
-0,         19,         19,        1,   194360, 851acbaf04c464689c8e2c4af3b9ed14
-0,         20,         20,        1,   193700, 1a477e0d665dcd088da6edeef77f21b1
-0,         21,         21,        1,   194008, b0d752c2201235e51ba0bbb59046fa60
-0,         22,         22,        1,   194096, 099df2b23c41ee54a6bd11aa6c92c390
-0,         23,         23,        1,   195092, e4d4dc89b8afba245355cec57ddcae40
-0,         24,         24,        1,   195196, 070c27e0499cf0210d729242ebc1a24e
-0,         25,         25,        1,   194912, 0fb78b7892035ecbec6ee9be6a13831c
-0,         26,         26,        1,   194768, 3ff6a05e68d6e33eeea22232e71bdf9a
-0,         27,         27,        1,   194360, 3828288e90a780d0c338ba5ab046aaa5
-0,         28,         28,        1,   193568, 60afb0ae9e6cbc9d8e4081764de7b4e6
-0,         29,         29,        1,   193560, 6b22fcfce4bff96b2afcb891f4fa9cf3
-0,         30,         30,        1,   193960, cae9eddb4464627fdc4413c3b5159575
-0,         31,         31,        1,   194780, 9e3d730fb835d3acaf92b7be368ea89e
-0,         32,         32,        1,   194648, 1ac7f5ae1b392ee8630266317a1818df
-0,         33,         33,        1,   194944, 374142509500017bbc29e157569bca2f
-0,         34,         34,        1,   194736, 0072a43b8de988683340c81e5bd4dba6
-0,         35,         35,        1,   194776, d5add7706f49a6a2f8d6bf3ed0ce3410
-0,         36,         36,        1,   194784, 7a1d38bc73fd293afef5fbcf9d34decd
-0,         37,         37,        1,   194912, 695e2d4c5d613245d591ae58100323bd
-0,         38,         38,        1,   194152, d4c9adb4f6340bc5f10b5b13f71d07bd
-0,         39,         39,        1,   194172, 0c7419c5c550e784e01a8c9927ecf59a
-0,         40,         40,        1,   193608, 4abff529172476d76c2956179041b2e4
-0,         41,         41,        1,   194260, dfa07971b01032b6a653d0d6715ffa8c
-0,         42,         42,        1,   193916, 6ffe1e68c74d51ea0cba0ede10b0f6f0
-0,         43,         43,        1,   194140, 46e18d23810193dd352fcc49b7c5ef6e
-0,         44,         44,        1,   193656, 4339d3e8b9dbeb376a1e19c4b86824f3
-0,         45,         45,        1,   192964, ff4680c71688f9944cd494105d2ab0b5
-0,         46,         46,        1,   192640, 62ce4b6d3311c34c73c6af1399fedfdc
-0,         47,         47,        1,   192584, f71b06a232a1a62a45ddac80c6f75090
-0,         48,         48,        1,   192360, 6642b9838eb32ed81d4d10a46ab9f954
-0,         49,         49,        1,   191916, d3ed1686383cfa7130ecc17c1ab52432
+#media_type 0: video
+#codec_id 0: utvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   195092, d32d5a3dc88b9aef0826b565ee5dfbc6
+0,          1,          1,        1,   195036, ea13e3522d1f3aeddd47117c91eccc55
+0,          2,          2,        1,   196040, 21c2c9abe791bed2a9bf02e539caa787
+0,          3,          3,        1,   195252, 58d5e081127f246f711f5b8ee1c760ff
+0,          4,          4,        1,   194852, 8ceb3824ec628a73e1c08e498f369484
+0,          5,          5,        1,   195356, 30ea64094f29d670e2ff8f43b50578d6
+0,          6,          6,        1,   195180, 08b406b9f3063a54681d7195fb53e953
+0,          7,          7,        1,   194808, e28c43ef3aef174f0f9b9d7a702ca747
+0,          8,          8,        1,   195036, 66247b40b0def9373bf6fdda9ef832f7
+0,          9,          9,        1,   195472, efa8a624d6b0fa69e0c1c746baed0b33
+0,         10,         10,        1,   195052, fdfc784aed661cb76bc5b3ef1863bd89
+0,         11,         11,        1,   195068, 040ad503d18a36d4f1cdaec64998138a
+0,         12,         12,        1,   194228, 1cd168427d022825a801b232cb23ca12
+0,         13,         13,        1,   195068, e4082f833d3bf75af24e1bb5f06d94fe
+0,         14,         14,        1,   195344, 19638340e93d4f1f7099deda34d28e3f
+0,         15,         15,        1,   195664, 001a801c5c5ceb197576c0f7b793850d
+0,         16,         16,        1,   194876, 9550b3cf6133997bf7557483f346b036
+0,         17,         17,        1,   195164, eb7220caf48ab2605ec971ca1297a7ae
+0,         18,         18,        1,   194444, a2ac812e6307a92ecd09d4282367a9d4
+0,         19,         19,        1,   194356, ee4d250226ab2a34cef0e3ed8920f7b2
+0,         20,         20,        1,   193696, 4bff0fc871969d17ad1f7391bbd543b2
+0,         21,         21,        1,   194004, 080e2a91fe768fd1725a8400bc6a1331
+0,         22,         22,        1,   194092, 5b9d65275695372e1f6b9c0a23f1ffa0
+0,         23,         23,        1,   195088, a4060bf595c877476a5952b335526d57
+0,         24,         24,        1,   195192, 17b55735834f291ecae399c317007d2c
+0,         25,         25,        1,   194908, fc78d797bd5740f4fec8f3d34bc2ff1b
+0,         26,         26,        1,   194764, d229a9e4d1c782504cad617d2b00802b
+0,         27,         27,        1,   194356, f987a587cb9fdcd04e36d9382c4d9139
+0,         28,         28,        1,   193564, bdfa512e3a0a46aabf289c22dbaee0b9
+0,         29,         29,        1,   193556, 341708f3181ba4b37114d6dbffc65e63
+0,         30,         30,        1,   193956, f97693469ae6f49c3995794d00430c4a
+0,         31,         31,        1,   194776, 970c96fe0f733683ce4f2b478af21b88
+0,         32,         32,        1,   194644, 8a96248e2821040e4d0d6d32d0a4f1a9
+0,         33,         33,        1,   194940, 70a462d8de0da8b5718bf8fb8034fa38
+0,         34,         34,        1,   194732, 2fb3437abbc0a85b6c46e1b1edd922c9
+0,         35,         35,        1,   194772, 0a0f54e266438e1a840247e1af2fb1f1
+0,         36,         36,        1,   194780, c4d516a459523b1c150d8aad1d5e3a6d
+0,         37,         37,        1,   194908, e09db67196513400dd55397a525b73c2
+0,         38,         38,        1,   194148, f3cc9fc8597f8806fbc2a0c13af5b9ba
+0,         39,         39,        1,   194168, 2bb82f80c239984fe7c1091ab6afb332
+0,         40,         40,        1,   193604, 6fd128240c540a0655e8f27ff6a50ee9
+0,         41,         41,        1,   194256, 9b49275154b4538abdebbddffe010105
+0,         42,         42,        1,   193912, 6acff798f9cca91347e36ee1ea86183c
+0,         43,         43,        1,   194136, f24ca78d9b813ab8bfc720bad2682e7b
+0,         44,         44,        1,   193652, d7d927faf59a3b82bd1cce418c13c430
+0,         45,         45,        1,   192960, 8a813fce1d21dd4ad474d06d890a3de5
+0,         46,         46,        1,   192636, 6bbe157ec4f799cfd47a69c5a5cbb0fc
+0,         47,         47,        1,   192580, 1c17bf08a3928533a0036bda1fb08ecb
+0,         48,         48,        1,   192356, a5b34ac48c82e79ff827f72dddbfc6b0
+0,         49,         49,        1,   191912, afceb467ddffd9697c9566c43f2576f9
diff --git a/tests/ref/fate/utvideoenc_rgba_none b/tests/ref/fate/utvideoenc_rgba_none
index 555409fbc9..65f07289d1 100644
--- a/tests/ref/fate/utvideoenc_rgba_none
+++ b/tests/ref/fate/utvideoenc_rgba_none
@@ -1,51 +1,60 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#extradata 0,                              16, 9881f4423f0a3b5da25a0574d3451eef
 #tb 0: 1/25
-0,          0,          0,        1,   301312, 6912d70f7c20db0b5079a99443ffe65c
-0,          1,          1,        1,   301328, 53f1b7d3c2f87ecfe9c9d305771421c5
-0,          2,          2,        1,   301100, 7040f2b50dc10b2565fa899ba007983d
-0,          3,          3,        1,   301164, 2bfe87a43842b21b083c166a5fcae979
-0,          4,          4,        1,   301172, e6535559b9cafb81d0f5312e6982228f
-0,          5,          5,        1,   301196, 899d3b7f4daca28b8d08fd80b9732332
-0,          6,          6,        1,   301204, 9ba8d921eb9345b9b90e5ec690cedbc6
-0,          7,          7,        1,   301304, 89d5758e5a4966d28fa3e6811822c9e6
-0,          8,          8,        1,   301336, b3f805d45e2cba1f3273fdc30e3d3d9c
-0,          9,          9,        1,   301304, 83c9ce5fdf5b20b29fc787ae20c5aa8f
-0,         10,         10,        1,   301204, 2cb730d551309ac307b69fb1e0f0bcbb
-0,         11,         11,        1,   301172, dc5d09bbd04e7b0a20521e67dbbad5f2
-0,         12,         12,        1,   301304, 9e08281b8be73b732b2793f7ffcf3bd4
-0,         13,         13,        1,   301224, 430fa7e9cc87e9292811601473bb03f9
-0,         14,         14,        1,   301128, 32eab97914c2f165e270e42e3c348ea0
-0,         15,         15,        1,   301140, c38233a19e22cc41957cd5a2e13bbca0
-0,         16,         16,        1,   301280, b87e1697217b744404d7998ec3dfac80
-0,         17,         17,        1,   301332, 231912bca1a1d4b54bc7ad392ca437c5
-0,         18,         18,        1,   301452, 30ce746afa3750735872fc9f2680e5b0
-0,         19,         19,        1,   301484, 9a56d219bcfb153190d17c8d89a0c5e3
-0,         20,         20,        1,   301440, c864010df06930259e712f7029a428b4
-0,         21,         21,        1,   301440, 1a4b6bf6557c65d5f088829602440819
-0,         22,         22,        1,   301376, f0ce8402bf00fcde4399da2f4088cd9f
-0,         23,         23,        1,   301320, 27d296bfd2df72c2fcf790098d2129cd
-0,         24,         24,        1,   301388, 0e78fec341c4d137959491e53ab23d92
-0,         25,         25,        1,   301404, 1ec3ca66bd6005cb754c00e346cdd895
-0,         26,         26,        1,   301348, b78ad47e42cfa510ab92d3ffc99371cf
-0,         27,         27,        1,   301492, 558f35abf593bf29a82e6353c75052d2
-0,         28,         28,        1,   301412, f44dae5d90ac9907b8847db0966e8d0b
-0,         29,         29,        1,   301484, 40d87d4e7c51bc2b3dede754c25e1b7e
-0,         30,         30,        1,   301484, 15dda8edd88e97f3db294bce9397e681
-0,         31,         31,        1,   301420, ff1dd12c16b295c83098a6b0135bd951
-0,         32,         32,        1,   301380, a290b1944381632a50fbb680f3f1af9e
-0,         33,         33,        1,   301356, 73d66b8546ac0698975af841dcea7a4c
-0,         34,         34,        1,   301260, 408ab0a50a74e7aaf196a202fd781892
-0,         35,         35,        1,   301412, bde264649818ed761d74281bf92a871e
-0,         36,         36,        1,   301492, c3612f4a8a748ffd6b43ccf24b2db821
-0,         37,         37,        1,   301488, 068ec12d90d1236e367caaf87f14da03
-0,         38,         38,        1,   301556, 000ee987cce47ab701e743d21a6607e6
-0,         39,         39,        1,   301556, 41277aa578fe7367c138a70b532bdf59
-0,         40,         40,        1,   301568, ebf086337aedfac24afc5c17715424d2
-0,         41,         41,        1,   301528, d8f0c31897748dfc761033f237f31f7f
-0,         42,         42,        1,   301604, 50b67f1d579eb8e7c5e0bdc438bf0ee2
-0,         43,         43,        1,   301568, 8297516127bb32a4326d6a859b2d8407
-0,         44,         44,        1,   301552, 1f9e1272e7249467631c4b9bd88bddcf
-0,         45,         45,        1,   301604, d835d90e9fc37583978c053bab5a96ed
-0,         46,         46,        1,   301692, fcb67990a58d25bff135fcc970714c4a
-0,         47,         47,        1,   301700, a4b0a26ed1626a4e46effa7987a32034
-0,         48,         48,        1,   301720, 44d53eab1be166c9bcc4b7b8bc3f80c9
-0,         49,         49,        1,   301704, 34314d5b44ea555b7d52958dec489fde
+#media_type 0: video
+#codec_id 0: utvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   301284, 55e84c6e1f41e48f47dcefb63e3c1efd
+0,          1,          1,        1,   301296, 12dab23dfd2c2d5b48bed2292b876688
+0,          2,          2,        1,   301072, cc2e2889403dcc5d8e36868f07918b9d
+0,          3,          3,        1,   301136, 9813d60e613a3a14e639f9af0a5b1fe7
+0,          4,          4,        1,   301140, 58554bb6749e8bbd9476335ac1cb0076
+0,          5,          5,        1,   301164, 37a249286019761a4a3e498e977f9da1
+0,          6,          6,        1,   301168, f3aa11b419ec6f683ad906e7f7a36342
+0,          7,          7,        1,   301272, f489654640f0e42225815ea9c9681201
+0,          8,          8,        1,   301308, f10eb3c1d0324b59bd25c8bc6556aca0
+0,          9,          9,        1,   301268, 2163aa992afef5210d677953d81adb17
+0,         10,         10,        1,   301168, 684d19d14212615ebffa1748a9c552ed
+0,         11,         11,        1,   301136, a5c47c30d12dbc679ce932a5988b32e5
+0,         12,         12,        1,   301272, 3a51dc37d7e5ecb4a8db948eade2e0fa
+0,         13,         13,        1,   301188, f9f9ed41c233e791e6cd75a34e52edf8
+0,         14,         14,        1,   301096, 63bbfbee6f0fa6745e143dfae40ce7ff
+0,         15,         15,        1,   301108, 1fb3340dd1804d27fb40aea6b073e9ce
+0,         16,         16,        1,   301248, 476d27f29da8e74db696ff38e81743fc
+0,         17,         17,        1,   301300, 84a7f5804a856b7ef640838320634568
+0,         18,         18,        1,   301424, f34006fb55745aac29e265e0362434bf
+0,         19,         19,        1,   301456, d9207e54e261d184ddd02f3706e63103
+0,         20,         20,        1,   301408, 89b5a6804bad85025a6a3d23dc539426
+0,         21,         21,        1,   301404, 5987d22d6e3bf18cd2ebea98a1915f57
+0,         22,         22,        1,   301340, 43ff13bb237a7899ecb04fa7d27e94ab
+0,         23,         23,        1,   301288, 01b3e148ed6b8a0d05ee628fb21fa4a5
+0,         24,         24,        1,   301360, aa7704007e3c437cfcad4fb83a69594a
+0,         25,         25,        1,   301376, 4dea983f0b4a012ba6875aa857d02e91
+0,         26,         26,        1,   301312, e263f1cb0fb19b50751e9a214a4c9d81
+0,         27,         27,        1,   301460, 85ad441664c99c591d6dc427910faa19
+0,         28,         28,        1,   301380, 86ffe8273011763d800dbf6c89942a70
+0,         29,         29,        1,   301448, 500862ea62e1982325d653d4853dcbcd
+0,         30,         30,        1,   301452, 91c4390a805e02d1924bd75946bc0b63
+0,         31,         31,        1,   301388, 4eb3040d65948355c4506ee8e8e041ca
+0,         32,         32,        1,   301348, ece814a764470f1d80973743a7adaa4b
+0,         33,         33,        1,   301324, 2ae0b9af5380c8f98087b90c646af813
+0,         34,         34,        1,   301224, d6a3ba0b543534bd7de9dd82107c468c
+0,         35,         35,        1,   301384, 4f4919c1b2502c6e03ddaa83f4c03f15
+0,         36,         36,        1,   301460, b45189bc89e6583f4426c390622fa1fc
+0,         37,         37,        1,   301456, db0c5e2bc705c825e554c2da54314746
+0,         38,         38,        1,   301520, 8d01037b2dcbba39d4746758fd53323c
+0,         39,         39,        1,   301524, 0a78af44bf49520ae8830060e6011898
+0,         40,         40,        1,   301532, da9032ac97b76ec10f94d74ee878cf41
+0,         41,         41,        1,   301496, 9a22b2a9a3ad897406fc7c3137d41a3b
+0,         42,         42,        1,   301572, a14a80ab416cf4a9a1ec24bfc72602a1
+0,         43,         43,        1,   301532, 71ea5a240540a2e08ced8ad78c1a0676
+0,         44,         44,        1,   301516, fffe101d036ed5afee9b6f86267c2a0c
+0,         45,         45,        1,   301568, 58ea3a6edaee760d98eadb072fb30796
+0,         46,         46,        1,   301660, 9886e77f5df35d8bd164d598d0f87514
+0,         47,         47,        1,   301668, 1f326eb789974fc853e1db57115ef58b
+0,         48,         48,        1,   301684, 08b2eb620b9a7be1bded4744cd4c88db
+0,         49,         49,        1,   301668, bfcce1ce5f7c30230aae9a2d67fc8a70
diff --git a/tests/ref/fate/utvideoenc_yuv420_left b/tests/ref/fate/utvideoenc_yuv420_left
index cec5a28ddc..5a5f0edc91 100644
--- a/tests/ref/fate/utvideoenc_yuv420_left
+++ b/tests/ref/fate/utvideoenc_yuv420_left
@@ -1,51 +1,60 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#extradata 0,                              16, 32fe9f95e57b78773a0fe54c47055a60
 #tb 0: 1/25
-0,          0,          0,        1,    59796, a7136363bc4b9ac663178e5c7f24bae7
-0,          1,          1,        1,    60012, d296cf24776234599e22526598de838c
-0,          2,          2,        1,    61040, e889f81df51b75acf8131de97f9da4e3
-0,          3,          3,        1,    59656, a63c343139b1117260cf6f790ba87968
-0,          4,          4,        1,    58592, e2170222ac38ddc0703f5b537b4beb79
-0,          5,          5,        1,    60248, 0ea350ecf7d8a440b06a60550b5dfa4c
-0,          6,          6,        1,    60480, 792694fa65994c407fd76d06fdbbdc34
-0,          7,          7,        1,    59888, eaef81fd1fa459feb9a3b15817c861a4
-0,          8,          8,        1,    60080, 610a75f3c275ffef75006fb862642993
-0,          9,          9,        1,    60320, 1e1cc244d2ea6b259d06384d1a95cc89
-0,         10,         10,        1,    60300, ddbb7eb36b73cd4f1dc28ded5217952e
-0,         11,         11,        1,    60288, 13f14eed47e1c4fec9f99b47316f82b6
-0,         12,         12,        1,    59172, c7c205489a3b389290f2c56e66bf8ddb
-0,         13,         13,        1,    59664, 81eead1a1fe199e4b66e9bc2f04ac892
-0,         14,         14,        1,    61004, d02e17515451d4259d7179741d208b28
-0,         15,         15,        1,    61088, 4f1c9877caf59dc5ebf5646fe98b3ef5
-0,         16,         16,        1,    60072, 5c4c41d25e9aa0da07da89475275513b
-0,         17,         17,        1,    59876, aeeb1f7a68a23f9fd0503831bfeb2ed1
-0,         18,         18,        1,    59396, 154d2a0717aeb78e47e20bbc9d4aa69a
-0,         19,         19,        1,    59076, 3fdcb2330689aed91d92d515a9eb015a
-0,         20,         20,        1,    58740, 71a054852adaf0da188550fd77ae2069
-0,         21,         21,        1,    58584, 403746356fd559e9bace9bb37557e58e
-0,         22,         22,        1,    58952, 1a3d80d21e00ca5ce8c378da373c65d8
-0,         23,         23,        1,    59696, f66ace9c237d6ee91a4c23a957fde2a1
-0,         24,         24,        1,    60664, 69e6f45d9adf351650648b3fd6fc41b8
-0,         25,         25,        1,    59748, ed9e5524584eb0438f88e12af331009e
-0,         26,         26,        1,    59088, 4325aa8c838b5793364c6ab6ed904d84
-0,         27,         27,        1,    58752, 46a17359055b7ac3285c845af9701c74
-0,         28,         28,        1,    56928, a1fb544e10ee9806c80b5b80d85ef813
-0,         29,         29,        1,    56960, e17a9082644d542b3d589346d3421c51
-0,         30,         30,        1,    58140, f5ae6688db909252b67c3fbe62d783ff
-0,         31,         31,        1,    58980, 71a7053ff0857fa0651e2b8c5626598c
-0,         32,         32,        1,    59548, 60b3d97b4f3893b791894968b7586e99
-0,         33,         33,        1,    61248, ceb9cccd0327ae4c52d8a2cf009d15f7
-0,         34,         34,        1,    60032, ea2ce622422c4efa41069707b231fd52
-0,         35,         35,        1,    59252, b891818e1aba1e29c23fecbf405b03c0
-0,         36,         36,        1,    58568, 0aec4492ddb9608bf217f8b828378680
-0,         37,         37,        1,    58744, 0f218bdc62102270393e7973caa251aa
-0,         38,         38,        1,    58280, 89c93e37590d56c7c32f4955e59b7c54
-0,         39,         39,        1,    58236, 9575ac5076c1c347069b48aa8cb6381f
-0,         40,         40,        1,    57308, e4ede1a1ab344b39399b231fec0cf420
-0,         41,         41,        1,    58964, 9f9c800eddf1fbb093c7ae1320f2ec19
-0,         42,         42,        1,    58800, 9729551ff14d80a3b647bb9688e38cd1
-0,         43,         43,        1,    58716, f0d81b0b287bbe1decd18eac2873166b
-0,         44,         44,        1,    58136, e6aa11b60f8be9cd3d3e9d5c22b326ff
-0,         45,         45,        1,    56772, c3dd97f5d29511103b80edfcf39d2fe3
-0,         46,         46,        1,    55904, ae67aee10ae3b04ac2dc19158bb9c69f
-0,         47,         47,        1,    56344, f3c9c3dd5238c1f29f9204e1efeb6235
-0,         48,         48,        1,    56396, 93b8a198ac7c7118da0b581a50633df9
-0,         49,         49,        1,    55480, b2907ad8da8252dd6403b72eeb49b141
+#media_type 0: video
+#codec_id 0: utvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    59796, dedd9623ead257b98e079c6d0479e5a9
+0,          1,          1,        1,    60012, 73ae403590ffc5962ff86b8dcb44ca50
+0,          2,          2,        1,    61040, 0c6baa05c0b1e458fceefc7b833edd71
+0,          3,          3,        1,    59656, 4d8d13a50efc73f6e6962bb234cc9b89
+0,          4,          4,        1,    58592, f9fd7cc56b1874bbe1a554f6150826ed
+0,          5,          5,        1,    60248, aa4d8d7f3f5eaead893adce9a7745e1c
+0,          6,          6,        1,    60480, 1c972785fefeb3ef6c5899abc75605cc
+0,          7,          7,        1,    59888, 6ab8c8eacedbd28b4341ae642f94cd83
+0,          8,          8,        1,    60080, 76f3eb46afdb2ebf83bf6aadc7277ddb
+0,          9,          9,        1,    60320, 01932335ef686a759b591ea450a7a802
+0,         10,         10,        1,    60300, 7a1bc0880154dfae83d5c4832d2a0ef4
+0,         11,         11,        1,    60288, 532314d7b508eae13ccb54c021c555eb
+0,         12,         12,        1,    59172, 3c307e8f17b27c489f91b609806eeea6
+0,         13,         13,        1,    59664, 070dd129e15219ac626e66279c6e7cdf
+0,         14,         14,        1,    61004, e6d8023b1c501fabb43e19d1b27e332e
+0,         15,         15,        1,    61088, beffd64b5410a5780481945057259830
+0,         16,         16,        1,    60072, df2ac66ec962c106d241a9e860bbf845
+0,         17,         17,        1,    59876, b4cd630af2b10995be0f46f6c2cb372c
+0,         18,         18,        1,    59396, a07393cd44eab3b4c6b2985931d104d7
+0,         19,         19,        1,    59072, 763f7702088fe148009a13b34e8dc0ba
+0,         20,         20,        1,    58740, 4b3c67d62bda1e1d41ae8b2a08ffc6ed
+0,         21,         21,        1,    58584, 7e696d1e2709d4abbf3777cfb891557b
+0,         22,         22,        1,    58952, 748cf0ce599b8f6b79e94fd38bd6f471
+0,         23,         23,        1,    59696, 369d7dd5403834a99af295ba7f7aec15
+0,         24,         24,        1,    60664, a95fc9270a66c79d1777ff6f970fe7cd
+0,         25,         25,        1,    59748, a4ae4093c9778f8f817977c1fe210e47
+0,         26,         26,        1,    59088, 5afd7ec014f73740095d7b442bce839e
+0,         27,         27,        1,    58752, 415bbfa919f86a4d5d39230749099db9
+0,         28,         28,        1,    56928, b6efa0547ff592c28c141f78e28fac1d
+0,         29,         29,        1,    56960, 9d78613a7511878970cd829809f82a77
+0,         30,         30,        1,    58140, fc65008ad890d0ac6b4d31dd87fcb1ba
+0,         31,         31,        1,    58980, 51ca202c4696073bbcc59885d6c91a2d
+0,         32,         32,        1,    59548, 283da1b559f8a1080df5525266c64963
+0,         33,         33,        1,    61248, 2f8a9fe1e7cac20ed716d2408af5faf2
+0,         34,         34,        1,    60032, 16c1b04dfa06e5896deb412536f82868
+0,         35,         35,        1,    59252, b12c42d343355035e3a80f67eeac29ba
+0,         36,         36,        1,    58568, 6958b7ddd22709356136a761bd1e947a
+0,         37,         37,        1,    58744, 544f50bf7a513425e0bde91bbb0c1b9f
+0,         38,         38,        1,    58280, af0f7e218dedcf8b3a61363cb8b66b80
+0,         39,         39,        1,    58236, 85954d2a24834cff1706f64e2937b84f
+0,         40,         40,        1,    57308, 9454333132d25fa15363fed1eadb9c35
+0,         41,         41,        1,    58964, 534643a08971e5bc1ba11a268dcdb0d0
+0,         42,         42,        1,    58800, fd5bc8c4c63f54dc0a062bbb81f464a4
+0,         43,         43,        1,    58716, 5e7a23faa930e4f447100a6cfb38181c
+0,         44,         44,        1,    58136, 5238fd231b1afdf11760e49341ff57cc
+0,         45,         45,        1,    56772, e82b61e4e6cc3088a482372b2f7af61f
+0,         46,         46,        1,    55904, 41e9834f48eafd70fe1d2361e9c84da0
+0,         47,         47,        1,    56344, 8c31cf8d3d938ec44a99de38cc4eaeea
+0,         48,         48,        1,    56396, ebe832913656dbd08f41b90a30360f5b
+0,         49,         49,        1,    55480, 65956930a7aacdaab5c65324fce90392
diff --git a/tests/ref/fate/utvideoenc_yuv420_median b/tests/ref/fate/utvideoenc_yuv420_median
index ddd074b876..c236c4cc09 100644
--- a/tests/ref/fate/utvideoenc_yuv420_median
+++ b/tests/ref/fate/utvideoenc_yuv420_median
@@ -1,51 +1,60 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#extradata 0,                              16, 32fe9f95e57b78773a0fe54c47055a60
 #tb 0: 1/25
-0,          0,          0,        1,    62876, c21650baa099fb2dfd35d4f8ddce16d1
-0,          1,          1,        1,    62832, 034a1996d13c15ee0bf482ddc398aac9
-0,          2,          2,        1,    64076, 1f39fd5fc926195b90a3374682a80eac
-0,          3,          3,        1,    62724, 4007f9193b9e3b19e991497bb73679ab
-0,          4,          4,        1,    61664, 3e86c3a2cd07807433ed7f46ede959ec
-0,          5,          5,        1,    63296, 4e7d334f3713ecc07fca77c945c758b7
-0,          6,          6,        1,    63528, 15b8f92a1d84e77521c539a9a02379ac
-0,          7,          7,        1,    62784, 07ead8344bde0c0a060c3313f39cf92e
-0,          8,          8,        1,    63176, 0a8d9329d7f66008a0d41c6ba4749b09
-0,          9,          9,        1,    63492, eefa6ba63516dd2ff9fb0a4e81169977
-0,         10,         10,        1,    63328, 991fd8fcb392774d11b1766cc1dbe0d7
-0,         11,         11,        1,    63328, e2745a89e96a7f0c641fa25a6ed2da83
-0,         12,         12,        1,    62384, 2dd300b64a32ae2d6fb65e88128e5147
-0,         13,         13,        1,    62944, 076331793373fe43cd213ae56fc19e0f
-0,         14,         14,        1,    63932, 37b6b50e7219ba0e593e4ce1de02a864
-0,         15,         15,        1,    64020, ed66d034f605621266054a54714feec9
-0,         16,         16,        1,    62940, fb6a921a8551db3d33b0a24e7e9a3ced
-0,         17,         17,        1,    63052, abac96a9e0128efd4362ec28e66464d2
-0,         18,         18,        1,    62408, 0351d4c9579779dbb398f68f0e4e02e4
-0,         19,         19,        1,    62148, b4f7ed147a1326cf5adae50af6db56ca
-0,         20,         20,        1,    61692, 48a9cdf3d4600768feca7616614dc46d
-0,         21,         21,        1,    61704, d8e6c2daa6ae50caf7d5ee9324812389
-0,         22,         22,        1,    61964, 3983f0bf566d206cde013982722d4453
-0,         23,         23,        1,    62812, b12b44c4df634f608380e2bfb26b717d
-0,         24,         24,        1,    63480, 30ad52da50e0d4f1fc811d24a01e777b
-0,         25,         25,        1,    62708, 2827bd4dec0fa603eaf92bae8c4deb72
-0,         26,         26,        1,    62252, fd7c3a5bcaf83701dd7f2da225f3ce69
-0,         27,         27,        1,    61752, ea9740f3a5f52baaa923e245f649f7c7
-0,         28,         28,        1,    60248, cf4a142fc28437cca11ad1d127a2948f
-0,         29,         29,        1,    60232, 6cd0b708ec41cd10357f8944ae8288bd
-0,         30,         30,        1,    61240, c4a44f902a295f3a6e85276087adcbc0
-0,         31,         31,        1,    62228, a36d5eafa03b784f35303b131ac5d3a0
-0,         32,         32,        1,    62636, e09ca8f58690f991e1ce3986c2864924
-0,         33,         33,        1,    63840, 830de5062cb9c8be8844118c7db4bcef
-0,         34,         34,        1,    62996, e008d4add85b595840a2773d01465147
-0,         35,         35,        1,    62480, 04a38e7c231697aa97e5a401d4329105
-0,         36,         36,        1,    61744, 4cb276703869f45a6ab798e53e615fc0
-0,         37,         37,        1,    62012, dfca9b52389b01d750a4b94d10a8e2e0
-0,         38,         38,        1,    61748, bf2ec90514c268440313fecf68e2f41f
-0,         39,         39,        1,    61688, 99f1c565dc76bde773ccb91b8dbb3860
-0,         40,         40,        1,    60528, 7b66ad4e019964ead8ed1a9eadad9721
-0,         41,         41,        1,    62248, 795e2a8351ac78bc482e341be3af98bb
-0,         42,         42,        1,    61832, d7fc01097c5ec0247d20727aec2adab6
-0,         43,         43,        1,    61688, 4492ffefcaed530fce3221f4bb61ef80
-0,         44,         44,        1,    61216, d9a91c3007686b7166f297bc1dddb9a9
-0,         45,         45,        1,    60192, 7c808c46b376c49fa3d5bd5ba97fce1c
-0,         46,         46,        1,    59388, 6d2a2a72d14ff5c800295de6b2e23465
-0,         47,         47,        1,    59620, 5c1aa124bb6ffb9cd33a6430bf07ea9f
-0,         48,         48,        1,    59584, efc1012cca50e509856e406622d760fe
-0,         49,         49,        1,    58800, fa8563a0bc6022f8f5c5fc70ce0d46f3
+#media_type 0: video
+#codec_id 0: utvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    62876, 5e2a5276e10b86511fb8101733bc4795
+0,          1,          1,        1,    62832, fb1e0a7b2bdbcbada9892e3db7be7821
+0,          2,          2,        1,    64076, e0d2af56a9c80e3e8096cf246260f3ca
+0,          3,          3,        1,    62724, bceca3c261206308030e2d7ad45e7599
+0,          4,          4,        1,    61664, ca8c005ba88cf1c97d49fe25f4830383
+0,          5,          5,        1,    63296, 7967f2592369b10bcd3ecac43413daeb
+0,          6,          6,        1,    63528, 5374d62636243ba8f3fd1d7f31b632a8
+0,          7,          7,        1,    62784, 8c6b4791881433bfa65732ecb5b16866
+0,          8,          8,        1,    63176, 5b63d41ddcb0ab291a0d435d5f581ee8
+0,          9,          9,        1,    63492, e0b3ecdb25bda555ab9b9dfd98179653
+0,         10,         10,        1,    63328, 3dd8397b620d84ca3e7a78f9c8d350d3
+0,         11,         11,        1,    63328, 1af5a1dddff26660e0d7a32e24bd9276
+0,         12,         12,        1,    62384, 1ff3c26a6bac33d80b63c0f8595201ea
+0,         13,         13,        1,    62944, 9c02a60be982847673da55180ef2c18d
+0,         14,         14,        1,    63932, ad7a22cf139c6e4ab8c5e53d9db3e68e
+0,         15,         15,        1,    64020, 53c8612a310d938be1080de4eebb18ba
+0,         16,         16,        1,    62940, bb481e1e906a4fdfdafa1cc15ebcbb5c
+0,         17,         17,        1,    63052, 0d97caa8514b4344c0ad8115e10b48c1
+0,         18,         18,        1,    62404, 0b05bb86b7bb1deaa3a1f0105adb823a
+0,         19,         19,        1,    62148, e70896d0e240f44275ca7d34e4de1b90
+0,         20,         20,        1,    61692, 5811d0049807b3e30bb165c106f121f6
+0,         21,         21,        1,    61704, 7b0714038c38fbaba0f30077e1fff859
+0,         22,         22,        1,    61964, 01e0aa600de8039bcfa29f4855861f72
+0,         23,         23,        1,    62812, a9374a4f24248363aa1011d48f352bea
+0,         24,         24,        1,    63480, 9837389866f467888b58d869c6c629c3
+0,         25,         25,        1,    62708, e463497b45db8c805fe8ef6903b1ce9c
+0,         26,         26,        1,    62252, 4a386a10f454c4a16314ce824348ccfc
+0,         27,         27,        1,    61752, ec17bfb853b0347ed5851adec930ac88
+0,         28,         28,        1,    60248, 2dce5d2345acaebe8d2ffe68248db51b
+0,         29,         29,        1,    60232, 69e26cd6734e29179a152271d31ec4d9
+0,         30,         30,        1,    61240, 4eb9641a3a7f96a1db6291ec1208b243
+0,         31,         31,        1,    62228, 6ea9280e5c470a1843e2af7b086270b0
+0,         32,         32,        1,    62636, cab91136cea5c672b970dbc9e1491ea1
+0,         33,         33,        1,    63840, 25dd643075412e90e16fd6732a7cb218
+0,         34,         34,        1,    62996, 173c292ebe568e845835e63ae98064f7
+0,         35,         35,        1,    62476, 4bdc99c66bcd82238d84f478b2be6d6d
+0,         36,         36,        1,    61744, fb3161857f91255e2fa3efff1fadfd4e
+0,         37,         37,        1,    62012, a7f45644fba6f9d3088800a18a78fe93
+0,         38,         38,        1,    61748, 3c606f8fc6f7535651f1203a0d390a1d
+0,         39,         39,        1,    61688, 636f94c06a5af282026aa82010362fd6
+0,         40,         40,        1,    60528, 157ff55e69660cb272c94ef1bf56f510
+0,         41,         41,        1,    62248, 1001e1aa4249cdc55bfc1f7daea931ad
+0,         42,         42,        1,    61832, 9435239c2ebe6bfee404c002c1f1a683
+0,         43,         43,        1,    61688, 6bdc7de71e539f50ddc7961e7e56e822
+0,         44,         44,        1,    61216, adf9cb20324a6ea37840aa96cc57f67f
+0,         45,         45,        1,    60192, 4d170c4d05a84440c9dbf60902902d70
+0,         46,         46,        1,    59388, f292adfcec971be4dd87e68da7edc662
+0,         47,         47,        1,    59620, ad02e16282fc53a395a3b61c077f56ca
+0,         48,         48,        1,    59584, e9cad9e33a2d9508ab4feabfc9545738
+0,         49,         49,        1,    58800, 83eed6619d5fa154a30128761561ff90
diff --git a/tests/ref/fate/utvideoenc_yuv420_none b/tests/ref/fate/utvideoenc_yuv420_none
index 555eee2ea1..f1606b3370 100644
--- a/tests/ref/fate/utvideoenc_yuv420_none
+++ b/tests/ref/fate/utvideoenc_yuv420_none
@@ -1,51 +1,60 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#extradata 0,                              16, 32fe9f95e57b78773a0fe54c47055a60
 #tb 0: 1/25
-0,          0,          0,        1,   144508, 83af3948090ebb44a0091815e4edc61e
-0,          1,          1,        1,   144496, 950742e357ee489fcda4f783b8df3b4c
-0,          2,          2,        1,   144376, 4b818cf0a50e9338fea26101073e445e
-0,          3,          3,        1,   144420, 0335c3b97dca65e9118a12e3cceb1e24
-0,          4,          4,        1,   144588, a9f7e6cb2d9129d97342c4eb67349aa8
-0,          5,          5,        1,   144444, b956115c6bab18a01594103bcb2ba9e0
-0,          6,          6,        1,   144408, 81761b3135ab3f4d5efd6f2790b6b70f
-0,          7,          7,        1,   144408, 566c53ee4126e31b78f6572292f97f55
-0,          8,          8,        1,   144320, 0c24c346a65cb945f8d804817f67f42e
-0,          9,          9,        1,   144316, 7920264636a6933c776b41567181f2d9
-0,         10,         10,        1,   144248, c1c1b10356f27fca35e03fdc67dd1638
-0,         11,         11,        1,   144168, 5a590c4f603aaddd01d4efbf5571426e
-0,         12,         12,        1,   144452, 10459aa8f48f7e8e0ebc03f15f795acd
-0,         13,         13,        1,   144312, 436658612212e706c4ed9f4bdcf45f38
-0,         14,         14,        1,   144252, 7a5612c485c501669e27039c435ac5d3
-0,         15,         15,        1,   144232, 81018c3b49d376d69af71a4ee2c910a9
-0,         16,         16,        1,   144312, 4280abfc59ee6cfddbf45474a42c5cd5
-0,         17,         17,        1,   144348, 0a48ba8ad15f7431830feeb2ac0f2118
-0,         18,         18,        1,   144356, 6c8f0a396195a840a225aca3ada427ff
-0,         19,         19,        1,   144360, 4a0a959d9c3ebb293d94ef37b4f7f19e
-0,         20,         20,        1,   144380, e61b564126a2d8255a7457b70af74514
-0,         21,         21,        1,   144416, fe434ae640e63fb774d6e7c864d02e49
-0,         22,         22,        1,   144344, 9e106257c640b66ca31919668c4da334
-0,         23,         23,        1,   144376, c0cdd6b2aa1bf4d89c82b602f09fa2e0
-0,         24,         24,        1,   144376, 8be60289a2a4c22355b3bd43f2f85fe4
-0,         25,         25,        1,   144320, 124127b8fcacfa5c5e0ee7f0324da7a0
-0,         26,         26,        1,   144408, a5639aedbdbfff34f36dda8872992cde
-0,         27,         27,        1,   144516, fbe3cf39fd764e6a3d05c63be35a4d58
-0,         28,         28,        1,   144676, 6ee82422712e11740d7b003eab69d5bd
-0,         29,         29,        1,   144648, e5f446835709b1baaca14af3aa6fbbb7
-0,         30,         30,        1,   144496, 3b23fb07c528ad824e9c8f10143ae06a
-0,         31,         31,        1,   144496, 4e4dddd0c72f9d3a555b8d32ae82c10e
-0,         32,         32,        1,   144372, 1dfe88fbe0c1193bb04a06840dfab155
-0,         33,         33,        1,   144168, e03b3d67fcbbde71c6985955feebabfe
-0,         34,         34,        1,   144180, 5d5a24b49cff98cbb85f69b547b43e87
-0,         35,         35,        1,   144348, bb9172de1a4c7a00fe80bb673484781b
-0,         36,         36,        1,   144544, 7824a6c4bb8b919306904be6f67f2736
-0,         37,         37,        1,   144516, 456c3884817909b4cca38f8138c079d4
-0,         38,         38,        1,   144532, 0e63cf833a33a9fac9e5969342817fc2
-0,         39,         39,        1,   144452, 9c0155cdd0a5ae42b79475ab47ba87f7
-0,         40,         40,        1,   144532, eefee218d181e74a80a1d2ec27932e91
-0,         41,         41,        1,   144348, fbd4fd20565350dd927005af590912ff
-0,         42,         42,        1,   144332, eac5c49230fb807c81e8a0c9e9721697
-0,         43,         43,        1,   144428, 9ee3fe8be6c4477b0d8ff1d91049634e
-0,         44,         44,        1,   144480, b58fb19549e4497e82491a26d67c1567
-0,         45,         45,        1,   144596, 1c8059bf14f4df3da9db6b89f87a52b9
-0,         46,         46,        1,   144592, db8a5750beb049ea835895d23e924cab
-0,         47,         47,        1,   144512, 58c69889edb9bdab219d698f6a44d2cf
-0,         48,         48,        1,   144468, 3da8e5ae1f1ff9da72abd3d2ac87a7b9
-0,         49,         49,        1,   144500, 4f80ccdb6f9549190ed72407dd7af2c1
+#media_type 0: video
+#codec_id 0: utvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   144508, 808a5bf7f8647095ed629c18bcd78c8e
+0,          1,          1,        1,   144496, 88d91b5aebecb8e3553dc5d25c11f663
+0,          2,          2,        1,   144376, 979d1dcc8eb2ead071545e4098453ab5
+0,          3,          3,        1,   144420, ce1cca3a2399408b1fd3dc28f2f908ff
+0,          4,          4,        1,   144588, f028271d61bc3f7f29eb670b2dc2227d
+0,          5,          5,        1,   144444, 4caecb43ab4f98af4bc2d8fc5737165e
+0,          6,          6,        1,   144408, 78313642af9937e83d4206cf69423f88
+0,          7,          7,        1,   144408, 02afd3b87e1f4a88236c23613d0bb138
+0,          8,          8,        1,   144316, 677dc12dbff90c9f25bc5b1bcfae0220
+0,          9,          9,        1,   144316, 6dd8385746a3a982dfa7683f7b206d86
+0,         10,         10,        1,   144248, 0611dfc4b3ced7c52b5d014d114e3052
+0,         11,         11,        1,   144168, 7d6d56be15d67c0ef736909080bf6d20
+0,         12,         12,        1,   144452, 3a30b5305b301cd1cedffc44867659a7
+0,         13,         13,        1,   144312, b4f1329701c8284f8907e82e73dc225f
+0,         14,         14,        1,   144252, ab4ee9e419d38dca74a22475ffed6b4f
+0,         15,         15,        1,   144232, f486e7e950c8e45b881755fbee9ca967
+0,         16,         16,        1,   144312, aa8aa1826a1da8087567c13914fb1f79
+0,         17,         17,        1,   144348, 9c9ce3c86308dcda388645c0ab3b3f37
+0,         18,         18,        1,   144356, d33fd7c7f23e851a17fd0f0f768db726
+0,         19,         19,        1,   144360, a63e8e41686800d60566b19a9f2783fc
+0,         20,         20,        1,   144376, c9b694f8df1cb44b42aa902392a18a87
+0,         21,         21,        1,   144416, 5624b1dc448e6e6bee47432df8c2703d
+0,         22,         22,        1,   144340, 079128a1838e8fcb718cf4280560e40f
+0,         23,         23,        1,   144376, bb67943fd9d91d6a8af9e4b2da2ef52b
+0,         24,         24,        1,   144376, b91459d03569354faca2237ffbbdf0a5
+0,         25,         25,        1,   144320, 7a8863d8786eee1b82c7469d79d03156
+0,         26,         26,        1,   144408, 13873c8e8a66d12609864bc2a4127ddb
+0,         27,         27,        1,   144516, 09f74425c309920aca58488e8bf9845f
+0,         28,         28,        1,   144676, 12441f9a3d8215793b6b38c6e647d10d
+0,         29,         29,        1,   144648, 6895219f14106bbc780c654fb9835abc
+0,         30,         30,        1,   144488, 0738dc5c283869272bf28bd6a3107808
+0,         31,         31,        1,   144492, 375f99622b54462ef886e66f96998ef3
+0,         32,         32,        1,   144372, effb150140b4d84a3ab6a277992b9da3
+0,         33,         33,        1,   144168, 09677824ee8b6fff8391d6d8fef49459
+0,         34,         34,        1,   144180, ae4b4a60e2fe35f308201a3ace709f2e
+0,         35,         35,        1,   144348, 3f8c8eacfbaee2560059c687a037af7a
+0,         36,         36,        1,   144544, df5dc52fb501151cf8d0bd997f6b3e17
+0,         37,         37,        1,   144516, a9fdb6284f9b3b6d3cb59ad58897cd82
+0,         38,         38,        1,   144528, b4e82d29344b4ef0d34bf37e36f08cdf
+0,         39,         39,        1,   144452, 88516ddef80594babbda3801710bf89b
+0,         40,         40,        1,   144532, d9937a226562e3e02d6a6b134f04043a
+0,         41,         41,        1,   144348, d8c09a3ce3ff01b1620205d54cf28d39
+0,         42,         42,        1,   144332, 5d79f1d677fe98e21b15821f8b3b5754
+0,         43,         43,        1,   144428, c9717bd43d9ddb4cee7946e725fd54e4
+0,         44,         44,        1,   144476, 18db82ef876bc80d777f801107c45c18
+0,         45,         45,        1,   144596, c62c01892d002dbb75a2020b9d0a1137
+0,         46,         46,        1,   144592, 9faf6283b8753002005c5a04ae345d5b
+0,         47,         47,        1,   144512, 8c25deaf7a77b0991861a5c62b4fe5d1
+0,         48,         48,        1,   144468, dcaaa1058c59946691d087c9941ac956
+0,         49,         49,        1,   144500, b36206851f8613bf9cae5296d85eb1c1
diff --git a/tests/ref/fate/utvideoenc_yuv422_left b/tests/ref/fate/utvideoenc_yuv422_left
index d9afc2cdab..35819745dd 100644
--- a/tests/ref/fate/utvideoenc_yuv422_left
+++ b/tests/ref/fate/utvideoenc_yuv422_left
@@ -1,51 +1,60 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#extradata 0,                              16, 7d613a4daaadf19228d42c98deb26024
 #tb 0: 1/25
-0,          0,          0,        1,    91788, e14e576f1f9abd095f13ceca627adb59
-0,          1,          1,        1,    92140, 4b7db11c2d35fa91ff1b6f65c184e3fa
-0,          2,          2,        1,    93268, 6ef5cb83a4db2afbf14467cbc4b6c4f7
-0,          3,          3,        1,    91612, f08ae129a2867a08770bdb61381bf366
-0,          4,          4,        1,    90456, ed3edabe09b9f6cfbf452a08dafa556d
-0,          5,          5,        1,    92180, a0760e91b3af27a7c1bb0264f128ca50
-0,          6,          6,        1,    92200, 2fda4c87dfa34206173e852b67841406
-0,          7,          7,        1,    91872, 944e7c88c7ebeae9e1efac859ea4fe7d
-0,          8,          8,        1,    91952, 34112ec99382b80c397d26cef93573c7
-0,          9,          9,        1,    92312, 63698686348ccd80cc920e9e73a195aa
-0,         10,         10,        1,    92308, 6a675d6678b7b78fac6375d44f325d06
-0,         11,         11,        1,    92272, bc1401e0acd3864ad30711ca4b61578d
-0,         12,         12,        1,    90920, cd7ecda23a4f312abe71bd3fc28af3e7
-0,         13,         13,        1,    91612, 91ebce52e2594296349476f3bf6a6408
-0,         14,         14,        1,    93112, 34be111d02130ed7389c0c62768041de
-0,         15,         15,        1,    93140, e1b440cad63dbf8ff034f424cd1194cc
-0,         16,         16,        1,    92080, 94181fde8563af0b6810f778f6b1d92b
-0,         17,         17,        1,    91816, ed0997f9b341fc3ab6a8c5d9a4067bd2
-0,         18,         18,        1,    91204, d833b0c3b3dfe60b079b746c4c3aed7f
-0,         19,         19,        1,    90880, 0d4702abb70d7cbc8843a96e3a74117a
-0,         20,         20,        1,    90408, 409860b79fe10ffbffd581c19445fa91
-0,         21,         21,        1,    90280, 5360fa4f1afd8c2c55cf33675a928a14
-0,         22,         22,        1,    90808, fe2ca67d315fb1d8806ee04470d06378
-0,         23,         23,        1,    91584, 84168a6fe20ee00ddd9f54ce8f1e1810
-0,         24,         24,        1,    92684, 6fb3d7193d3bb5400c449717358827e0
-0,         25,         25,        1,    91580, acd2aa86dbae6e133183e5bf2ca389a3
-0,         26,         26,        1,    90928, cc0df9c8e00df5985e39ae486eb59eff
-0,         27,         27,        1,    90536, 8f9d294190c03435f3cee266cca2a31a
-0,         28,         28,        1,    88364, ae9564ad4eb3c1fc03e4befb4b1e719e
-0,         29,         29,        1,    88404, 745a16947203cd7017900b137fca70eb
-0,         30,         30,        1,    89844, 1b7e75be9edb25ffe91c54e270eb8f46
-0,         31,         31,        1,    90752, 9ff03fa3b28f2c84a4da41779e0a2aa4
-0,         32,         32,        1,    91320, 409ed4c3eced8793760505cf8095f51a
-0,         33,         33,        1,    93204, 70865d89c930919474500befe0e2ec3f
-0,         34,         34,        1,    92036, 7388d12a6954b9870749ab6a5f05815f
-0,         35,         35,        1,    91144, b47bfdaec4c00177a9258a03e864400f
-0,         36,         36,        1,    90368, 418df89a063f66cfbb1f806d68aca6a2
-0,         37,         37,        1,    90628, 3f90314ab7311ad0f4bd4808d62a1e80
-0,         38,         38,        1,    89836, 414f90d0efc65b993f6e1fc8f2c1d860
-0,         39,         39,        1,    89792, a07cf9fc580ffee5d61c241dce116ae6
-0,         40,         40,        1,    88896, 3d583229da6b7455b6876843b3b747c7
-0,         41,         41,        1,    90572, cbef36619e7c8e62fc21a735c7701514
-0,         42,         42,        1,    90544, 144816eaeaf0412fca6bf40e6f3e6d3f
-0,         43,         43,        1,    90416, 76f0d9dd1f4fd00b68223dd7c6024b2e
-0,         44,         44,        1,    89788, ce0b66e45ed3c50124680f84614c5ac0
-0,         45,         45,        1,    88120, 5d59770b187109e2e6824f5cb42b9b73
-0,         46,         46,        1,    87164, bb52ce20f4a21ef82a2cc3316ba69e1c
-0,         47,         47,        1,    87632, 87f44c3ecebd09b2ffa94d8ace01f3f3
-0,         48,         48,        1,    87700, cbaed2ac667bdc9aa17ffc68ebaea790
-0,         49,         49,        1,    86624, 21797bc69a89976f9b4b552603a63267
+#media_type 0: video
+#codec_id 0: utvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    91788, 2b29ead6a04f08e49c25cd89fe0c0e46
+0,          1,          1,        1,    92140, 011a3c92a1a6659b26db7de3c74cda41
+0,          2,          2,        1,    93268, 69ffde2375949c0124e3f6b46a8bdf1f
+0,          3,          3,        1,    91612, a34b1bbbc245a315906085aab9dca284
+0,          4,          4,        1,    90456, 7a1034d99c06d9163116e05dc88de0b8
+0,          5,          5,        1,    92180, cfe398abada0424f7ceab29426d27711
+0,          6,          6,        1,    92200, 1335b1706618dc85d64c3d47a2bf9eab
+0,          7,          7,        1,    91872, c37958d720e011c337bf87543e635791
+0,          8,          8,        1,    91952, abdb95aa1c20d4724ec442d876b3ef82
+0,          9,          9,        1,    92312, b346e210e76f3ac350c9026d0421c1a6
+0,         10,         10,        1,    92308, 9b36f5e0085b3e4ef50e6a00aa8e9dd3
+0,         11,         11,        1,    92272, 4880487b34e836fa975fc0c857cae271
+0,         12,         12,        1,    90920, 924850fe3b48417160854234a60ee452
+0,         13,         13,        1,    91612, 34e4e1b6114bd2eef0ac26b4c3a0be5d
+0,         14,         14,        1,    93112, 34e98cc2bc42b0cdd12f3b5a8a062a14
+0,         15,         15,        1,    93140, a6163289cc8450b55f82f13a8a372259
+0,         16,         16,        1,    92080, 143e999836a6ebc144c707dd77ce3d6b
+0,         17,         17,        1,    91816, 0fcb2542dd7e281b098f2a4a76220286
+0,         18,         18,        1,    91204, fb9f7126d5c37bf48ae3cb7702fd27c5
+0,         19,         19,        1,    90880, d618dad8a7c6c03091a8d72f05ff06a8
+0,         20,         20,        1,    90408, e9de31ec047f7ea8aa2b781c1b8ac0cf
+0,         21,         21,        1,    90280, 742f6b57e5014c85bf4ce63c3973ceb5
+0,         22,         22,        1,    90808, 0bde9c976e491dbca37762af1569f05f
+0,         23,         23,        1,    91584, f69c98911e98cf1b35fee8c7a17784d6
+0,         24,         24,        1,    92684, 813535f3fddf27ed41475a4a16153407
+0,         25,         25,        1,    91580, 99e840b30697c491a42381278b74060f
+0,         26,         26,        1,    90928, 1bb430db061f5ea70f97b0808f6fd0c6
+0,         27,         27,        1,    90532, 8669ea68164d3f9f6e234c24ed4ba6dd
+0,         28,         28,        1,    88364, 65c5175d6c6bab9f205ae9b8d52931e8
+0,         29,         29,        1,    88404, cb375b083b2d415d11111b7d0b65d499
+0,         30,         30,        1,    89844, 6b29caf5d67711e4a68f9dc852c89607
+0,         31,         31,        1,    90752, d1d424a5f93970e1bca8e6cc558359bc
+0,         32,         32,        1,    91320, 726a9a5fb90b88961f7392028c83cff3
+0,         33,         33,        1,    93204, 0ed7b1760d190df0c84f62f7ee3050c9
+0,         34,         34,        1,    92036, ff3ad470d5195aa00e364f180961b852
+0,         35,         35,        1,    91144, 8a7050fa18088c6dbbf148d7ae047a86
+0,         36,         36,        1,    90368, 0c0252b21de41b75141085a05cdfd462
+0,         37,         37,        1,    90628, 143d503a9e2ca9f5e95ba12e2237a88a
+0,         38,         38,        1,    89836, 93fe7527a5681c819c6052b87bca8bb9
+0,         39,         39,        1,    89792, 6c353b6ef1cc14ebdbb2de24faabcfcb
+0,         40,         40,        1,    88896, ed7e33a68674399293203e4fef8db0f6
+0,         41,         41,        1,    90572, d70967dd3d556559773980a776836423
+0,         42,         42,        1,    90544, ee7727dd0f3833728b3c557e9775f1ef
+0,         43,         43,        1,    90416, 0e4b028286b5b1f7fb902821dd015951
+0,         44,         44,        1,    89788, a4e5d8715ae485f875b80ebcb150692e
+0,         45,         45,        1,    88120, 9dce5bc1420f0e67abed693f75023d43
+0,         46,         46,        1,    87164, 89374077f87c8d3639743e17f8583307
+0,         47,         47,        1,    87632, 6ebcb11b9c0263aa82ca4797acd078ff
+0,         48,         48,        1,    87696, 9941fc859d6b9e4c057c2a4b40faff98
+0,         49,         49,        1,    86624, a2a157ab69d82eda4f8ab502de62ca55
diff --git a/tests/ref/fate/utvideoenc_yuv422_median b/tests/ref/fate/utvideoenc_yuv422_median
index e1c8fcdfe8..b3f4296bc0 100644
--- a/tests/ref/fate/utvideoenc_yuv422_median
+++ b/tests/ref/fate/utvideoenc_yuv422_median
@@ -1,51 +1,60 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#extradata 0,                              16, 7d613a4daaadf19228d42c98deb26024
 #tb 0: 1/25
-0,          0,          0,        1,    89732, 698174b0d0d68e98774363ca7926f6e1
-0,          1,          1,        1,    89652, f0789b7c32ef44207dfc5a454bb5ccee
-0,          2,          2,        1,    90868, 6df1dcb1957efca736e88adfbad8557b
-0,          3,          3,        1,    89520, 9cee942e7f03a97cd2cdf8cea429fb31
-0,          4,          4,        1,    88508, 798f4e8c00f4d949882cdc3f89be0bf6
-0,          5,          5,        1,    90140, 70fc5f4f240b0ca30332b0f37632d1cb
-0,          6,          6,        1,    90176, 1c2747fc56d5eb70ff8f4f361cb70610
-0,          7,          7,        1,    89392, bd8764124753f784d5984cd829c8ca90
-0,          8,          8,        1,    89848, 1dc30ed23a8634f6b2661ac8583fe8cc
-0,          9,          9,        1,    90356, 0910ae7c3a6924031453f458009354fa
-0,         10,         10,        1,    89984, 61da06bf1ed667b54ee749c69ab031eb
-0,         11,         11,        1,    90012, 11d05491f86014f19b34cab3111a95d2
-0,         12,         12,        1,    89072, 4598f16727472daa1710c39b4840efdc
-0,         13,         13,        1,    89776, ed6c0da32acf621e9f79b76a3afaa280
-0,         14,         14,        1,    90680, 05f3a9232bc14ca8721ef04243177a20
-0,         15,         15,        1,    90852, e4deff113ea503656efecb227f6b702a
-0,         16,         16,        1,    89844, 5ee70abd6f1d2e5c55117b28840327e6
-0,         17,         17,        1,    89852, 6721997ae0563009adbdeed31f437ce4
-0,         18,         18,        1,    89144, 8a40f0af74afb4ff05e6242a41c7789f
-0,         19,         19,        1,    88880, 8824c3526629a30fbf9a53abc448844c
-0,         20,         20,        1,    88344, 18a656127a16bb50113bb2e98b11a26d
-0,         21,         21,        1,    88464, 19a3b9510e6347a7782f695b48736991
-0,         22,         22,        1,    88588, e3d22d15b4812c26214db546ce17c7dd
-0,         23,         23,        1,    89720, afe800faa0188dff0899cd83af6301d6
-0,         24,         24,        1,    90216, a9d9ece70c978c595e1d724a0f644f56
-0,         25,         25,        1,    89456, 9bf3e8f87f072d55095acc9351a09f45
-0,         26,         26,        1,    88992, 40d1b1858f1ba0bebd9eb9f5263cda9d
-0,         27,         27,        1,    88632, 1df39644ac99bccab4c6bd72498284c4
-0,         28,         28,        1,    87048, 9983cd95307c1bab653170ba2aecdc55
-0,         29,         29,        1,    87120, 006b48403af94a0bc5121900b48af9c1
-0,         30,         30,        1,    88044, 652d17c8805de56cd83824d99888822e
-0,         31,         31,        1,    89016, 652a971973d088b5098a06b216137151
-0,         32,         32,        1,    89324, 2775a087358ead0281ce188f4006050d
-0,         33,         33,        1,    90328, 564e119bdf5f3c780c0613990ca487db
-0,         34,         34,        1,    89684, 1f5fb4ec22234aee771791b71881b630
-0,         35,         35,        1,    89216, dde7a003cfe5b47f9be407f28dcdfb3f
-0,         36,         36,        1,    88644, 1fed2d2f72ec9488181a06606aaf4e12
-0,         37,         37,        1,    89000, 8f916bee0ad8efe8d3572e4af4bf4b8e
-0,         38,         38,        1,    88628, d802fb5634d3acd72a96bd99c22dd566
-0,         39,         39,        1,    88448, a4d438df349f1f2ff1620fb965d08513
-0,         40,         40,        1,    87332, 18a8527dcfc5c1fa8ae7aa8a83781d2d
-0,         41,         41,        1,    88856, 63179f19a5d60d3ea9fa14c00ca5c493
-0,         42,         42,        1,    88556, 92b568c24ed53e823b54fa6c064d16ac
-0,         43,         43,        1,    88380, c204b982e3ab7fc1aa6b1b132c4ae462
-0,         44,         44,        1,    87888, 45f1cd55d454a0b611b047b6e5172b30
-0,         45,         45,        1,    86876, c668ac58b31feb51902b78fdfcdc1064
-0,         46,         46,        1,    86272, 24a94950de7065cb236e52502c9c8e67
-0,         47,         47,        1,    86388, 51dad738cd8896616694a4fb52b47fbd
-0,         48,         48,        1,    86188, dc6709cd2722eb8dd927f405c6a30915
-0,         49,         49,        1,    85244, 68f40045a250ab0799a7325aa16ec80c
+#media_type 0: video
+#codec_id 0: utvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    89732, c8dbbbed6c59cff00c7cead39cadd7d4
+0,          1,          1,        1,    89652, f1c995c2bcb13f9de97fd8c5da2637a1
+0,          2,          2,        1,    90868, e126298a564eec5e60518fca891bfd43
+0,          3,          3,        1,    89520, 8694da46ab5672f890d57c741d69d830
+0,          4,          4,        1,    88508, 0e0ae55ba0bcdf6618b7cffae7242d71
+0,          5,          5,        1,    90140, ef59eccdbf3b699a2eb857c6da044fa7
+0,          6,          6,        1,    90176, 95509ddb5a5169900714eaa2aac59703
+0,          7,          7,        1,    89392, 25782fbbf8552e7682cded46b418096b
+0,          8,          8,        1,    89848, 46cbfe84ab2c46f045d23fd798dc64b2
+0,          9,          9,        1,    90356, 41cdc2e6dec30172ecccf1aca7b7ab0e
+0,         10,         10,        1,    89984, 469be246c63ba4743d9c5ea91c4b849a
+0,         11,         11,        1,    90012, 100bc595e92ca6d73525b2e20eaa7d25
+0,         12,         12,        1,    89072, a355e131c150b82d3620fe54ab53b423
+0,         13,         13,        1,    89776, 67e7c8a187157c1827a2e529865ab941
+0,         14,         14,        1,    90676, 7fa956927033cab7c0ae9a0a86d57b59
+0,         15,         15,        1,    90852, d507b175068e9d6c729530b436824436
+0,         16,         16,        1,    89844, ae6b71fe15285387229734fdaaad86d0
+0,         17,         17,        1,    89852, 6ced7f1bc56299e5c7b5169a1e62f4e6
+0,         18,         18,        1,    89144, 09a950b254eb5e7ac061e30a14ef98e8
+0,         19,         19,        1,    88880, acf28ad860b52fb502d22c063689a9d8
+0,         20,         20,        1,    88344, 682436aa7aeffa2cd5daa6adf037eb88
+0,         21,         21,        1,    88464, bbbefa2630e4e5165c9db638ceb730b8
+0,         22,         22,        1,    88588, 71d0e9178794e0ebf414bdd1c532d4fd
+0,         23,         23,        1,    89720, f39171093709c90dae1ecc56e1a0d52b
+0,         24,         24,        1,    90216, d8a7e85456ed58b86f42120269a62a46
+0,         25,         25,        1,    89456, e6d8b4f4b7c1903d66caea47cde9188a
+0,         26,         26,        1,    88992, 226f69483ab481fd48fa2121fa925fc9
+0,         27,         27,        1,    88632, 2ef0ae5d9b35440a540dce11098be40b
+0,         28,         28,        1,    87048, 5ed9c2db56db5ab3b5695ff282fbbd00
+0,         29,         29,        1,    87120, afe541aa18fd0fbeb7d623c2e03f7313
+0,         30,         30,        1,    88044, 4783145cbcbac507631d89b4c1b9f657
+0,         31,         31,        1,    89016, b8d2e919eecced0e4e13bab212fe5eaa
+0,         32,         32,        1,    89324, 1be1c9ee208834cb150e7dc114b3c3f5
+0,         33,         33,        1,    90328, 9ecb6f9511b869becfc3ae1cac0532c4
+0,         34,         34,        1,    89684, dc56a959ece1d3ea923be523ae4b5f03
+0,         35,         35,        1,    89216, bb1b89d23284a73faaae092e02c35318
+0,         36,         36,        1,    88644, 5a01fba266207f286dd000502144374c
+0,         37,         37,        1,    89000, e30493ff019668eaccae12c420a250ea
+0,         38,         38,        1,    88628, 0217f6f365739f8c7f1738d369afb2e5
+0,         39,         39,        1,    88448, 9d064836b1b232620da1d470fa314d56
+0,         40,         40,        1,    87332, 9179648b65b4757cd23d732ef96e8685
+0,         41,         41,        1,    88856, 96e0779b5fb5708a73519cc5f8a685b3
+0,         42,         42,        1,    88556, 5586e5b8149eefe271d7d2c4688a57e0
+0,         43,         43,        1,    88380, c8a1962e2c4fc33b303e3e09c87ee1fb
+0,         44,         44,        1,    87888, 70f38ebefceec78ec00fc2d190efc633
+0,         45,         45,        1,    86876, f8e0beb98988c19930c2cdd90ecfe867
+0,         46,         46,        1,    86272, fcb7343e281b2d42c81f9b5c4c1e786e
+0,         47,         47,        1,    86388, cfa6fce827ac3604ea2124d7332e2226
+0,         48,         48,        1,    86188, 5455b984533d774b8e7f04eea4e4eeaa
+0,         49,         49,        1,    85244, 9e4691d5a8be8270d48ef15292aaf0f7
diff --git a/tests/ref/fate/utvideoenc_yuv422_none b/tests/ref/fate/utvideoenc_yuv422_none
index ca771770e7..5e785b7bf8 100644
--- a/tests/ref/fate/utvideoenc_yuv422_none
+++ b/tests/ref/fate/utvideoenc_yuv422_none
@@ -1,51 +1,60 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#extradata 0,                              16, 7d613a4daaadf19228d42c98deb26024
 #tb 0: 1/25
-0,          0,          0,        1,   191800, 0e1d199f87997ba47e98596b6087d7d4
-0,          1,          1,        1,   191820, b35714d0635214095ac06d35da00ed32
-0,          2,          2,        1,   191668, 8336829e44f5b90034e5da33dcd27f1f
-0,          3,          3,        1,   191696, ebff701893f27b026fe6fec4a1cbd90b
-0,          4,          4,        1,   191976, c2729ecde4337a51192da71b0ef36e7d
-0,          5,          5,        1,   191760, e2ef2db5ef30019d5fd24cd32c696318
-0,          6,          6,        1,   191708, 638eb1c1b68bc9f4cc315ebdd3bd86f5
-0,          7,          7,        1,   191688, aca858d2cce189eb60012a33ea74d10b
-0,          8,          8,        1,   191576, aa933dea9aac9b61fea004747e3b8e6a
-0,          9,          9,        1,   191544, 6c410ec9e2492d464d439a58e6e338c3
-0,         10,         10,        1,   191472, 7c7661ff35671b3912b2b216bc6df478
-0,         11,         11,        1,   191280, 73c1ff53a0cd5c65eb2ae75a45efbf72
-0,         12,         12,        1,   191700, 201b0b4834878513e6e13bd9f5977a28
-0,         13,         13,        1,   191424, 0affff549b2da09c7852c5e8dbd1c84a
-0,         14,         14,        1,   191420, e0e80adf520953c4bc4033efc77b9092
-0,         15,         15,        1,   191408, 4fa22efbf2101b7f6bfffae227ce1d23
-0,         16,         16,        1,   191500, fef8df893234b38be36803d5f5656e16
-0,         17,         17,        1,   191580, 3585b500a77344fd87f8f18e3816f1a8
-0,         18,         18,        1,   191608, 419189483180612b72491dab5864c6e7
-0,         19,         19,        1,   191616, 197fa32c8a164eeea73defb7422657d1
-0,         20,         20,        1,   191596, a660a6c630f7e55c3ca2f9a37d599223
-0,         21,         21,        1,   191660, d98445b0387c3d54034f8defe1d03ea6
-0,         22,         22,        1,   191540, ef4522aa762b82d1c715805a779c7c1e
-0,         23,         23,        1,   191576, 32d109d2040c69b3944471b0bd399a65
-0,         24,         24,        1,   191636, 58e2f3a01de4175ba7f915e2d065ba36
-0,         25,         25,        1,   191524, 0989a64e78613cfc26124e195cfc0cde
-0,         26,         26,        1,   191640, b9e252a5c4583736a8ba248d15c429aa
-0,         27,         27,        1,   191800, 1541cccc66cb63d3e1ef675a16a1258e
-0,         28,         28,        1,   192028, 5dada6bf987738caebca210067d13c39
-0,         29,         29,        1,   191964, 8d55bb4a1464ac74364d4b1e416d4a0c
-0,         30,         30,        1,   191736, 88c279b9f3e96485f85dbca09177fe26
-0,         31,         31,        1,   191788, aa75795116428edb57dea8b54527e13b
-0,         32,         32,        1,   191636, aa45e4ec1fcc038ea2e48046e5047417
-0,         33,         33,        1,   191400, 7b2861b3ca8bfcdca010d859c0595e03
-0,         34,         34,        1,   191332, 956acfcc00661d9a9ba7575e8c1a011b
-0,         35,         35,        1,   191548, 3b5b7c3b9a6a5ebe10f178077a5fea4d
-0,         36,         36,        1,   191852, 835219e1689946f3e26457ffce197181
-0,         37,         37,        1,   191828, f67a1e4640472287baf194c02f24dc29
-0,         38,         38,        1,   191812, 978f44d430859044350ea20913ae4194
-0,         39,         39,        1,   191700, 92e21c9ded61f69f793c649eece071c4
-0,         40,         40,        1,   191812, 0a460bc35daad68e8042917f26dac542
-0,         41,         41,        1,   191548, 7c7a65b9257f9b4439002c5c414c401c
-0,         42,         42,        1,   191544, b03d903c46536dc336461827fd4d34db
-0,         43,         43,        1,   191700, 75b391d84b120e63ec229fcb48808d19
-0,         44,         44,        1,   191780, c953dcd42a8aa19eb4d4be0149894bbe
-0,         45,         45,        1,   191952, 64be44b2e21f8301f4234e32a10cb1c9
-0,         46,         46,        1,   191916, a6c805f651f3f57a84681b1aab6fe3ef
-0,         47,         47,        1,   191784, 9cc8db3cb63a026645f634aabc89c37b
-0,         48,         48,        1,   191716, e2f0c7543b3484a726411eac4e9a79cd
-0,         49,         49,        1,   191728, 50277180199917d1259e0cad42f52d4c
+#media_type 0: video
+#codec_id 0: utvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   191800, 4a5653458a4206bcbc584d5e6beb61f2
+0,          1,          1,        1,   191820, 2f77ced17c186b507864ea482016c913
+0,          2,          2,        1,   191668, 2dd719b7228e3b38e1e86a0304a599f1
+0,          3,          3,        1,   191696, 4fe7ef1586ef85f3ceb579426ff4077f
+0,          4,          4,        1,   191972, 9b9718c63d0b6f6bc293036bcf7a884d
+0,          5,          5,        1,   191760, 24fbe86d07c66d4f791533219a6bbca5
+0,          6,          6,        1,   191708, 32f4e266cc3e22e8b5ad354f4685ca9f
+0,          7,          7,        1,   191688, 9614c1881c3c2807ac492b1c3d689559
+0,          8,          8,        1,   191568, a4e53b02fdbc66c47e099cb3506a5f27
+0,          9,          9,        1,   191544, c3f2fcb7a299163e72faa93522405def
+0,         10,         10,        1,   191468, 598cb568c2e4b651f04511eea480b8f0
+0,         11,         11,        1,   191280, 7ac77492856c214f6266da9eea4cc766
+0,         12,         12,        1,   191700, 5b261fda1cdafc11596fca42e902e8a9
+0,         13,         13,        1,   191424, c31421daddb684ec01a0b8953a340891
+0,         14,         14,        1,   191416, 742171e3f053ffb7f27dd14e9a408e33
+0,         15,         15,        1,   191408, 06efc3afdf3c97c6c6e6f76eeea217b7
+0,         16,         16,        1,   191500, ee9d95219dc34981f1e3a9feee21a12a
+0,         17,         17,        1,   191580, 9fd14328b5f304cab54405b2e7b6dd74
+0,         18,         18,        1,   191608, 84374f2e0540d97f4f5a5282397d1fd4
+0,         19,         19,        1,   191616, 6f8d0b3143d78d87209815e4f14e8fde
+0,         20,         20,        1,   191596, 4533cb5577bbee750eee21966f3e6b87
+0,         21,         21,        1,   191660, c9cbe09e11e7bb47565d54ec25e407e1
+0,         22,         22,        1,   191536, 3a9168133d91c67219052869bb4a1aa9
+0,         23,         23,        1,   191576, 0df4b9398953fe710b949cc3912927a1
+0,         24,         24,        1,   191636, 5ee06edd617272e33b59da14e9e472b5
+0,         25,         25,        1,   191524, 3e09b926cf3dbed003746d0fc4bb9eb1
+0,         26,         26,        1,   191640, e4f9408633b8cb13578de8caca4afd77
+0,         27,         27,        1,   191800, 7c57ae6d60df4676c132de16ebf1ec24
+0,         28,         28,        1,   192028, 36fd55e15ee357478bdd3085adc5d1f9
+0,         29,         29,        1,   191964, 82a4fd877d4dba1266fc28d9a74e5cf3
+0,         30,         30,        1,   191732, 3d905c393537ccdbdc2bb83cfc9ac1f3
+0,         31,         31,        1,   191788, 92e647f7728fe892c3f97d866aa9e6e7
+0,         32,         32,        1,   191636, d26af69ceee2e7433e04da1eee6a4043
+0,         33,         33,        1,   191400, 9e5d147eea116586d13cec38e59d0e90
+0,         34,         34,        1,   191332, 93419f91d6d4d274344a0f184f03210a
+0,         35,         35,        1,   191548, 61c4c7a96c86ccb5189daa63b3219340
+0,         36,         36,        1,   191852, 62fd435d20d032686bf9bad5ac5252b8
+0,         37,         37,        1,   191828, 2487f780f709f38c38a19b1d0e255575
+0,         38,         38,        1,   191808, 5bd0d224585427f2fa6fca1392ea6273
+0,         39,         39,        1,   191700, deaed17ec6cbc863313b7698114d54fd
+0,         40,         40,        1,   191812, 296dce78545cf89745c13f117347949b
+0,         41,         41,        1,   191548, 0273c1819d7af2f49b1b86b238414702
+0,         42,         42,        1,   191544, e9e29ab1e3f9fd5bff18748f38a3a79d
+0,         43,         43,        1,   191700, c211fa96ed541d7d53bc975577bd7bbc
+0,         44,         44,        1,   191780, cfcd29e8a289aa0f2d4026189bb0b966
+0,         45,         45,        1,   191952, 0c1f04a3877565eb8bd76b652626a27f
+0,         46,         46,        1,   191916, 1e49ee7ea02c2df7e0b6187fcc6cbdbe
+0,         47,         47,        1,   191784, 5fa516e0bb264c767e49169cf7accd23
+0,         48,         48,        1,   191716, 3a7abe462356b1020f3c8d496bcbbbdc
+0,         49,         49,        1,   191728, cf5fb801291c77b04d9937e4b828f772
diff --git a/tests/ref/fate/v210 b/tests/ref/fate/v210
index 7ad9dcf9e7..1ff76f8442 100644
--- a/tests/ref/fate/v210
+++ b/tests/ref/fate/v210
@@ -1,2 +1,6 @@
 #tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  3686400, 0x8d5c3847
diff --git a/tests/ref/fate/v410dec b/tests/ref/fate/v410dec
index 98b2816b6a..ed78e39087 100644
--- a/tests/ref/fate/v410dec
+++ b/tests/ref/fate/v410dec
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 256x256
+#sar 0: 0/1
 0,          0,          0,        1,   393216, 0xfe11a6b0
diff --git a/tests/ref/fate/v410enc b/tests/ref/fate/v410enc
index ab219bbed1..9fddf5a35c 100644
--- a/tests/ref/fate/v410enc
+++ b/tests/ref/fate/v410enc
@@ -1 +1 @@
-e5c0b1f17d2a64a416dcf9bf7a38d9d9
+465bcc7477104a8295f47b35f1b987df
diff --git a/tests/ref/fate/vb b/tests/ref/fate/vb
index 336d42657b..d5fdb0436a 100644
--- a/tests/ref/fate/vb
+++ b/tests/ref/fate/vb
@@ -1,4 +1,8 @@
 #tb 0: 1/12
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
 0,          0,          0,        1,   230400, 0x3bd1d731
 0,          1,          1,        1,   230400, 0x9d0774c3
 0,          2,          2,        1,   230400, 0xa0faafe2
diff --git a/tests/ref/fate/vble b/tests/ref/fate/vble
index 8c4250fd2a..62d9682967 100644
--- a/tests/ref/fate/vble
+++ b/tests/ref/fate/vble
@@ -1,4 +1,8 @@
 #tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  1382400, 0x5e1bc307
 0,          1,          1,        1,  1382400, 0x198795f7
 0,          2,          2,        1,  1382400, 0xa9102ac2
diff --git a/tests/ref/fate/vc1-ism b/tests/ref/fate/vc1-ism
index a60cb8ac33..1bd6c643d9 100644
--- a/tests/ref/fate/vc1-ism
+++ b/tests/ref/fate/vc1-ism
@@ -1,63 +1,125 @@
-#tb 0: 1/10000000
-0,          4,          4,        0,    37440, 0xd1bc5235
-0,    1256670,    1256670,        0,    37440, 0x158e6167
-0,    2086670,    2086670,        0,    37440, 0x427158c5
-0,    2916670,    2916670,        0,    37440, 0x99304eea
-0,    3756670,    3756670,        0,    37440, 0xabeb6c35
-0,    4586670,    4586670,        0,    37440, 0xaa79b504
-0,    5416670,    5416670,        0,    37440, 0x7e36ecca
-0,    6256670,    6256670,        0,    37440, 0xf1b4138f
-0,    7086670,    7086670,        0,    37440, 0x5eff21da
-0,    7916670,    7916670,        0,    37440, 0x62e5963e
-0,    8756670,    8756670,        0,    37440, 0x27b4bb6c
-0,    9586670,    9586670,        0,    37440, 0x04260104
-0,   10416670,   10416670,        0,    37440, 0xdf4e2474
-0,   11256670,   11256670,        0,    37440, 0x8780e34c
-0,   12086670,   12086670,        0,    37440, 0x630a7583
-0,   12916670,   12916670,        0,    37440, 0x984b8f0e
-0,   13756670,   13756670,        0,    37440, 0x70f376f2
-0,   14586670,   14586670,        0,    37440, 0xde772d79
-0,   15416670,   15416670,        0,    37440, 0x3dc2bd9f
-0,   16256670,   16256670,        0,    37440, 0x02025d73
-0,   17086670,   17086670,        0,    37440, 0xd6554f62
-0,   17916670,   17916670,        0,    37440, 0x80643560
-0,   18756670,   18756670,        0,    37440, 0x9ce51e0b
-0,   19586670,   19586670,        0,    37440, 0x145fc900
-0,   20416670,   20416670,        0,    37440, 0x0a87552a
-0,   21256670,   21256670,        0,    37440, 0x1c07c825
-0,   22086670,   22086670,        0,    37440, 0xb1a32605
-0,   22916670,   22916670,        0,    37440, 0xff5e6696
-0,   23756670,   23756670,        0,    37440, 0x6c9e9e68
-0,   24586670,   24586670,        0,    37440, 0xf237bd6c
-0,   25416670,   25416670,        0,    37440, 0xc7ccc918
-0,   26256670,   26256670,        0,    37440, 0xacb3c881
-0,   27086670,   27086670,        0,    37440, 0x19d5be85
-0,   27506670,   27506670,        0,    37440, 0xdae7a7aa
-0,   27916670,   27916670,        0,    37440, 0x6b0f9f69
-0,   28756670,   28756670,        0,    37440, 0x353e8201
-0,   29586670,   29586670,        0,    37440, 0x66c8d7e0
-0,   30416670,   30416670,        0,    37440, 0x71431b9b
-0,   31256670,   31256670,        0,    37440, 0x95a146bb
-0,   32086670,   32086670,        0,    37440, 0xa3bdd43c
-0,   32916670,   32916670,        0,    37440, 0xa95423ea
-0,   33756670,   33756670,        0,    37440, 0x6cf82844
-0,   34586670,   34586670,        0,    37440, 0x1f7db118
-0,   35416670,   35416670,        0,    37440, 0x321c1c40
-0,   36256670,   36256670,        0,    37440, 0xa1471f4b
-0,   37086670,   37086670,        0,    37440, 0x24c07107
-0,   37916670,   37916670,        0,    37440, 0xd0ca6495
-0,   38756670,   38756670,        0,    37440, 0xb5ec3c38
-0,   39586670,   39586670,        0,    37440, 0x68170812
-0,   40416670,   40416670,        0,    37440, 0xd688706c
-0,   41256670,   41256670,        0,    37440, 0x28bd0fbf
-0,   42086670,   42086670,        0,    37440, 0x30559121
-0,   42916670,   42916670,        0,    37440, 0x4b427672
-0,   43756670,   43756670,        0,    37440, 0x38a70b06
-0,   44586670,   44586670,        0,    37440, 0x6efe8ea6
-0,   45416670,   45416670,        0,    37440, 0xf4060050
-0,   46256670,   46256670,        0,    37440, 0x5fa21382
-0,   47086670,   47086670,        0,    37440, 0xf7130133
-0,   47916670,   47916670,        0,    37440, 0x1dbae1be
-0,   48756670,   48756670,        0,    37440, 0xbdcd41a3
-0,   49586670,   49586670,        0,    37440, 0xc0036222
-0,   50006670,   50006670,        0,    37440, 0x68141016
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 240x104
+#sar 0: 156/156
+0,          0,          0,        1,    37440, 0xd1bc5235
+0,          2,          2,        1,    37440, 0x158e6167
+0,          3,          3,        1,    37440, 0x0faa4481
+0,          4,          4,        1,    37440, 0x427158c5
+0,          5,          5,        1,    37440, 0x4eb53ac6
+0,          6,          6,        1,    37440, 0x99304eea
+0,          7,          7,        1,    37440, 0xcc554a6f
+0,          8,          8,        1,    37440, 0xabeb6c35
+0,          9,          9,        1,    37440, 0xddfc7e18
+0,         10,         10,        1,    37440, 0xaa79b504
+0,         11,         11,        1,    37440, 0x5cb1c839
+0,         12,         12,        1,    37440, 0x7e36ecca
+0,         13,         13,        1,    37440, 0xf486f425
+0,         14,         14,        1,    37440, 0xf1b4138f
+0,         15,         15,        1,    37440, 0x966f1a49
+0,         16,         16,        1,    37440, 0x5eff21da
+0,         17,         17,        1,    37440, 0x333f39b1
+0,         18,         18,        1,    37440, 0x62e5963e
+0,         19,         19,        1,    37440, 0x26930671
+0,         20,         20,        1,    37440, 0x27b4bb6c
+0,         21,         21,        1,    37440, 0xdbd07766
+0,         22,         22,        1,    37440, 0x04260104
+0,         23,         23,        1,    37440, 0x9b1e078b
+0,         24,         24,        1,    37440, 0xdf4e2474
+0,         25,         25,        1,    37440, 0x57d44986
+0,         26,         26,        1,    37440, 0x8780e34c
+0,         27,         27,        1,    37440, 0xf80c8bc0
+0,         28,         28,        1,    37440, 0x630a7583
+0,         29,         29,        1,    37440, 0x235ae089
+0,         30,         30,        1,    37440, 0x984b8f0e
+0,         31,         31,        1,    37440, 0x865cf592
+0,         32,         32,        1,    37440, 0x70f376f2
+0,         33,         33,        1,    37440, 0x8b30c035
+0,         34,         34,        1,    37440, 0xde772d79
+0,         35,         35,        1,    37440, 0x8e076be5
+0,         36,         36,        1,    37440, 0x3dc2bd9f
+0,         37,         37,        1,    37440, 0xb782eb67
+0,         38,         38,        1,    37440, 0x02025d73
+0,         39,         39,        1,    37440, 0x86bbbce8
+0,         40,         40,        1,    37440, 0xd6554f62
+0,         41,         41,        1,    37440, 0xb831b917
+0,         42,         42,        1,    37440, 0x80643560
+0,         43,         43,        1,    37440, 0x4ecf9afd
+0,         44,         44,        1,    37440, 0x9ce51e0b
+0,         45,         45,        1,    37440, 0x179466cd
+0,         46,         46,        1,    37440, 0x145fc900
+0,         47,         47,        1,    37440, 0xb1b50402
+0,         48,         48,        1,    37440, 0x0a87552a
+0,         49,         49,        1,    37440, 0x8f53821d
+0,         50,         50,        1,    37440, 0x1c07c825
+0,         51,         51,        1,    37440, 0x49dde82f
+0,         52,         52,        1,    37440, 0xb1a32605
+0,         53,         53,        1,    37440, 0x410f3cd5
+0,         54,         54,        1,    37440, 0xff5e6696
+0,         55,         55,        1,    37440, 0x96f678c9
+0,         56,         56,        1,    37440, 0x6c9e9e68
+0,         57,         57,        1,    37440, 0x79a2a655
+0,         58,         58,        1,    37440, 0xf237bd6c
+0,         59,         59,        1,    37440, 0x4051b611
+0,         60,         60,        1,    37440, 0xc7ccc918
+0,         61,         61,        1,    37440, 0xbd02c122
+0,         62,         62,        1,    37440, 0xacb3c881
+0,         63,         63,        1,    37440, 0x2abdb940
+0,         64,         64,        1,    37440, 0x19d5be85
+0,         65,         65,        1,    37440, 0xfa5fb1ba
+0,         66,         66,        1,    37440, 0xdae7a7aa
+0,         67,         67,        1,    37440, 0x6b0f9f69
+0,         68,         68,        1,    37440, 0x353e8201
+0,         69,         69,        1,    37440, 0xa21443aa
+0,         70,         70,        1,    37440, 0x66c8d7e0
+0,         71,         71,        1,    37440, 0xc332068e
+0,         72,         72,        1,    37440, 0x71431b9b
+0,         73,         73,        1,    37440, 0x392f15cb
+0,         74,         74,        1,    37440, 0x95a146bb
+0,         75,         75,        1,    37440, 0x7c51740a
+0,         76,         76,        1,    37440, 0xa3bdd43c
+0,         77,         77,        1,    37440, 0xa079f965
+0,         78,         78,        1,    37440, 0xa95423ea
+0,         79,         79,        1,    37440, 0xd1bd2c67
+0,         80,         80,        1,    37440, 0x6cf82844
+0,         81,         81,        1,    37440, 0xd401e128
+0,         82,         82,        1,    37440, 0x1f7db118
+0,         83,         83,        1,    37440, 0x2e0a65a9
+0,         84,         84,        1,    37440, 0x321c1c40
+0,         85,         85,        1,    37440, 0x95b2a127
+0,         86,         86,        1,    37440, 0xa1471f4b
+0,         87,         87,        1,    37440, 0x29d148c0
+0,         88,         88,        1,    37440, 0x24c07107
+0,         89,         89,        1,    37440, 0x0ead678d
+0,         90,         90,        1,    37440, 0xd0ca6495
+0,         91,         91,        1,    37440, 0x08f935ef
+0,         92,         92,        1,    37440, 0xb5ec3c38
+0,         93,         93,        1,    37440, 0xce371628
+0,         94,         94,        1,    37440, 0x68170812
+0,         95,         95,        1,    37440, 0xe222699e
+0,         96,         96,        1,    37440, 0xd688706c
+0,         97,         97,        1,    37440, 0x81a033f9
+0,         98,         98,        1,    37440, 0x28bd0fbf
+0,         99,         99,        1,    37440, 0xe36db7b2
+0,        100,        100,        1,    37440, 0x30559121
+0,        101,        101,        1,    37440, 0xbf2b5fc8
+0,        102,        102,        1,    37440, 0x4b427672
+0,        103,        103,        1,    37440, 0x0544b0b4
+0,        104,        104,        1,    37440, 0x38a70b06
+0,        105,        105,        1,    37440, 0x4ed62607
+0,        106,        106,        1,    37440, 0x6efe8ea6
+0,        107,        107,        1,    37440, 0x81197e11
+0,        108,        108,        1,    37440, 0xf4060050
+0,        109,        109,        1,    37440, 0xaf205f13
+0,        110,        110,        1,    37440, 0x5fa21382
+0,        111,        111,        1,    37440, 0x8627ad05
+0,        112,        112,        1,    37440, 0xf7130133
+0,        113,        113,        1,    37440, 0x76dea7ba
+0,        114,        114,        1,    37440, 0x1dbae1be
+0,        115,        115,        1,    37440, 0x74a933f7
+0,        116,        116,        1,    37440, 0xbdcd41a3
+0,        117,        117,        1,    37440, 0xf0fe8c1c
+0,        118,        118,        1,    37440, 0xc0036222
+0,        119,        119,        1,    37440, 0x3058385c
+0,        120,        120,        1,    37440, 0x68141016
diff --git a/tests/ref/fate/vc1_ilaced_twomv b/tests/ref/fate/vc1_ilaced_twomv
index dca5fa9990..fa56b29495 100644
--- a/tests/ref/fate/vc1_ilaced_twomv
+++ b/tests/ref/fate/vc1_ilaced_twomv
@@ -1,14 +1,18 @@
-#tb 0: 1/25
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
 0,          0,          0,        1,  3110400, 0x764f8856
 0,          2,          2,        1,  3110400, 0x3b615b79
 0,          3,          3,        1,  3110400, 0x4fbb6f84
 0,          4,          4,        1,  3110400, 0xc1ca8532
-0,          5,          5,        1,  3110400, 0x53efd0f9
-0,          6,          6,        1,  3110400, 0xa9605bc9
-0,          7,          7,        1,  3110400, 0xbaa9aede
-0,          8,          8,        1,  3110400, 0x602fbcd5
-0,          9,          9,        1,  3110400, 0x93d204b5
-0,         10,         10,        1,  3110400, 0x7b047286
-0,         11,         11,        1,  3110400, 0xa7cb2f84
-0,         12,         12,        1,  3110400, 0xfba20dd1
-0,         13,         13,        1,  3110400, 0x24c32a55
+0,          5,          5,        1,  3110400, 0xb6e7d363
+0,          6,          6,        1,  3110400, 0x1beb5c34
+0,          7,          7,        1,  3110400, 0xcb8cb061
+0,          8,          8,        1,  3110400, 0x13ddbd61
+0,          9,          9,        1,  3110400, 0xde8f052f
+0,         10,         10,        1,  3110400, 0x4d4072db
+0,         11,         11,        1,  3110400, 0x4e5d29e3
+0,         12,         12,        1,  3110400, 0x75300531
+0,         13,         13,        1,  3110400, 0x1114285a
diff --git a/tests/ref/fate/vc1_sa00040 b/tests/ref/fate/vc1_sa00040
index 79bff27943..554b838ff0 100644
--- a/tests/ref/fate/vc1_sa00040
+++ b/tests/ref/fate/vc1_sa00040
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 1/1
 0,          0,          0,        1,    38016, 0xa6f15db5
 0,          1,          1,        1,    38016, 0xa6f15db5
 0,          2,          2,        1,    38016, 0xa6f15db5
diff --git a/tests/ref/fate/vc1_sa00050 b/tests/ref/fate/vc1_sa00050
index 89a3840b28..d30b1bfbe3 100644
--- a/tests/ref/fate/vc1_sa00050
+++ b/tests/ref/fate/vc1_sa00050
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 1/1
 0,          0,          0,        1,   115200, 0xb8830eef
 0,          1,          1,        1,   115200, 0xb8830eef
 0,          2,          2,        1,   115200, 0xb8830eef
diff --git a/tests/ref/fate/vc1_sa10091 b/tests/ref/fate/vc1_sa10091
index 33326d6a63..ebfe2710ca 100644
--- a/tests/ref/fate/vc1_sa10091
+++ b/tests/ref/fate/vc1_sa10091
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 1/1
 0,          0,          0,        1,   518400, 0xae20b4fa
 0,          2,          2,        1,   518400, 0x2b4ccdf9
 0,          3,          3,        1,   518400, 0x2b4ccdf9
diff --git a/tests/ref/fate/vc1_sa10143 b/tests/ref/fate/vc1_sa10143
index c0ecc3bb9d..d6904819d0 100644
--- a/tests/ref/fate/vc1_sa10143
+++ b/tests/ref/fate/vc1_sa10143
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x480
+#sar 0: 1/1
 0,          0,          0,        1,   518400, 0x89407f55
 0,          2,          2,        1,   518400, 0xaa896afd
 0,          3,          3,        1,   518400, 0x0e69ff59
diff --git a/tests/ref/fate/vc1_sa20021 b/tests/ref/fate/vc1_sa20021
index 22989a0aed..450504f83c 100644
--- a/tests/ref/fate/vc1_sa20021
+++ b/tests/ref/fate/vc1_sa20021
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 704x480
+#sar 0: 1/1
 0,          0,          0,        1,   506880, 0x884bc093
 0,          2,          2,        1,   506880, 0x4b09548f
 0,          3,          3,        1,   506880, 0x195cbee1
diff --git a/tests/ref/fate/vcr1 b/tests/ref/fate/vcr1
index da21df4c2e..983c52e9fc 100644
--- a/tests/ref/fate/vcr1
+++ b/tests/ref/fate/vcr1
@@ -1,4 +1,8 @@
 #tb 0: 66099/1000000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
 0,          0,          0,        1,    28512, 0x7165286d
 0,          1,          1,        1,    28512, 0x2b842acc
 0,          2,          2,        1,    28512, 0x6d1b8e85
diff --git a/tests/ref/fate/vcr2 b/tests/ref/fate/vcr2
new file mode 100644
index 0000000000..e25aa14361
--- /dev/null
+++ b/tests/ref/fate/vcr2
@@ -0,0 +1,162 @@
+#tb 0: 1001/15000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+0,          0,          0,        1,    38016, 0x50e93e0d
+0,          1,          1,        1,    38016, 0x6ac8627d
+0,          2,          2,        1,    38016, 0x6f38661e
+0,          3,          3,        1,    38016, 0x18bb3e23
+0,          4,          4,        1,    38016, 0x2029f4da
+0,          5,          5,        1,    38016, 0xa981eeb9
+0,          6,          6,        1,    38016, 0x65c636ef
+0,          7,          7,        1,    38016, 0x8218f178
+0,          8,          8,        1,    38016, 0xc3986e18
+0,          9,          9,        1,    38016, 0xac871f50
+0,         10,         10,        1,    38016, 0xe83ed617
+0,         11,         11,        1,    38016, 0xe87c4132
+0,         12,         12,        1,    38016, 0x9e03c321
+0,         13,         13,        1,    38016, 0x81f06a6e
+0,         14,         14,        1,    38016, 0x4ce15039
+0,         15,         15,        1,    38016, 0x398dfbdd
+0,         16,         16,        1,    38016, 0x3049218c
+0,         17,         17,        1,    38016, 0x6d90bb3f
+0,         18,         18,        1,    38016, 0x5b61ae57
+0,         19,         19,        1,    38016, 0xaf17011d
+0,         20,         20,        1,    38016, 0xb6c13da6
+0,         21,         21,        1,    38016, 0xb58135cf
+0,         22,         22,        1,    38016, 0x051c33ce
+0,         23,         23,        1,    38016, 0xda950393
+0,         24,         24,        1,    38016, 0x76f7ea61
+0,         25,         25,        1,    38016, 0xcba6f5c8
+0,         26,         26,        1,    38016, 0x2ac20405
+0,         27,         27,        1,    38016, 0x6c790a1b
+0,         28,         28,        1,    38016, 0x8525413b
+0,         29,         29,        1,    38016, 0xef2e46a5
+0,         30,         30,        1,    38016, 0x32c16c28
+0,         31,         31,        1,    38016, 0x9fb0755f
+0,         32,         32,        1,    38016, 0xdfd7a1e2
+0,         33,         33,        1,    38016, 0xa91eb2d0
+0,         34,         34,        1,    38016, 0xb7bed869
+0,         35,         35,        1,    38016, 0x0263da70
+0,         36,         36,        1,    38016, 0x1403cf83
+0,         37,         37,        1,    38016, 0xb766f81a
+0,         38,         38,        1,    38016, 0x85abd4e0
+0,         39,         39,        1,    38016, 0xfc30c171
+0,         40,         40,        1,    38016, 0xb53bb9e5
+0,         41,         41,        1,    38016, 0xe93ca93c
+0,         42,         42,        1,    38016, 0xfa9db507
+0,         43,         43,        1,    38016, 0xd4da8492
+0,         44,         44,        1,    38016, 0x951cb041
+0,         45,         45,        1,    38016, 0x64fb9a09
+0,         46,         46,        1,    38016, 0x8f89b841
+0,         47,         47,        1,    38016, 0x9ee4b6df
+0,         48,         48,        1,    38016, 0xd733ae27
+0,         49,         49,        1,    38016, 0x2a1ab87d
+0,         50,         50,        1,    38016, 0x4853bf88
+0,         51,         51,        1,    38016, 0x701da865
+0,         52,         52,        1,    38016, 0x074d8248
+0,         53,         53,        1,    38016, 0xa1b4b019
+0,         54,         54,        1,    38016, 0x33f798c7
+0,         55,         55,        1,    38016, 0x5091bd66
+0,         56,         56,        1,    38016, 0x9dc0bf08
+0,         57,         57,        1,    38016, 0x83cff4c3
+0,         58,         58,        1,    38016, 0xce551295
+0,         59,         59,        1,    38016, 0x3c334a45
+0,         60,         60,        1,    38016, 0xd6e669ae
+0,         61,         61,        1,    38016, 0x08817cb0
+0,         62,         62,        1,    38016, 0x3d399508
+0,         63,         63,        1,    38016, 0xaf49a306
+0,         64,         64,        1,    38016, 0x6b77e02c
+0,         65,         65,        1,    38016, 0x34a6cc72
+0,         66,         66,        1,    38016, 0x0303e6bb
+0,         67,         67,        1,    38016, 0x3995eee2
+0,         68,         68,        1,    38016, 0x8eefd136
+0,         69,         69,        1,    38016, 0xd69ad171
+0,         70,         70,        1,    38016, 0xed98bff6
+0,         71,         71,        1,    38016, 0x606ba5ef
+0,         72,         72,        1,    38016, 0xbce4afaa
+0,         73,         73,        1,    38016, 0xa5baac40
+0,         74,         74,        1,    38016, 0x7a15929f
+0,         75,         75,        1,    38016, 0x0374cdec
+0,         76,         76,        1,    38016, 0xf482e941
+0,         77,         77,        1,    38016, 0xced1c9e3
+0,         78,         78,        1,    38016, 0x638fd91f
+0,         79,         79,        1,    38016, 0xced5d802
+0,         80,         80,        1,    38016, 0x330adeeb
+0,         81,         81,        1,    38016, 0x7a70f93e
+0,         82,         82,        1,    38016, 0x25c0dac1
+0,         83,         83,        1,    38016, 0x6f9401cf
+0,         84,         84,        1,    38016, 0x01632a5b
+0,         85,         85,        1,    38016, 0x6eedd857
+0,         86,         86,        1,    38016, 0xcfad1017
+0,         87,         87,        1,    38016, 0x38071e53
+0,         88,         88,        1,    38016, 0xc7c3013f
+0,         89,         89,        1,    38016, 0x1f41fe19
+0,         90,         90,        1,    38016, 0x9662e170
+0,         91,         91,        1,    38016, 0xec19ecfc
+0,         92,         92,        1,    38016, 0xab419765
+0,         93,         93,        1,    38016, 0xe784d98b
+0,         94,         94,        1,    38016, 0x93c1a4bf
+0,         95,         95,        1,    38016, 0xf2e4c9b4
+0,         96,         96,        1,    38016, 0x7cb6c1ff
+0,         97,         97,        1,    38016, 0x6fb36837
+0,         98,         98,        1,    38016, 0x6fb64665
+0,         99,         99,        1,    38016, 0xf24eaba9
+0,        100,        100,        1,    38016, 0x3866d28b
+0,        101,        101,        1,    38016, 0x807e829c
+0,        102,        102,        1,    38016, 0xf25fcbbb
+0,        103,        103,        1,    38016, 0xc28ba68f
+0,        104,        104,        1,    38016, 0x65ef8def
+0,        105,        105,        1,    38016, 0xc4646ee4
+0,        106,        106,        1,    38016, 0x3cb76962
+0,        107,        107,        1,    38016, 0xe5500136
+0,        108,        108,        1,    38016, 0xb086aa05
+0,        109,        109,        1,    38016, 0xde9fd4c3
+0,        110,        110,        1,    38016, 0xcae0d11b
+0,        111,        111,        1,    38016, 0x6cd3ee1a
+0,        112,        112,        1,    38016, 0x38981b85
+0,        113,        113,        1,    38016, 0xbe742f68
+0,        114,        114,        1,    38016, 0x29c41fc7
+0,        115,        115,        1,    38016, 0x43612eaf
+0,        116,        116,        1,    38016, 0x199dba2f
+0,        117,        117,        1,    38016, 0xb434f64d
+0,        118,        118,        1,    38016, 0x36f2fd8c
+0,        119,        119,        1,    38016, 0xc1075321
+0,        120,        120,        1,    38016, 0x7eabeab8
+0,        121,        121,        1,    38016, 0x7fcd5127
+0,        122,        122,        1,    38016, 0x37ddb544
+0,        123,        123,        1,    38016, 0x5dee2700
+0,        124,        124,        1,    38016, 0x46deb355
+0,        125,        125,        1,    38016, 0xb2496a7c
+0,        126,        126,        1,    38016, 0xfaf3b134
+0,        127,        127,        1,    38016, 0x42e9dbe1
+0,        128,        128,        1,    38016, 0x699fc6e0
+0,        129,        129,        1,    38016, 0x43ba68ae
+0,        130,        130,        1,    38016, 0xffd21579
+0,        131,        131,        1,    38016, 0xdd979741
+0,        132,        132,        1,    38016, 0x789c89aa
+0,        133,        133,        1,    38016, 0x40be024e
+0,        134,        134,        1,    38016, 0xa60c291d
+0,        135,        135,        1,    38016, 0xa8d253e9
+0,        136,        136,        1,    38016, 0x16d7f60e
+0,        137,        137,        1,    38016, 0xf1d21a57
+0,        138,        138,        1,    38016, 0x5e80e3bd
+0,        139,        139,        1,    38016, 0xceec0529
+0,        140,        140,        1,    38016, 0x1ff9c462
+0,        141,        141,        1,    38016, 0x51c168d2
+0,        142,        142,        1,    38016, 0xf61f2059
+0,        143,        143,        1,    38016, 0xb22fa794
+0,        144,        144,        1,    38016, 0xb81ec7d5
+0,        145,        145,        1,    38016, 0x7555d1df
+0,        146,        146,        1,    38016, 0x860d9de3
+0,        147,        147,        1,    38016, 0x9b19a66f
+0,        148,        148,        1,    38016, 0xec52d405
+0,        149,        149,        1,    38016, 0x2da4d05b
+0,        150,        150,        1,    38016, 0xf15bf060
+0,        151,        151,        1,    38016, 0xfabcc24a
+0,        152,        152,        1,    38016, 0xc159f63a
+0,        153,        153,        1,    38016, 0x0b97fcc1
+0,        154,        154,        1,    38016, 0xe0c063a2
+0,        155,        155,        1,    38016, 0x7bda9bec
+0,        156,        156,        1,    38016, 0xbe99a923
diff --git a/tests/ref/fate/videoxl b/tests/ref/fate/videoxl
index 4d2db37f3e..c5b4c81278 100644
--- a/tests/ref/fate/videoxl
+++ b/tests/ref/fate/videoxl
@@ -1,4 +1,8 @@
 #tb 0: 71/500
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 188x128
+#sar 0: 0/1
 0,          0,          0,        1,    36096, 0xab1c53c1
 0,          1,          1,        1,    36096, 0x8b598ff3
 0,          2,          2,        1,    36096, 0xe9a5f3eb
diff --git a/tests/ref/fate/vmnc-16bit b/tests/ref/fate/vmnc-16bit
index 2a1848eccb..69cf09556b 100644
--- a/tests/ref/fate/vmnc-16bit
+++ b/tests/ref/fate/vmnc-16bit
@@ -1,193 +1,197 @@
 #tb 0: 1/5
-0,          0,          0,        1,   864000, 0x9b1cee65
-0,          1,          1,        1,   864000, 0x82950e3f
-0,          2,          2,        1,   864000, 0x335f9678
-0,          3,          3,        1,   864000, 0x6b86b7e7
-0,          4,          4,        1,   864000, 0x25618cf2
-0,          5,          5,        1,   864000, 0xed2196c9
-0,          6,          6,        1,   864000, 0xbeaa31ba
-0,          7,          7,        1,   864000, 0x14e6c8ab
-0,          8,          8,        1,   864000, 0x17e5c196
-0,          9,          9,        1,   864000, 0x4aa15110
-0,         10,         10,        1,   864000, 0x4aa15110
-0,         11,         11,        1,   864000, 0x4aa15110
-0,         12,         12,        1,   864000, 0x3c2d3809
-0,         13,         13,        1,   864000, 0xd075f4d0
-0,         14,         14,        1,   864000, 0x0c3f2833
-0,         15,         15,        1,   864000, 0xe7471872
-0,         16,         16,        1,   864000, 0x4300b71d
-0,         17,         17,        1,   864000, 0x6b5844ec
-0,         18,         18,        1,   864000, 0xb3ebc395
-0,         19,         19,        1,   864000, 0x39aa8a7d
-0,         20,         20,        1,   864000, 0x52a3d93d
-0,         21,         21,        1,   864000, 0x73adbdac
-0,         22,         22,        1,   864000, 0xa9fd6cdc
-0,         23,         23,        1,   864000, 0x4a085344
-0,         24,         24,        1,   864000, 0xc21b943c
-0,         25,         25,        1,   864000, 0xfaef6ed4
-0,         26,         26,        1,   864000, 0xa3e9163c
-0,         27,         27,        1,   864000, 0x917e2be4
-0,         28,         28,        1,   864000, 0x2d89d534
-0,         29,         29,        1,   864000, 0x6fe5a9e4
-0,         30,         30,        1,   864000, 0x71af29ec
-0,         31,         31,        1,   864000, 0x8f33f6ad
-0,         32,         32,        1,   864000, 0xe7d46a24
-0,         33,         33,        1,   864000, 0xb631e044
-0,         34,         34,        1,   864000, 0x77db01cb
-0,         35,         35,        1,   864000, 0x9861b6ec
-0,         36,         36,        1,   864000, 0x973bd263
-0,         37,         37,        1,   864000, 0xdd4c175b
-0,         38,         38,        1,   864000, 0xdc28469b
-0,         39,         39,        1,   864000, 0x67393ebb
-0,         40,         40,        1,   864000, 0x01a06813
-0,         41,         41,        1,   864000, 0x63e88f73
-0,         42,         42,        1,   864000, 0x3ffbdd73
-0,         43,         43,        1,   864000, 0xd25f790b
-0,         44,         44,        1,   864000, 0x14e3c5d3
-0,         45,         45,        1,   864000, 0x0d3d1202
-0,         46,         46,        1,   864000, 0x69decf03
-0,         47,         47,        1,   864000, 0x1b20ab93
-0,         48,         48,        1,   864000, 0xee2f8d4a
-0,         49,         49,        1,   864000, 0xaac44c52
-0,         50,         50,        1,   864000, 0x3f874a5a
-0,         51,         51,        1,   864000, 0x239b2d7a
-0,         52,         52,        1,   864000, 0xb85db552
-0,         53,         53,        1,   864000, 0xb12962a2
-0,         54,         54,        1,   864000, 0xb8270fd9
-0,         55,         55,        1,   864000, 0x14930601
-0,         56,         56,        1,   864000, 0x827a15c1
-0,         57,         57,        1,   864000, 0xe31011d1
-0,         58,         58,        1,   864000, 0xcd2154c1
-0,         59,         59,        1,   864000, 0xad02dbd9
-0,         60,         60,        1,   864000, 0x40c17d58
-0,         61,         61,        1,   864000, 0x8219e3b9
-0,         62,         62,        1,   864000, 0x2d348340
-0,         63,         63,        1,   864000, 0x6b61dfc9
-0,         64,         64,        1,   864000, 0xc8d95be1
-0,         65,         65,        1,   864000, 0x70ba0918
-0,         66,         66,        1,   864000, 0xdc728131
-0,         67,         67,        1,   864000, 0x9b054a10
-0,         68,         68,        1,   864000, 0x3983f751
-0,         69,         69,        1,   864000, 0x325fe1a9
-0,         70,         70,        1,   864000, 0x7a41eac0
-0,         71,         71,        1,   864000, 0x324372a8
-0,         72,         72,        1,   864000, 0xc014ea18
-0,         73,         73,        1,   864000, 0x1a506a1f
-0,         74,         74,        1,   864000, 0x47b59557
-0,         75,         75,        1,   864000, 0x5f2e194f
-0,         76,         76,        1,   864000, 0x9f6abb68
-0,         77,         77,        1,   864000, 0x831d2b97
-0,         78,         78,        1,   864000, 0x0635af7f
-0,         79,         79,        1,   864000, 0xe54a5626
-0,         80,         80,        1,   864000, 0x704dca4f
-0,         81,         81,        1,   864000, 0x47de6676
-0,         82,         82,        1,   864000, 0x609705fd
-0,         83,         83,        1,   864000, 0x8d92e086
-0,         84,         84,        1,   864000, 0xdb7dab5e
-0,         85,         85,        1,   864000, 0xe6ccb686
-0,         86,         86,        1,   864000, 0x0d137f66
-0,         87,         87,        1,   864000, 0xd200035d
-0,         88,         88,        1,   864000, 0x7dcb959d
-0,         89,         89,        1,   864000, 0xee849f75
-0,         90,         90,        1,   864000, 0x89d14acd
-0,         91,         91,        1,   864000, 0x3738029d
-0,         92,         92,        1,   864000, 0x6f4c4395
-0,         93,         93,        1,   864000, 0x06334395
-0,         94,         94,        1,   864000, 0x238b7c94
-0,         95,         95,        1,   864000, 0xfa5d1e14
-0,         96,         96,        1,   864000, 0x50b10e54
-0,         97,         97,        1,   864000, 0x9ed3b6e4
-0,         98,         98,        1,   864000, 0x68da9374
-0,         99,         99,        1,   864000, 0xb32a137c
-0,        100,        100,        1,   864000, 0x577d5084
-0,        101,        101,        1,   864000, 0xd262176b
-0,        102,        102,        1,   864000, 0xf58b44b3
-0,        103,        103,        1,   864000, 0xd0828edc
-0,        104,        104,        1,   864000, 0xc91a7544
-0,        105,        105,        1,   864000, 0x18ae7f1c
-0,        106,        106,        1,   864000, 0x82623643
-0,        107,        107,        1,   864000, 0x9cf82cfb
-0,        108,        108,        1,   864000, 0x93ad116b
-0,        109,        109,        1,   864000, 0xa669044b
-0,        110,        110,        1,   864000, 0x8adf88c3
-0,        111,        111,        1,   864000, 0xb83fb413
-0,        112,        112,        1,   864000, 0xb9e291f3
-0,        113,        113,        1,   864000, 0x5833dcc3
-0,        114,        114,        1,   864000, 0x4ab825aa
-0,        115,        115,        1,   864000, 0xb52c3b53
-0,        116,        116,        1,   864000, 0x0cb0dd53
-0,        117,        117,        1,   864000, 0x98b8dd52
-0,        118,        118,        1,   864000, 0x989230ba
-0,        119,        119,        1,   864000, 0xaed4c073
-0,        120,        120,        1,   864000, 0x76a7c83a
-0,        121,        121,        1,   864000, 0x02711eea
-0,        122,        122,        1,   864000, 0x8de65fe2
-0,        123,        123,        1,   864000, 0xc1163689
-0,        124,        124,        1,   864000, 0xc04f8b31
-0,        125,        125,        1,   864000, 0x69218d2a
-0,        126,        126,        1,   864000, 0x7e3abe62
-0,        127,        127,        1,   864000, 0x00ebe27a
-0,        128,        128,        1,   864000, 0x34803f11
-0,        129,        129,        1,   864000, 0x85591cd9
-0,        130,        130,        1,   864000, 0x8422fb51
-0,        131,        131,        1,   864000, 0x67c759e1
-0,        132,        132,        1,   864000, 0x4ac36af1
-0,        133,        133,        1,   864000, 0xdf00fca2
-0,        134,        134,        1,   864000, 0x74c633d1
-0,        135,        135,        1,   864000, 0x00251c31
-0,        136,        136,        1,   864000, 0x6d12a499
-0,        137,        137,        1,   864000, 0x1b6492e1
-0,        138,        138,        1,   864000, 0xdfc9a2a1
-0,        139,        139,        1,   864000, 0x33dcac79
-0,        140,        140,        1,   864000, 0x2305a499
-0,        141,        141,        1,   864000, 0xe1f3ae71
-0,        142,        142,        1,   864000, 0xc0cc92e1
-0,        143,        143,        1,   864000, 0x53d3b261
-0,        144,        144,        1,   864000, 0xf953aa81
-0,        145,        145,        1,   864000, 0x4108da69
-0,        146,        146,        1,   864000, 0xd6acf9e9
-0,        147,        147,        1,   864000, 0xb97ed900
-0,        148,        148,        1,   864000, 0x1d8b7a80
-0,        149,        149,        1,   864000, 0xd5406cb8
-0,        150,        150,        1,   864000, 0x5aa34948
-0,        151,        151,        1,   864000, 0x328eee01
-0,        152,        152,        1,   864000, 0xac92e621
-0,        153,        153,        1,   864000, 0x4fa1f5e1
-0,        154,        154,        1,   864000, 0xf7c4e8a8
-0,        155,        155,        1,   864000, 0xc358bd58
-0,        156,        156,        1,   864000, 0x29ec4b27
-0,        157,        157,        1,   864000, 0xf7219c88
-0,        158,        158,        1,   864000, 0xe77ff130
-0,        159,        159,        1,   864000, 0x73683417
-0,        160,        160,        1,   864000, 0x08b6be77
-0,        161,        161,        1,   864000, 0x3a7eea6f
-0,        162,        162,        1,   864000, 0xb319cce7
-0,        163,        163,        1,   864000, 0x9607b13e
-0,        164,        164,        1,   864000, 0x30543f0d
-0,        165,        165,        1,   864000, 0x56915a9e
-0,        166,        166,        1,   864000, 0x79f158a6
-0,        167,        167,        1,   864000, 0x498b8bd6
-0,        168,        168,        1,   864000, 0xe9ad7046
-0,        169,        169,        1,   864000, 0xe9ad7046
-0,        170,        170,        1,   864000, 0x10317e0e
-0,        171,        171,        1,   864000, 0x10317e0e
-0,        172,        172,        1,   864000, 0x10317e0e
-0,        173,        173,        1,   864000, 0x99ec7046
-0,        174,        174,        1,   864000, 0x924d46ee
-0,        175,        175,        1,   864000, 0x98bf333e
-0,        176,        176,        1,   864000, 0xb2625c96
-0,        177,        177,        1,   864000, 0xb46b3926
-0,        178,        178,        1,   864000, 0xeb4e5c96
-0,        179,        179,        1,   864000, 0x87154ece
-0,        180,        180,        1,   864000, 0x9e4c666e
-0,        181,        181,        1,   864000, 0x65b53d16
-0,        182,        182,        1,   864000, 0x99e85e8e
-0,        183,        183,        1,   864000, 0x650ba17e
-0,        184,        184,        1,   864000, 0x1ecb000e
-0,        185,        185,        1,   864000, 0xb942327d
-0,        186,        186,        1,   864000, 0x1bf20925
-0,        187,        187,        1,   864000, 0x61dba6a5
-0,        188,        188,        1,   864000, 0x5de16d8d
-0,        189,        189,        1,   864000, 0x4eb1f75d
-0,        190,        190,        1,   864000, 0x4eb1f75d
-0,        191,        191,        1,   864000, 0xd0750144
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x400
+#sar 0: 0/1
+0,          0,          0,        1,   864000, 0xd6929ea7
+0,          1,          1,        1,   864000, 0x9d5283fa
+0,          2,          2,        1,   864000, 0xcec52d42
+0,          3,          3,        1,   864000, 0x34d5943e
+0,          4,          4,        1,   864000, 0x5bd0b2a8
+0,          5,          5,        1,   864000, 0x41f1c468
+0,          6,          6,        1,   864000, 0x16aa54b9
+0,          7,          7,        1,   864000, 0xdb92e88a
+0,          8,          8,        1,   864000, 0x0ae5d695
+0,          9,          9,        1,   864000, 0x2c338d33
+0,         10,         10,        1,   864000, 0x2c338d33
+0,         11,         11,        1,   864000, 0x2c338d33
+0,         12,         12,        1,   864000, 0xd9c1152f
+0,         13,         13,        1,   864000, 0x9833bf29
+0,         14,         14,        1,   864000, 0xbedbe1bc
+0,         15,         15,        1,   864000, 0xd137d921
+0,         16,         16,        1,   864000, 0xcb0f967a
+0,         17,         17,        1,   864000, 0x931a2881
+0,         18,         18,        1,   864000, 0xeb8ca351
+0,         19,         19,        1,   864000, 0xe2f66886
+0,         20,         20,        1,   864000, 0xb81fb99e
+0,         21,         21,        1,   864000, 0x2048a4d9
+0,         22,         22,        1,   864000, 0x145b514f
+0,         23,         23,        1,   864000, 0xcb6236f4
+0,         24,         24,        1,   864000, 0x6d2d79db
+0,         25,         25,        1,   864000, 0xadca5356
+0,         26,         26,        1,   864000, 0x5d51f80c
+0,         27,         27,        1,   864000, 0x9e240e68
+0,         28,         28,        1,   864000, 0xcafcbcc2
+0,         29,         29,        1,   864000, 0x76f99028
+0,         30,         30,        1,   864000, 0xd7450c61
+0,         31,         31,        1,   864000, 0x1431d79c
+0,         32,         32,        1,   864000, 0x081a4e30
+0,         33,         33,        1,   864000, 0x0437c7d4
+0,         34,         34,        1,   864000, 0xb4bbea4b
+0,         35,         35,        1,   864000, 0x0a149d41
+0,         36,         36,        1,   864000, 0xf7dbc0d5
+0,         37,         37,        1,   864000, 0x6933003c
+0,         38,         38,        1,   864000, 0x18ce30e4
+0,         39,         39,        1,   864000, 0x8c8728c8
+0,         40,         40,        1,   864000, 0x37b6535b
+0,         41,         41,        1,   864000, 0xcdab7be7
+0,         42,         42,        1,   864000, 0xe1e1cbe7
+0,         43,         43,        1,   864000, 0x1d476482
+0,         44,         44,        1,   864000, 0x0ae0b393
+0,         45,         45,        1,   864000, 0x49140206
+0,         46,         46,        1,   864000, 0xe9f9bd09
+0,         47,         47,        1,   864000, 0x89a7988b
+0,         48,         48,        1,   864000, 0x24f780a7
+0,         49,         49,        1,   864000, 0x88a53dc0
+0,         50,         50,        1,   864000, 0x27ed3bb9
+0,         51,         51,        1,   864000, 0xc8151dfd
+0,         52,         52,        1,   864000, 0xfcb8a9e0
+0,         53,         53,        1,   864000, 0xd6d554ba
+0,         54,         54,        1,   864000, 0xbc6e06c6
+0,         55,         55,        1,   864000, 0x6334fc94
+0,         56,         56,        1,   864000, 0x7a7e0cdb
+0,         57,         57,        1,   864000, 0xf96008cd
+0,         58,         58,        1,   864000, 0xffbc4dbb
+0,         59,         59,        1,   864000, 0x1071d886
+0,         60,         60,        1,   864000, 0x6b967ed3
+0,         61,         61,        1,   864000, 0xd370e0a2
+0,         62,         62,        1,   864000, 0x4cca84e8
+0,         63,         63,        1,   864000, 0xd46bdc94
+0,         64,         64,        1,   864000, 0x102a54bf
+0,         65,         65,        1,   864000, 0xe39406cb
+0,         66,         66,        1,   864000, 0x9bb07ad9
+0,         67,         67,        1,   864000, 0xd3b749b2
+0,         68,         68,        1,   864000, 0x59faf47d
+0,         69,         69,        1,   864000, 0xba38de30
+0,         70,         70,        1,   864000, 0x7084eed8
+0,         71,         71,        1,   864000, 0xa966732d
+0,         72,         72,        1,   864000, 0xb9f1ee2b
+0,         73,         73,        1,   864000, 0x09267201
+0,         74,         74,        1,   864000, 0xc6b09e30
+0,         75,         75,        1,   864000, 0x080d1e77
+0,         76,         76,        1,   864000, 0xe28bbdc5
+0,         77,         77,        1,   864000, 0x230a30f8
+0,         78,         78,        1,   864000, 0x4d0bb8cd
+0,         79,         79,        1,   864000, 0x96096417
+0,         80,         80,        1,   864000, 0x7467d417
+0,         81,         81,        1,   864000, 0xbcc07491
+0,         82,         82,        1,   864000, 0x794718d7
+0,         83,         83,        1,   864000, 0xf23ff243
+0,         84,         84,        1,   864000, 0x9961bb86
+0,         85,         85,        1,   864000, 0x7be4c703
+0,         86,         86,        1,   864000, 0x727f8e3f
+0,         87,         87,        1,   864000, 0xda421623
+0,         88,         88,        1,   864000, 0xca69ac6b
+0,         89,         89,        1,   864000, 0x67aeb68e
+0,         90,         90,        1,   864000, 0x3b665f61
+0,         91,         91,        1,   864000, 0x3716150b
+0,         92,         92,        1,   864000, 0x2dcd57f2
+0,         93,         93,        1,   864000, 0x800257f2
+0,         94,         94,        1,   864000, 0x10de99ef
+0,         95,         95,        1,   864000, 0x3438389f
+0,         96,         96,        1,   864000, 0x42682867
+0,         97,         97,        1,   864000, 0x9d64d5a9
+0,         98,         98,        1,   864000, 0x9e2eb12b
+0,         99,         99,        1,   864000, 0xb9f42d64
+0,        100,        100,        1,   864000, 0xd6f36c3d
+0,        101,        101,        1,   864000, 0xfeaa390f
+0,        102,        102,        1,   864000, 0x3fe067b0
+0,        103,        103,        1,   864000, 0x45ebac70
+0,        104,        104,        1,   864000, 0xabfb9215
+0,        105,        105,        1,   864000, 0x20f79c38
+0,        106,        106,        1,   864000, 0x326858d2
+0,        107,        107,        1,   864000, 0x67154ef1
+0,        108,        108,        1,   864000, 0x2b3d328f
+0,        109,        109,        1,   864000, 0x8190250b
+0,        110,        110,        1,   864000, 0x31dead22
+0,        111,        111,        1,   864000, 0xa9b8d9bc
+0,        112,        112,        1,   864000, 0x330db698
+0,        113,        113,        1,   864000, 0x0ff803b1
+0,        114,        114,        1,   864000, 0xb7614eb4
+0,        115,        115,        1,   864000, 0x12c75d64
+0,        116,        116,        1,   864000, 0x622c03f3
+0,        117,        117,        1,   864000, 0x0ace0b90
+0,        118,        118,        1,   864000, 0x2c2b59c6
+0,        119,        119,        1,   864000, 0xadbbe628
+0,        120,        120,        1,   864000, 0x1371f576
+0,        121,        121,        1,   864000, 0x066a471c
+0,        122,        122,        1,   864000, 0x0e6f8a03
+0,        123,        123,        1,   864000, 0x4325670d
+0,        124,        124,        1,   864000, 0x2e8abe3a
+0,        125,        125,        1,   864000, 0x0ea8b8a4
+0,        126,        126,        1,   864000, 0x65e4eb53
+0,        127,        127,        1,   864000, 0xa03d108d
+0,        128,        128,        1,   864000, 0xd3d56fd6
+0,        129,        129,        1,   864000, 0x1b8e4c47
+0,        130,        130,        1,   864000, 0x5bd0316d
+0,        131,        131,        1,   864000, 0x49478b20
+0,        132,        132,        1,   864000, 0x3dae9cb2
+0,        133,        133,        1,   864000, 0x671e2b2a
+0,        134,        134,        1,   864000, 0x521763ee
+0,        135,        135,        1,   864000, 0x73dc4b9a
+0,        136,        136,        1,   864000, 0x3c95d7bf
+0,        137,        137,        1,   864000, 0x3abdc580
+0,        138,        138,        1,   864000, 0xae24d5b8
+0,        139,        139,        1,   864000, 0xe630dfdb
+0,        140,        140,        1,   864000, 0x229ad7bf
+0,        141,        141,        1,   864000, 0x3372e1e2
+0,        142,        142,        1,   864000, 0xa821c580
+0,        143,        143,        1,   864000, 0x7c78e5f0
+0,        144,        144,        1,   864000, 0x3324ddd4
+0,        145,        145,        1,   864000, 0x98580f38
+0,        146,        146,        1,   864000, 0x14072fa8
+0,        147,        147,        1,   864000, 0xdbb21510
+0,        148,        148,        1,   864000, 0x6a55b3b1
+0,        149,        149,        1,   864000, 0x7b5ba580
+0,        150,        150,        1,   864000, 0x2f5e8102
+0,        151,        151,        1,   864000, 0x691e2313
+0,        152,        152,        1,   864000, 0x423b1af7
+0,        153,        153,        1,   864000, 0x02842b2f
+0,        154,        154,        1,   864000, 0x8a4e24dd
+0,        155,        155,        1,   864000, 0xbbebf834
+0,        156,        156,        1,   864000, 0x0ba68a3b
+0,        157,        157,        1,   864000, 0x6390d66a
+0,        158,        158,        1,   864000, 0x6ee32da6
+0,        159,        159,        1,   864000, 0xace87229
+0,        160,        160,        1,   864000, 0xb2a10064
+0,        161,        161,        1,   864000, 0x9cc42dab
+0,        162,        162,        1,   864000, 0x32eb0f42
+0,        163,        163,        1,   864000, 0x6cb1fa03
+0,        164,        164,        1,   864000, 0xddd28c0a
+0,        165,        165,        1,   864000, 0xae5ca0cf
+0,        166,        166,        1,   864000, 0x4cb99ec8
+0,        167,        167,        1,   864000, 0xdad7d37e
+0,        168,        168,        1,   864000, 0x7090b71c
+0,        169,        169,        1,   864000, 0x7090b71c
+0,        170,        170,        1,   864000, 0x96a4c54d
+0,        171,        171,        1,   864000, 0x96a4c54d
+0,        172,        172,        1,   864000, 0x96a4c54d
+0,        173,        173,        1,   864000, 0xc47eb71c
+0,        174,        174,        1,   864000, 0xcd678c89
+0,        175,        175,        1,   864000, 0xb89e7843
+0,        176,        176,        1,   864000, 0x7f3aa2d6
+0,        177,        177,        1,   864000, 0xffc57e58
+0,        178,        178,        1,   864000, 0x091fa2d6
+0,        179,        179,        1,   864000, 0x3bc994a5
+0,        180,        180,        1,   864000, 0x73afacf9
+0,        181,        181,        1,   864000, 0x628b8266
+0,        182,        182,        1,   864000, 0xe2f2a4dd
+0,        183,        183,        1,   864000, 0x7118e9cb
+0,        184,        184,        1,   864000, 0x65b1438d
+0,        185,        185,        1,   864000, 0x51657ec8
+0,        186,        186,        1,   864000, 0x41a75435
+0,        187,        187,        1,   864000, 0xe387f665
+0,        188,        188,        1,   864000, 0x2baabb9a
+0,        189,        189,        1,   864000, 0xd2d74993
+0,        190,        190,        1,   864000, 0xd2d74993
+0,        191,        191,        1,   864000, 0xa7bf53b6
diff --git a/tests/ref/fate/vmnc-32bit b/tests/ref/fate/vmnc-32bit
index d55d88f66b..71117b986d 100644
--- a/tests/ref/fate/vmnc-32bit
+++ b/tests/ref/fate/vmnc-32bit
@@ -1,4 +1,8 @@
 #tb 0: 1/5
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1268x961
+#sar 0: 0/1
 0,          0,          0,        1,  3655644, 0x87973530
 0,          1,          1,        1,  3655644, 0x87973530
 0,          2,          2,        1,  3655644, 0x3c3167fd
diff --git a/tests/ref/fate/vorbis-1833-chapters b/tests/ref/fate/vorbis-1833-chapters
new file mode 100644
index 0000000000..46bd77ad95
--- /dev/null
+++ b/tests/ref/fate/vorbis-1833-chapters
@@ -0,0 +1,36 @@
+[CHAPTER]
+id=1
+time_base=1/1000
+start=0
+start_time=0.000000
+end=5000
+end_time=5.000000
+TAG:title=start
+[/CHAPTER]
+[CHAPTER]
+id=2
+time_base=1/1000
+start=5000
+start_time=5.000000
+end=10500
+end_time=10.500000
+TAG:title=Five Seconds
+[/CHAPTER]
+[CHAPTER]
+id=3
+time_base=1/1000
+start=10500
+start_time=10.500000
+end=15000
+end_time=15.000000
+TAG:title=Ten point 5 seconds
+[/CHAPTER]
+[CHAPTER]
+id=4
+time_base=1/1000
+start=15000
+start_time=15.000000
+end=19849
+end_time=19.849000
+TAG:title=15 sec - over soon
+[/CHAPTER]
diff --git a/tests/ref/fate/vp31 b/tests/ref/fate/vp31
index 48221c1b02..e41d37271a 100644
--- a/tests/ref/fate/vp31
+++ b/tests/ref/fate/vp31
@@ -1,4 +1,8 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x272
+#sar 0: 0/1
 0,          0,          0,        1,   261120, 0xc50dec2b
 0,          1,          1,        1,   261120, 0xaa8d4441
 0,          2,          2,        1,   261120, 0x932b0d44
diff --git a/tests/ref/fate/vp5 b/tests/ref/fate/vp5
index 0e601ba811..2469a3ec21 100644
--- a/tests/ref/fate/vp5
+++ b/tests/ref/fate/vp5
@@ -1,4 +1,8 @@
 #tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 512x304
+#sar 0: 0/1
 0,          0,          0,        1,   233472, 0x27488413
 0,          1,          1,        1,   233472, 0x4af384b5
 0,          2,          2,        1,   233472, 0x948d845d
@@ -245,4 +249,4 @@
 0,        243,        243,        1,   233472, 0x6f530ac6
 0,        244,        244,        1,   233472, 0x94f7466c
 0,        245,        245,        1,   233472, 0xa8c1d365
-0,        246,        246,        1,   233472, 0xedcff050
+0,        246,        246,        1,   233472, 0xbf73f1b7
diff --git a/tests/ref/fate/vp60 b/tests/ref/fate/vp60
index 5e4b62c60f..4becf2a8e2 100644
--- a/tests/ref/fate/vp60
+++ b/tests/ref/fate/vp60
@@ -1,4 +1,8 @@
 #tb 0: 32767/982027
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 192x192
+#sar 0: 0/1
 0,          0,          0,        1,    55296, 0x6a3202a3
 0,          1,          1,        1,    55296, 0x2af202eb
 0,          2,          2,        1,    55296, 0xa1a40388
@@ -6,8 +10,8 @@
 0,          4,          4,        1,    55296, 0x17720594
 0,          5,          5,        1,    55296, 0x49440805
 0,          6,          6,        1,    55296, 0x5b2e0d32
-0,          7,          7,        1,    55296, 0x207891c1
-0,          8,          8,        1,    55296, 0x502da4cd
+0,          7,          7,        1,    55296, 0x5cf691c3
+0,          8,          8,        1,    55296, 0x61a5a4c8
 0,          9,          9,        1,    55296, 0x75a22a75
 0,         10,         10,        1,    55296, 0xd55099af
 0,         11,         11,        1,    55296, 0x48778bb6
@@ -16,85 +20,85 @@
 0,         14,         14,        1,    55296, 0xc83d9b90
 0,         15,         15,        1,    55296, 0x567877b8
 0,         16,         16,        1,    55296, 0x334c7f6e
-0,         17,         17,        1,    55296, 0x8717945c
-0,         18,         18,        1,    55296, 0xe432831e
-0,         19,         19,        1,    55296, 0x032e8d2d
+0,         17,         17,        1,    55296, 0x9317945c
+0,         18,         18,        1,    55296, 0xf032831e
+0,         19,         19,        1,    55296, 0x7b6c8d2c
 0,         20,         20,        1,    55296, 0x37109fd6
 0,         21,         21,        1,    55296, 0xe9b0b61b
 0,         22,         22,        1,    55296, 0x7385dae8
-0,         23,         23,        1,    55296, 0x74b8a9f5
-0,         24,         24,        1,    55296, 0xbce2e218
-0,         25,         25,        1,    55296, 0x0ab6c623
-0,         26,         26,        1,    55296, 0x2234d6d6
-0,         27,         27,        1,    55296, 0xd18be4d6
-0,         28,         28,        1,    55296, 0x5247ecc9
-0,         29,         29,        1,    55296, 0xc89f10ca
-0,         30,         30,        1,    55296, 0x16181f87
-0,         31,         31,        1,    55296, 0x893bfa85
-0,         32,         32,        1,    55296, 0x1fd9f1c0
-0,         33,         33,        1,    55296, 0xa2e8e6a9
-0,         34,         34,        1,    55296, 0x1b42dfd5
-0,         35,         35,        1,    55296, 0x0fa9f509
-0,         36,         36,        1,    55296, 0x4449c216
-0,         37,         37,        1,    55296, 0xb66baa36
-0,         38,         38,        1,    55296, 0x38c19f3b
-0,         39,         39,        1,    55296, 0xcdce83a0
+0,         23,         23,        1,    55296, 0x74a8a9f5
+0,         24,         24,        1,    55296, 0xbcd2e218
+0,         25,         25,        1,    55296, 0x0aa6c623
+0,         26,         26,        1,    55296, 0x2224d6d6
+0,         27,         27,        1,    55296, 0x8c8ee4d9
+0,         28,         28,        1,    55296, 0x0d4ceccc
+0,         29,         29,        1,    55296, 0x623f10c7
+0,         30,         30,        1,    55296, 0x13a61f8f
+0,         31,         31,        1,    55296, 0x5343fa8d
+0,         32,         32,        1,    55296, 0x21fef1b5
+0,         33,         33,        1,    55296, 0x380de6b4
+0,         34,         34,        1,    55296, 0x04bedfd3
+0,         35,         35,        1,    55296, 0x428cf510
+0,         36,         36,        1,    55296, 0xbca8c214
+0,         37,         37,        1,    55296, 0x947faa34
+0,         38,         38,        1,    55296, 0x70769f45
+0,         39,         39,        1,    55296, 0xcb9483ad
 0,         40,         40,        1,    55296, 0xac4ea82b
-0,         41,         41,        1,    55296, 0xb77a6979
-0,         42,         42,        1,    55296, 0xc8834ec2
-0,         43,         43,        1,    55296, 0x181d3f0f
-0,         44,         44,        1,    55296, 0x2ae04252
-0,         45,         45,        1,    55296, 0x07633c18
-0,         46,         46,        1,    55296, 0xdc6a3340
-0,         47,         47,        1,    55296, 0xa456ebb1
-0,         48,         48,        1,    55296, 0xbf7de5e2
-0,         49,         49,        1,    55296, 0x54a1c39b
-0,         50,         50,        1,    55296, 0x08fc9423
-0,         51,         51,        1,    55296, 0x926f968a
-0,         52,         52,        1,    55296, 0x5c908481
-0,         53,         53,        1,    55296, 0x6b257f16
-0,         54,         54,        1,    55296, 0xbaf8658a
-0,         55,         55,        1,    55296, 0x61c957b1
-0,         56,         56,        1,    55296, 0xa6d181ff
-0,         57,         57,        1,    55296, 0xef476e69
-0,         58,         58,        1,    55296, 0x74f72f9a
-0,         59,         59,        1,    55296, 0x3a9328e9
-0,         60,         60,        1,    55296, 0xbe962874
-0,         61,         61,        1,    55296, 0x5f8b58cc
-0,         62,         62,        1,    55296, 0x1e066d22
-0,         63,         63,        1,    55296, 0x9ef72b34
-0,         64,         64,        1,    55296, 0x525c2bb1
-0,         65,         65,        1,    55296, 0x8e5a20a3
-0,         66,         66,        1,    55296, 0x1c6723d0
-0,         67,         67,        1,    55296, 0x2b1023c8
-0,         68,         68,        1,    55296, 0x8f682691
-0,         69,         69,        1,    55296, 0x3a0624f5
+0,         41,         41,        1,    55296, 0xa3816977
+0,         42,         42,        1,    55296, 0xcfd54ec4
+0,         43,         43,        1,    55296, 0x97743f0e
+0,         44,         44,        1,    55296, 0x4cb4424d
+0,         45,         45,        1,    55296, 0x0b503c11
+0,         46,         46,        1,    55296, 0x879f333a
+0,         47,         47,        1,    55296, 0x6ff9eb8f
+0,         48,         48,        1,    55296, 0x7cd6e5af
+0,         49,         49,        1,    55296, 0x44e2c36f
+0,         50,         50,        1,    55296, 0x4e8993fb
+0,         51,         51,        1,    55296, 0xf0bb9664
+0,         52,         52,        1,    55296, 0xde608458
+0,         53,         53,        1,    55296, 0xb3017f01
+0,         54,         54,        1,    55296, 0x2e096579
+0,         55,         55,        1,    55296, 0xd7295790
+0,         56,         56,        1,    55296, 0xc40b81cb
+0,         57,         57,        1,    55296, 0x53a86e41
+0,         58,         58,        1,    55296, 0x74142f89
+0,         59,         59,        1,    55296, 0x2a1428ce
+0,         60,         60,        1,    55296, 0x5d0c2852
+0,         61,         61,        1,    55296, 0x162058a4
+0,         62,         62,        1,    55296, 0x4e8c6ce8
+0,         63,         63,        1,    55296, 0x1d382af2
+0,         64,         64,        1,    55296, 0x35dd2b75
+0,         65,         65,        1,    55296, 0x1e4c205f
+0,         66,         66,        1,    55296, 0x74a22383
+0,         67,         67,        1,    55296, 0x6ddb237d
+0,         68,         68,        1,    55296, 0xd290263b
+0,         69,         69,        1,    55296, 0xc778249f
 0,         70,         70,        1,    55296, 0xbc1046fb
-0,         71,         71,        1,    55296, 0x2859470e
-0,         72,         72,        1,    55296, 0x61d45a12
-0,         73,         73,        1,    55296, 0xa68853b6
-0,         74,         74,        1,    55296, 0x36543ce4
-0,         75,         75,        1,    55296, 0x95b953d4
-0,         76,         76,        1,    55296, 0x804b3c53
-0,         77,         77,        1,    55296, 0x743960f6
-0,         78,         78,        1,    55296, 0x23916b9c
-0,         79,         79,        1,    55296, 0x8f5a59e3
-0,         80,         80,        1,    55296, 0xf1285f83
-0,         81,         81,        1,    55296, 0xde75640f
-0,         82,         82,        1,    55296, 0xde146188
-0,         83,         83,        1,    55296, 0xb5315cc9
+0,         71,         71,        1,    55296, 0xf44d470f
+0,         72,         72,        1,    55296, 0x28d85a11
+0,         73,         73,        1,    55296, 0xa68953b6
+0,         74,         74,        1,    55296, 0x02593ce5
+0,         75,         75,        1,    55296, 0x61be53d5
+0,         76,         76,        1,    55296, 0x4c503c54
+0,         77,         77,        1,    55296, 0x3d3e60f7
+0,         78,         78,        1,    55296, 0xec876b9d
+0,         79,         79,        1,    55296, 0x5b5f59e4
+0,         80,         80,        1,    55296, 0xbd2d5f84
+0,         81,         81,        1,    55296, 0xaa7a6410
+0,         82,         82,        1,    55296, 0xaa196189
+0,         83,         83,        1,    55296, 0x81365cca
 0,         84,         84,        1,    55296, 0xa85f6861
-0,         85,         85,        1,    55296, 0x4fda562f
-0,         86,         86,        1,    55296, 0xa0185863
-0,         87,         87,        1,    55296, 0xe4dc5a5f
-0,         88,         88,        1,    55296, 0x8a2aabb6
-0,         89,         89,        1,    55296, 0x3ba89b4f
-0,         90,         90,        1,    55296, 0x82b07c21
-0,         91,         91,        1,    55296, 0xb7998478
-0,         92,         92,        1,    55296, 0xceca8046
-0,         93,         93,        1,    55296, 0xe652b325
-0,         94,         94,        1,    55296, 0xc26bb607
-0,         95,         95,        1,    55296, 0x40c99200
+0,         85,         85,        1,    55296, 0xcb46562e
+0,         86,         86,        1,    55296, 0x1b935862
+0,         87,         87,        1,    55296, 0x80a45a60
+0,         88,         88,        1,    55296, 0x8e8aabba
+0,         89,         89,        1,    55296, 0x38939b53
+0,         90,         90,        1,    55296, 0x4f397c22
+0,         91,         91,        1,    55296, 0x7d0d8476
+0,         92,         92,        1,    55296, 0x943e8044
+0,         93,         93,        1,    55296, 0xabc6b323
+0,         94,         94,        1,    55296, 0x87dfb605
+0,         95,         95,        1,    55296, 0x5ca89202
 0,         96,         96,        1,    55296, 0x61bc9b27
 0,         97,         97,        1,    55296, 0x1e4baa30
 0,         98,         98,        1,    55296, 0xd8a7adb0
@@ -110,25 +114,25 @@
 0,        108,        108,        1,    55296, 0xe208d626
 0,        109,        109,        1,    55296, 0x28cc0616
 0,        110,        110,        1,    55296, 0xc545179e
-0,        111,        111,        1,    55296, 0xdf9205af
-0,        112,        112,        1,    55296, 0x31d6ed99
-0,        113,        113,        1,    55296, 0x866bf86e
-0,        114,        114,        1,    55296, 0x0490fbd1
-0,        115,        115,        1,    55296, 0xe1102987
-0,        116,        116,        1,    55296, 0x7f860c29
-0,        117,        117,        1,    55296, 0xc3a91f7a
-0,        118,        118,        1,    55296, 0x69641a52
-0,        119,        119,        1,    55296, 0x05b12204
-0,        120,        120,        1,    55296, 0x715b6206
-0,        121,        121,        1,    55296, 0xdcf55139
-0,        122,        122,        1,    55296, 0x1369f746
+0,        111,        111,        1,    55296, 0xd38e05af
+0,        112,        112,        1,    55296, 0x25d6ed99
+0,        113,        113,        1,    55296, 0x7a6bf86e
+0,        114,        114,        1,    55296, 0xbb3bfbcd
+0,        115,        115,        1,    55296, 0x33de2984
+0,        116,        116,        1,    55296, 0xd5b10c27
+0,        117,        117,        1,    55296, 0x19e31f78
+0,        118,        118,        1,    55296, 0xf62f1a4f
+0,        119,        119,        1,    55296, 0x3f792203
+0,        120,        120,        1,    55296, 0xe4ed6202
+0,        121,        121,        1,    55296, 0xee265136
+0,        122,        122,        1,    55296, 0x408af73c
 0,        123,        123,        1,    55296, 0xc1533ef5
-0,        124,        124,        1,    55296, 0xc00ff85f
-0,        125,        125,        1,    55296, 0x4f5f70dc
-0,        126,        126,        1,    55296, 0x85720ccc
-0,        127,        127,        1,    55296, 0xfdff0780
-0,        128,        128,        1,    55296, 0x57ef04ff
-0,        129,        129,        1,    55296, 0xbf94041f
-0,        130,        130,        1,    55296, 0x4cee0392
-0,        131,        131,        1,    55296, 0x80160314
-0,        132,        132,        1,    55296, 0x396802af
+0,        124,        124,        1,    55296, 0xf671f85d
+0,        125,        125,        1,    55296, 0xae2670e0
+0,        126,        126,        1,    55296, 0xe4390cd0
+0,        127,        127,        1,    55296, 0x5cd50784
+0,        128,        128,        1,    55296, 0x05880500
+0,        129,        129,        1,    55296, 0x6d2d0420
+0,        130,        130,        1,    55296, 0xfa780393
+0,        131,        131,        1,    55296, 0x2daf0315
+0,        132,        132,        1,    55296, 0x982f02b3
diff --git a/tests/ref/fate/vp61 b/tests/ref/fate/vp61
index be1fe530bd..2d3beea189 100644
--- a/tests/ref/fate/vp61
+++ b/tests/ref/fate/vp61
@@ -1,4 +1,8 @@
 #tb 0: 32767/982027
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 112x112
+#sar 0: 0/1
 0,          0,          0,        1,    18816, 0xc3fe9fc7
 0,          1,          1,        1,    18816, 0x6ddf972f
 0,          2,          2,        1,    18816, 0x72808b6e
diff --git a/tests/ref/fate/vp6a b/tests/ref/fate/vp6a
index 6ce8486284..b4f33630f7 100644
--- a/tests/ref/fate/vp6a
+++ b/tests/ref/fate/vp6a
@@ -1,94 +1,98 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   135000, 0x9dceed6d
-0,        249,        249,        0,   135000, 0xcb87787f
-0,        499,        499,        0,   135000, 0xdb4361ce
-0,        749,        749,        0,   135000, 0xb8fd81c2
-0,       1000,       1000,        0,   135000, 0xbf86a7af
-0,       1249,       1249,        0,   135000, 0x2e7787e3
-0,       1499,       1499,        0,   135000, 0x6cec6ebd
-0,       1749,       1749,        0,   135000, 0xa4d08c07
-0,       2000,       2000,        0,   135000, 0x1be48faf
-0,       2249,       2249,        0,   135000, 0xf3cd8ede
-0,       2499,       2499,        0,   135000, 0x33ec8a49
-0,       2749,       2749,        0,   135000, 0x11e887ec
-0,       3000,       3000,        0,   135000, 0x3e215c25
-0,       3249,       3249,        0,   135000, 0x1a2cb3f8
-0,       3499,       3499,        0,   135000, 0x7fb0e48a
-0,       3749,       3749,        0,   135000, 0x749f3738
-0,       4000,       4000,        0,   135000, 0x686e78e9
-0,       4249,       4249,        0,   135000, 0x29515bc7
-0,       4499,       4499,        0,   135000, 0x987126bd
-0,       4749,       4749,        0,   135000, 0xdf77bb13
-0,       5000,       5000,        0,   135000, 0x5fb1468a
-0,       5249,       5249,        0,   135000, 0x06ea50ea
-0,       5499,       5499,        0,   135000, 0x7bd9c715
-0,       5749,       5749,        0,   135000, 0xdd6e6831
-0,       6000,       6000,        0,   135000, 0x0ee3760f
-0,       6249,       6249,        0,   135000, 0xc7984dc8
-0,       6499,       6499,        0,   135000, 0x7e385bff
-0,       6749,       6749,        0,   135000, 0xae155ab9
-0,       7000,       7000,        0,   135000, 0xc05ee8f7
-0,       7249,       7249,        0,   135000, 0x93de3392
-0,       7499,       7499,        0,   135000, 0xfe45b38b
-0,       7749,       7749,        0,   135000, 0xeb5ed72c
-0,       8000,       8000,        0,   135000, 0x0794cb57
-0,       8249,       8249,        0,   135000, 0x2578c6e5
-0,       8499,       8499,        0,   135000, 0x78486707
-0,       8749,       8749,        0,   135000, 0x41e1f0e6
-0,       9000,       9000,        0,   135000, 0x4508eb76
-0,       9249,       9249,        0,   135000, 0xd8c087f3
-0,       9499,       9499,        0,   135000, 0x1a8db89a
-0,       9749,       9749,        0,   135000, 0x6dbd90c6
-0,      10000,      10000,        0,   135000, 0x0845e400
-0,      10249,      10249,        0,   135000, 0xe8b02fc2
-0,      10499,      10499,        0,   135000, 0x8007d813
-0,      10749,      10749,        0,   135000, 0xdfb04e69
-0,      11000,      11000,        0,   135000, 0x5746cf71
-0,      11249,      11249,        0,   135000, 0xe510299f
-0,      11499,      11499,        0,   135000, 0xeea0c829
-0,      11749,      11749,        0,   135000, 0x7c0578ab
-0,      12000,      12000,        0,   135000, 0xb1569ce9
-0,      12249,      12249,        0,   135000, 0x6c233986
-0,      12499,      12499,        0,   135000, 0x95b77f3d
-0,      12749,      12749,        0,   135000, 0xfc368d80
-0,      13000,      13000,        0,   135000, 0x5c73b064
-0,      13249,      13249,        0,   135000, 0x2206da8d
-0,      13499,      13499,        0,   135000, 0x62bb599e
-0,      13749,      13749,        0,   135000, 0x15a68991
-0,      14000,      14000,        0,   135000, 0x5f5eb810
-0,      14249,      14249,        0,   135000, 0x85a9634a
-0,      14499,      14499,        0,   135000, 0xf24b5c1a
-0,      14749,      14749,        0,   135000, 0x38034850
-0,      15000,      15000,        0,   135000, 0x48fd3599
-0,      15249,      15249,        0,   135000, 0xb9d62408
-0,      15499,      15499,        0,   135000, 0xaf202a21
-0,      15749,      15749,        0,   135000, 0x341aa582
-0,      16000,      16000,        0,   135000, 0x90cdc9bb
-0,      16249,      16249,        0,   135000, 0x0b52f319
-0,      16499,      16499,        0,   135000, 0xce61aa5e
-0,      16749,      16749,        0,   135000, 0x988acb45
-0,      17000,      17000,        0,   135000, 0xcd353664
-0,      17249,      17249,        0,   135000, 0xa80c8ce9
-0,      17499,      17499,        0,   135000, 0x15dce784
-0,      17749,      17749,        0,   135000, 0x16bd4519
-0,      18000,      18000,        0,   135000, 0x571712f3
-0,      18249,      18249,        0,   135000, 0x6b109f1e
-0,      18499,      18499,        0,   135000, 0x8e4c19aa
-0,      18749,      18749,        0,   135000, 0x4132bd4c
-0,      19000,      19000,        0,   135000, 0x5babafe2
-0,      19249,      19249,        0,   135000, 0xddef6313
-0,      19499,      19499,        0,   135000, 0x76d6b48b
-0,      19749,      19749,        0,   135000, 0x929e7702
-0,      20000,      20000,        0,   135000, 0x33f5e4a1
-0,      20249,      20249,        0,   135000, 0xdb7041bf
-0,      20499,      20499,        0,   135000, 0xbc761e04
-0,      20749,      20749,        0,   135000, 0x0b2a81e6
-0,      21000,      21000,        0,   135000, 0xf6fd20ea
-0,      21249,      21249,        0,   135000, 0x1894a26c
-0,      21499,      21499,        0,   135000, 0xb25e216f
-0,      21749,      21749,        0,   135000, 0x83bb02ee
-0,      22000,      22000,        0,   135000, 0x6952a3c3
-0,      22249,      22249,        0,   135000, 0x372184d6
-0,      22499,      22499,        0,   135000, 0x2ac47afe
-0,      22749,      22749,        0,   135000, 0x14c33a35
-0,      23000,      23000,        0,   135000, 0xdc08470e
+#tb 0: 1/4
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 300x180
+#sar 0: 0/1
+0,          0,          0,        1,   135000, 0x9dceed6d
+0,          1,          1,        1,   135000, 0x47e5778d
+0,          2,          2,        1,   135000, 0x5de36599
+0,          3,          3,        1,   135000, 0x540d8079
+0,          4,          4,        1,   135000, 0xba9ea534
+0,          5,          5,        1,   135000, 0xa75088f8
+0,          6,          6,        1,   135000, 0x7d867559
+0,          7,          7,        1,   135000, 0xcc678fee
+0,          8,          8,        1,   135000, 0x79c590b9
+0,          9,          9,        1,   135000, 0x87789918
+0,         10,         10,        1,   135000, 0xaa939213
+0,         11,         11,        1,   135000, 0x3912916d
+0,         12,         12,        1,   135000, 0x41305d0b
+0,         13,         13,        1,   135000, 0x2686b5dd
+0,         14,         14,        1,   135000, 0xa69ae422
+0,         15,         15,        1,   135000, 0x998a3478
+0,         16,         16,        1,   135000, 0x5842768d
+0,         17,         17,        1,   135000, 0xf6a85b16
+0,         18,         18,        1,   135000, 0x7a5b2708
+0,         19,         19,        1,   135000, 0x8b2abb63
+0,         20,         20,        1,   135000, 0x7dc8468b
+0,         21,         21,        1,   135000, 0x04d85001
+0,         22,         22,        1,   135000, 0x83e3c647
+0,         23,         23,        1,   135000, 0xcddd687e
+0,         24,         24,        1,   135000, 0x818e785e
+0,         25,         25,        1,   135000, 0x3a915080
+0,         26,         26,        1,   135000, 0x953d603d
+0,         27,         27,        1,   135000, 0x79005ebf
+0,         28,         28,        1,   135000, 0x80afec75
+0,         29,         29,        1,   135000, 0xfc8e376b
+0,         30,         30,        1,   135000, 0xf957b7ef
+0,         31,         31,        1,   135000, 0xe878da44
+0,         32,         32,        1,   135000, 0xe68ecca3
+0,         33,         33,        1,   135000, 0x1a2cc7d3
+0,         34,         34,        1,   135000, 0x4f346a69
+0,         35,         35,        1,   135000, 0x7a0cf4ac
+0,         36,         36,        1,   135000, 0x6d4eee7a
+0,         37,         37,        1,   135000, 0xf0688cbd
+0,         38,         38,        1,   135000, 0xca4abbbc
+0,         39,         39,        1,   135000, 0x87669519
+0,         40,         40,        1,   135000, 0xd090e9d7
+0,         41,         41,        1,   135000, 0xd7f536c1
+0,         42,         42,        1,   135000, 0x353ede54
+0,         43,         43,        1,   135000, 0xbc8f5358
+0,         44,         44,        1,   135000, 0xb52cd59a
+0,         45,         45,        1,   135000, 0x0b882eba
+0,         46,         46,        1,   135000, 0xc544cd54
+0,         47,         47,        1,   135000, 0x31ca7e73
+0,         48,         48,        1,   135000, 0xb1569ce9
+0,         49,         49,        1,   135000, 0x8bf4394f
+0,         50,         50,        1,   135000, 0xf413812a
+0,         51,         51,        1,   135000, 0xf2fa90ab
+0,         52,         52,        1,   135000, 0xdcd8b265
+0,         53,         53,        1,   135000, 0xa89cdba1
+0,         54,         54,        1,   135000, 0x212b59a5
+0,         55,         55,        1,   135000, 0x10c589c3
+0,         56,         56,        1,   135000, 0x432ab5b4
+0,         57,         57,        1,   135000, 0x85a9634a
+0,         58,         58,        1,   135000, 0x10db5b87
+0,         59,         59,        1,   135000, 0x583145d9
+0,         60,         60,        1,   135000, 0x7d3a33bd
+0,         61,         61,        1,   135000, 0xcf592423
+0,         62,         62,        1,   135000, 0xb59728e5
+0,         63,         63,        1,   135000, 0x1eeca660
+0,         64,         64,        1,   135000, 0xff7bcc34
+0,         65,         65,        1,   135000, 0x0ef8f271
+0,         66,         66,        1,   135000, 0x8c9ca8ee
+0,         67,         67,        1,   135000, 0x8a7ece34
+0,         68,         68,        1,   135000, 0x7d4c3b5d
+0,         69,         69,        1,   135000, 0x99118f21
+0,         70,         70,        1,   135000, 0xd97fe7e2
+0,         71,         71,        1,   135000, 0xf93842f1
+0,         72,         72,        1,   135000, 0x35c912e8
+0,         73,         73,        1,   135000, 0x14e59e97
+0,         74,         74,        1,   135000, 0x8e4c19aa
+0,         75,         75,        1,   135000, 0x4adfbc53
+0,         76,         76,        1,   135000, 0x0613adde
+0,         77,         77,        1,   135000, 0x8db264ab
+0,         78,         78,        1,   135000, 0x3948b619
+0,         79,         79,        1,   135000, 0x843d7c02
+0,         80,         80,        1,   135000, 0x534fea34
+0,         81,         81,        1,   135000, 0xdb7041bf
+0,         82,         82,        1,   135000, 0xd0ce1cce
+0,         83,         83,        1,   135000, 0x3c008335
+0,         84,         84,        1,   135000, 0xb699208f
+0,         85,         85,        1,   135000, 0xe07da3ca
+0,         86,         86,        1,   135000, 0x26331f41
+0,         87,         87,        1,   135000, 0x4e19fe83
+0,         88,         88,        1,   135000, 0xaa9a9e45
+0,         89,         89,        1,   135000, 0x336b7ed0
+0,         90,         90,        1,   135000, 0xc9bf7611
+0,         91,         91,        1,   135000, 0x14c33a35
+0,         92,         92,        1,   135000, 0xdc08470e
diff --git a/tests/ref/fate/vp6a-skip_alpha b/tests/ref/fate/vp6a-skip_alpha
new file mode 100644
index 0000000000..e2c435f402
--- /dev/null
+++ b/tests/ref/fate/vp6a-skip_alpha
@@ -0,0 +1,98 @@
+#tb 0: 1/4
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 300x180
+#sar 0: 0/1
+0,          0,          0,        1,    81000, 0xcb92962d
+0,          1,          1,        1,    81000, 0xae381904
+0,          2,          2,        1,    81000, 0x1fcc0c75
+0,          3,          3,        1,    81000, 0x023f0c21
+0,          4,          4,        1,    81000, 0xad691402
+0,          5,          5,        1,    81000, 0x42390be0
+0,          6,          6,        1,    81000, 0xc1c10a4e
+0,          7,          7,        1,    81000, 0x9c0315ac
+0,          8,          8,        1,    81000, 0xc2a315a7
+0,          9,          9,        1,    81000, 0x3a631392
+0,         10,         10,        1,    81000, 0x11591414
+0,         11,         11,        1,    81000, 0x1a551125
+0,         12,         12,        1,    81000, 0x2e1efa4f
+0,         13,         13,        1,    81000, 0x4aa3f016
+0,         14,         14,        1,    81000, 0x74c029d8
+0,         15,         15,        1,    81000, 0xdee9a98b
+0,         16,         16,        1,    81000, 0xdf3502d5
+0,         17,         17,        1,    81000, 0x4653536b
+0,         18,         18,        1,    81000, 0x7f658c75
+0,         19,         19,        1,    81000, 0xab18ff13
+0,         20,         20,        1,    81000, 0xac2b8f3b
+0,         21,         21,        1,    81000, 0xd61ff094
+0,         22,         22,        1,    81000, 0x425bfc2b
+0,         23,         23,        1,    81000, 0x6be7ecd3
+0,         24,         24,        1,    81000, 0x0b0ee65b
+0,         25,         25,        1,    81000, 0x3c6f146b
+0,         26,         26,        1,    81000, 0x27c4e9c8
+0,         27,         27,        1,    81000, 0x174022c4
+0,         28,         28,        1,    81000, 0x3320fe81
+0,         29,         29,        1,    81000, 0x7a3c342e
+0,         30,         30,        1,    81000, 0x448b4346
+0,         31,         31,        1,    81000, 0xd285b23d
+0,         32,         32,        1,    81000, 0x852ed590
+0,         33,         33,        1,    81000, 0xc9d3df17
+0,         34,         34,        1,    81000, 0x4d23727b
+0,         35,         35,        1,    81000, 0x1fae66cd
+0,         36,         36,        1,    81000, 0x384d54ab
+0,         37,         37,        1,    81000, 0x2fee6ba3
+0,         38,         38,        1,    81000, 0xd7ad6f59
+0,         39,         39,        1,    81000, 0xaf5e3e76
+0,         40,         40,        1,    81000, 0x10fceda4
+0,         41,         41,        1,    81000, 0xb26df92b
+0,         42,         42,        1,    81000, 0xd6676e08
+0,         43,         43,        1,    81000, 0xff6b1b95
+0,         44,         44,        1,    81000, 0x6196d598
+0,         45,         45,        1,    81000, 0x833ebf1b
+0,         46,         46,        1,    81000, 0x7b085af1
+0,         47,         47,        1,    81000, 0xe8f583b4
+0,         48,         48,        1,    81000, 0x3426d5e4
+0,         49,         49,        1,    81000, 0x214069ed
+0,         50,         50,        1,    81000, 0x7dbdfd3f
+0,         51,         51,        1,    81000, 0xf19b3f45
+0,         52,         52,        1,    81000, 0x0f05c7e2
+0,         53,         53,        1,    81000, 0xba94e323
+0,         54,         54,        1,    81000, 0x0de7b0c2
+0,         55,         55,        1,    81000, 0xfcf93c55
+0,         56,         56,        1,    81000, 0x8a8dbd55
+0,         57,         57,        1,    81000, 0xddf22b97
+0,         58,         58,        1,    81000, 0x49a830ff
+0,         59,         59,        1,    81000, 0x82ab2a4b
+0,         60,         60,        1,    81000, 0xd23420e5
+0,         61,         61,        1,    81000, 0x7c1017d1
+0,         62,         62,        1,    81000, 0x9aa61b38
+0,         63,         63,        1,    81000, 0x2a724a18
+0,         64,         64,        1,    81000, 0xc18055f2
+0,         65,         65,        1,    81000, 0xecba3855
+0,         66,         66,        1,    81000, 0x0eed6b0f
+0,         67,         67,        1,    81000, 0x4be73816
+0,         68,         68,        1,    81000, 0xa681214e
+0,         69,         69,        1,    81000, 0x4958f83d
+0,         70,         70,        1,    81000, 0xca0f0d61
+0,         71,         71,        1,    81000, 0x3c453de1
+0,         72,         72,        1,    81000, 0xff60360a
+0,         73,         73,        1,    81000, 0xdcef0949
+0,         74,         74,        1,    81000, 0xe5e3732d
+0,         75,         75,        1,    81000, 0x39747fd4
+0,         76,         76,        1,    81000, 0x6bec70e6
+0,         77,         77,        1,    81000, 0x7026a8c0
+0,         78,         78,        1,    81000, 0x92de5b61
+0,         79,         79,        1,    81000, 0x3f00507f
+0,         80,         80,        1,    81000, 0x5620c377
+0,         81,         81,        1,    81000, 0x39f5ed38
+0,         82,         82,        1,    81000, 0x6ee35d67
+0,         83,         83,        1,    81000, 0x4f99a409
+0,         84,         84,        1,    81000, 0x0a05b6ea
+0,         85,         85,        1,    81000, 0xd6c442d9
+0,         86,         86,        1,    81000, 0x0bb3d2f0
+0,         87,         87,        1,    81000, 0x6891c5b1
+0,         88,         88,        1,    81000, 0xf16ba9be
+0,         89,         89,        1,    81000, 0xba53528e
+0,         90,         90,        1,    81000, 0xc847de49
+0,         91,         91,        1,    81000, 0xc5b2e2b0
+0,         92,         92,        1,    81000, 0xb0b497ff
diff --git a/tests/ref/fate/vp6f b/tests/ref/fate/vp6f
index 87950425b0..65e113174a 100644
--- a/tests/ref/fate/vp6f
+++ b/tests/ref/fate/vp6f
@@ -1,175 +1,179 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    13440, 0x7cb0a22f
-0,        100,        100,        0,    13440, 0xdfcea6ba
-0,        200,        200,        0,    13440, 0x59b2a5da
-0,        300,        300,        0,    13440, 0x12f1b2d8
-0,        400,        400,        0,    13440, 0x280fb9f6
-0,        500,        500,        0,    13440, 0x7bace8b3
-0,        600,        600,        0,    13440, 0x4ec91480
-0,        700,        700,        0,    13440, 0xa8010450
-0,        800,        800,        0,    13440, 0x61d8fc46
-0,        900,        900,        0,    13440, 0x242bb24e
-0,       1000,       1000,        0,    13440, 0x88397a36
-0,       1100,       1100,        0,    13440, 0x10e15726
-0,       1200,       1200,        0,    13440, 0x3018438c
-0,       1300,       1300,        0,    13440, 0xbbb94c21
-0,       1400,       1400,        0,    13440, 0xfc3e5e2b
-0,       1500,       1500,        0,    13440, 0xeaa69354
-0,       1600,       1600,        0,    13440, 0x96f1cc01
-0,       1700,       1700,        0,    13440, 0x333fdaff
-0,       1800,       1800,        0,    13440, 0xb5230ed2
-0,       1900,       1900,        0,    13440, 0x59383446
-0,       2000,       2000,        0,    13440, 0x954939e6
-0,       2100,       2100,        0,    13440, 0x53813d2f
-0,       2200,       2200,        0,    13440, 0x3ca53600
-0,       2300,       2300,        0,    13440, 0x7b30227a
-0,       2400,       2400,        0,    13440, 0x5145bbfe
-0,       2500,       2500,        0,    13440, 0xa0979632
-0,       2600,       2600,        0,    13440, 0x08026e21
-0,       2700,       2700,        0,    13440, 0x3f456d1e
-0,       2800,       2800,        0,    13440, 0x7d036b62
-0,       2900,       2900,        0,    13440, 0x508085fb
-0,       3000,       3000,        0,    13440, 0x251dc193
-0,       3100,       3100,        0,    13440, 0xf3121c9b
-0,       3200,       3200,        0,    13440, 0xf5da772e
-0,       3300,       3300,        0,    13440, 0x8179ccf7
-0,       3400,       3400,        0,    13440, 0xd57ceeb3
-0,       3500,       3500,        0,    13440, 0xc8f2169c
-0,       3600,       3600,        0,    13440, 0xbf8296c3
-0,       3700,       3700,        0,    13440, 0xee1927d0
-0,       3800,       3800,        0,    13440, 0xdd84e8d1
-0,       3900,       3900,        0,    13440, 0x7be57be2
-0,       4000,       4000,        0,    13440, 0xae353f91
-0,       4100,       4100,        0,    13440, 0x3ae927f2
-0,       4200,       4200,        0,    13440, 0x417227c6
-0,       4300,       4300,        0,    13440, 0x32572bea
-0,       4400,       4400,        0,    13440, 0x8b9e4839
-0,       4500,       4500,        0,    13440, 0xad669441
-0,       4600,       4600,        0,    13440, 0xc9de99a6
-0,       4700,       4700,        0,    13440, 0xb3ffb88b
-0,       4800,       4800,        0,    13440, 0xb321b8a0
-0,       4900,       4900,        0,    13440, 0x2efdbf53
-0,       5000,       5000,        0,    13440, 0x9b7aa566
-0,       5100,       5100,        0,    13440, 0x563c8d60
-0,       5200,       5200,        0,    13440, 0xe3848ee8
-0,       5300,       5300,        0,    13440, 0xa84b8f1d
-0,       5400,       5400,        0,    13440, 0x52da9f9f
-0,       5500,       5500,        0,    13440, 0x2ed56d97
-0,       5600,       5600,        0,    13440, 0x4e8534c2
-0,       5700,       5700,        0,    13440, 0x318900a6
-0,       5800,       5800,        0,    13440, 0xda96de39
-0,       5900,       5900,        0,    13440, 0xaae7ac0b
-0,       6000,       6000,        0,    13440, 0x7533ad99
-0,       6100,       6100,        0,    13440, 0x4e70c2c9
-0,       6200,       6200,        0,    13440, 0x9ce5e3fa
-0,       6300,       6300,        0,    13440, 0xc788fbbc
-0,       6400,       6400,        0,    13440, 0xd36604a9
-0,       6500,       6500,        0,    13440, 0x246221a4
-0,       6600,       6600,        0,    13440, 0x290c5c2b
-0,       6700,       6700,        0,    13440, 0xde6c68ec
-0,       6800,       6800,        0,    13440, 0x56248dbf
-0,       6900,       6900,        0,    13440, 0x5b898cbd
-0,       7000,       7000,        0,    13440, 0x090574b9
-0,       7100,       7100,        0,    13440, 0x8df2814a
-0,       7200,       7200,        0,    13440, 0xd4a6b285
-0,       7300,       7300,        0,    13440, 0xa016e921
-0,       7400,       7400,        0,    13440, 0x7f93fdc1
-0,       7500,       7500,        0,    13440, 0xfd0dee6f
-0,       7600,       7600,        0,    13440, 0xef04ce0e
-0,       7700,       7700,        0,    13440, 0x7560bee3
-0,       7800,       7800,        0,    13440, 0x5a8cdc85
-0,       7900,       7900,        0,    13440, 0x4788f7bc
-0,       8000,       8000,        0,    13440, 0xc001e34d
-0,       8100,       8100,        0,    13440, 0xc687eb74
-0,       8200,       8200,        0,    13440, 0xbf20feba
-0,       8300,       8300,        0,    13440, 0xd32647a8
-0,       8400,       8400,        0,    13440, 0xe69a955a
-0,       8500,       8500,        0,    13440, 0x1b56951f
-0,       8600,       8600,        0,    13440, 0xd1977378
-0,       8700,       8700,        0,    13440, 0x1620357d
-0,       8800,       8800,        0,    13440, 0x2596116f
-0,       8900,       8900,        0,    13440, 0x7473feca
-0,       9000,       9000,        0,    13440, 0x7f92bb47
-0,       9100,       9100,        0,    13440, 0x6866a683
-0,       9200,       9200,        0,    13440, 0xe9b08d7e
-0,       9300,       9300,        0,    13440, 0xa3fd7546
-0,       9400,       9400,        0,    13440, 0xa4416522
-0,       9500,       9500,        0,    13440, 0xd8f5572e
-0,       9600,       9600,        0,    13440, 0xf5746dbd
-0,       9700,       9700,        0,    13440, 0x256a87c6
-0,       9800,       9800,        0,    13440, 0x722aa2c8
-0,       9900,       9900,        0,    13440, 0xb26de5f5
-0,      10000,      10000,        0,    13440, 0x117f0841
-0,      10100,      10100,        0,    13440, 0xda2d192c
-0,      10200,      10200,        0,    13440, 0xb022442d
-0,      10300,      10300,        0,    13440, 0xbc4044f2
-0,      10400,      10400,        0,    13440, 0x68b330da
-0,      10500,      10500,        0,    13440, 0xc07228cf
-0,      10600,      10600,        0,    13440, 0xaa3f3d44
-0,      10700,      10700,        0,    13440, 0x25867aad
-0,      10800,      10800,        0,    13440, 0xa3ecb432
-0,      10900,      10900,        0,    13440, 0x93ccdcbb
-0,      11000,      11000,        0,    13440, 0x8302fa4f
-0,      11100,      11100,        0,    13440, 0x2f960f33
-0,      11200,      11200,        0,    13440, 0x15d41d14
-0,      11300,      11300,        0,    13440, 0x636529d0
-0,      11400,      11400,        0,    13440, 0x11035be5
-0,      11500,      11500,        0,    13440, 0x9b6e9167
-0,      11600,      11600,        0,    13440, 0x7b01adc7
-0,      11700,      11700,        0,    13440, 0xa237e05d
-0,      11800,      11800,        0,    13440, 0xd2f4f134
-0,      11900,      11900,        0,    13440, 0x2052d368
-0,      12000,      12000,        0,    13440, 0x08f7ae0d
-0,      12100,      12100,        0,    13440, 0xa89185bc
-0,      12200,      12200,        0,    13440, 0xfa628236
-0,      12300,      12300,        0,    13440, 0xdf79848b
-0,      12400,      12400,        0,    13440, 0xd19a906f
-0,      12500,      12500,        0,    13440, 0x219f9324
-0,      12600,      12600,        0,    13440, 0x46509b6d
-0,      12700,      12700,        0,    13440, 0xc5d9a568
-0,      12800,      12800,        0,    13440, 0xb21aaaa8
-0,      12900,      12900,        0,    13440, 0x925a97ed
-0,      13000,      13000,        0,    13440, 0xc5e3557f
-0,      13100,      13100,        0,    13440, 0x7c57155a
-0,      13200,      13200,        0,    13440, 0x6b26d005
-0,      13300,      13300,        0,    13440, 0xfdc7b369
-0,      13400,      13400,        0,    13440, 0x99919fc2
-0,      13500,      13500,        0,    13440, 0xcfe889e4
-0,      13600,      13600,        0,    13440, 0xd1196856
-0,      13700,      13700,        0,    13440, 0xec8348c6
-0,      13800,      13800,        0,    13440, 0x5ede0d9a
-0,      13900,      13900,        0,    13440, 0x198ef66e
-0,      14000,      14000,        0,    13440, 0x62fcefdf
-0,      14100,      14100,        0,    13440, 0x7791f415
-0,      14200,      14200,        0,    13440, 0xfbdb0029
-0,      14300,      14300,        0,    13440, 0xdab12b01
-0,      14400,      14400,        0,    13440, 0x646b2d5f
-0,      14500,      14500,        0,    13440, 0x5410f52e
-0,      14600,      14600,        0,    13440, 0x7186eef8
-0,      14700,      14700,        0,    13440, 0xca251ef6
-0,      14800,      14800,        0,    13440, 0x757c3b43
-0,      14900,      14900,        0,    13440, 0x59ff4982
-0,      15000,      15000,        0,    13440, 0xbe8ff084
-0,      15100,      15100,        0,    13440, 0xc85a9e38
-0,      15200,      15200,        0,    13440, 0x541b9a19
-0,      15300,      15300,        0,    13440, 0x274893c9
-0,      15400,      15400,        0,    13440, 0x7634b5d2
-0,      15500,      15500,        0,    13440, 0x1bd8e10c
-0,      15600,      15600,        0,    13440, 0xa661dfb1
-0,      15700,      15700,        0,    13440, 0x9d01bf92
-0,      15800,      15800,        0,    13440, 0xcb1eb220
-0,      15900,      15900,        0,    13440, 0x0ce27d25
-0,      16000,      16000,        0,    13440, 0x523b594f
-0,      16100,      16100,        0,    13440, 0xf0a04c4f
-0,      16200,      16200,        0,    13440, 0x0f0ffc3d
-0,      16300,      16300,        0,    13440, 0xb0d8b778
-0,      16400,      16400,        0,    13440, 0x5137a642
-0,      16500,      16500,        0,    13440, 0xd213a552
-0,      16600,      16600,        0,    13440, 0xc2fbc9b1
-0,      16700,      16700,        0,    13440, 0xfc2ee379
-0,      16800,      16800,        0,    13440, 0xfb80f737
-0,      16900,      16900,        0,    13440, 0xd6cb2447
-0,      17000,      17000,        0,    13440, 0x124b606d
-0,      17100,      17100,        0,    13440, 0xf788a066
-0,      17200,      17200,        0,    13440, 0xa16eed6e
-0,      17300,      17300,        0,    13440, 0x73ff0f82
+#tb 0: 1/10
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 112x80
+#sar 0: 0/1
+0,          0,          0,        1,    13440, 0x7cb0a22f
+0,          1,          1,        1,    13440, 0xdfcea6ba
+0,          2,          2,        1,    13440, 0x59b2a5da
+0,          3,          3,        1,    13440, 0x12f1b2d8
+0,          4,          4,        1,    13440, 0x280fb9f6
+0,          5,          5,        1,    13440, 0x7bace8b3
+0,          6,          6,        1,    13440, 0x4ec91480
+0,          7,          7,        1,    13440, 0xa8010450
+0,          8,          8,        1,    13440, 0x61d8fc46
+0,          9,          9,        1,    13440, 0x242bb24e
+0,         10,         10,        1,    13440, 0x88397a36
+0,         11,         11,        1,    13440, 0x10e15726
+0,         12,         12,        1,    13440, 0x3018438c
+0,         13,         13,        1,    13440, 0xbbb94c21
+0,         14,         14,        1,    13440, 0xfc3e5e2b
+0,         15,         15,        1,    13440, 0xeaa69354
+0,         16,         16,        1,    13440, 0x96f1cc01
+0,         17,         17,        1,    13440, 0x333fdaff
+0,         18,         18,        1,    13440, 0xb5230ed2
+0,         19,         19,        1,    13440, 0x59383446
+0,         20,         20,        1,    13440, 0x954939e6
+0,         21,         21,        1,    13440, 0x53813d2f
+0,         22,         22,        1,    13440, 0x3ca53600
+0,         23,         23,        1,    13440, 0x7b30227a
+0,         24,         24,        1,    13440, 0x5145bbfe
+0,         25,         25,        1,    13440, 0xa0979632
+0,         26,         26,        1,    13440, 0x08026e21
+0,         27,         27,        1,    13440, 0x3f456d1e
+0,         28,         28,        1,    13440, 0x7d036b62
+0,         29,         29,        1,    13440, 0x508085fb
+0,         30,         30,        1,    13440, 0x251dc193
+0,         31,         31,        1,    13440, 0xf3121c9b
+0,         32,         32,        1,    13440, 0xf5da772e
+0,         33,         33,        1,    13440, 0x8179ccf7
+0,         34,         34,        1,    13440, 0xd57ceeb3
+0,         35,         35,        1,    13440, 0xc8f2169c
+0,         36,         36,        1,    13440, 0xbf8296c3
+0,         37,         37,        1,    13440, 0xee1927d0
+0,         38,         38,        1,    13440, 0xdd84e8d1
+0,         39,         39,        1,    13440, 0x7be57be2
+0,         40,         40,        1,    13440, 0xae353f91
+0,         41,         41,        1,    13440, 0x3ae927f2
+0,         42,         42,        1,    13440, 0x417227c6
+0,         43,         43,        1,    13440, 0x32572bea
+0,         44,         44,        1,    13440, 0x8b9e4839
+0,         45,         45,        1,    13440, 0xad669441
+0,         46,         46,        1,    13440, 0xc9de99a6
+0,         47,         47,        1,    13440, 0xb3ffb88b
+0,         48,         48,        1,    13440, 0xb321b8a0
+0,         49,         49,        1,    13440, 0x2efdbf53
+0,         50,         50,        1,    13440, 0x9b7aa566
+0,         51,         51,        1,    13440, 0x563c8d60
+0,         52,         52,        1,    13440, 0xe3848ee8
+0,         53,         53,        1,    13440, 0xa84b8f1d
+0,         54,         54,        1,    13440, 0x52da9f9f
+0,         55,         55,        1,    13440, 0x2ed56d97
+0,         56,         56,        1,    13440, 0x4e8534c2
+0,         57,         57,        1,    13440, 0x318900a6
+0,         58,         58,        1,    13440, 0xda96de39
+0,         59,         59,        1,    13440, 0xaae7ac0b
+0,         60,         60,        1,    13440, 0x7533ad99
+0,         61,         61,        1,    13440, 0x4e70c2c9
+0,         62,         62,        1,    13440, 0x9ce5e3fa
+0,         63,         63,        1,    13440, 0xc788fbbc
+0,         64,         64,        1,    13440, 0xd36604a9
+0,         65,         65,        1,    13440, 0x246221a4
+0,         66,         66,        1,    13440, 0x290c5c2b
+0,         67,         67,        1,    13440, 0xde6c68ec
+0,         68,         68,        1,    13440, 0x56248dbf
+0,         69,         69,        1,    13440, 0x5b898cbd
+0,         70,         70,        1,    13440, 0x090574b9
+0,         71,         71,        1,    13440, 0x8df2814a
+0,         72,         72,        1,    13440, 0xd4a6b285
+0,         73,         73,        1,    13440, 0xa016e921
+0,         74,         74,        1,    13440, 0x7f93fdc1
+0,         75,         75,        1,    13440, 0xfd0dee6f
+0,         76,         76,        1,    13440, 0xef04ce0e
+0,         77,         77,        1,    13440, 0x7560bee3
+0,         78,         78,        1,    13440, 0x5a8cdc85
+0,         79,         79,        1,    13440, 0x4788f7bc
+0,         80,         80,        1,    13440, 0xc001e34d
+0,         81,         81,        1,    13440, 0xc687eb74
+0,         82,         82,        1,    13440, 0xbf20feba
+0,         83,         83,        1,    13440, 0xd32647a8
+0,         84,         84,        1,    13440, 0xe69a955a
+0,         85,         85,        1,    13440, 0x1b56951f
+0,         86,         86,        1,    13440, 0xd1977378
+0,         87,         87,        1,    13440, 0x1620357d
+0,         88,         88,        1,    13440, 0x2596116f
+0,         89,         89,        1,    13440, 0x7473feca
+0,         90,         90,        1,    13440, 0x7f92bb47
+0,         91,         91,        1,    13440, 0x6866a683
+0,         92,         92,        1,    13440, 0xe9b08d7e
+0,         93,         93,        1,    13440, 0xa3fd7546
+0,         94,         94,        1,    13440, 0xa4416522
+0,         95,         95,        1,    13440, 0xd8f5572e
+0,         96,         96,        1,    13440, 0xf5746dbd
+0,         97,         97,        1,    13440, 0x256a87c6
+0,         98,         98,        1,    13440, 0x722aa2c8
+0,         99,         99,        1,    13440, 0xb26de5f5
+0,        100,        100,        1,    13440, 0x117f0841
+0,        101,        101,        1,    13440, 0xda2d192c
+0,        102,        102,        1,    13440, 0xb022442d
+0,        103,        103,        1,    13440, 0xbc4044f2
+0,        104,        104,        1,    13440, 0x68b330da
+0,        105,        105,        1,    13440, 0xc07228cf
+0,        106,        106,        1,    13440, 0xaa3f3d44
+0,        107,        107,        1,    13440, 0x25867aad
+0,        108,        108,        1,    13440, 0xa3ecb432
+0,        109,        109,        1,    13440, 0x93ccdcbb
+0,        110,        110,        1,    13440, 0x8302fa4f
+0,        111,        111,        1,    13440, 0x2f960f33
+0,        112,        112,        1,    13440, 0x15d41d14
+0,        113,        113,        1,    13440, 0x636529d0
+0,        114,        114,        1,    13440, 0x11035be5
+0,        115,        115,        1,    13440, 0x9b6e9167
+0,        116,        116,        1,    13440, 0x7b01adc7
+0,        117,        117,        1,    13440, 0xa237e05d
+0,        118,        118,        1,    13440, 0xd2f4f134
+0,        119,        119,        1,    13440, 0x2052d368
+0,        120,        120,        1,    13440, 0x08f7ae0d
+0,        121,        121,        1,    13440, 0xa89185bc
+0,        122,        122,        1,    13440, 0xfa628236
+0,        123,        123,        1,    13440, 0xdf79848b
+0,        124,        124,        1,    13440, 0xd19a906f
+0,        125,        125,        1,    13440, 0x219f9324
+0,        126,        126,        1,    13440, 0x46509b6d
+0,        127,        127,        1,    13440, 0xc5d9a568
+0,        128,        128,        1,    13440, 0xb21aaaa8
+0,        129,        129,        1,    13440, 0x925a97ed
+0,        130,        130,        1,    13440, 0xc5e3557f
+0,        131,        131,        1,    13440, 0x7c57155a
+0,        132,        132,        1,    13440, 0x6b26d005
+0,        133,        133,        1,    13440, 0xfdc7b369
+0,        134,        134,        1,    13440, 0x99919fc2
+0,        135,        135,        1,    13440, 0xcfe889e4
+0,        136,        136,        1,    13440, 0xd1196856
+0,        137,        137,        1,    13440, 0xec8348c6
+0,        138,        138,        1,    13440, 0x5ede0d9a
+0,        139,        139,        1,    13440, 0x198ef66e
+0,        140,        140,        1,    13440, 0x62fcefdf
+0,        141,        141,        1,    13440, 0x7791f415
+0,        142,        142,        1,    13440, 0xfbdb0029
+0,        143,        143,        1,    13440, 0xdab12b01
+0,        144,        144,        1,    13440, 0x646b2d5f
+0,        145,        145,        1,    13440, 0x5410f52e
+0,        146,        146,        1,    13440, 0x7186eef8
+0,        147,        147,        1,    13440, 0xca251ef6
+0,        148,        148,        1,    13440, 0x757c3b43
+0,        149,        149,        1,    13440, 0x59ff4982
+0,        150,        150,        1,    13440, 0xbe8ff084
+0,        151,        151,        1,    13440, 0xc85a9e38
+0,        152,        152,        1,    13440, 0x541b9a19
+0,        153,        153,        1,    13440, 0x274893c9
+0,        154,        154,        1,    13440, 0x7634b5d2
+0,        155,        155,        1,    13440, 0x1bd8e10c
+0,        156,        156,        1,    13440, 0xa661dfb1
+0,        157,        157,        1,    13440, 0x9d01bf92
+0,        158,        158,        1,    13440, 0xcb1eb220
+0,        159,        159,        1,    13440, 0x0ce27d25
+0,        160,        160,        1,    13440, 0x523b594f
+0,        161,        161,        1,    13440, 0xf0a04c4f
+0,        162,        162,        1,    13440, 0x0f0ffc3d
+0,        163,        163,        1,    13440, 0xb0d8b778
+0,        164,        164,        1,    13440, 0x5137a642
+0,        165,        165,        1,    13440, 0xd213a552
+0,        166,        166,        1,    13440, 0xc2fbc9b1
+0,        167,        167,        1,    13440, 0xfc2ee379
+0,        168,        168,        1,    13440, 0xfb80f737
+0,        169,        169,        1,    13440, 0xd6cb2447
+0,        170,        170,        1,    13440, 0x124b606d
+0,        171,        171,        1,    13440, 0xf788a066
+0,        172,        172,        1,    13440, 0xa16eed6e
+0,        173,        173,        1,    13440, 0x73ff0f82
diff --git a/tests/ref/fate/vp7 b/tests/ref/fate/vp7
index b014010090..3af21f2166 100644
--- a/tests/ref/fate/vp7
+++ b/tests/ref/fate/vp7
@@ -1,4 +1,8 @@
 #tb 0: 1001/12000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x176
+#sar 0: 0/1
 0,          0,          0,        1,    84480, 0xa7776101
 0,          1,          1,        1,    84480, 0xeb1560ca
 0,          2,          2,        1,    84480, 0x7a4e6123
diff --git a/tests/ref/fate/vp8-2451 b/tests/ref/fate/vp8-2451
new file mode 100644
index 0000000000..f681695056
--- /dev/null
+++ b/tests/ref/fate/vp8-2451
@@ -0,0 +1,112 @@
+#tb 0: 1001/24000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x360
+#sar 0: 1/1
+0,          0,          0,        1,   345600, 0xa1e65077
+0,          1,          1,        1,   345600, 0xa1e65077
+0,          2,          2,        1,   345600, 0xa1e65077
+0,          3,          3,        1,   345600, 0xa1e65077
+0,          4,          4,        1,   345600, 0xa1e65077
+0,          5,          5,        1,   345600, 0xa1e65077
+0,          6,          6,        1,   345600, 0xa1e65077
+0,          7,          7,        1,   345600, 0xa1e65077
+0,          8,          8,        1,   345600, 0xa1e65077
+0,          9,          9,        1,   345600, 0xa1e65077
+0,         10,         10,        1,   345600, 0xa1e65077
+0,         11,         11,        1,   345600, 0xa1e65077
+0,         12,         12,        1,   345600, 0xa1e65077
+0,         13,         13,        1,   345600, 0xa1e65077
+0,         14,         14,        1,   345600, 0xa1e65077
+0,         15,         15,        1,   345600, 0xa1e65077
+0,         16,         16,        1,   345600, 0xa1e65077
+0,         17,         17,        1,   345600, 0xa1e65077
+0,         18,         18,        1,   345600, 0xa1e65077
+0,         19,         19,        1,   345600, 0xa1e65077
+0,         20,         20,        1,   345600, 0xa1e65077
+0,         21,         21,        1,   345600, 0xa1e65077
+0,         22,         22,        1,   345600, 0xa1e65077
+0,         23,         23,        1,   345600, 0xa1e65077
+0,         24,         24,        1,   345600, 0xa1e65077
+0,         25,         25,        1,   345600, 0xa1e65077
+0,         26,         26,        1,   345600, 0xa1e65077
+0,         27,         27,        1,   345600, 0xa1e65077
+0,         28,         28,        1,   345600, 0xa1e65077
+0,         29,         29,        1,   345600, 0xa1e65077
+0,         30,         30,        1,   345600, 0xa1e65077
+0,         31,         31,        1,   345600, 0xa1e65077
+0,         32,         32,        1,   345600, 0x07059a25
+0,         33,         33,        1,   345600, 0xc917003c
+0,         34,         34,        1,   345600, 0xab5b7227
+0,         35,         35,        1,   345600, 0xd393c4c4
+0,         36,         36,        1,   345600, 0x7eab2e81
+0,         37,         37,        1,   345600, 0x203a9404
+0,         38,         38,        1,   345600, 0x0d84f956
+0,         39,         39,        1,   345600, 0xfed15b41
+0,         40,         40,        1,   345600, 0x1659bdb4
+0,         41,         41,        1,   345600, 0xffd82d2c
+0,         42,         42,        1,   345600, 0xeada9083
+0,         43,         43,        1,   345600, 0xeb28f693
+0,         44,         44,        1,   345600, 0xf2a8f693
+0,         45,         45,        1,   345600, 0xf2a8f693
+0,         46,         46,        1,   345600, 0xf2a8f693
+0,         47,         47,        1,   345600, 0xf2a8f693
+0,         48,         48,        1,   345600, 0xf2a8f693
+0,         49,         49,        1,   345600, 0xf2a8f693
+0,         50,         50,        1,   345600, 0xf2a8f693
+0,         51,         51,        1,   345600, 0xf2a8f693
+0,         52,         52,        1,   345600, 0xf2a8f693
+0,         53,         53,        1,   345600, 0xf2a8f693
+0,         54,         54,        1,   345600, 0xf2a8f693
+0,         55,         55,        1,   345600, 0xf2a8f693
+0,         56,         56,        1,   345600, 0xf2a8f693
+0,         57,         57,        1,   345600, 0x19cbf6d0
+0,         58,         58,        1,   345600, 0x19cbf6d0
+0,         59,         59,        1,   345600, 0x19cbf6d0
+0,         60,         60,        1,   345600, 0x19cbf6d0
+0,         61,         61,        1,   345600, 0x19cbf6d0
+0,         62,         62,        1,   345600, 0x19cbf6d0
+0,         63,         63,        1,   345600, 0x19cbf6d0
+0,         64,         64,        1,   345600, 0x19cbf6d0
+0,         65,         65,        1,   345600, 0x19cbf6d0
+0,         66,         66,        1,   345600, 0x19cbf6d0
+0,         67,         67,        1,   345600, 0x19cbf6d0
+0,         68,         68,        1,   345600, 0x19cbf6d0
+0,         69,         69,        1,   345600, 0x19cbf6d0
+0,         70,         70,        1,   345600, 0x19cbf6d0
+0,         71,         71,        1,   345600, 0x19cbf6d0
+0,         72,         72,        1,   345600, 0x19cbf6d0
+0,         73,         73,        1,   345600, 0x19cbf6d0
+0,         74,         74,        1,   345600, 0x19cbf6d0
+0,         75,         75,        1,   345600, 0x19cbf6d0
+0,         76,         76,        1,   345600, 0x19cbf6d0
+0,         77,         77,        1,   345600, 0x19cbf6d0
+0,         78,         78,        1,   345600, 0x19cbf6d0
+0,         79,         79,        1,   345600, 0x19cbf6d0
+0,         80,         80,        1,   345600, 0x19cbf6d0
+0,         81,         81,        1,   345600, 0x19cbf6d0
+0,         82,         82,        1,   345600, 0x19cbf6d0
+0,         83,         83,        1,   345600, 0x19cbf6d0
+0,         84,         84,        1,   345600, 0x19cbf6d0
+0,         85,         85,        1,   345600, 0x19cbf6d0
+0,         86,         86,        1,   345600, 0x19cbf6d0
+0,         87,         87,        1,   345600, 0x19cbf6d0
+0,         88,         88,        1,   345600, 0x19cbf6d0
+0,         89,         89,        1,   345600, 0x19cbf6d0
+0,         90,         90,        1,   345600, 0x19cbf6d0
+0,         91,         91,        1,   345600, 0x19cbf6d0
+0,         92,         92,        1,   345600, 0x19cbf6d0
+0,         93,         93,        1,   345600, 0x19cbf6d0
+0,         94,         94,        1,   345600, 0x19cbf6d0
+0,         95,         95,        1,   345600, 0x19cbf6d0
+0,         96,         96,        1,   345600, 0x19cbf6d0
+0,         97,         97,        1,   345600, 0x19cbf6d0
+0,         98,         98,        1,   345600, 0x19cbf6d0
+0,         99,         99,        1,   345600, 0x19cbf6d0
+0,        100,        100,        1,   345600, 0x19cbf6d0
+0,        101,        101,        1,   345600, 0x19cbf6d0
+0,        102,        102,        1,   345600, 0x19cbf6d0
+0,        103,        103,        1,   345600, 0x19cbf6d0
+0,        104,        104,        1,   345600, 0x19cbf6d0
+0,        105,        105,        1,   345600, 0x19cbf6d0
+0,        106,        106,        1,   345600, 0x19cbf6d0
diff --git a/tests/ref/fate/vp8-alpha b/tests/ref/fate/vp8-alpha
new file mode 100644
index 0000000000..4922d52739
--- /dev/null
+++ b/tests/ref/fate/vp8-alpha
@@ -0,0 +1,125 @@
+#tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: vp8
+#dimensions 0: 320x213
+#sar 0: 1/1
+0,          0,          0,       33,     2108, 0x59b92a34, S=2,     1900, 0x8fb3adc5,        8, 0x00000000
+0,         32,         32,       33,      142, 0x2f2a3fed, F=0x0, S=1,      160, 0xa13346af
+0,         65,         65,       33,      157, 0x17804767, F=0x0, S=1,      209, 0x64115f15
+0,         99,         99,       33,      206, 0x537262ca, F=0x0, S=1,      317, 0x44a09dd0
+0,        132,        132,       33,      259, 0x73ff74b6, F=0x0, S=1,      384, 0x2ee2c588
+0,        165,        165,       33,      320, 0x0fcf8ce4, F=0x0, S=1,      415, 0xff68c953
+0,        199,        199,       33,      377, 0x8fffb5f5, F=0x0, S=1,      475, 0x4166f3eb
+0,        232,        232,       33,      407, 0xe476c19e, F=0x0, S=1,      193, 0x3ff75489
+0,        265,        265,       33,      539, 0x90202334, F=0x0, S=1,      681, 0x776656b0
+0,        299,        299,       33,      560, 0xc6e2168d, F=0x0, S=1,      585, 0xddc81b8a
+0,        332,        332,       33,      597, 0x201a32a7, F=0x0, S=1,      574, 0x8baa1d65
+0,        365,        365,       33,      770, 0xab2b8891, F=0x0, S=1,      666, 0xcd8e51eb
+0,        399,        399,       33,      708, 0xc2386711, F=0x0, S=1,      706, 0x046b6444
+0,        432,        432,       33,      905, 0x7211c52d, F=0x0, S=1,      814, 0x5e288def
+0,        465,        465,       33,      770, 0xda4f8574, F=0x0, S=1,      829, 0xa0e8a949
+0,        499,        499,       33,      955, 0xf9a1d77a, F=0x0, S=1,      857, 0x9b63b955
+0,        532,        532,       33,      970, 0xff4de39a, F=0x0, S=1,      153, 0x3b00416c
+0,        565,        565,       33,      978, 0x12bcf81f, F=0x0, S=1,     1181, 0xce175555
+0,        599,        599,       33,     1233, 0x2903744a, F=0x0, S=1,      860, 0x737eb566
+0,        632,        632,       33,     1118, 0x7f274f50, F=0x0, S=1,      933, 0xb669c6b6
+0,        665,        665,       33,      941, 0x6bffd4b1, F=0x0, S=1,     1058, 0x07581cee
+0,        699,        699,       33,     1598, 0xc007219f, F=0x0, S=1,      939, 0x2c0bdc45
+0,        732,        732,       33,     1218, 0x25d962b6, F=0x0, S=1,     1090, 0x96482341
+0,        765,        765,       33,     1200, 0x86b85be3, F=0x0, S=1,      189, 0x3f085309
+0,        799,        799,       33,     1329, 0x298a848a, F=0x0, S=1,     1426, 0x6ea3df12
+0,        832,        832,       33,     1500, 0xe437edec, F=0x0, S=1,     1244, 0x32836b8d
+0,        865,        865,       33,     1288, 0xc4447dd5, F=0x0, S=1,     1289, 0x06a57b0f
+0,        899,        899,       33,     1281, 0xb5bf7e9f, F=0x0, S=1,     1227, 0xd96d5697
+0,        932,        932,       33,     1372, 0x09be9014, F=0x0, S=1,     1556, 0x2630fbff
+0,        965,        965,       33,     1238, 0x42ce6316, F=0x0, S=1,     1287, 0x1d3084f6
+0,        999,        999,       33,     1655, 0xb94b45c2, F=0x0, S=1,     1494, 0x34dbd1a4
+0,       1032,       1032,       33,     1164, 0xf6b93ad0, F=0x0, S=1,     1337, 0xba6d9673
+0,       1065,       1065,       33,     1084, 0x58c50fb5, F=0x0, S=1,     1384, 0x3fabb82b
+0,       1099,       1099,       33,     1151, 0x0b3f3359, F=0x0, S=1,     1353, 0x08e2a1d7
+0,       1132,       1132,       33,     1277, 0xa3ae77e1, F=0x0, S=1,     1409, 0xf65cb9f7
+0,       1165,       1165,       33,      782, 0xdcf671ff, F=0x0, S=1,     1408, 0x01e2ac53
+0,       1199,       1199,       33,      926, 0xe913c286, F=0x0, S=1,     1320, 0x32e38e42
+0,       1232,       1232,       33,      970, 0x3d86e5ae, F=0x0, S=1,     1608, 0x40b52618
+0,       1265,       1265,       33,     1353, 0xe4f197b2, F=0x0, S=1,     1272, 0xf1d272a5
+0,       1299,       1299,       33,      685, 0x629b4ce4, F=0x0, S=1,     1257, 0x14845de9
+0,       1332,       1332,       33,      743, 0x6f1172a3, F=0x0, S=1,     1260, 0xa6c66fda
+0,       1365,       1365,       33,      789, 0x94fc84cd, F=0x0, S=1,     1009, 0x7daaf2b0
+0,       1399,       1399,       33,     1460, 0x668adb82, F=0x0, S=1,      944, 0x44b6ccf5
+0,       1432,       1432,       33,      766, 0x49c884ef, F=0x0, S=1,      996, 0x8646e6dd
+0,       1465,       1465,       33,     1037, 0x24831498, F=0x0, S=1,      983, 0x14a9e7a6
+0,       1499,       1499,       33,      943, 0x1f53d180, F=0x0, S=1,     1107, 0x02f72acb
+0,       1532,       1532,       33,     1152, 0xbf6a35ae, F=0x0, S=1,     1026, 0xd57afda0
+0,       1565,       1565,       33,      730, 0x42806abf, F=0x0, S=1,     1029, 0xfb0402d5
+0,       1599,       1599,       33,      975, 0xa5ffec57, F=0x0, S=1,     1081, 0xe2890cea
+0,       1632,       1632,       33,      970, 0xbe8ee224, F=0x0, S=1,     1151, 0x7b0d3b20
+0,       1665,       1665,       33,     1012, 0x20c6f0d8, F=0x0, S=1,      979, 0xc25cd69c
+0,       1699,       1699,       33,      874, 0x1a2fb4da, F=0x0, S=1,      943, 0xdb2dc9f8
+0,       1732,       1732,       33,      869, 0xab0caf3d, F=0x0, S=1,      934, 0x48b9bfcc
+0,       1765,       1765,       33,      863, 0xd8caa2e5, F=0x0, S=1,      874, 0x0b34b026
+0,       1799,       1799,       33,     1246, 0x47866cdc, F=0x0, S=1,      818, 0x0c908eeb
+0,       1832,       1832,       33,      742, 0xa6296ac1, F=0x0, S=1,      921, 0x97b6b053
+0,       1865,       1865,       33,      828, 0x0b568d7a, F=0x0, S=1,      969, 0x3314dbfa
+0,       1899,       1899,       33,      825, 0x6d329394, F=0x0, S=1,      982, 0x5f66e68c
+0,       1932,       1932,       33,      836, 0x8ace8dfb, F=0x0, S=1,      929, 0x9ffdc2fd
+0,       1965,       1965,       33,     1774, 0xd4686726, F=0x0, S=1,      909, 0x11a9c07a
+0,       1999,       1999,       33,     1803, 0x08c879ce, F=0x0, S=1,     1525, 0x1e11f02f
+0,       2032,       2032,       33,      518, 0x7c32fc72, F=0x0, S=1,      785, 0xfc1f792a
+0,       2065,       2065,       33,      790, 0x3dac8aa0, F=0x0, S=1,      876, 0x0918c88d
+0,       2099,       2099,       33,      927, 0x4feccb24, F=0x0, S=1,     1059, 0xbcaa05c7
+0,       2132,       2132,       33,      835, 0x29d39266, F=0x0, S=1,      980, 0x4913e409
+0,       2165,       2165,       33,      951, 0xc1dddd12, F=0x0, S=1,     1041, 0x0541047e
+0,       2199,       2199,       33,      876, 0x2f6eb89d, F=0x0, S=1,      949, 0x2d56c53b
+0,       2232,       2232,       33,      959, 0xf0dedabd, F=0x0, S=1,     1022, 0x8d33f5fa
+0,       2265,       2265,       33,      860, 0x9274ab39, F=0x0, S=1,     1061, 0x289c0132
+0,       2299,       2299,       33,      863, 0x7058ba30, F=0x0, S=1,      940, 0x1f32d4a3
+0,       2332,       2332,       33,     1021, 0xcabdf84f, F=0x0, S=1,      887, 0xda8ab95e
+0,       2365,       2365,       33,      897, 0x9867c8e8, F=0x0, S=1,      840, 0xd93eaaf5
+0,       2399,       2399,       33,      897, 0x6a16b5db, F=0x0, S=1,      977, 0x7b77dc9b
+0,       2432,       2432,       33,      953, 0xe9b4cf1f, F=0x0, S=1,      921, 0x75a8ca45
+0,       2465,       2465,       33,      847, 0x0335ad37, F=0x0, S=1,     1000, 0x2691f3bd
+0,       2499,       2499,       33,      902, 0x3360b315, F=0x0, S=1,     1008, 0xd5e1deb6
+0,       2532,       2532,       33,      881, 0xf5309d59, F=0x0, S=1,     1113, 0xdbef3065
+0,       2565,       2565,       33,      974, 0x7c2de3ce, F=0x0, S=1,     1086, 0x365626bb
+0,       2599,       2599,       33,      974, 0xf42bd9f5, F=0x0, S=1,     1039, 0xa7e9060d
+0,       2632,       2632,       33,     1029, 0x7c33f4d0, F=0x0, S=1,     1041, 0xf4affa59
+0,       2665,       2665,       33,      881, 0x9021a565, F=0x0, S=1,     1039, 0xc1e00521
+0,       2699,       2699,       33,     1157, 0xe1c136f7, F=0x0, S=1,      917, 0x357ac7d3
+0,       2732,       2732,       33,      649, 0xdffb3cb7, F=0x0, S=1,      976, 0xa386e05e
+0,       2765,       2765,       33,      758, 0xb67875f3, F=0x0, S=1,     1041, 0xae4e0a63
+0,       2799,       2799,       33,     1105, 0x8ffb1a26, F=0x0, S=1,      962, 0x211ddc5e
+0,       2832,       2832,       33,      866, 0xa60eb2d9, F=0x0, S=1,      929, 0xe9e4c84b
+0,       2865,       2865,       33,      912, 0xcd34bf9b, F=0x0, S=1,      946, 0xfce9d359
+0,       2899,       2899,       33,      868, 0x5651a343, F=0x0, S=1,      809, 0x624a8ef9
+0,       2932,       2932,       33,      997, 0xfa66eaeb, F=0x0, S=1,      992, 0xc913e5e2
+0,       2965,       2965,       33,     1111, 0x3f272497, F=0x0, S=1,     1007, 0xf78ee6a7
+0,       2999,       2999,       33,      842, 0xe442999f, F=0x0, S=1,      972, 0x25a0d25c
+0,       3032,       3032,       33,     1030, 0x6f97ffad, F=0x0, S=1,      993, 0x4059fd6b
+0,       3065,       3065,       33,     1176, 0x66e64926, F=0x0, S=1,      951, 0x2762cdf1
+0,       3099,       3099,       33,      803, 0xfd1699cb, F=0x0, S=1,      959, 0x5cf9d56c
+0,       3132,       3132,       33,      972, 0x1cdff00e, F=0x0, S=1,     1023, 0xeaf20900
+0,       3165,       3165,       33,      907, 0x17f8acca, F=0x0, S=1,     1054, 0xeb010c4d
+0,       3199,       3199,       33,      915, 0x3569b545, F=0x0, S=1,      987, 0x73b2e159
+0,       3232,       3232,       33,     1021, 0x14c5076a, F=0x0, S=1,     1007, 0x6c4bf7f0
+0,       3265,       3265,       33,      837, 0xbf86b0ef, F=0x0, S=1,      963, 0xf472d31a
+0,       3299,       3299,       33,      885, 0x1caac123, F=0x0, S=1,     1052, 0x2b7bfd20
+0,       3332,       3332,       33,     1355, 0x299e8d3c, F=0x0, S=1,      858, 0x2bbca3f0
+0,       3365,       3365,       33,      784, 0xb0bd7e9d, F=0x0, S=1,      969, 0xc865dc00
+0,       3399,       3399,       33,      991, 0xbc7ddda9, F=0x0, S=1,     1028, 0x801b00a6
+0,       3432,       3432,       33,      986, 0xb356f6b1, F=0x0, S=1,     1056, 0x8b840add
+0,       3465,       3465,       33,      978, 0x94a3e87e, F=0x0, S=1,     1018, 0xe766fa52
+0,       3499,       3499,       33,      976, 0x55ddd14a, F=0x0, S=1,      992, 0x58a9ddfe
+0,       3532,       3532,       33,     1241, 0x1ec867f7, F=0x0, S=1,      966, 0xa329e84f
+0,       3565,       3565,       33,      975, 0xecf5dbb3, F=0x0, S=1,      899, 0xa7539f4d
+0,       3599,       3599,       33,     1129, 0xb7243037, F=0x0, S=1,     1057, 0xbd0d10bd
+0,       3632,       3632,       33,      913, 0xe5f1d03d, F=0x0, S=1,     1092, 0xeb9621f8
+0,       3665,       3665,       33,      943, 0x87d0ed78, F=0x0, S=1,     1057, 0x079c1054
+0,       3699,       3699,       33,      917, 0x536cc3fd, F=0x0, S=1,      946, 0xd2b9d0e2
+0,       3732,       3732,       33,      892, 0x4dffb1e2, F=0x0, S=1,      930, 0x70c9cc40
+0,       3765,       3765,       33,      957, 0x1a98e71c, F=0x0, S=1,      719, 0x6fec614a
+0,       3799,       3799,       33,      893, 0xf405b2c3, F=0x0, S=1,      821, 0x63529cab
+0,       3832,       3832,       33,      978, 0xa0a8d5f6, F=0x0, S=1,      745, 0x3c616219
+0,       3865,       3865,       33,      887, 0xfa7cb65d, F=0x0, S=1,      768, 0xb8f07885
+0,       3899,       3899,       33,      867, 0xd808ade7, F=0x0, S=1,      783, 0xf82b6b9a
+0,       3932,       3932,       33,     1068, 0x6f8b135a, F=0x0, S=1,      807, 0x52028d50
+0,       3965,       3965,       33,     2010, 0x536fe0b6, F=0x0, S=1,     1512, 0x690aeb55
diff --git a/tests/ref/fate/vp8-sign-bias b/tests/ref/fate/vp8-sign-bias
index 77b69ed421..36ffc0264d 100644
--- a/tests/ref/fate/vp8-sign-bias
+++ b/tests/ref/fate/vp8-sign-bias
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 854x480
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,   614880, 12ce23b288485be3ddbc1db28c21517f
 0,          2,          2,        1,   614880, ce352e1079535ea058c0e9ad50f7cdb8
 0,          3,          3,        1,   614880, 9f6bf2739a027dfd12c81586cf75d3a3
@@ -6,4 +14,5 @@
 0,          5,          5,        1,   614880, 52f47f1e0348f3297d9f233fb5405e8b
 0,          6,          6,        1,   614880, cd51d2c200bfd66e8e1b0fd6b404570f
 0,          7,          7,        1,   614880, cf535cf0a53e903cd98a9a944b72da6d
-0,          8,          8,        1,   614880, ff373c0c8a4a319c84e72b1c3d76b399
+0,          8,          8,        1,   614880, 1b270fd2b56daa7892102c2885d23201
+0,          9,          9,        1,   614880, ff373c0c8a4a319c84e72b1c3d76b399
diff --git a/tests/ref/fate/vp8-size-change b/tests/ref/fate/vp8-size-change
index d87c563b7d..5105bc6f55 100644
--- a/tests/ref/fate/vp8-size-change
+++ b/tests/ref/fate/vp8-size-change
@@ -1,31 +1,39 @@
-#tb 0: 1/1000
-0,          0,          0,        0,  3110400, 649f0f2e3e09e6938161bb07bede5282
-0,         33,         33,        0,  3110400, f24f632d50eafef73fa89391ca98c375
-0,         67,         67,        0,  3110400, 57b6d2ed51bfaf6588f39eb73e7922b8
-0,        100,        100,        0,  3110400, 463e0988ce28eb1c30669c06113deb4c
-0,        133,        133,        0,  3110400, 3c4ac119f998a0ccd7d3a6361f4d10a0
-0,        167,        167,        0,  3110400, 0f11c5cc9c1ac9055e21e417e1259c69
-0,        200,        200,        0,  3110400, 08c6e70f101c61013f2969b6a370d3f9
-0,        233,        233,        0,  3110400, ea8cb37017d8a9d20bf443b730fd8365
-0,        267,        267,        0,  3110400, 3f614203f054c89151680f4b1b0c6c4c
-0,        300,        300,        0,  3110400, 90488ee40d06c0f05eee8348dde57325
-0,        333,        333,        0,  3110400, f48117b74ac7455e69fd14e9b68ce95d
-0,        367,        367,        0,  3110400, 37ee06b6267b5ec25fd642525cf4469a
-0,        400,        400,        0,  3110400, cd5e0988e7c084f29bda4a18cb38c1e8
-0,        433,        433,        0,  3110400, 1fe943b01f00b8bc0cb5722010cef03c
-0,        467,        467,        0,  3110400, 40d8e8150326c7eb061d3f6cfd307d97
-0,        500,        500,        0,  3110400, 49812cbf928858cb56331c8c8aaaf556
-0,        533,        533,        0,  3110400, 3df607c752273ebcac21123e2c4c010c
-0,        567,        567,        0,  3110400, 020a0ae162c8326f83f8f4d8bf1627d2
-0,        600,        600,        0,  3110400, 459ac9f9488a6a2f4e378703a6b2a45a
-0,        633,        633,        0,  3110400, b1baf9a56f7667e4b8f4e3007b9ebe0f
-0,        667,        667,        0,  3110400, eea61a72a05c380450a96b575ba25f65
-0,        700,        700,        0,  3110400, e013a9f233824631d8c6e3f93106eebe
-0,        733,        733,        0,  3110400, 6c64147ebdee4b36728c6978b290ffb5
-0,        767,        767,        0,  3110400, c37956235667345d92fdfc7c62496e84
-0,        800,        800,        0,  3110400, 0ac58c28575b804d9e63395653c3aef2
-0,        833,        833,        0,  3110400, 641f2a78e338c733ef159bd36ec7966f
-0,        867,        867,        0,  3110400, 9402d455fa5bd556b85f479c42c3a4d2
-0,        900,        900,        0,  3110400, ca86e16b05db0c79b028d709c19e1f13
-0,        933,        933,        0,  3110400, 9167d622809df07eef9bcb3cb09de0f0
-0,        967,        967,        0,  3110400, e1d52ae2a2eb6aabb9bdc7e7ed05253e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x90
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    21600, 5abd6c163522c7e882f7e9c369293bf9
+0,          1,          1,        1,    21600, 5c11d8cc9cc9102d0ef5afd1dc64aff1
+0,          2,          2,        1,    21600, cbeffa9ea9d682af77d3fd0fdf12c8c1
+0,          3,          3,        1,    21600, ea7cec515fcf8ccbc932d9e9b472cdc7
+0,          4,          4,        1,    21600, 23038b711dbac95ce710657b1fef5901
+0,          5,          5,        1,    21600, e0d6fb46bb5c0d939ee33af82b887668
+0,          6,          6,        1,    21600, 694518f14d3a2bd3c319bc0b098c78bb
+0,          7,          7,        1,    21600, c1c7394bd4236afbc773af52ef7a10ea
+0,          8,          8,        1,    21600, 4d8d3b2c9a637f963521585ea879357b
+0,          9,          9,        1,    21600, b4444dc3cbf1b6cdd8047d3dcd497ffd
+0,         10,         10,        1,    21600, 65e5d667ec9ceb636e21357f032ce800
+0,         11,         11,        1,    21600, fd9a4c67598051074387b640df7edaa9
+0,         12,         12,        1,    21600, 0e54e22d90f6296ae6989c83846272cd
+0,         13,         13,        1,    21600, db4b1727450243b202bfec5ed6c73ae0
+0,         14,         14,        1,    21600, ab37a84be075ca42cc7351ff9fb1cb47
+0,         15,         15,        1,    21600, ae4d2d297e646bd8e05e76b457d9b576
+0,         16,         16,        1,    21600, e7cfd580e3c3d7c3f2f5136d1e548595
+0,         17,         17,        1,    21600, cbec09314a0b7ad53f4893eb474e1c65
+0,         18,         18,        1,    21600, e1fa89cd63c37496bc86f18694324d88
+0,         19,         19,        1,    21600, e9655b151253950313810228278ca104
+0,         20,         20,        1,    21600, 69ba31c0eff7bc93f4180173d8e64c60
+0,         21,         21,        1,    21600, 368a1f6a1172d7d56f695153b234a330
+0,         22,         22,        1,    21600, 6c298b196e16c64f7c2f407ba1242937
+0,         23,         23,        1,    21600, bf54474112ed5592c4d890e3313881a0
+0,         24,         24,        1,    21600, 945d49abedb0606b6a009c8b5d8face3
+0,         25,         25,        1,    21600, dd6ebef7b6f24619910de811918d3437
+0,         26,         26,        1,    21600, 7952346fc0f1eff3914e0d7646b3cf28
+0,         27,         27,        1,    21600, 26bd0d6b21e8a2df17af8d1446fba745
+0,         28,         28,        1,    21600, b0d91600416716d81c1f73ac141a0b62
+0,         29,         29,        1,    21600, 08f16698beb9cc15f7115961bd69e995
diff --git a/tests/ref/fate/vp8-test-vector-001 b/tests/ref/fate/vp8-test-vector-001
index 64accc488c..4abaf68f50 100644
--- a/tests/ref/fate/vp8-test-vector-001
+++ b/tests/ref/fate/vp8-test-vector-001
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    38016, 83c78b5db579710f61f9354d5c51e8c8
 0,          1,          1,        1,    38016, 8d089d226f52d6cdaffdb3fcc080b75b
 0,          2,          2,        1,    38016, acaae81ca812145e85e0be83bdf54226
diff --git a/tests/ref/fate/vp8-test-vector-002 b/tests/ref/fate/vp8-test-vector-002
index d42674ad0a..3154a1a7fa 100644
--- a/tests/ref/fate/vp8-test-vector-002
+++ b/tests/ref/fate/vp8-test-vector-002
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    38016, 872e9922f37f0e92c767d33e0a15b8e0
 0,          1,          1,        1,    38016, ea5ad6c6ee4355018fc0ba83b5172836
 0,          2,          2,        1,    38016, fe744612b2167c9ba6e1dc81c031e16a
diff --git a/tests/ref/fate/vp8-test-vector-003 b/tests/ref/fate/vp8-test-vector-003
index 504766fd52..1e03bad7c0 100644
--- a/tests/ref/fate/vp8-test-vector-003
+++ b/tests/ref/fate/vp8-test-vector-003
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    38016, 96e6ce168b5ef377053e86ab5484e7f9
 0,          1,          1,        1,    38016, 10fd750292d8522ab7ee577043604789
 0,          2,          2,        1,    38016, e040995173dc5c85abbbe38f6823ff9a
diff --git a/tests/ref/fate/vp8-test-vector-004 b/tests/ref/fate/vp8-test-vector-004
index f402372b88..6de548f5f6 100644
--- a/tests/ref/fate/vp8-test-vector-004
+++ b/tests/ref/fate/vp8-test-vector-004
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    38016, 83c78b5db579710f61f9354d5c51e8c8
 0,          1,          1,        1,    38016, d173eb8a8211a05672b43206609c9034
 0,          2,          2,        1,    38016, 204e3e91613d647d30244c00fa2b9563
diff --git a/tests/ref/fate/vp8-test-vector-005 b/tests/ref/fate/vp8-test-vector-005
index 3569deea68..e1963a06b6 100644
--- a/tests/ref/fate/vp8-test-vector-005
+++ b/tests/ref/fate/vp8-test-vector-005
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    38016, e7a4be434df4bb524ba56a03cba901f4
 0,          1,          1,        1,    38016, d903ade6d49e51485627c044fbb2190c
 0,          2,          2,        1,    38016, af07ee39629b852870104cb9a9dde9e3
diff --git a/tests/ref/fate/vp8-test-vector-006 b/tests/ref/fate/vp8-test-vector-006
index 38b92c4a7f..49130434a1 100644
--- a/tests/ref/fate/vp8-test-vector-006
+++ b/tests/ref/fate/vp8-test-vector-006
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 175x143
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    37697, 9ca5df27b0158aca2a38dff946f58c41
 0,          1,          1,        1,    37697, 627129a99538ec1ac51be910ca92ebc4
 0,          2,          2,        1,    37697, 6c2df1f21af317aa5bb68b161ca96c70
diff --git a/tests/ref/fate/vp8-test-vector-007 b/tests/ref/fate/vp8-test-vector-007
index 8d9b912fc9..851ce7b8a2 100644
--- a/tests/ref/fate/vp8-test-vector-007
+++ b/tests/ref/fate/vp8-test-vector-007
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    38016, 98bd0af6928c144888a9c320270e9f0e
 0,          1,          1,        1,    38016, 9ff7cff703d58481acd233451388377c
 0,          2,          2,        1,    38016, e4cd8815527846cc782ea61ef5a46e49
diff --git a/tests/ref/fate/vp8-test-vector-008 b/tests/ref/fate/vp8-test-vector-008
index 9be8d73a24..00066a6b8d 100644
--- a/tests/ref/fate/vp8-test-vector-008
+++ b/tests/ref/fate/vp8-test-vector-008
@@ -1,3 +1,11 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/23
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1432x888
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,  1907424, 7146d3a72b6cb8e43ee5280ef8d661fe
 0,          1,          1,        1,  1907424, 5a537e9710158efb5ad2683a1d3b4c72
diff --git a/tests/ref/fate/vp8-test-vector-009 b/tests/ref/fate/vp8-test-vector-009
index fae204db99..02a1aa71eb 100644
--- a/tests/ref/fate/vp8-test-vector-009
+++ b/tests/ref/fate/vp8-test-vector-009
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    38016, b3a3121c796a60c88988fef5240a07fe
 0,          1,          1,        1,    38016, f25147764829cf837e00b8fd6383e2c4
 0,          2,          2,        1,    38016, 1b1552291a89c97d5deea145ab0ac0cd
diff --git a/tests/ref/fate/vp8-test-vector-010 b/tests/ref/fate/vp8-test-vector-010
index b250ad92d1..74a71637d0 100644
--- a/tests/ref/fate/vp8-test-vector-010
+++ b/tests/ref/fate/vp8-test-vector-010
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,   115200, 3441ec1a9b9d325c9aeda44e3b68377d
 0,          1,          1,        1,   115200, bff86a84fd673394f45c09d19a1ee0ac
 0,          2,          2,        1,   115200, 8cd920f0de408e8cd883f9241680ff80
diff --git a/tests/ref/fate/vp8-test-vector-011 b/tests/ref/fate/vp8-test-vector-011
index d591ec7eee..14b277378e 100644
--- a/tests/ref/fate/vp8-test-vector-011
+++ b/tests/ref/fate/vp8-test-vector-011
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    38016, 83c78b5db579710f61f9354d5c51e8c8
 0,          1,          1,        1,    38016, 9b755a63c7c5352660a265f6e24991e1
 0,          2,          2,        1,    38016, a591f0b04447d6d6dd9bb990502594aa
diff --git a/tests/ref/fate/vp8-test-vector-012 b/tests/ref/fate/vp8-test-vector-012
index 4d5adcbf1b..27f728d812 100644
--- a/tests/ref/fate/vp8-test-vector-012
+++ b/tests/ref/fate/vp8-test-vector-012
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    38016, cc3069a59b6f4319761af2b39923a6e5
 0,          1,          1,        1,    38016, c0bc935941d994c6af6a864f02a90a62
 0,          2,          2,        1,    38016, 5b6073ce4a03967aa87e56dfa27e32c2
diff --git a/tests/ref/fate/vp8-test-vector-013 b/tests/ref/fate/vp8-test-vector-013
index de7c0b3cbc..05b0f21ad9 100644
--- a/tests/ref/fate/vp8-test-vector-013
+++ b/tests/ref/fate/vp8-test-vector-013
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    38016, ad137b9eae93daed28fe31fd5165b4d0
 0,          1,          1,        1,    38016, 7cd527f647680c0eb305050d27fb8092
 0,          2,          2,        1,    38016, f306e07a2e86c82a8cc1333be3812326
diff --git a/tests/ref/fate/vp8-test-vector-014 b/tests/ref/fate/vp8-test-vector-014
index 4341e59097..72b16a029c 100644
--- a/tests/ref/fate/vp8-test-vector-014
+++ b/tests/ref/fate/vp8-test-vector-014
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 175x143
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    37697, 7a0356dc950e79744d79c98e391ebee9
 0,          1,          1,        1,    37697, 96e221e75c290dd847b8e55865073366
 0,          2,          2,        1,    37697, 67638290841837c90f180a01094f9191
diff --git a/tests/ref/fate/vp8-test-vector-015 b/tests/ref/fate/vp8-test-vector-015
index b32f2337d7..5024bd6ab0 100644
--- a/tests/ref/fate/vp8-test-vector-015
+++ b/tests/ref/fate/vp8-test-vector-015
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,   115200, 6b4c7cc0c6a7218362e43cffef6618c9
 0,          1,          1,        1,   115200, e132a7b1bb4fb15b1019092aedc0e599
 0,          2,          2,        1,   115200, b36975db60f24088d95385ff7e8b7b8a
diff --git a/tests/ref/fate/vp8-test-vector-016 b/tests/ref/fate/vp8-test-vector-016
index 291e7fe2cd..4c35a357b4 100644
--- a/tests/ref/fate/vp8-test-vector-016
+++ b/tests/ref/fate/vp8-test-vector-016
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    38016, 905a823da31f71f9c25ebb8dfc9ddd3c
 0,          1,          1,        1,    38016, 9a1b97859b2f774954dbf96f45a22a0a
 0,          2,          2,        1,    38016, f0f5651b32577549dc2e6e3050125229
diff --git a/tests/ref/fate/vp8-test-vector-017 b/tests/ref/fate/vp8-test-vector-017
index a8ccda8ee9..db0527e21f 100644
--- a/tests/ref/fate/vp8-test-vector-017
+++ b/tests/ref/fate/vp8-test-vector-017
@@ -1,4 +1,12 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 176x144
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        1,    38016, 905a823da31f71f9c25ebb8dfc9ddd3c
 0,          1,          1,        1,    38016, f0f411dd067bff05d5d9c64e3f52a4b1
 0,          2,          2,        1,    38016, c8696f8fa56b4adf18f3db0c384d968f
diff --git a/tests/ref/fate/vp9-00-quantizer-00 b/tests/ref/fate/vp9-00-quantizer-00
index a6e701e4a3..de1f54aa69 100644
--- a/tests/ref/fate/vp9-00-quantizer-00
+++ b/tests/ref/fate/vp9-00-quantizer-00
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, c3fbb7abbdb5bd4ed4a7e34768c17df1
-0,         33,         33,        0,   152064, 08203c2595bdb2d58ead6f921345d699
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, c3fbb7abbdb5bd4ed4a7e34768c17df1
+0,          1,          1,        1,   152064, 08203c2595bdb2d58ead6f921345d699
diff --git a/tests/ref/fate/vp9-00-quantizer-01 b/tests/ref/fate/vp9-00-quantizer-01
index 0d22d2bf07..59c497410d 100644
--- a/tests/ref/fate/vp9-00-quantizer-01
+++ b/tests/ref/fate/vp9-00-quantizer-01
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, f041b870cf9236d5f22e2b08a77d5958
-0,         33,         33,        0,   152064, cbdb7526986ae15592891488c9afc84c
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, f041b870cf9236d5f22e2b08a77d5958
+0,          1,          1,        1,   152064, cbdb7526986ae15592891488c9afc84c
diff --git a/tests/ref/fate/vp9-00-quantizer-02 b/tests/ref/fate/vp9-00-quantizer-02
index 023caf8f3a..6cc92f46d4 100644
--- a/tests/ref/fate/vp9-00-quantizer-02
+++ b/tests/ref/fate/vp9-00-quantizer-02
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 98048cfdb4af5059f4085c5acc94ef8f
-0,         33,         33,        0,   152064, 8160183e1eed1d0af4427be216b8b9f7
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 98048cfdb4af5059f4085c5acc94ef8f
+0,          1,          1,        1,   152064, 8160183e1eed1d0af4427be216b8b9f7
diff --git a/tests/ref/fate/vp9-00-quantizer-03 b/tests/ref/fate/vp9-00-quantizer-03
index 5abb9eecb5..a7e3043bb4 100644
--- a/tests/ref/fate/vp9-00-quantizer-03
+++ b/tests/ref/fate/vp9-00-quantizer-03
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 15c548208f5eda243a151a42f4d64855
-0,         33,         33,        0,   152064, e96d463dc8e9b27b1c2ec40f77eee6ef
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 15c548208f5eda243a151a42f4d64855
+0,          1,          1,        1,   152064, e96d463dc8e9b27b1c2ec40f77eee6ef
diff --git a/tests/ref/fate/vp9-00-quantizer-04 b/tests/ref/fate/vp9-00-quantizer-04
index 1be91be870..df742fd8c1 100644
--- a/tests/ref/fate/vp9-00-quantizer-04
+++ b/tests/ref/fate/vp9-00-quantizer-04
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 928c64a0747ac57ab50c1520d694fea7
-0,         33,         33,        0,   152064, a6f6daa293231e95ef30ed168f582c84
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 928c64a0747ac57ab50c1520d694fea7
+0,          1,          1,        1,   152064, a6f6daa293231e95ef30ed168f582c84
diff --git a/tests/ref/fate/vp9-00-quantizer-05 b/tests/ref/fate/vp9-00-quantizer-05
index 9e359b39b8..ca544a9c7b 100644
--- a/tests/ref/fate/vp9-00-quantizer-05
+++ b/tests/ref/fate/vp9-00-quantizer-05
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 082460718b7d7046c8fb23184b7f71ca
-0,         33,         33,        0,   152064, 4a41aad51c40a92df72333e13f47d3fe
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 082460718b7d7046c8fb23184b7f71ca
+0,          1,          1,        1,   152064, 4a41aad51c40a92df72333e13f47d3fe
diff --git a/tests/ref/fate/vp9-00-quantizer-06 b/tests/ref/fate/vp9-00-quantizer-06
index e9843114eb..d5de1881a3 100644
--- a/tests/ref/fate/vp9-00-quantizer-06
+++ b/tests/ref/fate/vp9-00-quantizer-06
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, cfca1bed96ff62a69b2d841fda01c6b9
-0,         33,         33,        0,   152064, 9b4d61f1b998745c108f8eb67925e03d
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, cfca1bed96ff62a69b2d841fda01c6b9
+0,          1,          1,        1,   152064, 9b4d61f1b998745c108f8eb67925e03d
diff --git a/tests/ref/fate/vp9-00-quantizer-07 b/tests/ref/fate/vp9-00-quantizer-07
index b1e6b542a6..619ce46076 100644
--- a/tests/ref/fate/vp9-00-quantizer-07
+++ b/tests/ref/fate/vp9-00-quantizer-07
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 6f5122064bead9d9882bec2698a6ed9c
-0,         33,         33,        0,   152064, 50dae67d2f57a76eece210dee8b6df9e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 6f5122064bead9d9882bec2698a6ed9c
+0,          1,          1,        1,   152064, 50dae67d2f57a76eece210dee8b6df9e
diff --git a/tests/ref/fate/vp9-00-quantizer-08 b/tests/ref/fate/vp9-00-quantizer-08
index 6bb9687b11..3bccbeae0a 100644
--- a/tests/ref/fate/vp9-00-quantizer-08
+++ b/tests/ref/fate/vp9-00-quantizer-08
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, eb3d6985fcda5d93dd62d53354e8a093
-0,         33,         33,        0,   152064, 5b1f5b7780b4cafe1f75e56a0b526643
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, eb3d6985fcda5d93dd62d53354e8a093
+0,          1,          1,        1,   152064, 5b1f5b7780b4cafe1f75e56a0b526643
diff --git a/tests/ref/fate/vp9-00-quantizer-09 b/tests/ref/fate/vp9-00-quantizer-09
index 32055ca00b..42ae12b483 100644
--- a/tests/ref/fate/vp9-00-quantizer-09
+++ b/tests/ref/fate/vp9-00-quantizer-09
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, d7ccaf28c59875fe91983def5490d2b1
-0,         33,         33,        0,   152064, bd98fe9492054826748de840b4495309
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, d7ccaf28c59875fe91983def5490d2b1
+0,          1,          1,        1,   152064, bd98fe9492054826748de840b4495309
diff --git a/tests/ref/fate/vp9-00-quantizer-10 b/tests/ref/fate/vp9-00-quantizer-10
index 9f738a3389..c3a7d7a430 100644
--- a/tests/ref/fate/vp9-00-quantizer-10
+++ b/tests/ref/fate/vp9-00-quantizer-10
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 20dda6231f9801c9c237c6d09d9939b6
-0,         33,         33,        0,   152064, 23c91e93807fb9a4ed5bd5bdd449d99f
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 20dda6231f9801c9c237c6d09d9939b6
+0,          1,          1,        1,   152064, 23c91e93807fb9a4ed5bd5bdd449d99f
diff --git a/tests/ref/fate/vp9-00-quantizer-11 b/tests/ref/fate/vp9-00-quantizer-11
index 3449ea9a5e..262978b30a 100644
--- a/tests/ref/fate/vp9-00-quantizer-11
+++ b/tests/ref/fate/vp9-00-quantizer-11
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 960833315ebcdee97f46c4d98d0f3fef
-0,         33,         33,        0,   152064, eec40507d17b64b7895a61cb87b2096a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 960833315ebcdee97f46c4d98d0f3fef
+0,          1,          1,        1,   152064, eec40507d17b64b7895a61cb87b2096a
diff --git a/tests/ref/fate/vp9-00-quantizer-12 b/tests/ref/fate/vp9-00-quantizer-12
index 1494fd9562..c3dfd3da3a 100644
--- a/tests/ref/fate/vp9-00-quantizer-12
+++ b/tests/ref/fate/vp9-00-quantizer-12
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 6533224d3b6ba1ec0dd973bbe56c6349
-0,         33,         33,        0,   152064, 12ceadc6d28327a24a75f8c40b6084d1
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 6533224d3b6ba1ec0dd973bbe56c6349
+0,          1,          1,        1,   152064, 12ceadc6d28327a24a75f8c40b6084d1
diff --git a/tests/ref/fate/vp9-00-quantizer-13 b/tests/ref/fate/vp9-00-quantizer-13
index 1a75e63f5f..e3a70fc5b6 100644
--- a/tests/ref/fate/vp9-00-quantizer-13
+++ b/tests/ref/fate/vp9-00-quantizer-13
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 7268de6756014f79a56dcf010c52a97f
-0,         33,         33,        0,   152064, 9e39e9b0e2295b8460dfa05f44762771
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 7268de6756014f79a56dcf010c52a97f
+0,          1,          1,        1,   152064, 9e39e9b0e2295b8460dfa05f44762771
diff --git a/tests/ref/fate/vp9-00-quantizer-14 b/tests/ref/fate/vp9-00-quantizer-14
index b614bd7759..0cb48f3cd1 100644
--- a/tests/ref/fate/vp9-00-quantizer-14
+++ b/tests/ref/fate/vp9-00-quantizer-14
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 57e9e333c641fa952f7485b788df225a
-0,         33,         33,        0,   152064, 551f0cea83dcdf4540c3983736757874
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 57e9e333c641fa952f7485b788df225a
+0,          1,          1,        1,   152064, 551f0cea83dcdf4540c3983736757874
diff --git a/tests/ref/fate/vp9-00-quantizer-15 b/tests/ref/fate/vp9-00-quantizer-15
index e092a9a140..fdab5179d2 100644
--- a/tests/ref/fate/vp9-00-quantizer-15
+++ b/tests/ref/fate/vp9-00-quantizer-15
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 17a0a2842856b9e89aede237648d5dda
-0,         33,         33,        0,   152064, c9fcade888a38621bebe3d4b41664245
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 17a0a2842856b9e89aede237648d5dda
+0,          1,          1,        1,   152064, c9fcade888a38621bebe3d4b41664245
diff --git a/tests/ref/fate/vp9-00-quantizer-16 b/tests/ref/fate/vp9-00-quantizer-16
index 159debc6be..ef45c9c5ea 100644
--- a/tests/ref/fate/vp9-00-quantizer-16
+++ b/tests/ref/fate/vp9-00-quantizer-16
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 6cc2089e9a3d352fe10b59ccd935c677
-0,         33,         33,        0,   152064, d165bf7b9cb901e121a65038758d8613
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 6cc2089e9a3d352fe10b59ccd935c677
+0,          1,          1,        1,   152064, d165bf7b9cb901e121a65038758d8613
diff --git a/tests/ref/fate/vp9-00-quantizer-17 b/tests/ref/fate/vp9-00-quantizer-17
index bc89173560..f66de6c417 100644
--- a/tests/ref/fate/vp9-00-quantizer-17
+++ b/tests/ref/fate/vp9-00-quantizer-17
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, bc80511c83162c09661f155cd29f6dd8
-0,         33,         33,        0,   152064, a62f1cbdb3f86d2fb4c880cfd917def5
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, bc80511c83162c09661f155cd29f6dd8
+0,          1,          1,        1,   152064, a62f1cbdb3f86d2fb4c880cfd917def5
diff --git a/tests/ref/fate/vp9-00-quantizer-18 b/tests/ref/fate/vp9-00-quantizer-18
index a05d563fb2..60f7bc911a 100644
--- a/tests/ref/fate/vp9-00-quantizer-18
+++ b/tests/ref/fate/vp9-00-quantizer-18
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, b2d350f6faa41cb50c2e8a9907d0f4a5
-0,         33,         33,        0,   152064, 39b4380d16bc8e093dd4dba475175fb3
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, b2d350f6faa41cb50c2e8a9907d0f4a5
+0,          1,          1,        1,   152064, 39b4380d16bc8e093dd4dba475175fb3
diff --git a/tests/ref/fate/vp9-00-quantizer-19 b/tests/ref/fate/vp9-00-quantizer-19
index 43c1c5543f..3c25eded1b 100644
--- a/tests/ref/fate/vp9-00-quantizer-19
+++ b/tests/ref/fate/vp9-00-quantizer-19
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 441e09be3c15fcb240afd74bb7a10a72
-0,         33,         33,        0,   152064, 32ae5dac876ca5d5ae6ab7c74f4dc25d
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 441e09be3c15fcb240afd74bb7a10a72
+0,          1,          1,        1,   152064, 32ae5dac876ca5d5ae6ab7c74f4dc25d
diff --git a/tests/ref/fate/vp9-00-quantizer-20 b/tests/ref/fate/vp9-00-quantizer-20
index 95e5216454..06a973f6e9 100644
--- a/tests/ref/fate/vp9-00-quantizer-20
+++ b/tests/ref/fate/vp9-00-quantizer-20
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 7786eb9944dba0553e129133523a98c1
-0,         33,         33,        0,   152064, 206d888f8453427f10a40aa8bf5f6df0
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 7786eb9944dba0553e129133523a98c1
+0,          1,          1,        1,   152064, 206d888f8453427f10a40aa8bf5f6df0
diff --git a/tests/ref/fate/vp9-00-quantizer-21 b/tests/ref/fate/vp9-00-quantizer-21
index 4ddd9fb7a9..0fc00d1b4d 100644
--- a/tests/ref/fate/vp9-00-quantizer-21
+++ b/tests/ref/fate/vp9-00-quantizer-21
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, aab95e195be71feca050a839d7b3154d
-0,         33,         33,        0,   152064, 02a05d699bbbdc477e34bb0dad9f0391
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, aab95e195be71feca050a839d7b3154d
+0,          1,          1,        1,   152064, 02a05d699bbbdc477e34bb0dad9f0391
diff --git a/tests/ref/fate/vp9-00-quantizer-22 b/tests/ref/fate/vp9-00-quantizer-22
index bb9d945764..3e6305e6fd 100644
--- a/tests/ref/fate/vp9-00-quantizer-22
+++ b/tests/ref/fate/vp9-00-quantizer-22
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 41f853c3ee2d4611b645cc643d82e287
-0,         33,         33,        0,   152064, 1c240c653110ff8609ca0f0287a6496d
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 41f853c3ee2d4611b645cc643d82e287
+0,          1,          1,        1,   152064, 1c240c653110ff8609ca0f0287a6496d
diff --git a/tests/ref/fate/vp9-00-quantizer-23 b/tests/ref/fate/vp9-00-quantizer-23
index 968dfc1df2..9ce2966b37 100644
--- a/tests/ref/fate/vp9-00-quantizer-23
+++ b/tests/ref/fate/vp9-00-quantizer-23
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, bc5b07369df50c8f97ce1a377fe513cf
-0,         33,         33,        0,   152064, ce62ddb4f3e305d0f8587ae8bb44cc79
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, bc5b07369df50c8f97ce1a377fe513cf
+0,          1,          1,        1,   152064, ce62ddb4f3e305d0f8587ae8bb44cc79
diff --git a/tests/ref/fate/vp9-00-quantizer-24 b/tests/ref/fate/vp9-00-quantizer-24
index 8f087c57bd..8e372179f2 100644
--- a/tests/ref/fate/vp9-00-quantizer-24
+++ b/tests/ref/fate/vp9-00-quantizer-24
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 982d54041221c977b6f0e37a9236cc76
-0,         33,         33,        0,   152064, 57631e7f13f645c834e2944ebfd6d40e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 982d54041221c977b6f0e37a9236cc76
+0,          1,          1,        1,   152064, 57631e7f13f645c834e2944ebfd6d40e
diff --git a/tests/ref/fate/vp9-00-quantizer-25 b/tests/ref/fate/vp9-00-quantizer-25
index a14840b219..00592e8609 100644
--- a/tests/ref/fate/vp9-00-quantizer-25
+++ b/tests/ref/fate/vp9-00-quantizer-25
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, b0fb55f3f2f56b3d27038e83c10123ce
-0,         33,         33,        0,   152064, 9fcac3becdcc2d30d778a55eca4c2018
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, b0fb55f3f2f56b3d27038e83c10123ce
+0,          1,          1,        1,   152064, 9fcac3becdcc2d30d778a55eca4c2018
diff --git a/tests/ref/fate/vp9-00-quantizer-26 b/tests/ref/fate/vp9-00-quantizer-26
index 0ccb7494ec..6b6ddc91d9 100644
--- a/tests/ref/fate/vp9-00-quantizer-26
+++ b/tests/ref/fate/vp9-00-quantizer-26
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 4f645e0f354da77b9e2f2a6753c361da
-0,         33,         33,        0,   152064, b7542998ec298273ca662bc9b658d10e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 4f645e0f354da77b9e2f2a6753c361da
+0,          1,          1,        1,   152064, b7542998ec298273ca662bc9b658d10e
diff --git a/tests/ref/fate/vp9-00-quantizer-27 b/tests/ref/fate/vp9-00-quantizer-27
index f8c5df7aa9..93234babde 100644
--- a/tests/ref/fate/vp9-00-quantizer-27
+++ b/tests/ref/fate/vp9-00-quantizer-27
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 6edc96a3747cad43828397045764206e
-0,         33,         33,        0,   152064, 5fbc65d20fdca1abd69079851ce676d3
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 6edc96a3747cad43828397045764206e
+0,          1,          1,        1,   152064, 5fbc65d20fdca1abd69079851ce676d3
diff --git a/tests/ref/fate/vp9-00-quantizer-28 b/tests/ref/fate/vp9-00-quantizer-28
index 588ef1c8a1..a17355eaeb 100644
--- a/tests/ref/fate/vp9-00-quantizer-28
+++ b/tests/ref/fate/vp9-00-quantizer-28
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 5db3e910e70da38bb91d01d73acc33dd
-0,         33,         33,        0,   152064, b920ee7f7e61b7fdf9f44b1f738d0292
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 5db3e910e70da38bb91d01d73acc33dd
+0,          1,          1,        1,   152064, b920ee7f7e61b7fdf9f44b1f738d0292
diff --git a/tests/ref/fate/vp9-00-quantizer-29 b/tests/ref/fate/vp9-00-quantizer-29
index 583cfa06c0..b0f56ef227 100644
--- a/tests/ref/fate/vp9-00-quantizer-29
+++ b/tests/ref/fate/vp9-00-quantizer-29
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 3cb3e310be5305077efa6216f6f10654
-0,         33,         33,        0,   152064, 692d3e098af5978fe1a898ebc1a66a7a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 3cb3e310be5305077efa6216f6f10654
+0,          1,          1,        1,   152064, 692d3e098af5978fe1a898ebc1a66a7a
diff --git a/tests/ref/fate/vp9-00-quantizer-30 b/tests/ref/fate/vp9-00-quantizer-30
index 45b2c69df4..8491c2f79e 100644
--- a/tests/ref/fate/vp9-00-quantizer-30
+++ b/tests/ref/fate/vp9-00-quantizer-30
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, e3b3cea66ea38c5dfba1aa73bb4c611d
-0,         33,         33,        0,   152064, 42bb3e54b19c3f4c4f7ee3a6ba012e19
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, e3b3cea66ea38c5dfba1aa73bb4c611d
+0,          1,          1,        1,   152064, 42bb3e54b19c3f4c4f7ee3a6ba012e19
diff --git a/tests/ref/fate/vp9-00-quantizer-31 b/tests/ref/fate/vp9-00-quantizer-31
index 22c5749f99..f9b8505d65 100644
--- a/tests/ref/fate/vp9-00-quantizer-31
+++ b/tests/ref/fate/vp9-00-quantizer-31
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 2523e9ecfd3781eafcd7da192dc105e9
-0,         33,         33,        0,   152064, 6d5feea012b9a1f51fc643633e728764
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 2523e9ecfd3781eafcd7da192dc105e9
+0,          1,          1,        1,   152064, 6d5feea012b9a1f51fc643633e728764
diff --git a/tests/ref/fate/vp9-00-quantizer-32 b/tests/ref/fate/vp9-00-quantizer-32
index 8103d9622e..f93286c699 100644
--- a/tests/ref/fate/vp9-00-quantizer-32
+++ b/tests/ref/fate/vp9-00-quantizer-32
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 0a0305eba36500ebf6cc6cc0f01f5a3b
-0,         33,         33,        0,   152064, 2c76bcd6763467f9057a726fbcf50ab1
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 0a0305eba36500ebf6cc6cc0f01f5a3b
+0,          1,          1,        1,   152064, 2c76bcd6763467f9057a726fbcf50ab1
diff --git a/tests/ref/fate/vp9-00-quantizer-33 b/tests/ref/fate/vp9-00-quantizer-33
index ab7c061b98..cbbc463d72 100644
--- a/tests/ref/fate/vp9-00-quantizer-33
+++ b/tests/ref/fate/vp9-00-quantizer-33
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, c68433e0e94047c220be9b629334f744
-0,         33,         33,        0,   152064, fcfa4dff7a39bc9c5e315849ecbb46ea
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, c68433e0e94047c220be9b629334f744
+0,          1,          1,        1,   152064, fcfa4dff7a39bc9c5e315849ecbb46ea
diff --git a/tests/ref/fate/vp9-00-quantizer-34 b/tests/ref/fate/vp9-00-quantizer-34
index d5719ec096..dc9bc3009f 100644
--- a/tests/ref/fate/vp9-00-quantizer-34
+++ b/tests/ref/fate/vp9-00-quantizer-34
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, ad9dc2f912c137b014a33e2792c88a25
-0,         33,         33,        0,   152064, 11221ee4ea5c776f43af68756682cd5a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, ad9dc2f912c137b014a33e2792c88a25
+0,          1,          1,        1,   152064, 11221ee4ea5c776f43af68756682cd5a
diff --git a/tests/ref/fate/vp9-00-quantizer-35 b/tests/ref/fate/vp9-00-quantizer-35
index 623d62c795..23effea74e 100644
--- a/tests/ref/fate/vp9-00-quantizer-35
+++ b/tests/ref/fate/vp9-00-quantizer-35
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 75031f898cccf303a64ab46b1f815389
-0,         33,         33,        0,   152064, a4fc864e7fbc470dfcab6207e0eea152
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 75031f898cccf303a64ab46b1f815389
+0,          1,          1,        1,   152064, a4fc864e7fbc470dfcab6207e0eea152
diff --git a/tests/ref/fate/vp9-00-quantizer-36 b/tests/ref/fate/vp9-00-quantizer-36
index e6cde4569c..f43915d594 100644
--- a/tests/ref/fate/vp9-00-quantizer-36
+++ b/tests/ref/fate/vp9-00-quantizer-36
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, c7824af009fde6cafdd8d39fae6bb6cf
-0,         33,         33,        0,   152064, 516a82d5fc4dfa3daf713ed2ec36041b
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, c7824af009fde6cafdd8d39fae6bb6cf
+0,          1,          1,        1,   152064, 516a82d5fc4dfa3daf713ed2ec36041b
diff --git a/tests/ref/fate/vp9-00-quantizer-37 b/tests/ref/fate/vp9-00-quantizer-37
index b4c01349b3..1e4fd74f97 100644
--- a/tests/ref/fate/vp9-00-quantizer-37
+++ b/tests/ref/fate/vp9-00-quantizer-37
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, a2e5c820fd9733e18f9349fb658ca281
-0,         33,         33,        0,   152064, fb23e0bc64728a492a33d985032f21b8
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, a2e5c820fd9733e18f9349fb658ca281
+0,          1,          1,        1,   152064, fb23e0bc64728a492a33d985032f21b8
diff --git a/tests/ref/fate/vp9-00-quantizer-38 b/tests/ref/fate/vp9-00-quantizer-38
index 89e45f9c6d..7ae5444d9c 100644
--- a/tests/ref/fate/vp9-00-quantizer-38
+++ b/tests/ref/fate/vp9-00-quantizer-38
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 8347bfb891317e89ef66781d6c28e24f
-0,         33,         33,        0,   152064, a5722f824d32deac042513a1a7dcdcd0
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 8347bfb891317e89ef66781d6c28e24f
+0,          1,          1,        1,   152064, a5722f824d32deac042513a1a7dcdcd0
diff --git a/tests/ref/fate/vp9-00-quantizer-39 b/tests/ref/fate/vp9-00-quantizer-39
index ed5add1b26..0241494b44 100644
--- a/tests/ref/fate/vp9-00-quantizer-39
+++ b/tests/ref/fate/vp9-00-quantizer-39
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 018968f97fac3bdff146cf22c1da5ef0
-0,         33,         33,        0,   152064, ca8b09b01e5132183395e238f1c7901e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 018968f97fac3bdff146cf22c1da5ef0
+0,          1,          1,        1,   152064, ca8b09b01e5132183395e238f1c7901e
diff --git a/tests/ref/fate/vp9-00-quantizer-40 b/tests/ref/fate/vp9-00-quantizer-40
index 8ac2b914c3..2da4ea153d 100644
--- a/tests/ref/fate/vp9-00-quantizer-40
+++ b/tests/ref/fate/vp9-00-quantizer-40
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 792660f6589ad5340be4bd0554435866
-0,         33,         33,        0,   152064, 68c84c8a15d679e0a73678b93215c62c
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 792660f6589ad5340be4bd0554435866
+0,          1,          1,        1,   152064, 68c84c8a15d679e0a73678b93215c62c
diff --git a/tests/ref/fate/vp9-00-quantizer-41 b/tests/ref/fate/vp9-00-quantizer-41
index ccd735db6c..bb7623e222 100644
--- a/tests/ref/fate/vp9-00-quantizer-41
+++ b/tests/ref/fate/vp9-00-quantizer-41
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, a456bdfc6c1c07b4cb3a3848843743b9
-0,         33,         33,        0,   152064, fe41a12b8cb6bc5667ba2179e076f3b0
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, a456bdfc6c1c07b4cb3a3848843743b9
+0,          1,          1,        1,   152064, fe41a12b8cb6bc5667ba2179e076f3b0
diff --git a/tests/ref/fate/vp9-00-quantizer-42 b/tests/ref/fate/vp9-00-quantizer-42
index 3955ebfcdf..b1f5293841 100644
--- a/tests/ref/fate/vp9-00-quantizer-42
+++ b/tests/ref/fate/vp9-00-quantizer-42
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, f016dd8431694d989700fb1ba71a5b2d
-0,         33,         33,        0,   152064, e89c3c5b935157b40f2fb0ab92415828
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, f016dd8431694d989700fb1ba71a5b2d
+0,          1,          1,        1,   152064, e89c3c5b935157b40f2fb0ab92415828
diff --git a/tests/ref/fate/vp9-00-quantizer-43 b/tests/ref/fate/vp9-00-quantizer-43
index e458266113..b25e1c079e 100644
--- a/tests/ref/fate/vp9-00-quantizer-43
+++ b/tests/ref/fate/vp9-00-quantizer-43
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 7b8ab82625f3006bac89d4fb5197e71c
-0,         33,         33,        0,   152064, 18bd3716045563dfba2c72b640b3274b
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 7b8ab82625f3006bac89d4fb5197e71c
+0,          1,          1,        1,   152064, 18bd3716045563dfba2c72b640b3274b
diff --git a/tests/ref/fate/vp9-00-quantizer-44 b/tests/ref/fate/vp9-00-quantizer-44
index 178c224183..1d378f687c 100644
--- a/tests/ref/fate/vp9-00-quantizer-44
+++ b/tests/ref/fate/vp9-00-quantizer-44
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 66fde04d8320c750e56406feefd29979
-0,         33,         33,        0,   152064, f9d01d8fc1722ec345e624e14b404215
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 66fde04d8320c750e56406feefd29979
+0,          1,          1,        1,   152064, f9d01d8fc1722ec345e624e14b404215
diff --git a/tests/ref/fate/vp9-00-quantizer-45 b/tests/ref/fate/vp9-00-quantizer-45
index 4ab45e2043..8155faad37 100644
--- a/tests/ref/fate/vp9-00-quantizer-45
+++ b/tests/ref/fate/vp9-00-quantizer-45
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, cc97597b015896d73f3e60e7ae44c4da
-0,         33,         33,        0,   152064, fea98bc508f92135641ab99762444b14
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, cc97597b015896d73f3e60e7ae44c4da
+0,          1,          1,        1,   152064, fea98bc508f92135641ab99762444b14
diff --git a/tests/ref/fate/vp9-00-quantizer-46 b/tests/ref/fate/vp9-00-quantizer-46
index df6c212627..166423b5e5 100644
--- a/tests/ref/fate/vp9-00-quantizer-46
+++ b/tests/ref/fate/vp9-00-quantizer-46
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 79ed95c741178bb3c0954f1f6f8e21a3
-0,         33,         33,        0,   152064, f02a06a5e2b5b7619c9a52c5bea0564d
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 79ed95c741178bb3c0954f1f6f8e21a3
+0,          1,          1,        1,   152064, f02a06a5e2b5b7619c9a52c5bea0564d
diff --git a/tests/ref/fate/vp9-00-quantizer-47 b/tests/ref/fate/vp9-00-quantizer-47
index 7e6476e5c0..5e04899494 100644
--- a/tests/ref/fate/vp9-00-quantizer-47
+++ b/tests/ref/fate/vp9-00-quantizer-47
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 9b98e948b8c2a822f21bd8419e6f4410
-0,         33,         33,        0,   152064, 491382d68c16c2a3c6f1746598bc4a97
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 9b98e948b8c2a822f21bd8419e6f4410
+0,          1,          1,        1,   152064, 491382d68c16c2a3c6f1746598bc4a97
diff --git a/tests/ref/fate/vp9-00-quantizer-48 b/tests/ref/fate/vp9-00-quantizer-48
index 22a3ce2bd4..444278baec 100644
--- a/tests/ref/fate/vp9-00-quantizer-48
+++ b/tests/ref/fate/vp9-00-quantizer-48
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, f0f095b0edae7262f44d7ed7ef84ded4
-0,         33,         33,        0,   152064, 0e833889ccac81d60251007d1baf6500
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, f0f095b0edae7262f44d7ed7ef84ded4
+0,          1,          1,        1,   152064, 0e833889ccac81d60251007d1baf6500
diff --git a/tests/ref/fate/vp9-00-quantizer-49 b/tests/ref/fate/vp9-00-quantizer-49
index 34f74a6761..31e59fdc4b 100644
--- a/tests/ref/fate/vp9-00-quantizer-49
+++ b/tests/ref/fate/vp9-00-quantizer-49
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 6c1b7b7827617fb9b8417aca2cfdbcaa
-0,         33,         33,        0,   152064, 4c1fc8a89297fdcf79f0faabd42b8684
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 6c1b7b7827617fb9b8417aca2cfdbcaa
+0,          1,          1,        1,   152064, 4c1fc8a89297fdcf79f0faabd42b8684
diff --git a/tests/ref/fate/vp9-00-quantizer-50 b/tests/ref/fate/vp9-00-quantizer-50
index e9d40affd3..ca40c628b5 100644
--- a/tests/ref/fate/vp9-00-quantizer-50
+++ b/tests/ref/fate/vp9-00-quantizer-50
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, ca6142db68463487bc28c888ab38476c
-0,         33,         33,        0,   152064, 02a71153ec70f569524c3d814cb62f86
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, ca6142db68463487bc28c888ab38476c
+0,          1,          1,        1,   152064, 02a71153ec70f569524c3d814cb62f86
diff --git a/tests/ref/fate/vp9-00-quantizer-51 b/tests/ref/fate/vp9-00-quantizer-51
index 3a86326bee..8b65d84268 100644
--- a/tests/ref/fate/vp9-00-quantizer-51
+++ b/tests/ref/fate/vp9-00-quantizer-51
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, eece2627df1ddf0872256eb92352e179
-0,         33,         33,        0,   152064, 0ee9f221246ad747250e4b5e8ba586e2
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, eece2627df1ddf0872256eb92352e179
+0,          1,          1,        1,   152064, 0ee9f221246ad747250e4b5e8ba586e2
diff --git a/tests/ref/fate/vp9-00-quantizer-52 b/tests/ref/fate/vp9-00-quantizer-52
index 6d976d83bc..e5bea451d8 100644
--- a/tests/ref/fate/vp9-00-quantizer-52
+++ b/tests/ref/fate/vp9-00-quantizer-52
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 7290039d974c4e50db9d69f9864bcdbe
-0,         33,         33,        0,   152064, 264765de9d02503038a4da54133b9f85
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 7290039d974c4e50db9d69f9864bcdbe
+0,          1,          1,        1,   152064, 264765de9d02503038a4da54133b9f85
diff --git a/tests/ref/fate/vp9-00-quantizer-53 b/tests/ref/fate/vp9-00-quantizer-53
index 5f2ab99263..663bc5cb74 100644
--- a/tests/ref/fate/vp9-00-quantizer-53
+++ b/tests/ref/fate/vp9-00-quantizer-53
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 917af24da66f143a56a01eb2c2254285
-0,         33,         33,        0,   152064, 45a05d3bc644420519619e4115662a70
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 917af24da66f143a56a01eb2c2254285
+0,          1,          1,        1,   152064, 45a05d3bc644420519619e4115662a70
diff --git a/tests/ref/fate/vp9-00-quantizer-54 b/tests/ref/fate/vp9-00-quantizer-54
index 38c2496ab5..8d4178212c 100644
--- a/tests/ref/fate/vp9-00-quantizer-54
+++ b/tests/ref/fate/vp9-00-quantizer-54
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 6fea2820bb10a9dec9add4d2452b01f5
-0,         33,         33,        0,   152064, 74675169a4bfc2ff5463c4db5d85a79f
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 6fea2820bb10a9dec9add4d2452b01f5
+0,          1,          1,        1,   152064, 74675169a4bfc2ff5463c4db5d85a79f
diff --git a/tests/ref/fate/vp9-00-quantizer-55 b/tests/ref/fate/vp9-00-quantizer-55
index c50fdd4902..676491aaaf 100644
--- a/tests/ref/fate/vp9-00-quantizer-55
+++ b/tests/ref/fate/vp9-00-quantizer-55
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 11e5d196f6537fb7d85988d90195e556
-0,         33,         33,        0,   152064, 8536106795f7c93c5a43a11493527469
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 11e5d196f6537fb7d85988d90195e556
+0,          1,          1,        1,   152064, 8536106795f7c93c5a43a11493527469
diff --git a/tests/ref/fate/vp9-00-quantizer-56 b/tests/ref/fate/vp9-00-quantizer-56
index 80bff693ad..44debaa04d 100644
--- a/tests/ref/fate/vp9-00-quantizer-56
+++ b/tests/ref/fate/vp9-00-quantizer-56
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 40839b7a3a40ec10f96b8a75224f646d
-0,         33,         33,        0,   152064, 11408dd73e8c45ddaab99f5c9650102b
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 40839b7a3a40ec10f96b8a75224f646d
+0,          1,          1,        1,   152064, 11408dd73e8c45ddaab99f5c9650102b
diff --git a/tests/ref/fate/vp9-00-quantizer-57 b/tests/ref/fate/vp9-00-quantizer-57
index 38783aa8e4..d506a0e733 100644
--- a/tests/ref/fate/vp9-00-quantizer-57
+++ b/tests/ref/fate/vp9-00-quantizer-57
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, d0e9fa03dd48da4592ebaadb4e3794e0
-0,         33,         33,        0,   152064, 5172e29b1e04cd543833d6a68aab297c
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, d0e9fa03dd48da4592ebaadb4e3794e0
+0,          1,          1,        1,   152064, 5172e29b1e04cd543833d6a68aab297c
diff --git a/tests/ref/fate/vp9-00-quantizer-58 b/tests/ref/fate/vp9-00-quantizer-58
index 80ead0f3e8..2c339e0fe7 100644
--- a/tests/ref/fate/vp9-00-quantizer-58
+++ b/tests/ref/fate/vp9-00-quantizer-58
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, bef4a27d460e7697e038fe6f1c8bd597
-0,         33,         33,        0,   152064, 124674686cafc5f2ff5bc7ea412b8f3b
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, bef4a27d460e7697e038fe6f1c8bd597
+0,          1,          1,        1,   152064, 124674686cafc5f2ff5bc7ea412b8f3b
diff --git a/tests/ref/fate/vp9-00-quantizer-59 b/tests/ref/fate/vp9-00-quantizer-59
index dbc6a5d28b..de3df905af 100644
--- a/tests/ref/fate/vp9-00-quantizer-59
+++ b/tests/ref/fate/vp9-00-quantizer-59
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, ae9d99e9d16ef20073300559566844ae
-0,         33,         33,        0,   152064, da9405e5a6bfe4ed18d927ba2004008e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, ae9d99e9d16ef20073300559566844ae
+0,          1,          1,        1,   152064, da9405e5a6bfe4ed18d927ba2004008e
diff --git a/tests/ref/fate/vp9-00-quantizer-60 b/tests/ref/fate/vp9-00-quantizer-60
index c71532ed70..5fee13add7 100644
--- a/tests/ref/fate/vp9-00-quantizer-60
+++ b/tests/ref/fate/vp9-00-quantizer-60
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 9e66bb8e1b5e206ea4afe4bf2d335ac5
-0,         33,         33,        0,   152064, 092b74c905c12c1e87e90f5a79857736
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 9e66bb8e1b5e206ea4afe4bf2d335ac5
+0,          1,          1,        1,   152064, 092b74c905c12c1e87e90f5a79857736
diff --git a/tests/ref/fate/vp9-00-quantizer-61 b/tests/ref/fate/vp9-00-quantizer-61
index b453341345..877a5b184d 100644
--- a/tests/ref/fate/vp9-00-quantizer-61
+++ b/tests/ref/fate/vp9-00-quantizer-61
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, d062dc6be246c8042744018765ef50a8
-0,         33,         33,        0,   152064, 45fd9cbacb6a91060a7e49a58a85869d
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, d062dc6be246c8042744018765ef50a8
+0,          1,          1,        1,   152064, 45fd9cbacb6a91060a7e49a58a85869d
diff --git a/tests/ref/fate/vp9-00-quantizer-62 b/tests/ref/fate/vp9-00-quantizer-62
index 1efa26f7bd..8ed9f1dbbd 100644
--- a/tests/ref/fate/vp9-00-quantizer-62
+++ b/tests/ref/fate/vp9-00-quantizer-62
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 62f7e42fe653e81c5a65a25389e045b5
-0,         33,         33,        0,   152064, cb0cdd0b25689e0a43328550011d960d
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 62f7e42fe653e81c5a65a25389e045b5
+0,          1,          1,        1,   152064, cb0cdd0b25689e0a43328550011d960d
diff --git a/tests/ref/fate/vp9-00-quantizer-63 b/tests/ref/fate/vp9-00-quantizer-63
index f47388440c..bebe71613b 100644
--- a/tests/ref/fate/vp9-00-quantizer-63
+++ b/tests/ref/fate/vp9-00-quantizer-63
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 8467643dceff827e04acd82eeff1d1b0
-0,         33,         33,        0,   152064, c786f49d66f4dfd685dea9605821a19f
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 8467643dceff827e04acd82eeff1d1b0
+0,          1,          1,        1,   152064, c786f49d66f4dfd685dea9605821a19f
diff --git a/tests/ref/fate/vp9-01-sharpness-1 b/tests/ref/fate/vp9-01-sharpness-1
index 406bd61fc7..9017ca8568 100644
--- a/tests/ref/fate/vp9-01-sharpness-1
+++ b/tests/ref/fate/vp9-01-sharpness-1
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, a2e5c820fd9733e18f9349fb658ca281
-0,         33,         33,        0,   152064, aa20a75be3a316193496706c9f760d08
-0,         66,         66,        0,   152064, 95567be97a64d3c9efe45f2524116a2e
-0,        100,        100,        0,   152064, 219e86cd6b3cca312856eead21776b1c
-0,        133,        133,        0,   152064, 4a67fd359ca362398e97c15eb018a2bb
-0,        166,        166,        0,   152064, 9916d4e359274d690827f0eb22547423
-0,        200,        200,        0,   152064, a07785b52561150c48f1a8eff89d5d75
-0,        233,        233,        0,   152064, a3382a92982953dfa20018e5ac975b51
-0,        266,        266,        0,   152064, 911836989ca7b148438aa3ec7fc7e303
-0,        300,        300,        0,   152064, 5627b981e3fc9e4401d35d3a5ab25917
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, a2e5c820fd9733e18f9349fb658ca281
+0,          1,          1,        1,   152064, aa20a75be3a316193496706c9f760d08
+0,          2,          2,        1,   152064, 95567be97a64d3c9efe45f2524116a2e
+0,          3,          3,        1,   152064, 219e86cd6b3cca312856eead21776b1c
+0,          4,          4,        1,   152064, 4a67fd359ca362398e97c15eb018a2bb
+0,          5,          5,        1,   152064, 9916d4e359274d690827f0eb22547423
+0,          6,          6,        1,   152064, a07785b52561150c48f1a8eff89d5d75
+0,          7,          7,        1,   152064, a3382a92982953dfa20018e5ac975b51
+0,          8,          8,        1,   152064, 911836989ca7b148438aa3ec7fc7e303
+0,          9,          9,        1,   152064, 5627b981e3fc9e4401d35d3a5ab25917
diff --git a/tests/ref/fate/vp9-01-sharpness-2 b/tests/ref/fate/vp9-01-sharpness-2
index 78d7e9177f..ea2464af9a 100644
--- a/tests/ref/fate/vp9-01-sharpness-2
+++ b/tests/ref/fate/vp9-01-sharpness-2
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, a2e5c820fd9733e18f9349fb658ca281
-0,         33,         33,        0,   152064, cd94572239817ae7c9b07de739c3272b
-0,         66,         66,        0,   152064, 383cf752d457e122b5ff49d08960208e
-0,        100,        100,        0,   152064, 1c0a6ec9cd3ce29b8b004e7526f1b07e
-0,        133,        133,        0,   152064, 91c42a8a108d67947cabfc2a5a80df66
-0,        166,        166,        0,   152064, 08c57fc1f3fec0305883315a66c714d1
-0,        200,        200,        0,   152064, 70cb8d8dc83eac82f2d3c4b0376bb1aa
-0,        233,        233,        0,   152064, ffd62a9ef829ec81f0f74f740488a41f
-0,        266,        266,        0,   152064, bab0aa23b5854e2a70926046e4618710
-0,        300,        300,        0,   152064, fec456f38f2a43661e786a8d5f67ed15
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, a2e5c820fd9733e18f9349fb658ca281
+0,          1,          1,        1,   152064, cd94572239817ae7c9b07de739c3272b
+0,          2,          2,        1,   152064, 383cf752d457e122b5ff49d08960208e
+0,          3,          3,        1,   152064, 1c0a6ec9cd3ce29b8b004e7526f1b07e
+0,          4,          4,        1,   152064, 91c42a8a108d67947cabfc2a5a80df66
+0,          5,          5,        1,   152064, 08c57fc1f3fec0305883315a66c714d1
+0,          6,          6,        1,   152064, 70cb8d8dc83eac82f2d3c4b0376bb1aa
+0,          7,          7,        1,   152064, ffd62a9ef829ec81f0f74f740488a41f
+0,          8,          8,        1,   152064, bab0aa23b5854e2a70926046e4618710
+0,          9,          9,        1,   152064, fec456f38f2a43661e786a8d5f67ed15
diff --git a/tests/ref/fate/vp9-01-sharpness-3 b/tests/ref/fate/vp9-01-sharpness-3
index 541c7e9755..79bff6ae0e 100644
--- a/tests/ref/fate/vp9-01-sharpness-3
+++ b/tests/ref/fate/vp9-01-sharpness-3
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, a2e5c820fd9733e18f9349fb658ca281
-0,         33,         33,        0,   152064, 0d487a146393a0b8b84b4be1b371b507
-0,         66,         66,        0,   152064, 68372e191eba620a431cfff226026ac3
-0,        100,        100,        0,   152064, de7fd274460e36b983fe93acc208d72f
-0,        133,        133,        0,   152064, afbd36c61bab65b98ff9acf08e215721
-0,        166,        166,        0,   152064, e1e9fc2ab4e7a187a8d8d84aae48d6b9
-0,        200,        200,        0,   152064, 11d95de6a9cc5e00511e99534779faac
-0,        233,        233,        0,   152064, cd2f5539fdfc2d8eefe6b6da28c13398
-0,        266,        266,        0,   152064, a8b3aeed41da7aeb8d5b962ee4a4af93
-0,        300,        300,        0,   152064, 4283670bd1c1c506ef18d3dafca22035
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, a2e5c820fd9733e18f9349fb658ca281
+0,          1,          1,        1,   152064, 0d487a146393a0b8b84b4be1b371b507
+0,          2,          2,        1,   152064, 68372e191eba620a431cfff226026ac3
+0,          3,          3,        1,   152064, de7fd274460e36b983fe93acc208d72f
+0,          4,          4,        1,   152064, afbd36c61bab65b98ff9acf08e215721
+0,          5,          5,        1,   152064, e1e9fc2ab4e7a187a8d8d84aae48d6b9
+0,          6,          6,        1,   152064, 11d95de6a9cc5e00511e99534779faac
+0,          7,          7,        1,   152064, cd2f5539fdfc2d8eefe6b6da28c13398
+0,          8,          8,        1,   152064, a8b3aeed41da7aeb8d5b962ee4a4af93
+0,          9,          9,        1,   152064, 4283670bd1c1c506ef18d3dafca22035
diff --git a/tests/ref/fate/vp9-01-sharpness-4 b/tests/ref/fate/vp9-01-sharpness-4
index df41b70565..d5393c38f2 100644
--- a/tests/ref/fate/vp9-01-sharpness-4
+++ b/tests/ref/fate/vp9-01-sharpness-4
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, a2e5c820fd9733e18f9349fb658ca281
-0,         33,         33,        0,   152064, 8bad76c55b5149169d64ce6512521de6
-0,         66,         66,        0,   152064, c1d986e1f9bf46382e598ba289b9bd7c
-0,        100,        100,        0,   152064, 86c097ac6069c786023d3561dae68bac
-0,        133,        133,        0,   152064, 8c238a2831b8c7c49736b6de6ff76ed8
-0,        166,        166,        0,   152064, cb5a038ed0a74a317ee72dae93a7ee3e
-0,        200,        200,        0,   152064, f8fe330a257e3e4e4c39c1c12820a654
-0,        233,        233,        0,   152064, a73e2fcdcbb9334c0c123f8276a2c881
-0,        266,        266,        0,   152064, 24fccece8ee639e4d0e00e4060e1db0c
-0,        300,        300,        0,   152064, 46d6e9aad69a39c718c5fd1e41e86e6e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, a2e5c820fd9733e18f9349fb658ca281
+0,          1,          1,        1,   152064, 8bad76c55b5149169d64ce6512521de6
+0,          2,          2,        1,   152064, c1d986e1f9bf46382e598ba289b9bd7c
+0,          3,          3,        1,   152064, 86c097ac6069c786023d3561dae68bac
+0,          4,          4,        1,   152064, 8c238a2831b8c7c49736b6de6ff76ed8
+0,          5,          5,        1,   152064, cb5a038ed0a74a317ee72dae93a7ee3e
+0,          6,          6,        1,   152064, f8fe330a257e3e4e4c39c1c12820a654
+0,          7,          7,        1,   152064, a73e2fcdcbb9334c0c123f8276a2c881
+0,          8,          8,        1,   152064, 24fccece8ee639e4d0e00e4060e1db0c
+0,          9,          9,        1,   152064, 46d6e9aad69a39c718c5fd1e41e86e6e
diff --git a/tests/ref/fate/vp9-01-sharpness-5 b/tests/ref/fate/vp9-01-sharpness-5
index b183d6bea0..93dfb0ed16 100644
--- a/tests/ref/fate/vp9-01-sharpness-5
+++ b/tests/ref/fate/vp9-01-sharpness-5
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, a2e5c820fd9733e18f9349fb658ca281
-0,         33,         33,        0,   152064, f1ce0a5d57a46c9ff1331804b7b03fdb
-0,         66,         66,        0,   152064, 0364a085b06bee6b980189cf5378eda9
-0,        100,        100,        0,   152064, 4b5358698d734b0ae210909a913d4c1e
-0,        133,        133,        0,   152064, dc22565aaceee77b15fd8ab3c84bd5e0
-0,        166,        166,        0,   152064, 5f6340b656536292b46ba9a647aeb6e4
-0,        200,        200,        0,   152064, b7d4bce9a04b2a6caa45801be15e331e
-0,        233,        233,        0,   152064, 534c851cfe59ffc047815ece98d8cede
-0,        266,        266,        0,   152064, 786b0e1564d5c71aabfc2dd528cff4e7
-0,        300,        300,        0,   152064, cac0366209cf471bb7cc3e64966cbbd4
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, a2e5c820fd9733e18f9349fb658ca281
+0,          1,          1,        1,   152064, f1ce0a5d57a46c9ff1331804b7b03fdb
+0,          2,          2,        1,   152064, 0364a085b06bee6b980189cf5378eda9
+0,          3,          3,        1,   152064, 4b5358698d734b0ae210909a913d4c1e
+0,          4,          4,        1,   152064, dc22565aaceee77b15fd8ab3c84bd5e0
+0,          5,          5,        1,   152064, 5f6340b656536292b46ba9a647aeb6e4
+0,          6,          6,        1,   152064, b7d4bce9a04b2a6caa45801be15e331e
+0,          7,          7,        1,   152064, 534c851cfe59ffc047815ece98d8cede
+0,          8,          8,        1,   152064, 786b0e1564d5c71aabfc2dd528cff4e7
+0,          9,          9,        1,   152064, cac0366209cf471bb7cc3e64966cbbd4
diff --git a/tests/ref/fate/vp9-01-sharpness-6 b/tests/ref/fate/vp9-01-sharpness-6
index e0189a2744..80c120ccd1 100644
--- a/tests/ref/fate/vp9-01-sharpness-6
+++ b/tests/ref/fate/vp9-01-sharpness-6
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, a2e5c820fd9733e18f9349fb658ca281
-0,         33,         33,        0,   152064, 45d9ca07ed04210b1ebc743169bc8ec4
-0,         66,         66,        0,   152064, 5b646cc309a711f1d8814f925002d8c4
-0,        100,        100,        0,   152064, 34db8db727fa1ded0a55cc7cf85be249
-0,        133,        133,        0,   152064, 54173d08afe6369b16a9c0c9cc6ce04d
-0,        166,        166,        0,   152064, 76275b0a478cdb3c1fb527ebbce023c3
-0,        200,        200,        0,   152064, e7643cdf0c42f2af700d8730bfc1a453
-0,        233,        233,        0,   152064, 6e53097e56f680cb658d63100e7736f7
-0,        266,        266,        0,   152064, 1a407c3c8ea1d5245ae68c5ce7de70e1
-0,        300,        300,        0,   152064, 6cbca24912cadf09b20be74f14e359c9
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, a2e5c820fd9733e18f9349fb658ca281
+0,          1,          1,        1,   152064, 45d9ca07ed04210b1ebc743169bc8ec4
+0,          2,          2,        1,   152064, 5b646cc309a711f1d8814f925002d8c4
+0,          3,          3,        1,   152064, 34db8db727fa1ded0a55cc7cf85be249
+0,          4,          4,        1,   152064, 54173d08afe6369b16a9c0c9cc6ce04d
+0,          5,          5,        1,   152064, 76275b0a478cdb3c1fb527ebbce023c3
+0,          6,          6,        1,   152064, e7643cdf0c42f2af700d8730bfc1a453
+0,          7,          7,        1,   152064, 6e53097e56f680cb658d63100e7736f7
+0,          8,          8,        1,   152064, 1a407c3c8ea1d5245ae68c5ce7de70e1
+0,          9,          9,        1,   152064, 6cbca24912cadf09b20be74f14e359c9
diff --git a/tests/ref/fate/vp9-01-sharpness-7 b/tests/ref/fate/vp9-01-sharpness-7
index 3fad7dc2b5..dc1ab3f70e 100644
--- a/tests/ref/fate/vp9-01-sharpness-7
+++ b/tests/ref/fate/vp9-01-sharpness-7
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, a2e5c820fd9733e18f9349fb658ca281
-0,         33,         33,        0,   152064, f719d0be18d16a448b4e7da3e2d9bf28
-0,         66,         66,        0,   152064, 83ee8ebc0ca796782a2376a76f2ffc26
-0,        100,        100,        0,   152064, 7cf5afdbc229e1af50a5377cfc23d831
-0,        133,        133,        0,   152064, 44244e896e0362f6376ba5afa563ba8b
-0,        166,        166,        0,   152064, df5f518d44eb6cb91b2df5a30d27ef82
-0,        200,        200,        0,   152064, 43cc3f151b8337aca7ee659c8abeb783
-0,        233,        233,        0,   152064, 4e89573470d9b97464e10806fc81aa8b
-0,        266,        266,        0,   152064, 62e0ba70f07ece8d85372f0a42e83a9a
-0,        300,        300,        0,   152064, 45ac2928acb11326f6c4a21401f3609c
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, a2e5c820fd9733e18f9349fb658ca281
+0,          1,          1,        1,   152064, f719d0be18d16a448b4e7da3e2d9bf28
+0,          2,          2,        1,   152064, 83ee8ebc0ca796782a2376a76f2ffc26
+0,          3,          3,        1,   152064, 7cf5afdbc229e1af50a5377cfc23d831
+0,          4,          4,        1,   152064, 44244e896e0362f6376ba5afa563ba8b
+0,          5,          5,        1,   152064, df5f518d44eb6cb91b2df5a30d27ef82
+0,          6,          6,        1,   152064, 43cc3f151b8337aca7ee659c8abeb783
+0,          7,          7,        1,   152064, 4e89573470d9b97464e10806fc81aa8b
+0,          8,          8,        1,   152064, 62e0ba70f07ece8d85372f0a42e83a9a
+0,          9,          9,        1,   152064, 45ac2928acb11326f6c4a21401f3609c
diff --git a/tests/ref/fate/vp9-02-size-08x08 b/tests/ref/fate/vp9-02-size-08x08
index 51a27b35e2..99cf18a0d6 100644
--- a/tests/ref/fate/vp9-02-size-08x08
+++ b/tests/ref/fate/vp9-02-size-08x08
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,       96, 52def242c36123e5a8f5f53d6a971399
-0,         33,         33,        0,       96, 79c93360fbd47179400414bbfee0901c
-0,         66,         66,        0,       96, c3b1947c79537baa7838905276276a91
-0,        100,        100,        0,       96, 20f35e501bdee0bc63e87b9240265c25
-0,        133,        133,        0,       96, 5e8f1c464bafd54833c51860906b5368
-0,        166,        166,        0,       96, f57b592600dfc99e634a083278af769a
-0,        200,        200,        0,       96, 7b02191f85590cbad3f148c7b92d6436
-0,        233,        233,        0,       96, b0a1c9870447a1744f64cd4087ef55ee
-0,        266,        266,        0,       96, c82712b1ba7a95efb67cbdde0ad708b6
-0,        300,        300,        0,       96, 89f4539f8d7a7b45a91fd2f46335988e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 8x8
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,       96, 52def242c36123e5a8f5f53d6a971399
+0,          1,          1,        1,       96, 79c93360fbd47179400414bbfee0901c
+0,          2,          2,        1,       96, c3b1947c79537baa7838905276276a91
+0,          3,          3,        1,       96, 20f35e501bdee0bc63e87b9240265c25
+0,          4,          4,        1,       96, 5e8f1c464bafd54833c51860906b5368
+0,          5,          5,        1,       96, f57b592600dfc99e634a083278af769a
+0,          6,          6,        1,       96, 7b02191f85590cbad3f148c7b92d6436
+0,          7,          7,        1,       96, b0a1c9870447a1744f64cd4087ef55ee
+0,          8,          8,        1,       96, c82712b1ba7a95efb67cbdde0ad708b6
+0,          9,          9,        1,       96, 89f4539f8d7a7b45a91fd2f46335988e
diff --git a/tests/ref/fate/vp9-02-size-08x10 b/tests/ref/fate/vp9-02-size-08x10
index 3829cfbb61..a4001ded2b 100644
--- a/tests/ref/fate/vp9-02-size-08x10
+++ b/tests/ref/fate/vp9-02-size-08x10
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      120, ea3e0f807304b0eb2d3e329b0124f75c
-0,         33,         33,        0,      120, 8d13cf682d63e7eb13094f55d67fc458
-0,         66,         66,        0,      120, e729cc6c3684c94a8f6118c618efc3ea
-0,        100,        100,        0,      120, ac43a0ace8e4112e877c2491ecc14fb5
-0,        133,        133,        0,      120, 53695f90b88d8e8cb838f0faec3238d3
-0,        166,        166,        0,      120, 40afd1c4dfd4a2e3b31631c46d252bcc
-0,        200,        200,        0,      120, 2b656f76f2e84d2f82d9bda2b5be94d3
-0,        233,        233,        0,      120, b22f004d678d047bc401be5e040cf883
-0,        266,        266,        0,      120, 57c840319abfb9c31013fbde54de3fb0
-0,        300,        300,        0,      120, 0f3dfc156216d7cfb6fd1d8c77dadab9
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 8x10
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      120, ea3e0f807304b0eb2d3e329b0124f75c
+0,          1,          1,        1,      120, 8d13cf682d63e7eb13094f55d67fc458
+0,          2,          2,        1,      120, e729cc6c3684c94a8f6118c618efc3ea
+0,          3,          3,        1,      120, ac43a0ace8e4112e877c2491ecc14fb5
+0,          4,          4,        1,      120, 53695f90b88d8e8cb838f0faec3238d3
+0,          5,          5,        1,      120, 40afd1c4dfd4a2e3b31631c46d252bcc
+0,          6,          6,        1,      120, 2b656f76f2e84d2f82d9bda2b5be94d3
+0,          7,          7,        1,      120, b22f004d678d047bc401be5e040cf883
+0,          8,          8,        1,      120, 57c840319abfb9c31013fbde54de3fb0
+0,          9,          9,        1,      120, 0f3dfc156216d7cfb6fd1d8c77dadab9
diff --git a/tests/ref/fate/vp9-02-size-08x16 b/tests/ref/fate/vp9-02-size-08x16
index c2e0a68ebb..f143cd8551 100644
--- a/tests/ref/fate/vp9-02-size-08x16
+++ b/tests/ref/fate/vp9-02-size-08x16
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      192, 0553e56a9d89aea496421885aab491f5
-0,         33,         33,        0,      192, b2a14cf676f7ebf3c50450050f76ad16
-0,         66,         66,        0,      192, a308d981e09b50571fb0c8ebdcefe505
-0,        100,        100,        0,      192, d592ec625a0ac0373e82610c3eed9864
-0,        133,        133,        0,      192, acd19642455e643023b4fb882c3891ba
-0,        166,        166,        0,      192, 5af5390fd8c29b795e0ddf83f3f34284
-0,        200,        200,        0,      192, 473505aa2a76231725cf2107d6c9dbef
-0,        233,        233,        0,      192, 84860db6887e320f2d64f80cf0032e57
-0,        266,        266,        0,      192, 408e9cf60e99ae99d204ff08f3196d1a
-0,        300,        300,        0,      192, d8af96b79258f9382e911ed38340bdf5
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 8x16
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      192, 0553e56a9d89aea496421885aab491f5
+0,          1,          1,        1,      192, b2a14cf676f7ebf3c50450050f76ad16
+0,          2,          2,        1,      192, a308d981e09b50571fb0c8ebdcefe505
+0,          3,          3,        1,      192, d592ec625a0ac0373e82610c3eed9864
+0,          4,          4,        1,      192, acd19642455e643023b4fb882c3891ba
+0,          5,          5,        1,      192, 5af5390fd8c29b795e0ddf83f3f34284
+0,          6,          6,        1,      192, 473505aa2a76231725cf2107d6c9dbef
+0,          7,          7,        1,      192, 84860db6887e320f2d64f80cf0032e57
+0,          8,          8,        1,      192, 408e9cf60e99ae99d204ff08f3196d1a
+0,          9,          9,        1,      192, d8af96b79258f9382e911ed38340bdf5
diff --git a/tests/ref/fate/vp9-02-size-08x18 b/tests/ref/fate/vp9-02-size-08x18
index 8b7470d5b2..308d229322 100644
--- a/tests/ref/fate/vp9-02-size-08x18
+++ b/tests/ref/fate/vp9-02-size-08x18
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      216, 4c41f93b1b280b37bc77d7047435eaa4
-0,         33,         33,        0,      216, c9c80fdba2ebc2b8c3490ae35e34f84f
-0,         66,         66,        0,      216, 089d86acb3263fa5ef4f591a7f44556d
-0,        100,        100,        0,      216, 938fca6d93b83484144f5054e4838a41
-0,        133,        133,        0,      216, e0592e2ac9f5e09525ce0d3904cadf47
-0,        166,        166,        0,      216, ea43ff5d1330986e60c08567262ea764
-0,        200,        200,        0,      216, 08b40fe109ee90188f1cba9bbb1b376e
-0,        233,        233,        0,      216, b067068a2a7e36d5c5b5b405a1e73a18
-0,        266,        266,        0,      216, 9cf2d350296288803434b7451bd2be85
-0,        300,        300,        0,      216, 3c785e21dc228d6396738fbfcb470289
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 8x18
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      216, 4c41f93b1b280b37bc77d7047435eaa4
+0,          1,          1,        1,      216, c9c80fdba2ebc2b8c3490ae35e34f84f
+0,          2,          2,        1,      216, 089d86acb3263fa5ef4f591a7f44556d
+0,          3,          3,        1,      216, 938fca6d93b83484144f5054e4838a41
+0,          4,          4,        1,      216, e0592e2ac9f5e09525ce0d3904cadf47
+0,          5,          5,        1,      216, ea43ff5d1330986e60c08567262ea764
+0,          6,          6,        1,      216, 08b40fe109ee90188f1cba9bbb1b376e
+0,          7,          7,        1,      216, b067068a2a7e36d5c5b5b405a1e73a18
+0,          8,          8,        1,      216, 9cf2d350296288803434b7451bd2be85
+0,          9,          9,        1,      216, 3c785e21dc228d6396738fbfcb470289
diff --git a/tests/ref/fate/vp9-02-size-08x32 b/tests/ref/fate/vp9-02-size-08x32
index 7d3841f408..9ec35a45ce 100644
--- a/tests/ref/fate/vp9-02-size-08x32
+++ b/tests/ref/fate/vp9-02-size-08x32
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      384, f92a7777fd69aa2f2914d9a41c4828ba
-0,         33,         33,        0,      384, 62e1cc73487d2249a88a60e35a22d9c7
-0,         66,         66,        0,      384, aa2619b605cb65eda15fdd99d5775550
-0,        100,        100,        0,      384, e6f0a491c543b835d0cefe5ca62c3dbe
-0,        133,        133,        0,      384, 361be1a06913c398f09494ca1b2d288f
-0,        166,        166,        0,      384, 0497bf849a973357c0ccb8d43f5bd8b4
-0,        200,        200,        0,      384, 5ac6ac523147c409dd00820622161dd7
-0,        233,        233,        0,      384, 7d07245574a46c524360f09be29a5f19
-0,        266,        266,        0,      384, fcfa7fbcaf42f81e4e34a4ee5a029ca1
-0,        300,        300,        0,      384, 336e3fe4f15d3d6c82d82b1855dcfeb4
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 8x32
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      384, f92a7777fd69aa2f2914d9a41c4828ba
+0,          1,          1,        1,      384, 62e1cc73487d2249a88a60e35a22d9c7
+0,          2,          2,        1,      384, aa2619b605cb65eda15fdd99d5775550
+0,          3,          3,        1,      384, e6f0a491c543b835d0cefe5ca62c3dbe
+0,          4,          4,        1,      384, 361be1a06913c398f09494ca1b2d288f
+0,          5,          5,        1,      384, 0497bf849a973357c0ccb8d43f5bd8b4
+0,          6,          6,        1,      384, 5ac6ac523147c409dd00820622161dd7
+0,          7,          7,        1,      384, 7d07245574a46c524360f09be29a5f19
+0,          8,          8,        1,      384, fcfa7fbcaf42f81e4e34a4ee5a029ca1
+0,          9,          9,        1,      384, 336e3fe4f15d3d6c82d82b1855dcfeb4
diff --git a/tests/ref/fate/vp9-02-size-08x34 b/tests/ref/fate/vp9-02-size-08x34
index affba3788b..7e4bc5b255 100644
--- a/tests/ref/fate/vp9-02-size-08x34
+++ b/tests/ref/fate/vp9-02-size-08x34
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      408, f3f2cd8f157466ff23dace85d77367ce
-0,         33,         33,        0,      408, 639d9b70a14062e95559c12d2b597f91
-0,         66,         66,        0,      408, b2ee07a6656af583f19593229fa11848
-0,        100,        100,        0,      408, 74e3b5ab4c798a0afe745694e871bbd5
-0,        133,        133,        0,      408, 35f1c30d0f8678f319a392a6c53b5989
-0,        166,        166,        0,      408, 07e2b4c0b92a394bfb11124fe80476f0
-0,        200,        200,        0,      408, 7864bd20dfc5280e5f027d67ea22bf30
-0,        233,        233,        0,      408, 10a2925a7b91dfa9b82de76069388fd4
-0,        266,        266,        0,      408, 79cc7f7a149e8d6e04e065f75e63733c
-0,        300,        300,        0,      408, 6453d10d97532d9bb03f7c06cba9fca0
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 8x34
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      408, f3f2cd8f157466ff23dace85d77367ce
+0,          1,          1,        1,      408, 639d9b70a14062e95559c12d2b597f91
+0,          2,          2,        1,      408, b2ee07a6656af583f19593229fa11848
+0,          3,          3,        1,      408, 74e3b5ab4c798a0afe745694e871bbd5
+0,          4,          4,        1,      408, 35f1c30d0f8678f319a392a6c53b5989
+0,          5,          5,        1,      408, 07e2b4c0b92a394bfb11124fe80476f0
+0,          6,          6,        1,      408, 7864bd20dfc5280e5f027d67ea22bf30
+0,          7,          7,        1,      408, 10a2925a7b91dfa9b82de76069388fd4
+0,          8,          8,        1,      408, 79cc7f7a149e8d6e04e065f75e63733c
+0,          9,          9,        1,      408, 6453d10d97532d9bb03f7c06cba9fca0
diff --git a/tests/ref/fate/vp9-02-size-08x64 b/tests/ref/fate/vp9-02-size-08x64
index 506f39fa1b..24dafb8082 100644
--- a/tests/ref/fate/vp9-02-size-08x64
+++ b/tests/ref/fate/vp9-02-size-08x64
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      768, 764bd02b781a38c621a109c12f3d9393
-0,         33,         33,        0,      768, 79496bd2b9212026af816b3b7a0587d5
-0,         66,         66,        0,      768, 2a3afd47ba3d075033fd94d5c3746c45
-0,        100,        100,        0,      768, fca00cad8d37a6646337baebadd0ca31
-0,        133,        133,        0,      768, aca376fb3f8a5ef670ecc2430037262a
-0,        166,        166,        0,      768, 7e6c8d96d1e24855c3e380f1bf2ce02c
-0,        200,        200,        0,      768, 09e051241972969d439f27f324d78490
-0,        233,        233,        0,      768, 2566b2a425caaba41305bf04ff10ea01
-0,        266,        266,        0,      768, db3995bedee42ada1b4ee63c339daf1b
-0,        300,        300,        0,      768, b00b8f1bf4fd907f0487738f5b5442c6
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 8x64
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      768, 764bd02b781a38c621a109c12f3d9393
+0,          1,          1,        1,      768, 79496bd2b9212026af816b3b7a0587d5
+0,          2,          2,        1,      768, 2a3afd47ba3d075033fd94d5c3746c45
+0,          3,          3,        1,      768, fca00cad8d37a6646337baebadd0ca31
+0,          4,          4,        1,      768, aca376fb3f8a5ef670ecc2430037262a
+0,          5,          5,        1,      768, 7e6c8d96d1e24855c3e380f1bf2ce02c
+0,          6,          6,        1,      768, 09e051241972969d439f27f324d78490
+0,          7,          7,        1,      768, 2566b2a425caaba41305bf04ff10ea01
+0,          8,          8,        1,      768, db3995bedee42ada1b4ee63c339daf1b
+0,          9,          9,        1,      768, b00b8f1bf4fd907f0487738f5b5442c6
diff --git a/tests/ref/fate/vp9-02-size-08x66 b/tests/ref/fate/vp9-02-size-08x66
index 6ef07a075c..f52eb69657 100644
--- a/tests/ref/fate/vp9-02-size-08x66
+++ b/tests/ref/fate/vp9-02-size-08x66
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      792, df20e8df89449fe50bb610e95a449a95
-0,         33,         33,        0,      792, 18f1a66d463274d1b0489f3a50e86857
-0,         66,         66,        0,      792, b0cc102875a94c9a92e53826617adbe9
-0,        100,        100,        0,      792, dfece7c17b4b149283ef51bdc1bd440e
-0,        133,        133,        0,      792, 6e346884f67be259fcabe493109cb63c
-0,        166,        166,        0,      792, 6d282127311eb2d958377490d7cb77f0
-0,        200,        200,        0,      792, 637ac8b14ca5ddbaf7b8910406c3cd08
-0,        233,        233,        0,      792, e7980f3fcb36969da0d218c4389fa9e8
-0,        266,        266,        0,      792, 730a1c95b9fb165f6e1a2f33a0d25de0
-0,        300,        300,        0,      792, 7bd8424d0783b1c8ad617e17408371bb
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 8x66
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      792, df20e8df89449fe50bb610e95a449a95
+0,          1,          1,        1,      792, 18f1a66d463274d1b0489f3a50e86857
+0,          2,          2,        1,      792, b0cc102875a94c9a92e53826617adbe9
+0,          3,          3,        1,      792, dfece7c17b4b149283ef51bdc1bd440e
+0,          4,          4,        1,      792, 6e346884f67be259fcabe493109cb63c
+0,          5,          5,        1,      792, 6d282127311eb2d958377490d7cb77f0
+0,          6,          6,        1,      792, 637ac8b14ca5ddbaf7b8910406c3cd08
+0,          7,          7,        1,      792, e7980f3fcb36969da0d218c4389fa9e8
+0,          8,          8,        1,      792, 730a1c95b9fb165f6e1a2f33a0d25de0
+0,          9,          9,        1,      792, 7bd8424d0783b1c8ad617e17408371bb
diff --git a/tests/ref/fate/vp9-02-size-10x08 b/tests/ref/fate/vp9-02-size-10x08
index f9ea55bd42..b23509a736 100644
--- a/tests/ref/fate/vp9-02-size-10x08
+++ b/tests/ref/fate/vp9-02-size-10x08
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      120, e1e66a88615da98523ef887f1463fc42
-0,         33,         33,        0,      120, 549842fa98c8faf572882d38b0aae390
-0,         66,         66,        0,      120, 17ee85785517705fdc78c6122a4b2548
-0,        100,        100,        0,      120, 1143391d419dac30a6c11f366157c974
-0,        133,        133,        0,      120, b62d2a962c4c36809ef75a610106715c
-0,        166,        166,        0,      120, e6f143ca33fbc0e776bb149950cdedff
-0,        200,        200,        0,      120, 01716a1077ec66df00474fd4510d2789
-0,        233,        233,        0,      120, 8cb5b6a865fa2cbb15f0d7736fda88a6
-0,        266,        266,        0,      120, 0fb9fd883e895a540fe1704dddbbab04
-0,        300,        300,        0,      120, 150a3b99aa24ef102c92f87c8adb4386
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 10x8
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      120, e1e66a88615da98523ef887f1463fc42
+0,          1,          1,        1,      120, 549842fa98c8faf572882d38b0aae390
+0,          2,          2,        1,      120, 17ee85785517705fdc78c6122a4b2548
+0,          3,          3,        1,      120, 1143391d419dac30a6c11f366157c974
+0,          4,          4,        1,      120, b62d2a962c4c36809ef75a610106715c
+0,          5,          5,        1,      120, e6f143ca33fbc0e776bb149950cdedff
+0,          6,          6,        1,      120, 01716a1077ec66df00474fd4510d2789
+0,          7,          7,        1,      120, 8cb5b6a865fa2cbb15f0d7736fda88a6
+0,          8,          8,        1,      120, 0fb9fd883e895a540fe1704dddbbab04
+0,          9,          9,        1,      120, 150a3b99aa24ef102c92f87c8adb4386
diff --git a/tests/ref/fate/vp9-02-size-10x10 b/tests/ref/fate/vp9-02-size-10x10
index cff03c2b3b..7a4831e0c1 100644
--- a/tests/ref/fate/vp9-02-size-10x10
+++ b/tests/ref/fate/vp9-02-size-10x10
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      150, 083d638f2e147295d817bb14fff5e4f4
-0,         33,         33,        0,      150, 6dbdc445b6fd6bb99f2025cc2a40977e
-0,         66,         66,        0,      150, 41714089383b181d64fbfa7de5904608
-0,        100,        100,        0,      150, 11fdb8465e1599f7a9227706646d2cba
-0,        133,        133,        0,      150, 907876b3342a10040db0851a936af4e3
-0,        166,        166,        0,      150, e7b18d47d06b25de205d873d3d941640
-0,        200,        200,        0,      150, 523ce7413c8da7f6a657a9b661f36c44
-0,        233,        233,        0,      150, 23caff863af875c66c903662a3e1e6a1
-0,        266,        266,        0,      150, ed4cc5557203e5b7a119112ee9ceb00b
-0,        300,        300,        0,      150, 4bb78a996be3188888d1c60e11a08e1b
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 10x10
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      150, 083d638f2e147295d817bb14fff5e4f4
+0,          1,          1,        1,      150, 6dbdc445b6fd6bb99f2025cc2a40977e
+0,          2,          2,        1,      150, 41714089383b181d64fbfa7de5904608
+0,          3,          3,        1,      150, 11fdb8465e1599f7a9227706646d2cba
+0,          4,          4,        1,      150, 907876b3342a10040db0851a936af4e3
+0,          5,          5,        1,      150, e7b18d47d06b25de205d873d3d941640
+0,          6,          6,        1,      150, 523ce7413c8da7f6a657a9b661f36c44
+0,          7,          7,        1,      150, 23caff863af875c66c903662a3e1e6a1
+0,          8,          8,        1,      150, ed4cc5557203e5b7a119112ee9ceb00b
+0,          9,          9,        1,      150, 4bb78a996be3188888d1c60e11a08e1b
diff --git a/tests/ref/fate/vp9-02-size-10x16 b/tests/ref/fate/vp9-02-size-10x16
index 9f9f5fe4cb..ca0bcf271b 100644
--- a/tests/ref/fate/vp9-02-size-10x16
+++ b/tests/ref/fate/vp9-02-size-10x16
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      240, fab07d6209d2413e0a434e1aaaa12154
-0,         33,         33,        0,      240, f9ffffdb96f98527ba2e553d1265edbb
-0,         66,         66,        0,      240, 56a992264cf7da2b23dd97435e9d0365
-0,        100,        100,        0,      240, b1db980423d8004bd45a789b02b92a65
-0,        133,        133,        0,      240, b29496aedc7026566367b634f55ebb28
-0,        166,        166,        0,      240, 2bc9def672da4a2fc17cbd669e2b8081
-0,        200,        200,        0,      240, 8c54721514cdf577a52a8668b9135f13
-0,        233,        233,        0,      240, 2efab81d5e039d82b3bc7b0303b022c4
-0,        266,        266,        0,      240, bd0f42b91b5d126fd0baec765b1096ad
-0,        300,        300,        0,      240, c6bfea2735a629167bc6a7a7c76eb7f3
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 10x16
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      240, fab07d6209d2413e0a434e1aaaa12154
+0,          1,          1,        1,      240, f9ffffdb96f98527ba2e553d1265edbb
+0,          2,          2,        1,      240, 56a992264cf7da2b23dd97435e9d0365
+0,          3,          3,        1,      240, b1db980423d8004bd45a789b02b92a65
+0,          4,          4,        1,      240, b29496aedc7026566367b634f55ebb28
+0,          5,          5,        1,      240, 2bc9def672da4a2fc17cbd669e2b8081
+0,          6,          6,        1,      240, 8c54721514cdf577a52a8668b9135f13
+0,          7,          7,        1,      240, 2efab81d5e039d82b3bc7b0303b022c4
+0,          8,          8,        1,      240, bd0f42b91b5d126fd0baec765b1096ad
+0,          9,          9,        1,      240, c6bfea2735a629167bc6a7a7c76eb7f3
diff --git a/tests/ref/fate/vp9-02-size-10x18 b/tests/ref/fate/vp9-02-size-10x18
index 3f1e9f1cb0..7f92d284f7 100644
--- a/tests/ref/fate/vp9-02-size-10x18
+++ b/tests/ref/fate/vp9-02-size-10x18
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      270, 0e9182e214aae732d94d007e5fe44888
-0,         33,         33,        0,      270, 2630e2674b5611d68218fddac08815e2
-0,         66,         66,        0,      270, d5cdd7d6a3de17939f60bb60ef6877da
-0,        100,        100,        0,      270, 29d1961096061029e78963fa82581eca
-0,        133,        133,        0,      270, 5c2629f8aa59757f6b4aafa9f6cbcba1
-0,        166,        166,        0,      270, 1f1a8b61e4fbd6222ddf42e9d0a07032
-0,        200,        200,        0,      270, cfb9771190ac2d0129907102d6abb63f
-0,        233,        233,        0,      270, cd98dd856ba573a26a943cbe53221f26
-0,        266,        266,        0,      270, ca13c161f067c4a4ce22bd58a2aca55b
-0,        300,        300,        0,      270, de4bd1a474a76a35b796a5fc45b4f893
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 10x18
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      270, 0e9182e214aae732d94d007e5fe44888
+0,          1,          1,        1,      270, 2630e2674b5611d68218fddac08815e2
+0,          2,          2,        1,      270, d5cdd7d6a3de17939f60bb60ef6877da
+0,          3,          3,        1,      270, 29d1961096061029e78963fa82581eca
+0,          4,          4,        1,      270, 5c2629f8aa59757f6b4aafa9f6cbcba1
+0,          5,          5,        1,      270, 1f1a8b61e4fbd6222ddf42e9d0a07032
+0,          6,          6,        1,      270, cfb9771190ac2d0129907102d6abb63f
+0,          7,          7,        1,      270, cd98dd856ba573a26a943cbe53221f26
+0,          8,          8,        1,      270, ca13c161f067c4a4ce22bd58a2aca55b
+0,          9,          9,        1,      270, de4bd1a474a76a35b796a5fc45b4f893
diff --git a/tests/ref/fate/vp9-02-size-10x32 b/tests/ref/fate/vp9-02-size-10x32
index 5ca7bee024..c84d822bf6 100644
--- a/tests/ref/fate/vp9-02-size-10x32
+++ b/tests/ref/fate/vp9-02-size-10x32
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      480, 622e6407a051ea08706394d03330ffbf
-0,         33,         33,        0,      480, 1841a0daf7c3ef7be94e01fdb1d3968a
-0,         66,         66,        0,      480, 37790e6cb2415f7add0ac5d3ab354755
-0,        100,        100,        0,      480, 91485880e17c292096a7335566d3648f
-0,        133,        133,        0,      480, eb6f74983d5fd13d6bd90afbce8836e1
-0,        166,        166,        0,      480, 0069ab5ff7f0d4d601f7d0f9b7a08338
-0,        200,        200,        0,      480, dbf04254765f7497070387e8c34895c6
-0,        233,        233,        0,      480, 410a9b2d9855b2c29618070994adae96
-0,        266,        266,        0,      480, 7e7f34effd90209f29f1b9ae01488b3b
-0,        300,        300,        0,      480, 471530f74082c01c9b0f1fcf3d240d77
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 10x32
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      480, 622e6407a051ea08706394d03330ffbf
+0,          1,          1,        1,      480, 1841a0daf7c3ef7be94e01fdb1d3968a
+0,          2,          2,        1,      480, 37790e6cb2415f7add0ac5d3ab354755
+0,          3,          3,        1,      480, 91485880e17c292096a7335566d3648f
+0,          4,          4,        1,      480, eb6f74983d5fd13d6bd90afbce8836e1
+0,          5,          5,        1,      480, 0069ab5ff7f0d4d601f7d0f9b7a08338
+0,          6,          6,        1,      480, dbf04254765f7497070387e8c34895c6
+0,          7,          7,        1,      480, 410a9b2d9855b2c29618070994adae96
+0,          8,          8,        1,      480, 7e7f34effd90209f29f1b9ae01488b3b
+0,          9,          9,        1,      480, 471530f74082c01c9b0f1fcf3d240d77
diff --git a/tests/ref/fate/vp9-02-size-10x34 b/tests/ref/fate/vp9-02-size-10x34
index e61e65da74..a38aa2aaf3 100644
--- a/tests/ref/fate/vp9-02-size-10x34
+++ b/tests/ref/fate/vp9-02-size-10x34
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      510, bfeeaf51f972fd0dfe9ee757083cbb54
-0,         33,         33,        0,      510, 10cd4ed6d762004846412d9cd0caa407
-0,         66,         66,        0,      510, 04cca4008d656ed180de88dd2ddb4f21
-0,        100,        100,        0,      510, ec777e377836895748c06849fa35ed2d
-0,        133,        133,        0,      510, b55633d0f9239dff3e45a4abce4a35a7
-0,        166,        166,        0,      510, 063c3ab4b4c599942c3a8a5b7bfe5029
-0,        200,        200,        0,      510, 07b920169d32b5fc51d5b9ae16fef5bf
-0,        233,        233,        0,      510, 8d49e727db9d3072b5ab7bab2133d9be
-0,        266,        266,        0,      510, 17441437203447e946a57d2f96966332
-0,        300,        300,        0,      510, 5d3f14af0e5cd81d0c7d2059f13efa5a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 10x34
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      510, bfeeaf51f972fd0dfe9ee757083cbb54
+0,          1,          1,        1,      510, 10cd4ed6d762004846412d9cd0caa407
+0,          2,          2,        1,      510, 04cca4008d656ed180de88dd2ddb4f21
+0,          3,          3,        1,      510, ec777e377836895748c06849fa35ed2d
+0,          4,          4,        1,      510, b55633d0f9239dff3e45a4abce4a35a7
+0,          5,          5,        1,      510, 063c3ab4b4c599942c3a8a5b7bfe5029
+0,          6,          6,        1,      510, 07b920169d32b5fc51d5b9ae16fef5bf
+0,          7,          7,        1,      510, 8d49e727db9d3072b5ab7bab2133d9be
+0,          8,          8,        1,      510, 17441437203447e946a57d2f96966332
+0,          9,          9,        1,      510, 5d3f14af0e5cd81d0c7d2059f13efa5a
diff --git a/tests/ref/fate/vp9-02-size-10x64 b/tests/ref/fate/vp9-02-size-10x64
index 9a9401f7ac..77a05d5c69 100644
--- a/tests/ref/fate/vp9-02-size-10x64
+++ b/tests/ref/fate/vp9-02-size-10x64
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      960, 835254d0eecb17bed1f2b0f3a1638165
-0,         33,         33,        0,      960, c0c95ce9890eab339a0e0f8b26cb095c
-0,         66,         66,        0,      960, f0337d645ade07cb716952b0d19352e8
-0,        100,        100,        0,      960, 7e3deb21cb3f0ead90c8af94464cde14
-0,        133,        133,        0,      960, c6b1ca6cfce358c411c0637c581157c8
-0,        166,        166,        0,      960, 10fce3f11f1ce90286ff4d74fe44fcfd
-0,        200,        200,        0,      960, ee0565a1f121bc905a35550619127a50
-0,        233,        233,        0,      960, 0624b601d379616eb792c94be60b6c91
-0,        266,        266,        0,      960, a1bb79cdf347548f1103f580f2b6930f
-0,        300,        300,        0,      960, 40e96e16c7e065aa7932e5aa57f32398
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 10x64
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      960, 835254d0eecb17bed1f2b0f3a1638165
+0,          1,          1,        1,      960, c0c95ce9890eab339a0e0f8b26cb095c
+0,          2,          2,        1,      960, f0337d645ade07cb716952b0d19352e8
+0,          3,          3,        1,      960, 7e3deb21cb3f0ead90c8af94464cde14
+0,          4,          4,        1,      960, c6b1ca6cfce358c411c0637c581157c8
+0,          5,          5,        1,      960, 10fce3f11f1ce90286ff4d74fe44fcfd
+0,          6,          6,        1,      960, ee0565a1f121bc905a35550619127a50
+0,          7,          7,        1,      960, 0624b601d379616eb792c94be60b6c91
+0,          8,          8,        1,      960, a1bb79cdf347548f1103f580f2b6930f
+0,          9,          9,        1,      960, 40e96e16c7e065aa7932e5aa57f32398
diff --git a/tests/ref/fate/vp9-02-size-10x66 b/tests/ref/fate/vp9-02-size-10x66
index ef9fa1b8a6..72b25d88b3 100644
--- a/tests/ref/fate/vp9-02-size-10x66
+++ b/tests/ref/fate/vp9-02-size-10x66
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      990, 1bd8b2d3bf679c4b925780bf82e12fae
-0,         33,         33,        0,      990, a0254b4cd4928fe1080cd6f8828288a9
-0,         66,         66,        0,      990, e416e99644cca481dc2806708d716ecb
-0,        100,        100,        0,      990, b1ed3203ffc77ed814f1cda7bfe721d2
-0,        133,        133,        0,      990, 0ff7b9d84765f7b0b0650775ba72b334
-0,        166,        166,        0,      990, 8b6cd91e035bad19b46b132bd411231d
-0,        200,        200,        0,      990, c714759a9a64402043ad00e5677c954c
-0,        233,        233,        0,      990, 8e4738010b724ce66bcd0a5d5afcfbc1
-0,        266,        266,        0,      990, 998a7aab8ed94f4b69bed39fb487f8d5
-0,        300,        300,        0,      990, 9964683a15a65c032631a4f608e6009b
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 10x66
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      990, 1bd8b2d3bf679c4b925780bf82e12fae
+0,          1,          1,        1,      990, a0254b4cd4928fe1080cd6f8828288a9
+0,          2,          2,        1,      990, e416e99644cca481dc2806708d716ecb
+0,          3,          3,        1,      990, b1ed3203ffc77ed814f1cda7bfe721d2
+0,          4,          4,        1,      990, 0ff7b9d84765f7b0b0650775ba72b334
+0,          5,          5,        1,      990, 8b6cd91e035bad19b46b132bd411231d
+0,          6,          6,        1,      990, c714759a9a64402043ad00e5677c954c
+0,          7,          7,        1,      990, 8e4738010b724ce66bcd0a5d5afcfbc1
+0,          8,          8,        1,      990, 998a7aab8ed94f4b69bed39fb487f8d5
+0,          9,          9,        1,      990, 9964683a15a65c032631a4f608e6009b
diff --git a/tests/ref/fate/vp9-02-size-16x08 b/tests/ref/fate/vp9-02-size-16x08
index aac95a3c9a..bdf3207e52 100644
--- a/tests/ref/fate/vp9-02-size-16x08
+++ b/tests/ref/fate/vp9-02-size-16x08
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      192, 68dccd167f9aa18df0840ebb8715eb68
-0,         33,         33,        0,      192, 65c90bb99fdbee7abf21031d34cb18dc
-0,         66,         66,        0,      192, 9ef1feb2dcbd4d73f3ee84e9e1cd2668
-0,        100,        100,        0,      192, b6281f7c88e9aa132d3902046f8cde5a
-0,        133,        133,        0,      192, 4b439b716a294bddf9f56a229705907b
-0,        166,        166,        0,      192, d42c0a6f0d24522c90bc2233bc1df2c7
-0,        200,        200,        0,      192, 74b763a5a12c4c4a581efb1818a92970
-0,        233,        233,        0,      192, 0c3a0916ddfda5abdd3ac382f036e71f
-0,        266,        266,        0,      192, 26ff590e8ae726f70e8b36f5eaee7a19
-0,        300,        300,        0,      192, 30fa5810995d7132387ea585c4a1cc3a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x8
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      192, 68dccd167f9aa18df0840ebb8715eb68
+0,          1,          1,        1,      192, 65c90bb99fdbee7abf21031d34cb18dc
+0,          2,          2,        1,      192, 9ef1feb2dcbd4d73f3ee84e9e1cd2668
+0,          3,          3,        1,      192, b6281f7c88e9aa132d3902046f8cde5a
+0,          4,          4,        1,      192, 4b439b716a294bddf9f56a229705907b
+0,          5,          5,        1,      192, d42c0a6f0d24522c90bc2233bc1df2c7
+0,          6,          6,        1,      192, 74b763a5a12c4c4a581efb1818a92970
+0,          7,          7,        1,      192, 0c3a0916ddfda5abdd3ac382f036e71f
+0,          8,          8,        1,      192, 26ff590e8ae726f70e8b36f5eaee7a19
+0,          9,          9,        1,      192, 30fa5810995d7132387ea585c4a1cc3a
diff --git a/tests/ref/fate/vp9-02-size-16x10 b/tests/ref/fate/vp9-02-size-16x10
index bea7010216..f1424a7a3a 100644
--- a/tests/ref/fate/vp9-02-size-16x10
+++ b/tests/ref/fate/vp9-02-size-16x10
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      240, fb3cad61d7d9eb511758dbf87dd8abe1
-0,         33,         33,        0,      240, 4fbc1aa5559c8db2930803893bd6ba75
-0,         66,         66,        0,      240, 2d8e2ee04dcc6097ca9e3f27070cdcc8
-0,        100,        100,        0,      240, 05d419f1322855ba3620665b68ce9910
-0,        133,        133,        0,      240, b004f8d88cb2c94f4e9a13cfa5bd480a
-0,        166,        166,        0,      240, 9d9dec90e2213c0411939131aa9adf7f
-0,        200,        200,        0,      240, a00874356ff1b1e9da1a400424661f8d
-0,        233,        233,        0,      240, fda587eb6323cd98c773f05905ac1794
-0,        266,        266,        0,      240, 781c63d221a04d8130806c799d16753a
-0,        300,        300,        0,      240, f346e311829f3789dc5a94da48ada5f4
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x10
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      240, fb3cad61d7d9eb511758dbf87dd8abe1
+0,          1,          1,        1,      240, 4fbc1aa5559c8db2930803893bd6ba75
+0,          2,          2,        1,      240, 2d8e2ee04dcc6097ca9e3f27070cdcc8
+0,          3,          3,        1,      240, 05d419f1322855ba3620665b68ce9910
+0,          4,          4,        1,      240, b004f8d88cb2c94f4e9a13cfa5bd480a
+0,          5,          5,        1,      240, 9d9dec90e2213c0411939131aa9adf7f
+0,          6,          6,        1,      240, a00874356ff1b1e9da1a400424661f8d
+0,          7,          7,        1,      240, fda587eb6323cd98c773f05905ac1794
+0,          8,          8,        1,      240, 781c63d221a04d8130806c799d16753a
+0,          9,          9,        1,      240, f346e311829f3789dc5a94da48ada5f4
diff --git a/tests/ref/fate/vp9-02-size-16x16 b/tests/ref/fate/vp9-02-size-16x16
index b013952c65..f81f513969 100644
--- a/tests/ref/fate/vp9-02-size-16x16
+++ b/tests/ref/fate/vp9-02-size-16x16
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      384, b5c9daafa548e54a8e33e9881fda33f4
-0,         33,         33,        0,      384, 1193acd7ea4b7aac968e35ef83c64378
-0,         66,         66,        0,      384, cd0e42c0b5a8b3be6f0e1d224062bf99
-0,        100,        100,        0,      384, ed79c71d17f68f86cbfa75ea2bfe97f3
-0,        133,        133,        0,      384, 1502a859c7e07b31faad5b80e3e27cf7
-0,        166,        166,        0,      384, df3f093da914ea947db93c3baa188ecb
-0,        200,        200,        0,      384, 480f86eb183b99277c1b38fdaafe2970
-0,        233,        233,        0,      384, 023e0114282e04963f0f52e00e65ac61
-0,        266,        266,        0,      384, e67f29cf0acc7f9b553458e1e5c59ebf
-0,        300,        300,        0,      384, a779a14ba718f0c1df8a7edc9467d12e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x16
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      384, b5c9daafa548e54a8e33e9881fda33f4
+0,          1,          1,        1,      384, 1193acd7ea4b7aac968e35ef83c64378
+0,          2,          2,        1,      384, cd0e42c0b5a8b3be6f0e1d224062bf99
+0,          3,          3,        1,      384, ed79c71d17f68f86cbfa75ea2bfe97f3
+0,          4,          4,        1,      384, 1502a859c7e07b31faad5b80e3e27cf7
+0,          5,          5,        1,      384, df3f093da914ea947db93c3baa188ecb
+0,          6,          6,        1,      384, 480f86eb183b99277c1b38fdaafe2970
+0,          7,          7,        1,      384, 023e0114282e04963f0f52e00e65ac61
+0,          8,          8,        1,      384, e67f29cf0acc7f9b553458e1e5c59ebf
+0,          9,          9,        1,      384, a779a14ba718f0c1df8a7edc9467d12e
diff --git a/tests/ref/fate/vp9-02-size-16x18 b/tests/ref/fate/vp9-02-size-16x18
index 1795bd9aa5..018afe28f4 100644
--- a/tests/ref/fate/vp9-02-size-16x18
+++ b/tests/ref/fate/vp9-02-size-16x18
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      432, 5156b11cd9995d0c1638c9b0d2b0786c
-0,         33,         33,        0,      432, ef78557f93fb3ea770c7d49ab60edf21
-0,         66,         66,        0,      432, f31fb9bb14566e4538a45ac7bf398b2a
-0,        100,        100,        0,      432, 97633875537f76ade183e975fa91b0fb
-0,        133,        133,        0,      432, 602cf54f9af852175173c21abd63796f
-0,        166,        166,        0,      432, 0b3741a6842cb65d6d21eda891882033
-0,        200,        200,        0,      432, 44240a27a6b6d36c9661d499fb965f87
-0,        233,        233,        0,      432, 9050f263f9a4767f9323ec8aa42cf7e6
-0,        266,        266,        0,      432, 57fa3a8494375f588a95376bc0c3cb28
-0,        300,        300,        0,      432, 084595f2a65aa10e7d3845044a0e7213
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x18
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      432, 5156b11cd9995d0c1638c9b0d2b0786c
+0,          1,          1,        1,      432, ef78557f93fb3ea770c7d49ab60edf21
+0,          2,          2,        1,      432, f31fb9bb14566e4538a45ac7bf398b2a
+0,          3,          3,        1,      432, 97633875537f76ade183e975fa91b0fb
+0,          4,          4,        1,      432, 602cf54f9af852175173c21abd63796f
+0,          5,          5,        1,      432, 0b3741a6842cb65d6d21eda891882033
+0,          6,          6,        1,      432, 44240a27a6b6d36c9661d499fb965f87
+0,          7,          7,        1,      432, 9050f263f9a4767f9323ec8aa42cf7e6
+0,          8,          8,        1,      432, 57fa3a8494375f588a95376bc0c3cb28
+0,          9,          9,        1,      432, 084595f2a65aa10e7d3845044a0e7213
diff --git a/tests/ref/fate/vp9-02-size-16x32 b/tests/ref/fate/vp9-02-size-16x32
index 663a456250..98e5f6aedb 100644
--- a/tests/ref/fate/vp9-02-size-16x32
+++ b/tests/ref/fate/vp9-02-size-16x32
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      768, c73d611490a5ddec6c690589deaf5e86
-0,         33,         33,        0,      768, 5d8eaeb222aa64abda59ce7b09b2f6d9
-0,         66,         66,        0,      768, 34321856b8dd5bbb9b63db04d3532289
-0,        100,        100,        0,      768, 947337d2fec8a09242f60e31e99f4065
-0,        133,        133,        0,      768, bb7d92f6fc055f0cf0e97bd2be56cc9e
-0,        166,        166,        0,      768, 5d343c82bcdd0e9d08581043cddfd0ca
-0,        200,        200,        0,      768, 612ded93207712e4916d584cc4a7b87c
-0,        233,        233,        0,      768, 6ba5e0d19893e1b96f5ca86e0bfd7e18
-0,        266,        266,        0,      768, 336572e1dcb110b1eb87bea81e0752f4
-0,        300,        300,        0,      768, 705f73d0a39afce59ea571e68bfe25df
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x32
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      768, c73d611490a5ddec6c690589deaf5e86
+0,          1,          1,        1,      768, 5d8eaeb222aa64abda59ce7b09b2f6d9
+0,          2,          2,        1,      768, 34321856b8dd5bbb9b63db04d3532289
+0,          3,          3,        1,      768, 947337d2fec8a09242f60e31e99f4065
+0,          4,          4,        1,      768, bb7d92f6fc055f0cf0e97bd2be56cc9e
+0,          5,          5,        1,      768, 5d343c82bcdd0e9d08581043cddfd0ca
+0,          6,          6,        1,      768, 612ded93207712e4916d584cc4a7b87c
+0,          7,          7,        1,      768, 6ba5e0d19893e1b96f5ca86e0bfd7e18
+0,          8,          8,        1,      768, 336572e1dcb110b1eb87bea81e0752f4
+0,          9,          9,        1,      768, 705f73d0a39afce59ea571e68bfe25df
diff --git a/tests/ref/fate/vp9-02-size-16x34 b/tests/ref/fate/vp9-02-size-16x34
index 54d9aaa73a..4fb287fb4f 100644
--- a/tests/ref/fate/vp9-02-size-16x34
+++ b/tests/ref/fate/vp9-02-size-16x34
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      816, b8bf711d9a1ce49180ed56407c8a4b0a
-0,         33,         33,        0,      816, 0457929b06ce46aec63d66bd38586e3f
-0,         66,         66,        0,      816, 3b5f417ee5a936797a6f0d138b8ed73b
-0,        100,        100,        0,      816, 5d1a42aeecfd5c8513cb2df94c206c8b
-0,        133,        133,        0,      816, a0ab2dddbc810a1667d779f6ed69d010
-0,        166,        166,        0,      816, b150cd7c4ec83e6f9d948e99d7465350
-0,        200,        200,        0,      816, ea39622ad21312bd8bcecdaf09aa18fb
-0,        233,        233,        0,      816, 467a42e1226a01c8ba244f312f588bab
-0,        266,        266,        0,      816, f2311e15228ffc7fd377b89c203d0fbf
-0,        300,        300,        0,      816, 5df58b3ac0a7856796a46f27be7dcf4c
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x34
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      816, b8bf711d9a1ce49180ed56407c8a4b0a
+0,          1,          1,        1,      816, 0457929b06ce46aec63d66bd38586e3f
+0,          2,          2,        1,      816, 3b5f417ee5a936797a6f0d138b8ed73b
+0,          3,          3,        1,      816, 5d1a42aeecfd5c8513cb2df94c206c8b
+0,          4,          4,        1,      816, a0ab2dddbc810a1667d779f6ed69d010
+0,          5,          5,        1,      816, b150cd7c4ec83e6f9d948e99d7465350
+0,          6,          6,        1,      816, ea39622ad21312bd8bcecdaf09aa18fb
+0,          7,          7,        1,      816, 467a42e1226a01c8ba244f312f588bab
+0,          8,          8,        1,      816, f2311e15228ffc7fd377b89c203d0fbf
+0,          9,          9,        1,      816, 5df58b3ac0a7856796a46f27be7dcf4c
diff --git a/tests/ref/fate/vp9-02-size-16x64 b/tests/ref/fate/vp9-02-size-16x64
index 0e19d9a1f3..c5b9f4507f 100644
--- a/tests/ref/fate/vp9-02-size-16x64
+++ b/tests/ref/fate/vp9-02-size-16x64
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     1536, 925fdc485f3baa1ed145ae391519d7fd
-0,         33,         33,        0,     1536, d37af656da2d7a727c8451773495d5ed
-0,         66,         66,        0,     1536, 8a0f207a99e46f3d3b2aaa3f1b061981
-0,        100,        100,        0,     1536, a3914c7b739d3af2641fd6aae35428ef
-0,        133,        133,        0,     1536, 0ba3b49970d7b029f2dfa991fdfc6e61
-0,        166,        166,        0,     1536, 55838d1d787dc5a4fa4da2994f04587f
-0,        200,        200,        0,     1536, c089f7ba2b2983df2a4dc2e07798af31
-0,        233,        233,        0,     1536, c23dcb3b109543a61ccfa404a726caae
-0,        266,        266,        0,     1536, 01aaf09960f5ca599ca32768f017d0c9
-0,        300,        300,        0,     1536, 79fe955692ecba8bbb00b20a42ca8104
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x64
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     1536, 925fdc485f3baa1ed145ae391519d7fd
+0,          1,          1,        1,     1536, d37af656da2d7a727c8451773495d5ed
+0,          2,          2,        1,     1536, 8a0f207a99e46f3d3b2aaa3f1b061981
+0,          3,          3,        1,     1536, a3914c7b739d3af2641fd6aae35428ef
+0,          4,          4,        1,     1536, 0ba3b49970d7b029f2dfa991fdfc6e61
+0,          5,          5,        1,     1536, 55838d1d787dc5a4fa4da2994f04587f
+0,          6,          6,        1,     1536, c089f7ba2b2983df2a4dc2e07798af31
+0,          7,          7,        1,     1536, c23dcb3b109543a61ccfa404a726caae
+0,          8,          8,        1,     1536, 01aaf09960f5ca599ca32768f017d0c9
+0,          9,          9,        1,     1536, 79fe955692ecba8bbb00b20a42ca8104
diff --git a/tests/ref/fate/vp9-02-size-16x66 b/tests/ref/fate/vp9-02-size-16x66
index 2d75fc8719..b3dadde447 100644
--- a/tests/ref/fate/vp9-02-size-16x66
+++ b/tests/ref/fate/vp9-02-size-16x66
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     1584, c7b0d91f362dff0a581434af6e902d43
-0,         33,         33,        0,     1584, d8b016ef59c6bc193b29d1c714f342c1
-0,         66,         66,        0,     1584, c520bd8d4b81aafc7687befff66c7396
-0,        100,        100,        0,     1584, 92e81bbd3af675c9cdb1cb00d03dabe1
-0,        133,        133,        0,     1584, a271db3defe5daa6d9e0a73a580f4f88
-0,        166,        166,        0,     1584, 4077e857321e241bb98dfd89c0aca46f
-0,        200,        200,        0,     1584, 0466e1453a94baf876e9f64b60235300
-0,        233,        233,        0,     1584, 9d2cb9c7b180d44841e0e4d8a595d912
-0,        266,        266,        0,     1584, 500f443eeb0ecef47c34d1e91f0df6ce
-0,        300,        300,        0,     1584, 83354487982915c33b1c6243d80adaeb
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x66
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     1584, c7b0d91f362dff0a581434af6e902d43
+0,          1,          1,        1,     1584, d8b016ef59c6bc193b29d1c714f342c1
+0,          2,          2,        1,     1584, c520bd8d4b81aafc7687befff66c7396
+0,          3,          3,        1,     1584, 92e81bbd3af675c9cdb1cb00d03dabe1
+0,          4,          4,        1,     1584, a271db3defe5daa6d9e0a73a580f4f88
+0,          5,          5,        1,     1584, 4077e857321e241bb98dfd89c0aca46f
+0,          6,          6,        1,     1584, 0466e1453a94baf876e9f64b60235300
+0,          7,          7,        1,     1584, 9d2cb9c7b180d44841e0e4d8a595d912
+0,          8,          8,        1,     1584, 500f443eeb0ecef47c34d1e91f0df6ce
+0,          9,          9,        1,     1584, 83354487982915c33b1c6243d80adaeb
diff --git a/tests/ref/fate/vp9-02-size-18x08 b/tests/ref/fate/vp9-02-size-18x08
index 49129ce92f..18edef95ee 100644
--- a/tests/ref/fate/vp9-02-size-18x08
+++ b/tests/ref/fate/vp9-02-size-18x08
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      216, 3219af4ef540636b0f67a989e9966059
-0,         33,         33,        0,      216, 1a3655c2cfd2ee332bc89da5b3faf778
-0,         66,         66,        0,      216, d638d5b361a6d81440e26993ed86c97d
-0,        100,        100,        0,      216, d9bc2e7cffd66db4ba9dcbce99448d4d
-0,        133,        133,        0,      216, 399f962e0a0573915bc4da4a9f1effcf
-0,        166,        166,        0,      216, 69d917e19b903e4f07f848e9e557bbe7
-0,        200,        200,        0,      216, d6311488a58acf6eb0cc45bc4fe3c2da
-0,        233,        233,        0,      216, 0ce360a84d5755307f98d65c83f190e1
-0,        266,        266,        0,      216, 2554828e6dbf94424ccac30fb153872e
-0,        300,        300,        0,      216, 598a55f9735e85b8d45105dd6be7f97b
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 18x8
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      216, 3219af4ef540636b0f67a989e9966059
+0,          1,          1,        1,      216, 1a3655c2cfd2ee332bc89da5b3faf778
+0,          2,          2,        1,      216, d638d5b361a6d81440e26993ed86c97d
+0,          3,          3,        1,      216, d9bc2e7cffd66db4ba9dcbce99448d4d
+0,          4,          4,        1,      216, 399f962e0a0573915bc4da4a9f1effcf
+0,          5,          5,        1,      216, 69d917e19b903e4f07f848e9e557bbe7
+0,          6,          6,        1,      216, d6311488a58acf6eb0cc45bc4fe3c2da
+0,          7,          7,        1,      216, 0ce360a84d5755307f98d65c83f190e1
+0,          8,          8,        1,      216, 2554828e6dbf94424ccac30fb153872e
+0,          9,          9,        1,      216, 598a55f9735e85b8d45105dd6be7f97b
diff --git a/tests/ref/fate/vp9-02-size-18x10 b/tests/ref/fate/vp9-02-size-18x10
index 3fcf5ca5db..5949110fc3 100644
--- a/tests/ref/fate/vp9-02-size-18x10
+++ b/tests/ref/fate/vp9-02-size-18x10
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      270, bf574489e9360b6475aa012c747e7924
-0,         33,         33,        0,      270, 851100301c2937312a6fd32f5aab5a09
-0,         66,         66,        0,      270, 0f7c1209e44ea7cd4df12d82f9224684
-0,        100,        100,        0,      270, 28d121f9c40de5280435bfdeaec0c072
-0,        133,        133,        0,      270, bb00898d03ce4dff5f7bee719dd3f5b5
-0,        166,        166,        0,      270, a098cc66bc25b81f84b0e930b0915cdb
-0,        200,        200,        0,      270, 81e25f19bfcbfce17bd7138eedae04ee
-0,        233,        233,        0,      270, 69c36c5ce555a461f16a1733450f7258
-0,        266,        266,        0,      270, c95236d9e7c624bb664310bd9ef47fb4
-0,        300,        300,        0,      270, 7ab0942e686939951037314e9402d2c1
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 18x10
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      270, bf574489e9360b6475aa012c747e7924
+0,          1,          1,        1,      270, 851100301c2937312a6fd32f5aab5a09
+0,          2,          2,        1,      270, 0f7c1209e44ea7cd4df12d82f9224684
+0,          3,          3,        1,      270, 28d121f9c40de5280435bfdeaec0c072
+0,          4,          4,        1,      270, bb00898d03ce4dff5f7bee719dd3f5b5
+0,          5,          5,        1,      270, a098cc66bc25b81f84b0e930b0915cdb
+0,          6,          6,        1,      270, 81e25f19bfcbfce17bd7138eedae04ee
+0,          7,          7,        1,      270, 69c36c5ce555a461f16a1733450f7258
+0,          8,          8,        1,      270, c95236d9e7c624bb664310bd9ef47fb4
+0,          9,          9,        1,      270, 7ab0942e686939951037314e9402d2c1
diff --git a/tests/ref/fate/vp9-02-size-18x16 b/tests/ref/fate/vp9-02-size-18x16
index 6b2a43a433..bcd285790c 100644
--- a/tests/ref/fate/vp9-02-size-18x16
+++ b/tests/ref/fate/vp9-02-size-18x16
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      432, 9535aaa2ea26fbdc16e7fe9cba3fc9b4
-0,         33,         33,        0,      432, 7f6e7ca33c0b27ff052dc2ab6721e37d
-0,         66,         66,        0,      432, d37e3f169457a9c7f2a197353e39d3d6
-0,        100,        100,        0,      432, f26d7d81dd81d051680ea2485e812705
-0,        133,        133,        0,      432, 704b01955ced6d101b9e9315d3327f28
-0,        166,        166,        0,      432, 30d46d6a0f6be383dede451cacf465f4
-0,        200,        200,        0,      432, 83c7ed04f0af61ec665041967cbce05d
-0,        233,        233,        0,      432, 152daf37dd37607886c50dd4c7796357
-0,        266,        266,        0,      432, 609d807351ba74b1c432e3d0516add91
-0,        300,        300,        0,      432, 67953f0c735984232cb6782217cdcdf6
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 18x16
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      432, 9535aaa2ea26fbdc16e7fe9cba3fc9b4
+0,          1,          1,        1,      432, 7f6e7ca33c0b27ff052dc2ab6721e37d
+0,          2,          2,        1,      432, d37e3f169457a9c7f2a197353e39d3d6
+0,          3,          3,        1,      432, f26d7d81dd81d051680ea2485e812705
+0,          4,          4,        1,      432, 704b01955ced6d101b9e9315d3327f28
+0,          5,          5,        1,      432, 30d46d6a0f6be383dede451cacf465f4
+0,          6,          6,        1,      432, 83c7ed04f0af61ec665041967cbce05d
+0,          7,          7,        1,      432, 152daf37dd37607886c50dd4c7796357
+0,          8,          8,        1,      432, 609d807351ba74b1c432e3d0516add91
+0,          9,          9,        1,      432, 67953f0c735984232cb6782217cdcdf6
diff --git a/tests/ref/fate/vp9-02-size-18x18 b/tests/ref/fate/vp9-02-size-18x18
index d7103ae911..58e690e761 100644
--- a/tests/ref/fate/vp9-02-size-18x18
+++ b/tests/ref/fate/vp9-02-size-18x18
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      486, 83790b0e7004d8d89b7134ee1a88d885
-0,         33,         33,        0,      486, 0baf0bf556ae56d2f4b04567e6ac7ed9
-0,         66,         66,        0,      486, c648854a4d49f7e407a2450cf4ba292a
-0,        100,        100,        0,      486, 510c3aca23339841ffc72ed5c75d184e
-0,        133,        133,        0,      486, 1c1f3116ec4d4ee1ad790652e49233ad
-0,        166,        166,        0,      486, f94891f4e16fd32d638a2c696f5922e6
-0,        200,        200,        0,      486, e164814c22e38cbe45312dfd48d987fc
-0,        233,        233,        0,      486, f582515fcc6c4308ad931d2f6cf371a0
-0,        266,        266,        0,      486, 0a446974bd227ee34a1621a2b7852abb
-0,        300,        300,        0,      486, beca28bdae8d1fe20036b3646f3109cd
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 18x18
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      486, 83790b0e7004d8d89b7134ee1a88d885
+0,          1,          1,        1,      486, 0baf0bf556ae56d2f4b04567e6ac7ed9
+0,          2,          2,        1,      486, c648854a4d49f7e407a2450cf4ba292a
+0,          3,          3,        1,      486, 510c3aca23339841ffc72ed5c75d184e
+0,          4,          4,        1,      486, 1c1f3116ec4d4ee1ad790652e49233ad
+0,          5,          5,        1,      486, f94891f4e16fd32d638a2c696f5922e6
+0,          6,          6,        1,      486, e164814c22e38cbe45312dfd48d987fc
+0,          7,          7,        1,      486, f582515fcc6c4308ad931d2f6cf371a0
+0,          8,          8,        1,      486, 0a446974bd227ee34a1621a2b7852abb
+0,          9,          9,        1,      486, beca28bdae8d1fe20036b3646f3109cd
diff --git a/tests/ref/fate/vp9-02-size-18x32 b/tests/ref/fate/vp9-02-size-18x32
index 450facc6df..37cabeb493 100644
--- a/tests/ref/fate/vp9-02-size-18x32
+++ b/tests/ref/fate/vp9-02-size-18x32
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      864, 62eabc8819ded6ddba2c3a5029497cf0
-0,         33,         33,        0,      864, b760182fddf8bc05f149e80bbcb2c281
-0,         66,         66,        0,      864, 0c44be0472ebd2653ce9fb174c6180ab
-0,        100,        100,        0,      864, bbb033c3bfeeb6f59cb43013597b9d92
-0,        133,        133,        0,      864, a769975cdbc6529525f7cac8a0d9299a
-0,        166,        166,        0,      864, 15b02059bbced62f19c0626efea1ecb9
-0,        200,        200,        0,      864, 47f4b50322ed31649bdcfffb05c70fa2
-0,        233,        233,        0,      864, 8649cdd0a958047839f5b6e7bbf6f288
-0,        266,        266,        0,      864, 2c766e3fd3882a9a5aff52ffe9d1d341
-0,        300,        300,        0,      864, 184a62b7332a1c24acbf03f670fb7ac1
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 18x32
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      864, 62eabc8819ded6ddba2c3a5029497cf0
+0,          1,          1,        1,      864, b760182fddf8bc05f149e80bbcb2c281
+0,          2,          2,        1,      864, 0c44be0472ebd2653ce9fb174c6180ab
+0,          3,          3,        1,      864, bbb033c3bfeeb6f59cb43013597b9d92
+0,          4,          4,        1,      864, a769975cdbc6529525f7cac8a0d9299a
+0,          5,          5,        1,      864, 15b02059bbced62f19c0626efea1ecb9
+0,          6,          6,        1,      864, 47f4b50322ed31649bdcfffb05c70fa2
+0,          7,          7,        1,      864, 8649cdd0a958047839f5b6e7bbf6f288
+0,          8,          8,        1,      864, 2c766e3fd3882a9a5aff52ffe9d1d341
+0,          9,          9,        1,      864, 184a62b7332a1c24acbf03f670fb7ac1
diff --git a/tests/ref/fate/vp9-02-size-18x34 b/tests/ref/fate/vp9-02-size-18x34
index ef6042abe1..60889d4a27 100644
--- a/tests/ref/fate/vp9-02-size-18x34
+++ b/tests/ref/fate/vp9-02-size-18x34
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      918, 612cc424eaae924cb25c7732c422f752
-0,         33,         33,        0,      918, 010e8c2a814862529fcf8d7771ba2d7f
-0,         66,         66,        0,      918, 7d791b7a5916738998f77586339d5840
-0,        100,        100,        0,      918, aeada5f59f3dda9ab3e898f305428cb2
-0,        133,        133,        0,      918, 06af894d38a1f0d3665c0081f5397ddf
-0,        166,        166,        0,      918, 24bf31323c568e652550e9d35de9c96c
-0,        200,        200,        0,      918, a9681ec47d3e6a19321b9ea47221dc3f
-0,        233,        233,        0,      918, 73ae7268df79c4012952bd3e8011e894
-0,        266,        266,        0,      918, 67aa4145398ca17036959251cb4ce17b
-0,        300,        300,        0,      918, de247b80114c722da849f5aa23adbb38
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 18x34
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      918, 612cc424eaae924cb25c7732c422f752
+0,          1,          1,        1,      918, 010e8c2a814862529fcf8d7771ba2d7f
+0,          2,          2,        1,      918, 7d791b7a5916738998f77586339d5840
+0,          3,          3,        1,      918, aeada5f59f3dda9ab3e898f305428cb2
+0,          4,          4,        1,      918, 06af894d38a1f0d3665c0081f5397ddf
+0,          5,          5,        1,      918, 24bf31323c568e652550e9d35de9c96c
+0,          6,          6,        1,      918, a9681ec47d3e6a19321b9ea47221dc3f
+0,          7,          7,        1,      918, 73ae7268df79c4012952bd3e8011e894
+0,          8,          8,        1,      918, 67aa4145398ca17036959251cb4ce17b
+0,          9,          9,        1,      918, de247b80114c722da849f5aa23adbb38
diff --git a/tests/ref/fate/vp9-02-size-18x64 b/tests/ref/fate/vp9-02-size-18x64
index 038b21bcfe..1ec161f223 100644
--- a/tests/ref/fate/vp9-02-size-18x64
+++ b/tests/ref/fate/vp9-02-size-18x64
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     1728, 72c74de547d9ed1b17bc962dbd5e0bb1
-0,         33,         33,        0,     1728, 462849f9e2204738e9f08b40e682a6ae
-0,         66,         66,        0,     1728, f0ee17692fd816747b11d5737b511cda
-0,        100,        100,        0,     1728, 0234d23406660ede76dd22b35a708390
-0,        133,        133,        0,     1728, 6544fdb9dc225d155820d3c7dfc909eb
-0,        166,        166,        0,     1728, 1c073544794389596177512fb4dcffce
-0,        200,        200,        0,     1728, 864709daac7b091d33afa2210c145084
-0,        233,        233,        0,     1728, b049c4ac941743613ede9a41b16acde5
-0,        266,        266,        0,     1728, ad0c4adb0efec03729a79f42eec66267
-0,        300,        300,        0,     1728, 146057d941f5a47eb8b2c9eefeaf3100
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 18x64
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     1728, 72c74de547d9ed1b17bc962dbd5e0bb1
+0,          1,          1,        1,     1728, 462849f9e2204738e9f08b40e682a6ae
+0,          2,          2,        1,     1728, f0ee17692fd816747b11d5737b511cda
+0,          3,          3,        1,     1728, 0234d23406660ede76dd22b35a708390
+0,          4,          4,        1,     1728, 6544fdb9dc225d155820d3c7dfc909eb
+0,          5,          5,        1,     1728, 1c073544794389596177512fb4dcffce
+0,          6,          6,        1,     1728, 864709daac7b091d33afa2210c145084
+0,          7,          7,        1,     1728, b049c4ac941743613ede9a41b16acde5
+0,          8,          8,        1,     1728, ad0c4adb0efec03729a79f42eec66267
+0,          9,          9,        1,     1728, 146057d941f5a47eb8b2c9eefeaf3100
diff --git a/tests/ref/fate/vp9-02-size-18x66 b/tests/ref/fate/vp9-02-size-18x66
index 6d3021b233..f06a4d28d3 100644
--- a/tests/ref/fate/vp9-02-size-18x66
+++ b/tests/ref/fate/vp9-02-size-18x66
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     1782, c3fc4a1593b9cc2f3752106af8539386
-0,         33,         33,        0,     1782, 7f2ffe6bc1750f6749bb5ad12cbaf34b
-0,         66,         66,        0,     1782, 2539b10a981d59ef54efd77cd7276aaa
-0,        100,        100,        0,     1782, 0bff22b4dfb7485fbedd6ff5b99673d1
-0,        133,        133,        0,     1782, 6a2b38f4abee785260a61bc60f16e7fa
-0,        166,        166,        0,     1782, 2fbb69b5519b51548bf1ee425ff79c55
-0,        200,        200,        0,     1782, dbd267028be2256111b2411b91fcc117
-0,        233,        233,        0,     1782, 12b2f1003633c9e19cae3d0fda06102d
-0,        266,        266,        0,     1782, d419a756c492867523af5185fd57d989
-0,        300,        300,        0,     1782, 8a7d36760bf5db32baef349b97316b47
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 18x66
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     1782, c3fc4a1593b9cc2f3752106af8539386
+0,          1,          1,        1,     1782, 7f2ffe6bc1750f6749bb5ad12cbaf34b
+0,          2,          2,        1,     1782, 2539b10a981d59ef54efd77cd7276aaa
+0,          3,          3,        1,     1782, 0bff22b4dfb7485fbedd6ff5b99673d1
+0,          4,          4,        1,     1782, 6a2b38f4abee785260a61bc60f16e7fa
+0,          5,          5,        1,     1782, 2fbb69b5519b51548bf1ee425ff79c55
+0,          6,          6,        1,     1782, dbd267028be2256111b2411b91fcc117
+0,          7,          7,        1,     1782, 12b2f1003633c9e19cae3d0fda06102d
+0,          8,          8,        1,     1782, d419a756c492867523af5185fd57d989
+0,          9,          9,        1,     1782, 8a7d36760bf5db32baef349b97316b47
diff --git a/tests/ref/fate/vp9-02-size-32x08 b/tests/ref/fate/vp9-02-size-32x08
index ae376d3c49..9a5783f612 100644
--- a/tests/ref/fate/vp9-02-size-32x08
+++ b/tests/ref/fate/vp9-02-size-32x08
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      384, c7b30cde5664387b0f7a80d9b01e4fe2
-0,         33,         33,        0,      384, 2228a2a4e54ab5145525e5803c314dcd
-0,         66,         66,        0,      384, 8c048469eba24f3163c36b7461b3b42a
-0,        100,        100,        0,      384, f6b8e8e701dea09dcf1158e9a52921c6
-0,        133,        133,        0,      384, b3a5fde0daf2eef8fc08521f88f79692
-0,        166,        166,        0,      384, 653ae11cc1380ae7f39b2e007f896d81
-0,        200,        200,        0,      384, 6e66fe002a7dff95e13cc9d3d13d9686
-0,        233,        233,        0,      384, 13308c917a1e22c2f702afc32b8a23c2
-0,        266,        266,        0,      384, 4fee1e63f9452dc3f81c1d634bd7f41d
-0,        300,        300,        0,      384, 666b43ead5c7c99ae5b7637da5aa4d62
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 32x8
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      384, c7b30cde5664387b0f7a80d9b01e4fe2
+0,          1,          1,        1,      384, 2228a2a4e54ab5145525e5803c314dcd
+0,          2,          2,        1,      384, 8c048469eba24f3163c36b7461b3b42a
+0,          3,          3,        1,      384, f6b8e8e701dea09dcf1158e9a52921c6
+0,          4,          4,        1,      384, b3a5fde0daf2eef8fc08521f88f79692
+0,          5,          5,        1,      384, 653ae11cc1380ae7f39b2e007f896d81
+0,          6,          6,        1,      384, 6e66fe002a7dff95e13cc9d3d13d9686
+0,          7,          7,        1,      384, 13308c917a1e22c2f702afc32b8a23c2
+0,          8,          8,        1,      384, 4fee1e63f9452dc3f81c1d634bd7f41d
+0,          9,          9,        1,      384, 666b43ead5c7c99ae5b7637da5aa4d62
diff --git a/tests/ref/fate/vp9-02-size-32x10 b/tests/ref/fate/vp9-02-size-32x10
index bc816e934e..f5f0d1e679 100644
--- a/tests/ref/fate/vp9-02-size-32x10
+++ b/tests/ref/fate/vp9-02-size-32x10
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      480, 7c5b5df373ebfd31d210ff910e02213b
-0,         33,         33,        0,      480, c5b0a5e3eceb792b15818324a43aa2a8
-0,         66,         66,        0,      480, 1d9c0eafd4638dfe4fe308174fde2faf
-0,        100,        100,        0,      480, 47301d12055944b35008028761cf5e7b
-0,        133,        133,        0,      480, 9586ac1087423dcd3b0ff96d43ae475e
-0,        166,        166,        0,      480, 26bfe1afea96c7ef2084fffd1fa99a33
-0,        200,        200,        0,      480, 0995c8a1935266159a7ef3f95d7f4697
-0,        233,        233,        0,      480, 8cfcc0ea67507ab7f3551d8ac50f93a5
-0,        266,        266,        0,      480, 658cf3cb887b055d9de7d50db4eb78a9
-0,        300,        300,        0,      480, 856bd5189688f7ccfe9995752bc0f1f6
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 32x10
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      480, 7c5b5df373ebfd31d210ff910e02213b
+0,          1,          1,        1,      480, c5b0a5e3eceb792b15818324a43aa2a8
+0,          2,          2,        1,      480, 1d9c0eafd4638dfe4fe308174fde2faf
+0,          3,          3,        1,      480, 47301d12055944b35008028761cf5e7b
+0,          4,          4,        1,      480, 9586ac1087423dcd3b0ff96d43ae475e
+0,          5,          5,        1,      480, 26bfe1afea96c7ef2084fffd1fa99a33
+0,          6,          6,        1,      480, 0995c8a1935266159a7ef3f95d7f4697
+0,          7,          7,        1,      480, 8cfcc0ea67507ab7f3551d8ac50f93a5
+0,          8,          8,        1,      480, 658cf3cb887b055d9de7d50db4eb78a9
+0,          9,          9,        1,      480, 856bd5189688f7ccfe9995752bc0f1f6
diff --git a/tests/ref/fate/vp9-02-size-32x16 b/tests/ref/fate/vp9-02-size-32x16
index ebb465e4d9..400d9f35c8 100644
--- a/tests/ref/fate/vp9-02-size-32x16
+++ b/tests/ref/fate/vp9-02-size-32x16
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      768, 7c2818db2632e5c5beee17e7105d9209
-0,         33,         33,        0,      768, cead72bd22995e98b54a91c7b4a20975
-0,         66,         66,        0,      768, eb6baee5d65d778052c88ba5db2f9174
-0,        100,        100,        0,      768, 1f5f38e89e985e9e4172446de05e91fd
-0,        133,        133,        0,      768, 57b57ffcb03627942fc5868324a10feb
-0,        166,        166,        0,      768, 4b4066a452d8e9cd687cd611f5d9cb88
-0,        200,        200,        0,      768, 113e5069b2a4d2c2e802b72649eb435d
-0,        233,        233,        0,      768, e176bb233f76f9fd4c55d62d53487b60
-0,        266,        266,        0,      768, f2ff3def712a846ea7b678bd9078e32b
-0,        300,        300,        0,      768, 21007ed1c727c5ccc5955188a2cec276
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 32x16
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      768, 7c2818db2632e5c5beee17e7105d9209
+0,          1,          1,        1,      768, cead72bd22995e98b54a91c7b4a20975
+0,          2,          2,        1,      768, eb6baee5d65d778052c88ba5db2f9174
+0,          3,          3,        1,      768, 1f5f38e89e985e9e4172446de05e91fd
+0,          4,          4,        1,      768, 57b57ffcb03627942fc5868324a10feb
+0,          5,          5,        1,      768, 4b4066a452d8e9cd687cd611f5d9cb88
+0,          6,          6,        1,      768, 113e5069b2a4d2c2e802b72649eb435d
+0,          7,          7,        1,      768, e176bb233f76f9fd4c55d62d53487b60
+0,          8,          8,        1,      768, f2ff3def712a846ea7b678bd9078e32b
+0,          9,          9,        1,      768, 21007ed1c727c5ccc5955188a2cec276
diff --git a/tests/ref/fate/vp9-02-size-32x18 b/tests/ref/fate/vp9-02-size-32x18
index 6afccbbbdd..7d58c32eaa 100644
--- a/tests/ref/fate/vp9-02-size-32x18
+++ b/tests/ref/fate/vp9-02-size-32x18
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      864, 9da5409d344e7b8380688569e54803a5
-0,         33,         33,        0,      864, 9b51e14e2e624ee2b430e9eaf1a48798
-0,         66,         66,        0,      864, b8811779f363b9a595e3a92737771ea9
-0,        100,        100,        0,      864, e5a0c335e5e713a3e77fff0b65127fb9
-0,        133,        133,        0,      864, 1bffa3283b463a356794c8f7a73f8c54
-0,        166,        166,        0,      864, 97c13270621a583eb9e13c05f9d792f0
-0,        200,        200,        0,      864, a6f81a4dde1ffc352ebe9d8ab8782f35
-0,        233,        233,        0,      864, 91a955a86ce9378ff3442794ce0934c6
-0,        266,        266,        0,      864, 2e4f8938e9c88b328a258a0b99366ea6
-0,        300,        300,        0,      864, adbbbc192cf36e1fc7c308824765d482
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 32x18
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      864, 9da5409d344e7b8380688569e54803a5
+0,          1,          1,        1,      864, 9b51e14e2e624ee2b430e9eaf1a48798
+0,          2,          2,        1,      864, b8811779f363b9a595e3a92737771ea9
+0,          3,          3,        1,      864, e5a0c335e5e713a3e77fff0b65127fb9
+0,          4,          4,        1,      864, 1bffa3283b463a356794c8f7a73f8c54
+0,          5,          5,        1,      864, 97c13270621a583eb9e13c05f9d792f0
+0,          6,          6,        1,      864, a6f81a4dde1ffc352ebe9d8ab8782f35
+0,          7,          7,        1,      864, 91a955a86ce9378ff3442794ce0934c6
+0,          8,          8,        1,      864, 2e4f8938e9c88b328a258a0b99366ea6
+0,          9,          9,        1,      864, adbbbc192cf36e1fc7c308824765d482
diff --git a/tests/ref/fate/vp9-02-size-32x32 b/tests/ref/fate/vp9-02-size-32x32
index fb3fb878b5..8493c91ef9 100644
--- a/tests/ref/fate/vp9-02-size-32x32
+++ b/tests/ref/fate/vp9-02-size-32x32
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     1536, 117915db1856cee26f05a609c8c8de2e
-0,         33,         33,        0,     1536, 943771a98b26b174e88ed1f4e872e504
-0,         66,         66,        0,     1536, 3e0d2585e1f1cb540998d107aca5c395
-0,        100,        100,        0,     1536, e64a9e1e0232983a69ab48453025b23d
-0,        133,        133,        0,     1536, 2c6ef6637fb7b9425f7d7ea28cd84087
-0,        166,        166,        0,     1536, 419a5a31a43955d408c13ee8a5ddce9c
-0,        200,        200,        0,     1536, 2ab13e1c236553d42d59498ca350b190
-0,        233,        233,        0,     1536, b8068beb037f3232d4da38fe33a8a885
-0,        266,        266,        0,     1536, 160df68b9e3f75e9b1f8ed7cce327bc2
-0,        300,        300,        0,     1536, 1ccafa8c7babdce0983aeb20d298b0ee
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 32x32
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     1536, 117915db1856cee26f05a609c8c8de2e
+0,          1,          1,        1,     1536, 943771a98b26b174e88ed1f4e872e504
+0,          2,          2,        1,     1536, 3e0d2585e1f1cb540998d107aca5c395
+0,          3,          3,        1,     1536, e64a9e1e0232983a69ab48453025b23d
+0,          4,          4,        1,     1536, 2c6ef6637fb7b9425f7d7ea28cd84087
+0,          5,          5,        1,     1536, 419a5a31a43955d408c13ee8a5ddce9c
+0,          6,          6,        1,     1536, 2ab13e1c236553d42d59498ca350b190
+0,          7,          7,        1,     1536, b8068beb037f3232d4da38fe33a8a885
+0,          8,          8,        1,     1536, 160df68b9e3f75e9b1f8ed7cce327bc2
+0,          9,          9,        1,     1536, 1ccafa8c7babdce0983aeb20d298b0ee
diff --git a/tests/ref/fate/vp9-02-size-32x34 b/tests/ref/fate/vp9-02-size-32x34
index 4e000a503c..fa33b07035 100644
--- a/tests/ref/fate/vp9-02-size-32x34
+++ b/tests/ref/fate/vp9-02-size-32x34
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     1632, 770582911fd0095ebbeae384e87665ac
-0,         33,         33,        0,     1632, f99d7e3131f04413cba2f9de6818976d
-0,         66,         66,        0,     1632, 3bfbb8c9c48f24cd596973a6deb33a3f
-0,        100,        100,        0,     1632, 0b8166afdd357f20c76f77d228bb7171
-0,        133,        133,        0,     1632, 3a3d7f2a03e19a82250d6ca0238f9791
-0,        166,        166,        0,     1632, 9b558f9b8744b016059f69f3fca90d2c
-0,        200,        200,        0,     1632, c857736342f1145d919cb77732120006
-0,        233,        233,        0,     1632, 11dc5dda4c883a3146db060dd50343d0
-0,        266,        266,        0,     1632, 7526a62ae87de174be86eac7bb36c7f3
-0,        300,        300,        0,     1632, 9ef38f47cfc461710ff0dd75690473c0
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 32x34
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     1632, 770582911fd0095ebbeae384e87665ac
+0,          1,          1,        1,     1632, f99d7e3131f04413cba2f9de6818976d
+0,          2,          2,        1,     1632, 3bfbb8c9c48f24cd596973a6deb33a3f
+0,          3,          3,        1,     1632, 0b8166afdd357f20c76f77d228bb7171
+0,          4,          4,        1,     1632, 3a3d7f2a03e19a82250d6ca0238f9791
+0,          5,          5,        1,     1632, 9b558f9b8744b016059f69f3fca90d2c
+0,          6,          6,        1,     1632, c857736342f1145d919cb77732120006
+0,          7,          7,        1,     1632, 11dc5dda4c883a3146db060dd50343d0
+0,          8,          8,        1,     1632, 7526a62ae87de174be86eac7bb36c7f3
+0,          9,          9,        1,     1632, 9ef38f47cfc461710ff0dd75690473c0
diff --git a/tests/ref/fate/vp9-02-size-32x64 b/tests/ref/fate/vp9-02-size-32x64
index d2b9c992fe..f70c27ae8f 100644
--- a/tests/ref/fate/vp9-02-size-32x64
+++ b/tests/ref/fate/vp9-02-size-32x64
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     3072, caa8471a8b381d53c3e8fc627946a871
-0,         33,         33,        0,     3072, 2cba86ea14c0f28e242625b08f5e9b88
-0,         66,         66,        0,     3072, cea0440ff6569fc82c3030e0340fb649
-0,        100,        100,        0,     3072, c18ef37f1356ade96a2f40af954b31c8
-0,        133,        133,        0,     3072, 21e6e549378bcff47913ef292e74dc37
-0,        166,        166,        0,     3072, a9d3d483f74a5afe5d80725ce696fd20
-0,        200,        200,        0,     3072, a436e2586b0963747deaf5e450e2b230
-0,        233,        233,        0,     3072, 9daaadf265df56974cb0950843d9fd8c
-0,        266,        266,        0,     3072, e0b84714bad2519e62b7d16705fb09d5
-0,        300,        300,        0,     3072, 8cdfce574edbe548da7f6cd9a7076b9e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 32x64
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     3072, caa8471a8b381d53c3e8fc627946a871
+0,          1,          1,        1,     3072, 2cba86ea14c0f28e242625b08f5e9b88
+0,          2,          2,        1,     3072, cea0440ff6569fc82c3030e0340fb649
+0,          3,          3,        1,     3072, c18ef37f1356ade96a2f40af954b31c8
+0,          4,          4,        1,     3072, 21e6e549378bcff47913ef292e74dc37
+0,          5,          5,        1,     3072, a9d3d483f74a5afe5d80725ce696fd20
+0,          6,          6,        1,     3072, a436e2586b0963747deaf5e450e2b230
+0,          7,          7,        1,     3072, 9daaadf265df56974cb0950843d9fd8c
+0,          8,          8,        1,     3072, e0b84714bad2519e62b7d16705fb09d5
+0,          9,          9,        1,     3072, 8cdfce574edbe548da7f6cd9a7076b9e
diff --git a/tests/ref/fate/vp9-02-size-32x66 b/tests/ref/fate/vp9-02-size-32x66
index 65c87da48d..f7c0615814 100644
--- a/tests/ref/fate/vp9-02-size-32x66
+++ b/tests/ref/fate/vp9-02-size-32x66
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     3168, 920ea4b8a00d41489d122d641d6e4fe5
-0,         33,         33,        0,     3168, 8bfc8d452a79f2978b8e973b77cbf8a8
-0,         66,         66,        0,     3168, 09f3f0d31d3377a844fa5385d9b36b9f
-0,        100,        100,        0,     3168, df43fae763da9360c8062bb92ee091a8
-0,        133,        133,        0,     3168, 445d8c675bb865d1814fcfa6b8a9afd3
-0,        166,        166,        0,     3168, dc7d43db86aac6636724de8790eda555
-0,        200,        200,        0,     3168, d3a9fc272424449ffc5b7e69f8f9948b
-0,        233,        233,        0,     3168, 11ef33b9bccca54b3703bf24ab55e2d6
-0,        266,        266,        0,     3168, ce31b8bf9b00b427ca956abb800d8034
-0,        300,        300,        0,     3168, e707f824d6e95d482bf3a0b4d52ea069
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 32x66
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     3168, 920ea4b8a00d41489d122d641d6e4fe5
+0,          1,          1,        1,     3168, 8bfc8d452a79f2978b8e973b77cbf8a8
+0,          2,          2,        1,     3168, 09f3f0d31d3377a844fa5385d9b36b9f
+0,          3,          3,        1,     3168, df43fae763da9360c8062bb92ee091a8
+0,          4,          4,        1,     3168, 445d8c675bb865d1814fcfa6b8a9afd3
+0,          5,          5,        1,     3168, dc7d43db86aac6636724de8790eda555
+0,          6,          6,        1,     3168, d3a9fc272424449ffc5b7e69f8f9948b
+0,          7,          7,        1,     3168, 11ef33b9bccca54b3703bf24ab55e2d6
+0,          8,          8,        1,     3168, ce31b8bf9b00b427ca956abb800d8034
+0,          9,          9,        1,     3168, e707f824d6e95d482bf3a0b4d52ea069
diff --git a/tests/ref/fate/vp9-02-size-34x08 b/tests/ref/fate/vp9-02-size-34x08
index d6ccbbb4b5..0c35493f8d 100644
--- a/tests/ref/fate/vp9-02-size-34x08
+++ b/tests/ref/fate/vp9-02-size-34x08
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      408, c14f2ba5b4582c9d3a488976814691b3
-0,         33,         33,        0,      408, 4387a4dce19007b7efb810b5a4069749
-0,         66,         66,        0,      408, ecfe868d28f4861a5612edfd57447a02
-0,        100,        100,        0,      408, 5cba54f568534d29169ac31c8fa505e0
-0,        133,        133,        0,      408, fe9aab7b3378b9fc3e373ee626b887db
-0,        166,        166,        0,      408, fce72dfc7f9c0cb50ff73761b4d82c1f
-0,        200,        200,        0,      408, d4d98f42b1377e0f0ffaa66aa81d40c3
-0,        233,        233,        0,      408, 65c027646dc95a749ce2d7ad0a6beccc
-0,        266,        266,        0,      408, 317b283a0d907270f671272771022e69
-0,        300,        300,        0,      408, d3e2c008584608502f3e24c5c5f64028
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 34x8
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      408, c14f2ba5b4582c9d3a488976814691b3
+0,          1,          1,        1,      408, 4387a4dce19007b7efb810b5a4069749
+0,          2,          2,        1,      408, ecfe868d28f4861a5612edfd57447a02
+0,          3,          3,        1,      408, 5cba54f568534d29169ac31c8fa505e0
+0,          4,          4,        1,      408, fe9aab7b3378b9fc3e373ee626b887db
+0,          5,          5,        1,      408, fce72dfc7f9c0cb50ff73761b4d82c1f
+0,          6,          6,        1,      408, d4d98f42b1377e0f0ffaa66aa81d40c3
+0,          7,          7,        1,      408, 65c027646dc95a749ce2d7ad0a6beccc
+0,          8,          8,        1,      408, 317b283a0d907270f671272771022e69
+0,          9,          9,        1,      408, d3e2c008584608502f3e24c5c5f64028
diff --git a/tests/ref/fate/vp9-02-size-34x10 b/tests/ref/fate/vp9-02-size-34x10
index adcb22e1c4..edcfdf91e7 100644
--- a/tests/ref/fate/vp9-02-size-34x10
+++ b/tests/ref/fate/vp9-02-size-34x10
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      510, fd7212b519783cf4831ce4bff91f2312
-0,         33,         33,        0,      510, 9768722ee939d80a6716865fdebca33d
-0,         66,         66,        0,      510, 328ee0f774eeafde00dcc4b9a8f4e9af
-0,        100,        100,        0,      510, f882fa6015fcb042094eadab5fa952cf
-0,        133,        133,        0,      510, 4331a3dabeae27d2bf3590eb96ce914a
-0,        166,        166,        0,      510, 0e15106bd8e90377f6ed8b464d17159c
-0,        200,        200,        0,      510, 8f062653ac2b83f7e541393e838d0e0f
-0,        233,        233,        0,      510, eeb98c1728c1a74510f8bfaf10fc0002
-0,        266,        266,        0,      510, 30bb058a67d6a5ee3693b21cbca5349a
-0,        300,        300,        0,      510, 7ce4b79983b3abc37b141a3bea56e0b7
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 34x10
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      510, fd7212b519783cf4831ce4bff91f2312
+0,          1,          1,        1,      510, 9768722ee939d80a6716865fdebca33d
+0,          2,          2,        1,      510, 328ee0f774eeafde00dcc4b9a8f4e9af
+0,          3,          3,        1,      510, f882fa6015fcb042094eadab5fa952cf
+0,          4,          4,        1,      510, 4331a3dabeae27d2bf3590eb96ce914a
+0,          5,          5,        1,      510, 0e15106bd8e90377f6ed8b464d17159c
+0,          6,          6,        1,      510, 8f062653ac2b83f7e541393e838d0e0f
+0,          7,          7,        1,      510, eeb98c1728c1a74510f8bfaf10fc0002
+0,          8,          8,        1,      510, 30bb058a67d6a5ee3693b21cbca5349a
+0,          9,          9,        1,      510, 7ce4b79983b3abc37b141a3bea56e0b7
diff --git a/tests/ref/fate/vp9-02-size-34x16 b/tests/ref/fate/vp9-02-size-34x16
index db88976ed9..5628876593 100644
--- a/tests/ref/fate/vp9-02-size-34x16
+++ b/tests/ref/fate/vp9-02-size-34x16
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      816, e443c43101be00470c6a61c1a2995b5a
-0,         33,         33,        0,      816, 1e79b1b46ec704d360b5fb725913b0f1
-0,         66,         66,        0,      816, 6d5e77cafab6bc43498980c515d299d3
-0,        100,        100,        0,      816, 91c3bba5fd2aa29ee54c8f3783cfe5a2
-0,        133,        133,        0,      816, 9548d07c2a6204694d34e973e8339077
-0,        166,        166,        0,      816, 6819a34c7e3c13bee3ea2b18e12e92fd
-0,        200,        200,        0,      816, f75920457f01f65bf30ba1ec41076d4e
-0,        233,        233,        0,      816, 3a04f6cc0c348c21464b173ac6005043
-0,        266,        266,        0,      816, 93a3336374e8cc4dfb2c0b4716ab60ec
-0,        300,        300,        0,      816, 148af188b8a2ee93de406a01c2af180d
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 34x16
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      816, e443c43101be00470c6a61c1a2995b5a
+0,          1,          1,        1,      816, 1e79b1b46ec704d360b5fb725913b0f1
+0,          2,          2,        1,      816, 6d5e77cafab6bc43498980c515d299d3
+0,          3,          3,        1,      816, 91c3bba5fd2aa29ee54c8f3783cfe5a2
+0,          4,          4,        1,      816, 9548d07c2a6204694d34e973e8339077
+0,          5,          5,        1,      816, 6819a34c7e3c13bee3ea2b18e12e92fd
+0,          6,          6,        1,      816, f75920457f01f65bf30ba1ec41076d4e
+0,          7,          7,        1,      816, 3a04f6cc0c348c21464b173ac6005043
+0,          8,          8,        1,      816, 93a3336374e8cc4dfb2c0b4716ab60ec
+0,          9,          9,        1,      816, 148af188b8a2ee93de406a01c2af180d
diff --git a/tests/ref/fate/vp9-02-size-34x18 b/tests/ref/fate/vp9-02-size-34x18
index d877088849..5a7f3c8b77 100644
--- a/tests/ref/fate/vp9-02-size-34x18
+++ b/tests/ref/fate/vp9-02-size-34x18
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      918, ab7eabb355e5163e7451945018fadebd
-0,         33,         33,        0,      918, b9a77cc0c769535808996a6de7b374ff
-0,         66,         66,        0,      918, bd773f11d89091b3c9ebc22d8291dd49
-0,        100,        100,        0,      918, 278c215d6c188752818f07f4d317c0e0
-0,        133,        133,        0,      918, b59856932c675c1ba587644c23cdb002
-0,        166,        166,        0,      918, 2bcaef04f89326a56025269a68742043
-0,        200,        200,        0,      918, 5abb4a1b96b4bc003cd19a146347c54e
-0,        233,        233,        0,      918, 26e36058f451ff80d498ac1c0343489f
-0,        266,        266,        0,      918, 57ac43fcc6f1a2c863188aca68d52524
-0,        300,        300,        0,      918, 282467118b5b7a986ccd28d16dab3ea7
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 34x18
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      918, ab7eabb355e5163e7451945018fadebd
+0,          1,          1,        1,      918, b9a77cc0c769535808996a6de7b374ff
+0,          2,          2,        1,      918, bd773f11d89091b3c9ebc22d8291dd49
+0,          3,          3,        1,      918, 278c215d6c188752818f07f4d317c0e0
+0,          4,          4,        1,      918, b59856932c675c1ba587644c23cdb002
+0,          5,          5,        1,      918, 2bcaef04f89326a56025269a68742043
+0,          6,          6,        1,      918, 5abb4a1b96b4bc003cd19a146347c54e
+0,          7,          7,        1,      918, 26e36058f451ff80d498ac1c0343489f
+0,          8,          8,        1,      918, 57ac43fcc6f1a2c863188aca68d52524
+0,          9,          9,        1,      918, 282467118b5b7a986ccd28d16dab3ea7
diff --git a/tests/ref/fate/vp9-02-size-34x32 b/tests/ref/fate/vp9-02-size-34x32
index ce29241349..956d2e3ea1 100644
--- a/tests/ref/fate/vp9-02-size-34x32
+++ b/tests/ref/fate/vp9-02-size-34x32
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     1632, 7e334867e27046fabf0f39365311c38c
-0,         33,         33,        0,     1632, d2a49216ecedea62f546e54c1552f163
-0,         66,         66,        0,     1632, f66e10d1779533e5b6e2b98369134833
-0,        100,        100,        0,     1632, 0054b8d4393df58eee87784862a29901
-0,        133,        133,        0,     1632, b9cdf3ebea0d1e3f1e0c42db2e11a3c2
-0,        166,        166,        0,     1632, c08a728d955a559457c82e44c3296148
-0,        200,        200,        0,     1632, d05f4c4a8b0e606525c3d388d26a9351
-0,        233,        233,        0,     1632, 78fc2544da88a1a21d6626b0f7bbcf8c
-0,        266,        266,        0,     1632, 90832c4fed05390377551359bb9a91f7
-0,        300,        300,        0,     1632, 5290a0e77081863398f36c7ae192710b
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 34x32
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     1632, 7e334867e27046fabf0f39365311c38c
+0,          1,          1,        1,     1632, d2a49216ecedea62f546e54c1552f163
+0,          2,          2,        1,     1632, f66e10d1779533e5b6e2b98369134833
+0,          3,          3,        1,     1632, 0054b8d4393df58eee87784862a29901
+0,          4,          4,        1,     1632, b9cdf3ebea0d1e3f1e0c42db2e11a3c2
+0,          5,          5,        1,     1632, c08a728d955a559457c82e44c3296148
+0,          6,          6,        1,     1632, d05f4c4a8b0e606525c3d388d26a9351
+0,          7,          7,        1,     1632, 78fc2544da88a1a21d6626b0f7bbcf8c
+0,          8,          8,        1,     1632, 90832c4fed05390377551359bb9a91f7
+0,          9,          9,        1,     1632, 5290a0e77081863398f36c7ae192710b
diff --git a/tests/ref/fate/vp9-02-size-34x34 b/tests/ref/fate/vp9-02-size-34x34
index fc5b90c4cc..931d422f67 100644
--- a/tests/ref/fate/vp9-02-size-34x34
+++ b/tests/ref/fate/vp9-02-size-34x34
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     1734, 1bb98ba89abf6b86f47a851f8126e1ff
-0,         33,         33,        0,     1734, b960cc795c179afe7eec360c57fddd7f
-0,         66,         66,        0,     1734, a93cd094a80c542ecb7b6ac7720c5eff
-0,        100,        100,        0,     1734, f1cd34e4f0bf9b1238769f028708b742
-0,        133,        133,        0,     1734, f01437ad14450d2136a8fc971f180eb7
-0,        166,        166,        0,     1734, 8778230f1182c2227bf1e253bd85df4c
-0,        200,        200,        0,     1734, 1d1d5cf6c5cc9e73a1fa5b882e441d74
-0,        233,        233,        0,     1734, 2f7a1867487c56c252e35225f71adb55
-0,        266,        266,        0,     1734, 1d1aea21f70ceed596f22ec32d8712ee
-0,        300,        300,        0,     1734, 260e66df92f32bc853f4cd4ede692ea4
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 34x34
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     1734, 1bb98ba89abf6b86f47a851f8126e1ff
+0,          1,          1,        1,     1734, b960cc795c179afe7eec360c57fddd7f
+0,          2,          2,        1,     1734, a93cd094a80c542ecb7b6ac7720c5eff
+0,          3,          3,        1,     1734, f1cd34e4f0bf9b1238769f028708b742
+0,          4,          4,        1,     1734, f01437ad14450d2136a8fc971f180eb7
+0,          5,          5,        1,     1734, 8778230f1182c2227bf1e253bd85df4c
+0,          6,          6,        1,     1734, 1d1d5cf6c5cc9e73a1fa5b882e441d74
+0,          7,          7,        1,     1734, 2f7a1867487c56c252e35225f71adb55
+0,          8,          8,        1,     1734, 1d1aea21f70ceed596f22ec32d8712ee
+0,          9,          9,        1,     1734, 260e66df92f32bc853f4cd4ede692ea4
diff --git a/tests/ref/fate/vp9-02-size-34x64 b/tests/ref/fate/vp9-02-size-34x64
index e31ad98c77..98c88cec19 100644
--- a/tests/ref/fate/vp9-02-size-34x64
+++ b/tests/ref/fate/vp9-02-size-34x64
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     3264, 3856635223f578e1e7f7e7250a53cb8d
-0,         33,         33,        0,     3264, ee8d7c3a0ea165420d7e733b9e59219a
-0,         66,         66,        0,     3264, 3d33f06bac22131f04e3411fc216dc02
-0,        100,        100,        0,     3264, 7aea667775077de32250dac25fd24bb3
-0,        133,        133,        0,     3264, 43fb534551f153c5e9e60240df0bf3b4
-0,        166,        166,        0,     3264, d42b721aa2242d4258d97f840fdcc901
-0,        200,        200,        0,     3264, e876200d720cbe6e36e0ffb775c5ad6c
-0,        233,        233,        0,     3264, 453078449d8701270564086e58a1d69e
-0,        266,        266,        0,     3264, 22cb799a817d45a7591489e6faa31cb9
-0,        300,        300,        0,     3264, 628dc3f03bf5dd5cae135ad1e4b9ebf7
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 34x64
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     3264, 3856635223f578e1e7f7e7250a53cb8d
+0,          1,          1,        1,     3264, ee8d7c3a0ea165420d7e733b9e59219a
+0,          2,          2,        1,     3264, 3d33f06bac22131f04e3411fc216dc02
+0,          3,          3,        1,     3264, 7aea667775077de32250dac25fd24bb3
+0,          4,          4,        1,     3264, 43fb534551f153c5e9e60240df0bf3b4
+0,          5,          5,        1,     3264, d42b721aa2242d4258d97f840fdcc901
+0,          6,          6,        1,     3264, e876200d720cbe6e36e0ffb775c5ad6c
+0,          7,          7,        1,     3264, 453078449d8701270564086e58a1d69e
+0,          8,          8,        1,     3264, 22cb799a817d45a7591489e6faa31cb9
+0,          9,          9,        1,     3264, 628dc3f03bf5dd5cae135ad1e4b9ebf7
diff --git a/tests/ref/fate/vp9-02-size-34x66 b/tests/ref/fate/vp9-02-size-34x66
index 2182c29aeb..af0a212826 100644
--- a/tests/ref/fate/vp9-02-size-34x66
+++ b/tests/ref/fate/vp9-02-size-34x66
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     3366, bf4e568217906ee4b58dc4707bee8ef6
-0,         33,         33,        0,     3366, f823f8c7b6e47ba43215f3becd35208e
-0,         66,         66,        0,     3366, 1d986d65b502e77764428e21e77503a6
-0,        100,        100,        0,     3366, 73520382bc54d6aee165402518dd7b5d
-0,        133,        133,        0,     3366, c84e943758f2d7e37126172728838640
-0,        166,        166,        0,     3366, 1d4b298da98e4b66b31ad6874f726aa6
-0,        200,        200,        0,     3366, e67748eeb3c818deb8b51d321cd16a9c
-0,        233,        233,        0,     3366, 4d1514c63e669261beef9e35b04c241e
-0,        266,        266,        0,     3366, 57705e2131e2129efbc68b74a1e0459c
-0,        300,        300,        0,     3366, 681acf1b384856d6e544d8e7a79fc628
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 34x66
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     3366, bf4e568217906ee4b58dc4707bee8ef6
+0,          1,          1,        1,     3366, f823f8c7b6e47ba43215f3becd35208e
+0,          2,          2,        1,     3366, 1d986d65b502e77764428e21e77503a6
+0,          3,          3,        1,     3366, 73520382bc54d6aee165402518dd7b5d
+0,          4,          4,        1,     3366, c84e943758f2d7e37126172728838640
+0,          5,          5,        1,     3366, 1d4b298da98e4b66b31ad6874f726aa6
+0,          6,          6,        1,     3366, e67748eeb3c818deb8b51d321cd16a9c
+0,          7,          7,        1,     3366, 4d1514c63e669261beef9e35b04c241e
+0,          8,          8,        1,     3366, 57705e2131e2129efbc68b74a1e0459c
+0,          9,          9,        1,     3366, 681acf1b384856d6e544d8e7a79fc628
diff --git a/tests/ref/fate/vp9-02-size-64x08 b/tests/ref/fate/vp9-02-size-64x08
index b15296add0..5e7046a394 100644
--- a/tests/ref/fate/vp9-02-size-64x08
+++ b/tests/ref/fate/vp9-02-size-64x08
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      768, d801797c94039b0a166d46e151ec912c
-0,         33,         33,        0,      768, 161ec22caa3689b214d9ab993424584b
-0,         66,         66,        0,      768, 499b589ecf1873e388c256ce948eabb9
-0,        100,        100,        0,      768, 22bc77650e3df70e3e36f2a1b8d8aa71
-0,        133,        133,        0,      768, 750e40530257a68211596a60de18bffa
-0,        166,        166,        0,      768, 4f812a92157e7186642656b59bc28a3d
-0,        200,        200,        0,      768, a3f141cec127a2c2e16740b8dd4ce56a
-0,        233,        233,        0,      768, a5ba9959bf65ab6e254e5b359a3d59b5
-0,        266,        266,        0,      768, baa72b8a57277d9e9ad4b92aab04f5d1
-0,        300,        300,        0,      768, 4cb9aebb6c9d5bd164461726de201549
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x8
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      768, d801797c94039b0a166d46e151ec912c
+0,          1,          1,        1,      768, 161ec22caa3689b214d9ab993424584b
+0,          2,          2,        1,      768, 499b589ecf1873e388c256ce948eabb9
+0,          3,          3,        1,      768, 22bc77650e3df70e3e36f2a1b8d8aa71
+0,          4,          4,        1,      768, 750e40530257a68211596a60de18bffa
+0,          5,          5,        1,      768, 4f812a92157e7186642656b59bc28a3d
+0,          6,          6,        1,      768, a3f141cec127a2c2e16740b8dd4ce56a
+0,          7,          7,        1,      768, a5ba9959bf65ab6e254e5b359a3d59b5
+0,          8,          8,        1,      768, baa72b8a57277d9e9ad4b92aab04f5d1
+0,          9,          9,        1,      768, 4cb9aebb6c9d5bd164461726de201549
diff --git a/tests/ref/fate/vp9-02-size-64x10 b/tests/ref/fate/vp9-02-size-64x10
index e499cc9da8..143ba2aebc 100644
--- a/tests/ref/fate/vp9-02-size-64x10
+++ b/tests/ref/fate/vp9-02-size-64x10
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      960, 97eb5fd0599d482662eb0a1def5c5ef2
-0,         33,         33,        0,      960, dfdc1b61b478dcca8d411021486aa2ec
-0,         66,         66,        0,      960, 2cf560f068bdcb9e345951739091808e
-0,        100,        100,        0,      960, 33cacb04c0797fc7bd774251e04b7fb9
-0,        133,        133,        0,      960, 7fca126c0542c0dcdcf769b156bd85f5
-0,        166,        166,        0,      960, 8a46c5a48cb5bd34be8e647c127f8d61
-0,        200,        200,        0,      960, 1ddf07562c0b7dc68ed61b8e1a09fcf0
-0,        233,        233,        0,      960, d75911d5eb7fc75ffc3ee40344fc7ed2
-0,        266,        266,        0,      960, 498329c8a01d950286af11e1fcf3ac07
-0,        300,        300,        0,      960, 7a6ec019df5f3e419d389699094f87c3
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x10
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      960, 97eb5fd0599d482662eb0a1def5c5ef2
+0,          1,          1,        1,      960, dfdc1b61b478dcca8d411021486aa2ec
+0,          2,          2,        1,      960, 2cf560f068bdcb9e345951739091808e
+0,          3,          3,        1,      960, 33cacb04c0797fc7bd774251e04b7fb9
+0,          4,          4,        1,      960, 7fca126c0542c0dcdcf769b156bd85f5
+0,          5,          5,        1,      960, 8a46c5a48cb5bd34be8e647c127f8d61
+0,          6,          6,        1,      960, 1ddf07562c0b7dc68ed61b8e1a09fcf0
+0,          7,          7,        1,      960, d75911d5eb7fc75ffc3ee40344fc7ed2
+0,          8,          8,        1,      960, 498329c8a01d950286af11e1fcf3ac07
+0,          9,          9,        1,      960, 7a6ec019df5f3e419d389699094f87c3
diff --git a/tests/ref/fate/vp9-02-size-64x16 b/tests/ref/fate/vp9-02-size-64x16
index 4810a6e6dd..67479f3806 100644
--- a/tests/ref/fate/vp9-02-size-64x16
+++ b/tests/ref/fate/vp9-02-size-64x16
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     1536, a43068a364cc42619e62406dcf17ddfc
-0,         33,         33,        0,     1536, 94691f93299bbf5b6ba3022b02b3e069
-0,         66,         66,        0,     1536, 3c8fc275490b4daf63ef6d8f9b7f81f6
-0,        100,        100,        0,     1536, 96c06031f0fcad49dfed256c5c737d07
-0,        133,        133,        0,     1536, f722d3a51790b55d070d57d3b9a53d0d
-0,        166,        166,        0,     1536, a753b3dfe13f5778f9f054e73e512ef1
-0,        200,        200,        0,     1536, fa12cbe6cbc38fa8a38ecbcf1af8833c
-0,        233,        233,        0,     1536, cb42303391ef6f76f77d14d2600cce12
-0,        266,        266,        0,     1536, e0c18bb1d4dcc8168b5fdd7c7963987e
-0,        300,        300,        0,     1536, 581b5291cb60e50326c0dfa6a2d09d8a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x16
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     1536, a43068a364cc42619e62406dcf17ddfc
+0,          1,          1,        1,     1536, 94691f93299bbf5b6ba3022b02b3e069
+0,          2,          2,        1,     1536, 3c8fc275490b4daf63ef6d8f9b7f81f6
+0,          3,          3,        1,     1536, 96c06031f0fcad49dfed256c5c737d07
+0,          4,          4,        1,     1536, f722d3a51790b55d070d57d3b9a53d0d
+0,          5,          5,        1,     1536, a753b3dfe13f5778f9f054e73e512ef1
+0,          6,          6,        1,     1536, fa12cbe6cbc38fa8a38ecbcf1af8833c
+0,          7,          7,        1,     1536, cb42303391ef6f76f77d14d2600cce12
+0,          8,          8,        1,     1536, e0c18bb1d4dcc8168b5fdd7c7963987e
+0,          9,          9,        1,     1536, 581b5291cb60e50326c0dfa6a2d09d8a
diff --git a/tests/ref/fate/vp9-02-size-64x18 b/tests/ref/fate/vp9-02-size-64x18
index 1f8fdf3438..c7acad7166 100644
--- a/tests/ref/fate/vp9-02-size-64x18
+++ b/tests/ref/fate/vp9-02-size-64x18
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     1728, adf7e84a351847683f6a8dd177019e29
-0,         33,         33,        0,     1728, 8227cf283a27277fbab3d7826e340337
-0,         66,         66,        0,     1728, a5551b16db948e395537310d12128e76
-0,        100,        100,        0,     1728, 4b57ed07dbc15de9ab6143656b2a7e8e
-0,        133,        133,        0,     1728, a15489495f0acc41f446e9689e4142d6
-0,        166,        166,        0,     1728, b0a0d5d3ff756e8ae19797455432755c
-0,        200,        200,        0,     1728, 094a440243d36edcdd3e9d0d070de011
-0,        233,        233,        0,     1728, a780bd61e1abbfbb28581784531608bd
-0,        266,        266,        0,     1728, 55886a8c7aad65683aa9366a38382512
-0,        300,        300,        0,     1728, 5ae5b24383f66720a62ed1001664051f
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x18
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     1728, adf7e84a351847683f6a8dd177019e29
+0,          1,          1,        1,     1728, 8227cf283a27277fbab3d7826e340337
+0,          2,          2,        1,     1728, a5551b16db948e395537310d12128e76
+0,          3,          3,        1,     1728, 4b57ed07dbc15de9ab6143656b2a7e8e
+0,          4,          4,        1,     1728, a15489495f0acc41f446e9689e4142d6
+0,          5,          5,        1,     1728, b0a0d5d3ff756e8ae19797455432755c
+0,          6,          6,        1,     1728, 094a440243d36edcdd3e9d0d070de011
+0,          7,          7,        1,     1728, a780bd61e1abbfbb28581784531608bd
+0,          8,          8,        1,     1728, 55886a8c7aad65683aa9366a38382512
+0,          9,          9,        1,     1728, 5ae5b24383f66720a62ed1001664051f
diff --git a/tests/ref/fate/vp9-02-size-64x32 b/tests/ref/fate/vp9-02-size-64x32
index ed1c9a52b5..88e29e0785 100644
--- a/tests/ref/fate/vp9-02-size-64x32
+++ b/tests/ref/fate/vp9-02-size-64x32
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     3072, 931ab6a2482c3e84bc7ef8dfbc251307
-0,         33,         33,        0,     3072, 3552a9d8470a64ed627a6dbb799b7811
-0,         66,         66,        0,     3072, cae1863fc606a0e3df3e708b7eefdf99
-0,        100,        100,        0,     3072, 4b825a07e235c4708b12a726da8e4cdf
-0,        133,        133,        0,     3072, 0dac578ef616a13be2b9db3c0d775524
-0,        166,        166,        0,     3072, bfd47cbab8285f301777351c8bc5553c
-0,        200,        200,        0,     3072, f29f9a0cfeaaae3bdeb26933bc7c17dc
-0,        233,        233,        0,     3072, c7f3a4d24dcf72ef195a402eff77d8f6
-0,        266,        266,        0,     3072, 88ede6207441a7953cf893032c353663
-0,        300,        300,        0,     3072, 258f4e86541813e3edb1fe5332ff4ab1
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x32
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     3072, 931ab6a2482c3e84bc7ef8dfbc251307
+0,          1,          1,        1,     3072, 3552a9d8470a64ed627a6dbb799b7811
+0,          2,          2,        1,     3072, cae1863fc606a0e3df3e708b7eefdf99
+0,          3,          3,        1,     3072, 4b825a07e235c4708b12a726da8e4cdf
+0,          4,          4,        1,     3072, 0dac578ef616a13be2b9db3c0d775524
+0,          5,          5,        1,     3072, bfd47cbab8285f301777351c8bc5553c
+0,          6,          6,        1,     3072, f29f9a0cfeaaae3bdeb26933bc7c17dc
+0,          7,          7,        1,     3072, c7f3a4d24dcf72ef195a402eff77d8f6
+0,          8,          8,        1,     3072, 88ede6207441a7953cf893032c353663
+0,          9,          9,        1,     3072, 258f4e86541813e3edb1fe5332ff4ab1
diff --git a/tests/ref/fate/vp9-02-size-64x34 b/tests/ref/fate/vp9-02-size-64x34
index c90f7e3e39..ea41f01128 100644
--- a/tests/ref/fate/vp9-02-size-64x34
+++ b/tests/ref/fate/vp9-02-size-64x34
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     3264, 68d00958a78e6252dd75d632806e2022
-0,         33,         33,        0,     3264, f7b6266e74200a669eecd241db787ee2
-0,         66,         66,        0,     3264, c8b88d43aee037857310edeb74bc66f4
-0,        100,        100,        0,     3264, c6d9a52baf3ca962574bff1364fcb8dc
-0,        133,        133,        0,     3264, b384fbf3ceef0affa69f5e81681edc6e
-0,        166,        166,        0,     3264, cd473f0c8d1cde98153402123a3ee7cf
-0,        200,        200,        0,     3264, c0f320a23c3e39719a3b3590fe3c2ab5
-0,        233,        233,        0,     3264, 751207d15a791728c1022f711a25cd68
-0,        266,        266,        0,     3264, 7396df89a0d88044cf7527420d193636
-0,        300,        300,        0,     3264, b772dd247838b0c3ed12713447894323
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x34
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     3264, 68d00958a78e6252dd75d632806e2022
+0,          1,          1,        1,     3264, f7b6266e74200a669eecd241db787ee2
+0,          2,          2,        1,     3264, c8b88d43aee037857310edeb74bc66f4
+0,          3,          3,        1,     3264, c6d9a52baf3ca962574bff1364fcb8dc
+0,          4,          4,        1,     3264, b384fbf3ceef0affa69f5e81681edc6e
+0,          5,          5,        1,     3264, cd473f0c8d1cde98153402123a3ee7cf
+0,          6,          6,        1,     3264, c0f320a23c3e39719a3b3590fe3c2ab5
+0,          7,          7,        1,     3264, 751207d15a791728c1022f711a25cd68
+0,          8,          8,        1,     3264, 7396df89a0d88044cf7527420d193636
+0,          9,          9,        1,     3264, b772dd247838b0c3ed12713447894323
diff --git a/tests/ref/fate/vp9-02-size-64x64 b/tests/ref/fate/vp9-02-size-64x64
index 743732bd00..c9d0c21ce2 100644
--- a/tests/ref/fate/vp9-02-size-64x64
+++ b/tests/ref/fate/vp9-02-size-64x64
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     6144, 35f17db9076fa20368fddfa01543c746
-0,         33,         33,        0,     6144, 61cd775dfc177262da9a91d3912e6718
-0,         66,         66,        0,     6144, 8b8cf175f91425d703332b22b46c1c0e
-0,        100,        100,        0,     6144, 6041afbdd81e228f8f16384d3f9e988e
-0,        133,        133,        0,     6144, d30bd08897b50f518920014c7fa55df9
-0,        166,        166,        0,     6144, fb67222a183876b502f93e48bb779b70
-0,        200,        200,        0,     6144, 60830425ca1dcf3df4ee9c6cd75f066a
-0,        233,        233,        0,     6144, 3e178df858f7fcaa2552a1c5c719b5cc
-0,        266,        266,        0,     6144, 66718eb0c3981beb7c1119df8a2cd27e
-0,        300,        300,        0,     6144, 7c1912448c7756f7451888050760d73d
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x64
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     6144, 35f17db9076fa20368fddfa01543c746
+0,          1,          1,        1,     6144, 61cd775dfc177262da9a91d3912e6718
+0,          2,          2,        1,     6144, 8b8cf175f91425d703332b22b46c1c0e
+0,          3,          3,        1,     6144, 6041afbdd81e228f8f16384d3f9e988e
+0,          4,          4,        1,     6144, d30bd08897b50f518920014c7fa55df9
+0,          5,          5,        1,     6144, fb67222a183876b502f93e48bb779b70
+0,          6,          6,        1,     6144, 60830425ca1dcf3df4ee9c6cd75f066a
+0,          7,          7,        1,     6144, 3e178df858f7fcaa2552a1c5c719b5cc
+0,          8,          8,        1,     6144, 66718eb0c3981beb7c1119df8a2cd27e
+0,          9,          9,        1,     6144, 7c1912448c7756f7451888050760d73d
diff --git a/tests/ref/fate/vp9-02-size-64x66 b/tests/ref/fate/vp9-02-size-64x66
index 7f2a052e0e..4bcd572c74 100644
--- a/tests/ref/fate/vp9-02-size-64x66
+++ b/tests/ref/fate/vp9-02-size-64x66
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     6336, 88587de65acfc85ff56daac8ef5d12e6
-0,         33,         33,        0,     6336, be41f6c788b929b5b6b27c5674f40abd
-0,         66,         66,        0,     6336, 04ab3f88ca062a6911405fd84c7e9de4
-0,        100,        100,        0,     6336, 231436e0a68d19d3882f285d38aca3fb
-0,        133,        133,        0,     6336, 1a067e147a6740bb4ce57c4184437eea
-0,        166,        166,        0,     6336, be0c47e06c7e9439570473adf4713f5f
-0,        200,        200,        0,     6336, a213b0611247eafab0711748c25e88a0
-0,        233,        233,        0,     6336, b1df495aa3afb74399f91c74b527b93c
-0,        266,        266,        0,     6336, 46319f21069541e1ee1652621b957860
-0,        300,        300,        0,     6336, 313517a5721b2b14683e7eefc83e51b1
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 64x66
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     6336, 88587de65acfc85ff56daac8ef5d12e6
+0,          1,          1,        1,     6336, be41f6c788b929b5b6b27c5674f40abd
+0,          2,          2,        1,     6336, 04ab3f88ca062a6911405fd84c7e9de4
+0,          3,          3,        1,     6336, 231436e0a68d19d3882f285d38aca3fb
+0,          4,          4,        1,     6336, 1a067e147a6740bb4ce57c4184437eea
+0,          5,          5,        1,     6336, be0c47e06c7e9439570473adf4713f5f
+0,          6,          6,        1,     6336, a213b0611247eafab0711748c25e88a0
+0,          7,          7,        1,     6336, b1df495aa3afb74399f91c74b527b93c
+0,          8,          8,        1,     6336, 46319f21069541e1ee1652621b957860
+0,          9,          9,        1,     6336, 313517a5721b2b14683e7eefc83e51b1
diff --git a/tests/ref/fate/vp9-02-size-66x08 b/tests/ref/fate/vp9-02-size-66x08
index 76ec31e60c..0b26c5aa99 100644
--- a/tests/ref/fate/vp9-02-size-66x08
+++ b/tests/ref/fate/vp9-02-size-66x08
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      792, 3b16847e60786706fc339abc452746ff
-0,         33,         33,        0,      792, 365a5951cb127d6df183fe5d5000f493
-0,         66,         66,        0,      792, 6d4bceb815ca7717c4a3f86a6670703a
-0,        100,        100,        0,      792, 5a0a03d4788934285448c85788ae8d71
-0,        133,        133,        0,      792, 8712f9a82d07447e7a0d0a37ddc3858d
-0,        166,        166,        0,      792, cff32e6c183c16962207a86d7c6cf0a0
-0,        200,        200,        0,      792, dc933d90f87110651d7efb39854d3d46
-0,        233,        233,        0,      792, d1299562a022521f0c3cb30668f83b6d
-0,        266,        266,        0,      792, 5054254ca125d7c7e6df4001397170cd
-0,        300,        300,        0,      792, a6bd7c7c0b02afa8d25f911ec847c61a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 66x8
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      792, 3b16847e60786706fc339abc452746ff
+0,          1,          1,        1,      792, 365a5951cb127d6df183fe5d5000f493
+0,          2,          2,        1,      792, 6d4bceb815ca7717c4a3f86a6670703a
+0,          3,          3,        1,      792, 5a0a03d4788934285448c85788ae8d71
+0,          4,          4,        1,      792, 8712f9a82d07447e7a0d0a37ddc3858d
+0,          5,          5,        1,      792, cff32e6c183c16962207a86d7c6cf0a0
+0,          6,          6,        1,      792, dc933d90f87110651d7efb39854d3d46
+0,          7,          7,        1,      792, d1299562a022521f0c3cb30668f83b6d
+0,          8,          8,        1,      792, 5054254ca125d7c7e6df4001397170cd
+0,          9,          9,        1,      792, a6bd7c7c0b02afa8d25f911ec847c61a
diff --git a/tests/ref/fate/vp9-02-size-66x10 b/tests/ref/fate/vp9-02-size-66x10
index 63c775bf29..0213fce72c 100644
--- a/tests/ref/fate/vp9-02-size-66x10
+++ b/tests/ref/fate/vp9-02-size-66x10
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,      990, 7cbd8c6b2fb35c0c3063cb7a379944c9
-0,         33,         33,        0,      990, 14062e74b98bed1ca982f408bc14326c
-0,         66,         66,        0,      990, f6d6868d849aa74b27df1c5f40c7096e
-0,        100,        100,        0,      990, 719c8d7e3769466ee8e3dca3f4747a0e
-0,        133,        133,        0,      990, a72e1a7a4c82ec09ea77f87b0e6f25aa
-0,        166,        166,        0,      990, a5163d142b429afa155cc2f1401a0b8a
-0,        200,        200,        0,      990, 27762d813dd1f80d6aaed5f197124fa5
-0,        233,        233,        0,      990, 02e94454660f3528abbde8f50e94288f
-0,        266,        266,        0,      990, 1d57dcfa57a55d96f14cfe471aac2e0b
-0,        300,        300,        0,      990, 7804477923c0cd067bd09ebca3529775
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 66x10
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,      990, 7cbd8c6b2fb35c0c3063cb7a379944c9
+0,          1,          1,        1,      990, 14062e74b98bed1ca982f408bc14326c
+0,          2,          2,        1,      990, f6d6868d849aa74b27df1c5f40c7096e
+0,          3,          3,        1,      990, 719c8d7e3769466ee8e3dca3f4747a0e
+0,          4,          4,        1,      990, a72e1a7a4c82ec09ea77f87b0e6f25aa
+0,          5,          5,        1,      990, a5163d142b429afa155cc2f1401a0b8a
+0,          6,          6,        1,      990, 27762d813dd1f80d6aaed5f197124fa5
+0,          7,          7,        1,      990, 02e94454660f3528abbde8f50e94288f
+0,          8,          8,        1,      990, 1d57dcfa57a55d96f14cfe471aac2e0b
+0,          9,          9,        1,      990, 7804477923c0cd067bd09ebca3529775
diff --git a/tests/ref/fate/vp9-02-size-66x16 b/tests/ref/fate/vp9-02-size-66x16
index 97d67c855b..f9ee10e43c 100644
--- a/tests/ref/fate/vp9-02-size-66x16
+++ b/tests/ref/fate/vp9-02-size-66x16
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     1584, fa2f292d273c37dc2804a70d1cae1e9d
-0,         33,         33,        0,     1584, ba75d90652c021bc7ca061352e6e94ce
-0,         66,         66,        0,     1584, e65d9a205bd17d100e50c7b6a7ea772d
-0,        100,        100,        0,     1584, 46f9e9ff891576b9462f21d48b7b9e2b
-0,        133,        133,        0,     1584, d23cedacf3a37cf6b2774e0b18b6b9d7
-0,        166,        166,        0,     1584, 84329f7716a6db5a7e64a68a1155bfc6
-0,        200,        200,        0,     1584, ad62286b0e13f4e54df4445cdd4fd4e3
-0,        233,        233,        0,     1584, 4511529eb24b21eb63e280070f888642
-0,        266,        266,        0,     1584, 4e1c122df1785e0e9134c43c85082e05
-0,        300,        300,        0,     1584, ac3a3747a00be3f9f58155648fcf9b24
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 66x16
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     1584, fa2f292d273c37dc2804a70d1cae1e9d
+0,          1,          1,        1,     1584, ba75d90652c021bc7ca061352e6e94ce
+0,          2,          2,        1,     1584, e65d9a205bd17d100e50c7b6a7ea772d
+0,          3,          3,        1,     1584, 46f9e9ff891576b9462f21d48b7b9e2b
+0,          4,          4,        1,     1584, d23cedacf3a37cf6b2774e0b18b6b9d7
+0,          5,          5,        1,     1584, 84329f7716a6db5a7e64a68a1155bfc6
+0,          6,          6,        1,     1584, ad62286b0e13f4e54df4445cdd4fd4e3
+0,          7,          7,        1,     1584, 4511529eb24b21eb63e280070f888642
+0,          8,          8,        1,     1584, 4e1c122df1785e0e9134c43c85082e05
+0,          9,          9,        1,     1584, ac3a3747a00be3f9f58155648fcf9b24
diff --git a/tests/ref/fate/vp9-02-size-66x18 b/tests/ref/fate/vp9-02-size-66x18
index 03928deef4..1cb9bbd67d 100644
--- a/tests/ref/fate/vp9-02-size-66x18
+++ b/tests/ref/fate/vp9-02-size-66x18
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     1782, fda5ad9bf70a51b3a41bdcabf2cce32a
-0,         33,         33,        0,     1782, 91916fb20ad542a7a3ad276e6505f9b0
-0,         66,         66,        0,     1782, e18e5d11aec483c76afd68f7e64415a4
-0,        100,        100,        0,     1782, c13da01c2b6c09101bda7af93ad5fd07
-0,        133,        133,        0,     1782, ed8d2568b2ad9c7bd980cba0d3b95cff
-0,        166,        166,        0,     1782, e6f3cf312b69d37579e77f2e52cc936b
-0,        200,        200,        0,     1782, e509f3682e9c4bcdb0889e044b1979b7
-0,        233,        233,        0,     1782, acc3945e557cd7a9642f08a656444976
-0,        266,        266,        0,     1782, 44ddd03aa8f03ba393f12fc6a1b3fc17
-0,        300,        300,        0,     1782, fdd3e68132c742d9f0cf0ea6fff2a074
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 66x18
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     1782, fda5ad9bf70a51b3a41bdcabf2cce32a
+0,          1,          1,        1,     1782, 91916fb20ad542a7a3ad276e6505f9b0
+0,          2,          2,        1,     1782, e18e5d11aec483c76afd68f7e64415a4
+0,          3,          3,        1,     1782, c13da01c2b6c09101bda7af93ad5fd07
+0,          4,          4,        1,     1782, ed8d2568b2ad9c7bd980cba0d3b95cff
+0,          5,          5,        1,     1782, e6f3cf312b69d37579e77f2e52cc936b
+0,          6,          6,        1,     1782, e509f3682e9c4bcdb0889e044b1979b7
+0,          7,          7,        1,     1782, acc3945e557cd7a9642f08a656444976
+0,          8,          8,        1,     1782, 44ddd03aa8f03ba393f12fc6a1b3fc17
+0,          9,          9,        1,     1782, fdd3e68132c742d9f0cf0ea6fff2a074
diff --git a/tests/ref/fate/vp9-02-size-66x32 b/tests/ref/fate/vp9-02-size-66x32
index 0901a7bdfe..20bfa780af 100644
--- a/tests/ref/fate/vp9-02-size-66x32
+++ b/tests/ref/fate/vp9-02-size-66x32
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     3168, 013cd22aea6bfeccc8ec809abd52be5c
-0,         33,         33,        0,     3168, 0980adfb0ef879b3c960797272f025ad
-0,         66,         66,        0,     3168, d1411ffa0429befb8c71d3ab45acee92
-0,        100,        100,        0,     3168, 6c6f825379eaf21709a45be77def7a63
-0,        133,        133,        0,     3168, bab632ef00a080739a41c692f2b21c3a
-0,        166,        166,        0,     3168, fc0f6045aca252f2e904730227b8f337
-0,        200,        200,        0,     3168, c8dbea209329463bfd9238a11b8d5b17
-0,        233,        233,        0,     3168, 457247bf4186ed8459e0a1564f0e68f2
-0,        266,        266,        0,     3168, baa55e20bd7c73960b080d8a0c8db4d5
-0,        300,        300,        0,     3168, dc8933e8edc98cd0cfca44ae22997c62
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 66x32
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     3168, 013cd22aea6bfeccc8ec809abd52be5c
+0,          1,          1,        1,     3168, 0980adfb0ef879b3c960797272f025ad
+0,          2,          2,        1,     3168, d1411ffa0429befb8c71d3ab45acee92
+0,          3,          3,        1,     3168, 6c6f825379eaf21709a45be77def7a63
+0,          4,          4,        1,     3168, bab632ef00a080739a41c692f2b21c3a
+0,          5,          5,        1,     3168, fc0f6045aca252f2e904730227b8f337
+0,          6,          6,        1,     3168, c8dbea209329463bfd9238a11b8d5b17
+0,          7,          7,        1,     3168, 457247bf4186ed8459e0a1564f0e68f2
+0,          8,          8,        1,     3168, baa55e20bd7c73960b080d8a0c8db4d5
+0,          9,          9,        1,     3168, dc8933e8edc98cd0cfca44ae22997c62
diff --git a/tests/ref/fate/vp9-02-size-66x34 b/tests/ref/fate/vp9-02-size-66x34
index a999573009..012900f483 100644
--- a/tests/ref/fate/vp9-02-size-66x34
+++ b/tests/ref/fate/vp9-02-size-66x34
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     3366, 6821eb3fcd1d10db32eff70468dcf9c1
-0,         33,         33,        0,     3366, ed0094d347d9f250d46b4903cbc14801
-0,         66,         66,        0,     3366, fd018555dc9a62b8074d46e7c0fd0b40
-0,        100,        100,        0,     3366, 05d5baf9f2e62bbeeb3809a099e84147
-0,        133,        133,        0,     3366, 7a150c265214269c08e05fe4f296122d
-0,        166,        166,        0,     3366, 9a7ae61d4bb125ee4c4ccce9cc1c3664
-0,        200,        200,        0,     3366, 5a88fd6d96dcbc4255e98dfe19ff96b8
-0,        233,        233,        0,     3366, 4192c273a46b2b196c871ead0e61ec71
-0,        266,        266,        0,     3366, e79ebfc47e755f5db221f392c3216278
-0,        300,        300,        0,     3366, b995c5f483a2e553baf4f66d1a47fc57
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 66x34
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     3366, 6821eb3fcd1d10db32eff70468dcf9c1
+0,          1,          1,        1,     3366, ed0094d347d9f250d46b4903cbc14801
+0,          2,          2,        1,     3366, fd018555dc9a62b8074d46e7c0fd0b40
+0,          3,          3,        1,     3366, 05d5baf9f2e62bbeeb3809a099e84147
+0,          4,          4,        1,     3366, 7a150c265214269c08e05fe4f296122d
+0,          5,          5,        1,     3366, 9a7ae61d4bb125ee4c4ccce9cc1c3664
+0,          6,          6,        1,     3366, 5a88fd6d96dcbc4255e98dfe19ff96b8
+0,          7,          7,        1,     3366, 4192c273a46b2b196c871ead0e61ec71
+0,          8,          8,        1,     3366, e79ebfc47e755f5db221f392c3216278
+0,          9,          9,        1,     3366, b995c5f483a2e553baf4f66d1a47fc57
diff --git a/tests/ref/fate/vp9-02-size-66x64 b/tests/ref/fate/vp9-02-size-66x64
index 3a3d6c8c70..cfd77d4de2 100644
--- a/tests/ref/fate/vp9-02-size-66x64
+++ b/tests/ref/fate/vp9-02-size-66x64
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     6336, 929086fbb3e117bd53110b64c1ee915b
-0,         33,         33,        0,     6336, 9ed45f5e40dd2393434e14a0c0160c63
-0,         66,         66,        0,     6336, 5cdade692b1baf23e61896da18e3e44f
-0,        100,        100,        0,     6336, 11a2ebac61a3f826ec41c8031899e55c
-0,        133,        133,        0,     6336, 621a1e0142b94d14db9c2121553a11fb
-0,        166,        166,        0,     6336, 029a29590f7255f1bc9ff9b7a000ca25
-0,        200,        200,        0,     6336, 5fde42becf6bf054d04e2a0fa1b2d55e
-0,        233,        233,        0,     6336, 5b8ba552cef1931e1412fb4f3420748b
-0,        266,        266,        0,     6336, d41cd7d418f6ec1db802a01a90cfee1e
-0,        300,        300,        0,     6336, cea99c93a84a82edff8c6069d131453f
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 66x64
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     6336, 929086fbb3e117bd53110b64c1ee915b
+0,          1,          1,        1,     6336, 9ed45f5e40dd2393434e14a0c0160c63
+0,          2,          2,        1,     6336, 5cdade692b1baf23e61896da18e3e44f
+0,          3,          3,        1,     6336, 11a2ebac61a3f826ec41c8031899e55c
+0,          4,          4,        1,     6336, 621a1e0142b94d14db9c2121553a11fb
+0,          5,          5,        1,     6336, 029a29590f7255f1bc9ff9b7a000ca25
+0,          6,          6,        1,     6336, 5fde42becf6bf054d04e2a0fa1b2d55e
+0,          7,          7,        1,     6336, 5b8ba552cef1931e1412fb4f3420748b
+0,          8,          8,        1,     6336, d41cd7d418f6ec1db802a01a90cfee1e
+0,          9,          9,        1,     6336, cea99c93a84a82edff8c6069d131453f
diff --git a/tests/ref/fate/vp9-02-size-66x66 b/tests/ref/fate/vp9-02-size-66x66
index 5c4e1aca72..8560383e8d 100644
--- a/tests/ref/fate/vp9-02-size-66x66
+++ b/tests/ref/fate/vp9-02-size-66x66
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,     6534, 69f9028d52f95d2e7f986c57b19fc018
-0,         33,         33,        0,     6534, 068e611f62b3f6222f6b1699748c8fbf
-0,         66,         66,        0,     6534, 3d3fec78ff2274241a7958f17a773a19
-0,        100,        100,        0,     6534, 93d71ef1a2d00c7e70e76ccc1859143d
-0,        133,        133,        0,     6534, 5a35a640d52bc0930825b963b0b9e830
-0,        166,        166,        0,     6534, 782223239e6b1ca1bedbd25d9652a07c
-0,        200,        200,        0,     6534, a4b5e8a319cbc9a12d3e36127c7f0fbb
-0,        233,        233,        0,     6534, a3e2d9a78fa42b3c817aadfd31fd2d16
-0,        266,        266,        0,     6534, e9fc6b83535735f46006f3e4b376755f
-0,        300,        300,        0,     6534, 80223f600dfe86021bd0e83fecdc4b2b
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 66x66
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,     6534, 69f9028d52f95d2e7f986c57b19fc018
+0,          1,          1,        1,     6534, 068e611f62b3f6222f6b1699748c8fbf
+0,          2,          2,        1,     6534, 3d3fec78ff2274241a7958f17a773a19
+0,          3,          3,        1,     6534, 93d71ef1a2d00c7e70e76ccc1859143d
+0,          4,          4,        1,     6534, 5a35a640d52bc0930825b963b0b9e830
+0,          5,          5,        1,     6534, 782223239e6b1ca1bedbd25d9652a07c
+0,          6,          6,        1,     6534, a4b5e8a319cbc9a12d3e36127c7f0fbb
+0,          7,          7,        1,     6534, a3e2d9a78fa42b3c817aadfd31fd2d16
+0,          8,          8,        1,     6534, e9fc6b83535735f46006f3e4b376755f
+0,          9,          9,        1,     6534, 80223f600dfe86021bd0e83fecdc4b2b
diff --git a/tests/ref/fate/vp9-03-deltaq b/tests/ref/fate/vp9-03-deltaq
index c8ed23fd47..3d13960bcd 100644
--- a/tests/ref/fate/vp9-03-deltaq
+++ b/tests/ref/fate/vp9-03-deltaq
@@ -1,3 +1,11 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   126720, 2f90d606edc511c8c960530dd915cb98
-0,         33,         33,        0,   126720, 7fd451a057d6341b2b0d116f59e41a13
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x240
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   126720, 2f90d606edc511c8c960530dd915cb98
+0,          1,          1,        1,   126720, 7fd451a057d6341b2b0d116f59e41a13
diff --git a/tests/ref/fate/vp9-03-size-196x196 b/tests/ref/fate/vp9-03-size-196x196
index 39efcba832..7ac30a57d5 100644
--- a/tests/ref/fate/vp9-03-size-196x196
+++ b/tests/ref/fate/vp9-03-size-196x196
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    57624, 14cc1c34b8106e35238d4650a9123852
-0,         33,         33,        0,    57624, 66e0bb9136ea24e30b781a4610b428a1
-0,         66,         66,        0,    57624, 8e36679c20a3a3e974fdacf7a9343817
-0,        100,        100,        0,    57624, 2669fd03ce7ce01f4fc9db23e06fffdb
-0,        133,        133,        0,    57624, 46ced29eb6edf2136c8ee19e9a87380f
-0,        166,        166,        0,    57624, 4e4138b65a30bc56cd18663a1799f98f
-0,        200,        200,        0,    57624, 580b0431b5f808c67e50ed34e62f39ad
-0,        233,        233,        0,    57624, 1339bbe256d8499ab17d6a550f7dac70
-0,        266,        266,        0,    57624, 89b9dac29a4c4136249c40a3763dc114
-0,        300,        300,        0,    57624, a735d341d7df9dcd0b6e51a82b813f61
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 196x196
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    57624, 14cc1c34b8106e35238d4650a9123852
+0,          1,          1,        1,    57624, 66e0bb9136ea24e30b781a4610b428a1
+0,          2,          2,        1,    57624, 8e36679c20a3a3e974fdacf7a9343817
+0,          3,          3,        1,    57624, 2669fd03ce7ce01f4fc9db23e06fffdb
+0,          4,          4,        1,    57624, 46ced29eb6edf2136c8ee19e9a87380f
+0,          5,          5,        1,    57624, 4e4138b65a30bc56cd18663a1799f98f
+0,          6,          6,        1,    57624, 580b0431b5f808c67e50ed34e62f39ad
+0,          7,          7,        1,    57624, 1339bbe256d8499ab17d6a550f7dac70
+0,          8,          8,        1,    57624, 89b9dac29a4c4136249c40a3763dc114
+0,          9,          9,        1,    57624, a735d341d7df9dcd0b6e51a82b813f61
diff --git a/tests/ref/fate/vp9-03-size-196x198 b/tests/ref/fate/vp9-03-size-196x198
index b328ab442f..fd65de0822 100644
--- a/tests/ref/fate/vp9-03-size-196x198
+++ b/tests/ref/fate/vp9-03-size-196x198
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    58212, d2bd2dfaf2ac22b3f2499844f228d89a
-0,         33,         33,        0,    58212, e066448baeb39da04b22d4d2ebd27b0a
-0,         66,         66,        0,    58212, aace53c0ecca2596c51dd5e70da7abc4
-0,        100,        100,        0,    58212, 077256d024ab101918d10ae61142f203
-0,        133,        133,        0,    58212, e2bfdad36b0365d41dc6813a371111ee
-0,        166,        166,        0,    58212, 17495af68b0a2c075899849382f3b046
-0,        200,        200,        0,    58212, 7853db163344798e5c37672adaac92d8
-0,        233,        233,        0,    58212, 7b2ee2e1ca709c58457c7d818e47c95c
-0,        266,        266,        0,    58212, f7eb3ce10561628f932861358a30b414
-0,        300,        300,        0,    58212, 3182374f5aa539fd0faa44ed4a7492e5
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 196x198
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    58212, d2bd2dfaf2ac22b3f2499844f228d89a
+0,          1,          1,        1,    58212, e066448baeb39da04b22d4d2ebd27b0a
+0,          2,          2,        1,    58212, aace53c0ecca2596c51dd5e70da7abc4
+0,          3,          3,        1,    58212, 077256d024ab101918d10ae61142f203
+0,          4,          4,        1,    58212, e2bfdad36b0365d41dc6813a371111ee
+0,          5,          5,        1,    58212, 17495af68b0a2c075899849382f3b046
+0,          6,          6,        1,    58212, 7853db163344798e5c37672adaac92d8
+0,          7,          7,        1,    58212, 7b2ee2e1ca709c58457c7d818e47c95c
+0,          8,          8,        1,    58212, f7eb3ce10561628f932861358a30b414
+0,          9,          9,        1,    58212, 3182374f5aa539fd0faa44ed4a7492e5
diff --git a/tests/ref/fate/vp9-03-size-196x200 b/tests/ref/fate/vp9-03-size-196x200
index 0aed80257b..de59ee12fe 100644
--- a/tests/ref/fate/vp9-03-size-196x200
+++ b/tests/ref/fate/vp9-03-size-196x200
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    58800, b2f2ac3e3833ae1b4dd075fe00210373
-0,         33,         33,        0,    58800, c0cce05e56a07111fe62553fa3a87074
-0,         66,         66,        0,    58800, 626aab3de03242073e03504e166b4697
-0,        100,        100,        0,    58800, 574d2c810f0bbfac57f1f06c2b97445c
-0,        133,        133,        0,    58800, 7d5bc5860bd1422d08396fe080452099
-0,        166,        166,        0,    58800, 5d47bbfb0f5cdecfe8415ca2caddc206
-0,        200,        200,        0,    58800, fbef6a0fa51029d0475975945ccf4b36
-0,        233,        233,        0,    58800, c9179c153bcb2a8e9d17ed04e5e2c39c
-0,        266,        266,        0,    58800, 107d796592cf2140d4d492beadba2d68
-0,        300,        300,        0,    58800, eee46f9ee67fc1121bffb63aeb7c768f
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 196x200
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    58800, b2f2ac3e3833ae1b4dd075fe00210373
+0,          1,          1,        1,    58800, c0cce05e56a07111fe62553fa3a87074
+0,          2,          2,        1,    58800, 626aab3de03242073e03504e166b4697
+0,          3,          3,        1,    58800, 574d2c810f0bbfac57f1f06c2b97445c
+0,          4,          4,        1,    58800, 7d5bc5860bd1422d08396fe080452099
+0,          5,          5,        1,    58800, 5d47bbfb0f5cdecfe8415ca2caddc206
+0,          6,          6,        1,    58800, fbef6a0fa51029d0475975945ccf4b36
+0,          7,          7,        1,    58800, c9179c153bcb2a8e9d17ed04e5e2c39c
+0,          8,          8,        1,    58800, 107d796592cf2140d4d492beadba2d68
+0,          9,          9,        1,    58800, eee46f9ee67fc1121bffb63aeb7c768f
diff --git a/tests/ref/fate/vp9-03-size-196x202 b/tests/ref/fate/vp9-03-size-196x202
index 9f8c3f2518..4a406740b9 100644
--- a/tests/ref/fate/vp9-03-size-196x202
+++ b/tests/ref/fate/vp9-03-size-196x202
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    59388, 7109d2ef160828ece26337f36fcfc092
-0,         33,         33,        0,    59388, bdaa6612f81a956d9b20d55a04df8346
-0,         66,         66,        0,    59388, 15eb75495d2713a64415b990b058d5ca
-0,        100,        100,        0,    59388, b997c84553475ba84e8ba3d7ee19ae4e
-0,        133,        133,        0,    59388, 63a8badd691bcf643cf676d029ce8a6c
-0,        166,        166,        0,    59388, b8ca23d9b3418c4c36040a215b2b7917
-0,        200,        200,        0,    59388, 1be0da18386c35e4a5e5d5d32d9a4468
-0,        233,        233,        0,    59388, e75a03fa70fe7e6b3a8d8ce7dc8305f1
-0,        266,        266,        0,    59388, cbd2b60df9209025c8e890771a05321d
-0,        300,        300,        0,    59388, c655d6fcc3333917b66358a9ac2b1357
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 196x202
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    59388, 7109d2ef160828ece26337f36fcfc092
+0,          1,          1,        1,    59388, bdaa6612f81a956d9b20d55a04df8346
+0,          2,          2,        1,    59388, 15eb75495d2713a64415b990b058d5ca
+0,          3,          3,        1,    59388, b997c84553475ba84e8ba3d7ee19ae4e
+0,          4,          4,        1,    59388, 63a8badd691bcf643cf676d029ce8a6c
+0,          5,          5,        1,    59388, b8ca23d9b3418c4c36040a215b2b7917
+0,          6,          6,        1,    59388, 1be0da18386c35e4a5e5d5d32d9a4468
+0,          7,          7,        1,    59388, e75a03fa70fe7e6b3a8d8ce7dc8305f1
+0,          8,          8,        1,    59388, cbd2b60df9209025c8e890771a05321d
+0,          9,          9,        1,    59388, c655d6fcc3333917b66358a9ac2b1357
diff --git a/tests/ref/fate/vp9-03-size-196x208 b/tests/ref/fate/vp9-03-size-196x208
index 2e6880239f..aee4445f0c 100644
--- a/tests/ref/fate/vp9-03-size-196x208
+++ b/tests/ref/fate/vp9-03-size-196x208
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    61152, efa2a2a76a0fe709a78e491346cfcf29
-0,         33,         33,        0,    61152, 97de85e21b408878853fa870104707d7
-0,         66,         66,        0,    61152, 419bd1157e156d3059190d6b561c57dd
-0,        100,        100,        0,    61152, fbb6e01c524fc7c8007c6cfe2c64f467
-0,        133,        133,        0,    61152, 7453994c2e9901fa23f295ec0b556f9c
-0,        166,        166,        0,    61152, ba39dc984789fa2c4b833cd88013cc97
-0,        200,        200,        0,    61152, cea5061cac1be18d5f9a9301a5460491
-0,        233,        233,        0,    61152, 1c583018c425b1a91949e0c3eb0a4152
-0,        266,        266,        0,    61152, b48be02280ac6f97731af69bcf18de25
-0,        300,        300,        0,    61152, 6f8ab465214d8374c9ff77b939da333e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 196x208
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    61152, efa2a2a76a0fe709a78e491346cfcf29
+0,          1,          1,        1,    61152, 97de85e21b408878853fa870104707d7
+0,          2,          2,        1,    61152, 419bd1157e156d3059190d6b561c57dd
+0,          3,          3,        1,    61152, fbb6e01c524fc7c8007c6cfe2c64f467
+0,          4,          4,        1,    61152, 7453994c2e9901fa23f295ec0b556f9c
+0,          5,          5,        1,    61152, ba39dc984789fa2c4b833cd88013cc97
+0,          6,          6,        1,    61152, cea5061cac1be18d5f9a9301a5460491
+0,          7,          7,        1,    61152, 1c583018c425b1a91949e0c3eb0a4152
+0,          8,          8,        1,    61152, b48be02280ac6f97731af69bcf18de25
+0,          9,          9,        1,    61152, 6f8ab465214d8374c9ff77b939da333e
diff --git a/tests/ref/fate/vp9-03-size-196x210 b/tests/ref/fate/vp9-03-size-196x210
index 7d24b47abd..bcfde205cc 100644
--- a/tests/ref/fate/vp9-03-size-196x210
+++ b/tests/ref/fate/vp9-03-size-196x210
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    61740, fccc18714a9ed3840bd6e9c6ca4858e5
-0,         33,         33,        0,    61740, a8f6eb43cf6ed670eb180c5051de06f7
-0,         66,         66,        0,    61740, 6a9baf9eae6e799deaefd6e801f7ace3
-0,        100,        100,        0,    61740, 3bb44c8a45aab088c9887c11bc6a4acf
-0,        133,        133,        0,    61740, 0907a7e926be9e54bbb087251b4715d9
-0,        166,        166,        0,    61740, 10fef2876c20eb3f9570c0c23e5acc69
-0,        200,        200,        0,    61740, ffe5d2b6d874af0f878075c97940ccfb
-0,        233,        233,        0,    61740, d10fae10144ff88075048827203f7e9c
-0,        266,        266,        0,    61740, bdf35736ac625f2178902c1f24d513c0
-0,        300,        300,        0,    61740, 30882bf2c21785be6234b637c4b16b28
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 196x210
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    61740, fccc18714a9ed3840bd6e9c6ca4858e5
+0,          1,          1,        1,    61740, a8f6eb43cf6ed670eb180c5051de06f7
+0,          2,          2,        1,    61740, 6a9baf9eae6e799deaefd6e801f7ace3
+0,          3,          3,        1,    61740, 3bb44c8a45aab088c9887c11bc6a4acf
+0,          4,          4,        1,    61740, 0907a7e926be9e54bbb087251b4715d9
+0,          5,          5,        1,    61740, 10fef2876c20eb3f9570c0c23e5acc69
+0,          6,          6,        1,    61740, ffe5d2b6d874af0f878075c97940ccfb
+0,          7,          7,        1,    61740, d10fae10144ff88075048827203f7e9c
+0,          8,          8,        1,    61740, bdf35736ac625f2178902c1f24d513c0
+0,          9,          9,        1,    61740, 30882bf2c21785be6234b637c4b16b28
diff --git a/tests/ref/fate/vp9-03-size-196x224 b/tests/ref/fate/vp9-03-size-196x224
index 152de0d149..0e9d64cd5d 100644
--- a/tests/ref/fate/vp9-03-size-196x224
+++ b/tests/ref/fate/vp9-03-size-196x224
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    65856, 13263674ea5aa619250dfd139bda872f
-0,         33,         33,        0,    65856, 39f5cbd8917f2b3a1df8cf2b786266de
-0,         66,         66,        0,    65856, f9aade31f9e3065f3d5b8645ef099ac6
-0,        100,        100,        0,    65856, 124f9664380f092e692b5e881f5a8fcc
-0,        133,        133,        0,    65856, e8e040e417830f5e911537828ace21b7
-0,        166,        166,        0,    65856, 84ce09882b9c184a787e8022e6d8c8de
-0,        200,        200,        0,    65856, b1397fd91814e4fdc4f75c89161ced26
-0,        233,        233,        0,    65856, d64f39d64d248f0223ed359e092d46cb
-0,        266,        266,        0,    65856, e04ee663dcc52eebd74255671c6f4ec9
-0,        300,        300,        0,    65856, 955303cb73bf072c693f37d9778ca2b6
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 196x224
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    65856, 13263674ea5aa619250dfd139bda872f
+0,          1,          1,        1,    65856, 39f5cbd8917f2b3a1df8cf2b786266de
+0,          2,          2,        1,    65856, f9aade31f9e3065f3d5b8645ef099ac6
+0,          3,          3,        1,    65856, 124f9664380f092e692b5e881f5a8fcc
+0,          4,          4,        1,    65856, e8e040e417830f5e911537828ace21b7
+0,          5,          5,        1,    65856, 84ce09882b9c184a787e8022e6d8c8de
+0,          6,          6,        1,    65856, b1397fd91814e4fdc4f75c89161ced26
+0,          7,          7,        1,    65856, d64f39d64d248f0223ed359e092d46cb
+0,          8,          8,        1,    65856, e04ee663dcc52eebd74255671c6f4ec9
+0,          9,          9,        1,    65856, 955303cb73bf072c693f37d9778ca2b6
diff --git a/tests/ref/fate/vp9-03-size-196x226 b/tests/ref/fate/vp9-03-size-196x226
index 974ab53737..05c88ec484 100644
--- a/tests/ref/fate/vp9-03-size-196x226
+++ b/tests/ref/fate/vp9-03-size-196x226
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    66444, 5cb240f10761f59687612ed589759800
-0,         33,         33,        0,    66444, 9d8d5b57336ddfa5c9c5100a0302197d
-0,         66,         66,        0,    66444, 9db74997d23b16f527c63e88795331dc
-0,        100,        100,        0,    66444, 52758cd901533e790334d464bee516da
-0,        133,        133,        0,    66444, 40e671b9b85d07b13acba85eb64bbbaa
-0,        166,        166,        0,    66444, 8524b2cd2c9bb3e41c6167f8269e75d2
-0,        200,        200,        0,    66444, ff194ad6fa180fde86cc05a99c0580ec
-0,        233,        233,        0,    66444, 22ab303cb37745a73c227cd7d1c70003
-0,        266,        266,        0,    66444, 01986c58e82e0b5194418f5b75a8599c
-0,        300,        300,        0,    66444, eedfc9c14cbf3fa10402dbed52103848
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 196x226
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    66444, 5cb240f10761f59687612ed589759800
+0,          1,          1,        1,    66444, 9d8d5b57336ddfa5c9c5100a0302197d
+0,          2,          2,        1,    66444, 9db74997d23b16f527c63e88795331dc
+0,          3,          3,        1,    66444, 52758cd901533e790334d464bee516da
+0,          4,          4,        1,    66444, 40e671b9b85d07b13acba85eb64bbbaa
+0,          5,          5,        1,    66444, 8524b2cd2c9bb3e41c6167f8269e75d2
+0,          6,          6,        1,    66444, ff194ad6fa180fde86cc05a99c0580ec
+0,          7,          7,        1,    66444, 22ab303cb37745a73c227cd7d1c70003
+0,          8,          8,        1,    66444, 01986c58e82e0b5194418f5b75a8599c
+0,          9,          9,        1,    66444, eedfc9c14cbf3fa10402dbed52103848
diff --git a/tests/ref/fate/vp9-03-size-198x196 b/tests/ref/fate/vp9-03-size-198x196
index 595299ecab..75af98d1a4 100644
--- a/tests/ref/fate/vp9-03-size-198x196
+++ b/tests/ref/fate/vp9-03-size-198x196
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    58212, c980866a6f17d4107ce128ee112d74cf
-0,         33,         33,        0,    58212, d4d5d2a10e73f1d09919355dc4d63d48
-0,         66,         66,        0,    58212, 82c76ed020acb68ff9d8bd81899aa6f8
-0,        100,        100,        0,    58212, 8330705fa354fb5838af56dcf9cc0980
-0,        133,        133,        0,    58212, e47b63d839a592e6372d18249bf5bc0c
-0,        166,        166,        0,    58212, b6095b6f752a50e96cab52e7c3fd52f3
-0,        200,        200,        0,    58212, fc4786f48b6ee31043d94f79c5c8a54f
-0,        233,        233,        0,    58212, 7d3d06c96496bd5ab44fe5489877771d
-0,        266,        266,        0,    58212, 5b96de089a9faa2dc01697fe9dd97f7f
-0,        300,        300,        0,    58212, d7361203b4c264067dcb7bf6912e8df2
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 198x196
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    58212, c980866a6f17d4107ce128ee112d74cf
+0,          1,          1,        1,    58212, d4d5d2a10e73f1d09919355dc4d63d48
+0,          2,          2,        1,    58212, 82c76ed020acb68ff9d8bd81899aa6f8
+0,          3,          3,        1,    58212, 8330705fa354fb5838af56dcf9cc0980
+0,          4,          4,        1,    58212, e47b63d839a592e6372d18249bf5bc0c
+0,          5,          5,        1,    58212, b6095b6f752a50e96cab52e7c3fd52f3
+0,          6,          6,        1,    58212, fc4786f48b6ee31043d94f79c5c8a54f
+0,          7,          7,        1,    58212, 7d3d06c96496bd5ab44fe5489877771d
+0,          8,          8,        1,    58212, 5b96de089a9faa2dc01697fe9dd97f7f
+0,          9,          9,        1,    58212, d7361203b4c264067dcb7bf6912e8df2
diff --git a/tests/ref/fate/vp9-03-size-198x198 b/tests/ref/fate/vp9-03-size-198x198
index 890dd9c75e..9323e7c98c 100644
--- a/tests/ref/fate/vp9-03-size-198x198
+++ b/tests/ref/fate/vp9-03-size-198x198
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    58806, ee0760611da9938e72f551d219671c76
-0,         33,         33,        0,    58806, c512cb8a864c25318254438c7170f373
-0,         66,         66,        0,    58806, aaea10aeb7dfd1f9f6dc77adccfcd56f
-0,        100,        100,        0,    58806, fb4e68ce202d9c6ecbddc6fe50b1cd7b
-0,        133,        133,        0,    58806, 57a803d02f0d71ec4c3c17a112574525
-0,        166,        166,        0,    58806, 526d0beaf7ef721c3a6ae8bf3505fd78
-0,        200,        200,        0,    58806, 972ab31f81dbb79c2273bcfc98569e8b
-0,        233,        233,        0,    58806, e1f05d62691bd1a9494d57449417415c
-0,        266,        266,        0,    58806, bc39a559b25e5a1ac698e0101bd6bf29
-0,        300,        300,        0,    58806, 04caed04ac21c76af873e21899860fb2
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 198x198
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    58806, ee0760611da9938e72f551d219671c76
+0,          1,          1,        1,    58806, c512cb8a864c25318254438c7170f373
+0,          2,          2,        1,    58806, aaea10aeb7dfd1f9f6dc77adccfcd56f
+0,          3,          3,        1,    58806, fb4e68ce202d9c6ecbddc6fe50b1cd7b
+0,          4,          4,        1,    58806, 57a803d02f0d71ec4c3c17a112574525
+0,          5,          5,        1,    58806, 526d0beaf7ef721c3a6ae8bf3505fd78
+0,          6,          6,        1,    58806, 972ab31f81dbb79c2273bcfc98569e8b
+0,          7,          7,        1,    58806, e1f05d62691bd1a9494d57449417415c
+0,          8,          8,        1,    58806, bc39a559b25e5a1ac698e0101bd6bf29
+0,          9,          9,        1,    58806, 04caed04ac21c76af873e21899860fb2
diff --git a/tests/ref/fate/vp9-03-size-198x200 b/tests/ref/fate/vp9-03-size-198x200
index 2535ceb2a0..b7c340f29b 100644
--- a/tests/ref/fate/vp9-03-size-198x200
+++ b/tests/ref/fate/vp9-03-size-198x200
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    59400, fb0e8171b0f91d9b2ceb5430db27a67b
-0,         33,         33,        0,    59400, 73f121e6aa0e6290cfd06ac9b033c772
-0,         66,         66,        0,    59400, 4113897efc44f49f5169a579bee03596
-0,        100,        100,        0,    59400, aec1d4cf1a15e12b689980cfe136d5d6
-0,        133,        133,        0,    59400, 1322af65f647254330120e67ddae38bd
-0,        166,        166,        0,    59400, 5d28c1684451812c9db41433e6286d85
-0,        200,        200,        0,    59400, 33843fc49d1d8655520c2f42332222ca
-0,        233,        233,        0,    59400, 92a8125d8c75eaf6159d5f431c5c71bf
-0,        266,        266,        0,    59400, 5bc96553842f65a3e37f012b72b580f5
-0,        300,        300,        0,    59400, de5eb6299ee5034dc3b01cdc94bf810a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 198x200
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    59400, fb0e8171b0f91d9b2ceb5430db27a67b
+0,          1,          1,        1,    59400, 73f121e6aa0e6290cfd06ac9b033c772
+0,          2,          2,        1,    59400, 4113897efc44f49f5169a579bee03596
+0,          3,          3,        1,    59400, aec1d4cf1a15e12b689980cfe136d5d6
+0,          4,          4,        1,    59400, 1322af65f647254330120e67ddae38bd
+0,          5,          5,        1,    59400, 5d28c1684451812c9db41433e6286d85
+0,          6,          6,        1,    59400, 33843fc49d1d8655520c2f42332222ca
+0,          7,          7,        1,    59400, 92a8125d8c75eaf6159d5f431c5c71bf
+0,          8,          8,        1,    59400, 5bc96553842f65a3e37f012b72b580f5
+0,          9,          9,        1,    59400, de5eb6299ee5034dc3b01cdc94bf810a
diff --git a/tests/ref/fate/vp9-03-size-198x202 b/tests/ref/fate/vp9-03-size-198x202
index ba4d425718..65e095e6df 100644
--- a/tests/ref/fate/vp9-03-size-198x202
+++ b/tests/ref/fate/vp9-03-size-198x202
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    59994, f5e1cf4cc56742fadddf42189a3f65e3
-0,         33,         33,        0,    59994, f3e8ca2c8deb29a6b5bfe415b39c901e
-0,         66,         66,        0,    59994, 89c513049e41e145bca46a7f7119567c
-0,        100,        100,        0,    59994, 419089035739e84f1aa14ccdf34edcb1
-0,        133,        133,        0,    59994, 4962c98c23b16b9257869a8ad5138731
-0,        166,        166,        0,    59994, fde9e858ec895c36c2d8071e69f68db6
-0,        200,        200,        0,    59994, 42e1271915f31a00be3627fa866ce3ee
-0,        233,        233,        0,    59994, c15f794933f913861a6d0041ff2fccdb
-0,        266,        266,        0,    59994, 35dab245ba952dc6fddc1a9668c30b28
-0,        300,        300,        0,    59994, 30bb4ef77cdde9cf5aea0f1287183b23
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 198x202
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    59994, f5e1cf4cc56742fadddf42189a3f65e3
+0,          1,          1,        1,    59994, f3e8ca2c8deb29a6b5bfe415b39c901e
+0,          2,          2,        1,    59994, 89c513049e41e145bca46a7f7119567c
+0,          3,          3,        1,    59994, 419089035739e84f1aa14ccdf34edcb1
+0,          4,          4,        1,    59994, 4962c98c23b16b9257869a8ad5138731
+0,          5,          5,        1,    59994, fde9e858ec895c36c2d8071e69f68db6
+0,          6,          6,        1,    59994, 42e1271915f31a00be3627fa866ce3ee
+0,          7,          7,        1,    59994, c15f794933f913861a6d0041ff2fccdb
+0,          8,          8,        1,    59994, 35dab245ba952dc6fddc1a9668c30b28
+0,          9,          9,        1,    59994, 30bb4ef77cdde9cf5aea0f1287183b23
diff --git a/tests/ref/fate/vp9-03-size-198x208 b/tests/ref/fate/vp9-03-size-198x208
index 49fea910cb..9b0a76e1b2 100644
--- a/tests/ref/fate/vp9-03-size-198x208
+++ b/tests/ref/fate/vp9-03-size-198x208
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    61776, d45b561f81cbfcca8a1dddbc2bf8ca31
-0,         33,         33,        0,    61776, 3664f63b2e59e380622caadb7a05545e
-0,         66,         66,        0,    61776, 0662fa199512320704efecc10af1aaa4
-0,        100,        100,        0,    61776, d8dc00882e73be89d0585663892cbcff
-0,        133,        133,        0,    61776, ff64b8d50b7c5b484a06dab09a26147c
-0,        166,        166,        0,    61776, 1771b6a55112eb7ea10885d1390339cc
-0,        200,        200,        0,    61776, 0d5944e8a13e3c2faffb562bbe2671a8
-0,        233,        233,        0,    61776, 744bed3a88407b75a8ff27a1b0cec64e
-0,        266,        266,        0,    61776, 3887415f2ab10d2a265c4a413e7060b9
-0,        300,        300,        0,    61776, 7dd683019b19b464bc0436f41e0b7c87
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 198x208
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    61776, d45b561f81cbfcca8a1dddbc2bf8ca31
+0,          1,          1,        1,    61776, 3664f63b2e59e380622caadb7a05545e
+0,          2,          2,        1,    61776, 0662fa199512320704efecc10af1aaa4
+0,          3,          3,        1,    61776, d8dc00882e73be89d0585663892cbcff
+0,          4,          4,        1,    61776, ff64b8d50b7c5b484a06dab09a26147c
+0,          5,          5,        1,    61776, 1771b6a55112eb7ea10885d1390339cc
+0,          6,          6,        1,    61776, 0d5944e8a13e3c2faffb562bbe2671a8
+0,          7,          7,        1,    61776, 744bed3a88407b75a8ff27a1b0cec64e
+0,          8,          8,        1,    61776, 3887415f2ab10d2a265c4a413e7060b9
+0,          9,          9,        1,    61776, 7dd683019b19b464bc0436f41e0b7c87
diff --git a/tests/ref/fate/vp9-03-size-198x210 b/tests/ref/fate/vp9-03-size-198x210
index 899fd50bd2..7c8878a00b 100644
--- a/tests/ref/fate/vp9-03-size-198x210
+++ b/tests/ref/fate/vp9-03-size-198x210
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    62370, 8525a27170982c059d5904c1af3b43fb
-0,         33,         33,        0,    62370, c4eb329733913360384d3917a58f6f36
-0,         66,         66,        0,    62370, ec118b87c9cba0e4bd89fd43567cca4e
-0,        100,        100,        0,    62370, 7e57c6caba7924823977e2c9bc11f7fa
-0,        133,        133,        0,    62370, f77ffb7228a5eda848acc40ff636ecad
-0,        166,        166,        0,    62370, c5dddafbe3badcbbcaaebe97076e0394
-0,        200,        200,        0,    62370, 34d69ae2e5b4c4fbcc51627237c9abc5
-0,        233,        233,        0,    62370, d9c63fa8b18d6c54e5fa31db866c06cc
-0,        266,        266,        0,    62370, 7ab392764a399328bf35977539e3148a
-0,        300,        300,        0,    62370, 7fbb7bae3ec775298aaa49a286dfb9d1
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 198x210
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    62370, 8525a27170982c059d5904c1af3b43fb
+0,          1,          1,        1,    62370, c4eb329733913360384d3917a58f6f36
+0,          2,          2,        1,    62370, ec118b87c9cba0e4bd89fd43567cca4e
+0,          3,          3,        1,    62370, 7e57c6caba7924823977e2c9bc11f7fa
+0,          4,          4,        1,    62370, f77ffb7228a5eda848acc40ff636ecad
+0,          5,          5,        1,    62370, c5dddafbe3badcbbcaaebe97076e0394
+0,          6,          6,        1,    62370, 34d69ae2e5b4c4fbcc51627237c9abc5
+0,          7,          7,        1,    62370, d9c63fa8b18d6c54e5fa31db866c06cc
+0,          8,          8,        1,    62370, 7ab392764a399328bf35977539e3148a
+0,          9,          9,        1,    62370, 7fbb7bae3ec775298aaa49a286dfb9d1
diff --git a/tests/ref/fate/vp9-03-size-198x224 b/tests/ref/fate/vp9-03-size-198x224
index b972f6af03..09d20b7e93 100644
--- a/tests/ref/fate/vp9-03-size-198x224
+++ b/tests/ref/fate/vp9-03-size-198x224
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    66528, 5f69230bfd8bb485bd85552b18339fc0
-0,         33,         33,        0,    66528, f5c365774fc1d0bffd5025ce2e931aaf
-0,         66,         66,        0,    66528, 2898234103c3624e6470ae82c916e000
-0,        100,        100,        0,    66528, d82a7fa705180b68a8ee8cb7de0cdd2d
-0,        133,        133,        0,    66528, 144a162d418deae62883a2cc4c341b4c
-0,        166,        166,        0,    66528, b3419a48385e42ca15717289ff2daa1c
-0,        200,        200,        0,    66528, d6306b5737f88f989bf2e6a1084a94fe
-0,        233,        233,        0,    66528, 5669761d7417b52b3cf81d44a13e3fb7
-0,        266,        266,        0,    66528, 3f730b8658d7a6657d1af38c75357512
-0,        300,        300,        0,    66528, 27df68d515148f732325bf821037d59f
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 198x224
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    66528, 5f69230bfd8bb485bd85552b18339fc0
+0,          1,          1,        1,    66528, f5c365774fc1d0bffd5025ce2e931aaf
+0,          2,          2,        1,    66528, 2898234103c3624e6470ae82c916e000
+0,          3,          3,        1,    66528, d82a7fa705180b68a8ee8cb7de0cdd2d
+0,          4,          4,        1,    66528, 144a162d418deae62883a2cc4c341b4c
+0,          5,          5,        1,    66528, b3419a48385e42ca15717289ff2daa1c
+0,          6,          6,        1,    66528, d6306b5737f88f989bf2e6a1084a94fe
+0,          7,          7,        1,    66528, 5669761d7417b52b3cf81d44a13e3fb7
+0,          8,          8,        1,    66528, 3f730b8658d7a6657d1af38c75357512
+0,          9,          9,        1,    66528, 27df68d515148f732325bf821037d59f
diff --git a/tests/ref/fate/vp9-03-size-198x226 b/tests/ref/fate/vp9-03-size-198x226
index 4f622cd0bf..9fcbcd47e2 100644
--- a/tests/ref/fate/vp9-03-size-198x226
+++ b/tests/ref/fate/vp9-03-size-198x226
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    67122, 412c33a8fd71c99e68e6701b050b107c
-0,         33,         33,        0,    67122, 8e69483ff8a094096dd550b30be20dde
-0,         66,         66,        0,    67122, b8df87ab3d2613be31a3743e34d7e794
-0,        100,        100,        0,    67122, ec4b08a4014950f1fe04e83f8a790af0
-0,        133,        133,        0,    67122, 030da2b60627d879730108826ce6632c
-0,        166,        166,        0,    67122, 03aab0c9b4d75bc0b47fa5237e9efe3d
-0,        200,        200,        0,    67122, fd01e369df258f340eb8e486c07ae136
-0,        233,        233,        0,    67122, 1c301f0e60c96008fd7b6e8de1ebaa29
-0,        266,        266,        0,    67122, 912723f43b2b36366c3e6ab122d31801
-0,        300,        300,        0,    67122, b2774a66f7aa0fb7dd7e64b0d67818cd
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 198x226
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    67122, 412c33a8fd71c99e68e6701b050b107c
+0,          1,          1,        1,    67122, 8e69483ff8a094096dd550b30be20dde
+0,          2,          2,        1,    67122, b8df87ab3d2613be31a3743e34d7e794
+0,          3,          3,        1,    67122, ec4b08a4014950f1fe04e83f8a790af0
+0,          4,          4,        1,    67122, 030da2b60627d879730108826ce6632c
+0,          5,          5,        1,    67122, 03aab0c9b4d75bc0b47fa5237e9efe3d
+0,          6,          6,        1,    67122, fd01e369df258f340eb8e486c07ae136
+0,          7,          7,        1,    67122, 1c301f0e60c96008fd7b6e8de1ebaa29
+0,          8,          8,        1,    67122, 912723f43b2b36366c3e6ab122d31801
+0,          9,          9,        1,    67122, b2774a66f7aa0fb7dd7e64b0d67818cd
diff --git a/tests/ref/fate/vp9-03-size-200x196 b/tests/ref/fate/vp9-03-size-200x196
index b0b7ee2a92..3326b236fa 100644
--- a/tests/ref/fate/vp9-03-size-200x196
+++ b/tests/ref/fate/vp9-03-size-200x196
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    58800, 651a0627c6cdaee8b46e1f8c4121a368
-0,         33,         33,        0,    58800, 3e63075148df16f69c933cf6c63e078c
-0,         66,         66,        0,    58800, edf18e52b7d52af2bb7594ed358542d8
-0,        100,        100,        0,    58800, 30284124756d00d10f4f8428206ceab8
-0,        133,        133,        0,    58800, 6f6ecde53cd0ea5298f4529d396460c6
-0,        166,        166,        0,    58800, 0431d389278957fbef3e72f69f3ce008
-0,        200,        200,        0,    58800, a047c60c4c60d2ea1f79c86dc98cdf8e
-0,        233,        233,        0,    58800, dceda8bf128a8cdcadfa6c5db49cde51
-0,        266,        266,        0,    58800, d8a6283637f5abda17e0bf150eac2983
-0,        300,        300,        0,    58800, 33dca31ef26fdd0daf9971c8de685d01
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x196
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    58800, 651a0627c6cdaee8b46e1f8c4121a368
+0,          1,          1,        1,    58800, 3e63075148df16f69c933cf6c63e078c
+0,          2,          2,        1,    58800, edf18e52b7d52af2bb7594ed358542d8
+0,          3,          3,        1,    58800, 30284124756d00d10f4f8428206ceab8
+0,          4,          4,        1,    58800, 6f6ecde53cd0ea5298f4529d396460c6
+0,          5,          5,        1,    58800, 0431d389278957fbef3e72f69f3ce008
+0,          6,          6,        1,    58800, a047c60c4c60d2ea1f79c86dc98cdf8e
+0,          7,          7,        1,    58800, dceda8bf128a8cdcadfa6c5db49cde51
+0,          8,          8,        1,    58800, d8a6283637f5abda17e0bf150eac2983
+0,          9,          9,        1,    58800, 33dca31ef26fdd0daf9971c8de685d01
diff --git a/tests/ref/fate/vp9-03-size-200x198 b/tests/ref/fate/vp9-03-size-200x198
index f7c7c3fe89..66ccd0b39c 100644
--- a/tests/ref/fate/vp9-03-size-200x198
+++ b/tests/ref/fate/vp9-03-size-200x198
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    59400, d4b3578d800c747bcabaa484a140ffb0
-0,         33,         33,        0,    59400, a40f6f8c384c5dc3d5546d960bb6d9e5
-0,         66,         66,        0,    59400, e270ae8754d9906dd88b1c7d05280801
-0,        100,        100,        0,    59400, bde7fde5012840c5e188f3b29f4f0003
-0,        133,        133,        0,    59400, 8f8510c1130615b64fb8469af66ff678
-0,        166,        166,        0,    59400, 79b9d4e0c64f82a6e9540394222a593d
-0,        200,        200,        0,    59400, 34852ac9ca5c6bfa51736296784343c7
-0,        233,        233,        0,    59400, b055218509dbed644113642f8f0ac8a8
-0,        266,        266,        0,    59400, 1628866b436f1c4b892474025226e545
-0,        300,        300,        0,    59400, 3fdec760c04e30c90e74afb38dbf757c
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x198
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    59400, d4b3578d800c747bcabaa484a140ffb0
+0,          1,          1,        1,    59400, a40f6f8c384c5dc3d5546d960bb6d9e5
+0,          2,          2,        1,    59400, e270ae8754d9906dd88b1c7d05280801
+0,          3,          3,        1,    59400, bde7fde5012840c5e188f3b29f4f0003
+0,          4,          4,        1,    59400, 8f8510c1130615b64fb8469af66ff678
+0,          5,          5,        1,    59400, 79b9d4e0c64f82a6e9540394222a593d
+0,          6,          6,        1,    59400, 34852ac9ca5c6bfa51736296784343c7
+0,          7,          7,        1,    59400, b055218509dbed644113642f8f0ac8a8
+0,          8,          8,        1,    59400, 1628866b436f1c4b892474025226e545
+0,          9,          9,        1,    59400, 3fdec760c04e30c90e74afb38dbf757c
diff --git a/tests/ref/fate/vp9-03-size-200x200 b/tests/ref/fate/vp9-03-size-200x200
index 6f453701b3..226e31a263 100644
--- a/tests/ref/fate/vp9-03-size-200x200
+++ b/tests/ref/fate/vp9-03-size-200x200
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    60000, b339f4e563afadb25f43b8c05b12dc03
-0,         33,         33,        0,    60000, 3bd5280e7fb42400085b0b1dbba1905e
-0,         66,         66,        0,    60000, acf1c84cabff763fe2073d2c1f183bfc
-0,        100,        100,        0,    60000, eaa4983b6baf907efb11d137644569d2
-0,        133,        133,        0,    60000, 8a1871c8dc38a19dfd4ac571ad7f39be
-0,        166,        166,        0,    60000, 0be539bd51f5f364828dd0abc70360be
-0,        200,        200,        0,    60000, df60622d2c9f294f61d738be9e3bd16c
-0,        233,        233,        0,    60000, 22b3f1d51ddf92c7d2add305ba0ef405
-0,        266,        266,        0,    60000, 01ba29be721e64a5a50526de0797c7d3
-0,        300,        300,        0,    60000, 7b7aa7fa0e58202b3104671375762587
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x200
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    60000, b339f4e563afadb25f43b8c05b12dc03
+0,          1,          1,        1,    60000, 3bd5280e7fb42400085b0b1dbba1905e
+0,          2,          2,        1,    60000, acf1c84cabff763fe2073d2c1f183bfc
+0,          3,          3,        1,    60000, eaa4983b6baf907efb11d137644569d2
+0,          4,          4,        1,    60000, 8a1871c8dc38a19dfd4ac571ad7f39be
+0,          5,          5,        1,    60000, 0be539bd51f5f364828dd0abc70360be
+0,          6,          6,        1,    60000, df60622d2c9f294f61d738be9e3bd16c
+0,          7,          7,        1,    60000, 22b3f1d51ddf92c7d2add305ba0ef405
+0,          8,          8,        1,    60000, 01ba29be721e64a5a50526de0797c7d3
+0,          9,          9,        1,    60000, 7b7aa7fa0e58202b3104671375762587
diff --git a/tests/ref/fate/vp9-03-size-200x202 b/tests/ref/fate/vp9-03-size-200x202
index 3657e80e19..be0ff5fd26 100644
--- a/tests/ref/fate/vp9-03-size-200x202
+++ b/tests/ref/fate/vp9-03-size-200x202
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    60600, c4a13df44e66f06961dd72fc990439e9
-0,         33,         33,        0,    60600, 81c73b8d3806ad96af8f422914a253f8
-0,         66,         66,        0,    60600, 05f77526125e802be9cb306e375ded6e
-0,        100,        100,        0,    60600, ab2e224840ff89abec2c675a23a73094
-0,        133,        133,        0,    60600, c30f58f88819eb57102678b169e15188
-0,        166,        166,        0,    60600, 33e5e2799eb4a9c548c8372fd6769db9
-0,        200,        200,        0,    60600, fa53c1c7e60bd1d00335af542ec69ed7
-0,        233,        233,        0,    60600, 534cafe658af10a314d6d084e55b3620
-0,        266,        266,        0,    60600, 502529e4fbecc8b890abf665fa21f53c
-0,        300,        300,        0,    60600, bf1f73c6e77370bc51a770c8ae87bd12
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x202
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    60600, c4a13df44e66f06961dd72fc990439e9
+0,          1,          1,        1,    60600, 81c73b8d3806ad96af8f422914a253f8
+0,          2,          2,        1,    60600, 05f77526125e802be9cb306e375ded6e
+0,          3,          3,        1,    60600, ab2e224840ff89abec2c675a23a73094
+0,          4,          4,        1,    60600, c30f58f88819eb57102678b169e15188
+0,          5,          5,        1,    60600, 33e5e2799eb4a9c548c8372fd6769db9
+0,          6,          6,        1,    60600, fa53c1c7e60bd1d00335af542ec69ed7
+0,          7,          7,        1,    60600, 534cafe658af10a314d6d084e55b3620
+0,          8,          8,        1,    60600, 502529e4fbecc8b890abf665fa21f53c
+0,          9,          9,        1,    60600, bf1f73c6e77370bc51a770c8ae87bd12
diff --git a/tests/ref/fate/vp9-03-size-200x208 b/tests/ref/fate/vp9-03-size-200x208
index cd47b57d24..3622609ec3 100644
--- a/tests/ref/fate/vp9-03-size-200x208
+++ b/tests/ref/fate/vp9-03-size-200x208
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    62400, 702748bec18c500dd41d93ae74b11d56
-0,         33,         33,        0,    62400, 4fb542190dab2fd673724d47451ff6ee
-0,         66,         66,        0,    62400, dbb4d27d52797dab67e39d32092c9d44
-0,        100,        100,        0,    62400, e4a0ed1572207b7ba433896bba711148
-0,        133,        133,        0,    62400, 28ec32bc165f4f9d455efec8a7aa8737
-0,        166,        166,        0,    62400, a95910575a6423abffb28ca38c384b34
-0,        200,        200,        0,    62400, 791f1c558c5467725f4614a75a8a687e
-0,        233,        233,        0,    62400, cfd3e12f84f7a811966721e890228313
-0,        266,        266,        0,    62400, 824c5fdf938551c28ac1c996645ae52f
-0,        300,        300,        0,    62400, 7465917fdd0206e393968232a0ec5193
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x208
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    62400, 702748bec18c500dd41d93ae74b11d56
+0,          1,          1,        1,    62400, 4fb542190dab2fd673724d47451ff6ee
+0,          2,          2,        1,    62400, dbb4d27d52797dab67e39d32092c9d44
+0,          3,          3,        1,    62400, e4a0ed1572207b7ba433896bba711148
+0,          4,          4,        1,    62400, 28ec32bc165f4f9d455efec8a7aa8737
+0,          5,          5,        1,    62400, a95910575a6423abffb28ca38c384b34
+0,          6,          6,        1,    62400, 791f1c558c5467725f4614a75a8a687e
+0,          7,          7,        1,    62400, cfd3e12f84f7a811966721e890228313
+0,          8,          8,        1,    62400, 824c5fdf938551c28ac1c996645ae52f
+0,          9,          9,        1,    62400, 7465917fdd0206e393968232a0ec5193
diff --git a/tests/ref/fate/vp9-03-size-200x210 b/tests/ref/fate/vp9-03-size-200x210
index 91eaa80f82..c0d172ee8d 100644
--- a/tests/ref/fate/vp9-03-size-200x210
+++ b/tests/ref/fate/vp9-03-size-200x210
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    63000, 31ef44bd12ae702f306c55eba10d2ba7
-0,         33,         33,        0,    63000, 83e9d913f5aa058d79a81047ca45e4a2
-0,         66,         66,        0,    63000, b5e21313b859f1e2c67aaac5fefc9f68
-0,        100,        100,        0,    63000, 959d63c1b219c3479af673a9a8b8d82c
-0,        133,        133,        0,    63000, ffcfaf42b69c7cd92f6e3c21987ff7df
-0,        166,        166,        0,    63000, e9667d3ee4d8179da44de4fbffcb7df2
-0,        200,        200,        0,    63000, 5e2c841bcf4ec6f3a05020d36986fe5b
-0,        233,        233,        0,    63000, 19fe287c30bd4c90b00a9631409568c0
-0,        266,        266,        0,    63000, 58a8843e50b19860a0a91e1e1bb63bfd
-0,        300,        300,        0,    63000, 0ebd31e18597a567f96645acbb2500cf
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x210
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    63000, 31ef44bd12ae702f306c55eba10d2ba7
+0,          1,          1,        1,    63000, 83e9d913f5aa058d79a81047ca45e4a2
+0,          2,          2,        1,    63000, b5e21313b859f1e2c67aaac5fefc9f68
+0,          3,          3,        1,    63000, 959d63c1b219c3479af673a9a8b8d82c
+0,          4,          4,        1,    63000, ffcfaf42b69c7cd92f6e3c21987ff7df
+0,          5,          5,        1,    63000, e9667d3ee4d8179da44de4fbffcb7df2
+0,          6,          6,        1,    63000, 5e2c841bcf4ec6f3a05020d36986fe5b
+0,          7,          7,        1,    63000, 19fe287c30bd4c90b00a9631409568c0
+0,          8,          8,        1,    63000, 58a8843e50b19860a0a91e1e1bb63bfd
+0,          9,          9,        1,    63000, 0ebd31e18597a567f96645acbb2500cf
diff --git a/tests/ref/fate/vp9-03-size-200x224 b/tests/ref/fate/vp9-03-size-200x224
index 14f52f60b1..760c59838e 100644
--- a/tests/ref/fate/vp9-03-size-200x224
+++ b/tests/ref/fate/vp9-03-size-200x224
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    67200, 315d69847bf752a84231a368278eb0b6
-0,         33,         33,        0,    67200, d245738f8627fc345ab38a547bc7d352
-0,         66,         66,        0,    67200, 982681cdca448919c2eead94435772ad
-0,        100,        100,        0,    67200, 7b67b2d96476e17cd407bbccb19fd070
-0,        133,        133,        0,    67200, c38dde73ca097049d1fc689e18a49b5d
-0,        166,        166,        0,    67200, 525f323b81d780c669a03655bb0d0b56
-0,        200,        200,        0,    67200, 5dbeb96f65e383771c1c877ec559044a
-0,        233,        233,        0,    67200, 7d96e976265ef0f9faf173376caaa9e9
-0,        266,        266,        0,    67200, 6047c805a724701b80a133486aae0e65
-0,        300,        300,        0,    67200, eb8895dd994076a52aa3a0c1758ccbb7
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x224
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    67200, 315d69847bf752a84231a368278eb0b6
+0,          1,          1,        1,    67200, d245738f8627fc345ab38a547bc7d352
+0,          2,          2,        1,    67200, 982681cdca448919c2eead94435772ad
+0,          3,          3,        1,    67200, 7b67b2d96476e17cd407bbccb19fd070
+0,          4,          4,        1,    67200, c38dde73ca097049d1fc689e18a49b5d
+0,          5,          5,        1,    67200, 525f323b81d780c669a03655bb0d0b56
+0,          6,          6,        1,    67200, 5dbeb96f65e383771c1c877ec559044a
+0,          7,          7,        1,    67200, 7d96e976265ef0f9faf173376caaa9e9
+0,          8,          8,        1,    67200, 6047c805a724701b80a133486aae0e65
+0,          9,          9,        1,    67200, eb8895dd994076a52aa3a0c1758ccbb7
diff --git a/tests/ref/fate/vp9-03-size-200x226 b/tests/ref/fate/vp9-03-size-200x226
index 97e600c3b7..d4bf47baf3 100644
--- a/tests/ref/fate/vp9-03-size-200x226
+++ b/tests/ref/fate/vp9-03-size-200x226
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    67800, e45b6b9dce4a8509b7d26bc3cfdf7c86
-0,         33,         33,        0,    67800, ddb9d5033ecfa2d6e9a5505dce374bda
-0,         66,         66,        0,    67800, 52c495d3137143e0bce9382fe5506057
-0,        100,        100,        0,    67800, d09f3d6ad084f2966196acd48246f951
-0,        133,        133,        0,    67800, 1556d006d0119a3172b98a500b27f8d0
-0,        166,        166,        0,    67800, 904f86cfbcc3fa683d3d7744a286cd88
-0,        200,        200,        0,    67800, b35907456b8ccab0ae8efc8405b04c89
-0,        233,        233,        0,    67800, b7f2648fe0f873f7e9ea4a6d913e45ec
-0,        266,        266,        0,    67800, 2da76544bc7e295486c335e17047e12e
-0,        300,        300,        0,    67800, 10fd6424caf837d37564ef15f1c6f93d
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x226
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    67800, e45b6b9dce4a8509b7d26bc3cfdf7c86
+0,          1,          1,        1,    67800, ddb9d5033ecfa2d6e9a5505dce374bda
+0,          2,          2,        1,    67800, 52c495d3137143e0bce9382fe5506057
+0,          3,          3,        1,    67800, d09f3d6ad084f2966196acd48246f951
+0,          4,          4,        1,    67800, 1556d006d0119a3172b98a500b27f8d0
+0,          5,          5,        1,    67800, 904f86cfbcc3fa683d3d7744a286cd88
+0,          6,          6,        1,    67800, b35907456b8ccab0ae8efc8405b04c89
+0,          7,          7,        1,    67800, b7f2648fe0f873f7e9ea4a6d913e45ec
+0,          8,          8,        1,    67800, 2da76544bc7e295486c335e17047e12e
+0,          9,          9,        1,    67800, 10fd6424caf837d37564ef15f1c6f93d
diff --git a/tests/ref/fate/vp9-03-size-202x196 b/tests/ref/fate/vp9-03-size-202x196
index c224ef0c71..f40fda9c38 100644
--- a/tests/ref/fate/vp9-03-size-202x196
+++ b/tests/ref/fate/vp9-03-size-202x196
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    59388, 1261466179df96099e598e46c50fa7c1
-0,         33,         33,        0,    59388, cc0fe373cd0399cf0c95edf92d9ab01f
-0,         66,         66,        0,    59388, 7a2dc0afd06ecfcf54321fb759f57601
-0,        100,        100,        0,    59388, db9c138503d27f87449f870ab07cab03
-0,        133,        133,        0,    59388, ddea2e5e2659e97132a537566d5ed989
-0,        166,        166,        0,    59388, c31e90b5eee032526c4e0603332fd160
-0,        200,        200,        0,    59388, 7e5b40f03b905d9ee749d3097a484ea0
-0,        233,        233,        0,    59388, 93e9f7defa94ff03c041448ae1e55cea
-0,        266,        266,        0,    59388, aef8e03f0146699faa16ec28dea49dbe
-0,        300,        300,        0,    59388, a651d949b4c8f0e455c6592dc98385f7
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 202x196
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    59388, 1261466179df96099e598e46c50fa7c1
+0,          1,          1,        1,    59388, cc0fe373cd0399cf0c95edf92d9ab01f
+0,          2,          2,        1,    59388, 7a2dc0afd06ecfcf54321fb759f57601
+0,          3,          3,        1,    59388, db9c138503d27f87449f870ab07cab03
+0,          4,          4,        1,    59388, ddea2e5e2659e97132a537566d5ed989
+0,          5,          5,        1,    59388, c31e90b5eee032526c4e0603332fd160
+0,          6,          6,        1,    59388, 7e5b40f03b905d9ee749d3097a484ea0
+0,          7,          7,        1,    59388, 93e9f7defa94ff03c041448ae1e55cea
+0,          8,          8,        1,    59388, aef8e03f0146699faa16ec28dea49dbe
+0,          9,          9,        1,    59388, a651d949b4c8f0e455c6592dc98385f7
diff --git a/tests/ref/fate/vp9-03-size-202x198 b/tests/ref/fate/vp9-03-size-202x198
index 96a3a1f497..1a7473ceee 100644
--- a/tests/ref/fate/vp9-03-size-202x198
+++ b/tests/ref/fate/vp9-03-size-202x198
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    59994, 181edc4ebeeff7f0527b93b84d5d8efb
-0,         33,         33,        0,    59994, 132c71b634fb67eed51fcdef1775b6b2
-0,         66,         66,        0,    59994, fd41144770765fc893adc5843ebe32e4
-0,        100,        100,        0,    59994, 77dcbaea101142940b6a78a271842829
-0,        133,        133,        0,    59994, 01737c38c1ac711a9744256788211177
-0,        166,        166,        0,    59994, 31cd0b5f621daac309c6f249f4c26cd8
-0,        200,        200,        0,    59994, e06d34e570dc46904fdb9eeb55811464
-0,        233,        233,        0,    59994, 71bf55030373bde1eaeb52d1e97bfa4a
-0,        266,        266,        0,    59994, e96063ff02e8a23a666222b59391de9c
-0,        300,        300,        0,    59994, 5aa0079168ab5069e8a3064f9e2a6d8b
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 202x198
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    59994, 181edc4ebeeff7f0527b93b84d5d8efb
+0,          1,          1,        1,    59994, 132c71b634fb67eed51fcdef1775b6b2
+0,          2,          2,        1,    59994, fd41144770765fc893adc5843ebe32e4
+0,          3,          3,        1,    59994, 77dcbaea101142940b6a78a271842829
+0,          4,          4,        1,    59994, 01737c38c1ac711a9744256788211177
+0,          5,          5,        1,    59994, 31cd0b5f621daac309c6f249f4c26cd8
+0,          6,          6,        1,    59994, e06d34e570dc46904fdb9eeb55811464
+0,          7,          7,        1,    59994, 71bf55030373bde1eaeb52d1e97bfa4a
+0,          8,          8,        1,    59994, e96063ff02e8a23a666222b59391de9c
+0,          9,          9,        1,    59994, 5aa0079168ab5069e8a3064f9e2a6d8b
diff --git a/tests/ref/fate/vp9-03-size-202x200 b/tests/ref/fate/vp9-03-size-202x200
index a8d42a767b..513dbf45f0 100644
--- a/tests/ref/fate/vp9-03-size-202x200
+++ b/tests/ref/fate/vp9-03-size-202x200
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    60600, 20c41d4a1271183dbbc7a44e6b90ea80
-0,         33,         33,        0,    60600, bd8c1fba8d8742f4d98b7d5097c8c828
-0,         66,         66,        0,    60600, 55cbe06a925009c1b1f9b609b60b4c1d
-0,        100,        100,        0,    60600, 78e80c7cf1f142e2dda1bc269b5b3e00
-0,        133,        133,        0,    60600, 42ee8157a4c8af6670b81e9324b251e9
-0,        166,        166,        0,    60600, 022bdf5a2e1ea5f98503cd25b383ae53
-0,        200,        200,        0,    60600, c2073865386a991da01966878ce1ce6d
-0,        233,        233,        0,    60600, 6a5b95cd4eff0836b9180a25f663d36a
-0,        266,        266,        0,    60600, 5e5498c357340d4755dc98eb0669f103
-0,        300,        300,        0,    60600, 0907d5e4020111b1ecfe707df71bcd8a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 202x200
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    60600, 20c41d4a1271183dbbc7a44e6b90ea80
+0,          1,          1,        1,    60600, bd8c1fba8d8742f4d98b7d5097c8c828
+0,          2,          2,        1,    60600, 55cbe06a925009c1b1f9b609b60b4c1d
+0,          3,          3,        1,    60600, 78e80c7cf1f142e2dda1bc269b5b3e00
+0,          4,          4,        1,    60600, 42ee8157a4c8af6670b81e9324b251e9
+0,          5,          5,        1,    60600, 022bdf5a2e1ea5f98503cd25b383ae53
+0,          6,          6,        1,    60600, c2073865386a991da01966878ce1ce6d
+0,          7,          7,        1,    60600, 6a5b95cd4eff0836b9180a25f663d36a
+0,          8,          8,        1,    60600, 5e5498c357340d4755dc98eb0669f103
+0,          9,          9,        1,    60600, 0907d5e4020111b1ecfe707df71bcd8a
diff --git a/tests/ref/fate/vp9-03-size-202x202 b/tests/ref/fate/vp9-03-size-202x202
index 9867cc7cb5..5591e5117c 100644
--- a/tests/ref/fate/vp9-03-size-202x202
+++ b/tests/ref/fate/vp9-03-size-202x202
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    61206, 610cef52d35e9c641f2b8c10489c3d12
-0,         33,         33,        0,    61206, 1f84062e607d4798b0544739fe0da99c
-0,         66,         66,        0,    61206, ea379947b5c52ea3989dfc3f47c729d9
-0,        100,        100,        0,    61206, 1d06b72f06178cbb6bb5d188d22bff43
-0,        133,        133,        0,    61206, 25bd41bd7607f88a01aa0cdc336c9975
-0,        166,        166,        0,    61206, 86836a95a7a9fb1eefb20f7c5a15a9ab
-0,        200,        200,        0,    61206, d8eb3fecce1b646b9877cd4fcca9f9bf
-0,        233,        233,        0,    61206, a057e0b29e4ac9717452cc478c418c12
-0,        266,        266,        0,    61206, 9a3bab91b4f0fff174536b1609c9632c
-0,        300,        300,        0,    61206, d1cd93975f746b6cae490aae31f89e7e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 202x202
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    61206, 610cef52d35e9c641f2b8c10489c3d12
+0,          1,          1,        1,    61206, 1f84062e607d4798b0544739fe0da99c
+0,          2,          2,        1,    61206, ea379947b5c52ea3989dfc3f47c729d9
+0,          3,          3,        1,    61206, 1d06b72f06178cbb6bb5d188d22bff43
+0,          4,          4,        1,    61206, 25bd41bd7607f88a01aa0cdc336c9975
+0,          5,          5,        1,    61206, 86836a95a7a9fb1eefb20f7c5a15a9ab
+0,          6,          6,        1,    61206, d8eb3fecce1b646b9877cd4fcca9f9bf
+0,          7,          7,        1,    61206, a057e0b29e4ac9717452cc478c418c12
+0,          8,          8,        1,    61206, 9a3bab91b4f0fff174536b1609c9632c
+0,          9,          9,        1,    61206, d1cd93975f746b6cae490aae31f89e7e
diff --git a/tests/ref/fate/vp9-03-size-202x208 b/tests/ref/fate/vp9-03-size-202x208
index a2a98f69c9..590926515c 100644
--- a/tests/ref/fate/vp9-03-size-202x208
+++ b/tests/ref/fate/vp9-03-size-202x208
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    63024, d2128e290be81bb0700ebe19e3faed4f
-0,         33,         33,        0,    63024, dccaecb7e4ddb7e4224221a659af2a43
-0,         66,         66,        0,    63024, be8e0966aaf3a9fe9164f63695dc3b62
-0,        100,        100,        0,    63024, da944fadc3a239c2254678cadb4cf7fa
-0,        133,        133,        0,    63024, 3c270f3c02fcbd192b7f896f3f9ee6d9
-0,        166,        166,        0,    63024, 0b3ccda0a87c37e40104ae2f1060e8e9
-0,        200,        200,        0,    63024, 254253aba91758f302e7177e614596be
-0,        233,        233,        0,    63024, b1501a4e372a5249e74aab77e57a28f1
-0,        266,        266,        0,    63024, c4497fea1cefed5cf2b2908620153d26
-0,        300,        300,        0,    63024, 5ba20dfa2400b15b5394f315c5c3707d
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 202x208
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    63024, d2128e290be81bb0700ebe19e3faed4f
+0,          1,          1,        1,    63024, dccaecb7e4ddb7e4224221a659af2a43
+0,          2,          2,        1,    63024, be8e0966aaf3a9fe9164f63695dc3b62
+0,          3,          3,        1,    63024, da944fadc3a239c2254678cadb4cf7fa
+0,          4,          4,        1,    63024, 3c270f3c02fcbd192b7f896f3f9ee6d9
+0,          5,          5,        1,    63024, 0b3ccda0a87c37e40104ae2f1060e8e9
+0,          6,          6,        1,    63024, 254253aba91758f302e7177e614596be
+0,          7,          7,        1,    63024, b1501a4e372a5249e74aab77e57a28f1
+0,          8,          8,        1,    63024, c4497fea1cefed5cf2b2908620153d26
+0,          9,          9,        1,    63024, 5ba20dfa2400b15b5394f315c5c3707d
diff --git a/tests/ref/fate/vp9-03-size-202x210 b/tests/ref/fate/vp9-03-size-202x210
index b9fb7c2a3d..eda5a1f68a 100644
--- a/tests/ref/fate/vp9-03-size-202x210
+++ b/tests/ref/fate/vp9-03-size-202x210
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    63630, e4663a28cabbfdd3815efda2d38debcc
-0,         33,         33,        0,    63630, 3cc7dbec64e9f697f40d740a72c09fc7
-0,         66,         66,        0,    63630, f108981e0ce9c6c501b9ac61d0f1ba44
-0,        100,        100,        0,    63630, 63191c7aceb8ac6b030cc1a4b3cda18c
-0,        133,        133,        0,    63630, b0a527ae3aafe94d13573199c6f4944f
-0,        166,        166,        0,    63630, 1be14b213ebf1d653468b8c16bae03fb
-0,        200,        200,        0,    63630, 44e5a8333a043cd93b9d1cc78e5f188f
-0,        233,        233,        0,    63630, bfd7619f990f20e23b47d0738a6a8449
-0,        266,        266,        0,    63630, 800405f45ca5198014ef8d8521b044fa
-0,        300,        300,        0,    63630, dca4eda872349708f54486433efc8225
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 202x210
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    63630, e4663a28cabbfdd3815efda2d38debcc
+0,          1,          1,        1,    63630, 3cc7dbec64e9f697f40d740a72c09fc7
+0,          2,          2,        1,    63630, f108981e0ce9c6c501b9ac61d0f1ba44
+0,          3,          3,        1,    63630, 63191c7aceb8ac6b030cc1a4b3cda18c
+0,          4,          4,        1,    63630, b0a527ae3aafe94d13573199c6f4944f
+0,          5,          5,        1,    63630, 1be14b213ebf1d653468b8c16bae03fb
+0,          6,          6,        1,    63630, 44e5a8333a043cd93b9d1cc78e5f188f
+0,          7,          7,        1,    63630, bfd7619f990f20e23b47d0738a6a8449
+0,          8,          8,        1,    63630, 800405f45ca5198014ef8d8521b044fa
+0,          9,          9,        1,    63630, dca4eda872349708f54486433efc8225
diff --git a/tests/ref/fate/vp9-03-size-202x224 b/tests/ref/fate/vp9-03-size-202x224
index 9a6b9da06b..1024fe8b89 100644
--- a/tests/ref/fate/vp9-03-size-202x224
+++ b/tests/ref/fate/vp9-03-size-202x224
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    67872, 1d318f05310f6d40646f23c62c7eafe4
-0,         33,         33,        0,    67872, 42870bd73e1a0c5d84b986db3d24f0f0
-0,         66,         66,        0,    67872, afaac676150286143c6fec7992a81467
-0,        100,        100,        0,    67872, 128f84400c272628e802c2369b6bf548
-0,        133,        133,        0,    67872, 9adc24d69f12349d8b17c84f5c111767
-0,        166,        166,        0,    67872, b33d2f7a1955248652701f2ade8ab55d
-0,        200,        200,        0,    67872, b8acc23721097fce6c8835f5fcfaa6ee
-0,        233,        233,        0,    67872, b63bf9a08e4dc5879bbd91efaec95960
-0,        266,        266,        0,    67872, 96e8fe29935266f6bd486b99f917eabc
-0,        300,        300,        0,    67872, 54be14f8dde6857867cd4581f8557044
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 202x224
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    67872, 1d318f05310f6d40646f23c62c7eafe4
+0,          1,          1,        1,    67872, 42870bd73e1a0c5d84b986db3d24f0f0
+0,          2,          2,        1,    67872, afaac676150286143c6fec7992a81467
+0,          3,          3,        1,    67872, 128f84400c272628e802c2369b6bf548
+0,          4,          4,        1,    67872, 9adc24d69f12349d8b17c84f5c111767
+0,          5,          5,        1,    67872, b33d2f7a1955248652701f2ade8ab55d
+0,          6,          6,        1,    67872, b8acc23721097fce6c8835f5fcfaa6ee
+0,          7,          7,        1,    67872, b63bf9a08e4dc5879bbd91efaec95960
+0,          8,          8,        1,    67872, 96e8fe29935266f6bd486b99f917eabc
+0,          9,          9,        1,    67872, 54be14f8dde6857867cd4581f8557044
diff --git a/tests/ref/fate/vp9-03-size-202x226 b/tests/ref/fate/vp9-03-size-202x226
index 38d2e605ed..0572eeaf54 100644
--- a/tests/ref/fate/vp9-03-size-202x226
+++ b/tests/ref/fate/vp9-03-size-202x226
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    68478, 5aa0f439c58c6335cd86d4238a8c4b68
-0,         33,         33,        0,    68478, 3616cc306ec05f89d9b0db63200e4abf
-0,         66,         66,        0,    68478, 424e98f8ec0ebf2a326a917ee0159bbe
-0,        100,        100,        0,    68478, ed5710e412f056fa8c1a277d86dd45d7
-0,        133,        133,        0,    68478, 760b850feab485f0bda6cde9943102bc
-0,        166,        166,        0,    68478, f4bd90ca72aa707f9b68e6192ac230fd
-0,        200,        200,        0,    68478, 58e4aad0bc2a9f3fc279df10208bd6f6
-0,        233,        233,        0,    68478, b42f84723dd167d5c544d539275ad537
-0,        266,        266,        0,    68478, 5f54feca21331646e68797380260932a
-0,        300,        300,        0,    68478, 8e787dd318024aff25af8b4d85040f3c
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 202x226
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    68478, 5aa0f439c58c6335cd86d4238a8c4b68
+0,          1,          1,        1,    68478, 3616cc306ec05f89d9b0db63200e4abf
+0,          2,          2,        1,    68478, 424e98f8ec0ebf2a326a917ee0159bbe
+0,          3,          3,        1,    68478, ed5710e412f056fa8c1a277d86dd45d7
+0,          4,          4,        1,    68478, 760b850feab485f0bda6cde9943102bc
+0,          5,          5,        1,    68478, f4bd90ca72aa707f9b68e6192ac230fd
+0,          6,          6,        1,    68478, 58e4aad0bc2a9f3fc279df10208bd6f6
+0,          7,          7,        1,    68478, b42f84723dd167d5c544d539275ad537
+0,          8,          8,        1,    68478, 5f54feca21331646e68797380260932a
+0,          9,          9,        1,    68478, 8e787dd318024aff25af8b4d85040f3c
diff --git a/tests/ref/fate/vp9-03-size-208x196 b/tests/ref/fate/vp9-03-size-208x196
index a541f14382..377dd24058 100644
--- a/tests/ref/fate/vp9-03-size-208x196
+++ b/tests/ref/fate/vp9-03-size-208x196
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    61152, 6195975181969789e101a83a555d13f7
-0,         33,         33,        0,    61152, 2aca5e3307d68a5e969564a943b8e723
-0,         66,         66,        0,    61152, aee4b00472ee0b6b7a13e31069181db4
-0,        100,        100,        0,    61152, 7808595b650a7c14d8a4800db7c014e0
-0,        133,        133,        0,    61152, 746eb763b176286aa875ae06b81118c4
-0,        166,        166,        0,    61152, 0e8a78ec061319e27d49ca25e333e017
-0,        200,        200,        0,    61152, ac4432db2bb0971d5f70a7dda1210c19
-0,        233,        233,        0,    61152, 78870f4bd767f8ab65d369a5b322735d
-0,        266,        266,        0,    61152, eee9ddd91209348a64259db6a4a3f80c
-0,        300,        300,        0,    61152, c48d21e36a9c0d0d1c64db3f776b3002
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x196
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    61152, 6195975181969789e101a83a555d13f7
+0,          1,          1,        1,    61152, 2aca5e3307d68a5e969564a943b8e723
+0,          2,          2,        1,    61152, aee4b00472ee0b6b7a13e31069181db4
+0,          3,          3,        1,    61152, 7808595b650a7c14d8a4800db7c014e0
+0,          4,          4,        1,    61152, 746eb763b176286aa875ae06b81118c4
+0,          5,          5,        1,    61152, 0e8a78ec061319e27d49ca25e333e017
+0,          6,          6,        1,    61152, ac4432db2bb0971d5f70a7dda1210c19
+0,          7,          7,        1,    61152, 78870f4bd767f8ab65d369a5b322735d
+0,          8,          8,        1,    61152, eee9ddd91209348a64259db6a4a3f80c
+0,          9,          9,        1,    61152, c48d21e36a9c0d0d1c64db3f776b3002
diff --git a/tests/ref/fate/vp9-03-size-208x198 b/tests/ref/fate/vp9-03-size-208x198
index 223668723f..486f8d2387 100644
--- a/tests/ref/fate/vp9-03-size-208x198
+++ b/tests/ref/fate/vp9-03-size-208x198
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    61776, 1f1fa3cdf865d8c75183f4ba6203b675
-0,         33,         33,        0,    61776, ead33ead8fea5bd5d831a79f4c75a590
-0,         66,         66,        0,    61776, 9a406b4464989fd4bb7cbcb1b18aeaa7
-0,        100,        100,        0,    61776, fab3d228e7032f2cdc440dbfcb17c4c1
-0,        133,        133,        0,    61776, f2f3f8b8d9ece21c359c89245157c613
-0,        166,        166,        0,    61776, 321f5a8ecb2cec1780013fe72c237bde
-0,        200,        200,        0,    61776, 6f025b1f4ef61d261f05ca149a9470e6
-0,        233,        233,        0,    61776, 85abcc8d8e6b5f286ed6aa6c588cf416
-0,        266,        266,        0,    61776, b28d710dd44389f774aa02edd6327d5c
-0,        300,        300,        0,    61776, 79374bef9819eecafa7396d70c80be7f
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x198
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    61776, 1f1fa3cdf865d8c75183f4ba6203b675
+0,          1,          1,        1,    61776, ead33ead8fea5bd5d831a79f4c75a590
+0,          2,          2,        1,    61776, 9a406b4464989fd4bb7cbcb1b18aeaa7
+0,          3,          3,        1,    61776, fab3d228e7032f2cdc440dbfcb17c4c1
+0,          4,          4,        1,    61776, f2f3f8b8d9ece21c359c89245157c613
+0,          5,          5,        1,    61776, 321f5a8ecb2cec1780013fe72c237bde
+0,          6,          6,        1,    61776, 6f025b1f4ef61d261f05ca149a9470e6
+0,          7,          7,        1,    61776, 85abcc8d8e6b5f286ed6aa6c588cf416
+0,          8,          8,        1,    61776, b28d710dd44389f774aa02edd6327d5c
+0,          9,          9,        1,    61776, 79374bef9819eecafa7396d70c80be7f
diff --git a/tests/ref/fate/vp9-03-size-208x200 b/tests/ref/fate/vp9-03-size-208x200
index 5f924a3dcf..40d5d47228 100644
--- a/tests/ref/fate/vp9-03-size-208x200
+++ b/tests/ref/fate/vp9-03-size-208x200
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    62400, ff2dda3ddbe8b461d960baba0ad132bf
-0,         33,         33,        0,    62400, d6935ac8f2250316f498e8f01afa04fd
-0,         66,         66,        0,    62400, 57173ebaef7b21698c62fa959cb40ead
-0,        100,        100,        0,    62400, f354c76d7cf45e9f3adfdde0f6b3b5c9
-0,        133,        133,        0,    62400, fbc968ecd214b01509a76996e45dd09a
-0,        166,        166,        0,    62400, 9c314b51a80f2a081adf9b9cc26f5f8a
-0,        200,        200,        0,    62400, f22883a6a5b74ffa4bb16f22d496b5a5
-0,        233,        233,        0,    62400, eb4fa914fc5658d43e32c48a0c39bab3
-0,        266,        266,        0,    62400, d763c0c2f44b68e1e3fe9e165334eb0b
-0,        300,        300,        0,    62400, 344e1075a48cd61e79b0550809b4c91f
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x200
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    62400, ff2dda3ddbe8b461d960baba0ad132bf
+0,          1,          1,        1,    62400, d6935ac8f2250316f498e8f01afa04fd
+0,          2,          2,        1,    62400, 57173ebaef7b21698c62fa959cb40ead
+0,          3,          3,        1,    62400, f354c76d7cf45e9f3adfdde0f6b3b5c9
+0,          4,          4,        1,    62400, fbc968ecd214b01509a76996e45dd09a
+0,          5,          5,        1,    62400, 9c314b51a80f2a081adf9b9cc26f5f8a
+0,          6,          6,        1,    62400, f22883a6a5b74ffa4bb16f22d496b5a5
+0,          7,          7,        1,    62400, eb4fa914fc5658d43e32c48a0c39bab3
+0,          8,          8,        1,    62400, d763c0c2f44b68e1e3fe9e165334eb0b
+0,          9,          9,        1,    62400, 344e1075a48cd61e79b0550809b4c91f
diff --git a/tests/ref/fate/vp9-03-size-208x202 b/tests/ref/fate/vp9-03-size-208x202
index b5373d5cf0..f7c58e2334 100644
--- a/tests/ref/fate/vp9-03-size-208x202
+++ b/tests/ref/fate/vp9-03-size-208x202
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    63024, e5164f87feadf4b65257f578affc3e04
-0,         33,         33,        0,    63024, 6aee5a3b6c3a096dfc1594762b2b248f
-0,         66,         66,        0,    63024, cb1c9dce6fdf7372e0eb2397251f0ade
-0,        100,        100,        0,    63024, 4fe5f24c08690c966b6a14ac3422510b
-0,        133,        133,        0,    63024, b22a273814523251b365f3278d8a3a9c
-0,        166,        166,        0,    63024, 190d9dff373023a25427fc859545ea24
-0,        200,        200,        0,    63024, a6307f38718ed686cb195e3833ab27ab
-0,        233,        233,        0,    63024, 79630bec5a91d69aca42a910413c2800
-0,        266,        266,        0,    63024, 2231cec9c03714b8671e5e1456b148c9
-0,        300,        300,        0,    63024, 278458f6734a24f2eb9bc877a6e9d7df
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x202
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    63024, e5164f87feadf4b65257f578affc3e04
+0,          1,          1,        1,    63024, 6aee5a3b6c3a096dfc1594762b2b248f
+0,          2,          2,        1,    63024, cb1c9dce6fdf7372e0eb2397251f0ade
+0,          3,          3,        1,    63024, 4fe5f24c08690c966b6a14ac3422510b
+0,          4,          4,        1,    63024, b22a273814523251b365f3278d8a3a9c
+0,          5,          5,        1,    63024, 190d9dff373023a25427fc859545ea24
+0,          6,          6,        1,    63024, a6307f38718ed686cb195e3833ab27ab
+0,          7,          7,        1,    63024, 79630bec5a91d69aca42a910413c2800
+0,          8,          8,        1,    63024, 2231cec9c03714b8671e5e1456b148c9
+0,          9,          9,        1,    63024, 278458f6734a24f2eb9bc877a6e9d7df
diff --git a/tests/ref/fate/vp9-03-size-208x208 b/tests/ref/fate/vp9-03-size-208x208
index aa5bc3c961..fa50887fd8 100644
--- a/tests/ref/fate/vp9-03-size-208x208
+++ b/tests/ref/fate/vp9-03-size-208x208
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    64896, 6bff7c1f4c5ef8412ebf669852c70de6
-0,         33,         33,        0,    64896, fdfd7a2308de9509a41fed2880a8f0f5
-0,         66,         66,        0,    64896, d8b464811e9c3b8a6db9cc277ac88c59
-0,        100,        100,        0,    64896, b8fa29e79be3126dd74310d6dd09c747
-0,        133,        133,        0,    64896, dad29803fed686887a0873eb78a469c6
-0,        166,        166,        0,    64896, 684de29bbf800f52aea4af9850bcc5b3
-0,        200,        200,        0,    64896, 06862dbce7571b4487766b179a596e1d
-0,        233,        233,        0,    64896, 99582a966bc7070112e214ce7912e485
-0,        266,        266,        0,    64896, a61158581a5719cb0cf13fb3301cb8c4
-0,        300,        300,        0,    64896, 9c2295332f34fee3a249262c8ba843bc
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x208
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    64896, 6bff7c1f4c5ef8412ebf669852c70de6
+0,          1,          1,        1,    64896, fdfd7a2308de9509a41fed2880a8f0f5
+0,          2,          2,        1,    64896, d8b464811e9c3b8a6db9cc277ac88c59
+0,          3,          3,        1,    64896, b8fa29e79be3126dd74310d6dd09c747
+0,          4,          4,        1,    64896, dad29803fed686887a0873eb78a469c6
+0,          5,          5,        1,    64896, 684de29bbf800f52aea4af9850bcc5b3
+0,          6,          6,        1,    64896, 06862dbce7571b4487766b179a596e1d
+0,          7,          7,        1,    64896, 99582a966bc7070112e214ce7912e485
+0,          8,          8,        1,    64896, a61158581a5719cb0cf13fb3301cb8c4
+0,          9,          9,        1,    64896, 9c2295332f34fee3a249262c8ba843bc
diff --git a/tests/ref/fate/vp9-03-size-208x210 b/tests/ref/fate/vp9-03-size-208x210
index 0477efa13c..92f21657d6 100644
--- a/tests/ref/fate/vp9-03-size-208x210
+++ b/tests/ref/fate/vp9-03-size-208x210
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    65520, b15c7e98ddd137237b062cb51667522f
-0,         33,         33,        0,    65520, 00c594c68b19ef39a79a38e86853dc64
-0,         66,         66,        0,    65520, e6742abe3d2c178af4298e121391c299
-0,        100,        100,        0,    65520, efe5387b38c32f1c25c0fc9836921074
-0,        133,        133,        0,    65520, e0e696f4c18af09a74e052903db1468c
-0,        166,        166,        0,    65520, f1960270c6704ca47caed63161716025
-0,        200,        200,        0,    65520, a1542d7749cfa447481acd7835db838a
-0,        233,        233,        0,    65520, a91fb10a17d1d056667860cc43c81dae
-0,        266,        266,        0,    65520, b673bfbb722522b4e7b5e9c5b85cc31f
-0,        300,        300,        0,    65520, 8b4bb57d3cf609cbf9564a96a6ca6ade
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x210
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    65520, b15c7e98ddd137237b062cb51667522f
+0,          1,          1,        1,    65520, 00c594c68b19ef39a79a38e86853dc64
+0,          2,          2,        1,    65520, e6742abe3d2c178af4298e121391c299
+0,          3,          3,        1,    65520, efe5387b38c32f1c25c0fc9836921074
+0,          4,          4,        1,    65520, e0e696f4c18af09a74e052903db1468c
+0,          5,          5,        1,    65520, f1960270c6704ca47caed63161716025
+0,          6,          6,        1,    65520, a1542d7749cfa447481acd7835db838a
+0,          7,          7,        1,    65520, a91fb10a17d1d056667860cc43c81dae
+0,          8,          8,        1,    65520, b673bfbb722522b4e7b5e9c5b85cc31f
+0,          9,          9,        1,    65520, 8b4bb57d3cf609cbf9564a96a6ca6ade
diff --git a/tests/ref/fate/vp9-03-size-208x224 b/tests/ref/fate/vp9-03-size-208x224
index 18ed456564..0d17a9ace3 100644
--- a/tests/ref/fate/vp9-03-size-208x224
+++ b/tests/ref/fate/vp9-03-size-208x224
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    69888, 479d07bb96905ad7d5f0ec3ee12b41ba
-0,         33,         33,        0,    69888, 4b6555aaed8e5a45879773f1bf87962e
-0,         66,         66,        0,    69888, c5f42cb796dd7b6622957016ca6b502f
-0,        100,        100,        0,    69888, f06c954483560866fbff10bae7ba0785
-0,        133,        133,        0,    69888, af83aff39999852310395fe241ccb49b
-0,        166,        166,        0,    69888, 108377d6f30ceba6f2377330af2da38f
-0,        200,        200,        0,    69888, e81e6e0b37a7b92368ede9cab124567c
-0,        233,        233,        0,    69888, 59dbe51caaed8e6e825c78c5901fb22c
-0,        266,        266,        0,    69888, 24686123ea14c8d1a9b447733df0aaab
-0,        300,        300,        0,    69888, ce2035c49237c8076f8dac0d3f61848e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x224
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    69888, 479d07bb96905ad7d5f0ec3ee12b41ba
+0,          1,          1,        1,    69888, 4b6555aaed8e5a45879773f1bf87962e
+0,          2,          2,        1,    69888, c5f42cb796dd7b6622957016ca6b502f
+0,          3,          3,        1,    69888, f06c954483560866fbff10bae7ba0785
+0,          4,          4,        1,    69888, af83aff39999852310395fe241ccb49b
+0,          5,          5,        1,    69888, 108377d6f30ceba6f2377330af2da38f
+0,          6,          6,        1,    69888, e81e6e0b37a7b92368ede9cab124567c
+0,          7,          7,        1,    69888, 59dbe51caaed8e6e825c78c5901fb22c
+0,          8,          8,        1,    69888, 24686123ea14c8d1a9b447733df0aaab
+0,          9,          9,        1,    69888, ce2035c49237c8076f8dac0d3f61848e
diff --git a/tests/ref/fate/vp9-03-size-208x226 b/tests/ref/fate/vp9-03-size-208x226
index a7a19813ae..1e9c2848e3 100644
--- a/tests/ref/fate/vp9-03-size-208x226
+++ b/tests/ref/fate/vp9-03-size-208x226
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    70512, 33aa4af6153570518c59960a0c959053
-0,         33,         33,        0,    70512, 024fa27dee80ad199528052aaa8d42c7
-0,         66,         66,        0,    70512, b949ef118c7e7e62a8b88e2308219ef9
-0,        100,        100,        0,    70512, 3061ee13696ced5e10a646fdd5ca6c34
-0,        133,        133,        0,    70512, c4984bd53dcb7b9e2570f2965d077b2f
-0,        166,        166,        0,    70512, d564c35c5caadcfd9f80377fa414af72
-0,        200,        200,        0,    70512, 9b7d7b10ee2f3eb7a9ffddcebff45b97
-0,        233,        233,        0,    70512, a0ede7085b04cbb3519d56b2e4347d14
-0,        266,        266,        0,    70512, 63d7af745f9e6a34b618db28fe878ffd
-0,        300,        300,        0,    70512, 85077809087e7bdfb9215bfcd1f1bbc0
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 208x226
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    70512, 33aa4af6153570518c59960a0c959053
+0,          1,          1,        1,    70512, 024fa27dee80ad199528052aaa8d42c7
+0,          2,          2,        1,    70512, b949ef118c7e7e62a8b88e2308219ef9
+0,          3,          3,        1,    70512, 3061ee13696ced5e10a646fdd5ca6c34
+0,          4,          4,        1,    70512, c4984bd53dcb7b9e2570f2965d077b2f
+0,          5,          5,        1,    70512, d564c35c5caadcfd9f80377fa414af72
+0,          6,          6,        1,    70512, 9b7d7b10ee2f3eb7a9ffddcebff45b97
+0,          7,          7,        1,    70512, a0ede7085b04cbb3519d56b2e4347d14
+0,          8,          8,        1,    70512, 63d7af745f9e6a34b618db28fe878ffd
+0,          9,          9,        1,    70512, 85077809087e7bdfb9215bfcd1f1bbc0
diff --git a/tests/ref/fate/vp9-03-size-210x196 b/tests/ref/fate/vp9-03-size-210x196
index 0db3b0021f..28db1dbb98 100644
--- a/tests/ref/fate/vp9-03-size-210x196
+++ b/tests/ref/fate/vp9-03-size-210x196
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    61740, 5c69f80da667bfd20394995e93e4cd2b
-0,         33,         33,        0,    61740, 13363cd8e52ca8c1053db1c84c111bc9
-0,         66,         66,        0,    61740, 108976afdf99f59276d6f89879e3bdc3
-0,        100,        100,        0,    61740, 770ce25985e6b479d52a9185876cfe83
-0,        133,        133,        0,    61740, eba7cbb3c91989aa4c13487ed01675b5
-0,        166,        166,        0,    61740, f391c30a47c33a250dd20cb12f0a6e01
-0,        200,        200,        0,    61740, c38e12de302177d19dd744a3ea227e90
-0,        233,        233,        0,    61740, 8c9370439a0b7289919c6ee68e00570f
-0,        266,        266,        0,    61740, ac3748c4b99c4f1aba7430ae12c19cfd
-0,        300,        300,        0,    61740, e5228dc84f7933ccc9306907d737ad3c
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 210x196
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    61740, 5c69f80da667bfd20394995e93e4cd2b
+0,          1,          1,        1,    61740, 13363cd8e52ca8c1053db1c84c111bc9
+0,          2,          2,        1,    61740, 108976afdf99f59276d6f89879e3bdc3
+0,          3,          3,        1,    61740, 770ce25985e6b479d52a9185876cfe83
+0,          4,          4,        1,    61740, eba7cbb3c91989aa4c13487ed01675b5
+0,          5,          5,        1,    61740, f391c30a47c33a250dd20cb12f0a6e01
+0,          6,          6,        1,    61740, c38e12de302177d19dd744a3ea227e90
+0,          7,          7,        1,    61740, 8c9370439a0b7289919c6ee68e00570f
+0,          8,          8,        1,    61740, ac3748c4b99c4f1aba7430ae12c19cfd
+0,          9,          9,        1,    61740, e5228dc84f7933ccc9306907d737ad3c
diff --git a/tests/ref/fate/vp9-03-size-210x198 b/tests/ref/fate/vp9-03-size-210x198
index 3949dbd9a0..b676c752f5 100644
--- a/tests/ref/fate/vp9-03-size-210x198
+++ b/tests/ref/fate/vp9-03-size-210x198
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    62370, d83ee2413e701ae405a2b74863d4c5a9
-0,         33,         33,        0,    62370, f2ebc0f7dc171e0e5d2911c7ee2df5e1
-0,         66,         66,        0,    62370, e189ef4d8add227352a0d6ee62748ee7
-0,        100,        100,        0,    62370, 6dcb1dca1a0e2ba85034aba9f021427e
-0,        133,        133,        0,    62370, e98c633ba8912f6d65374055ec9af543
-0,        166,        166,        0,    62370, 82111cb7d5addce16d9bcba9e0a99503
-0,        200,        200,        0,    62370, bbbc73002f794ab0261fe384b2524226
-0,        233,        233,        0,    62370, 0bcdc427df47123959f7de9c44fe291e
-0,        266,        266,        0,    62370, 505776b3d82e38612393d60b6aa55c1d
-0,        300,        300,        0,    62370, feb93758242b847f3d53bb4c97b0ad9c
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 210x198
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    62370, d83ee2413e701ae405a2b74863d4c5a9
+0,          1,          1,        1,    62370, f2ebc0f7dc171e0e5d2911c7ee2df5e1
+0,          2,          2,        1,    62370, e189ef4d8add227352a0d6ee62748ee7
+0,          3,          3,        1,    62370, 6dcb1dca1a0e2ba85034aba9f021427e
+0,          4,          4,        1,    62370, e98c633ba8912f6d65374055ec9af543
+0,          5,          5,        1,    62370, 82111cb7d5addce16d9bcba9e0a99503
+0,          6,          6,        1,    62370, bbbc73002f794ab0261fe384b2524226
+0,          7,          7,        1,    62370, 0bcdc427df47123959f7de9c44fe291e
+0,          8,          8,        1,    62370, 505776b3d82e38612393d60b6aa55c1d
+0,          9,          9,        1,    62370, feb93758242b847f3d53bb4c97b0ad9c
diff --git a/tests/ref/fate/vp9-03-size-210x200 b/tests/ref/fate/vp9-03-size-210x200
index 9c4245c0a1..01f1093bf0 100644
--- a/tests/ref/fate/vp9-03-size-210x200
+++ b/tests/ref/fate/vp9-03-size-210x200
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    63000, 2465560246c1ee24d937cb9cbc1422f1
-0,         33,         33,        0,    63000, 8926b628dcdf2182516822c7d0d778ec
-0,         66,         66,        0,    63000, 9bd14d3ebc7fe81c4223116de1b9c2ec
-0,        100,        100,        0,    63000, 2d029d8461c20236066c0786950540fb
-0,        133,        133,        0,    63000, 39412b6e62de43bd40c58d4e2e38daf8
-0,        166,        166,        0,    63000, 3ea211c24f606b29582147bf872994dd
-0,        200,        200,        0,    63000, 261c37f88bf7f40549642578d9464aeb
-0,        233,        233,        0,    63000, 98551d44de1e23165e05975babb72446
-0,        266,        266,        0,    63000, 1d85ad052dd27e7e6bfea5d2babf5176
-0,        300,        300,        0,    63000, ad18b6a3698a3674c2488f927810eb0d
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 210x200
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    63000, 2465560246c1ee24d937cb9cbc1422f1
+0,          1,          1,        1,    63000, 8926b628dcdf2182516822c7d0d778ec
+0,          2,          2,        1,    63000, 9bd14d3ebc7fe81c4223116de1b9c2ec
+0,          3,          3,        1,    63000, 2d029d8461c20236066c0786950540fb
+0,          4,          4,        1,    63000, 39412b6e62de43bd40c58d4e2e38daf8
+0,          5,          5,        1,    63000, 3ea211c24f606b29582147bf872994dd
+0,          6,          6,        1,    63000, 261c37f88bf7f40549642578d9464aeb
+0,          7,          7,        1,    63000, 98551d44de1e23165e05975babb72446
+0,          8,          8,        1,    63000, 1d85ad052dd27e7e6bfea5d2babf5176
+0,          9,          9,        1,    63000, ad18b6a3698a3674c2488f927810eb0d
diff --git a/tests/ref/fate/vp9-03-size-210x202 b/tests/ref/fate/vp9-03-size-210x202
index 253bb1dfbe..42924c5903 100644
--- a/tests/ref/fate/vp9-03-size-210x202
+++ b/tests/ref/fate/vp9-03-size-210x202
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    63630, 5d01848aee2b324f2e356627f9c39532
-0,         33,         33,        0,    63630, b671fe34bc0e5a682baff929d26ea627
-0,         66,         66,        0,    63630, e9a40f87ca5aaa5af9772e286feb9063
-0,        100,        100,        0,    63630, 4730f60d4c856e8ad877c0d8b1729ec4
-0,        133,        133,        0,    63630, 317fc01349e0984c23d15f97a3a0f442
-0,        166,        166,        0,    63630, aea89116ffe48340d1752d1ad5195529
-0,        200,        200,        0,    63630, 14694ba65b6308e5f5571486b62ca1cc
-0,        233,        233,        0,    63630, 53c6102d877c9a30eaa20ddc45207ea0
-0,        266,        266,        0,    63630, 7d1e898b1bead878224e8ff15d624bd9
-0,        300,        300,        0,    63630, 37b684bfae5dbd33e8dbb8332b94ce8a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 210x202
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    63630, 5d01848aee2b324f2e356627f9c39532
+0,          1,          1,        1,    63630, b671fe34bc0e5a682baff929d26ea627
+0,          2,          2,        1,    63630, e9a40f87ca5aaa5af9772e286feb9063
+0,          3,          3,        1,    63630, 4730f60d4c856e8ad877c0d8b1729ec4
+0,          4,          4,        1,    63630, 317fc01349e0984c23d15f97a3a0f442
+0,          5,          5,        1,    63630, aea89116ffe48340d1752d1ad5195529
+0,          6,          6,        1,    63630, 14694ba65b6308e5f5571486b62ca1cc
+0,          7,          7,        1,    63630, 53c6102d877c9a30eaa20ddc45207ea0
+0,          8,          8,        1,    63630, 7d1e898b1bead878224e8ff15d624bd9
+0,          9,          9,        1,    63630, 37b684bfae5dbd33e8dbb8332b94ce8a
diff --git a/tests/ref/fate/vp9-03-size-210x208 b/tests/ref/fate/vp9-03-size-210x208
index 39752a9a71..0d271b2c3a 100644
--- a/tests/ref/fate/vp9-03-size-210x208
+++ b/tests/ref/fate/vp9-03-size-210x208
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    65520, 1156d318c00d299cf5bdc7e485966dab
-0,         33,         33,        0,    65520, a8094f8f1e7e04e54251bee8c4c800ce
-0,         66,         66,        0,    65520, e2a07d99ffe1cfe6b9fce36e93677fe1
-0,        100,        100,        0,    65520, 63d179b00816dbad75b778d2c23955c6
-0,        133,        133,        0,    65520, 407de5fb2dfdd52e6173905b09ff22f2
-0,        166,        166,        0,    65520, 36900199c56310e651723de4e3ad2f2c
-0,        200,        200,        0,    65520, 908db56e975b5db07af17fdc51b12be8
-0,        233,        233,        0,    65520, 400e32490b1262009a481cc331a00e44
-0,        266,        266,        0,    65520, dc43b786cba033cc92b9921d12f7b3d7
-0,        300,        300,        0,    65520, e8c94c5965c729f5d1ef3ba4509c97c8
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 210x208
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    65520, 1156d318c00d299cf5bdc7e485966dab
+0,          1,          1,        1,    65520, a8094f8f1e7e04e54251bee8c4c800ce
+0,          2,          2,        1,    65520, e2a07d99ffe1cfe6b9fce36e93677fe1
+0,          3,          3,        1,    65520, 63d179b00816dbad75b778d2c23955c6
+0,          4,          4,        1,    65520, 407de5fb2dfdd52e6173905b09ff22f2
+0,          5,          5,        1,    65520, 36900199c56310e651723de4e3ad2f2c
+0,          6,          6,        1,    65520, 908db56e975b5db07af17fdc51b12be8
+0,          7,          7,        1,    65520, 400e32490b1262009a481cc331a00e44
+0,          8,          8,        1,    65520, dc43b786cba033cc92b9921d12f7b3d7
+0,          9,          9,        1,    65520, e8c94c5965c729f5d1ef3ba4509c97c8
diff --git a/tests/ref/fate/vp9-03-size-210x210 b/tests/ref/fate/vp9-03-size-210x210
index efbc81c233..bac0e9c6ab 100644
--- a/tests/ref/fate/vp9-03-size-210x210
+++ b/tests/ref/fate/vp9-03-size-210x210
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    66150, b65725c68978bdaaafdf735dfbafa9e3
-0,         33,         33,        0,    66150, 35be2f16bd5dedc9d3f7a016f0d71701
-0,         66,         66,        0,    66150, 8c2873a97b51510d7449869e24a348f5
-0,        100,        100,        0,    66150, 724a30e8ae539e797db8889dc08aec5e
-0,        133,        133,        0,    66150, e3ae1246a63ea22afd026bfb859fe165
-0,        166,        166,        0,    66150, 7e1fa363cf3f44c7a3019f29c14a6da4
-0,        200,        200,        0,    66150, c6f26619ab5687a2a698c8766b79f2eb
-0,        233,        233,        0,    66150, be5b8c50a772afe95d72bf3cc7c4fd2f
-0,        266,        266,        0,    66150, 9eab1417ac249ce31c79750143d52084
-0,        300,        300,        0,    66150, 9d2455048dbc3cdc2343a818c5a2bcb1
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 210x210
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    66150, b65725c68978bdaaafdf735dfbafa9e3
+0,          1,          1,        1,    66150, 35be2f16bd5dedc9d3f7a016f0d71701
+0,          2,          2,        1,    66150, 8c2873a97b51510d7449869e24a348f5
+0,          3,          3,        1,    66150, 724a30e8ae539e797db8889dc08aec5e
+0,          4,          4,        1,    66150, e3ae1246a63ea22afd026bfb859fe165
+0,          5,          5,        1,    66150, 7e1fa363cf3f44c7a3019f29c14a6da4
+0,          6,          6,        1,    66150, c6f26619ab5687a2a698c8766b79f2eb
+0,          7,          7,        1,    66150, be5b8c50a772afe95d72bf3cc7c4fd2f
+0,          8,          8,        1,    66150, 9eab1417ac249ce31c79750143d52084
+0,          9,          9,        1,    66150, 9d2455048dbc3cdc2343a818c5a2bcb1
diff --git a/tests/ref/fate/vp9-03-size-210x224 b/tests/ref/fate/vp9-03-size-210x224
index cfa37581a8..17ebe8ad21 100644
--- a/tests/ref/fate/vp9-03-size-210x224
+++ b/tests/ref/fate/vp9-03-size-210x224
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    70560, bb903b926c4b34ae336e21d65ad8fd25
-0,         33,         33,        0,    70560, c4c0bc3b112487e994d22176817ace3c
-0,         66,         66,        0,    70560, 24e699f7a92ab1b0fe12e0b747470b5b
-0,        100,        100,        0,    70560, 200f403694d3acfda63f52e8373f1420
-0,        133,        133,        0,    70560, 6df417a8ec1810562301c89724b739d1
-0,        166,        166,        0,    70560, 55757b633d8fe669fc0f507dab4fa9f7
-0,        200,        200,        0,    70560, 45bc82bee02cb45422be3ac1019896d0
-0,        233,        233,        0,    70560, 4aaf5d07d2796910767d5084556c9cf9
-0,        266,        266,        0,    70560, f100fa26da47250b98d95a18915f521d
-0,        300,        300,        0,    70560, f5a8def53b4638b6ce7c8588d595d0ad
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 210x224
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    70560, bb903b926c4b34ae336e21d65ad8fd25
+0,          1,          1,        1,    70560, c4c0bc3b112487e994d22176817ace3c
+0,          2,          2,        1,    70560, 24e699f7a92ab1b0fe12e0b747470b5b
+0,          3,          3,        1,    70560, 200f403694d3acfda63f52e8373f1420
+0,          4,          4,        1,    70560, 6df417a8ec1810562301c89724b739d1
+0,          5,          5,        1,    70560, 55757b633d8fe669fc0f507dab4fa9f7
+0,          6,          6,        1,    70560, 45bc82bee02cb45422be3ac1019896d0
+0,          7,          7,        1,    70560, 4aaf5d07d2796910767d5084556c9cf9
+0,          8,          8,        1,    70560, f100fa26da47250b98d95a18915f521d
+0,          9,          9,        1,    70560, f5a8def53b4638b6ce7c8588d595d0ad
diff --git a/tests/ref/fate/vp9-03-size-210x226 b/tests/ref/fate/vp9-03-size-210x226
index 046f7335bb..cfadeae5e0 100644
--- a/tests/ref/fate/vp9-03-size-210x226
+++ b/tests/ref/fate/vp9-03-size-210x226
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    71190, 03707b2f5c392933f7336f380423a0a1
-0,         33,         33,        0,    71190, b388553c79573555a3b660f5e36d4e36
-0,         66,         66,        0,    71190, a1a7fd8ba7fb0fe7733cdf5440c7c1f3
-0,        100,        100,        0,    71190, 9daff7ef71dd54951f0b75a902065259
-0,        133,        133,        0,    71190, 60218a4b8bc0a5b0b40fa560a40fb4c0
-0,        166,        166,        0,    71190, 21229bfed833468fafc27ce93db1450c
-0,        200,        200,        0,    71190, 7aa290c6e503315d7aa3517258d5f63a
-0,        233,        233,        0,    71190, 63fd08ae2e859ff3d874ab2c2ce41a42
-0,        266,        266,        0,    71190, 725b371247fae28ef4b912368738df64
-0,        300,        300,        0,    71190, 7cf2d8d9e464307311b499ff0c3ea05e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 210x226
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    71190, 03707b2f5c392933f7336f380423a0a1
+0,          1,          1,        1,    71190, b388553c79573555a3b660f5e36d4e36
+0,          2,          2,        1,    71190, a1a7fd8ba7fb0fe7733cdf5440c7c1f3
+0,          3,          3,        1,    71190, 9daff7ef71dd54951f0b75a902065259
+0,          4,          4,        1,    71190, 60218a4b8bc0a5b0b40fa560a40fb4c0
+0,          5,          5,        1,    71190, 21229bfed833468fafc27ce93db1450c
+0,          6,          6,        1,    71190, 7aa290c6e503315d7aa3517258d5f63a
+0,          7,          7,        1,    71190, 63fd08ae2e859ff3d874ab2c2ce41a42
+0,          8,          8,        1,    71190, 725b371247fae28ef4b912368738df64
+0,          9,          9,        1,    71190, 7cf2d8d9e464307311b499ff0c3ea05e
diff --git a/tests/ref/fate/vp9-03-size-224x196 b/tests/ref/fate/vp9-03-size-224x196
index b94c04d311..d8a25181be 100644
--- a/tests/ref/fate/vp9-03-size-224x196
+++ b/tests/ref/fate/vp9-03-size-224x196
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    65856, 3ffc096f1b42b4d319d4a9efbefc7625
-0,         33,         33,        0,    65856, 78b3655d5cad30fa6b2c2d8fd29463de
-0,         66,         66,        0,    65856, ab197553d9599b2a03aff62d1d694848
-0,        100,        100,        0,    65856, be368d1f3d3fcc710565b5433940f0df
-0,        133,        133,        0,    65856, 374c5db60ea9c110b871bb45be0efff1
-0,        166,        166,        0,    65856, ec50085400d626de5833bc0a94d9941f
-0,        200,        200,        0,    65856, d4ae69937e2a8d9bf2023d4215749635
-0,        233,        233,        0,    65856, 9b0b81eb6d62b8014e0639932fe35bc0
-0,        266,        266,        0,    65856, cd02d0cc268e6b6df0b2dbd3f3b137e6
-0,        300,        300,        0,    65856, 5322ba1085c114f93534e1761a0d8aa1
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 224x196
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    65856, 3ffc096f1b42b4d319d4a9efbefc7625
+0,          1,          1,        1,    65856, 78b3655d5cad30fa6b2c2d8fd29463de
+0,          2,          2,        1,    65856, ab197553d9599b2a03aff62d1d694848
+0,          3,          3,        1,    65856, be368d1f3d3fcc710565b5433940f0df
+0,          4,          4,        1,    65856, 374c5db60ea9c110b871bb45be0efff1
+0,          5,          5,        1,    65856, ec50085400d626de5833bc0a94d9941f
+0,          6,          6,        1,    65856, d4ae69937e2a8d9bf2023d4215749635
+0,          7,          7,        1,    65856, 9b0b81eb6d62b8014e0639932fe35bc0
+0,          8,          8,        1,    65856, cd02d0cc268e6b6df0b2dbd3f3b137e6
+0,          9,          9,        1,    65856, 5322ba1085c114f93534e1761a0d8aa1
diff --git a/tests/ref/fate/vp9-03-size-224x198 b/tests/ref/fate/vp9-03-size-224x198
index dfcc091dae..f132875368 100644
--- a/tests/ref/fate/vp9-03-size-224x198
+++ b/tests/ref/fate/vp9-03-size-224x198
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    66528, cf35dffc80946e87bb9d3e18aab9d320
-0,         33,         33,        0,    66528, a76ac92f05e9b097f8ac5882e1ffe656
-0,         66,         66,        0,    66528, faa1e8a11c9df3e9c9a9dafbebea6d04
-0,        100,        100,        0,    66528, 905a28289c8ac793b335096ca7f84e1d
-0,        133,        133,        0,    66528, cb480fa6977baf98a74bddf213ecba82
-0,        166,        166,        0,    66528, 35224d3708e3ba1dafcc58b803d5ea77
-0,        200,        200,        0,    66528, d166d764e87854bca47ab7a2bc8b1f9b
-0,        233,        233,        0,    66528, 562f1e06ae36abba5f1fb53e3d6cd7e8
-0,        266,        266,        0,    66528, 1599cebef060f6464aeef15aacbde446
-0,        300,        300,        0,    66528, 3316ebca2864a9dc04db86069efb1dd1
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 224x198
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    66528, cf35dffc80946e87bb9d3e18aab9d320
+0,          1,          1,        1,    66528, a76ac92f05e9b097f8ac5882e1ffe656
+0,          2,          2,        1,    66528, faa1e8a11c9df3e9c9a9dafbebea6d04
+0,          3,          3,        1,    66528, 905a28289c8ac793b335096ca7f84e1d
+0,          4,          4,        1,    66528, cb480fa6977baf98a74bddf213ecba82
+0,          5,          5,        1,    66528, 35224d3708e3ba1dafcc58b803d5ea77
+0,          6,          6,        1,    66528, d166d764e87854bca47ab7a2bc8b1f9b
+0,          7,          7,        1,    66528, 562f1e06ae36abba5f1fb53e3d6cd7e8
+0,          8,          8,        1,    66528, 1599cebef060f6464aeef15aacbde446
+0,          9,          9,        1,    66528, 3316ebca2864a9dc04db86069efb1dd1
diff --git a/tests/ref/fate/vp9-03-size-224x200 b/tests/ref/fate/vp9-03-size-224x200
index f7cf72cf69..a38d414c9d 100644
--- a/tests/ref/fate/vp9-03-size-224x200
+++ b/tests/ref/fate/vp9-03-size-224x200
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    67200, 0819e6d715c9b4d94f05f63a7ca86199
-0,         33,         33,        0,    67200, 9b9a4b01ed4c8a93687e45245b3092a3
-0,         66,         66,        0,    67200, 3a076f5b8dba60552e84a391ee04d1c7
-0,        100,        100,        0,    67200, 7aafc561f5b96e9d286bd8deb5687774
-0,        133,        133,        0,    67200, daa43a89ab6b2761eedaa183e33a3465
-0,        166,        166,        0,    67200, c14874409872357b11b65f35a283e058
-0,        200,        200,        0,    67200, 37d2ef52a9c694b2596d58ed9ca0d90b
-0,        233,        233,        0,    67200, c97bc860c006896d80f52ccc0759f472
-0,        266,        266,        0,    67200, 5f8618114a723a017e39a1af695996f3
-0,        300,        300,        0,    67200, ee8234fc5ccd41d05eb87e1510f9795e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 224x200
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    67200, 0819e6d715c9b4d94f05f63a7ca86199
+0,          1,          1,        1,    67200, 9b9a4b01ed4c8a93687e45245b3092a3
+0,          2,          2,        1,    67200, 3a076f5b8dba60552e84a391ee04d1c7
+0,          3,          3,        1,    67200, 7aafc561f5b96e9d286bd8deb5687774
+0,          4,          4,        1,    67200, daa43a89ab6b2761eedaa183e33a3465
+0,          5,          5,        1,    67200, c14874409872357b11b65f35a283e058
+0,          6,          6,        1,    67200, 37d2ef52a9c694b2596d58ed9ca0d90b
+0,          7,          7,        1,    67200, c97bc860c006896d80f52ccc0759f472
+0,          8,          8,        1,    67200, 5f8618114a723a017e39a1af695996f3
+0,          9,          9,        1,    67200, ee8234fc5ccd41d05eb87e1510f9795e
diff --git a/tests/ref/fate/vp9-03-size-224x202 b/tests/ref/fate/vp9-03-size-224x202
index e9573443fe..ddf076e027 100644
--- a/tests/ref/fate/vp9-03-size-224x202
+++ b/tests/ref/fate/vp9-03-size-224x202
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    67872, e1e3b4af5910383ff6f66b6ab1a29544
-0,         33,         33,        0,    67872, 8668ef92b72f35728ebb456665d48b95
-0,         66,         66,        0,    67872, dffc7c28f86f07bf28451292990e9594
-0,        100,        100,        0,    67872, aebfb446fa6d48db36dbd9b5cd147f1e
-0,        133,        133,        0,    67872, e3c6cb8c5bb3a26928493bfc297ab827
-0,        166,        166,        0,    67872, 68dabae76c1d27ab0e1079d99cb6d413
-0,        200,        200,        0,    67872, d1f7745eef748688f3871d00a7e67ef8
-0,        233,        233,        0,    67872, 36738851cc2af83fd250dea4cd63941b
-0,        266,        266,        0,    67872, 16c0315c43427e7e6719806a89551703
-0,        300,        300,        0,    67872, c4d589c0ea4cdfc1dd6dff72084c61fd
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 224x202
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    67872, e1e3b4af5910383ff6f66b6ab1a29544
+0,          1,          1,        1,    67872, 8668ef92b72f35728ebb456665d48b95
+0,          2,          2,        1,    67872, dffc7c28f86f07bf28451292990e9594
+0,          3,          3,        1,    67872, aebfb446fa6d48db36dbd9b5cd147f1e
+0,          4,          4,        1,    67872, e3c6cb8c5bb3a26928493bfc297ab827
+0,          5,          5,        1,    67872, 68dabae76c1d27ab0e1079d99cb6d413
+0,          6,          6,        1,    67872, d1f7745eef748688f3871d00a7e67ef8
+0,          7,          7,        1,    67872, 36738851cc2af83fd250dea4cd63941b
+0,          8,          8,        1,    67872, 16c0315c43427e7e6719806a89551703
+0,          9,          9,        1,    67872, c4d589c0ea4cdfc1dd6dff72084c61fd
diff --git a/tests/ref/fate/vp9-03-size-224x208 b/tests/ref/fate/vp9-03-size-224x208
index b2efc6552a..58d8617d98 100644
--- a/tests/ref/fate/vp9-03-size-224x208
+++ b/tests/ref/fate/vp9-03-size-224x208
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    69888, 85f08afadfd1204d4131b9ee9c8cc10b
-0,         33,         33,        0,    69888, f893de5432a082b3dffcf7499827f548
-0,         66,         66,        0,    69888, cb81e0d7b657bc5a4a9cf8ad75a76a77
-0,        100,        100,        0,    69888, 8a40842123965731c15fc23fb6366d1d
-0,        133,        133,        0,    69888, 09c6d92af14a3fcfb12705cd5da57f2a
-0,        166,        166,        0,    69888, 6bede4dc8770df534b599021b0425309
-0,        200,        200,        0,    69888, 334b0b0448e9e4e6a0cddcd2e3a0af3f
-0,        233,        233,        0,    69888, 09f491f0f3870ef96cff0384cd7183d1
-0,        266,        266,        0,    69888, c9e5f81186ac947a77b051c8f0e76eac
-0,        300,        300,        0,    69888, 917565c3327bff78b53a78ea739472ff
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 224x208
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    69888, 85f08afadfd1204d4131b9ee9c8cc10b
+0,          1,          1,        1,    69888, f893de5432a082b3dffcf7499827f548
+0,          2,          2,        1,    69888, cb81e0d7b657bc5a4a9cf8ad75a76a77
+0,          3,          3,        1,    69888, 8a40842123965731c15fc23fb6366d1d
+0,          4,          4,        1,    69888, 09c6d92af14a3fcfb12705cd5da57f2a
+0,          5,          5,        1,    69888, 6bede4dc8770df534b599021b0425309
+0,          6,          6,        1,    69888, 334b0b0448e9e4e6a0cddcd2e3a0af3f
+0,          7,          7,        1,    69888, 09f491f0f3870ef96cff0384cd7183d1
+0,          8,          8,        1,    69888, c9e5f81186ac947a77b051c8f0e76eac
+0,          9,          9,        1,    69888, 917565c3327bff78b53a78ea739472ff
diff --git a/tests/ref/fate/vp9-03-size-224x210 b/tests/ref/fate/vp9-03-size-224x210
index 0996abd2f0..d24dc4a544 100644
--- a/tests/ref/fate/vp9-03-size-224x210
+++ b/tests/ref/fate/vp9-03-size-224x210
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    70560, 427421e5fd2087c6ff7b87a27982332f
-0,         33,         33,        0,    70560, b68311fd44e189e4174ac357d5415068
-0,         66,         66,        0,    70560, 2c822ff45be7a1ea412d21ff82c7bc1d
-0,        100,        100,        0,    70560, 34659186d93516eae1dd4d9a391d1c3f
-0,        133,        133,        0,    70560, 1990dd822abc3a10f511589db5aa50f4
-0,        166,        166,        0,    70560, 4a4dc076172c79d9fde3e17b47109835
-0,        200,        200,        0,    70560, 51874c79850120537fa5c405721d0107
-0,        233,        233,        0,    70560, 15d7897a128de9be90be17f1679012c9
-0,        266,        266,        0,    70560, a8d9480accf8585e94161a5f7c371cef
-0,        300,        300,        0,    70560, 8a9d3f09561b895b423ae9428f620b9b
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 224x210
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    70560, 427421e5fd2087c6ff7b87a27982332f
+0,          1,          1,        1,    70560, b68311fd44e189e4174ac357d5415068
+0,          2,          2,        1,    70560, 2c822ff45be7a1ea412d21ff82c7bc1d
+0,          3,          3,        1,    70560, 34659186d93516eae1dd4d9a391d1c3f
+0,          4,          4,        1,    70560, 1990dd822abc3a10f511589db5aa50f4
+0,          5,          5,        1,    70560, 4a4dc076172c79d9fde3e17b47109835
+0,          6,          6,        1,    70560, 51874c79850120537fa5c405721d0107
+0,          7,          7,        1,    70560, 15d7897a128de9be90be17f1679012c9
+0,          8,          8,        1,    70560, a8d9480accf8585e94161a5f7c371cef
+0,          9,          9,        1,    70560, 8a9d3f09561b895b423ae9428f620b9b
diff --git a/tests/ref/fate/vp9-03-size-224x224 b/tests/ref/fate/vp9-03-size-224x224
index fba94fc39c..8183364fcd 100644
--- a/tests/ref/fate/vp9-03-size-224x224
+++ b/tests/ref/fate/vp9-03-size-224x224
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    75264, bedd5d2725ffff06a50e23841bc2dfb8
-0,         33,         33,        0,    75264, 8c363f68b0b30f507563516aa99e23ac
-0,         66,         66,        0,    75264, 9cb7d51ca4439614dc3f5980507a4d32
-0,        100,        100,        0,    75264, b393a18de28ab6b8d1c6afd67a7794e0
-0,        133,        133,        0,    75264, 81f69ee1e3d89cb78cac192c352f7741
-0,        166,        166,        0,    75264, aabb51f029a9a02e71524cf3500931e9
-0,        200,        200,        0,    75264, 6581aec620c508d2b42ccceaa2c6044d
-0,        233,        233,        0,    75264, 993cde759158c30dcf0f0a9fdcdfb0d8
-0,        266,        266,        0,    75264, 85985ae8d35514d601800a06c8226625
-0,        300,        300,        0,    75264, 0eba1d7c193e473586e4a5c87d0e0d21
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 224x224
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    75264, bedd5d2725ffff06a50e23841bc2dfb8
+0,          1,          1,        1,    75264, 8c363f68b0b30f507563516aa99e23ac
+0,          2,          2,        1,    75264, 9cb7d51ca4439614dc3f5980507a4d32
+0,          3,          3,        1,    75264, b393a18de28ab6b8d1c6afd67a7794e0
+0,          4,          4,        1,    75264, 81f69ee1e3d89cb78cac192c352f7741
+0,          5,          5,        1,    75264, aabb51f029a9a02e71524cf3500931e9
+0,          6,          6,        1,    75264, 6581aec620c508d2b42ccceaa2c6044d
+0,          7,          7,        1,    75264, 993cde759158c30dcf0f0a9fdcdfb0d8
+0,          8,          8,        1,    75264, 85985ae8d35514d601800a06c8226625
+0,          9,          9,        1,    75264, 0eba1d7c193e473586e4a5c87d0e0d21
diff --git a/tests/ref/fate/vp9-03-size-224x226 b/tests/ref/fate/vp9-03-size-224x226
index 2bf12257c4..a5a4ae7ae3 100644
--- a/tests/ref/fate/vp9-03-size-224x226
+++ b/tests/ref/fate/vp9-03-size-224x226
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    75936, dca556e648a576b3973fbe4b34d0328c
-0,         33,         33,        0,    75936, 34a49e4aba4aca5c76ab0f751341c32b
-0,         66,         66,        0,    75936, 4b7cc6d500b273efe7e30fc3a3946f74
-0,        100,        100,        0,    75936, 1960f0f1edf9196c96b0de742a3cd53c
-0,        133,        133,        0,    75936, 3cb7d90178636911c5d53a5f8e75599c
-0,        166,        166,        0,    75936, 84b56c60c2282f85102048cc2cf40b88
-0,        200,        200,        0,    75936, 3ca34d2978307ec0fca05130d81bcc26
-0,        233,        233,        0,    75936, c15560be737e02ea9d1deeca0af9bb77
-0,        266,        266,        0,    75936, 391439789a6aa7bb02d7e699795a9559
-0,        300,        300,        0,    75936, 9f681e91cbcbe9920f21236b8ff093c7
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 224x226
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    75936, dca556e648a576b3973fbe4b34d0328c
+0,          1,          1,        1,    75936, 34a49e4aba4aca5c76ab0f751341c32b
+0,          2,          2,        1,    75936, 4b7cc6d500b273efe7e30fc3a3946f74
+0,          3,          3,        1,    75936, 1960f0f1edf9196c96b0de742a3cd53c
+0,          4,          4,        1,    75936, 3cb7d90178636911c5d53a5f8e75599c
+0,          5,          5,        1,    75936, 84b56c60c2282f85102048cc2cf40b88
+0,          6,          6,        1,    75936, 3ca34d2978307ec0fca05130d81bcc26
+0,          7,          7,        1,    75936, c15560be737e02ea9d1deeca0af9bb77
+0,          8,          8,        1,    75936, 391439789a6aa7bb02d7e699795a9559
+0,          9,          9,        1,    75936, 9f681e91cbcbe9920f21236b8ff093c7
diff --git a/tests/ref/fate/vp9-03-size-226x196 b/tests/ref/fate/vp9-03-size-226x196
index 9cb72d315a..f85bfb8d51 100644
--- a/tests/ref/fate/vp9-03-size-226x196
+++ b/tests/ref/fate/vp9-03-size-226x196
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    66444, 4757a31842453f806de2f2256329547e
-0,         33,         33,        0,    66444, fe5fb955a4143091c5bfae7c4a4afe0f
-0,         66,         66,        0,    66444, 93766c5a03d71f99afb7705add7b63f0
-0,        100,        100,        0,    66444, 30c91162aa6fb0ed3e47325146bb6d8a
-0,        133,        133,        0,    66444, 501fe67785b970b1b62c2ae0b36b19ad
-0,        166,        166,        0,    66444, 836be5e778e3d20e75c4fcd71f765b3d
-0,        200,        200,        0,    66444, 21a9fd5e78212fe71719e173844bc6e6
-0,        233,        233,        0,    66444, 81b3919208e345d93dde62740b47dd93
-0,        266,        266,        0,    66444, df010555a929ba88a2f25c6267e3786e
-0,        300,        300,        0,    66444, d2cff8282e5e7a5bbd879c73df0670c3
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 226x196
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    66444, 4757a31842453f806de2f2256329547e
+0,          1,          1,        1,    66444, fe5fb955a4143091c5bfae7c4a4afe0f
+0,          2,          2,        1,    66444, 93766c5a03d71f99afb7705add7b63f0
+0,          3,          3,        1,    66444, 30c91162aa6fb0ed3e47325146bb6d8a
+0,          4,          4,        1,    66444, 501fe67785b970b1b62c2ae0b36b19ad
+0,          5,          5,        1,    66444, 836be5e778e3d20e75c4fcd71f765b3d
+0,          6,          6,        1,    66444, 21a9fd5e78212fe71719e173844bc6e6
+0,          7,          7,        1,    66444, 81b3919208e345d93dde62740b47dd93
+0,          8,          8,        1,    66444, df010555a929ba88a2f25c6267e3786e
+0,          9,          9,        1,    66444, d2cff8282e5e7a5bbd879c73df0670c3
diff --git a/tests/ref/fate/vp9-03-size-226x198 b/tests/ref/fate/vp9-03-size-226x198
index f70b3308ed..dcb08526e5 100644
--- a/tests/ref/fate/vp9-03-size-226x198
+++ b/tests/ref/fate/vp9-03-size-226x198
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    67122, b97087eb8c53cf56dc44576912654fb2
-0,         33,         33,        0,    67122, 219bb68a59dc166806a5b5689a943b66
-0,         66,         66,        0,    67122, 67b2ec19dd3b74d828b51912c25249d6
-0,        100,        100,        0,    67122, 73dd9625538e10a0f94d31ac9fe3db23
-0,        133,        133,        0,    67122, 51e68f201130da18beb0cb27adcf6fa9
-0,        166,        166,        0,    67122, 455d9753b3c0ac5ad7d9da022f69acd0
-0,        200,        200,        0,    67122, 60a8905a63db4cdd2560583fb6415030
-0,        233,        233,        0,    67122, 48c156f4b2c9f936487b43713a4573fd
-0,        266,        266,        0,    67122, a5c8f4190cb34b3ecd42ca8e09bf1646
-0,        300,        300,        0,    67122, 233a5d5187137e047993532fc2e725d3
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 226x198
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    67122, b97087eb8c53cf56dc44576912654fb2
+0,          1,          1,        1,    67122, 219bb68a59dc166806a5b5689a943b66
+0,          2,          2,        1,    67122, 67b2ec19dd3b74d828b51912c25249d6
+0,          3,          3,        1,    67122, 73dd9625538e10a0f94d31ac9fe3db23
+0,          4,          4,        1,    67122, 51e68f201130da18beb0cb27adcf6fa9
+0,          5,          5,        1,    67122, 455d9753b3c0ac5ad7d9da022f69acd0
+0,          6,          6,        1,    67122, 60a8905a63db4cdd2560583fb6415030
+0,          7,          7,        1,    67122, 48c156f4b2c9f936487b43713a4573fd
+0,          8,          8,        1,    67122, a5c8f4190cb34b3ecd42ca8e09bf1646
+0,          9,          9,        1,    67122, 233a5d5187137e047993532fc2e725d3
diff --git a/tests/ref/fate/vp9-03-size-226x200 b/tests/ref/fate/vp9-03-size-226x200
index 62cea7f2dc..7622f29a97 100644
--- a/tests/ref/fate/vp9-03-size-226x200
+++ b/tests/ref/fate/vp9-03-size-226x200
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    67800, 0ae27db338f73f37eaed806b1c789593
-0,         33,         33,        0,    67800, 3f69273752f43699a3bc7b22a88cc3aa
-0,         66,         66,        0,    67800, ce0dfafb59910241d2b1a2275a2c2143
-0,        100,        100,        0,    67800, 8d20f404e25766c819ee728858bcbc76
-0,        133,        133,        0,    67800, 67bc5604c5b0f6c3484b605c1f93c83a
-0,        166,        166,        0,    67800, 1c82def3a06430d205cce0db7b5714de
-0,        200,        200,        0,    67800, 654d7a676e3b8b64541ed8cdefbd7286
-0,        233,        233,        0,    67800, 6c80c78c7b652c5b3b117a0960e89951
-0,        266,        266,        0,    67800, ae73e3c69ec6747c5234d58c5e1e36eb
-0,        300,        300,        0,    67800, e40d716efd8caf2d4004d299fb914328
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 226x200
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    67800, 0ae27db338f73f37eaed806b1c789593
+0,          1,          1,        1,    67800, 3f69273752f43699a3bc7b22a88cc3aa
+0,          2,          2,        1,    67800, ce0dfafb59910241d2b1a2275a2c2143
+0,          3,          3,        1,    67800, 8d20f404e25766c819ee728858bcbc76
+0,          4,          4,        1,    67800, 67bc5604c5b0f6c3484b605c1f93c83a
+0,          5,          5,        1,    67800, 1c82def3a06430d205cce0db7b5714de
+0,          6,          6,        1,    67800, 654d7a676e3b8b64541ed8cdefbd7286
+0,          7,          7,        1,    67800, 6c80c78c7b652c5b3b117a0960e89951
+0,          8,          8,        1,    67800, ae73e3c69ec6747c5234d58c5e1e36eb
+0,          9,          9,        1,    67800, e40d716efd8caf2d4004d299fb914328
diff --git a/tests/ref/fate/vp9-03-size-226x202 b/tests/ref/fate/vp9-03-size-226x202
index d13634aa45..b8a217ced6 100644
--- a/tests/ref/fate/vp9-03-size-226x202
+++ b/tests/ref/fate/vp9-03-size-226x202
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    68478, 0cd2876640e71de3a6df7839bd6f0b51
-0,         33,         33,        0,    68478, f887db6839c0cddd1ea9ae6bfd2cc16d
-0,         66,         66,        0,    68478, ff2a890cf4c4973bf181ba8424c2eadc
-0,        100,        100,        0,    68478, f69f2e4f3036a21deb43a0bf4b95771f
-0,        133,        133,        0,    68478, 93f511739c19f1a3b356dda39d945c93
-0,        166,        166,        0,    68478, 7f79633c93765b504fef0324bd10fdba
-0,        200,        200,        0,    68478, d6c53d3937c9a40b227b4486452e0b33
-0,        233,        233,        0,    68478, 4e26625e8997ad6fe08ae68fbdfdbfd7
-0,        266,        266,        0,    68478, 3bf4c8ac0279351bf904cf57b0fc13c1
-0,        300,        300,        0,    68478, 12d64d856025185fa9e610dfa62b05af
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 226x202
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    68478, 0cd2876640e71de3a6df7839bd6f0b51
+0,          1,          1,        1,    68478, f887db6839c0cddd1ea9ae6bfd2cc16d
+0,          2,          2,        1,    68478, ff2a890cf4c4973bf181ba8424c2eadc
+0,          3,          3,        1,    68478, f69f2e4f3036a21deb43a0bf4b95771f
+0,          4,          4,        1,    68478, 93f511739c19f1a3b356dda39d945c93
+0,          5,          5,        1,    68478, 7f79633c93765b504fef0324bd10fdba
+0,          6,          6,        1,    68478, d6c53d3937c9a40b227b4486452e0b33
+0,          7,          7,        1,    68478, 4e26625e8997ad6fe08ae68fbdfdbfd7
+0,          8,          8,        1,    68478, 3bf4c8ac0279351bf904cf57b0fc13c1
+0,          9,          9,        1,    68478, 12d64d856025185fa9e610dfa62b05af
diff --git a/tests/ref/fate/vp9-03-size-226x208 b/tests/ref/fate/vp9-03-size-226x208
index 9e88108b78..cdf1113db1 100644
--- a/tests/ref/fate/vp9-03-size-226x208
+++ b/tests/ref/fate/vp9-03-size-226x208
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    70512, 6006cac6628cf9e7cea58aec07471b06
-0,         33,         33,        0,    70512, f7e994921248b6933920c984880ec96c
-0,         66,         66,        0,    70512, c0aeeb9d2009538d8d5e837f45e1542d
-0,        100,        100,        0,    70512, 7dacf9d00e85bd52045eb47bae5225b3
-0,        133,        133,        0,    70512, 024fd008a099ae954e38a3f0a8ebb6c9
-0,        166,        166,        0,    70512, fb6c368a1b3578ab59aa30e0b5cc4853
-0,        200,        200,        0,    70512, 07815251f7020b627c365a7a7be694c7
-0,        233,        233,        0,    70512, db8b8f48f3693867d2bd8208cf4f929a
-0,        266,        266,        0,    70512, 88b42d943c0978d832333a8a3f7b6bbc
-0,        300,        300,        0,    70512, 7aa760190f9328ba4f6fa87d1d9e8d3e
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 226x208
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    70512, 6006cac6628cf9e7cea58aec07471b06
+0,          1,          1,        1,    70512, f7e994921248b6933920c984880ec96c
+0,          2,          2,        1,    70512, c0aeeb9d2009538d8d5e837f45e1542d
+0,          3,          3,        1,    70512, 7dacf9d00e85bd52045eb47bae5225b3
+0,          4,          4,        1,    70512, 024fd008a099ae954e38a3f0a8ebb6c9
+0,          5,          5,        1,    70512, fb6c368a1b3578ab59aa30e0b5cc4853
+0,          6,          6,        1,    70512, 07815251f7020b627c365a7a7be694c7
+0,          7,          7,        1,    70512, db8b8f48f3693867d2bd8208cf4f929a
+0,          8,          8,        1,    70512, 88b42d943c0978d832333a8a3f7b6bbc
+0,          9,          9,        1,    70512, 7aa760190f9328ba4f6fa87d1d9e8d3e
diff --git a/tests/ref/fate/vp9-03-size-226x210 b/tests/ref/fate/vp9-03-size-226x210
index 0ff9dfc20d..e903e821bd 100644
--- a/tests/ref/fate/vp9-03-size-226x210
+++ b/tests/ref/fate/vp9-03-size-226x210
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    71190, a6c1b7686202f5cc64335f92be595309
-0,         33,         33,        0,    71190, 3e573d4c693a39c5d6cd46b8873e99bb
-0,         66,         66,        0,    71190, d2388f6f641c8ddec98f11493f1a1390
-0,        100,        100,        0,    71190, 16473e33532ebc8de2f02077c406346b
-0,        133,        133,        0,    71190, 6c75d1c01276838fce40837e373f49db
-0,        166,        166,        0,    71190, b718e7445e2b08dde78fa7f30be01346
-0,        200,        200,        0,    71190, 2f556ed5afd60b1bbae76984ce073107
-0,        233,        233,        0,    71190, 4e5d59daed044c39a14c35f18cb4fb7a
-0,        266,        266,        0,    71190, c14901a9906ffcd0eb1efc068ce32941
-0,        300,        300,        0,    71190, 3d73b7f87bcd16c1ec565b5cc8d0fe93
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 226x210
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    71190, a6c1b7686202f5cc64335f92be595309
+0,          1,          1,        1,    71190, 3e573d4c693a39c5d6cd46b8873e99bb
+0,          2,          2,        1,    71190, d2388f6f641c8ddec98f11493f1a1390
+0,          3,          3,        1,    71190, 16473e33532ebc8de2f02077c406346b
+0,          4,          4,        1,    71190, 6c75d1c01276838fce40837e373f49db
+0,          5,          5,        1,    71190, b718e7445e2b08dde78fa7f30be01346
+0,          6,          6,        1,    71190, 2f556ed5afd60b1bbae76984ce073107
+0,          7,          7,        1,    71190, 4e5d59daed044c39a14c35f18cb4fb7a
+0,          8,          8,        1,    71190, c14901a9906ffcd0eb1efc068ce32941
+0,          9,          9,        1,    71190, 3d73b7f87bcd16c1ec565b5cc8d0fe93
diff --git a/tests/ref/fate/vp9-03-size-226x224 b/tests/ref/fate/vp9-03-size-226x224
index 37b39a865b..425490efaf 100644
--- a/tests/ref/fate/vp9-03-size-226x224
+++ b/tests/ref/fate/vp9-03-size-226x224
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    75936, 80fb3a643384386beadc0991f171669d
-0,         33,         33,        0,    75936, 65a4a51163f49a75f8eeecd94cb2ba47
-0,         66,         66,        0,    75936, d5b2aac9889d2991b83fd4360ada0258
-0,        100,        100,        0,    75936, 7958ff5535358567ea7df351d78256a7
-0,        133,        133,        0,    75936, 7e7413b9a61967d0ade07b81944e9a15
-0,        166,        166,        0,    75936, 40a008016adbf9673adbbc4c0edb4454
-0,        200,        200,        0,    75936, fef7b5e2809ef79917ab394a067ef4be
-0,        233,        233,        0,    75936, 91ee2360faf46a25b95927c55eea603f
-0,        266,        266,        0,    75936, a47f14a80a529f79f97accbe23188046
-0,        300,        300,        0,    75936, 3613bcd41ff13006fbba3bd0087c44f4
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 226x224
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    75936, 80fb3a643384386beadc0991f171669d
+0,          1,          1,        1,    75936, 65a4a51163f49a75f8eeecd94cb2ba47
+0,          2,          2,        1,    75936, d5b2aac9889d2991b83fd4360ada0258
+0,          3,          3,        1,    75936, 7958ff5535358567ea7df351d78256a7
+0,          4,          4,        1,    75936, 7e7413b9a61967d0ade07b81944e9a15
+0,          5,          5,        1,    75936, 40a008016adbf9673adbbc4c0edb4454
+0,          6,          6,        1,    75936, fef7b5e2809ef79917ab394a067ef4be
+0,          7,          7,        1,    75936, 91ee2360faf46a25b95927c55eea603f
+0,          8,          8,        1,    75936, a47f14a80a529f79f97accbe23188046
+0,          9,          9,        1,    75936, 3613bcd41ff13006fbba3bd0087c44f4
diff --git a/tests/ref/fate/vp9-03-size-226x226 b/tests/ref/fate/vp9-03-size-226x226
index 01c05dca3f..5c291e7586 100644
--- a/tests/ref/fate/vp9-03-size-226x226
+++ b/tests/ref/fate/vp9-03-size-226x226
@@ -1,11 +1,19 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    76614, f2370fc802dafdf5082beffc1907a9c6
-0,         33,         33,        0,    76614, aad6de7b986234a1d621935b272501c9
-0,         66,         66,        0,    76614, 8a6d3784e22e3b4f735e78916fbc3821
-0,        100,        100,        0,    76614, 0c4afce19c43fdf3bb1b972810cc9126
-0,        133,        133,        0,    76614, 814a68dd76a3135221131988910f51ba
-0,        166,        166,        0,    76614, b2379c4b28dca10e67ac58631f9731c0
-0,        200,        200,        0,    76614, b16fd651884340a428cea3fe0ac18ba6
-0,        233,        233,        0,    76614, cb65cd4c421cfd6a19fb123ec27abbe6
-0,        266,        266,        0,    76614, 7f1d2686b9808de8ecc723b18136d57d
-0,        300,        300,        0,    76614, da7fd4bff4b6db0221c42492876c5c4d
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 226x226
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    76614, f2370fc802dafdf5082beffc1907a9c6
+0,          1,          1,        1,    76614, aad6de7b986234a1d621935b272501c9
+0,          2,          2,        1,    76614, 8a6d3784e22e3b4f735e78916fbc3821
+0,          3,          3,        1,    76614, 0c4afce19c43fdf3bb1b972810cc9126
+0,          4,          4,        1,    76614, 814a68dd76a3135221131988910f51ba
+0,          5,          5,        1,    76614, b2379c4b28dca10e67ac58631f9731c0
+0,          6,          6,        1,    76614, b16fd651884340a428cea3fe0ac18ba6
+0,          7,          7,        1,    76614, cb65cd4c421cfd6a19fb123ec27abbe6
+0,          8,          8,        1,    76614, 7f1d2686b9808de8ecc723b18136d57d
+0,          9,          9,        1,    76614, da7fd4bff4b6db0221c42492876c5c4d
diff --git a/tests/ref/fate/vp9-05-resize b/tests/ref/fate/vp9-05-resize
new file mode 100644
index 0000000000..6b8823df12
--- /dev/null
+++ b/tests/ref/fate/vp9-05-resize
@@ -0,0 +1,19 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 0/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 539e9964364c1db09ad18f2e01713799
+0,          1,          1,        1,   152064, fb76e673ba2a5342bfed8a1523e0a425
+0,          2,          2,        1,   152064, b0e6881ac6c1e0d839f80f292cb1afd4
+0,          3,          3,        1,   152064, f69a4d7f784e1619e45ffd65e3f103b9
+0,          4,          4,        1,   152064, a9cefc3088de0b403c7cc1ffd117479a
+0,          5,          5,        1,   152064, 6a053249fe6fdc52ed00a21668fe330f
+0,          6,          6,        1,   152064, 2c6f7b8c72a0103cd1fa37270f6d9962
+0,          7,          7,        1,   152064, 9f837ba58bf07d1e1a8b6a30a9a588e8
+0,          8,          8,        1,   152064, 81ecfd1810b25395af999e557ed4b938
+0,          9,          9,        1,   152064, cee53e71d6347333fd76d421ece1740f
diff --git a/tests/ref/fate/vp9-06-bilinear b/tests/ref/fate/vp9-06-bilinear
new file mode 100644
index 0000000000..77369f88cd
--- /dev/null
+++ b/tests/ref/fate/vp9-06-bilinear
@@ -0,0 +1,19 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 818a5af531c921ae58dfedc75234f3c5
+0,          1,          1,        1,   152064, f863f8c68b5c87c721d345c5a894336d
+0,          2,          2,        1,   152064, 3f1213e44db416530bc0717f0a795b5d
+0,          3,          3,        1,   152064, 4b99c16a62c3d6687c78236fa13e1f41
+0,          4,          4,        1,   152064, 80f23a3f04215dd7542128e7c53d68d0
+0,          5,          5,        1,   152064, b40b7aa34a77fe773d82d75b5bdd9c13
+0,          6,          6,        1,   152064, dd4af6263d20bbaf9afedb6695c1ba67
+0,          7,          7,        1,   152064, 1f2ccf88f15c10e3c27b2368dacc3727
+0,          8,          8,        1,   152064, 232b027c4e9b598f50d078bb7b7a165e
+0,          9,          9,        1,   152064, 2b44367332aa0fe42362d61f18e7f8dd
diff --git a/tests/ref/fate/vp9-09-lf_deltas b/tests/ref/fate/vp9-09-lf_deltas
new file mode 100644
index 0000000000..278395fdc3
--- /dev/null
+++ b/tests/ref/fate/vp9-09-lf_deltas
@@ -0,0 +1,39 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x240
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   126720, a83c7f4602f595fd09e97f8c8a7277ec
+0,          1,          1,        1,   126720, 53e1a3fd44932883a8dd112bbb0e359f
+0,          2,          2,        1,   126720, 4bb16d168f9f0a7702c31a68bb8ff36c
+0,          3,          3,        1,   126720, 1b2df157913aba96553aaf8d51491bf3
+0,          4,          4,        1,   126720, 9d041532e42fca7a4062cd3e9b75413b
+0,          5,          5,        1,   126720, 0dbac5ca06e13714d10e99042aefe375
+0,          6,          6,        1,   126720, bb83a507a65d2a640b08f42a77bb37f6
+0,          7,          7,        1,   126720, 176f992d37c7daa36135cddb49398de3
+0,          8,          8,        1,   126720, c41834f72b3281cf6aaa66fd7416e6c3
+0,          9,          9,        1,   126720, 790d4e6b1609dec782ff978e2003d318
+0,         10,         10,        1,   126720, 449622f741f7577c1d721f2e9eb25091
+0,         11,         11,        1,   126720, 8ef8543f7895c87ab04491b0150628e5
+0,         12,         12,        1,   126720, 88ef626aca4b2bcb8c58a69db20a7b02
+0,         13,         13,        1,   126720, 4b2f7adc2e1872ecdd9ffa7d1f1df4a6
+0,         14,         14,        1,   126720, 7b162660225022ef31e39c34fee3418e
+0,         15,         15,        1,   126720, 2b439a4b846edcc69cdf6075de5ac8fb
+0,         16,         16,        1,   126720, ba2eb1ba0ed9abf701a53a94c9c626fc
+0,         17,         17,        1,   126720, 9fbec5d5334fd5e917feee756b652d93
+0,         18,         18,        1,   126720, 93b5eb99ea54abc5fa90c5674499e27e
+0,         19,         19,        1,   126720, 04a98408e9b0aed28932ef1dfdcfdb6c
+0,         20,         20,        1,   126720, 9856ba976bed30bc790a3f28e926b092
+0,         21,         21,        1,   126720, 2b0f450e9724cfc57b846148ff876e51
+0,         22,         22,        1,   126720, 163757f3529369b9789ea606387b831d
+0,         23,         23,        1,   126720, de5ed2aff936c54f3378d0dcc2575d13
+0,         24,         24,        1,   126720, 1f642826b8a6fb111c7c6130481dab89
+0,         25,         25,        1,   126720, b8e3a77c7d3c5c56f67aa7409fb5404c
+0,         26,         26,        1,   126720, eb06cb4f471e42d7fc06929a442cca8b
+0,         27,         27,        1,   126720, 53471649a5080b306d2c04a4f7673bdf
+0,         28,         28,        1,   126720, 70996be0cc5d2bd97025015dd50caa99
+0,         29,         29,        1,   126720, ff3280a8562fdf6697c4a7cb9c1bf0a0
diff --git a/tests/ref/fate/vp9-10-show-existing-frame b/tests/ref/fate/vp9-10-show-existing-frame
new file mode 100644
index 0000000000..aeed44a168
--- /dev/null
+++ b/tests/ref/fate/vp9-10-show-existing-frame
@@ -0,0 +1,22 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 18981342ec178e082519451062c3a67f
+0,          3,          3,        1,   152064, 04ab9dbeac49ec31be58f6e671698e05
+0,          4,          4,        1,   152064, 4ed58a0ba93a5d97a232a50c5876cda2
+0,          6,          6,        1,   152064, a41f00034923e56ba51a0b598acc2e3a
+0,          7,          7,        1,   152064, 63fa55ae9535ccdf06d44cce8065dda6
+0,          8,          8,        1,   152064, a41f00034923e56ba51a0b598acc2e3a
+0,          9,          9,        1,   152064, 0e4b08e14d919edee2bbff2ecd47de57
+0,         11,         11,        1,   152064, 0e4b08e14d919edee2bbff2ecd47de57
+0,         12,         12,        1,   152064, 5d4af03fc3d410413ef2b5a6275528b7
+0,         13,         13,        1,   152064, 9e932915c67a789f6877e6d3f76d3649
+0,         14,         14,        1,   152064, 12f2e975c217e7ffcf334524e8acec35
+0,         15,         15,        1,   152064, 9e932915c67a789f6877e6d3f76d3649
+0,         16,         16,        1,   152064, 12f2e975c217e7ffcf334524e8acec35
diff --git a/tests/ref/fate/vp9-10-show-existing-frame2 b/tests/ref/fate/vp9-10-show-existing-frame2
new file mode 100644
index 0000000000..c93a09f301
--- /dev/null
+++ b/tests/ref/fate/vp9-10-show-existing-frame2
@@ -0,0 +1,25 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 382b12c33cd86b38758706b8ebca8a85
+0,          1,          1,        1,   152064, 799544370b35c91711a5b49a28cf86a8
+0,          2,          2,        1,   152064, 7218eb4b6d1c7aea4f96ee47ad675e8e
+0,          3,          3,        1,   152064, 627466200370e6ad60ea570d31be66e3
+0,          4,          4,        1,   152064, 7dc65a2af108379f2b9265a9a1ea7cf8
+0,          5,          5,        1,   152064, c979e2f084760775a567f60f79f28198
+0,          6,          6,        1,   152064, fe668a6417aa0543e4ed4d1c67c5cbcb
+0,          7,          7,        1,   152064, bf9901e39815fa93cce0ed5b02b2ef2d
+0,          8,          8,        1,   152064, 627466200370e6ad60ea570d31be66e3
+0,          9,          9,        1,   152064, 7dc65a2af108379f2b9265a9a1ea7cf8
+0,         10,         10,        1,   152064, c979e2f084760775a567f60f79f28198
+0,         11,         11,        1,   152064, fe668a6417aa0543e4ed4d1c67c5cbcb
+0,         12,         12,        1,   152064, bf9901e39815fa93cce0ed5b02b2ef2d
+0,         13,         13,        1,   152064, 627466200370e6ad60ea570d31be66e3
+0,         14,         14,        1,   152064, 7dc65a2af108379f2b9265a9a1ea7cf8
+0,         15,         15,        1,   152064, c979e2f084760775a567f60f79f28198
diff --git a/tests/ref/fate/vp9-15-segkey_adpq b/tests/ref/fate/vp9-15-segkey_adpq
new file mode 100644
index 0000000000..4e4adad9eb
--- /dev/null
+++ b/tests/ref/fate/vp9-15-segkey_adpq
@@ -0,0 +1,159 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 852x480
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   613440, d4f0e4b606ddb40b482aecb24cf3bc63
+0,          1,          1,        1,   613440, 692ec092bc5928fa6430d056e883759a
+0,          2,          2,        1,   613440, dad790df33430899fed98886a24b37e5
+0,          3,          3,        1,   613440, 7e66e793ac9462a40dd5b963fb62e667
+0,          4,          4,        1,   613440, 0d795c6e20f42f09aca0ddb9dffaa6e8
+0,          5,          5,        1,   613440, 0ef3739c4ab2c51f0ab8e290eadad77e
+0,          6,          6,        1,   613440, 04a15f765960263c1b4a5a8822e17322
+0,          7,          7,        1,   613440, 116d518830c958bf46759fd79bc74198
+0,          8,          8,        1,   613440, 58ea67addab05825cc2e5f2ab99fca4b
+0,          9,          9,        1,   613440, 590f6e5deea6dde21dc1098fa2017c2f
+0,         10,         10,        1,   613440, 895479957b0882ccce4159782dee8deb
+0,         11,         11,        1,   613440, cc8e05afdfb6f9c7042fd6f9e9d49140
+0,         12,         12,        1,   613440, 3e47c556a63af90f1ca4609f97f25d2c
+0,         13,         13,        1,   613440, e5ca5dce8cbd39412db2fe219d6d2594
+0,         14,         14,        1,   613440, c62b456e12230660d26eb7226f257d0c
+0,         15,         15,        1,   613440, e184c961b373de465d3242f32f7cf3ed
+0,         16,         16,        1,   613440, 7466b91858f740fc28965a63effe05d6
+0,         17,         17,        1,   613440, c8f06a3b1e471c4e7a9efd71a30dfe3b
+0,         18,         18,        1,   613440, d4fb95148963b2eaff0211ddc5117c13
+0,         19,         19,        1,   613440, c646526b40277289520d47ed8ca3b644
+0,         20,         20,        1,   613440, e441ae686fa444e4e3584543611043ba
+0,         21,         21,        1,   613440, 68d707ef6909bfbc02dcbd9e392a04f6
+0,         22,         22,        1,   613440, 1ff285d17a26622b61bd2651754602b1
+0,         23,         23,        1,   613440, c272192987e44e54e5335e6416bd15a5
+0,         24,         24,        1,   613440, 8f6f02572181eb4855dcd4c957e57d2e
+0,         25,         25,        1,   613440, baf03eb567fd092eeb6f08ff5e098350
+0,         26,         26,        1,   613440, 479c78bd3da0892b8d4e32c99ec4739f
+0,         27,         27,        1,   613440, d39a52f6e30ef10462bdef1006809e88
+0,         28,         28,        1,   613440, d58395369806221efe9ba88513319d8a
+0,         29,         29,        1,   613440, 459e77e83c510ee1d79bf069752d44e5
+0,         30,         30,        1,   613440, 438027c8eacb9c795f8267a151ef5a4e
+0,         31,         31,        1,   613440, ea6b73fb0d4b23ebbdaeb0267135d083
+0,         32,         32,        1,   613440, 48160c624d4d5050a4c8abcbe0edf4b2
+0,         33,         33,        1,   613440, 6fc6d5b4751cf137fc0204c0026f2503
+0,         34,         34,        1,   613440, 5ea20f6483fc5cde854313ed8288c7ca
+0,         35,         35,        1,   613440, dafa41fa3468f684ca5538593cd1a0de
+0,         36,         36,        1,   613440, b73d3336c83a27874e24b691c34c3421
+0,         37,         37,        1,   613440, d0b0488a5871a49442746ac8ea1343bc
+0,         38,         38,        1,   613440, df6fe9cb354624b69908730f24f51b88
+0,         39,         39,        1,   613440, a388b159a024ace9437976206e62473c
+0,         40,         40,        1,   613440, 9007423410201a70b6997477ed9040f6
+0,         41,         41,        1,   613440, 7f7425cc018ad391e06b867f51d69513
+0,         42,         42,        1,   613440, 2ef51a3a15c627f803eee7f351cdfa4e
+0,         43,         43,        1,   613440, 260cded2461ab87181d650c58a8a0656
+0,         44,         44,        1,   613440, fdd7a93b5f25ec2b74d93736fa7bb475
+0,         45,         45,        1,   613440, 810bb95ef0221b50ef12c7d0a4740fec
+0,         46,         46,        1,   613440, f7eb4d63c16aebfeba4804c4e9c2c134
+0,         47,         47,        1,   613440, a1ae94b85bced552e2c4f15ab5c5096d
+0,         48,         48,        1,   613440, 4b7b9e460b4a4ceab5deb5c6876cea05
+0,         49,         49,        1,   613440, 514472399dc39fcc4e833e166b81ea8e
+0,         50,         50,        1,   613440, dca73ca76936d0a7eeb71c20955ea3a3
+0,         51,         51,        1,   613440, 927b185567b515a6bd102e1199ee1836
+0,         52,         52,        1,   613440, 63e1fffd59b77c53811d75a116fbac60
+0,         53,         53,        1,   613440, 5ca302497e81d564cfd455e2b606b262
+0,         54,         54,        1,   613440, 6e317d469ee664bc511a8286650f0b79
+0,         55,         55,        1,   613440, d93e1909f3bdda983e0b3c73a8c51754
+0,         56,         56,        1,   613440, 836072cb1c4dc3dc32c935ba4ac3f716
+0,         57,         57,        1,   613440, 014e61666ba819260a25f09ae97768a8
+0,         58,         58,        1,   613440, 997fa6283e48ff017ce04041b9022fb9
+0,         59,         59,        1,   613440, b2c35749c6b848601193c2eff7f0bdf1
+0,         60,         60,        1,   613440, 813e9f562ef53589afbfe7d73002c136
+0,         61,         61,        1,   613440, be876a05cfc72fe6138e1c24b6e94c3f
+0,         62,         62,        1,   613440, 2a33b99f67fe5579ddbd62bac085ae8a
+0,         63,         63,        1,   613440, 8d374a1886861cfd9ca6f16a0aff1b6c
+0,         64,         64,        1,   613440, eff4e17b08c67a1663c8f1cc614bd94a
+0,         65,         65,        1,   613440, 39e4d97460cf02ecfbc666e0413d7db1
+0,         66,         66,        1,   613440, 732f41606146dfb0c6a8cf130df969a8
+0,         67,         67,        1,   613440, 9b724b808bc26f21aaa32653185b2cf3
+0,         68,         68,        1,   613440, e18598cb7ac70cdb5dea29b35ae5accb
+0,         69,         69,        1,   613440, afbcad9f7bad0b58a5bccdb8977a60fb
+0,         70,         70,        1,   613440, 6ec24c40cd8a0cf2e15339ce4f60c232
+0,         71,         71,        1,   613440, 76616dbe8207235f6890360566f9e8df
+0,         72,         72,        1,   613440, 49a5c751ed430e9bc41c3a3334295025
+0,         73,         73,        1,   613440, f657e47dbbcc2a04e9e7b71ecd8451ff
+0,         74,         74,        1,   613440, 8e85f3d26b26f26ccd804061d2f37bbb
+0,         75,         75,        1,   613440, 5a9dd5c0390491cd21163da01dc21f4d
+0,         76,         76,        1,   613440, 3cf88ad2d2d7ecf1223afa5d1b849317
+0,         77,         77,        1,   613440, 27385b23461b5f1c137c2f29354595ed
+0,         78,         78,        1,   613440, e6eacbe2890389c586f2936a75ab3509
+0,         79,         79,        1,   613440, 19a48ffafdcdb6fb1d6b9808daed2f86
+0,         80,         80,        1,   613440, f8c9419d4944fb214e06a2c30a560d93
+0,         81,         81,        1,   613440, 3f3d3dd54e5aa6bd59af1be86ec9be3d
+0,         82,         82,        1,   613440, 28be5316ed79dc47b6a142cef0c16ab7
+0,         83,         83,        1,   613440, 6fbed684bfe8dfd354210293d7eb4d0b
+0,         84,         84,        1,   613440, e60cd76f68c95f8b484d0b6424eea4cc
+0,         85,         85,        1,   613440, e05a0cf382f49039faddaffeff2cec16
+0,         86,         86,        1,   613440, 42ea736ebbfe50f1ebd460d71781e5d6
+0,         87,         87,        1,   613440, 80f78066700b6752bbc1a41390ddb482
+0,         88,         88,        1,   613440, 14671354929fcf10677b2ed2db3c8cb4
+0,         89,         89,        1,   613440, 96a7d68407f1a2c96bd3cafe0c696bf5
+0,         90,         90,        1,   613440, 2f2adb990cfa42229db987a668b19d38
+0,         91,         91,        1,   613440, a8233951004e1bb0d0937435a517fad2
+0,         92,         92,        1,   613440, 6163e872c38adfde7b0c8891cbb2c969
+0,         93,         93,        1,   613440, 990165e0905fb80ccc29d2de062d4f9b
+0,         94,         94,        1,   613440, e6f3224c4c60098ee93fca870f8636b2
+0,         95,         95,        1,   613440, 8c561667345f932618f8b3aaa43ffde0
+0,         96,         96,        1,   613440, 1acb3999bacd483d1153beb43ee09772
+0,         97,         97,        1,   613440, 2a075c7bc49190df83b8285ee6e124d3
+0,         98,         98,        1,   613440, 890a134a3c77d9b64d83fe6d2def02de
+0,         99,         99,        1,   613440, d0b41422b89f03ffcbde7c85889ad2c2
+0,        100,        100,        1,   613440, fdc4f855d70ef16ec9baeb05c3a73f44
+0,        101,        101,        1,   613440, ed9f847a3b4280cfe306018825c76508
+0,        102,        102,        1,   613440, 5deb2536bba158c722bc0d909f45e611
+0,        103,        103,        1,   613440, fc7880ca8680e03fb1978adce8066027
+0,        104,        104,        1,   613440, 6e1c351c6b102e9185f688a02190b87f
+0,        105,        105,        1,   613440, 1f6169bf490ed1b4c391383f770fec02
+0,        106,        106,        1,   613440, 80ac3b673b1504fb1e88d883a91a539c
+0,        107,        107,        1,   613440, d2e7654f961ff3767c1e9e8558c2f20d
+0,        108,        108,        1,   613440, 365368d813eb10c5adc53e47afeb414d
+0,        109,        109,        1,   613440, 5f74f55478377dd31da91cf195332480
+0,        110,        110,        1,   613440, 827b7b3853ea3b1855583b59ed7b09c2
+0,        111,        111,        1,   613440, 2017c1a57a271308172bd84d3887d063
+0,        112,        112,        1,   613440, d65b95c71db9972dc051bec7df19f85f
+0,        113,        113,        1,   613440, 7243da9072729ffa75209a6699e77ac3
+0,        114,        114,        1,   613440, 112da8d27907ab6a66b030e9c8864e46
+0,        115,        115,        1,   613440, e2837b6409de4bc6e71ff9eca8eab391
+0,        116,        116,        1,   613440, 567eba2ddb91a02665ac96fa10703f00
+0,        117,        117,        1,   613440, 474a99d56fce0e7e96ac3585b905956f
+0,        118,        118,        1,   613440, 3087edb09f1ef2e63130b7c03e696028
+0,        119,        119,        1,   613440, 574f7328da31760ecf237617aebd7784
+0,        120,        120,        1,   613440, c3a7669bb496bec766a74a800275ff6c
+0,        121,        121,        1,   613440, c0d87245a92e7140e6b729c26fe97a95
+0,        122,        122,        1,   613440, 467e33e84435fe64cb14653600ec5163
+0,        123,        123,        1,   613440, 1c7a5b2472c00e9dc63f679b51ead6a9
+0,        124,        124,        1,   613440, 8fb7197463cdae6c45437a73dcb4a3d8
+0,        125,        125,        1,   613440, f352fee36f51536175b05b5ff5a3187a
+0,        126,        126,        1,   613440, ac1ed4392a38268a2495508245032d74
+0,        127,        127,        1,   613440, b8179a306c4fbc6f207d15acaae92dfb
+0,        128,        128,        1,   613440, 7f263b0fd68652d83b75d24cc11c89e8
+0,        129,        129,        1,   613440, 39e33d02a01247cefe19d8bf9fbdecae
+0,        130,        130,        1,   613440, 49a4e89c9fcc66f7e6e679aee4af0852
+0,        131,        131,        1,   613440, 0af52a32e6d74694a0a1f12aa78293fe
+0,        132,        132,        1,   613440, fedde75a5c093ea12f0ed328da7350c9
+0,        133,        133,        1,   613440, 2ab788cf689fdbe8fbc74dde165605ad
+0,        134,        134,        1,   613440, 682c2316cbd2e8a5e54edd1e9309a6c7
+0,        135,        135,        1,   613440, f155e8fa47625f18dffea813a7070c71
+0,        136,        136,        1,   613440, 2611eb2b2da8f6995ac2159012ec540a
+0,        137,        137,        1,   613440, a1130a4ddf7dbd592e23001c4b98b3fc
+0,        138,        138,        1,   613440, 84eef6f47bff223c6a0916c0688d2f7c
+0,        139,        139,        1,   613440, ccfab0b84c7fc59d850ac5cb8d36da41
+0,        140,        140,        1,   613440, 6866845dfb320ecd9c22444ca7e52c8b
+0,        141,        141,        1,   613440, 3068ceb83ee4d047df3880c64754efd7
+0,        142,        142,        1,   613440, 7f9a74e20cfe10972961e7f21529f7f4
+0,        143,        143,        1,   613440, 29156833963ec7f218d38fca7df132bf
+0,        144,        144,        1,   613440, f8feb4c2ae1ce371fc8b4a83d7dc34e0
+0,        145,        145,        1,   613440, 0e5fe8965da239c17b02f0c902feeaec
+0,        146,        146,        1,   613440, e8d37eb1b8c2576658ebc58a7cc6c0d4
+0,        147,        147,        1,   613440, 0a89fd2784112bbd54eb559a8272ab1e
+0,        148,        148,        1,   613440, 342bc99cdd618272d12d045698b9cb20
+0,        149,        149,        1,   613440, a489a32bb43559b8a1989b13660e3cf6
diff --git a/tests/ref/fate/vp9-16-intra-only b/tests/ref/fate/vp9-16-intra-only
new file mode 100644
index 0000000000..a33e62e10e
--- /dev/null
+++ b/tests/ref/fate/vp9-16-intra-only
@@ -0,0 +1,16 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, d57529601178948afa4818c3c8938884
+0,          1,          1,        1,   152064, d47e00250c45733d64af067a417bcd06
+0,          2,          2,        1,   152064, 984e41cd8350808ac6129746b2377818
+0,          3,          3,        1,   152064, a5fa62996b4bb52e72e335722cf55bef
+0,          4,          4,        1,   152064, b71ca5ad650170ac921a71a6440fb508
+0,          5,          5,        1,   152064, 76ba63001170b8992fc72be5c4ace731
+0,          6,          6,        1,   152064, c4e7f96a8fd58d901b1d881926ddae09
diff --git a/tests/ref/fate/vp9-2pass-akiyo b/tests/ref/fate/vp9-2pass-akiyo
index 5061a76410..59c5429a12 100644
--- a/tests/ref/fate/vp9-2pass-akiyo
+++ b/tests/ref/fate/vp9-2pass-akiyo
@@ -1,51 +1,59 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, 043ce065a309514e1e8ebdcbb3c2458b
-0,         33,         33,        0,   152064, 8579c9cffd95b11db86158e518b2e34a
-0,         66,         66,        0,   152064, ebbba105e499604f5e69b8aa48fe86f4
-0,        100,        100,        0,   152064, b08526fab7e106021f9fb9b1e2d4b725
-0,        133,        133,        0,   152064, 92afa561d06f41ccc6d2e2bcc3ab2ee4
-0,        166,        166,        0,   152064, 50de8ec2db66c783289a3982dd1c4f97
-0,        200,        200,        0,   152064, c2ab55d114b8822adef06ccb093b5ac7
-0,        233,        233,        0,   152064, e3ee4edbe8a1f0b5486bbd8a52e7cbcb
-0,        266,        266,        0,   152064, fc33fd50566cd64e5b13911ee06c6e24
-0,        300,        300,        0,   152064, 05297e847f983a19fe2ba5e05932a110
-0,        333,        333,        0,   152064, d21db9adb27be89ab3b7f75d89175e24
-0,        367,        367,        0,   152064, 29bb87bdebd078f8dd953a70def6c4dc
-0,        400,        400,        0,   152064, c57f7bc772f6143a22edaf926f92de5f
-0,        433,        433,        0,   152064, 39f2fc755d4bc2cc5ec077035382be22
-0,        467,        467,        0,   152064, 000ec9c75374f6d74a5e61189e6fd782
-0,        500,        500,        0,   152064, 3027187c9bdb2a755d14513b7e597bb1
-0,        533,        533,        0,   152064, 2b3129659df2b3aa10b9398c50301e00
-0,        567,        567,        0,   152064, e23bcacf1cafca9a7959508b33e63907
-0,        600,        600,        0,   152064, fe0382dd155284998a0d7eb7effb5adf
-0,        633,        633,        0,   152064, e0a487860dd0df3d865971b483fab3e9
-0,        667,        667,        0,   152064, 7ca757c55b0ea4779cdfa3a535f8f234
-0,        700,        700,        0,   152064, 1a276d27f4ce0e2720e25dbed2e524ae
-0,        734,        734,        0,   152064, dd39bc322c8bdce196a9c2129bcb5d6e
-0,        767,        767,        0,   152064, 63e295427977d645462e0fb3277ccb53
-0,        800,        800,        0,   152064, e9a35655c71da22fb0c7865e0bbc91b8
-0,        834,        834,        0,   152064, 5903bcbccabb3366382b37bf08119dde
-0,        867,        867,        0,   152064, 3b6ce09353b07b193914a71ca2334d8c
-0,        900,        900,        0,   152064, cb3731eb5dbe338125c0a7d6b4bf2868
-0,        934,        934,        0,   152064, 0837c62b54912ed06f7f755894ad3f6b
-0,        967,        967,        0,   152064, 7f215dc14d8e280fc18ad3fb3122fa58
-0,       1001,       1001,        0,   152064, 6dafaf5adc45fead74f0153e3764b17d
-0,       1034,       1034,        0,   152064, e19c8274ee6377dbf005f6516a81c413
-0,       1067,       1067,        0,   152064, 358cbf29bd136d2f9dcb60ab82a2e9e5
-0,       1101,       1101,        0,   152064, 2276d4670ff35c3a76c27c3a5810eea3
-0,       1134,       1134,        0,   152064, 636dd3390d4011c377915d7d3acc9ee1
-0,       1167,       1167,        0,   152064, 5e7a1ed17d80168567d61987425f4e60
-0,       1201,       1201,        0,   152064, c10a4830c5f268888789fccd16c0cc0e
-0,       1234,       1234,        0,   152064, 298ef49418d730a031ff23311031c969
-0,       1267,       1267,        0,   152064, 4dd2249e13cda0f99fa46786d345c96a
-0,       1301,       1301,        0,   152064, 24232dbc6e35a069c60422c4c23dfa51
-0,       1334,       1334,        0,   152064, ae8751c5ac168d6aa4499fe69f018ae2
-0,       1368,       1368,        0,   152064, 6a3a7e60a569e7415f2c3a1453e4dc38
-0,       1401,       1401,        0,   152064, 5475af1c118d1b7cc0a357bc434241a8
-0,       1434,       1434,        0,   152064, c6b5ab39e630e66e8f09698fd1dfa160
-0,       1468,       1468,        0,   152064, f1c0310adf115456167e3fa790e43dde
-0,       1501,       1501,        0,   152064, 3028296307b47d10156fc9657693edc3
-0,       1534,       1534,        0,   152064, 0903dabcb8ac707b423b222ac5bb4898
-0,       1568,       1568,        0,   152064, 713cf71b994e2c85ed577062814c5732
-0,       1601,       1601,        0,   152064, 674f56b9cccf5c9d1f88f68c3996a671
-0,       1634,       1634,        0,   152064, f63732c2ff823960d8b62d866dfb5e6a
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, 043ce065a309514e1e8ebdcbb3c2458b
+0,          1,          1,        1,   152064, 8579c9cffd95b11db86158e518b2e34a
+0,          2,          2,        1,   152064, ebbba105e499604f5e69b8aa48fe86f4
+0,          3,          3,        1,   152064, b08526fab7e106021f9fb9b1e2d4b725
+0,          4,          4,        1,   152064, 92afa561d06f41ccc6d2e2bcc3ab2ee4
+0,          5,          5,        1,   152064, 50de8ec2db66c783289a3982dd1c4f97
+0,          6,          6,        1,   152064, c2ab55d114b8822adef06ccb093b5ac7
+0,          7,          7,        1,   152064, e3ee4edbe8a1f0b5486bbd8a52e7cbcb
+0,          8,          8,        1,   152064, fc33fd50566cd64e5b13911ee06c6e24
+0,          9,          9,        1,   152064, 05297e847f983a19fe2ba5e05932a110
+0,         10,         10,        1,   152064, d21db9adb27be89ab3b7f75d89175e24
+0,         11,         11,        1,   152064, 29bb87bdebd078f8dd953a70def6c4dc
+0,         12,         12,        1,   152064, c57f7bc772f6143a22edaf926f92de5f
+0,         13,         13,        1,   152064, 39f2fc755d4bc2cc5ec077035382be22
+0,         14,         14,        1,   152064, 000ec9c75374f6d74a5e61189e6fd782
+0,         15,         15,        1,   152064, 3027187c9bdb2a755d14513b7e597bb1
+0,         16,         16,        1,   152064, 2b3129659df2b3aa10b9398c50301e00
+0,         17,         17,        1,   152064, e23bcacf1cafca9a7959508b33e63907
+0,         18,         18,        1,   152064, fe0382dd155284998a0d7eb7effb5adf
+0,         19,         19,        1,   152064, e0a487860dd0df3d865971b483fab3e9
+0,         20,         20,        1,   152064, 7ca757c55b0ea4779cdfa3a535f8f234
+0,         21,         21,        1,   152064, 1a276d27f4ce0e2720e25dbed2e524ae
+0,         22,         22,        1,   152064, dd39bc322c8bdce196a9c2129bcb5d6e
+0,         23,         23,        1,   152064, 63e295427977d645462e0fb3277ccb53
+0,         24,         24,        1,   152064, e9a35655c71da22fb0c7865e0bbc91b8
+0,         25,         25,        1,   152064, 5903bcbccabb3366382b37bf08119dde
+0,         26,         26,        1,   152064, 3b6ce09353b07b193914a71ca2334d8c
+0,         27,         27,        1,   152064, cb3731eb5dbe338125c0a7d6b4bf2868
+0,         28,         28,        1,   152064, 0837c62b54912ed06f7f755894ad3f6b
+0,         29,         29,        1,   152064, 7f215dc14d8e280fc18ad3fb3122fa58
+0,         30,         30,        1,   152064, 6dafaf5adc45fead74f0153e3764b17d
+0,         31,         31,        1,   152064, e19c8274ee6377dbf005f6516a81c413
+0,         32,         32,        1,   152064, 358cbf29bd136d2f9dcb60ab82a2e9e5
+0,         33,         33,        1,   152064, 2276d4670ff35c3a76c27c3a5810eea3
+0,         34,         34,        1,   152064, 636dd3390d4011c377915d7d3acc9ee1
+0,         35,         35,        1,   152064, 5e7a1ed17d80168567d61987425f4e60
+0,         36,         36,        1,   152064, c10a4830c5f268888789fccd16c0cc0e
+0,         37,         37,        1,   152064, 298ef49418d730a031ff23311031c969
+0,         38,         38,        1,   152064, 4dd2249e13cda0f99fa46786d345c96a
+0,         39,         39,        1,   152064, 24232dbc6e35a069c60422c4c23dfa51
+0,         40,         40,        1,   152064, ae8751c5ac168d6aa4499fe69f018ae2
+0,         41,         41,        1,   152064, 6a3a7e60a569e7415f2c3a1453e4dc38
+0,         42,         42,        1,   152064, 5475af1c118d1b7cc0a357bc434241a8
+0,         43,         43,        1,   152064, c6b5ab39e630e66e8f09698fd1dfa160
+0,         44,         44,        1,   152064, f1c0310adf115456167e3fa790e43dde
+0,         45,         45,        1,   152064, 3028296307b47d10156fc9657693edc3
+0,         46,         46,        1,   152064, 0903dabcb8ac707b423b222ac5bb4898
+0,         47,         47,        1,   152064, 713cf71b994e2c85ed577062814c5732
+0,         48,         48,        1,   152064, 674f56b9cccf5c9d1f88f68c3996a671
+0,         49,         49,        1,   152064, f63732c2ff823960d8b62d866dfb5e6a
diff --git a/tests/ref/fate/vp9-parallelmode-akiyo b/tests/ref/fate/vp9-parallelmode-akiyo
index 097880751f..df3186679c 100644
--- a/tests/ref/fate/vp9-parallelmode-akiyo
+++ b/tests/ref/fate/vp9-parallelmode-akiyo
@@ -1,26 +1,34 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, f5bc602db15c69545307e56990f9f9f7
-0,         33,         33,        0,   152064, b56428b6f97669938c8b9b05458fca70
-0,         66,         66,        0,   152064, b56428b6f97669938c8b9b05458fca70
-0,        100,        100,        0,   152064, 3098d2eb9129beddb6975e3ae332a4ab
-0,        133,        133,        0,   152064, 6719f3a6c22f05dc53dd3906e4154bd7
-0,        166,        166,        0,   152064, 8cd9a12761e35f67c278949cd3aee88f
-0,        200,        200,        0,   152064, 8cd9a12761e35f67c278949cd3aee88f
-0,        233,        233,        0,   152064, 0160dec415234d39f148e91f72d264ab
-0,        266,        266,        0,   152064, 9f90d96d67d9e9b3716abe2a3faa854e
-0,        300,        300,        0,   152064, 1edb312f9d0be7835b964a3ffa014759
-0,        333,        333,        0,   152064, 7614fd674609afccacd355aa2f714c75
-0,        367,        367,        0,   152064, cb46868706dd246878bebf354aff66f4
-0,        400,        400,        0,   152064, da36fe96cb4956036f890bb2f6d05b98
-0,        433,        433,        0,   152064, af0a178c68b719b369c8fa8537d38e65
-0,        467,        467,        0,   152064, ff03dbc436376fc60ac240cd6c4fc518
-0,        500,        500,        0,   152064, b0bf25e139556bd9067616db7e4f47b5
-0,        533,        533,        0,   152064, e70d5480c1f82fc877bbe1a8093f807a
-0,        567,        567,        0,   152064, 622fb43e6ff63834f0f680a68b49f6e6
-0,        600,        600,        0,   152064, c331ebba15f2290f174533dbffb3c27b
-0,        633,        633,        0,   152064, 15cb153425c55f7065fb36606c48972e
-0,        667,        667,        0,   152064, b95c7699639c51b08b3615ef7fa7046c
-0,        700,        700,        0,   152064, b4774148c71c9c184bda5a18294e459c
-0,        734,        734,        0,   152064, 795b7ce4c5e0dc343bd8f80ad6c1a454
-0,        767,        767,        0,   152064, 19163601b7b6138e2940cf28f6df6c7f
-0,        800,        800,        0,   152064, b9b388e0892c52df0680a30bfa954506
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, f5bc602db15c69545307e56990f9f9f7
+0,          1,          1,        1,   152064, b56428b6f97669938c8b9b05458fca70
+0,          2,          2,        1,   152064, b56428b6f97669938c8b9b05458fca70
+0,          3,          3,        1,   152064, 3098d2eb9129beddb6975e3ae332a4ab
+0,          4,          4,        1,   152064, 6719f3a6c22f05dc53dd3906e4154bd7
+0,          5,          5,        1,   152064, 8cd9a12761e35f67c278949cd3aee88f
+0,          6,          6,        1,   152064, 8cd9a12761e35f67c278949cd3aee88f
+0,          7,          7,        1,   152064, 0160dec415234d39f148e91f72d264ab
+0,          8,          8,        1,   152064, 9f90d96d67d9e9b3716abe2a3faa854e
+0,          9,          9,        1,   152064, 1edb312f9d0be7835b964a3ffa014759
+0,         10,         10,        1,   152064, 7614fd674609afccacd355aa2f714c75
+0,         11,         11,        1,   152064, cb46868706dd246878bebf354aff66f4
+0,         12,         12,        1,   152064, da36fe96cb4956036f890bb2f6d05b98
+0,         13,         13,        1,   152064, af0a178c68b719b369c8fa8537d38e65
+0,         14,         14,        1,   152064, ff03dbc436376fc60ac240cd6c4fc518
+0,         15,         15,        1,   152064, b0bf25e139556bd9067616db7e4f47b5
+0,         16,         16,        1,   152064, e70d5480c1f82fc877bbe1a8093f807a
+0,         17,         17,        1,   152064, 622fb43e6ff63834f0f680a68b49f6e6
+0,         18,         18,        1,   152064, c331ebba15f2290f174533dbffb3c27b
+0,         19,         19,        1,   152064, 15cb153425c55f7065fb36606c48972e
+0,         20,         20,        1,   152064, b95c7699639c51b08b3615ef7fa7046c
+0,         21,         21,        1,   152064, b4774148c71c9c184bda5a18294e459c
+0,         22,         22,        1,   152064, 795b7ce4c5e0dc343bd8f80ad6c1a454
+0,         23,         23,        1,   152064, 19163601b7b6138e2940cf28f6df6c7f
+0,         24,         24,        1,   152064, b9b388e0892c52df0680a30bfa954506
diff --git a/tests/ref/fate/vp9-segmentation-aq-akiyo b/tests/ref/fate/vp9-segmentation-aq-akiyo
index 2be837a9ed..deb5ac5b38 100644
--- a/tests/ref/fate/vp9-segmentation-aq-akiyo
+++ b/tests/ref/fate/vp9-segmentation-aq-akiyo
@@ -1,26 +1,34 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, b208eac12f0ae74a812bc9e314bdfac7
-0,         33,         33,        0,   152064, ebb2259451c3acf3ad6379d1f4092efb
-0,         66,         66,        0,   152064, 33de46060afd14aa359b7bd0d9ff1be8
-0,        100,        100,        0,   152064, 33de46060afd14aa359b7bd0d9ff1be8
-0,        133,        133,        0,   152064, 5d087d8df10fd406d59172710ea0341a
-0,        166,        166,        0,   152064, 3570ed7fb90ac9b5335b97adf0539e94
-0,        200,        200,        0,   152064, 68a8c56b889a3befc75c9ec4293c7fda
-0,        233,        233,        0,   152064, f871f7c0456f644cfb0ec896132a097f
-0,        266,        266,        0,   152064, 14e939bfeb2b878e0782a7ce68ecd214
-0,        300,        300,        0,   152064, bd3e97881ebece0f876d46d067c6a7ff
-0,        333,        333,        0,   152064, a20529c091ef3e68a901c574371224b3
-0,        367,        367,        0,   152064, 5253f16c8b0329d33d38d275124487fb
-0,        400,        400,        0,   152064, c9c2f7d8835e620709a53ff8adfe72bf
-0,        433,        433,        0,   152064, dc8f1df0d7ab8e4f9daf2ccfd96de855
-0,        467,        467,        0,   152064, d09d43208d4de7f81d54f48cff310b6f
-0,        500,        500,        0,   152064, 0dcf7212075c1f15219690ad6ffe2940
-0,        533,        533,        0,   152064, 3b52e3eb4f972318c6912dd29a95dcf3
-0,        567,        567,        0,   152064, aa1414343067749fbd743ace93553492
-0,        600,        600,        0,   152064, 6951cb7a78e0a03f9a3f6264084de6dc
-0,        633,        633,        0,   152064, 5324f2f03c4d5fe35446561af654e9ec
-0,        667,        667,        0,   152064, dff11b046a02ca34c6b1aecc857632ec
-0,        700,        700,        0,   152064, 971182c013c1524d4864fd946b8c1550
-0,        734,        734,        0,   152064, 3306f1dcd5760ba92dd9cec8bfc21b08
-0,        767,        767,        0,   152064, f1f7b13c33332fece576b4d175f91832
-0,        800,        800,        0,   152064, 9e66573fbfe847149eb32e8a9c242c18
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, b208eac12f0ae74a812bc9e314bdfac7
+0,          1,          1,        1,   152064, ebb2259451c3acf3ad6379d1f4092efb
+0,          2,          2,        1,   152064, 33de46060afd14aa359b7bd0d9ff1be8
+0,          3,          3,        1,   152064, 33de46060afd14aa359b7bd0d9ff1be8
+0,          4,          4,        1,   152064, 5d087d8df10fd406d59172710ea0341a
+0,          5,          5,        1,   152064, 3570ed7fb90ac9b5335b97adf0539e94
+0,          6,          6,        1,   152064, 68a8c56b889a3befc75c9ec4293c7fda
+0,          7,          7,        1,   152064, f871f7c0456f644cfb0ec896132a097f
+0,          8,          8,        1,   152064, 14e939bfeb2b878e0782a7ce68ecd214
+0,          9,          9,        1,   152064, bd3e97881ebece0f876d46d067c6a7ff
+0,         10,         10,        1,   152064, a20529c091ef3e68a901c574371224b3
+0,         11,         11,        1,   152064, 5253f16c8b0329d33d38d275124487fb
+0,         12,         12,        1,   152064, c9c2f7d8835e620709a53ff8adfe72bf
+0,         13,         13,        1,   152064, dc8f1df0d7ab8e4f9daf2ccfd96de855
+0,         14,         14,        1,   152064, d09d43208d4de7f81d54f48cff310b6f
+0,         15,         15,        1,   152064, 0dcf7212075c1f15219690ad6ffe2940
+0,         16,         16,        1,   152064, 3b52e3eb4f972318c6912dd29a95dcf3
+0,         17,         17,        1,   152064, aa1414343067749fbd743ace93553492
+0,         18,         18,        1,   152064, 6951cb7a78e0a03f9a3f6264084de6dc
+0,         19,         19,        1,   152064, 5324f2f03c4d5fe35446561af654e9ec
+0,         20,         20,        1,   152064, dff11b046a02ca34c6b1aecc857632ec
+0,         21,         21,        1,   152064, 971182c013c1524d4864fd946b8c1550
+0,         22,         22,        1,   152064, 3306f1dcd5760ba92dd9cec8bfc21b08
+0,         23,         23,        1,   152064, f1f7b13c33332fece576b4d175f91832
+0,         24,         24,        1,   152064, 9e66573fbfe847149eb32e8a9c242c18
diff --git a/tests/ref/fate/vp9-segmentation-sf-akiyo b/tests/ref/fate/vp9-segmentation-sf-akiyo
index bfef222a42..08f1305a31 100644
--- a/tests/ref/fate/vp9-segmentation-sf-akiyo
+++ b/tests/ref/fate/vp9-segmentation-sf-akiyo
@@ -1,26 +1,34 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   152064, f4e04a0f92fab3a52d858bb222807ac0
-0,         33,         33,        0,   152064, 493cb96b8202a1518c6c9bdb848540e4
-0,         66,         66,        0,   152064, 60b5b63f832cff119a43de82102758f4
-0,        100,        100,        0,   152064, 0d9bd42e279d480603f9c670f0a8ffe3
-0,        133,        133,        0,   152064, 25ca563f233688f32f40fec985a116a2
-0,        166,        166,        0,   152064, dd14b43d538708a91de41606703dbe1c
-0,        200,        200,        0,   152064, 01bb23cb43960ff185a97ea79936d3b4
-0,        233,        233,        0,   152064, 85045c4310ee80cd12979bdea4f3f86e
-0,        266,        266,        0,   152064, c8e015ea13359a05483de349313a6686
-0,        300,        300,        0,   152064, 8dbb0406bf6fe19c30a9c9253fcdfe7f
-0,        333,        333,        0,   152064, 84881463643069036d03e8120a5f15e9
-0,        367,        367,        0,   152064, 9abcd3f2f86ff31f8d357389b330df59
-0,        400,        400,        0,   152064, 19ada6395c4e656578d2ceeaba291bb2
-0,        433,        433,        0,   152064, fc29773a6f32eed2bfa44143f8f505b1
-0,        467,        467,        0,   152064, 5e56bd91f5e3d1457c124b5702bdc3b6
-0,        500,        500,        0,   152064, 5b920d73e301adb6c45699a209f09a33
-0,        533,        533,        0,   152064, 4d06ec294270638c6abdd1c2303b34fc
-0,        567,        567,        0,   152064, dc99797067851f74708d7e6ff54367d8
-0,        600,        600,        0,   152064, 5df68b49124219592b043916affb1311
-0,        633,        633,        0,   152064, cfb52d101fad76acb1bb0d48c513bffd
-0,        667,        667,        0,   152064, 206dbd55680b8a83d8bafe33c54c3e36
-0,        700,        700,        0,   152064, 171f2e26771db631788065eecf6c44d9
-0,        734,        734,        0,   152064, b10809dcf9ecfdb4f86a6f3236ac273e
-0,        767,        767,        0,   152064, b354107bdea9bd011b09d9f4a32d4e89
-0,        800,        800,        0,   152064, 0c18be13dc6fbf79a613f2b24bb301c1
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1001/30000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   152064, f4e04a0f92fab3a52d858bb222807ac0
+0,          1,          1,        1,   152064, 493cb96b8202a1518c6c9bdb848540e4
+0,          2,          2,        1,   152064, 60b5b63f832cff119a43de82102758f4
+0,          3,          3,        1,   152064, 0d9bd42e279d480603f9c670f0a8ffe3
+0,          4,          4,        1,   152064, 25ca563f233688f32f40fec985a116a2
+0,          5,          5,        1,   152064, dd14b43d538708a91de41606703dbe1c
+0,          6,          6,        1,   152064, 01bb23cb43960ff185a97ea79936d3b4
+0,          7,          7,        1,   152064, 85045c4310ee80cd12979bdea4f3f86e
+0,          8,          8,        1,   152064, c8e015ea13359a05483de349313a6686
+0,          9,          9,        1,   152064, 8dbb0406bf6fe19c30a9c9253fcdfe7f
+0,         10,         10,        1,   152064, 84881463643069036d03e8120a5f15e9
+0,         11,         11,        1,   152064, 9abcd3f2f86ff31f8d357389b330df59
+0,         12,         12,        1,   152064, 19ada6395c4e656578d2ceeaba291bb2
+0,         13,         13,        1,   152064, fc29773a6f32eed2bfa44143f8f505b1
+0,         14,         14,        1,   152064, 5e56bd91f5e3d1457c124b5702bdc3b6
+0,         15,         15,        1,   152064, 5b920d73e301adb6c45699a209f09a33
+0,         16,         16,        1,   152064, 4d06ec294270638c6abdd1c2303b34fc
+0,         17,         17,        1,   152064, dc99797067851f74708d7e6ff54367d8
+0,         18,         18,        1,   152064, 5df68b49124219592b043916affb1311
+0,         19,         19,        1,   152064, cfb52d101fad76acb1bb0d48c513bffd
+0,         20,         20,        1,   152064, 206dbd55680b8a83d8bafe33c54c3e36
+0,         21,         21,        1,   152064, 171f2e26771db631788065eecf6c44d9
+0,         22,         22,        1,   152064, b10809dcf9ecfdb4f86a6f3236ac273e
+0,         23,         23,        1,   152064, b354107bdea9bd011b09d9f4a32d4e89
+0,         24,         24,        1,   152064, 0c18be13dc6fbf79a613f2b24bb301c1
diff --git a/tests/ref/fate/vp9-tiling-pedestrian b/tests/ref/fate/vp9-tiling-pedestrian
index 23c760e0a7..4b25a2914a 100644
--- a/tests/ref/fate/vp9-tiling-pedestrian
+++ b/tests/ref/fate/vp9-tiling-pedestrian
@@ -1,3 +1,11 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1920x1080
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
 0,          0,          0,        0,  3110400, 1e6c2e768a5107e57e6d626f0511193a
 0,         40,         40,        0,  3110400, 972d3e2b5ee2e3b0907218a243e4cb7d
diff --git a/tests/ref/fate/vp9-trac3849 b/tests/ref/fate/vp9-trac3849
new file mode 100644
index 0000000000..6d6584a4aa
--- /dev/null
+++ b/tests/ref/fate/vp9-trac3849
@@ -0,0 +1,19 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/30
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 640x360
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   345600, c2ee30cb4529fcbd61938af1887e2b45
+0,          1,          1,        1,   345600, 946e9bfee03777a07c122df038087d92
+0,          2,          2,        1,   345600, 5dd1916a4bad6e94393f6a50a37c823d
+0,          3,          3,        1,   345600, 2f2760d8dcecc1854fd665892382c3af
+0,          4,          4,        1,   345600, 70418b01ae59e2885457b62b7f416bac
+0,          5,          5,        1,   345600, bda937bb934a6eba193daadccdaa418d
+0,          6,          6,        1,   345600, 8348bbb7c260dec6baa135c8f16348a9
+0,          7,          7,        1,   345600, d45bf60db5f25e774d32975eca01f9c7
+0,          8,          8,        1,   345600, 980e73d96767b2097adf26e0ea31d50e
+0,          9,          9,        1,   345600, 66fda810a9a35f1ce57d6f2351b73c13
diff --git a/tests/ref/fate/vp9-trac4359 b/tests/ref/fate/vp9-trac4359
new file mode 100644
index 0000000000..0f50cffb03
--- /dev/null
+++ b/tests/ref/fate/vp9-trac4359
@@ -0,0 +1,13 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,  1382400, 2929e5318edee6cd6b24ede0c1015137
+0,          1,          1,        1,  1382400, ca0d83b04297da33a1aa17129a9fe9c9
+0,          2,          2,        1,  1382400, dfdb277e615307e501f416669a208ff4
+0,          3,          3,        1,  1382400, 9c17c58ea4fc5ff1c3398acbf5cc6c69
diff --git a/tests/ref/fate/vp9p1-04-yuv422 b/tests/ref/fate/vp9p1-04-yuv422
new file mode 100644
index 0000000000..3340e74f40
--- /dev/null
+++ b/tests/ref/fate/vp9p1-04-yuv422
@@ -0,0 +1,19 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x90
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    28800, b81b8a8444ac6ce4a4807c37e0a44c8b
+0,          1,          1,        1,    28800, 344458b82d35ea9944dc841643fc25c2
+0,          2,          2,        1,    28800, 376a4bb3944f052191963740b980eb26
+0,          3,          3,        1,    28800, 2fecb02c842bd7d588415904f2d3a82d
+0,          4,          4,        1,    28800, 0fda2f1dabba5c179599190f179b9782
+0,          5,          5,        1,    28800, a88ac885ee59e3a3a01fa483cdd40274
+0,          6,          6,        1,    28800, e76b488ffa70a05457fc046e7b999c56
+0,          7,          7,        1,    28800, 74ae5e52162f5bbc95258d44a2dd647c
+0,          8,          8,        1,    28800, 0c017e2b12e5192c8d598941d9c93306
+0,          9,          9,        1,    28800, ca3941ee43b7033cb48f8498af127d53
diff --git a/tests/ref/fate/vp9p1-04-yuv440 b/tests/ref/fate/vp9p1-04-yuv440
new file mode 100644
index 0000000000..17c9f99929
--- /dev/null
+++ b/tests/ref/fate/vp9p1-04-yuv440
@@ -0,0 +1,19 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x90
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    28800, 61157ad4fb02a254de8f34ae7b8915dc
+0,          1,          1,        1,    28800, 9431337382bf90d40aa417e297ac05da
+0,          2,          2,        1,    28800, 56b739049cc9e97a1d82018bba3db0ee
+0,          3,          3,        1,    28800, 75138a9b6bb905b2f79a1ebb959ddfea
+0,          4,          4,        1,    28800, 141b2fc9625fad86577838d84a276ef8
+0,          5,          5,        1,    28800, b364668c44a237d4e532e086a55401a9
+0,          6,          6,        1,    28800, a4ca6014d5194e4c921a4cb4289eb315
+0,          7,          7,        1,    28800, cfcacb3d5086d3861f4712a3c87a6b6c
+0,          8,          8,        1,    28800, 228d3fd3d849d021f3690cc538edb0a3
+0,          9,          9,        1,    28800, 97ecf281eb1130723d70e3c8803fa814
diff --git a/tests/ref/fate/vp9p1-04-yuv444 b/tests/ref/fate/vp9p1-04-yuv444
new file mode 100644
index 0000000000..b7e5603fb0
--- /dev/null
+++ b/tests/ref/fate/vp9p1-04-yuv444
@@ -0,0 +1,19 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x288
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   304128, 859df7b3661783e337a16ee79f3c20bc
+0,          1,          1,        1,   304128, 3b3ccf344cd5a478c4c1fa422497183d
+0,          2,          2,        1,   304128, 3be1f565823cb88013a14a93a3cf9480
+0,          3,          3,        1,   304128, 6e188a963deaf46c2d6e741b03c4240c
+0,          4,          4,        1,   304128, 82ead184ae478ac821b1b4b72f28c9cd
+0,          5,          5,        1,   304128, 59bb43badc76b39a228b1ad96b6339ca
+0,          6,          6,        1,   304128, 2eaee790fc188e2251b92dd4ea90c42a
+0,          7,          7,        1,   304128, 2a95f8727589e710dc1b95400916b72e
+0,          8,          8,        1,   304128, b7032f73544a7108fcdcaca2832ecc32
+0,          9,          9,        1,   304128, b7778c35b30bcc400b25ed0e5b7913e1
diff --git a/tests/ref/fate/vp9p2-20-10bit-yuv420 b/tests/ref/fate/vp9p2-20-10bit-yuv420
new file mode 100644
index 0000000000..535bd776d0
--- /dev/null
+++ b/tests/ref/fate/vp9p2-20-10bit-yuv420
@@ -0,0 +1,19 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x90
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    43200, c3964ed9065de7f839b8d878444c6140
+0,          1,          1,        1,    43200, 87595f7f53d6e84af9708dba72422cc4
+0,          2,          2,        1,    43200, 5cadbce099363a71040919e6f1cec496
+0,          3,          3,        1,    43200, 0e3cab2b26b936de245a94b4128a368f
+0,          4,          4,        1,    43200, 07bde452ca50655717a85cd9fdb3f7ce
+0,          5,          5,        1,    43200, 00bee090fe849fee5fd4eb169c62c897
+0,          6,          6,        1,    43200, 4564a423df89d7e9dea1226873ce9a51
+0,          7,          7,        1,    43200, 7580af6956360112191380a677f5e625
+0,          8,          8,        1,    43200, c9d05c5aadf8a372acfc2c93094d003e
+0,          9,          9,        1,    43200, 6c08ea732cda06cf9a12f2e1a089d401
diff --git a/tests/ref/fate/vp9p2-20-12bit-yuv420 b/tests/ref/fate/vp9p2-20-12bit-yuv420
new file mode 100644
index 0000000000..e80859b760
--- /dev/null
+++ b/tests/ref/fate/vp9p2-20-12bit-yuv420
@@ -0,0 +1,19 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x90
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    43200, 8403bd5a381737e1c2d737047f6a5a0b
+0,          1,          1,        1,    43200, 3c0bf7eecc3131e3598f6810d6b70539
+0,          2,          2,        1,    43200, ff020bf894bb88d74426f02a75081695
+0,          3,          3,        1,    43200, 097d81cb29f1caaf4446f3a3de4842d9
+0,          4,          4,        1,    43200, e923a7e7e0349846ba27bd2e6ebdf4df
+0,          5,          5,        1,    43200, 28c6016e6687c7eecbe4057a4dbfe372
+0,          6,          6,        1,    43200, 15ae05537ea7152b535d112871b5ef84
+0,          7,          7,        1,    43200, cb50d043a10a0e9b52eed0e8b3aabc7b
+0,          8,          8,        1,    43200, f97dfbce56e36a42538ef000ce0e937e
+0,          9,          9,        1,    43200, aae42063df910ed31c09eba5f73a195c
diff --git a/tests/ref/fate/vp9p3-20-10bit-yuv422 b/tests/ref/fate/vp9p3-20-10bit-yuv422
new file mode 100644
index 0000000000..53d7e66c95
--- /dev/null
+++ b/tests/ref/fate/vp9p3-20-10bit-yuv422
@@ -0,0 +1,19 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x90
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    57600, 18fed3eff623f0308561e5db0bc28691
+0,          1,          1,        1,    57600, 3f22b2269cd53738e955c4b27ff6abce
+0,          2,          2,        1,    57600, d1a44bae5cf45c68c5ca86f9e1ffd6a0
+0,          3,          3,        1,    57600, 6592a5b6f1a8a18930bf27195a836efc
+0,          4,          4,        1,    57600, f1dc8ba72916630aa8ff07f214bd1baf
+0,          5,          5,        1,    57600, 195db6438c313e870ecfe9db3e3cbe83
+0,          6,          6,        1,    57600, ad1cca6689026c31c2350594b669b7e7
+0,          7,          7,        1,    57600, 6cb437a604a714ea746b429cdd68c47f
+0,          8,          8,        1,    57600, cda524f9de8774cc161224c3b81033f5
+0,          9,          9,        1,    57600, a2ae05ae998b4158a32b96e01ed02241
diff --git a/tests/ref/fate/vp9p3-20-10bit-yuv440 b/tests/ref/fate/vp9p3-20-10bit-yuv440
new file mode 100644
index 0000000000..8b5416eb98
--- /dev/null
+++ b/tests/ref/fate/vp9p3-20-10bit-yuv440
@@ -0,0 +1,29 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x90
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    57600, 504a347654ef41e568c484ab017f5387
+0,          1,          1,        1,    57600, 6110f151a39144da5616227d44b81c21
+0,          2,          2,        1,    57600, a856b5e0675c59fb9329d087580c6c5b
+0,          3,          3,        1,    57600, d951b271bf38e7c9b9d215f7a87a079c
+0,          4,          4,        1,    57600, a9e6feb4142a111c74d46cdbac08f2e6
+0,          5,          5,        1,    57600, 4802b599651e7aa35cd52d0dfbfaa4d3
+0,          6,          6,        1,    57600, 1244f3b9da3341057566915e708c7afb
+0,          7,          7,        1,    57600, 212a02d7ee8d56b6f2a4fd7ee6eb3c93
+0,          8,          8,        1,    57600, 1872091be977628ff5435f9186f64a29
+0,          9,          9,        1,    57600, d5255599c33859ee96474a20929dc4bb
+0,         10,         10,        1,    57600, 16d0056501cd1bfc630f6f99672504a0
+0,         11,         11,        1,    57600, 7dcca62c4dc5d508f38376533648bce6
+0,         12,         12,        1,    57600, 1e1617813af32cbf7be3df11d275339e
+0,         13,         13,        1,    57600, 88b036fde717f72485b24e346f55f9dc
+0,         14,         14,        1,    57600, e689287b89b116ec71670ee479e15717
+0,         15,         15,        1,    57600, 211aa3727dcde2d9dfe15d6cebda69e4
+0,         16,         16,        1,    57600, 3037677f680cbdcac242da94717da3ff
+0,         17,         17,        1,    57600, 0138ea9fd279a939df385ea0c97700ca
+0,         18,         18,        1,    57600, 9da47cb99085c352f9e9a07639a9b3cb
+0,         19,         19,        1,    57600, d369f4c840ccb61ce3aaffc77b5f230e
diff --git a/tests/ref/fate/vp9p3-20-10bit-yuv444 b/tests/ref/fate/vp9p3-20-10bit-yuv444
new file mode 100644
index 0000000000..8896186ad0
--- /dev/null
+++ b/tests/ref/fate/vp9p3-20-10bit-yuv444
@@ -0,0 +1,19 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x90
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    86400, 06a4c4550dc31f75f842a4e65fc32398
+0,          1,          1,        1,    86400, f7feda15d5c2babc1f6438c72d4900e4
+0,          2,          2,        1,    86400, 5aa9924c0a17c2209b72ba7ec9af6fdd
+0,          3,          3,        1,    86400, 01597451aab5498ba89a7f632cd7d0cf
+0,          4,          4,        1,    86400, 9a42ae17c2744c305895acd911066575
+0,          5,          5,        1,    86400, 17c1d9cda113a3ce2fc7387e2adaa89b
+0,          6,          6,        1,    86400, 6c6e303d282d8e043329eb6b29600cb4
+0,          7,          7,        1,    86400, 97b7d47711222a91dd7ac121df01f922
+0,          8,          8,        1,    86400, 69f305bc0a4a92422b5ebe05a3ac8b38
+0,          9,          9,        1,    86400, a559c738c428c2f895e94a31957eec6b
diff --git a/tests/ref/fate/vp9p3-20-12bit-yuv422 b/tests/ref/fate/vp9p3-20-12bit-yuv422
new file mode 100644
index 0000000000..ed4af26c25
--- /dev/null
+++ b/tests/ref/fate/vp9p3-20-12bit-yuv422
@@ -0,0 +1,19 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x90
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    57600, 442a6d932a163907303f1e08056b33b3
+0,          1,          1,        1,    57600, 80b21954eb522f0140e2226a03062839
+0,          2,          2,        1,    57600, 991251ca3f55879e3ed90d5816bf5056
+0,          3,          3,        1,    57600, 33f1a1aa1a48fda4ef7dccf302c4e7bf
+0,          4,          4,        1,    57600, e9faf81b0664be622040910f29e3d522
+0,          5,          5,        1,    57600, fa9aba755df9f52aa551d942bba5e26f
+0,          6,          6,        1,    57600, ef58938b38ced2fecb8afdb9a6d8024b
+0,          7,          7,        1,    57600, ce43338326c024eb187abaeaa64a44b1
+0,          8,          8,        1,    57600, d487dab8c8b9f690f13569f3d1875a6d
+0,          9,          9,        1,    57600, b4ab8672067ffce5df2daa9a2c2496d2
diff --git a/tests/ref/fate/vp9p3-20-12bit-yuv440 b/tests/ref/fate/vp9p3-20-12bit-yuv440
new file mode 100644
index 0000000000..60d5c58a4f
--- /dev/null
+++ b/tests/ref/fate/vp9p3-20-12bit-yuv440
@@ -0,0 +1,29 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x90
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    57600, 9c03fb4aa813522d9a44b3b309b85d19
+0,          1,          1,        1,    57600, 73081beafa17bc23a170172e311c0f54
+0,          2,          2,        1,    57600, 36a1eb7aec96b81d54119e26a5056f48
+0,          3,          3,        1,    57600, 228ca739c96ceb5c63f593790e487a49
+0,          4,          4,        1,    57600, 289e08c01574d23562ce8162b0ec553b
+0,          5,          5,        1,    57600, 76ca62fa4b80bef534e3cb4e37d9f178
+0,          6,          6,        1,    57600, 0d9d5c09c4a453b8b7e04d2904924e15
+0,          7,          7,        1,    57600, b659b38305c3afbbc84f5aab4c373592
+0,          8,          8,        1,    57600, 3f5c87c678c2dc6ffc45ec875920e620
+0,          9,          9,        1,    57600, d758cb908aee57e05af8dd7132ce0973
+0,         10,         10,        1,    57600, 5539bdf8f2cfc09580bd9371c3655989
+0,         11,         11,        1,    57600, 0446cf34d7f1a081e7eef6050cbcb7d8
+0,         12,         12,        1,    57600, 2a29f74bd76f8c2187a0f61ff6935744
+0,         13,         13,        1,    57600, fb4b0e71884069537e3e3e62fbe83877
+0,         14,         14,        1,    57600, 57e19855e60825333fbbd9fdbad54ca0
+0,         15,         15,        1,    57600, 2f111ed5be32c4cbff83efd5530893db
+0,         16,         16,        1,    57600, 87afd9a47e6ee7a71cee99157dd89815
+0,         17,         17,        1,    57600, 72992f2a91f9d91dca5c638d6a2f748c
+0,         18,         18,        1,    57600, ad92cad72adfe2ad43c3be5e3b74439f
+0,         19,         19,        1,    57600, d70f736810724ab968307daf4da1120c
diff --git a/tests/ref/fate/vp9p3-20-12bit-yuv444 b/tests/ref/fate/vp9p3-20-12bit-yuv444
new file mode 100644
index 0000000000..9b3b163309
--- /dev/null
+++ b/tests/ref/fate/vp9p3-20-12bit-yuv444
@@ -0,0 +1,19 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
+#tb 0: 1/50
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x90
+#sar 0: 1/1
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,    86400, d9500a2c9e0b6b44935de019c3583194
+0,          1,          1,        1,    86400, 58edf3e69b332a2b62ca78a8dc99ea68
+0,          2,          2,        1,    86400, ca8894e8496bf0eec64655972323feb2
+0,          3,          3,        1,    86400, 3473bbb77d10631525a6e7240f6f0c68
+0,          4,          4,        1,    86400, 1bc71b016a90d6a79882bd6b8af0cb23
+0,          5,          5,        1,    86400, ebfbb540587c20586d9ff33adee41f24
+0,          6,          6,        1,    86400, e8bd27ebb53f979232abbb9d18b15085
+0,          7,          7,        1,    86400, 820f65d50b3c48ec600924c0bba90c40
+0,          8,          8,        1,    86400, d8d8588550bc9820eb3289c5684dd7a9
+0,          9,          9,        1,    86400, d8bd25842191e47ac1b342655e7015e6
diff --git a/tests/ref/fate/vqa-cc b/tests/ref/fate/vqa-cc
index d3c5e6a8e1..fd7bc704b2 100644
--- a/tests/ref/fate/vqa-cc
+++ b/tests/ref/fate/vqa-cc
@@ -1,39 +1,43 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
 0,          0,          0,        1,   192000, 0x00000000
 0,          1,          1,        1,   192000, 0x00000000
 0,          2,          2,        1,   192000, 0x00000000
 0,          3,          3,        1,   192000, 0x00000000
-0,          4,          4,        1,   192000, 0xcd900ccc
-0,          5,          5,        1,   192000, 0xfd496438
-0,          6,          6,        1,   192000, 0x965f0bf3
-0,          7,          7,        1,   192000, 0x378fca5f
-0,          8,          8,        1,   192000, 0x5ccd8966
-0,          9,          9,        1,   192000, 0x859676f9
-0,         10,         10,        1,   192000, 0x820bfb1c
-0,         11,         11,        1,   192000, 0x7570cc05
-0,         12,         12,        1,   192000, 0xf38bdb06
-0,         13,         13,        1,   192000, 0x9b0cbb44
-0,         14,         14,        1,   192000, 0x0ed70665
-0,         15,         15,        1,   192000, 0xd16de7fc
-0,         16,         16,        1,   192000, 0x97afb484
-0,         17,         17,        1,   192000, 0x012893f3
-0,         18,         18,        1,   192000, 0x742a4b43
-0,         19,         19,        1,   192000, 0x309dcd75
-0,         20,         20,        1,   192000, 0xed7814ac
-0,         21,         21,        1,   192000, 0xdb7de3d7
-0,         22,         22,        1,   192000, 0xe18679a3
-0,         23,         23,        1,   192000, 0xb1f213f4
-0,         24,         24,        1,   192000, 0x33c99b5c
-0,         25,         25,        1,   192000, 0xf66c0c91
-0,         26,         26,        1,   192000, 0x929cdc73
-0,         27,         27,        1,   192000, 0xa723fc3b
-0,         28,         28,        1,   192000, 0xe6395ccc
-0,         29,         29,        1,   192000, 0x147fbf74
-0,         30,         30,        1,   192000, 0x3ec62d28
-0,         31,         31,        1,   192000, 0x22104ffb
-0,         32,         32,        1,   192000, 0x91f25f58
-0,         33,         33,        1,   192000, 0xc91b0e4e
-0,         34,         34,        1,   192000, 0x4683df56
-0,         35,         35,        1,   192000, 0x8ef8932a
-0,         36,         36,        1,   192000, 0xce6c0ec0
-0,         37,         37,        1,   192000, 0xcc10e2a0
+0,          4,          4,        1,   192000, 0x9ee00ccf
+0,          5,          5,        1,   192000, 0x67256507
+0,          6,          6,        1,   192000, 0x74c70e87
+0,          7,          7,        1,   192000, 0x8ecdce9a
+0,          8,          8,        1,   192000, 0xc40f8efd
+0,          9,          9,        1,   192000, 0xb8107dfb
+0,         10,         10,        1,   192000, 0xb4e504eb
+0,         11,         11,        1,   192000, 0x0c7fdb95
+0,         12,         12,        1,   192000, 0x58c9f045
+0,         13,         13,        1,   192000, 0xcba9d0e9
+0,         14,         14,        1,   192000, 0x392a20f6
+0,         15,         15,        1,   192000, 0xc37905cc
+0,         16,         16,        1,   192000, 0xe278cf95
+0,         17,         17,        1,   192000, 0x3d03b01d
+0,         18,         18,        1,   192000, 0x16a26f28
+0,         19,         19,        1,   192000, 0xdd17f51c
+0,         20,         20,        1,   192000, 0x19703b85
+0,         21,         21,        1,   192000, 0xe51f0e70
+0,         22,         22,        1,   192000, 0x6f94ad2a
+0,         23,         23,        1,   192000, 0x71e449f1
+0,         24,         24,        1,   192000, 0x1dcacc52
+0,         25,         25,        1,   192000, 0x49c23f58
+0,         26,         26,        1,   192000, 0x4ce61551
+0,         27,         27,        1,   192000, 0xe54832d5
+0,         28,         28,        1,   192000, 0xbae28a59
+0,         29,         29,        1,   192000, 0xe8a4efbe
+0,         30,         30,        1,   192000, 0xe9e96883
+0,         31,         31,        1,   192000, 0xa5468c49
+0,         32,         32,        1,   192000, 0x7ec6936a
+0,         33,         33,        1,   192000, 0x46e53ee4
+0,         34,         34,        1,   192000, 0x937b168a
+0,         35,         35,        1,   192000, 0xed76cec4
+0,         36,         36,        1,   192000, 0x4b9f454d
+0,         37,         37,        1,   192000, 0xb58c1566
diff --git a/tests/ref/fate/vqf-demux b/tests/ref/fate/vqf-demux
index 3acae60f5a..d768ddbb69 100644
--- a/tests/ref/fate/vqf-demux
+++ b/tests/ref/fate/vqf-demux
@@ -1 +1 @@
-d72fb75fb22f4bcc94a1dc7af5356ec1
+5f4cd9a6a8bea0040db6732a7830e9d7
diff --git a/tests/ref/fate/wav-ac3 b/tests/ref/fate/wav-ac3
new file mode 100644
index 0000000000..039e155daf
--- /dev/null
+++ b/tests/ref/fate/wav-ac3
@@ -0,0 +1,48 @@
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: ac3
+#sample_rate 0: 44100
+#channel_layout 0: 60f
+#channel_layout_name 0: 5.1(side)
+0,          0,          0,     1536,     2786, 0xe2fd0f40
+0,       1536,       1536,     1536,     2786, 0x7a6207c2
+0,       3072,       3072,     1536,     2786, 0x7a6207c2
+0,       4608,       4608,     1536,     2786, 0x7a6207c2
+0,       6144,       6144,     1536,     2786, 0x7a6207c2
+0,       7680,       7680,     1536,     2786, 0x7a6207c2
+0,       9216,       9216,     1536,     2786, 0x41be035e
+0,      10752,      10752,     1536,     2786, 0xc799072a
+0,      12288,      12288,     1536,     2786, 0xf5eb0603
+0,      13824,      13824,     1536,     2786, 0x3d330bb2
+0,      15360,      15360,     1536,     2786, 0x992206d2
+0,      16896,      16896,     1536,     2786, 0x89051878
+0,      18432,      18432,     1536,     2786, 0xe6291a6b
+0,      19968,      19968,     1536,     2786, 0x07c133b4
+0,      21504,      21504,     1536,     2786, 0x61c42e35
+0,      23040,      23040,     1536,     2786, 0x9ec542ae
+0,      24576,      24576,     1536,     2786, 0x42544e06
+0,      26112,      26112,     1536,     2786, 0x0c495e62
+0,      27648,      27648,     1536,     2786, 0x062f78bc
+0,      29184,      29184,     1536,     2786, 0x497a8be9
+0,      30720,      30720,     1536,     2786, 0xedae978e
+0,      32256,      32256,     1536,     2786, 0x77cfaa0f
+0,      33792,      33792,     1536,     2786, 0x1471b792
+0,      35328,      35328,     1536,     2786, 0x76b7daf9
+0,      36864,      36864,     1536,     2786, 0xfc85f35f
+0,      38400,      38400,     1536,     2786, 0xebf8213b
+0,      39936,      39936,     1536,     2786, 0x59e73f77
+0,      41472,      41472,     1536,     2786, 0x98615899
+0,      43008,      43008,     1536,     2786, 0xd9fc642c
+0,      44544,      44544,     1536,     2786, 0x10378c7c
+0,      46080,      46080,     1536,     2786, 0x1d6abbb1
+0,      47616,      47616,     1536,     2786, 0xbe28d007
+0,      49152,      49152,     1536,     2786, 0xa427f2c1
+0,      50688,      50688,     1536,     2786, 0xb43203a3
+0,      52224,      52224,     1536,     2786, 0xcb6d0f2b
+0,      53760,      53760,     1536,     2786, 0x7b833d5c
+0,      55296,      55296,     1536,     2786, 0x26477105
+0,      56832,      56832,     1536,     2786, 0xef16814d
+0,      58368,      58368,     1536,     2786, 0x2a43ae86
+0,      59904,      59904,     1536,     2786, 0x5af1ccb3
+0,      61440,      61440,     1536,     2786, 0x6fa20941
+0,      62976,      62976,     1536,     2786, 0x5d4f336a
diff --git a/tests/ref/fate/wc3movie-xan b/tests/ref/fate/wc3movie-xan
index 57b7f70edc..052dbbce7d 100644
--- a/tests/ref/fate/wc3movie-xan
+++ b/tests/ref/fate/wc3movie-xan
@@ -1,5 +1,14 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x165
+#sar 0: 0/1
 #tb 1: 1/22050
+#media_type 1: audio
+#codec_id 1: pcm_s16le
+#sample_rate 1: 22050
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        1,   158400, 0x25aec781
 1,          0,          0,     1470,     2940, 0x92cee2a6
 0,          1,          1,        1,   158400, 0xda4dbf70
diff --git a/tests/ref/fate/webm-dash-manifest b/tests/ref/fate/webm-dash-manifest
new file mode 100644
index 0000000000..f5fc9121da
--- /dev/null
+++ b/tests/ref/fate/webm-dash-manifest
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MPD
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="urn:mpeg:DASH:schema:MPD:2011"
+  xsi:schemaLocation="urn:mpeg:DASH:schema:MPD:2011"
+  type="static"
+  mediaPresentationDuration="PT32.501S"
+  minBufferTime="PT1S"
+  profiles="urn:webm:dash:profile:webm-on-demand:2012">
+<Period id="0" start="PT0S" duration="PT32.501S" >
+<AdaptationSet id="0" mimeType="video/webm" codecs="vp8" lang="eng" width="640" height="360" bitstreamSwitching="true" subsegmentAlignment="true" subsegmentStartsWithSAP="1">
+<Representation id="0" bandwidth="302355">
+<BaseURL>dash_video1.webm</BaseURL>
+<SegmentBase
+  indexRange="1115974-1116097">
+<Initialization
+  range="0-441" />
+</SegmentBase>
+</Representation>
+<Representation id="1" bandwidth="302355">
+<BaseURL>dash_video2.webm</BaseURL>
+<SegmentBase
+  indexRange="1115782-1115879">
+<Initialization
+  range="0-249" />
+</SegmentBase>
+</Representation>
+</AdaptationSet>
+<AdaptationSet id="1" mimeType="audio/webm" codecs="vorbis" lang="eng" audioSamplingRate="44100" bitstreamSwitching="true" subsegmentAlignment="false" subsegmentStartsWithSAP="1">
+<Representation id="2" bandwidth="82867">
+<BaseURL>dash_audio1.webm</BaseURL>
+<SegmentBase
+  indexRange="335488-335612">
+<Initialization
+  range="0-4103" />
+</SegmentBase>
+</Representation>
+<Representation id="3" bandwidth="82814">
+<BaseURL>dash_audio2.webm</BaseURL>
+<SegmentBase
+  indexRange="335312-335425">
+<Initialization
+  range="0-3927" />
+</SegmentBase>
+</Representation>
+</AdaptationSet>
+</Period>
+</MPD>
diff --git a/tests/ref/fate/webm-dash-manifest-live b/tests/ref/fate/webm-dash-manifest-live
new file mode 100644
index 0000000000..6df7f87cca
--- /dev/null
+++ b/tests/ref/fate/webm-dash-manifest-live
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MPD
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="urn:mpeg:DASH:schema:MPD:2011"
+  xsi:schemaLocation="urn:mpeg:DASH:schema:MPD:2011"
+  type="dynamic"
+  minBufferTime="PT1S"
+  profiles="urn:mpeg:dash:profile:isoff-live:2011"
+  availabilityStartTime=""
+  timeShiftBufferDepth="PT7200S"
+  minimumUpdatePeriod="PT60S">
+<Period id="0" start="PT0S" >
+<AdaptationSet id="0" mimeType="video/webm" codecs="vp9" bitstreamSwitching="true" subsegmentAlignment="true" subsegmentStartsWithSAP="1">
+<ContentComponent id="1" type="video"/>
+<SegmentTemplate timescale="1000" duration="5000" media="dash_live_video_$RepresentationID$_$Number$.chk" startNumber="1" initialization="dash_live_video_$RepresentationID$.hdr"/>
+<Representation id="360" bandwidth="1000000" width="640" height="360" codecs="vp9" mimeType="video/webm" startsWithSAP="1"></Representation>
+</AdaptationSet>
+<AdaptationSet id="1" mimeType="audio/webm" codecs="vorbis" bitstreamSwitching="true" subsegmentAlignment="true" subsegmentStartsWithSAP="1">
+<ContentComponent id="1" type="audio"/>
+<SegmentTemplate timescale="1000" duration="5000" media="dash_live_audio_$RepresentationID$_$Number$.chk" startNumber="1" initialization="dash_live_audio_$RepresentationID$.hdr"/>
+<Representation id="171" bandwidth="128000" audioSamplingRate="32000" codecs="vorbis" mimeType="audio/webm" startsWithSAP="1"></Representation>
+</AdaptationSet>
+</Period>
+</MPD>
diff --git a/tests/ref/fate/webm-dash-manifest-live-bandwidth b/tests/ref/fate/webm-dash-manifest-live-bandwidth
new file mode 100644
index 0000000000..18b8951283
--- /dev/null
+++ b/tests/ref/fate/webm-dash-manifest-live-bandwidth
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MPD
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="urn:mpeg:DASH:schema:MPD:2011"
+  xsi:schemaLocation="urn:mpeg:DASH:schema:MPD:2011"
+  type="dynamic"
+  minBufferTime="PT1S"
+  profiles="urn:mpeg:dash:profile:isoff-live:2011"
+  availabilityStartTime=""
+  timeShiftBufferDepth="PT7200S"
+  minimumUpdatePeriod="PT60S">
+<Period id="0" start="PT0S" >
+<AdaptationSet id="0" mimeType="video/webm" codecs="vp9" bitstreamSwitching="true" subsegmentAlignment="true" subsegmentStartsWithSAP="1">
+<ContentComponent id="1" type="video"/>
+<SegmentTemplate timescale="1000" duration="5000" media="dash_live_video_$RepresentationID$_$Number$.chk" startNumber="1" initialization="dash_live_video_$RepresentationID$.hdr"/>
+<Representation id="360" bandwidth="100" width="640" height="360" codecs="vp9" mimeType="video/webm" startsWithSAP="1"></Representation>
+</AdaptationSet>
+<AdaptationSet id="1" mimeType="audio/webm" codecs="vorbis" bitstreamSwitching="true" subsegmentAlignment="true" subsegmentStartsWithSAP="1">
+<ContentComponent id="1" type="audio"/>
+<SegmentTemplate timescale="1000" duration="5000" media="dash_live_audio_$RepresentationID$_$Number$.chk" startNumber="1" initialization="dash_live_audio_$RepresentationID$.hdr"/>
+<Representation id="171" bandwidth="200" audioSamplingRate="32000" codecs="vorbis" mimeType="audio/webm" startsWithSAP="1"></Representation>
+</AdaptationSet>
+</Period>
+</MPD>
diff --git a/tests/ref/fate/webm-dash-manifest-representations b/tests/ref/fate/webm-dash-manifest-representations
new file mode 100644
index 0000000000..8556ecebee
--- /dev/null
+++ b/tests/ref/fate/webm-dash-manifest-representations
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MPD
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="urn:mpeg:DASH:schema:MPD:2011"
+  xsi:schemaLocation="urn:mpeg:DASH:schema:MPD:2011"
+  type="static"
+  mediaPresentationDuration="PT32.48S"
+  minBufferTime="PT1S"
+  profiles="urn:webm:dash:profile:webm-on-demand:2012">
+<Period id="0" start="PT0S" duration="PT32.48S" >
+<AdaptationSet id="0" mimeType="video/webm" codecs="vp8" lang="eng" bitstreamSwitching="true" subsegmentAlignment="false" subsegmentStartsWithSAP="1">
+<Representation id="0" bandwidth="302355" width="640" height="360">
+<BaseURL>dash_video1.webm</BaseURL>
+<SegmentBase
+  indexRange="1115974-1116097">
+<Initialization
+  range="0-441" />
+</SegmentBase>
+</Representation>
+<Representation id="1" bandwidth="243938" width="320" height="240">
+<BaseURL>dash_video4.webm</BaseURL>
+<SegmentBase
+  indexRange="871124-871645">
+<Initialization
+  range="0-437" />
+</SegmentBase>
+</Representation>
+</AdaptationSet>
+</Period>
+</MPD>
diff --git a/tests/ref/fate/webm-dash-manifest-unaligned-audio-streams b/tests/ref/fate/webm-dash-manifest-unaligned-audio-streams
new file mode 100644
index 0000000000..6e9de211fb
--- /dev/null
+++ b/tests/ref/fate/webm-dash-manifest-unaligned-audio-streams
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MPD
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="urn:mpeg:DASH:schema:MPD:2011"
+  xsi:schemaLocation="urn:mpeg:DASH:schema:MPD:2011"
+  type="static"
+  mediaPresentationDuration="PT32.501S"
+  minBufferTime="PT1S"
+  profiles="urn:webm:dash:profile:webm-on-demand:2012">
+<Period id="0" start="PT0S" duration="PT32.501S" >
+<AdaptationSet id="0" mimeType="audio/webm" codecs="vorbis" lang="eng" audioSamplingRate="44100" bitstreamSwitching="false" subsegmentAlignment="false" subsegmentStartsWithSAP="1">
+<Representation id="0" bandwidth="82867">
+<BaseURL>dash_audio1.webm</BaseURL>
+<SegmentBase
+  indexRange="335488-335612">
+<Initialization
+  range="0-4103" />
+</SegmentBase>
+</Representation>
+<Representation id="1" bandwidth="83502">
+<BaseURL>dash_audio3.webm</BaseURL>
+<SegmentBase
+  indexRange="335312-335425">
+<Initialization
+  range="0-3927" />
+</SegmentBase>
+</Representation>
+</AdaptationSet>
+</Period>
+</MPD>
diff --git a/tests/ref/fate/webm-dash-manifest-unaligned-video-streams b/tests/ref/fate/webm-dash-manifest-unaligned-video-streams
new file mode 100644
index 0000000000..ce205638b6
--- /dev/null
+++ b/tests/ref/fate/webm-dash-manifest-unaligned-video-streams
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MPD
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="urn:mpeg:DASH:schema:MPD:2011"
+  xsi:schemaLocation="urn:mpeg:DASH:schema:MPD:2011"
+  type="static"
+  mediaPresentationDuration="PT32.48S"
+  minBufferTime="PT1S"
+  profiles="urn:webm:dash:profile:webm-on-demand:2012">
+<Period id="0" start="PT0S" duration="PT32.48S" >
+<AdaptationSet id="0" mimeType="video/webm" codecs="vp8" lang="eng" width="640" height="360" bitstreamSwitching="true" subsegmentAlignment="false" subsegmentStartsWithSAP="0">
+<Representation id="0" bandwidth="302355">
+<BaseURL>dash_video1.webm</BaseURL>
+<SegmentBase
+  indexRange="1115974-1116097">
+<Initialization
+  range="0-441" />
+</SegmentBase>
+</Representation>
+<Representation id="1" bandwidth="321574">
+<BaseURL>dash_video3.webm</BaseURL>
+<SegmentBase
+  indexRange="1116070-1116455">
+<Initialization
+  range="0-249" />
+</SegmentBase>
+</Representation>
+</AdaptationSet>
+</Period>
+</MPD>
diff --git a/tests/ref/fate/webp-rgb-lena-lossless b/tests/ref/fate/webp-rgb-lena-lossless
new file mode 100644
index 0000000000..c00715a5e7
--- /dev/null
+++ b/tests/ref/fate/webp-rgb-lena-lossless
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    65536, 0xdfcd01ae
diff --git a/tests/ref/fate/webp-rgb-lena-lossless-rgb24 b/tests/ref/fate/webp-rgb-lena-lossless-rgb24
new file mode 100644
index 0000000000..7f8f550afe
--- /dev/null
+++ b/tests/ref/fate/webp-rgb-lena-lossless-rgb24
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 128x128
+#sar 0: 0/1
+0,          0,          0,        1,    49152, 0xe0013dee
diff --git a/tests/ref/fate/webp-rgb-lossless b/tests/ref/fate/webp-rgb-lossless
new file mode 100644
index 0000000000..8dbdfd6887
--- /dev/null
+++ b/tests/ref/fate/webp-rgb-lossless
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 0/1
+0,          0,          0,        1,      384, 0xe30d1b01
diff --git a/tests/ref/fate/webp-rgb-lossy-q80 b/tests/ref/fate/webp-rgb-lossy-q80
new file mode 100644
index 0000000000..f61d75ac13
--- /dev/null
+++ b/tests/ref/fate/webp-rgb-lossy-q80
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 0/1
+0,          0,          0,        1,      144, 0xf38b5307
diff --git a/tests/ref/fate/webp-rgba-lossless b/tests/ref/fate/webp-rgba-lossless
new file mode 100644
index 0000000000..bb654ae442
--- /dev/null
+++ b/tests/ref/fate/webp-rgba-lossless
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 0/1
+0,          0,          0,        1,      384, 0xbd35e0e6
diff --git a/tests/ref/fate/webp-rgba-lossy-q80 b/tests/ref/fate/webp-rgba-lossy-q80
new file mode 100644
index 0000000000..d2c2aa3fce
--- /dev/null
+++ b/tests/ref/fate/webp-rgba-lossy-q80
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 12x8
+#sar 0: 0/1
+0,          0,          0,        1,      240, 0xc56c96c3
diff --git a/tests/ref/fate/webp-yuv420p b/tests/ref/fate/webp-yuv420p
deleted file mode 100644
index ced2ead363..0000000000
--- a/tests/ref/fate/webp-yuv420p
+++ /dev/null
@@ -1,2 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,   135200, 0xc2e0319d
diff --git a/tests/ref/fate/webp-yuva420p b/tests/ref/fate/webp-yuva420p
deleted file mode 100644
index 3350edf2d7..0000000000
--- a/tests/ref/fate/webp-yuva420p
+++ /dev/null
@@ -1,2 +0,0 @@
-#tb 0: 1/25
-0,          0,          0,        1,   301200, 0x12b071a0
diff --git a/tests/ref/fate/westwood-aud b/tests/ref/fate/westwood-aud
index 9fab24197a..b719c50a4d 100644
--- a/tests/ref/fate/westwood-aud
+++ b/tests/ref/fate/westwood-aud
@@ -1,4 +1,9 @@
 #tb 0: 1/22050
+#media_type 0: audio
+#codec_id 0: adpcm_ima_ws
+#sample_rate 0: 22050
+#channel_layout 0: 4
+#channel_layout_name 0: mono
 0,          0,          0,     1024,      512, 0x6694cc55
 0,       1024,       1024,     1024,      512, 0xdbc5cb22
 0,       2048,       2048,     1024,      512, 0x8e5bcbfd
diff --git a/tests/ref/fate/wmv3-drm-dec b/tests/ref/fate/wmv3-drm-dec
index 7f4b523642..d802b5ece2 100644
--- a/tests/ref/fate/wmv3-drm-dec
+++ b/tests/ref/fate/wmv3-drm-dec
@@ -1,130 +1,134 @@
-#tb 0: 1/1000
-0,          0,          0,        0,    84480, 0x7760a00b
-0,       1208,       1208,        0,    84480, 0xfe39a1db
-0,       1250,       1250,        0,    84480, 0xd71961b4
-0,       1291,       1291,        0,    84480, 0xc80dedba
-0,       1333,       1333,        0,    84480, 0x34d8b538
-0,       1375,       1375,        0,    84480, 0x1a86b8e5
-0,       1416,       1416,        0,    84480, 0xabf7c25d
-0,       1458,       1458,        0,    84480, 0x912600ee
-0,       1500,       1500,        0,    84480, 0x7ee7c70b
-0,       1541,       1541,        0,    84480, 0x09c5b0d1
-0,       1583,       1583,        0,    84480, 0x6dbe6c0c
-0,       1625,       1625,        0,    84480, 0x0fe0a120
-0,       1666,       1666,        0,    84480, 0x2352d3a2
-0,       1708,       1708,        0,    84480, 0xb22ce92e
-0,       1750,       1750,        0,    84480, 0x31db0099
-0,       1791,       1791,        0,    84480, 0xad2dd73a
-0,       1833,       1833,        0,    84480, 0xb9af8e20
-0,       1875,       1875,        0,    84480, 0x7b956549
-0,       1916,       1916,        0,    84480, 0x3f774b87
-0,       1958,       1958,        0,    84480, 0x824a23a3
-0,       2000,       2000,        0,    84480, 0x4469a8d8
-0,       2041,       2041,        0,    84480, 0xc80c7a0a
-0,       2083,       2083,        0,    84480, 0xcf958549
-0,       2125,       2125,        0,    84480, 0x449746e3
-0,       2166,       2166,        0,    84480, 0xbac66a82
-0,       2208,       2208,        0,    84480, 0x99e85855
-0,       2250,       2250,        0,    84480, 0xa4a17d17
-0,       2291,       2291,        0,    84480, 0xe29c7587
-0,       2333,       2333,        0,    84480, 0x551de592
-0,       2375,       2375,        0,    84480, 0xe0877bce
-0,       2416,       2416,        0,    84480, 0x9660eb35
-0,       2458,       2458,        0,    84480, 0x0a34b644
-0,       2500,       2500,        0,    84480, 0x352919f0
-0,       2541,       2541,        0,    84480, 0xef56ce27
-0,       2583,       2583,        0,    84480, 0x030fe862
-0,       2625,       2625,        0,    84480, 0x2eba33e2
-0,       2666,       2666,        0,    84480, 0x242de401
-0,       2708,       2708,        0,    84480, 0xbadd61ca
-0,       2750,       2750,        0,    84480, 0x2060465b
-0,       2791,       2791,        0,    84480, 0x256e6965
-0,       2833,       2833,        0,    84480, 0x243b7084
-0,       2875,       2875,        0,    84480, 0x8b3c0b47
-0,       2916,       2916,        0,    84480, 0xc174a9af
-0,       2958,       2958,        0,    84480, 0xb6d48686
-0,       3000,       3000,        0,    84480, 0xa3dd1871
-0,       3041,       3041,        0,    84480, 0x04cdcaf7
-0,       3083,       3083,        0,    84480, 0x55f89c94
-0,       3125,       3125,        0,    84480, 0xda657032
-0,       3166,       3166,        0,    84480, 0x38ba7698
-0,       3208,       3208,        0,    84480, 0x4d03a7f2
-0,       3250,       3250,        0,    84480, 0x115d9035
-0,       3291,       3291,        0,    84480, 0x24c6acc6
-0,       3333,       3333,        0,    84480, 0xdd2bbcae
-0,       3375,       3375,        0,    84480, 0xb4fee0b9
-0,       3416,       3416,        0,    84480, 0xc51c14e0
-0,       3458,       3458,        0,    84480, 0xfb7737de
-0,       3500,       3500,        0,    84480, 0x38675fb0
-0,       3541,       3541,        0,    84480, 0x4752c710
-0,       3583,       3583,        0,    84480, 0xfeb7491b
-0,       3625,       3625,        0,    84480, 0xaa248122
-0,       3666,       3666,        0,    84480, 0x9a4af87c
-0,       3708,       3708,        0,    84480, 0xedcf09df
-0,       3750,       3750,        0,    84480, 0x563a05df
-0,       3791,       3791,        0,    84480, 0x0dde1e03
-0,       3833,       3833,        0,    84480, 0xd8f0ff65
-0,       3875,       3875,        0,    84480, 0xbeb9ae1a
-0,       3916,       3916,        0,    84480, 0x416d1468
-0,       3958,       3958,        0,    84480, 0x66c87d4c
-0,       4000,       4000,        0,    84480, 0xa67c0774
-0,       4041,       4041,        0,    84480, 0xd8f8aec1
-0,       4083,       4083,        0,    84480, 0xadfa502b
-0,       4125,       4125,        0,    84480, 0x50bf20e4
-0,       4166,       4166,        0,    84480, 0xbcb3d8cc
-0,       4208,       4208,        0,    84480, 0xa54677d7
-0,       4250,       4250,        0,    84480, 0x3566042d
-0,       4291,       4291,        0,    84480, 0x4c9eed57
-0,       4333,       4333,        0,    84480, 0xc3b90e58
-0,       4375,       4375,        0,    84480, 0x3c042bfa
-0,       4416,       4416,        0,    84480, 0x19f8e890
-0,       4458,       4458,        0,    84480, 0xd3dacfb9
-0,       4500,       4500,        0,    84480, 0x2365fc6f
-0,       4541,       4541,        0,    84480, 0xa2c19d00
-0,       4583,       4583,        0,    84480, 0xce94336f
-0,       4625,       4625,        0,    84480, 0xfa9bcf14
-0,       4916,       4916,        0,    84480, 0x24d6a243
-0,       4958,       4958,        0,    84480, 0xae1c8854
-0,       5000,       5000,        0,    84480, 0xbb8968bf
-0,       5041,       5041,        0,    84480, 0x6f923623
-0,       5083,       5083,        0,    84480, 0x22e98029
-0,       5125,       5125,        0,    84480, 0x8ac33af3
-0,       5166,       5166,        0,    84480, 0x05947b6e
-0,       5208,       5208,        0,    84480, 0xfc35661a
-0,       5250,       5250,        0,    84480, 0x0e6b6e47
-0,       5291,       5291,        0,    84480, 0x82c764bb
-0,       5333,       5333,        0,    84480, 0x57a36833
-0,       5375,       5375,        0,    84480, 0xc8dd690a
-0,       5416,       5416,        0,    84480, 0x02c47232
-0,       5458,       5458,        0,    84480, 0x6645715d
-0,       5500,       5500,        0,    84480, 0xc64860f7
-0,       5541,       5541,        0,    84480, 0x4f5614b3
-0,       5583,       5583,        0,    84480, 0xa70842ca
-0,       5625,       5625,        0,    84480, 0x379d8458
-0,       5666,       5666,        0,    84480, 0xa14701cf
-0,       5708,       5708,        0,    84480, 0xad1aa2b2
-0,       5750,       5750,        0,    84480, 0xee28f320
-0,       5791,       5791,        0,    84480, 0x505801e9
-0,       5833,       5833,        0,    84480, 0x7947233b
-0,       5875,       5875,        0,    84480, 0x3ce72a9d
-0,       5916,       5916,        0,    84480, 0xa6834e64
-0,       5958,       5958,        0,    84480, 0xfebf4d70
-0,       6000,       6000,        0,    84480, 0x4a0775e2
-0,       6041,       6041,        0,    84480, 0x9d7e945b
-0,       6083,       6083,        0,    84480, 0xaa9eadd9
-0,       6125,       6125,        0,    84480, 0xaa85c9b1
-0,       6166,       6166,        0,    84480, 0xa005edaf
-0,       6208,       6208,        0,    84480, 0x7fc4e5cc
-0,       6250,       6250,        0,    84480, 0xb0f6e8d1
-0,       6291,       6291,        0,    84480, 0x9ef9f330
-0,       6333,       6333,        0,    84480, 0xbe14ff1f
-0,       6375,       6375,        0,    84480, 0xd494048c
-0,       6416,       6416,        0,    84480, 0x046166a7
-0,       6458,       6458,        0,    84480, 0x052a09b2
-0,       6500,       6500,        0,    84480, 0x71fff4ab
-0,       6541,       6541,        0,    84480, 0xb9684e41
-0,       6583,       6583,        0,    84480, 0x1ddce068
-0,       6625,       6625,        0,    84480, 0xb9de300e
-0,       6666,       6666,        0,    84480, 0x13962590
-0,       6708,       6708,        0,    84480, 0xde79482f
-0,       6750,       6750,        0,    84480, 0x7d1ca064
+#tb 0: 1/24
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x176
+#sar 0: 0/1
+0,          0,          0,        1,    84480, 0x7760a00b
+0,         29,         29,        1,    84480, 0xfe39a1db
+0,         30,         30,        1,    84480, 0xd71961b4
+0,         31,         31,        1,    84480, 0xc80dedba
+0,         32,         32,        1,    84480, 0x34d8b538
+0,         33,         33,        1,    84480, 0x1a86b8e5
+0,         34,         34,        1,    84480, 0xabf7c25d
+0,         35,         35,        1,    84480, 0x912600ee
+0,         36,         36,        1,    84480, 0x7ee7c70b
+0,         37,         37,        1,    84480, 0x09c5b0d1
+0,         38,         38,        1,    84480, 0x6dbe6c0c
+0,         39,         39,        1,    84480, 0x0fe0a120
+0,         40,         40,        1,    84480, 0x2352d3a2
+0,         41,         41,        1,    84480, 0xb22ce92e
+0,         42,         42,        1,    84480, 0x31db0099
+0,         43,         43,        1,    84480, 0xad2dd73a
+0,         44,         44,        1,    84480, 0xb9af8e20
+0,         45,         45,        1,    84480, 0x7b956549
+0,         46,         46,        1,    84480, 0x3f774b87
+0,         47,         47,        1,    84480, 0x824a23a3
+0,         48,         48,        1,    84480, 0x4469a8d8
+0,         49,         49,        1,    84480, 0xc80c7a0a
+0,         50,         50,        1,    84480, 0xcf958549
+0,         51,         51,        1,    84480, 0x449746e3
+0,         52,         52,        1,    84480, 0xbac66a82
+0,         53,         53,        1,    84480, 0x99e85855
+0,         54,         54,        1,    84480, 0xa4a17d17
+0,         55,         55,        1,    84480, 0xe29c7587
+0,         56,         56,        1,    84480, 0x551de592
+0,         57,         57,        1,    84480, 0xe0877bce
+0,         58,         58,        1,    84480, 0x9660eb35
+0,         59,         59,        1,    84480, 0x0a34b644
+0,         60,         60,        1,    84480, 0x352919f0
+0,         61,         61,        1,    84480, 0xef56ce27
+0,         62,         62,        1,    84480, 0x030fe862
+0,         63,         63,        1,    84480, 0x2eba33e2
+0,         64,         64,        1,    84480, 0x242de401
+0,         65,         65,        1,    84480, 0xbadd61ca
+0,         66,         66,        1,    84480, 0x2060465b
+0,         67,         67,        1,    84480, 0x256e6965
+0,         68,         68,        1,    84480, 0x243b7084
+0,         69,         69,        1,    84480, 0x8b3c0b47
+0,         70,         70,        1,    84480, 0xc174a9af
+0,         71,         71,        1,    84480, 0xb6d48686
+0,         72,         72,        1,    84480, 0xa3dd1871
+0,         73,         73,        1,    84480, 0x04cdcaf7
+0,         74,         74,        1,    84480, 0x55f89c94
+0,         75,         75,        1,    84480, 0xda657032
+0,         76,         76,        1,    84480, 0x38ba7698
+0,         77,         77,        1,    84480, 0x4d03a7f2
+0,         78,         78,        1,    84480, 0x115d9035
+0,         79,         79,        1,    84480, 0x24c6acc6
+0,         80,         80,        1,    84480, 0xdd2bbcae
+0,         81,         81,        1,    84480, 0xb4fee0b9
+0,         82,         82,        1,    84480, 0xc51c14e0
+0,         83,         83,        1,    84480, 0xfb7737de
+0,         84,         84,        1,    84480, 0x38675fb0
+0,         85,         85,        1,    84480, 0x4752c710
+0,         86,         86,        1,    84480, 0xfeb7491b
+0,         87,         87,        1,    84480, 0xaa248122
+0,         88,         88,        1,    84480, 0x9a4af87c
+0,         89,         89,        1,    84480, 0xedcf09df
+0,         90,         90,        1,    84480, 0x563a05df
+0,         91,         91,        1,    84480, 0x0dde1e03
+0,         92,         92,        1,    84480, 0xd8f0ff65
+0,         93,         93,        1,    84480, 0xbeb9ae1a
+0,         94,         94,        1,    84480, 0x416d1468
+0,         95,         95,        1,    84480, 0x66c87d4c
+0,         96,         96,        1,    84480, 0xa67c0774
+0,         97,         97,        1,    84480, 0xd8f8aec1
+0,         98,         98,        1,    84480, 0xadfa502b
+0,         99,         99,        1,    84480, 0x50bf20e4
+0,        100,        100,        1,    84480, 0xbcb3d8cc
+0,        101,        101,        1,    84480, 0xa54677d7
+0,        102,        102,        1,    84480, 0x3566042d
+0,        103,        103,        1,    84480, 0x4c9eed57
+0,        104,        104,        1,    84480, 0xc3b90e58
+0,        105,        105,        1,    84480, 0x3c042bfa
+0,        106,        106,        1,    84480, 0x19f8e890
+0,        107,        107,        1,    84480, 0xd3dacfb9
+0,        108,        108,        1,    84480, 0x2365fc6f
+0,        109,        109,        1,    84480, 0xa2c19d00
+0,        110,        110,        1,    84480, 0xce94336f
+0,        111,        111,        1,    84480, 0xfa9bcf14
+0,        118,        118,        1,    84480, 0x24d6a243
+0,        119,        119,        1,    84480, 0xae1c8854
+0,        120,        120,        1,    84480, 0xbb8968bf
+0,        121,        121,        1,    84480, 0x6f923623
+0,        122,        122,        1,    84480, 0x22e98029
+0,        123,        123,        1,    84480, 0x8ac33af3
+0,        124,        124,        1,    84480, 0x05947b6e
+0,        125,        125,        1,    84480, 0xfc35661a
+0,        126,        126,        1,    84480, 0x0e6b6e47
+0,        127,        127,        1,    84480, 0x82c764bb
+0,        128,        128,        1,    84480, 0x57a36833
+0,        129,        129,        1,    84480, 0xc8dd690a
+0,        130,        130,        1,    84480, 0x02c47232
+0,        131,        131,        1,    84480, 0x6645715d
+0,        132,        132,        1,    84480, 0xc64860f7
+0,        133,        133,        1,    84480, 0x4f5614b3
+0,        134,        134,        1,    84480, 0xa70842ca
+0,        135,        135,        1,    84480, 0x379d8458
+0,        136,        136,        1,    84480, 0xa14701cf
+0,        137,        137,        1,    84480, 0xad1aa2b2
+0,        138,        138,        1,    84480, 0xee28f320
+0,        139,        139,        1,    84480, 0x505801e9
+0,        140,        140,        1,    84480, 0x7947233b
+0,        141,        141,        1,    84480, 0x3ce72a9d
+0,        142,        142,        1,    84480, 0xa6834e64
+0,        143,        143,        1,    84480, 0xfebf4d70
+0,        144,        144,        1,    84480, 0x4a0775e2
+0,        145,        145,        1,    84480, 0x9d7e945b
+0,        146,        146,        1,    84480, 0xaa9eadd9
+0,        147,        147,        1,    84480, 0xaa85c9b1
+0,        148,        148,        1,    84480, 0xa005edaf
+0,        149,        149,        1,    84480, 0x7fc4e5cc
+0,        150,        150,        1,    84480, 0xb0f6e8d1
+0,        151,        151,        1,    84480, 0x9ef9f330
+0,        152,        152,        1,    84480, 0xbe14ff1f
+0,        153,        153,        1,    84480, 0xd494048c
+0,        154,        154,        1,    84480, 0x046166a7
+0,        155,        155,        1,    84480, 0x052a09b2
+0,        156,        156,        1,    84480, 0x71fff4ab
+0,        157,        157,        1,    84480, 0xb9684e41
+0,        158,        158,        1,    84480, 0x1ddce068
+0,        159,        159,        1,    84480, 0xb9de300e
+0,        160,        160,        1,    84480, 0x13962590
+0,        161,        161,        1,    84480, 0xde79482f
+0,        162,        162,        1,    84480, 0x7d1ca064
diff --git a/tests/ref/fate/wmv3-drm-nodec b/tests/ref/fate/wmv3-drm-nodec
index 679bc7ea98..a46c338d54 100644
--- a/tests/ref/fate/wmv3-drm-nodec
+++ b/tests/ref/fate/wmv3-drm-nodec
@@ -1,151 +1,163 @@
+#extradata 0:        4, 0x021800a2
+#extradata 1:       46, 0x63d9043a
 #tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: wmv3
+#dimensions 0: 320x176
+#sar 0: 0/1
 #tb 1: 1/1000
+#media_type 1: audio
+#codec_id 1: wmavoice
+#sample_rate 1: 22050
+#channel_layout 1: 4
+#channel_layout_name 1: mono
 0,          0,          0,        0,      282, 0x000d949a
 1,          0,          0,        0,     1088, 0x5cd379bb
 1,        435,        435,        0,     1088, 0x8dfa1368
 1,        740,        740,        0,     1088, 0xc0d211be
 1,       1023,       1023,        0,     1088, 0x8238113a
-0,       1208,       1208,        0,      137, 0x903c415e
-0,       1250,       1250,        0,      942, 0xd5b7d2aa
-0,       1291,       1291,        0,      841, 0xaffd8ce6
+0,       1208,       1208,        0,      137, 0x903c415e, F=0x0
+0,       1250,       1250,        0,      942, 0xd5b7d2aa, F=0x0
+0,       1291,       1291,        0,      841, 0xaffd8ce6, F=0x0
 1,       1306,       1306,        0,     1088, 0x9f8924b7
-0,       1333,       1333,        0,     1164, 0x4ed84836
-0,       1375,       1375,        0,     1492, 0x37f3e8aa
-0,       1416,       1416,        0,     1663, 0xc091392d
-0,       1458,       1458,        0,     1443, 0x6162c718
-0,       1500,       1500,        0,     1721, 0x7bdb3dd0
-0,       1541,       1541,        0,     1410, 0xde689881
-0,       1583,       1583,        0,     1258, 0xb5b86920
+0,       1333,       1333,        0,     1164, 0x4ed84836, F=0x0
+0,       1375,       1375,        0,     1492, 0x37f3e8aa, F=0x0
+0,       1416,       1416,        0,     1663, 0xc091392d, F=0x0
+0,       1458,       1458,        0,     1443, 0x6162c718, F=0x0
+0,       1500,       1500,        0,     1721, 0x7bdb3dd0, F=0x0
+0,       1541,       1541,        0,     1410, 0xde689881, F=0x0
+0,       1583,       1583,        0,     1258, 0xb5b86920, F=0x0
 1,       1589,       1589,        0,     1088, 0x767f317a
-0,       1625,       1625,        0,     2050, 0x99b6d7c7
-0,       1666,       1666,        0,     1242, 0x9ba35009
-0,       1708,       1708,        0,     1630, 0x17f10192
-0,       1750,       1750,        0,     1747, 0xbbee59d7
-0,       1791,       1791,        0,     1565, 0xb09b00d9
-0,       1833,       1833,        0,     1573, 0xd2e62201
+0,       1625,       1625,        0,     2050, 0x99b6d7c7, F=0x0
+0,       1666,       1666,        0,     1242, 0x9ba35009, F=0x0
+0,       1708,       1708,        0,     1630, 0x17f10192, F=0x0
+0,       1750,       1750,        0,     1747, 0xbbee59d7, F=0x0
+0,       1791,       1791,        0,     1565, 0xb09b00d9, F=0x0
+0,       1833,       1833,        0,     1573, 0xd2e62201, F=0x0
 1,       1872,       1872,        0,     1088, 0x57000d38
-0,       1875,       1875,        0,     1353, 0x2305a24d
-0,       1916,       1916,        0,     1425, 0xf41bbb46
-0,       1958,       1958,        0,     1355, 0xfc08a762
-0,       2000,       2000,        0,     1363, 0x98cda71d
-0,       2041,       2041,        0,     1547, 0x8742f11f
-0,       2083,       2083,        0,     1967, 0x43d61723
-0,       2125,       2125,        0,     1378, 0xde22c753
-0,       2166,       2166,        0,      961, 0x2418a4da
+0,       1875,       1875,        0,     1353, 0x2305a24d, F=0x0
+0,       1916,       1916,        0,     1425, 0xf41bbb46, F=0x0
+0,       1958,       1958,        0,     1355, 0xfc08a762, F=0x0
+0,       2000,       2000,        0,     1363, 0x98cda71d, F=0x0
+0,       2041,       2041,        0,     1547, 0x8742f11f, F=0x0
+0,       2083,       2083,        0,     1967, 0x43d61723, F=0x0
+0,       2125,       2125,        0,     1378, 0xde22c753, F=0x0
+0,       2166,       2166,        0,      961, 0x2418a4da, F=0x0
 1,       2198,       2198,        0,     1088, 0xad977261
-0,       2208,       2208,        0,      968, 0x0d04ba51
-0,       2250,       2250,        0,     1140, 0x737f3543
-0,       2291,       2291,        0,     1119, 0x3c050388
-0,       2333,       2333,        0,     1078, 0xeac8d981
-0,       2375,       2375,        0,     1113, 0xebfa0314
-0,       2416,       2416,        0,     1229, 0x95dc3cb5
-0,       2458,       2458,        0,     1311, 0x8a6f5bda
-0,       2500,       2500,        0,     1270, 0x2e66540a
-0,       2541,       2541,        0,     1408, 0x5f489779
-0,       2583,       2583,        0,     1359, 0x8bd085f5
-0,       2625,       2625,        0,     1428, 0xef9ba480
-0,       2666,       2666,        0,     1179, 0x5bb221a8
-0,       2708,       2708,        0,     1108, 0x9a6019a8
-0,       2750,       2750,        0,     1205, 0xccba4d22
-0,       2791,       2791,        0,     1306, 0xde708c19
-0,       2833,       2833,       41,     1724, 0xa70b521e
-0,       2875,       2875,       41,     1336, 0xdf3974b9
-0,       2916,       2916,       41,     1259, 0x1f6b4307
-0,       2958,       2958,       41,     1194, 0x635f5a43
-0,       3000,       3000,       41,     1183, 0x1dd47115
-0,       3041,       3041,       41,     1126, 0x5bac3cc8
-0,       3083,       3083,       41,     1360, 0x1fe2d981
-0,       3125,       3125,       41,     1261, 0x34288acb
-0,       3166,       3166,       41,     1250, 0x26bd72b3
-0,       3208,       3208,       41,     1147, 0x02e81ba0
-0,       3250,       3250,       41,     1368, 0xb8146962
-0,       3291,       3291,       41,     1377, 0xf7b6ce65
-0,       3333,       3333,       41,     1396, 0x88467dee
-0,       3375,       3375,       41,     1408, 0x5585c25c
-0,       3416,       3416,       41,     1551, 0x42002c8d
-0,       3458,       3458,       41,     1524, 0xbcb609e3
+0,       2208,       2208,        0,      968, 0x0d04ba51, F=0x0
+0,       2250,       2250,        0,     1140, 0x737f3543, F=0x0
+0,       2291,       2291,        0,     1119, 0x3c050388, F=0x0
+0,       2333,       2333,        0,     1078, 0xeac8d981, F=0x0
+0,       2375,       2375,        0,     1113, 0xebfa0314, F=0x0
+0,       2416,       2416,        0,     1229, 0x95dc3cb5, F=0x0
+0,       2458,       2458,        0,     1311, 0x8a6f5bda, F=0x0
+0,       2500,       2500,        0,     1270, 0x2e66540a, F=0x0
+0,       2541,       2541,        0,     1408, 0x5f489779, F=0x0
+0,       2583,       2583,        0,     1359, 0x8bd085f5, F=0x0
+0,       2625,       2625,        0,     1428, 0xef9ba480, F=0x0
+0,       2666,       2666,        0,     1179, 0x5bb221a8, F=0x0
+0,       2708,       2708,        0,     1108, 0x9a6019a8, F=0x0
+0,       2750,       2750,        0,     1205, 0xccba4d22, F=0x0
+0,       2791,       2791,        0,     1306, 0xde708c19, F=0x0
+0,       2833,       2833,        0,     1724, 0xa70b521e, F=0x0
+0,       2875,       2875,       41,     1336, 0xdf3974b9, F=0x0
+0,       2916,       2916,       41,     1259, 0x1f6b4307, F=0x0
+0,       2958,       2958,       41,     1194, 0x635f5a43, F=0x0
+0,       3000,       3000,       41,     1183, 0x1dd47115, F=0x0
+0,       3041,       3041,       41,     1126, 0x5bac3cc8, F=0x0
+0,       3083,       3083,       41,     1360, 0x1fe2d981, F=0x0
+0,       3125,       3125,       41,     1261, 0x34288acb, F=0x0
+0,       3166,       3166,       41,     1250, 0x26bd72b3, F=0x0
+0,       3208,       3208,       41,     1147, 0x02e81ba0, F=0x0
+0,       3250,       3250,       41,     1368, 0xb8146962, F=0x0
+0,       3291,       3291,       41,     1377, 0xf7b6ce65, F=0x0
+0,       3333,       3333,       41,     1396, 0x88467dee, F=0x0
+0,       3375,       3375,       41,     1408, 0x5585c25c, F=0x0
+0,       3416,       3416,       41,     1551, 0x42002c8d, F=0x0
+0,       3458,       3458,       41,     1524, 0xbcb609e3, F=0x0
 1,       3482,       3482,        0,     1088, 0xdce57471
-0,       3500,       3500,       41,     1554, 0x3d740564
-0,       3541,       3541,       41,     1467, 0xc349f2d7
-0,       3583,       3583,       41,     1066, 0xb7401462
-0,       3625,       3625,       41,     1502, 0x3ee602ed
-0,       3666,       3666,       41,     1148, 0xba463637
-0,       3708,       3708,       41,     1351, 0x5e85ae79
-0,       3750,       3750,       41,     1187, 0xed8d6055
-0,       3791,       3791,       41,     1200, 0x64185be6
-0,       3833,       3833,       41,     1175, 0x12ad3c1e
-0,       3875,       3875,       41,     1179, 0x7e034570
-0,       3916,       3916,       41,     1136, 0x5c633c51
+0,       3500,       3500,       41,     1554, 0x3d740564, F=0x0
+0,       3541,       3541,       41,     1467, 0xc349f2d7, F=0x0
+0,       3583,       3583,       41,     1066, 0xb7401462, F=0x0
+0,       3625,       3625,       41,     1502, 0x3ee602ed, F=0x0
+0,       3666,       3666,       41,     1148, 0xba463637, F=0x0
+0,       3708,       3708,       41,     1351, 0x5e85ae79, F=0x0
+0,       3750,       3750,       41,     1187, 0xed8d6055, F=0x0
+0,       3791,       3791,       41,     1200, 0x64185be6, F=0x0
+0,       3833,       3833,       41,     1175, 0x12ad3c1e, F=0x0
+0,       3875,       3875,       41,     1179, 0x7e034570, F=0x0
+0,       3916,       3916,       41,     1136, 0x5c633c51, F=0x0
 1,       3918,       3918,        0,     1088, 0xf3887977
-0,       3958,       3958,       41,     1064, 0x5eb51d89
-0,       4000,       4000,       41,      953, 0xe148bbdd
-0,       4041,       4041,       41,      989, 0x901ec306
-0,       4083,       4083,       41,     1030, 0x680de26f
-0,       4125,       4125,       41,     1078, 0x86e0ee43
-0,       4166,       4166,       41,     1232, 0x98546a86
-0,       4208,       4208,       41,     1164, 0x93305074
-0,       4250,       4250,       41,     1348, 0x27cfa91b
-0,       4291,       4291,       41,     1417, 0x2312d70e
-0,       4333,       4333,       41,     1285, 0x46ca4cca
+0,       3958,       3958,       41,     1064, 0x5eb51d89, F=0x0
+0,       4000,       4000,       41,      953, 0xe148bbdd, F=0x0
+0,       4041,       4041,       41,      989, 0x901ec306, F=0x0
+0,       4083,       4083,       41,     1030, 0x680de26f, F=0x0
+0,       4125,       4125,       41,     1078, 0x86e0ee43, F=0x0
+0,       4166,       4166,       41,     1232, 0x98546a86, F=0x0
+0,       4208,       4208,       41,     1164, 0x93305074, F=0x0
+0,       4250,       4250,       41,     1348, 0x27cfa91b, F=0x0
+0,       4291,       4291,       41,     1417, 0x2312d70e, F=0x0
+0,       4333,       4333,       41,     1285, 0x46ca4cca, F=0x0
 1,       4353,       4353,        0,     1088, 0x1d6c8ed2
-0,       4375,       4375,       41,     1037, 0xcf09dd3d
-0,       4416,       4416,       41,     1005, 0xe780cf1f
-0,       4458,       4458,       41,      890, 0x8b1d8c1b
-0,       4500,       4500,       41,     1023, 0xd1dbd506
-0,       4541,       4541,       41,      803, 0x935e775e
-0,       4583,       4583,       41,     1035, 0x6a220483
-0,       4625,       4625,       41,      466, 0xd88bb237
+0,       4375,       4375,       41,     1037, 0xcf09dd3d, F=0x0
+0,       4416,       4416,       41,     1005, 0xe780cf1f, F=0x0
+0,       4458,       4458,       41,      890, 0x8b1d8c1b, F=0x0
+0,       4500,       4500,       41,     1023, 0xd1dbd506, F=0x0
+0,       4541,       4541,       41,      803, 0x935e775e, F=0x0
+0,       4583,       4583,       41,     1035, 0x6a220483, F=0x0
+0,       4625,       4625,       41,      466, 0xd88bb237, F=0x0
 1,       4789,       4789,        0,     1088, 0x09115bae
-0,       4916,       4916,       41,      945, 0x8f2eb1ec
+0,       4916,       4916,       41,      945, 0x8f2eb1ec, F=0x0
 0,       4958,       4958,       41,     1190, 0x4c451c1b
-0,       5000,       5000,       41,     1811, 0x727c52cb
-0,       5041,       5041,       41,     1552, 0x73f82bff
-0,       5083,       5083,       41,     1544, 0xa7241ece
-0,       5125,       5125,       41,     1707, 0x3d1a6464
-0,       5166,       5166,       41,     1103, 0x06b22710
-0,       5208,       5208,       41,     1122, 0x656725b8
+0,       5000,       5000,       41,     1811, 0x727c52cb, F=0x0
+0,       5041,       5041,       41,     1552, 0x73f82bff, F=0x0
+0,       5083,       5083,       41,     1544, 0xa7241ece, F=0x0
+0,       5125,       5125,       41,     1707, 0x3d1a6464, F=0x0
+0,       5166,       5166,       41,     1103, 0x06b22710, F=0x0
+0,       5208,       5208,       41,     1122, 0x656725b8, F=0x0
 1,       5224,       5224,        0,     1088, 0x0c8b9372
-0,       5250,       5250,       41,     1150, 0xf9674678
-0,       5291,       5291,       41,     1438, 0x03fac426
-0,       5333,       5333,       41,     1623, 0x7adb1321
-0,       5375,       5375,       41,     1677, 0x0b9a3e62
-0,       5416,       5416,       41,     1124, 0x769c0ea2
-0,       5458,       5458,       41,     1221, 0xd942409f
-0,       5500,       5500,       41,     1698, 0xd7ca3fe3
-0,       5541,       5541,       41,     1262, 0xb994692f
-0,       5583,       5583,       41,     2097, 0xf4eb663f
-0,       5625,       5625,       41,     1251, 0xfd4f633a
+0,       5250,       5250,       41,     1150, 0xf9674678, F=0x0
+0,       5291,       5291,       41,     1438, 0x03fac426, F=0x0
+0,       5333,       5333,       41,     1623, 0x7adb1321, F=0x0
+0,       5375,       5375,       41,     1677, 0x0b9a3e62, F=0x0
+0,       5416,       5416,       41,     1124, 0x769c0ea2, F=0x0
+0,       5458,       5458,       41,     1221, 0xd942409f, F=0x0
+0,       5500,       5500,       41,     1698, 0xd7ca3fe3, F=0x0
+0,       5541,       5541,       41,     1262, 0xb994692f, F=0x0
+0,       5583,       5583,       41,     2097, 0xf4eb663f, F=0x0
+0,       5625,       5625,       41,     1251, 0xfd4f633a, F=0x0
 1,       5659,       5659,        0,     1088, 0x75a82540
-0,       5666,       5666,       41,     1633, 0xb7e1290e
-0,       5708,       5708,       41,     1739, 0xecd18c38
-0,       5750,       5750,       41,     1132, 0xc83e1828
-0,       5791,       5791,       41,      825, 0xdd02867c
-0,       5833,       5833,       41,      903, 0x349ba205
-0,       5875,       5875,       41,     1013, 0x1366ec2a
-0,       5916,       5916,       41,     1340, 0xeaa2a231
-0,       5958,       5958,       41,     1102, 0x82de2889
-0,       6000,       6000,       41,     1834, 0x59b99b92
+0,       5666,       5666,       41,     1633, 0xb7e1290e, F=0x0
+0,       5708,       5708,       41,     1739, 0xecd18c38, F=0x0
+0,       5750,       5750,       41,     1132, 0xc83e1828, F=0x0
+0,       5791,       5791,       41,      825, 0xdd02867c, F=0x0
+0,       5833,       5833,       41,      903, 0x349ba205, F=0x0
+0,       5875,       5875,       41,     1013, 0x1366ec2a, F=0x0
+0,       5916,       5916,       41,     1340, 0xeaa2a231, F=0x0
+0,       5958,       5958,       41,     1102, 0x82de2889, F=0x0
+0,       6000,       6000,       41,     1834, 0x59b99b92, F=0x0
 1,       6008,       6008,        0,     1088, 0x690312b0
-0,       6041,       6041,       41,     1332, 0x0610813a
-0,       6083,       6083,       41,     1275, 0x5b0d7be7
-0,       6125,       6125,       41,     1376, 0xd915b0fe
-0,       6166,       6166,       41,     1417, 0x8606b34a
-0,       6208,       6208,       41,     1360, 0x3bcd93d3
-0,       6250,       6250,       41,     1330, 0xd0439c93
-0,       6291,       6291,       41,     1562, 0xb2560a09
+0,       6041,       6041,       41,     1332, 0x0610813a, F=0x0
+0,       6083,       6083,       41,     1275, 0x5b0d7be7, F=0x0
+0,       6125,       6125,       41,     1376, 0xd915b0fe, F=0x0
+0,       6166,       6166,       41,     1417, 0x8606b34a, F=0x0
+0,       6208,       6208,       41,     1360, 0x3bcd93d3, F=0x0
+0,       6250,       6250,       41,     1330, 0xd0439c93, F=0x0
+0,       6291,       6291,       41,     1562, 0xb2560a09, F=0x0
 1,       6312,       6312,        0,     1088, 0x76d50ff3
-0,       6333,       6333,       41,     1376, 0x4f9eb447
-0,       6375,       6375,       41,     1405, 0x85d3b084
-0,       6416,       6416,       41,     1344, 0xcdbda2ae
-0,       6458,       6458,       41,     1313, 0xe3067b35
-0,       6500,       6500,       41,     1459, 0xf9d2c56f
-0,       6541,       6541,       41,     1275, 0xf5536d81
-0,       6583,       6583,       41,     1209, 0x3b5b4ea5
+0,       6333,       6333,       41,     1376, 0x4f9eb447, F=0x0
+0,       6375,       6375,       41,     1405, 0x85d3b084, F=0x0
+0,       6416,       6416,       41,     1344, 0xcdbda2ae, F=0x0
+0,       6458,       6458,       41,     1313, 0xe3067b35, F=0x0
+0,       6500,       6500,       41,     1459, 0xf9d2c56f, F=0x0
+0,       6541,       6541,       41,     1275, 0xf5536d81, F=0x0
+0,       6583,       6583,       41,     1209, 0x3b5b4ea5, F=0x0
 1,       6595,       6595,        0,     1088, 0x8766276f
-0,       6625,       6625,       41,     1352, 0x7b199d28
-0,       6666,       6666,       41,     1349, 0x02adaaf3
-0,       6708,       6708,       41,     1464, 0x20d7cfd2
-0,       6750,       6750,       41,     1377, 0x78e0b1f4
+0,       6625,       6625,       41,     1352, 0x7b199d28, F=0x0
+0,       6666,       6666,       41,     1349, 0x02adaaf3, F=0x0
+0,       6708,       6708,       41,     1464, 0x20d7cfd2, F=0x0
+0,       6750,       6750,       41,     1377, 0x78e0b1f4, F=0x0
+0,       6791,       6791,       41,      289, 0x1f2e9246, F=0x0
 1,       6878,       6878,        0,     1088, 0x678f20fd
 1,       7161,       7161,        0,     1088, 0x718afa20
 1,       7444,       7444,        0,     1088, 0x758f0939
diff --git a/tests/ref/fate/wmv8-intrax8 b/tests/ref/fate/wmv8-intrax8
deleted file mode 100644
index 103e8dac21..0000000000
--- a/tests/ref/fate/wmv8-intrax8
+++ /dev/null
@@ -1,475 +0,0 @@
-#tb 0: 1/1000
-0,          0,          0,        0,   115200, 0x03fbd838
-0,        200,        200,        0,   115200, 0x8911d86f
-0,        266,        266,        0,   115200, 0x7c5dd82e
-0,        333,        333,        0,   115200, 0x7c5ed82e
-0,       2000,       2000,        0,   115200, 0xd323d838
-0,       2066,       2066,        0,   115200, 0x6e7479ab
-0,       2133,       2133,        0,   115200, 0x14674bf6
-0,       2200,       2200,        0,   115200, 0x074c2e3d
-0,       2266,       2266,        0,   115200, 0x9b3025ef
-0,       2333,       2333,        0,   115200, 0x76882dae
-0,       2400,       2400,        0,   115200, 0xedf3421b
-0,       2466,       2466,        0,   115200, 0xb5378486
-0,       2533,       2533,        0,   115200, 0xc4a53420
-0,       2600,       2600,        0,   115200, 0x559cb60f
-0,       2666,       2666,        0,   115200, 0xcc034ddd
-0,       2733,       2733,        0,   115200, 0xb77b7779
-0,       2800,       2800,        0,   115200, 0x0ad9c3e6
-0,       2866,       2866,        0,   115200, 0x4e673027
-0,       2933,       2933,        0,   115200, 0x54717979
-0,       3000,       3000,        0,   115200, 0xf9e557c9
-0,       3066,       3066,        0,   115200, 0xbdcf6358
-0,       3133,       3133,        0,   115200, 0xd55c7bb7
-0,       3200,       3200,        0,   115200, 0x78d171e7
-0,       3266,       3266,        0,   115200, 0x28715816
-0,       3333,       3333,        0,   115200, 0x58740b8a
-0,       3400,       3400,        0,   115200, 0x86c10f18
-0,       3466,       3466,        0,   115200, 0x903918f9
-0,       3533,       3533,        0,   115200, 0x7f742394
-0,       3600,       3600,        0,   115200, 0xd3a91d44
-0,       3666,       3666,        0,   115200, 0x24452563
-0,       3733,       3733,        0,   115200, 0x1b0c320e
-0,       3800,       3800,        0,   115200, 0x3a493c8e
-0,       3866,       3866,        0,   115200, 0xebe445ec
-0,       3933,       3933,        0,   115200, 0xd2c54c8c
-0,       4000,       4000,        0,   115200, 0x4aa15593
-0,       4066,       4066,        0,   115200, 0x19a35cc1
-0,       4133,       4133,        0,   115200, 0x968c6ee7
-0,       4200,       4200,        0,   115200, 0x9f7c7808
-0,       4266,       4266,        0,   115200, 0xa23980ee
-0,       4333,       4333,        0,   115200, 0xcf3089c3
-0,       4400,       4400,        0,   115200, 0x43f78d5c
-0,       4466,       4466,        0,   115200, 0x43caa1d4
-0,       4533,       4533,        0,   115200, 0x025594c3
-0,       4600,       4600,        0,   115200, 0x5ec8a11c
-0,       4666,       4666,        0,   115200, 0x7f2a959b
-0,       4733,       4733,        0,   115200, 0xc602852d
-0,       4800,       4800,        0,   115200, 0x67737ef5
-0,       4866,       4866,        0,   115200, 0x81e06efe
-0,       4933,       4933,        0,   115200, 0xdb0a484f
-0,       5000,       5000,        0,   115200, 0xf30e4418
-0,       5066,       5066,        0,   115200, 0xbdd1310d
-0,       5133,       5133,        0,   115200, 0x0d2a58ca
-0,       5200,       5200,        0,   115200, 0xa428b4ba
-0,       5266,       5266,        0,   115200, 0x4b850596
-0,       5333,       5333,        0,   115200, 0x38d3ecc0
-0,       5400,       5400,        0,   115200, 0x6bb0ed23
-0,       5466,       5466,        0,   115200, 0xb56eedaf
-0,       5533,       5533,        0,   115200, 0xde81f828
-0,       5600,       5600,        0,   115200, 0x334abf89
-0,       5666,       5666,        0,   115200, 0x8e8ebd78
-0,       5733,       5733,        0,   115200, 0x96ba99c8
-0,       5800,       5800,        0,   115200, 0x2c8e0abd
-0,       5866,       5866,        0,   115200, 0xe1ab8f9f
-0,       5933,       5933,        0,   115200, 0xb2f95da4
-0,       6000,       6000,        0,   115200, 0x2e536d62
-0,       6066,       6066,        0,   115200, 0xdd78f3ab
-0,       6133,       6133,        0,   115200, 0xea1cdaaa
-0,       6200,       6200,        0,   115200, 0x4e653cc0
-0,       6266,       6266,        0,   115200, 0x95e38123
-0,       6333,       6333,        0,   115200, 0x20964119
-0,       6400,       6400,        0,   115200, 0xcd08ea74
-0,       6466,       6466,        0,   115200, 0x0eee2a96
-0,       6533,       6533,        0,   115200, 0x966662c9
-0,       6600,       6600,        0,   115200, 0x975893b4
-0,       6666,       6666,        0,   115200, 0x0aa888a7
-0,       6733,       6733,        0,   115200, 0x80dab966
-0,       6800,       6800,        0,   115200, 0x78bb8f95
-0,       6866,       6866,        0,   115200, 0x9c71d03f
-0,       6933,       6933,        0,   115200, 0xbe5db887
-0,       7000,       7000,        0,   115200, 0xa88e00d0
-0,       7066,       7066,        0,   115200, 0xc7b50827
-0,       7133,       7133,        0,   115200, 0xf9155ed3
-0,       7200,       7200,        0,   115200, 0x8dd72d44
-0,       7266,       7266,        0,   115200, 0xee38183a
-0,       7333,       7333,        0,   115200, 0xea2b6329
-0,       7400,       7400,        0,   115200, 0xf556c2b3
-0,       7466,       7466,        0,   115200, 0x90edebf9
-0,       7533,       7533,        0,   115200, 0x4f440fdf
-0,       7600,       7600,        0,   115200, 0xfdec7a9d
-0,       7666,       7666,        0,   115200, 0xc7927952
-0,       7733,       7733,        0,   115200, 0xdd475704
-0,       7800,       7800,        0,   115200, 0x974a61a5
-0,       7866,       7866,        0,   115200, 0xbf2b785e
-0,       7933,       7933,        0,   115200, 0x5de451fa
-0,       8000,       8000,        0,   115200, 0x3fac503e
-0,       8066,       8066,        0,   115200, 0xc6785643
-0,       8133,       8133,        0,   115200, 0xe6666254
-0,       8200,       8200,        0,   115200, 0x1a05130c
-0,       8266,       8266,        0,   115200, 0x082cea5d
-0,       8333,       8333,        0,   115200, 0x473ef142
-0,       8400,       8400,        0,   115200, 0x9769a776
-0,       8466,       8466,        0,   115200, 0xe6e841af
-0,       8533,       8533,        0,   115200, 0xa44c8d1e
-0,       8600,       8600,        0,   115200, 0xd03d641b
-0,       8666,       8666,        0,   115200, 0x3aea3c9e
-0,       8733,       8733,        0,   115200, 0x09efcf21
-0,       8800,       8800,        0,   115200, 0xeeb6ff64
-0,       8866,       8866,        0,   115200, 0xa310af6f
-0,       8933,       8933,        0,   115200, 0x2488519e
-0,       9000,       9000,        0,   115200, 0x48e1febf
-0,       9066,       9066,        0,   115200, 0x76d00513
-0,       9133,       9133,        0,   115200, 0xa28eda81
-0,       9200,       9200,        0,   115200, 0xc2cbdcae
-0,       9266,       9266,        0,   115200, 0xd976c9b2
-0,       9333,       9333,        0,   115200, 0xb0abebab
-0,       9400,       9400,        0,   115200, 0x32be4765
-0,       9466,       9466,        0,   115200, 0xc0a36b11
-0,       9533,       9533,        0,   115200, 0xb6d1d47f
-0,       9600,       9600,        0,   115200, 0xab7954a6
-0,       9666,       9666,        0,   115200, 0xc485789c
-0,       9733,       9733,        0,   115200, 0xa07101b6
-0,       9800,       9800,        0,   115200, 0x6297780a
-0,       9866,       9866,        0,   115200, 0xf550ba94
-0,       9933,       9933,        0,   115200, 0x9b77f994
-0,      10000,      10000,        0,   115200, 0xb0e870ad
-0,      10066,      10066,        0,   115200, 0x2dd89b0b
-0,      10133,      10133,        0,   115200, 0x36dcfe2f
-0,      10200,      10200,        0,   115200, 0x3e5e1a8f
-0,      10266,      10266,        0,   115200, 0xb8394740
-0,      10333,      10333,        0,   115200, 0xbfc852fc
-0,      10400,      10400,        0,   115200, 0x5b3f8aa2
-0,      10466,      10466,        0,   115200, 0xc29d8e3a
-0,      10533,      10533,        0,   115200, 0x7300abd8
-0,      10600,      10600,        0,   115200, 0xd1dd7a3b
-0,      10666,      10666,        0,   115200, 0xe5978f39
-0,      10733,      10733,        0,   115200, 0x235c6b8d
-0,      10800,      10800,        0,   115200, 0xec1b5805
-0,      10866,      10866,        0,   115200, 0x16d23946
-0,      10933,      10933,        0,   115200, 0xa8de1cf4
-0,      11000,      11000,        0,   115200, 0x5e730512
-0,      11066,      11066,        0,   115200, 0x1250feed
-0,      11133,      11133,        0,   115200, 0x0928c190
-0,      11200,      11200,        0,   115200, 0xa25d9e5c
-0,      11266,      11266,        0,   115200, 0x921068ea
-0,      11333,      11333,        0,   115200, 0x2c974ddb
-0,      11400,      11400,        0,   115200, 0x35ae4d75
-0,      11466,      11466,        0,   115200, 0xec0c6469
-0,      11533,      11533,        0,   115200, 0x22704fad
-0,      11600,      11600,        0,   115200, 0x0a9a5aed
-0,      11666,      11666,        0,   115200, 0x45192f2f
-0,      11733,      11733,        0,   115200, 0xc07b39f4
-0,      11800,      11800,        0,   115200, 0x32c60215
-0,      11866,      11866,        0,   115200, 0xda65035e
-0,      11933,      11933,        0,   115200, 0x99d0cd81
-0,      12000,      12000,        0,   115200, 0xd08ca5e3
-0,      12066,      12066,        0,   115200, 0x82cdad17
-0,      12133,      12133,        0,   115200, 0x2587a420
-0,      12200,      12200,        0,   115200, 0x85cba73d
-0,      12266,      12266,        0,   115200, 0x4677bf89
-0,      12333,      12333,        0,   115200, 0x84c2e034
-0,      12400,      12400,        0,   115200, 0xd343066c
-0,      12466,      12466,        0,   115200, 0xdec716a1
-0,      12533,      12533,        0,   115200, 0x93c04f5d
-0,      12600,      12600,        0,   115200, 0xce126ac4
-0,      12666,      12666,        0,   115200, 0xa20098c5
-0,      12733,      12733,        0,   115200, 0x9a4ca711
-0,      12800,      12800,        0,   115200, 0xfae9c154
-0,      12866,      12866,        0,   115200, 0xb34cc431
-0,      12933,      12933,        0,   115200, 0x923cdec2
-0,      13000,      13000,        0,   115200, 0x60ffdfe8
-0,      13066,      13066,        0,   115200, 0xa3e6f9f2
-0,      13133,      13133,        0,   115200, 0x374f0a47
-0,      13200,      13200,        0,   115200, 0x8fb228f1
-0,      13266,      13266,        0,   115200, 0x4c1a24bf
-0,      13333,      13333,        0,   115200, 0x768a52d1
-0,      13400,      13400,        0,   115200, 0x5bf77025
-0,      13466,      13466,        0,   115200, 0x6ca67c2a
-0,      13533,      13533,        0,   115200, 0x107ca3e9
-0,      13600,      13600,        0,   115200, 0x4abeda93
-0,      13666,      13666,        0,   115200, 0x750be9ff
-0,      13733,      13733,        0,   115200, 0x28c5eee3
-0,      13800,      13800,        0,   115200, 0xa1b0e4b2
-0,      13866,      13866,        0,   115200, 0x2ae7f33d
-0,      13933,      13933,        0,   115200, 0xf29cdae0
-0,      14000,      14000,        0,   115200, 0xd470f9ed
-0,      14066,      14066,        0,   115200, 0x2d22f832
-0,      14133,      14133,        0,   115200, 0xc5b91780
-0,      14200,      14200,        0,   115200, 0x3d8e4151
-0,      14266,      14266,        0,   115200, 0x459f58e0
-0,      14333,      14333,        0,   115200, 0x8dc198fe
-0,      14400,      14400,        0,   115200, 0x2479f579
-0,      14466,      14466,        0,   115200, 0xc2040c21
-0,      14533,      14533,        0,   115200, 0x39ad60d5
-0,      14600,      14600,        0,   115200, 0x9329dd37
-0,      14666,      14666,        0,   115200, 0xa08807da
-0,      14733,      14733,        0,   115200, 0xbf514cd1
-0,      14800,      14800,        0,   115200, 0x8b66a779
-0,      14866,      14866,        0,   115200, 0x865ebff5
-0,      14933,      14933,        0,   115200, 0x5967074c
-0,      15000,      15000,        0,   115200, 0xd5521f60
-0,      15066,      15066,        0,   115200, 0x462c329c
-0,      15133,      15133,        0,   115200, 0xbefd36fb
-0,      15200,      15200,        0,   115200, 0x6f58403b
-0,      15266,      15266,        0,   115200, 0xe4af2fac
-0,      15333,      15333,        0,   115200, 0x46453662
-0,      15400,      15400,        0,   115200, 0x72cc59e8
-0,      15466,      15466,        0,   115200, 0xd6c67f8e
-0,      15533,      15533,        0,   115200, 0xd35674a7
-0,      15600,      15600,        0,   115200, 0x65785ddb
-0,      15666,      15666,        0,   115200, 0xfd7958aa
-0,      15733,      15733,        0,   115200, 0x93e45607
-0,      15800,      15800,        0,   115200, 0x196a4fa5
-0,      15866,      15866,        0,   115200, 0xe33a5dac
-0,      15933,      15933,        0,   115200, 0x4e66904a
-0,      16000,      16000,        0,   115200, 0xc1e3a50a
-0,      16066,      16066,        0,   115200, 0xa685b351
-0,      16133,      16133,        0,   115200, 0xee2fdeb7
-0,      16200,      16200,        0,   115200, 0x189cefdd
-0,      16266,      16266,        0,   115200, 0xbdf90506
-0,      16333,      16333,        0,   115200, 0xe72c23d2
-0,      16400,      16400,        0,   115200, 0xa3f65e7b
-0,      16466,      16466,        0,   115200, 0x8bc67eee
-0,      16533,      16533,        0,   115200, 0xd305d09b
-0,      16600,      16600,        0,   115200, 0xc521eba5
-0,      16666,      16666,        0,   115200, 0x16cf161f
-0,      16733,      16733,        0,   115200, 0x2ce322b5
-0,      16800,      16800,        0,   115200, 0x57ce82b4
-0,      16866,      16866,        0,   115200, 0x8da896b9
-0,      16933,      16933,        0,   115200, 0xc16ad590
-0,      17000,      17000,        0,   115200, 0x8cdbe729
-0,      17066,      17066,        0,   115200, 0x69eafd96
-0,      17133,      17133,        0,   115200, 0xd9e40a03
-0,      17200,      17200,        0,   115200, 0xb91423e1
-0,      17266,      17266,        0,   115200, 0x09b516bd
-0,      17333,      17333,        0,   115200, 0x20292b85
-0,      17400,      17400,        0,   115200, 0x8cbb4aeb
-0,      17466,      17466,        0,   115200, 0x99b761ec
-0,      17533,      17533,        0,   115200, 0x28406a14
-0,      17600,      17600,        0,   115200, 0xea368c86
-0,      17666,      17666,        0,   115200, 0xf388ab54
-0,      17733,      17733,        0,   115200, 0x263fe1de
-0,      17800,      17800,        0,   115200, 0xc3410c39
-0,      17866,      17866,        0,   115200, 0xc056244d
-0,      17933,      17933,        0,   115200, 0x99c51fc5
-0,      18000,      18000,        0,   115200, 0x7e4a0d07
-0,      18066,      18066,        0,   115200, 0xcd911916
-0,      18133,      18133,        0,   115200, 0x8bd0fa21
-0,      18200,      18200,        0,   115200, 0xd1a1ab71
-0,      18266,      18266,        0,   115200, 0xbc904028
-0,      18333,      18333,        0,   115200, 0xfd480acc
-0,      18400,      18400,        0,   115200, 0x1cb5c8b5
-0,      18466,      18466,        0,   115200, 0xcad15709
-0,      18533,      18533,        0,   115200, 0xdd306f19
-0,      18600,      18600,        0,   115200, 0x3f975f1b
-0,      18666,      18666,        0,   115200, 0x2386cd1f
-0,      18733,      18733,        0,   115200, 0xcaa4f5b0
-0,      18800,      18800,        0,   115200, 0x8ce213de
-0,      18866,      18866,        0,   115200, 0x5f7407c6
-0,      18932,      18932,        0,   115200, 0x01b3ee00
-0,      18998,      18998,        0,   115200, 0x92759715
-0,      19064,      19064,        0,   115200, 0x4a208e1e
-0,      19133,      19133,        0,   115200, 0x6e1b80a5
-0,      19200,      19200,        0,   115200, 0xe78c7622
-0,      19266,      19266,        0,   115200, 0xcc255da9
-0,      19333,      19333,        0,   115200, 0x69e561cb
-0,      19400,      19400,        0,   115200, 0x2d135227
-0,      19466,      19466,        0,   115200, 0xfc6a5e4d
-0,      19533,      19533,        0,   115200, 0x81473914
-0,      19600,      19600,        0,   115200, 0xe50831b2
-0,      19666,      19666,        0,   115200, 0xe7d2228f
-0,      19733,      19733,        0,   115200, 0xe6992f1a
-0,      19800,      19800,        0,   115200, 0x1e533698
-0,      19866,      19866,        0,   115200, 0x0c63558c
-0,      19933,      19933,        0,   115200, 0x54990104
-0,      20000,      20000,        0,   115200, 0xce14fc4d
-0,      20066,      20066,        0,   115200, 0x760b5c6e
-0,      20133,      20133,        0,   115200, 0x14157b61
-0,      20200,      20200,        0,   115200, 0x62ca7972
-0,      20266,      20266,        0,   115200, 0xe99573ce
-0,      20333,      20333,        0,   115200, 0x36df4b8d
-0,      20400,      20400,        0,   115200, 0x272238ea
-0,      20466,      20466,        0,   115200, 0x606e3863
-0,      20533,      20533,        0,   115200, 0x8b143873
-0,      20600,      20600,        0,   115200, 0x2e46db9e
-0,      20666,      20666,        0,   115200, 0x1131ad78
-0,      20733,      20733,        0,   115200, 0x52f34951
-0,      20800,      20800,        0,   115200, 0xd4590eea
-0,      20866,      20866,        0,   115200, 0x44ddeaa2
-0,      20933,      20933,        0,   115200, 0xbc83c399
-0,      21000,      21000,        0,   115200, 0x5e9da9a7
-0,      21066,      21066,        0,   115200, 0xca6a8dfc
-0,      21133,      21133,        0,   115200, 0xe17b3ff8
-0,      21200,      21200,        0,   115200, 0xea1f375c
-0,      21266,      21266,        0,   115200, 0xa265143b
-0,      21333,      21333,        0,   115200, 0xe788fa1e
-0,      21400,      21400,        0,   115200, 0xd58be649
-0,      21466,      21466,        0,   115200, 0x740c1f19
-0,      21533,      21533,        0,   115200, 0xfab3302f
-0,      21600,      21600,        0,   115200, 0x1c954fc7
-0,      21666,      21666,        0,   115200, 0xd57a5923
-0,      21733,      21733,        0,   115200, 0x099745d9
-0,      21800,      21800,        0,   115200, 0x2e61cc66
-0,      21866,      21866,        0,   115200, 0xdb3ec93a
-0,      21933,      21933,        0,   115200, 0x553ba839
-0,      22000,      22000,        0,   115200, 0xfafc6b60
-0,      22066,      22066,        0,   115200, 0xa3fb39b6
-0,      22133,      22133,        0,   115200, 0x7fb9d7be
-0,      22200,      22200,        0,   115200, 0x7e73cd93
-0,      22266,      22266,        0,   115200, 0xa43ec5f2
-0,      22333,      22333,        0,   115200, 0x3ec077c1
-0,      22400,      22400,        0,   115200, 0xc4275815
-0,      22466,      22466,        0,   115200, 0xf84c17bf
-0,      22533,      22533,        0,   115200, 0x1f54d44d
-0,      22600,      22600,        0,   115200, 0x566fa5bb
-0,      22666,      22666,        0,   115200, 0x82179a82
-0,      22733,      22733,        0,   115200, 0xf8865f3d
-0,      22800,      22800,        0,   115200, 0xa5fb7b80
-0,      22866,      22866,        0,   115200, 0x9aebc04d
-0,      22933,      22933,        0,   115200, 0x44c705fc
-0,      23000,      23000,        0,   115200, 0xd322add3
-0,      23066,      23066,        0,   115200, 0xf4230b76
-0,      23133,      23133,        0,   115200, 0xaa915069
-0,      23200,      23200,        0,   115200, 0x518d53d8
-0,      23266,      23266,        0,   115200, 0xefa7d909
-0,      23333,      23333,        0,   115200, 0x803c3c0e
-0,      23400,      23400,        0,   115200, 0x5650bc0a
-0,      23466,      23466,        0,   115200, 0x8b34ecab
-0,      23533,      23533,        0,   115200, 0x975c4976
-0,      23600,      23600,        0,   115200, 0x700e3cb4
-0,      23666,      23666,        0,   115200, 0xef27a4ec
-0,      23733,      23733,        0,   115200, 0x2b953936
-0,      23800,      23800,        0,   115200, 0xcf9b4956
-0,      23866,      23866,        0,   115200, 0xae4a8eba
-0,      23933,      23933,        0,   115200, 0xf8821144
-0,      24000,      24000,        0,   115200, 0x97c2402c
-0,      24066,      24066,        0,   115200, 0x209b7bb3
-0,      24133,      24133,        0,   115200, 0xd22fff2c
-0,      24200,      24200,        0,   115200, 0xe85b4f16
-0,      24266,      24266,        0,   115200, 0x0659f318
-0,      24333,      24333,        0,   115200, 0x6e2bff98
-0,      24400,      24400,        0,   115200, 0xc6626f2f
-0,      24466,      24466,        0,   115200, 0x123138e2
-0,      24533,      24533,        0,   115200, 0x69e680ab
-0,      24600,      24600,        0,   115200, 0xe4d7cd1d
-0,      24666,      24666,        0,   115200, 0x4ca10d47
-0,      24733,      24733,        0,   115200, 0x633a4c39
-0,      24800,      24800,        0,   115200, 0x64ded292
-0,      24866,      24866,        0,   115200, 0x88d2df42
-0,      24933,      24933,        0,   115200, 0x998f4c63
-0,      25000,      25000,        0,   115200, 0x753c76f9
-0,      25066,      25066,        0,   115200, 0x9d7ba0a6
-0,      25133,      25133,        0,   115200, 0x68798da5
-0,      25200,      25200,        0,   115200, 0xb5b18bc3
-0,      25266,      25266,        0,   115200, 0x20245e49
-0,      25333,      25333,        0,   115200, 0xf15d4b8f
-0,      25400,      25400,        0,   115200, 0x17f83b69
-0,      25466,      25466,        0,   115200, 0xcc545783
-0,      25533,      25533,        0,   115200, 0x3dad530e
-0,      25600,      25600,        0,   115200, 0x6b465c94
-0,      25666,      25666,        0,   115200, 0xbc5f3831
-0,      25733,      25733,        0,   115200, 0x1b2f042d
-0,      25800,      25800,        0,   115200, 0xaec391ac
-0,      25866,      25866,        0,   115200, 0x99fa8b2a
-0,      25933,      25933,        0,   115200, 0xf78d3524
-0,      26000,      26000,        0,   115200, 0xe6255a24
-0,      26066,      26066,        0,   115200, 0x253542c6
-0,      26133,      26133,        0,   115200, 0xfab05365
-0,      26200,      26200,        0,   115200, 0x406a3749
-0,      26266,      26266,        0,   115200, 0xaf0f3935
-0,      26333,      26333,        0,   115200, 0x0d9ff780
-0,      26400,      26400,        0,   115200, 0xfadcfc15
-0,      26466,      26466,        0,   115200, 0x8267d5ad
-0,      26533,      26533,        0,   115200, 0xd705d250
-0,      26600,      26600,        0,   115200, 0x18f9d1f2
-0,      26666,      26666,        0,   115200, 0xd92bc045
-0,      26733,      26733,        0,   115200, 0x439b9ca0
-0,      26800,      26800,        0,   115200, 0xcb80a14c
-0,      26866,      26866,        0,   115200, 0xee887f49
-0,      26933,      26933,        0,   115200, 0xfba297eb
-0,      27000,      27000,        0,   115200, 0x0e2f744b
-0,      27066,      27066,        0,   115200, 0xaa227aa7
-0,      27133,      27133,        0,   115200, 0xd7bc6fff
-0,      27200,      27200,        0,   115200, 0x295c91cf
-0,      27266,      27266,        0,   115200, 0xc5678733
-0,      27333,      27333,        0,   115200, 0xc8d49120
-0,      27400,      27400,        0,   115200, 0xb14e90b9
-0,      27466,      27466,        0,   115200, 0x6a09acab
-0,      27533,      27533,        0,   115200, 0xb9aec358
-0,      27600,      27600,        0,   115200, 0xeb3695b2
-0,      27666,      27666,        0,   115200, 0xc5bebd62
-0,      27733,      27733,        0,   115200, 0x2d6b1a3f
-0,      27800,      27800,        0,   115200, 0x92986f49
-0,      27866,      27866,        0,   115200, 0x00c37cf9
-0,      27933,      27933,        0,   115200, 0x5a4d87a6
-0,      28000,      28000,        0,   115200, 0xe87888a2
-0,      28066,      28066,        0,   115200, 0x4ab18d6d
-0,      28133,      28133,        0,   115200, 0xcb84880b
-0,      28200,      28200,        0,   115200, 0x82458848
-0,      28266,      28266,        0,   115200, 0x11b477dc
-0,      28333,      28333,        0,   115200, 0x56d876d3
-0,      28400,      28400,        0,   115200, 0xf5297ceb
-0,      28466,      28466,        0,   115200, 0x47357713
-0,      28533,      28533,        0,   115200, 0xede562df
-0,      28600,      28600,        0,   115200, 0xabf42d38
-0,      28666,      28666,        0,   115200, 0xea9225c8
-0,      28733,      28733,        0,   115200, 0x79ce1cb4
-0,      28800,      28800,        0,   115200, 0x0cd418b4
-0,      28866,      28866,        0,   115200, 0x6f7c118e
-0,      28933,      28933,        0,   115200, 0xbbbc0fa4
-0,      29000,      29000,        0,   115200, 0x890514e6
-0,      29066,      29066,        0,   115200, 0x9c4d0e7d
-0,      29133,      29133,        0,   115200, 0x56260e76
-0,      29200,      29200,        0,   115200, 0x7dc80258
-0,      29266,      29266,        0,   115200, 0xa990f5a3
-0,      29333,      29333,        0,   115200, 0x2174e913
-0,      29400,      29400,        0,   115200, 0x8296e674
-0,      29466,      29466,        0,   115200, 0x9e28e3b4
-0,      29533,      29533,        0,   115200, 0x404ce72b
-0,      29600,      29600,        0,   115200, 0xc7cbf4ec
-0,      29666,      29666,        0,   115200, 0x5ce0f5a1
-0,      29733,      29733,        0,   115200, 0x88dbf7c7
-0,      29800,      29800,        0,   115200, 0x26daf35a
-0,      29866,      29866,        0,   115200, 0x5cfdfe63
-0,      29933,      29933,        0,   115200, 0xdd40fb9b
-0,      30000,      30000,        0,   115200, 0x5b8df20f
-0,      30066,      30066,        0,   115200, 0x4f2ce5ac
-0,      30133,      30133,        0,   115200, 0xc9d0e0c2
-0,      30200,      30200,        0,   115200, 0x51c7e2a6
-0,      30266,      30266,        0,   115200, 0xb3bae109
-0,      30333,      30333,        0,   115200, 0xbd85e5b2
-0,      30400,      30400,        0,   115200, 0x1fbbdfd1
-0,      30466,      30466,        0,   115200, 0x3665dfd0
-0,      30533,      30533,        0,   115200, 0xcd29d50c
-0,      30600,      30600,        0,   115200, 0xedd1c6bc
-0,      30666,      30666,        0,   115200, 0xebc2d072
-0,      30733,      30733,        0,   115200, 0xe2e5fbbd
-0,      30800,      30800,        0,   115200, 0x616a13dc
-0,      30866,      30866,        0,   115200, 0xf64f1efc
-0,      30933,      30933,        0,   115200, 0x5356235f
-0,      31000,      31000,        0,   115200, 0xafc032d5
-0,      31066,      31066,        0,   115200, 0xaa034420
-0,      31133,      31133,        0,   115200, 0x007e0afa
-0,      31200,      31200,        0,   115200, 0x077ad5c8
-0,      31266,      31266,        0,   115200, 0x8fc815b8
-0,      31333,      31333,        0,   115200, 0x95b85990
-0,      31400,      31400,        0,   115200, 0x46f5899f
-0,      31466,      31466,        0,   115200, 0x1e37cd82
-0,      31533,      31533,        0,   115200, 0x3ce90bfd
-0,      31600,      31600,        0,   115200, 0xbb95bd1d
-0,      31666,      31666,        0,   115200, 0xd4aa9ba8
-0,      31733,      31733,        0,   115200, 0x0e761649
-0,      31800,      31800,        0,   115200, 0x49ad7886
-0,      31866,      31866,        0,   115200, 0x2f4184df
-0,      31933,      31933,        0,   115200, 0x80b906ee
-0,      32000,      32000,        0,   115200, 0x62405100
-0,      32066,      32066,        0,   115200, 0x3ece13b5
-0,      32133,      32133,        0,   115200, 0x3abd4cfc
-0,      32200,      32200,        0,   115200, 0x91b418e3
-0,      32266,      32266,        0,   115200, 0xde1ce68e
-0,      32333,      32333,        0,   115200, 0xfc47f912
-0,      32400,      32400,        0,   115200, 0x5b380a6f
-0,      32466,      32466,        0,   115200, 0x8f35c3c0
-0,      32533,      32533,        0,   115200, 0xb26dc220
-0,      32599,      32599,        0,   115200, 0x3d5bbfce
-0,      32665,      32665,        0,   115200, 0xa1f9bee6
-0,      32731,      32731,        0,   115200, 0xa87dcd24
-0,      32797,      32797,        0,   115200, 0x9374cb71
-0,      32863,      32863,        0,   115200, 0x0c7ccbd0
-0,      32929,      32929,        0,   115200, 0x9a16cc49
-0,      32995,      32995,        0,   115200, 0x4df0c28b
-0,      33061,      33061,        0,   115200, 0xb5b8b866
-0,      33133,      33133,        0,   115200, 0xafcc1019
-0,      34000,      34000,        0,   115200, 0x623b0ff3
-0,      34133,      34133,        0,   115200, 0x1d6f10b5
diff --git a/tests/ref/fate/wmv8-x8intra b/tests/ref/fate/wmv8-x8intra
new file mode 100644
index 0000000000..c9ed2733e7
--- /dev/null
+++ b/tests/ref/fate/wmv8-x8intra
@@ -0,0 +1,479 @@
+#tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x240
+#sar 0: 0/1
+0,          0,          0,        1,   115200, 0x03fbd838
+0,          3,          3,        1,   115200, 0x8911d86f
+0,          4,          4,        1,   115200, 0x7c5dd82e
+0,          5,          5,        1,   115200, 0x7c5ed82e
+0,         30,         30,        1,   115200, 0xd323d838
+0,         31,         31,        1,   115200, 0x6e7479ab
+0,         32,         32,        1,   115200, 0x14674bf6
+0,         33,         33,        1,   115200, 0x074c2e3d
+0,         34,         34,        1,   115200, 0x9b3025ef
+0,         35,         35,        1,   115200, 0x76882dae
+0,         36,         36,        1,   115200, 0xedf3421b
+0,         37,         37,        1,   115200, 0xb5378486
+0,         38,         38,        1,   115200, 0xc4a53420
+0,         39,         39,        1,   115200, 0x559cb60f
+0,         40,         40,        1,   115200, 0xcc034ddd
+0,         41,         41,        1,   115200, 0xb77b7779
+0,         42,         42,        1,   115200, 0x0ad9c3e6
+0,         43,         43,        1,   115200, 0x4e673027
+0,         44,         44,        1,   115200, 0x54717979
+0,         45,         45,        1,   115200, 0xf9e557c9
+0,         46,         46,        1,   115200, 0xbdcf6358
+0,         47,         47,        1,   115200, 0xd55c7bb7
+0,         48,         48,        1,   115200, 0x78d171e7
+0,         49,         49,        1,   115200, 0x28715816
+0,         50,         50,        1,   115200, 0x58740b8a
+0,         51,         51,        1,   115200, 0x86c10f18
+0,         52,         52,        1,   115200, 0x903918f9
+0,         53,         53,        1,   115200, 0x7f742394
+0,         54,         54,        1,   115200, 0xd3a91d44
+0,         55,         55,        1,   115200, 0x24452563
+0,         56,         56,        1,   115200, 0x1b0c320e
+0,         57,         57,        1,   115200, 0x3a493c8e
+0,         58,         58,        1,   115200, 0xebe445ec
+0,         59,         59,        1,   115200, 0xd2c54c8c
+0,         60,         60,        1,   115200, 0x4aa15593
+0,         61,         61,        1,   115200, 0x19a35cc1
+0,         62,         62,        1,   115200, 0x968c6ee7
+0,         63,         63,        1,   115200, 0x9f7c7808
+0,         64,         64,        1,   115200, 0xa23980ee
+0,         65,         65,        1,   115200, 0xcf3089c3
+0,         66,         66,        1,   115200, 0x43f78d5c
+0,         67,         67,        1,   115200, 0x43caa1d4
+0,         68,         68,        1,   115200, 0x025594c3
+0,         69,         69,        1,   115200, 0x5ec8a11c
+0,         70,         70,        1,   115200, 0x7f2a959b
+0,         71,         71,        1,   115200, 0xc602852d
+0,         72,         72,        1,   115200, 0x67737ef5
+0,         73,         73,        1,   115200, 0x81e06efe
+0,         74,         74,        1,   115200, 0xdb0a484f
+0,         75,         75,        1,   115200, 0xf30e4418
+0,         76,         76,        1,   115200, 0xbdd1310d
+0,         77,         77,        1,   115200, 0x0d2a58ca
+0,         78,         78,        1,   115200, 0xa428b4ba
+0,         79,         79,        1,   115200, 0x4b850596
+0,         80,         80,        1,   115200, 0x38d3ecc0
+0,         81,         81,        1,   115200, 0x6bb0ed23
+0,         82,         82,        1,   115200, 0xb56eedaf
+0,         83,         83,        1,   115200, 0xde81f828
+0,         84,         84,        1,   115200, 0x334abf89
+0,         85,         85,        1,   115200, 0x8e8ebd78
+0,         86,         86,        1,   115200, 0x96ba99c8
+0,         87,         87,        1,   115200, 0x2c8e0abd
+0,         88,         88,        1,   115200, 0xe1ab8f9f
+0,         89,         89,        1,   115200, 0xb2f95da4
+0,         90,         90,        1,   115200, 0x2e536d62
+0,         91,         91,        1,   115200, 0xdd78f3ab
+0,         92,         92,        1,   115200, 0xea1cdaaa
+0,         93,         93,        1,   115200, 0x4e653cc0
+0,         94,         94,        1,   115200, 0x95e38123
+0,         95,         95,        1,   115200, 0x20964119
+0,         96,         96,        1,   115200, 0xcd08ea74
+0,         97,         97,        1,   115200, 0x0eee2a96
+0,         98,         98,        1,   115200, 0x966662c9
+0,         99,         99,        1,   115200, 0x975893b4
+0,        100,        100,        1,   115200, 0x0aa888a7
+0,        101,        101,        1,   115200, 0x80dab966
+0,        102,        102,        1,   115200, 0x78bb8f95
+0,        103,        103,        1,   115200, 0x9c71d03f
+0,        104,        104,        1,   115200, 0xbe5db887
+0,        105,        105,        1,   115200, 0xa88e00d0
+0,        106,        106,        1,   115200, 0xc7b50827
+0,        107,        107,        1,   115200, 0xf9155ed3
+0,        108,        108,        1,   115200, 0x8dd72d44
+0,        109,        109,        1,   115200, 0xee38183a
+0,        110,        110,        1,   115200, 0xea2b6329
+0,        111,        111,        1,   115200, 0xf556c2b3
+0,        112,        112,        1,   115200, 0x90edebf9
+0,        113,        113,        1,   115200, 0x4f440fdf
+0,        114,        114,        1,   115200, 0xfdec7a9d
+0,        115,        115,        1,   115200, 0xc7927952
+0,        116,        116,        1,   115200, 0xdd475704
+0,        117,        117,        1,   115200, 0x974a61a5
+0,        118,        118,        1,   115200, 0xbf2b785e
+0,        119,        119,        1,   115200, 0x5de451fa
+0,        120,        120,        1,   115200, 0x3fac503e
+0,        121,        121,        1,   115200, 0xc6785643
+0,        122,        122,        1,   115200, 0xe6666254
+0,        123,        123,        1,   115200, 0x1a05130c
+0,        124,        124,        1,   115200, 0x082cea5d
+0,        125,        125,        1,   115200, 0x473ef142
+0,        126,        126,        1,   115200, 0x9769a776
+0,        127,        127,        1,   115200, 0xe6e841af
+0,        128,        128,        1,   115200, 0xa44c8d1e
+0,        129,        129,        1,   115200, 0xd03d641b
+0,        130,        130,        1,   115200, 0x3aea3c9e
+0,        131,        131,        1,   115200, 0x09efcf21
+0,        132,        132,        1,   115200, 0xeeb6ff64
+0,        133,        133,        1,   115200, 0xa310af6f
+0,        134,        134,        1,   115200, 0x2488519e
+0,        135,        135,        1,   115200, 0x48e1febf
+0,        136,        136,        1,   115200, 0x76d00513
+0,        137,        137,        1,   115200, 0xa28eda81
+0,        138,        138,        1,   115200, 0xc2cbdcae
+0,        139,        139,        1,   115200, 0xd976c9b2
+0,        140,        140,        1,   115200, 0xb0abebab
+0,        141,        141,        1,   115200, 0x32be4765
+0,        142,        142,        1,   115200, 0xc0a36b11
+0,        143,        143,        1,   115200, 0xb6d1d47f
+0,        144,        144,        1,   115200, 0xab7954a6
+0,        145,        145,        1,   115200, 0xc485789c
+0,        146,        146,        1,   115200, 0xa07101b6
+0,        147,        147,        1,   115200, 0x6297780a
+0,        148,        148,        1,   115200, 0xf550ba94
+0,        149,        149,        1,   115200, 0x9b77f994
+0,        150,        150,        1,   115200, 0xb0e870ad
+0,        151,        151,        1,   115200, 0x2dd89b0b
+0,        152,        152,        1,   115200, 0x36dcfe2f
+0,        153,        153,        1,   115200, 0x3e5e1a8f
+0,        154,        154,        1,   115200, 0xb8394740
+0,        155,        155,        1,   115200, 0xbfc852fc
+0,        156,        156,        1,   115200, 0x5b3f8aa2
+0,        157,        157,        1,   115200, 0xc29d8e3a
+0,        158,        158,        1,   115200, 0x7300abd8
+0,        159,        159,        1,   115200, 0xd1dd7a3b
+0,        160,        160,        1,   115200, 0xe5978f39
+0,        161,        161,        1,   115200, 0x235c6b8d
+0,        162,        162,        1,   115200, 0xec1b5805
+0,        163,        163,        1,   115200, 0x16d23946
+0,        164,        164,        1,   115200, 0xa8de1cf4
+0,        165,        165,        1,   115200, 0x5e730512
+0,        166,        166,        1,   115200, 0x1250feed
+0,        167,        167,        1,   115200, 0x0928c190
+0,        168,        168,        1,   115200, 0xa25d9e5c
+0,        169,        169,        1,   115200, 0x921068ea
+0,        170,        170,        1,   115200, 0x2c974ddb
+0,        171,        171,        1,   115200, 0x35ae4d75
+0,        172,        172,        1,   115200, 0xec0c6469
+0,        173,        173,        1,   115200, 0x22704fad
+0,        174,        174,        1,   115200, 0x0a9a5aed
+0,        175,        175,        1,   115200, 0x45192f2f
+0,        176,        176,        1,   115200, 0xc07b39f4
+0,        177,        177,        1,   115200, 0x32c60215
+0,        178,        178,        1,   115200, 0xda65035e
+0,        179,        179,        1,   115200, 0x99d0cd81
+0,        180,        180,        1,   115200, 0xd08ca5e3
+0,        181,        181,        1,   115200, 0x82cdad17
+0,        182,        182,        1,   115200, 0x2587a420
+0,        183,        183,        1,   115200, 0x85cba73d
+0,        184,        184,        1,   115200, 0x4677bf89
+0,        185,        185,        1,   115200, 0x84c2e034
+0,        186,        186,        1,   115200, 0xd343066c
+0,        187,        187,        1,   115200, 0xdec716a1
+0,        188,        188,        1,   115200, 0x93c04f5d
+0,        189,        189,        1,   115200, 0xce126ac4
+0,        190,        190,        1,   115200, 0xa20098c5
+0,        191,        191,        1,   115200, 0x9a4ca711
+0,        192,        192,        1,   115200, 0xfae9c154
+0,        193,        193,        1,   115200, 0xb34cc431
+0,        194,        194,        1,   115200, 0x923cdec2
+0,        195,        195,        1,   115200, 0x60ffdfe8
+0,        196,        196,        1,   115200, 0xa3e6f9f2
+0,        197,        197,        1,   115200, 0x374f0a47
+0,        198,        198,        1,   115200, 0x8fb228f1
+0,        199,        199,        1,   115200, 0x4c1a24bf
+0,        200,        200,        1,   115200, 0x768a52d1
+0,        201,        201,        1,   115200, 0x5bf77025
+0,        202,        202,        1,   115200, 0x6ca67c2a
+0,        203,        203,        1,   115200, 0x107ca3e9
+0,        204,        204,        1,   115200, 0x4abeda93
+0,        205,        205,        1,   115200, 0x750be9ff
+0,        206,        206,        1,   115200, 0x28c5eee3
+0,        207,        207,        1,   115200, 0xa1b0e4b2
+0,        208,        208,        1,   115200, 0x2ae7f33d
+0,        209,        209,        1,   115200, 0xf29cdae0
+0,        210,        210,        1,   115200, 0xd470f9ed
+0,        211,        211,        1,   115200, 0x2d22f832
+0,        212,        212,        1,   115200, 0xc5b91780
+0,        213,        213,        1,   115200, 0x3d8e4151
+0,        214,        214,        1,   115200, 0x459f58e0
+0,        215,        215,        1,   115200, 0x8dc198fe
+0,        216,        216,        1,   115200, 0x2479f579
+0,        217,        217,        1,   115200, 0xc2040c21
+0,        218,        218,        1,   115200, 0x39ad60d5
+0,        219,        219,        1,   115200, 0x9329dd37
+0,        220,        220,        1,   115200, 0xa08807da
+0,        221,        221,        1,   115200, 0xbf514cd1
+0,        222,        222,        1,   115200, 0x8b66a779
+0,        223,        223,        1,   115200, 0x865ebff5
+0,        224,        224,        1,   115200, 0x5967074c
+0,        225,        225,        1,   115200, 0xd5521f60
+0,        226,        226,        1,   115200, 0x462c329c
+0,        227,        227,        1,   115200, 0xbefd36fb
+0,        228,        228,        1,   115200, 0x6f58403b
+0,        229,        229,        1,   115200, 0xe4af2fac
+0,        230,        230,        1,   115200, 0x46453662
+0,        231,        231,        1,   115200, 0x72cc59e8
+0,        232,        232,        1,   115200, 0xd6c67f8e
+0,        233,        233,        1,   115200, 0xd35674a7
+0,        234,        234,        1,   115200, 0x65785ddb
+0,        235,        235,        1,   115200, 0xfd7958aa
+0,        236,        236,        1,   115200, 0x93e45607
+0,        237,        237,        1,   115200, 0x196a4fa5
+0,        238,        238,        1,   115200, 0xe33a5dac
+0,        239,        239,        1,   115200, 0x4e66904a
+0,        240,        240,        1,   115200, 0xc1e3a50a
+0,        241,        241,        1,   115200, 0xa685b351
+0,        242,        242,        1,   115200, 0xee2fdeb7
+0,        243,        243,        1,   115200, 0x189cefdd
+0,        244,        244,        1,   115200, 0xbdf90506
+0,        245,        245,        1,   115200, 0xe72c23d2
+0,        246,        246,        1,   115200, 0xa3f65e7b
+0,        247,        247,        1,   115200, 0x8bc67eee
+0,        248,        248,        1,   115200, 0xd305d09b
+0,        249,        249,        1,   115200, 0xc521eba5
+0,        250,        250,        1,   115200, 0x16cf161f
+0,        251,        251,        1,   115200, 0x2ce322b5
+0,        252,        252,        1,   115200, 0x57ce82b4
+0,        253,        253,        1,   115200, 0x8da896b9
+0,        254,        254,        1,   115200, 0xc16ad590
+0,        255,        255,        1,   115200, 0x8cdbe729
+0,        256,        256,        1,   115200, 0x69eafd96
+0,        257,        257,        1,   115200, 0xd9e40a03
+0,        258,        258,        1,   115200, 0xb91423e1
+0,        259,        259,        1,   115200, 0x09b516bd
+0,        260,        260,        1,   115200, 0x20292b85
+0,        261,        261,        1,   115200, 0x8cbb4aeb
+0,        262,        262,        1,   115200, 0x99b761ec
+0,        263,        263,        1,   115200, 0x28406a14
+0,        264,        264,        1,   115200, 0xea368c86
+0,        265,        265,        1,   115200, 0xf388ab54
+0,        266,        266,        1,   115200, 0x263fe1de
+0,        267,        267,        1,   115200, 0xc3410c39
+0,        268,        268,        1,   115200, 0xc056244d
+0,        269,        269,        1,   115200, 0x99c51fc5
+0,        270,        270,        1,   115200, 0x7e4a0d07
+0,        271,        271,        1,   115200, 0xcd911916
+0,        272,        272,        1,   115200, 0x8bd0fa21
+0,        273,        273,        1,   115200, 0xd1a1ab71
+0,        274,        274,        1,   115200, 0xbc904028
+0,        275,        275,        1,   115200, 0xfd480acc
+0,        276,        276,        1,   115200, 0x1cb5c8b5
+0,        277,        277,        1,   115200, 0xcad15709
+0,        278,        278,        1,   115200, 0xdd306f19
+0,        279,        279,        1,   115200, 0x3f975f1b
+0,        280,        280,        1,   115200, 0x2386cd1f
+0,        281,        281,        1,   115200, 0xcaa4f5b0
+0,        282,        282,        1,   115200, 0x8ce213de
+0,        283,        283,        1,   115200, 0x5f7407c6
+0,        284,        284,        1,   115200, 0x01b3ee00
+0,        285,        285,        1,   115200, 0x92759715
+0,        286,        286,        1,   115200, 0x4a208e1e
+0,        287,        287,        1,   115200, 0x6e1b80a5
+0,        288,        288,        1,   115200, 0xe78c7622
+0,        289,        289,        1,   115200, 0xcc255da9
+0,        290,        290,        1,   115200, 0x69e561cb
+0,        291,        291,        1,   115200, 0x2d135227
+0,        292,        292,        1,   115200, 0xfc6a5e4d
+0,        293,        293,        1,   115200, 0x81473914
+0,        294,        294,        1,   115200, 0xe50831b2
+0,        295,        295,        1,   115200, 0xe7d2228f
+0,        296,        296,        1,   115200, 0xe6992f1a
+0,        297,        297,        1,   115200, 0x1e533698
+0,        298,        298,        1,   115200, 0x0c63558c
+0,        299,        299,        1,   115200, 0x54990104
+0,        300,        300,        1,   115200, 0xce14fc4d
+0,        301,        301,        1,   115200, 0x760b5c6e
+0,        302,        302,        1,   115200, 0x14157b61
+0,        303,        303,        1,   115200, 0x62ca7972
+0,        304,        304,        1,   115200, 0xe99573ce
+0,        305,        305,        1,   115200, 0x36df4b8d
+0,        306,        306,        1,   115200, 0x272238ea
+0,        307,        307,        1,   115200, 0x606e3863
+0,        308,        308,        1,   115200, 0x8b143873
+0,        309,        309,        1,   115200, 0x2e46db9e
+0,        310,        310,        1,   115200, 0x1131ad78
+0,        311,        311,        1,   115200, 0x52f34951
+0,        312,        312,        1,   115200, 0xd4590eea
+0,        313,        313,        1,   115200, 0x44ddeaa2
+0,        314,        314,        1,   115200, 0xbc83c399
+0,        315,        315,        1,   115200, 0x5e9da9a7
+0,        316,        316,        1,   115200, 0xca6a8dfc
+0,        317,        317,        1,   115200, 0xe17b3ff8
+0,        318,        318,        1,   115200, 0xea1f375c
+0,        319,        319,        1,   115200, 0xa265143b
+0,        320,        320,        1,   115200, 0xe788fa1e
+0,        321,        321,        1,   115200, 0xd58be649
+0,        322,        322,        1,   115200, 0x740c1f19
+0,        323,        323,        1,   115200, 0xfab3302f
+0,        324,        324,        1,   115200, 0x1c954fc7
+0,        325,        325,        1,   115200, 0xd57a5923
+0,        326,        326,        1,   115200, 0x099745d9
+0,        327,        327,        1,   115200, 0x2e61cc66
+0,        328,        328,        1,   115200, 0xdb3ec93a
+0,        329,        329,        1,   115200, 0x553ba839
+0,        330,        330,        1,   115200, 0xfafc6b60
+0,        331,        331,        1,   115200, 0xa3fb39b6
+0,        332,        332,        1,   115200, 0x7fb9d7be
+0,        333,        333,        1,   115200, 0x7e73cd93
+0,        334,        334,        1,   115200, 0xa43ec5f2
+0,        335,        335,        1,   115200, 0x3ec077c1
+0,        336,        336,        1,   115200, 0xc4275815
+0,        337,        337,        1,   115200, 0xf84c17bf
+0,        338,        338,        1,   115200, 0x1f54d44d
+0,        339,        339,        1,   115200, 0x566fa5bb
+0,        340,        340,        1,   115200, 0x82179a82
+0,        341,        341,        1,   115200, 0xf8865f3d
+0,        342,        342,        1,   115200, 0xa5fb7b80
+0,        343,        343,        1,   115200, 0x9aebc04d
+0,        344,        344,        1,   115200, 0x44c705fc
+0,        345,        345,        1,   115200, 0xd322add3
+0,        346,        346,        1,   115200, 0xf4230b76
+0,        347,        347,        1,   115200, 0xaa915069
+0,        348,        348,        1,   115200, 0x518d53d8
+0,        349,        349,        1,   115200, 0xefa7d909
+0,        350,        350,        1,   115200, 0x803c3c0e
+0,        351,        351,        1,   115200, 0x5650bc0a
+0,        352,        352,        1,   115200, 0x8b34ecab
+0,        353,        353,        1,   115200, 0x975c4976
+0,        354,        354,        1,   115200, 0x700e3cb4
+0,        355,        355,        1,   115200, 0xef27a4ec
+0,        356,        356,        1,   115200, 0x2b953936
+0,        357,        357,        1,   115200, 0xcf9b4956
+0,        358,        358,        1,   115200, 0xae4a8eba
+0,        359,        359,        1,   115200, 0xf8821144
+0,        360,        360,        1,   115200, 0x97c2402c
+0,        361,        361,        1,   115200, 0x209b7bb3
+0,        362,        362,        1,   115200, 0xd22fff2c
+0,        363,        363,        1,   115200, 0xe85b4f16
+0,        364,        364,        1,   115200, 0x0659f318
+0,        365,        365,        1,   115200, 0x6e2bff98
+0,        366,        366,        1,   115200, 0xc6626f2f
+0,        367,        367,        1,   115200, 0x123138e2
+0,        368,        368,        1,   115200, 0x69e680ab
+0,        369,        369,        1,   115200, 0xe4d7cd1d
+0,        370,        370,        1,   115200, 0x4ca10d47
+0,        371,        371,        1,   115200, 0x633a4c39
+0,        372,        372,        1,   115200, 0x64ded292
+0,        373,        373,        1,   115200, 0x88d2df42
+0,        374,        374,        1,   115200, 0x998f4c63
+0,        375,        375,        1,   115200, 0x753c76f9
+0,        376,        376,        1,   115200, 0x9d7ba0a6
+0,        377,        377,        1,   115200, 0x68798da5
+0,        378,        378,        1,   115200, 0xb5b18bc3
+0,        379,        379,        1,   115200, 0x20245e49
+0,        380,        380,        1,   115200, 0xf15d4b8f
+0,        381,        381,        1,   115200, 0x17f83b69
+0,        382,        382,        1,   115200, 0xcc545783
+0,        383,        383,        1,   115200, 0x3dad530e
+0,        384,        384,        1,   115200, 0x6b465c94
+0,        385,        385,        1,   115200, 0xbc5f3831
+0,        386,        386,        1,   115200, 0x1b2f042d
+0,        387,        387,        1,   115200, 0xaec391ac
+0,        388,        388,        1,   115200, 0x99fa8b2a
+0,        389,        389,        1,   115200, 0xf78d3524
+0,        390,        390,        1,   115200, 0xe6255a24
+0,        391,        391,        1,   115200, 0x253542c6
+0,        392,        392,        1,   115200, 0xfab05365
+0,        393,        393,        1,   115200, 0x406a3749
+0,        394,        394,        1,   115200, 0xaf0f3935
+0,        395,        395,        1,   115200, 0x0d9ff780
+0,        396,        396,        1,   115200, 0xfadcfc15
+0,        397,        397,        1,   115200, 0x8267d5ad
+0,        398,        398,        1,   115200, 0xd705d250
+0,        399,        399,        1,   115200, 0x18f9d1f2
+0,        400,        400,        1,   115200, 0xd92bc045
+0,        401,        401,        1,   115200, 0x439b9ca0
+0,        402,        402,        1,   115200, 0xcb80a14c
+0,        403,        403,        1,   115200, 0xee887f49
+0,        404,        404,        1,   115200, 0xfba297eb
+0,        405,        405,        1,   115200, 0x0e2f744b
+0,        406,        406,        1,   115200, 0xaa227aa7
+0,        407,        407,        1,   115200, 0xd7bc6fff
+0,        408,        408,        1,   115200, 0x295c91cf
+0,        409,        409,        1,   115200, 0xc5678733
+0,        410,        410,        1,   115200, 0xc8d49120
+0,        411,        411,        1,   115200, 0xb14e90b9
+0,        412,        412,        1,   115200, 0x6a09acab
+0,        413,        413,        1,   115200, 0xb9aec358
+0,        414,        414,        1,   115200, 0xeb3695b2
+0,        415,        415,        1,   115200, 0xc5bebd62
+0,        416,        416,        1,   115200, 0x2d6b1a3f
+0,        417,        417,        1,   115200, 0x92986f49
+0,        418,        418,        1,   115200, 0x00c37cf9
+0,        419,        419,        1,   115200, 0x5a4d87a6
+0,        420,        420,        1,   115200, 0xe87888a2
+0,        421,        421,        1,   115200, 0x4ab18d6d
+0,        422,        422,        1,   115200, 0xcb84880b
+0,        423,        423,        1,   115200, 0x82458848
+0,        424,        424,        1,   115200, 0x11b477dc
+0,        425,        425,        1,   115200, 0x56d876d3
+0,        426,        426,        1,   115200, 0xf5297ceb
+0,        427,        427,        1,   115200, 0x47357713
+0,        428,        428,        1,   115200, 0xede562df
+0,        429,        429,        1,   115200, 0xabf42d38
+0,        430,        430,        1,   115200, 0xea9225c8
+0,        431,        431,        1,   115200, 0x79ce1cb4
+0,        432,        432,        1,   115200, 0x0cd418b4
+0,        433,        433,        1,   115200, 0x6f7c118e
+0,        434,        434,        1,   115200, 0xbbbc0fa4
+0,        435,        435,        1,   115200, 0x890514e6
+0,        436,        436,        1,   115200, 0x9c4d0e7d
+0,        437,        437,        1,   115200, 0x56260e76
+0,        438,        438,        1,   115200, 0x7dc80258
+0,        439,        439,        1,   115200, 0xa990f5a3
+0,        440,        440,        1,   115200, 0x2174e913
+0,        441,        441,        1,   115200, 0x8296e674
+0,        442,        442,        1,   115200, 0x9e28e3b4
+0,        443,        443,        1,   115200, 0x404ce72b
+0,        444,        444,        1,   115200, 0xc7cbf4ec
+0,        445,        445,        1,   115200, 0x5ce0f5a1
+0,        446,        446,        1,   115200, 0x88dbf7c7
+0,        447,        447,        1,   115200, 0x26daf35a
+0,        448,        448,        1,   115200, 0x5cfdfe63
+0,        449,        449,        1,   115200, 0xdd40fb9b
+0,        450,        450,        1,   115200, 0x5b8df20f
+0,        451,        451,        1,   115200, 0x4f2ce5ac
+0,        452,        452,        1,   115200, 0xc9d0e0c2
+0,        453,        453,        1,   115200, 0x51c7e2a6
+0,        454,        454,        1,   115200, 0xb3bae109
+0,        455,        455,        1,   115200, 0xbd85e5b2
+0,        456,        456,        1,   115200, 0x1fbbdfd1
+0,        457,        457,        1,   115200, 0x3665dfd0
+0,        458,        458,        1,   115200, 0xcd29d50c
+0,        459,        459,        1,   115200, 0xedd1c6bc
+0,        460,        460,        1,   115200, 0xebc2d072
+0,        461,        461,        1,   115200, 0xe2e5fbbd
+0,        462,        462,        1,   115200, 0x616a13dc
+0,        463,        463,        1,   115200, 0xf64f1efc
+0,        464,        464,        1,   115200, 0x5356235f
+0,        465,        465,        1,   115200, 0xafc032d5
+0,        466,        466,        1,   115200, 0xaa034420
+0,        467,        467,        1,   115200, 0x007e0afa
+0,        468,        468,        1,   115200, 0x077ad5c8
+0,        469,        469,        1,   115200, 0x8fc815b8
+0,        470,        470,        1,   115200, 0x95b85990
+0,        471,        471,        1,   115200, 0x46f5899f
+0,        472,        472,        1,   115200, 0x1e37cd82
+0,        473,        473,        1,   115200, 0x3ce90bfd
+0,        474,        474,        1,   115200, 0xbb95bd1d
+0,        475,        475,        1,   115200, 0xd4aa9ba8
+0,        476,        476,        1,   115200, 0x0e761649
+0,        477,        477,        1,   115200, 0x49ad7886
+0,        478,        478,        1,   115200, 0x2f4184df
+0,        479,        479,        1,   115200, 0x80b906ee
+0,        480,        480,        1,   115200, 0x62405100
+0,        481,        481,        1,   115200, 0x3ece13b5
+0,        482,        482,        1,   115200, 0x3abd4cfc
+0,        483,        483,        1,   115200, 0x91b418e3
+0,        484,        484,        1,   115200, 0xde1ce68e
+0,        485,        485,        1,   115200, 0xfc47f912
+0,        486,        486,        1,   115200, 0x5b380a6f
+0,        487,        487,        1,   115200, 0x8f35c3c0
+0,        488,        488,        1,   115200, 0xb26dc220
+0,        489,        489,        1,   115200, 0x3d5bbfce
+0,        490,        490,        1,   115200, 0xa1f9bee6
+0,        491,        491,        1,   115200, 0xa87dcd24
+0,        492,        492,        1,   115200, 0x9374cb71
+0,        493,        493,        1,   115200, 0x0c7ccbd0
+0,        494,        494,        1,   115200, 0x9a16cc49
+0,        495,        495,        1,   115200, 0x4df0c28b
+0,        496,        496,        1,   115200, 0xb5b8b866
+0,        497,        497,        1,   115200, 0xafcc1019
+0,        510,        510,        1,   115200, 0x623b0ff3
+0,        512,        512,        1,   115200, 0x1d6f10b5
diff --git a/tests/ref/fate/wnv1 b/tests/ref/fate/wnv1
index 4de35bfc7c..5d48aed9ac 100644
--- a/tests/ref/fate/wnv1
+++ b/tests/ref/fate/wnv1
@@ -1,4 +1,8 @@
 #tb 0: 13333/200000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 160x120
+#sar 0: 0/1
 0,          0,          0,        1,    38400, 0x4c3fdc2f
 0,          1,          1,        1,    38400, 0x11c9d0cb
 0,          2,          2,        1,    38400, 0x6c37fd7f
diff --git a/tests/ref/fate/wtv-demux b/tests/ref/fate/wtv-demux
index bdd6c20b42..abe85a4ab6 100644
--- a/tests/ref/fate/wtv-demux
+++ b/tests/ref/fate/wtv-demux
@@ -1,5 +1,16 @@
+#extradata 0:       86, 0xc7ca09e5
+#extradata 1:       22, 0x12dc010c
 #tb 0: 1/10000000
+#media_type 0: video
+#codec_id 0: mpeg2video
+#dimensions 0: 720x576
+#sar 0: 64/45
 #tb 1: 1/10000000
+#media_type 1: audio
+#codec_id 1: mp2
+#sample_rate 1: 48000
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
 1,         -2,         -2,   240000,      576, 0x9b6e1638
 1,     239998,     239998,   240000,      576, 0x0ca91183
 1,     479998,     479998,   240000,      576, 0xec6a180f
@@ -33,109 +44,109 @@
 1,    7199998,    7199998,   240000,      576, 0xeb4b0d93
 1,    7439998,    7439998,   240000,      576, 0xde1322f5
 1,    7679998,    7679998,   240000,      576, 0xc3131f35
-0,    7886331,    9486442,   400000,    41980, 0xd4920915
 1,    7919998,    7919998,   240000,      576, 0x708f1381
 1,    8159998,    8159998,   240000,      576, 0x1f00137e
+0,    8286442,    9486442,   400000,    41980, 0xd4920915
 1,    8399998,    8399998,   240000,      576, 0x05131eb0
 1,    8639998,    8639998,   240000,      576, 0x78151c22
-0,    8686442,    8686442,   400000,     7228, 0x1b141fa3
+0,    8686442,    8686442,   400000,     7228, 0x1b141fa3, F=0x0
 1,    8879998,    8879998,   240000,      576, 0x31771239
-0,    9086331,    9086331,   400000,     7492, 0x1a47f3e4
+0,    9086331,    9086331,   400000,     7492, 0x1a47f3e4, F=0x0
 1,    9119998,    9119998,   240000,      576, 0x3ce4097c
 1,    9359998,    9359998,   240000,      576, 0x180e15f4
-0,    9486442,   10686331,   400000,    25068, 0xcb70a744
+0,    9486442,   10686331,   400000,    25068, 0xcb70a744, F=0x0
 1,    9599998,    9599998,   240000,      576, 0x30db0604
 1,    9839998,    9839998,   240000,      576, 0x9b290284
-0,    9886442,    9886442,   400000,     7212, 0x0ab9f558
+0,    9886442,    9886442,   400000,     7212, 0x0ab9f558, F=0x0
 1,   10079998,   10079998,   240000,      576, 0xcf340753
-0,   10286442,   10286442,   400000,     7612, 0xa93054f0
+0,   10286442,   10286442,   400000,     7612, 0xa93054f0, F=0x0
 1,   10319998,   10319998,   240000,      576, 0xdaa41457
 1,   10559998,   10559998,   240000,      576, 0x34d310a2
-0,   10686331,   11886331,   400000,    22868, 0xa77db64a
+0,   10686331,   11886331,   400000,    22868, 0xa77db64a, F=0x0
 1,   10799998,   10799998,   240000,      576, 0x58b31010
 1,   11039998,   11039998,   240000,      576, 0x19610f54
-0,   11086442,   11086442,   400000,     6260, 0x6cf76411
+0,   11086442,   11086442,   400000,     6260, 0x6cf76411, F=0x0
 1,   11279998,   11279998,   240000,      576, 0x17762352
-0,   11486331,   11486331,   400000,     6156, 0xe168394b
+0,   11486331,   11486331,   400000,     6156, 0xe168394b, F=0x0
 1,   11519998,   11519998,   240000,      576, 0x1fea1448
 1,   11759998,   11759998,   240000,      576, 0x55840a01
-0,   11886331,   13086442,   449438,    23364, 0x53164f1e
+0,   11886331,   13086442,   400000,    23364, 0x53164f1e, F=0x0
 1,   11999998,   11999998,   240000,      576, 0x6c9c24ce
 1,   12239998,   12239998,   240000,      576, 0x955f1e97
-0,   12286442,   12286442,   449438,     6708, 0x89877269
+0,   12286442,   12286442,   400000,     6708, 0x89877269, F=0x0
 1,   12479998,   12479998,   240000,      576, 0x2827134f
-0,   12686442,   12686442,   449438,     6908, 0x8d62a249
+0,   12686442,   12686442,   400000,     6908, 0x8d62a249, F=0x0
 1,   12719998,   12719998,   240000,      576, 0x34a01c29
 1,   12959998,   12959998,   240000,      576, 0x7d351e52
-0,   13086442,   14286442,   449438,    38156, 0xec41f682
+0,   13086442,   14286442,   400000,    38156, 0xec41f682
 1,   13199998,   13199998,   240000,      576, 0x00c91d9e
 1,   13439998,   13439998,   240000,      576, 0x57ea1a97
-0,   13486331,   13486331,   449438,     5764, 0xcc04534b
+0,   13486331,   13486331,   400000,     5764, 0xcc04534b, F=0x0
 1,   13679998,   13679998,   240000,      576, 0xef3a1c74
-0,   13886331,   13886331,   449438,     5388, 0xb8a1c3c5
+0,   13886331,   13886331,   400000,     5388, 0xb8a1c3c5, F=0x0
 1,   13919998,   13919998,   240000,      576, 0x11fc217d
 1,   14159998,   14159998,   240000,      576, 0x59ce20e5
-0,   14286442,   15486331,   449438,    16764, 0x59460d96
+0,   14286442,   15486331,   400000,    16764, 0x59460d96, F=0x0
 1,   14399998,   14399998,   240000,      576, 0xaafc1dbf
 1,   14639998,   14639998,   240000,      576, 0xdd941609
-0,   14686331,   14686331,   449438,     5548, 0x5c91e93d
+0,   14686331,   14686331,   400000,     5548, 0x5c91e93d, F=0x0
 1,   14879998,   14879998,   240000,      576, 0x900420b0
-0,   15086331,   15086331,   449438,     5652, 0x5e321aed
+0,   15086331,   15086331,   400000,     5652, 0x5e321aed, F=0x0
 1,   15119998,   15119998,   240000,      576, 0x5f4f1aa1
 1,   15359998,   15359998,   240000,      576, 0x7d7e18de
-0,   15486331,   16686331,   449438,    15564, 0xefdf5080
+0,   15486331,   16686331,   400000,    15564, 0xefdf5080, F=0x0
 1,   15599998,   15599998,   240000,      576, 0x986c0d9d
 1,   15839998,   15839998,   240000,      576, 0xcb4c21c0
-0,   15886331,   15886331,   449438,     6492, 0xd1d5c5f8
+0,   15886331,   15886331,   400000,     6492, 0xd1d5c5f8, F=0x0
 1,   16079998,   16079998,   240000,      576, 0xbcfb1e8b
-0,   16286331,   16286331,   449438,     5604, 0xf9472b44
+0,   16286331,   16286331,   400000,     5604, 0xf9472b44, F=0x0
 1,   16319998,   16319998,   240000,      576, 0xcb541b4c
 1,   16559998,   16559998,   240000,      576, 0x980426e9
-0,   16686331,   17886331,   449438,    17924, 0x45815b7b
+0,   16686331,   17886331,   400000,    17924, 0x45815b7b, F=0x0
 1,   16799998,   16799998,   240000,      576, 0x09d00aa0
 1,   17039998,   17039998,   240000,      576, 0xad591374
-0,   17086442,   17086442,   449438,     5020, 0x3cc5e554
+0,   17086442,   17086442,   400000,     5020, 0x3cc5e554, F=0x0
 1,   17279998,   17279998,   240000,      576, 0x97bf1461
-0,   17486442,   17486442,   449438,     5276, 0xa0554c12
+0,   17486442,   17486442,   400000,     5276, 0xa0554c12, F=0x0
 1,   17519998,   17519998,   240000,      576, 0xdc871cc4
 1,   17759998,   17759998,   240000,      576, 0x56781896
-0,   17886331,   19086442,   449438,    31460, 0x5765eb5f
+0,   17886331,   19086442,   400000,    31460, 0x5765eb5f
 1,   17999998,   17999998,   240000,      576, 0xc77714e3
 1,   18239998,   18239998,   240000,      576, 0x280e18d4
-0,   18286331,   18286331,   449438,     4972, 0x91adbab7
+0,   18286331,   18286331,   400000,     4972, 0x91adbab7, F=0x0
 1,   18479998,   18479998,   240000,      576, 0xbc0d2302
-0,   18686442,   18686442,   449438,     5580, 0xfea707cb
+0,   18686442,   18686442,   400000,     5580, 0xfea707cb, F=0x0
 1,   18719998,   18719998,   240000,      576, 0x79191384
 1,   18959998,   18959998,   240000,      576, 0x65481c97
-0,   19086442,   20286331,   449438,    17412, 0x0afe4d27
+0,   19086442,   20286331,   400000,    17412, 0x0afe4d27, F=0x0
 1,   19199998,   19199998,   240000,      576, 0xc94d227d
 1,   19439998,   19439998,   240000,      576, 0xa68a1f14
-0,   19486442,   19486442,   449438,     5236, 0x03f55309
+0,   19486442,   19486442,   400000,     5236, 0x03f55309, F=0x0
 1,   19679998,   19679998,   240000,      576, 0x6af11a5c
-0,   19886331,   19886331,   449438,     4924, 0x558e753c
+0,   19886331,   19886331,   400000,     4924, 0x558e753c, F=0x0
 1,   19919998,   19919998,   240000,      576, 0x4d1019ef
 1,   20159998,   20159998,   240000,      576, 0x3b1b17b5
-0,   20286331,   21486331,   449438,    15396, 0xf145d121
+0,   20286331,   21486331,   400000,    15396, 0xf145d121, F=0x0
 1,   20399998,   20399998,   240000,      576, 0xcdd8159f
 1,   20639998,   20639998,   240000,      576, 0x97cd1d06
-0,   20686331,   20686331,   449438,     4708, 0x43066a92
+0,   20686331,   20686331,   400000,     4708, 0x43066a92, F=0x0
 1,   20879998,   20879998,   240000,      576, 0x5d1b1123
-0,   21086442,   21086442,   449438,     4332, 0x9e22bcba
+0,   21086442,   21086442,   400000,     4332, 0x9e22bcba, F=0x0
 1,   21119998,   21119998,   240000,      576, 0x888d0cb0
 1,   21359998,   21359998,   240000,      576, 0x556e1dad
-0,   21486331,   22686442,   449438,    12876, 0x46ff9ef4
+0,   21486331,   22686442,   400000,    12876, 0x46ff9ef4, F=0x0
 1,   21599998,   21599998,   240000,      576, 0xf7af0bce
 1,   21839998,   21839998,   240000,      576, 0xb5da160a
-0,   21886442,   21886442,   449438,     5940, 0x27cba62e
+0,   21886442,   21886442,   400000,     5940, 0x27cba62e, F=0x0
 1,   22079998,   22079998,   240000,      576, 0x4a8d0e98
-0,   22286442,   22286442,   449438,     6124, 0x6bab0a6d
+0,   22286442,   22286442,   400000,     6124, 0x6bab0a6d, F=0x0
 1,   22319998,   22319998,   240000,      576, 0x183b1c7e
 1,   22559998,   22559998,   240000,      576, 0xc47120e6
-0,   22686442,   23886442,   449438,    36428, 0x942f9648
+0,   22686442,   23886442,   400000,    36428, 0x942f9648
 1,   22799998,   22799998,   240000,      576, 0xb1f31346
-0,   23086331,   23086331,   449438,     6660, 0x545a0db7
-0,   23486331,   23486331,   449438,     6780, 0x2d1d4189
-0,   23886442,   25086331,   449438,    16460, 0x7c3b3ca4
-0,   24286442,   24286442,   449438,     6724, 0x8538cc6f
-0,   24686442,   24686442,   449438,     7068, 0x69574fd0
-0,   25086331,   26286331,   449438,    19552, 0xf230e854
+0,   23086331,   23086331,   400000,     6660, 0x545a0db7, F=0x0
+0,   23486331,   23486331,   400000,     6780, 0x2d1d4189, F=0x0
+0,   23886442,   25086331,   400000,    16460, 0x7c3b3ca4, F=0x0
+0,   24286442,   24286442,   400000,     6724, 0x8538cc6f, F=0x0
+0,   24686442,   24686442,   400000,     7068, 0x69574fd0, F=0x0
+0,   25086331,   26286331,   400000,    19552, 0xf230e854, F=0x0
diff --git a/tests/ref/fate/xbm10 b/tests/ref/fate/xbm10
index 00388916f7..57a70d2771 100644
--- a/tests/ref/fate/xbm10
+++ b/tests/ref/fate/xbm10
@@ -1,2 +1,6 @@
 #tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 16x16
+#sar 0: 0/1
 0,          0,          0,        1,       32, 0x777f0737
diff --git a/tests/ref/fate/xbm11 b/tests/ref/fate/xbm11
index 778e8ab702..8385281239 100644
--- a/tests/ref/fate/xbm11
+++ b/tests/ref/fate/xbm11
@@ -1,2 +1,6 @@
 #tb 0: 1/25
-0,          0,          0,        1,     1500, 0x8b73635a
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 200x190
+#sar 0: 0/1
+0,          0,          0,        1,     4750, 0xc85f0b6d
diff --git a/tests/ref/fate/xface b/tests/ref/fate/xface
new file mode 100644
index 0000000000..05a955cf92
--- /dev/null
+++ b/tests/ref/fate/xface
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 48x48
+#sar 0: 0/1
+0,          0,          0,        1,      288, 0x87ddaef8
diff --git a/tests/ref/fate/xmv-demux b/tests/ref/fate/xmv-demux
index 20c6ac1c4f..6da2b1a701 100644
--- a/tests/ref/fate/xmv-demux
+++ b/tests/ref/fate/xmv-demux
@@ -1,5 +1,15 @@
+#extradata 0:        4, 0x015a00ad
 #tb 0: 1/1000
+#media_type 0: video
+#codec_id 0: wmv2
+#dimensions 0: 640x480
+#sar 0: 0/1
 #tb 1: 16/11025
+#media_type 1: audio
+#codec_id 1: adpcm_ima_wav
+#sample_rate 1: 44100
+#channel_layout 1: 3
+#channel_layout_name 1: stereo
 0,          0,          0,        0,     1508, 0xefceba48
 1,          0,          0,       83,     5976, 0xfa2c2db9
 1,         83,         83,       83,     5976, 0x256b935c
@@ -7,32 +17,32 @@
 1,        249,        249,       83,     5976, 0x4ea056f4
 1,        332,        332,       83,     5976, 0xda772d8d
 1,        415,        415,       83,     5976, 0xafacf7c9
-0,        640,        640,        0,      108, 0x06713c96
-0,        680,        680,        0,      952, 0xd306df7e
-0,        720,        720,        0,     2312, 0xaf316585
+0,        640,        640,        0,      108, 0x06713c96, F=0x0
+0,        680,        680,        0,      952, 0xd306df7e, F=0x0
+0,        720,        720,        0,     2312, 0xaf316585, F=0x0
 1,        498,        498,       83,     5976, 0xdeb003f4
-0,        760,        760,        0,     3872, 0xfc1c527c
-0,        800,        800,        0,       20, 0xaffc0edd
-0,        840,        840,        0,     6600, 0xe1b66c7f
+0,        760,        760,        0,     3872, 0xfc1c527c, F=0x0
+0,        800,        800,        0,       20, 0xaffc0edd, F=0x0
+0,        840,        840,        0,     6600, 0xe1b66c7f, F=0x0
 1,        581,        581,       28,     2016, 0xa7380d36
-0,        880,        880,        0,     6868, 0xd5b3f631
+0,        880,        880,        0,     6868, 0xd5b3f631, F=0x0
 1,        609,        609,       28,     2016, 0xbc090bac
-0,        920,        920,        0,     8420, 0xf70ee33b
+0,        920,        920,        0,     8420, 0xf70ee33b, F=0x0
 1,        637,        637,       28,     2016, 0x6f8c164c
-0,        960,        960,        0,    13144, 0x9a54ef39
+0,        960,        960,        0,    13144, 0x9a54ef39, F=0x0
 1,        665,        665,       28,     2016, 0x13b80e28
-0,       1000,       1000,        0,     6340, 0xe55bf555
+0,       1000,       1000,        0,     6340, 0xe55bf555, F=0x0
 1,        693,        693,       28,     2016, 0xd40ff863
-0,       1040,       1040,        0,     3736, 0x0b23f89f
+0,       1040,       1040,        0,     3736, 0x0b23f89f, F=0x0
 1,        721,        721,       28,     2016, 0x4d530ed7
-0,       1080,       1080,        0,     2624, 0x79e2e451
+0,       1080,       1080,        0,     2624, 0x79e2e451, F=0x0
 1,        749,        749,       30,     2160, 0x0fbc37eb
-0,       1120,       1120,        0,     1860, 0x63886f11
+0,       1120,       1120,        0,     1860, 0x63886f11, F=0x0
 1,        779,        779,      192,    13824, 0x82fb2602
-0,       1160,       1160,        0,     1244, 0x74594601
-0,       1200,       1200,        0,      564, 0xf4561dfb
-0,       1240,       1240,        0,       80, 0xbf8e2e30
-0,       1280,       1280,        0,       20, 0xa0990c29
+0,       1160,       1160,        0,     1244, 0x74594601, F=0x0
+0,       1200,       1200,        0,      564, 0xf4561dfb, F=0x0
+0,       1240,       1240,        0,       80, 0xbf8e2e30, F=0x0
+0,       1280,       1280,        0,       20, 0xa0990c29, F=0x0
 1,        971,        971,      192,    13824, 0x08771caf
 1,       1163,       1163,      192,    13824, 0xdf7d4a65
 1,       1355,       1355,      193,    13896, 0x24bf3f47
@@ -40,35 +50,35 @@
 1,       1598,       1598,       50,     3600, 0x8c666fd6
 1,       1648,       1648,       50,     3600, 0x305c6ca1
 1,       1698,       1698,       50,     3600, 0x48b04e1e
-0,       2480,       2480,        0,      104, 0x12413980
-0,       2520,       2520,        0,      796, 0x2e698ed3
+0,       2480,       2480,        0,      104, 0x12413980, F=0x0
+0,       2520,       2520,        0,      796, 0x2e698ed3, F=0x0
 1,       1748,       1748,       50,     3600, 0x8c915935
-0,       2560,       2560,        0,     1808, 0x8b3e6e5e
-0,       2600,       2600,        0,     4712, 0xdbd51737
+0,       2560,       2560,        0,     1808, 0x8b3e6e5e, F=0x0
+0,       2600,       2600,        0,     4712, 0xdbd51737, F=0x0
 1,       1798,       1798,       50,     3600, 0xa8f45e01
-0,       2640,       2640,        0,     5548, 0xee9c831c
-0,       2680,       2680,        0,     6152, 0x9c18ccc1
+0,       2640,       2640,        0,     5548, 0xee9c831c, F=0x0
+0,       2680,       2680,        0,     6152, 0x9c18ccc1, F=0x0
 1,       1848,       1848,       53,     3816, 0xc64cc5ed
-0,       2720,       2720,        0,     6452, 0x7860462a
+0,       2720,       2720,        0,     6452, 0x7860462a, F=0x0
 1,       1901,       1901,       27,     1944, 0x0ac2e3f1
-0,       2760,       2760,        0,     6676, 0xe1b1c9e4
+0,       2760,       2760,        0,     6676, 0xe1b1c9e4, F=0x0
 1,       1928,       1928,       27,     1944, 0x2197dccd
-0,       2800,       2800,        0,    10904, 0x0bded7b7
+0,       2800,       2800,        0,    10904, 0x0bded7b7, F=0x0
 1,       1955,       1955,       27,     1944, 0x0c02e77f
-0,       2840,       2840,        0,    12844, 0xe6d16cff
+0,       2840,       2840,        0,    12844, 0xe6d16cff, F=0x0
 1,       1982,       1982,       27,     1944, 0x675ee06a
-0,       2880,       2880,        0,    10920, 0xe114c46b
+0,       2880,       2880,        0,    10920, 0xe114c46b, F=0x0
 1,       2009,       2009,       30,     2160, 0x0d803a8b
-0,       2920,       2920,        0,     5952, 0xb7464634
+0,       2920,       2920,        0,     5952, 0xb7464634, F=0x0
 1,       2039,       2039,       93,     6696, 0xa7a0dfea
-0,       2960,       2960,        0,     4732, 0x2fa2e36d
-0,       3000,       3000,        0,     2592, 0xf54ddd57
-0,       3040,       3040,        0,     1516, 0x4a1cd4d5
-0,       3080,       3080,        0,      864, 0x49889afc
+0,       2960,       2960,        0,     4732, 0x2fa2e36d, F=0x0
+0,       3000,       3000,        0,     2592, 0xf54ddd57, F=0x0
+0,       3040,       3040,        0,     1516, 0x4a1cd4d5, F=0x0
+0,       3080,       3080,        0,      864, 0x49889afc, F=0x0
 1,       2132,       2132,       93,     6696, 0x59aa3145
-0,       3120,       3120,        0,      468, 0x3932e6a4
-0,       3160,       3160,        0,      116, 0x2b8341e6
-0,       3200,       3200,        0,       16, 0x6a3109cf
+0,       3120,       3120,        0,      468, 0x3932e6a4, F=0x0
+0,       3160,       3160,        0,      116, 0x2b8341e6, F=0x0
+0,       3200,       3200,        0,       16, 0x6a3109cf, F=0x0
 1,       2225,       2225,       93,     6696, 0x69be4d78
 1,       2318,       2318,       93,     6696, 0x64064c67
 1,       2411,       2411,       93,     6696, 0xc8536f98
@@ -80,104 +90,104 @@
 1,       2937,       2937,      123,     8856, 0x19e18797
 1,       3060,       3060,      123,     8856, 0x0a0c7fbd
 1,       3183,       3183,      124,     8928, 0x4a9b2d42
-0,       4640,       4640,        0,      100, 0x45023894
-0,       4680,       4680,        0,      948, 0xa65ed345
-0,       4720,       4720,      108,     2808, 0xd7285746
-0,       4760,       4760,      108,     5372, 0x05794175
+0,       4640,       4640,        0,      100, 0x45023894, F=0x0
+0,       4680,       4680,        0,      948, 0xa65ed345, F=0x0
+0,       4720,       4720,        0,     2808, 0xd7285746, F=0x0
+0,       4760,       4760,        0,     5372, 0x05794175, F=0x0
 1,       3307,       3307,       21,     1512, 0xed8b3f4b
-0,       4800,       4800,      108,    11596, 0x8636eca7
+0,       4800,       4800,        0,    11596, 0x8636eca7, F=0x0
 1,       3328,       3328,       21,     1512, 0xa27d3891
-0,       4840,       4840,      108,    11524, 0xe1f39be3
+0,       4840,       4840,        0,    11524, 0xe1f39be3, F=0x0
 1,       3349,       3349,       21,     1512, 0xb0f13eb6
-0,       4880,       4880,      108,    23392, 0xab053f05
+0,       4880,       4880,        0,    23392, 0xab053f05, F=0x0
 1,       3370,       3370,       23,     1656, 0xe5a98324
-0,       4920,       4920,      108,     4560, 0x03197d07
+0,       4920,       4920,        0,     4560, 0x03197d07, F=0x0
 1,       3393,       3393,       31,     2232, 0x15445433
-0,       4960,       4960,      108,     4440, 0x1cc361a2
+0,       4960,       4960,        0,     4440, 0x1cc361a2, F=0x0
 1,       3424,       3424,       31,     2232, 0x5cb348a9
-0,       5000,       5000,      108,    23688, 0x16030634
+0,       5000,       5000,        0,    23688, 0x16030634, F=0x0
 1,       3455,       3455,       31,     2232, 0xf10347da
-0,       5040,       5040,      108,    16132, 0xf0eca799
+0,       5040,       5040,        0,    16132, 0xf0eca799, F=0x0
 1,       3486,       3486,       34,     2448, 0x3e16a175
-0,       5080,       5080,      108,    29896, 0x0c0988ea
+0,       5080,       5080,        0,    29896, 0x0c0988ea, F=0x0
 1,       3520,       3520,       35,     2520, 0x17e3ca2b
-0,       5120,       5120,      108,    19956, 0x0093aa0b
+0,       5120,       5120,        0,    19956, 0x0093aa0b, F=0x0
 1,       3555,       3555,       27,     1944, 0x35c2de84
-0,       5160,       5160,      108,    16392, 0x8829a9ca
+0,       5160,       5160,        0,    16392, 0x8829a9ca, F=0x0
 1,       3582,       3582,       27,     1944, 0x55b4db40
-0,       5200,       5200,      108,    16772, 0x9a4a546d
+0,       5200,       5200,        0,    16772, 0x9a4a546d, F=0x0
 1,       3609,       3609,       29,     2088, 0xdaae14b2
-0,       5240,       5240,      108,     8920, 0xcd8ca203
+0,       5240,       5240,        0,     8920, 0xcd8ca203, F=0x0
 1,       3638,       3638,       27,     1944, 0x92ccd37f
-0,       5280,       5280,      108,     9632, 0x53c1d37b
+0,       5280,       5280,        0,     9632, 0x53c1d37b, F=0x0
 1,       3665,       3665,       27,     1944, 0x70efede1
-0,       5320,       5320,      108,     8976, 0xfe4da2cc
+0,       5320,       5320,       40,     8976, 0xfe4da2cc, F=0x0
 1,       3692,       3692,       27,     1944, 0x7601d304
-0,       5360,       5360,      108,     6680, 0x35348fe0
+0,       5360,       5360,       40,     6680, 0x35348fe0, F=0x0
 1,       3719,       3719,       27,     1944, 0x3922ebc2
-0,       5400,       5400,      108,     9228, 0xcbf62b0c
+0,       5400,       5400,       40,     9228, 0xcbf62b0c, F=0x0
 1,       3746,       3746,       30,     2160, 0xde462f2e
-0,       5440,       5440,      108,     5108, 0xd1d88511
+0,       5440,       5440,       40,     5108, 0xd1d88511, F=0x0
 1,       3776,       3776,       26,     1872, 0x467ac1d2
-0,       5480,       5480,      108,    10016, 0xaff4b2b2
+0,       5480,       5480,       40,    10016, 0xaff4b2b2, F=0x0
 1,       3802,       3802,       26,     1872, 0xa1e4cd43
-0,       5520,       5520,      108,     7468, 0x23e81ab8
+0,       5520,       5520,       40,     7468, 0x23e81ab8, F=0x0
 1,       3828,       3828,       26,     1872, 0x1dceccc6
-0,       5560,       5560,      108,     4172, 0x253cd05b
+0,       5560,       5560,       40,     4172, 0x253cd05b, F=0x0
 1,       3854,       3854,       26,     1872, 0x2bbad2a5
-0,       5600,       5600,      108,     8188, 0x7ede743f
+0,       5600,       5600,       40,     8188, 0x7ede743f, F=0x0
 1,       3880,       3880,       26,     1872, 0xc603d44d
-0,       5640,       5640,      108,     2884, 0x2dec55a3
+0,       5640,       5640,       40,     2884, 0x2dec55a3, F=0x0
 1,       3906,       3906,       26,     1872, 0x1b4cc261
-0,       5680,       5680,      108,     3900, 0xd0666a18
+0,       5680,       5680,       40,     3900, 0xd0666a18, F=0x0
 1,       3932,       3932,       26,     1872, 0x10edd6cf
-0,       5720,       5720,      108,     2996, 0x9cc99b8c
+0,       5720,       5720,       40,     2996, 0x9cc99b8c, F=0x0
 1,       3958,       3958,       33,     2376, 0xecdb9d61
-0,       5760,       5760,      108,     2156, 0xae612776
+0,       5760,       5760,       40,     2156, 0xae612776, F=0x0
 1,       3991,       3991,       36,     2592, 0x5559eced
-0,       5800,       5800,      108,     3988, 0x0d2c9992
-0,       5840,       5840,      108,     1512, 0x6281fc00
+0,       5800,       5800,       40,     3988, 0x0d2c9992, F=0x0
+0,       5840,       5840,       40,     1512, 0x6281fc00, F=0x0
 1,       4027,       4027,       36,     2592, 0x8848dfc7
-0,       5880,       5880,      108,     6544, 0xb75c2562
+0,       5880,       5880,       40,     6544, 0xb75c2562, F=0x0
 1,       4063,       4063,       36,     2592, 0x4ca2d7da
-0,       5920,       5920,      108,     4108, 0xfb21efc9
+0,       5920,       5920,       40,     4108, 0xfb21efc9, F=0x0
 1,       4099,       4099,       36,     2592, 0x285fd7e6
-0,       5960,       5960,      108,     1096, 0x85922a37
-0,       6000,       6000,      108,     9740, 0xe57d7647
+0,       5960,       5960,       40,     1096, 0x85922a37, F=0x0
+0,       6000,       6000,       40,     9740, 0xe57d7647, F=0x0
 1,       4135,       4135,       36,     2592, 0x2717e404
-0,       6040,       6040,      108,      416, 0x61c2ea02
+0,       6040,       6040,       40,      416, 0x61c2ea02, F=0x0
 1,       4171,       4171,       36,     2592, 0xf106111a
-0,       6080,       6080,      108,      336, 0x1dc5ac1c
+0,       6080,       6080,       40,      336, 0x1dc5ac1c, F=0x0
 1,       4207,       4207,       36,     2592, 0xd7d01119
-0,       6120,       6120,      108,      204, 0x16f57017
+0,       6120,       6120,       40,      204, 0x16f57017, F=0x0
 1,       4243,       4243,       36,     2592, 0x550cfeda
-0,       6160,       6160,      108,      112, 0x78374234
-0,       6200,       6200,      108,       40, 0x6cb21985
+0,       6160,       6160,       40,      112, 0x78374234, F=0x0
+0,       6200,       6200,       40,       40, 0x6cb21985, F=0x0
 1,       4279,       4279,       36,     2592, 0x47ad00c4
 1,       4315,       4315,       36,     2592, 0x39bbf306
 1,       4351,       4351,       45,     3240, 0x69addfce
 1,       4396,       4396,      297,    21384, 0x254f63e0
 1,       4693,       4693,      298,    21456, 0x2f7a9859
-0,       6840,       6840,      108,    14420, 0x53324ca4
-0,       6880,       6880,      108,       40, 0x10971420
+0,       6840,       6840,       40,    14420, 0x53324ca4, F=0x0
+0,       6880,       6880,       40,       40, 0x10971420, F=0x0
 1,       4991,       4991,      521,    37512, 0x6e962928
 1,       5512,       5512,       38,     2736, 0x1dc91c69
-0,       8000,       8000,      108,    24904, 0x15574f7e
+0,       8000,       8000,       40,    24904, 0x15574f7e
 1,       5550,       5550,       38,     2736, 0x023434fd
 1,       5588,       5588,       38,     2736, 0x906f1541
-0,       8160,       8160,      108,     1908, 0xccb2dd3c
+0,       8160,       8160,       40,     1908, 0xccb2dd3c, F=0x0
 1,       5626,       5626,       38,     2736, 0x85a31102
-0,       8200,       8200,      108,     4676, 0xbfa42b7e
+0,       8200,       8200,       40,     4676, 0xbfa42b7e, F=0x0
 1,       5664,       5664,       42,     3024, 0x9296a5f3
-0,       8240,       8240,      108,     3600, 0x87c9dc58
-0,       8280,       8280,      108,     8184, 0x504a8e65
+0,       8240,       8240,       40,     3600, 0x87c9dc58, F=0x0
+0,       8280,       8280,       40,     8184, 0x504a8e65, F=0x0
 1,       5706,       5706,       27,     1944, 0x7bf4dedc
-0,       8320,       8320,      108,     9636, 0x2efb3006
+0,       8320,       8320,       40,     9636, 0x2efb3006, F=0x0
 1,       5733,       5733,       27,     1944, 0x4196c404
 1,       5760,       5760,       27,     1944, 0xcda97c7a
-0,       8360,       8360,      108,     9580, 0x0fb6f4e8
+0,       8360,       8360,       40,     9580, 0x0fb6f4e8, F=0x0
 1,       5787,       5787,       27,     1944, 0x5f4922b2
-0,       8400,       8400,      108,     7840, 0xe996f564
+0,       8400,       8400,       40,     7840, 0xe996f564, F=0x0
 1,       5814,       5814,       29,     2088, 0x37dfc157
-0,       8440,       8440,      108,     4208, 0xe9c2fba2
-0,       8480,       8480,      108,      556, 0x3f1e077c
+0,       8440,       8440,       40,     4208, 0xe9c2fba2, F=0x0
+0,       8480,       8480,       40,      556, 0x3f1e077c, F=0x0
diff --git a/tests/ref/fate/xvid-custom-matrix b/tests/ref/fate/xvid-custom-matrix
index 03613890b9..32f629f32d 100644
--- a/tests/ref/fate/xvid-custom-matrix
+++ b/tests/ref/fate/xvid-custom-matrix
@@ -1,21 +1,29 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/25
-0,          1,          1,        1,   622080, 870e846b6b001d3e34fa87df96297e28
-0,          2,          2,        1,   622080, de1a3dd9fcc32086ecdffd4591a8defa
-0,          3,          3,        1,   622080, 59f5f16d4224e98e09f22818cc9227e0
-0,          4,          4,        1,   622080, 9744609bcf95107bdbe6a9e21dc22b9d
-0,          5,          5,        1,   622080, 6dc50ad4b5821cc20f418f2eb273a45c
-0,          6,          6,        1,   622080, 57012fc77d853c17591319cc528ebd93
-0,          7,          7,        1,   622080, fd0068955ce1583f21bb888ad3b6952a
-0,          8,          8,        1,   622080, 58b7bcb056fac5d34ec4197fe10723a7
-0,          9,          9,        1,   622080, 064311346d0ea2753f01f18f13188c27
-0,         10,         10,        1,   622080, 21995e49367aee152a11992f48317bbe
-0,         11,         11,        1,   622080, 288c2cd0ac0a3b74d23da6ba30111d55
-0,         12,         12,        1,   622080, 88db7bf240fd6ee5ef89c34522de76e8
-0,         13,         13,        1,   622080, 8e2d38686bbf768e812005decc37cb90
-0,         14,         14,        1,   622080, 3a7d3c036ecaa669d26660937a8b723e
-0,         15,         15,        1,   622080, 6c8b8e847c544125213c9f49d9607d98
-0,         16,         16,        1,   622080, 16b56117f1b327862f78421116dfe52e
-0,         17,         17,        1,   622080, a7ce423456a59bdb4d5921aff1a27691
-0,         18,         18,        1,   622080, 881c9561c9ab66a7659145173f8e8cda
-0,         19,         19,        1,   622080, 7413961f9accd1d32e116592a6448e9b
-0,         20,         20,        1,   622080, c66409494fd1714e6236596f476cece6
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 16/11
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   622080, 870e846b6b001d3e34fa87df96297e28
+0,          1,          1,        1,   622080, de1a3dd9fcc32086ecdffd4591a8defa
+0,          2,          2,        1,   622080, 59f5f16d4224e98e09f22818cc9227e0
+0,          3,          3,        1,   622080, 9744609bcf95107bdbe6a9e21dc22b9d
+0,          4,          4,        1,   622080, 6dc50ad4b5821cc20f418f2eb273a45c
+0,          5,          5,        1,   622080, 57012fc77d853c17591319cc528ebd93
+0,          6,          6,        1,   622080, fd0068955ce1583f21bb888ad3b6952a
+0,          7,          7,        1,   622080, 58b7bcb056fac5d34ec4197fe10723a7
+0,          8,          8,        1,   622080, 064311346d0ea2753f01f18f13188c27
+0,          9,          9,        1,   622080, 21995e49367aee152a11992f48317bbe
+0,         10,         10,        1,   622080, 288c2cd0ac0a3b74d23da6ba30111d55
+0,         11,         11,        1,   622080, 88db7bf240fd6ee5ef89c34522de76e8
+0,         12,         12,        1,   622080, 8e2d38686bbf768e812005decc37cb90
+0,         13,         13,        1,   622080, 3a7d3c036ecaa669d26660937a8b723e
+0,         14,         14,        1,   622080, 6c8b8e847c544125213c9f49d9607d98
+0,         15,         15,        1,   622080, 16b56117f1b327862f78421116dfe52e
+0,         16,         16,        1,   622080, a7ce423456a59bdb4d5921aff1a27691
+0,         17,         17,        1,   622080, 881c9561c9ab66a7659145173f8e8cda
+0,         18,         18,        1,   622080, 7413961f9accd1d32e116592a6448e9b
+0,         21,         21,        1,   622080, c66409494fd1714e6236596f476cece6
diff --git a/tests/ref/fate/xvid-idct b/tests/ref/fate/xvid-idct
index c3cafa3934..cdbba2fa27 100644
--- a/tests/ref/fate/xvid-idct
+++ b/tests/ref/fate/xvid-idct
@@ -1,21 +1,29 @@
+#format: frame checksums
+#version: 2
+#hash: MD5
 #tb 0: 1/25
-0,          1,          1,        1,   622080, 8fe318df973b5d7669e6d28ebf03b229
-0,          2,          2,        1,   622080, 3568d92074e0298a2027f990004fe1a6
-0,          3,          3,        1,   622080, 4781afb6ba38318738e26a98ace4061b
-0,          4,          4,        1,   622080, bd29a005b8392005ef30211f185ca049
-0,          5,          5,        1,   622080, fc50b441ee9256883edba5a584000d66
-0,          6,          6,        1,   622080, 5fce9fb7e66c9d0773ff9c7482cb8307
-0,          7,          7,        1,   622080, 2e0ad7b1ba39e60cdd7a65ed1ed57c30
-0,          8,          8,        1,   622080, b91cfdb91751dabd6691d3c34221b636
-0,          9,          9,        1,   622080, f65507bc00043e8fe345c542f0861a64
-0,         10,         10,        1,   622080, 2e4ee4ea4ec761c2298acced17f63f35
-0,         11,         11,        1,   622080, e7945bd07296205d1549c8edf843af48
-0,         12,         12,        1,   622080, 52fed0ec02c57a138de7dc0e0c804de8
-0,         13,         13,        1,   622080, 3ee2848d0d70795e14765127111a677c
-0,         14,         14,        1,   622080, 42cb0929406b10b95817ffaa2da47335
-0,         15,         15,        1,   622080, 523986866b6cf729e130ea43feacb0a2
-0,         16,         16,        1,   622080, 5d1e4becddf728e93bbcb428de1f02ae
-0,         17,         17,        1,   622080, 0a1453df21e4547447ec8f27a0d4d5ec
-0,         18,         18,        1,   622080, d3495686e769df299b1732326fa3f17e
-0,         19,         19,        1,   622080, 602e9020397b1e82b58b1ff6b9733d21
-0,         20,         20,        1,   622080, 759bd3f739a3b99309efa5c1a697e34d
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 720x576
+#sar 0: 16/11
+#stream#, dts,        pts, duration,     size, hash
+0,          0,          0,        1,   622080, 8fe318df973b5d7669e6d28ebf03b229
+0,          1,          1,        1,   622080, 3568d92074e0298a2027f990004fe1a6
+0,          2,          2,        1,   622080, 4781afb6ba38318738e26a98ace4061b
+0,          3,          3,        1,   622080, bd29a005b8392005ef30211f185ca049
+0,          4,          4,        1,   622080, fc50b441ee9256883edba5a584000d66
+0,          5,          5,        1,   622080, 5fce9fb7e66c9d0773ff9c7482cb8307
+0,          6,          6,        1,   622080, 2e0ad7b1ba39e60cdd7a65ed1ed57c30
+0,          7,          7,        1,   622080, b91cfdb91751dabd6691d3c34221b636
+0,          8,          8,        1,   622080, f65507bc00043e8fe345c542f0861a64
+0,          9,          9,        1,   622080, 2e4ee4ea4ec761c2298acced17f63f35
+0,         10,         10,        1,   622080, e7945bd07296205d1549c8edf843af48
+0,         11,         11,        1,   622080, 52fed0ec02c57a138de7dc0e0c804de8
+0,         12,         12,        1,   622080, 3ee2848d0d70795e14765127111a677c
+0,         13,         13,        1,   622080, 42cb0929406b10b95817ffaa2da47335
+0,         14,         14,        1,   622080, 523986866b6cf729e130ea43feacb0a2
+0,         15,         15,        1,   622080, 5d1e4becddf728e93bbcb428de1f02ae
+0,         16,         16,        1,   622080, 0a1453df21e4547447ec8f27a0d4d5ec
+0,         17,         17,        1,   622080, d3495686e769df299b1732326fa3f17e
+0,         18,         18,        1,   622080, 602e9020397b1e82b58b1ff6b9733d21
+0,         21,         21,        1,   622080, 759bd3f739a3b99309efa5c1a697e34d
diff --git a/tests/ref/fate/xxan-wc4 b/tests/ref/fate/xxan-wc4
index 88dcc98ac5..ae3bda3c34 100644
--- a/tests/ref/fate/xxan-wc4
+++ b/tests/ref/fate/xxan-wc4
@@ -1,4 +1,8 @@
 #tb 0: 1/15
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x165
+#sar 0: 0/1
 0,          0,          0,        1,    79360, 0x8537821b
 0,          1,          1,        1,    79360, 0x110c4343
 0,          2,          2,        1,    79360, 0xa85105bb
diff --git a/tests/ref/fate/yop b/tests/ref/fate/yop
index 1a5666069e..9d615b1394 100644
--- a/tests/ref/fate/yop
+++ b/tests/ref/fate/yop
@@ -1,7 +1,11 @@
 #tb 0: 1/12
-0,          0,          0,        1,   302760, 0x78939253
-0,          1,          1,        1,   302760, 0x534f5253
-0,          2,          2,        1,   302760, 0x25eaa782
-0,          3,          3,        1,   302760, 0x60861c3d
-0,          4,          4,        1,   302760, 0x43552521
-0,          5,          5,        1,   302760, 0x45abca02
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 580x174
+#sar 0: 1/2
+0,          0,          0,        1,   302760, 0xf24dfa37
+0,          1,          1,        1,   302760, 0xcedcbb6c
+0,          2,          2,        1,   302760, 0xc87716a2
+0,          3,          3,        1,   302760, 0x7e378e5a
+0,          4,          4,        1,   302760, 0xd4a19734
+0,          5,          5,        1,   302760, 0x26e93266
diff --git a/tests/ref/fate/zerocodec b/tests/ref/fate/zerocodec
index 2d368c3764..10f9d4ccae 100644
--- a/tests/ref/fate/zerocodec
+++ b/tests/ref/fate/zerocodec
@@ -1,4 +1,8 @@
 #tb 0: 417083/10000000
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 1280x720
+#sar 0: 0/1
 0,          0,          0,        1,  1843200, 0x04154bd5
 0,          1,          1,        1,  1843200, 0x3a872d04
 0,          2,          2,        1,  1843200, 0x3b1304a0
diff --git a/tests/ref/fate/zlib b/tests/ref/fate/zlib
index 4ff76ffbac..007fe00c24 100644
--- a/tests/ref/fate/zlib
+++ b/tests/ref/fate/zlib
@@ -1,2 +1,6 @@
 #tb 0: 100/2997
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 352x240
+#sar 0: 0/1
 0,          0,          0,        1,   253440, 0x94af61e5
diff --git a/tests/ref/fate/zmbv-15bit b/tests/ref/fate/zmbv-15bit
index f054a9d781..d3bee30a5e 100644
--- a/tests/ref/fate/zmbv-15bit
+++ b/tests/ref/fate/zmbv-15bit
@@ -1,160 +1,164 @@
 #tb 0: 250000/1585341
-0,          0,          0,        1,   192000, 0xe1d317d6
-0,          1,          1,        1,   192000, 0xe100109d
-0,          2,          2,        1,   192000, 0xecc69c65
-0,          3,          3,        1,   192000, 0x68f06324
-0,          4,          4,        1,   192000, 0x68f06324
-0,          5,          5,        1,   192000, 0x68f06324
-0,          6,          6,        1,   192000, 0x68f06324
-0,          7,          7,        1,   192000, 0x68f06324
-0,          8,          8,        1,   192000, 0x68f06324
-0,          9,          9,        1,   192000, 0x68f06324
-0,         10,         10,        1,   192000, 0x68f06324
-0,         11,         11,        1,   192000, 0x68f06324
-0,         12,         12,        1,   192000, 0x68f06324
-0,         13,         13,        1,   192000, 0x68f06324
-0,         14,         14,        1,   192000, 0x68f06324
-0,         15,         15,        1,   192000, 0x68f06324
-0,         16,         16,        1,   192000, 0x68f06324
-0,         17,         17,        1,   192000, 0x4c03d2e3
-0,         18,         18,        1,   192000, 0x4c03d2e3
-0,         19,         19,        1,   192000, 0x4c03d2e3
-0,         20,         20,        1,   192000, 0x4c03d2e3
-0,         21,         21,        1,   192000, 0xb562cf68
-0,         22,         22,        1,   192000, 0xb562cf68
-0,         23,         23,        1,   192000, 0xb562cf68
-0,         24,         24,        1,   192000, 0xb562cf68
-0,         25,         25,        1,   192000, 0xb562cf68
-0,         26,         26,        1,   192000, 0x0e5e03c7
-0,         27,         27,        1,   192000, 0x0e5e03c7
-0,         28,         28,        1,   192000, 0x0e5e03c7
-0,         29,         29,        1,   192000, 0x0e5e03c7
-0,         30,         30,        1,   192000, 0xeb2e0f67
-0,         31,         31,        1,   192000, 0xeb2e0f67
-0,         32,         32,        1,   192000, 0xeb2e0f67
-0,         33,         33,        1,   192000, 0xeb2e0f67
-0,         34,         34,        1,   192000, 0xeb2e0f67
-0,         35,         35,        1,   192000, 0xdce603c7
-0,         36,         36,        1,   192000, 0xdce603c7
-0,         37,         37,        1,   192000, 0xdce603c7
-0,         38,         38,        1,   192000, 0xdce603c7
-0,         39,         39,        1,   192000, 0xa8e7db08
-0,         40,         40,        1,   192000, 0xa8e7db08
-0,         41,         41,        1,   192000, 0xa8e7db08
-0,         42,         42,        1,   192000, 0xa8e7db08
-0,         43,         43,        1,   192000, 0xa8e7db08
-0,         44,         44,        1,   192000, 0x322a1b07
-0,         45,         45,        1,   192000, 0x322a1b07
-0,         46,         46,        1,   192000, 0x322a1b07
-0,         47,         47,        1,   192000, 0x322a1b07
-0,         48,         48,        1,   192000, 0x743206af
-0,         49,         49,        1,   192000, 0x743206af
-0,         50,         50,        1,   192000, 0x743206af
-0,         51,         51,        1,   192000, 0x743206af
-0,         52,         52,        1,   192000, 0x743206af
-0,         53,         53,        1,   192000, 0x50195ddf
-0,         54,         54,        1,   192000, 0x50195ddf
-0,         55,         55,        1,   192000, 0x50195ddf
-0,         56,         56,        1,   192000, 0x50195ddf
-0,         57,         57,        1,   192000, 0xd31620d7
-0,         58,         58,        1,   192000, 0xd31620d7
-0,         59,         59,        1,   192000, 0xd31620d7
-0,         60,         60,        1,   192000, 0xd31620d7
-0,         61,         61,        1,   192000, 0xd31620d7
-0,         62,         62,        1,   192000, 0x3af023bf
-0,         63,         63,        1,   192000, 0x3af023bf
-0,         64,         64,        1,   192000, 0x3af023bf
-0,         65,         65,        1,   192000, 0x3af023bf
-0,         66,         66,        1,   192000, 0x561a124f
-0,         67,         67,        1,   192000, 0x561a124f
-0,         68,         68,        1,   192000, 0x561a124f
-0,         69,         69,        1,   192000, 0x561a124f
-0,         70,         70,        1,   192000, 0x561a124f
-0,         71,         71,        1,   192000, 0x99210c7f
-0,         72,         72,        1,   192000, 0x99210c7f
-0,         73,         73,        1,   192000, 0x99210c7f
-0,         74,         74,        1,   192000, 0x99210c7f
-0,         75,         75,        1,   192000, 0xc77b03c7
-0,         76,         76,        1,   192000, 0xc77b03c7
-0,         77,         77,        1,   192000, 0xc77b03c7
-0,         78,         78,        1,   192000, 0xc77b03c7
-0,         79,         79,        1,   192000, 0xc77b03c7
-0,         80,         80,        1,   192000, 0x83ea7550
-0,         81,         81,        1,   192000, 0xec285270
-0,         82,         82,        1,   192000, 0x0e075558
-0,         83,         83,        1,   192000, 0x880c2108
-0,         84,         84,        1,   192000, 0x40c523f0
-0,         85,         85,        1,   192000, 0x01378f78
-0,         86,         86,        1,   192000, 0x42045558
-0,         87,         87,        1,   192000, 0xde8f3278
-0,         88,         88,        1,   192000, 0xa58c0110
-0,         89,         89,        1,   192000, 0x335ea9d1
-0,         90,         90,        1,   192000, 0x7e94bb41
-0,         91,         91,        1,   192000, 0x9cc5d569
-0,         92,         92,        1,   192000, 0xe942e109
-0,         93,         93,        1,   192000, 0x4cb83848
-0,         94,         94,        1,   192000, 0x6986fe19
-0,         95,         95,        1,   192000, 0xbb8c23f0
-0,         96,         96,        1,   192000, 0x296766c8
-0,         97,         97,        1,   192000, 0xb4230cb0
-0,         98,         98,        1,   192000, 0x2c2f1850
-0,         99,         99,        1,   192000, 0x93c70110
-0,        100,        100,        1,   192000, 0xb830a9d1
-0,        101,        101,        1,   192000, 0xbed48fa9
-0,        102,        102,        1,   192000, 0xc087bb41
-0,        103,        103,        1,   192000, 0x792de6d9
-0,        104,        104,        1,   192000, 0x1edaf849
-0,        105,        105,        1,   192000, 0x6564bb41
-0,        106,        106,        1,   192000, 0x9153d569
-0,        107,        107,        1,   192000, 0xe73ff561
-0,        108,        108,        1,   192000, 0xfa3be3f1
-0,        109,        109,        1,   192000, 0x8008fe19
-0,        110,        110,        1,   192000, 0xd2561b38
-0,        111,        111,        1,   192000, 0xae3c26d8
-0,        112,        112,        1,   192000, 0xb0114f88
-0,        113,        113,        1,   192000, 0x117e1e20
-0,        114,        114,        1,   192000, 0x482d1280
-0,        115,        115,        1,   192000, 0x425106e0
-0,        116,        116,        1,   192000, 0x0e6b0cb0
-0,        117,        117,        1,   192000, 0x95dc2ca8
-0,        118,        118,        1,   192000, 0x52097b20
-0,        119,        119,        1,   192000, 0x41a84f88
-0,        120,        120,        1,   192000, 0xb78d7268
-0,        121,        121,        1,   192000, 0x2cd366c8
-0,        122,        122,        1,   192000, 0xbf39e109
-0,        123,        123,        1,   192000, 0xecbaeca9
-0,        124,        124,        1,   192000, 0x3254eca9
-0,        125,        125,        1,   192000, 0x3fc903f8
-0,        126,        126,        1,   192000, 0x0bbc5e10
-0,        127,        127,        1,   192000, 0xe9103560
-0,        128,        128,        1,   192000, 0xbd5d2f90
-0,        129,        129,        1,   192000, 0x7ace2ca8
-0,        130,        130,        1,   192000, 0x7354c6e1
-0,        131,        131,        1,   192000, 0x72e0d569
-0,        132,        132,        1,   192000, 0xa4ade3f1
-0,        133,        133,        1,   192000, 0xf2f8cf99
-0,        134,        134,        1,   192000, 0x2b7ee6d9
-0,        135,        135,        1,   192000, 0x548d1b38
-0,        136,        136,        1,   192000, 0xa1551b38
-0,        137,        137,        1,   192000, 0xfb3e3560
-0,        138,        138,        1,   192000, 0x3aaaccb1
-0,        139,        139,        1,   192000, 0xa85ee109
-0,        140,        140,        1,   192000, 0xc1bff849
-0,        141,        141,        1,   192000, 0xa62bef91
-0,        142,        142,        1,   192000, 0xddf40cb0
-0,        143,        143,        1,   192000, 0x15bb3e18
-0,        144,        144,        1,   192000, 0x92fd5558
-0,        145,        145,        1,   192000, 0x2d365270
-0,        146,        146,        1,   192000, 0xb5f343e8
-0,        147,        147,        1,   192000, 0x93042108
-0,        148,        148,        1,   192000, 0x96d59830
-0,        149,        149,        1,   192000, 0x1f69ddf0
-0,        150,        150,        1,   192000, 0x8eb0124f
-0,        151,        151,        1,   192000, 0xae727dd7
-0,        152,        152,        1,   192000, 0xb8a63aff
-0,        153,        153,        1,   192000, 0xfae83de7
-0,        154,        154,        1,   192000, 0x2f034987
-0,        155,        155,        1,   192000, 0xa99e1537
-0,        156,        156,        1,   192000, 0x0ad70c7f
-0,        157,        157,        1,   192000, 0x74b3e990
-0,        158,        158,        1,   192000, 0x1bf0d250
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
+0,          0,          0,        1,   192000, 0x8f9020f2
+0,          1,          1,        1,   192000, 0xbfba7f63
+0,          2,          2,        1,   192000, 0x96b48d11
+0,          3,          3,        1,   192000, 0xf91727d5
+0,          4,          4,        1,   192000, 0xf91727d5
+0,          5,          5,        1,   192000, 0xf91727d5
+0,          6,          6,        1,   192000, 0xf91727d5
+0,          7,          7,        1,   192000, 0xf91727d5
+0,          8,          8,        1,   192000, 0xf91727d5
+0,          9,          9,        1,   192000, 0xf91727d5
+0,         10,         10,        1,   192000, 0xf91727d5
+0,         11,         11,        1,   192000, 0xf91727d5
+0,         12,         12,        1,   192000, 0xf91727d5
+0,         13,         13,        1,   192000, 0xf91727d5
+0,         14,         14,        1,   192000, 0xf91727d5
+0,         15,         15,        1,   192000, 0xf91727d5
+0,         16,         16,        1,   192000, 0xf91727d5
+0,         17,         17,        1,   192000, 0x61c4e431
+0,         18,         18,        1,   192000, 0x61c4e431
+0,         19,         19,        1,   192000, 0x61c4e431
+0,         20,         20,        1,   192000, 0x61c4e431
+0,         21,         21,        1,   192000, 0x1fb3f649
+0,         22,         22,        1,   192000, 0x1fb3f649
+0,         23,         23,        1,   192000, 0x1fb3f649
+0,         24,         24,        1,   192000, 0x1fb3f649
+0,         25,         25,        1,   192000, 0x1fb3f649
+0,         26,         26,        1,   192000, 0x14f72c22
+0,         27,         27,        1,   192000, 0x14f72c22
+0,         28,         28,        1,   192000, 0x14f72c22
+0,         29,         29,        1,   192000, 0x14f72c22
+0,         30,         30,        1,   192000, 0x8cae3816
+0,         31,         31,        1,   192000, 0x8cae3816
+0,         32,         32,        1,   192000, 0x8cae3816
+0,         33,         33,        1,   192000, 0x8cae3816
+0,         34,         34,        1,   192000, 0x8cae3816
+0,         35,         35,        1,   192000, 0x2b6f2c22
+0,         36,         36,        1,   192000, 0x2b6f2c22
+0,         37,         37,        1,   192000, 0x2b6f2c22
+0,         38,         38,        1,   192000, 0x2b6f2c22
+0,         39,         39,        1,   192000, 0xc568024c
+0,         40,         40,        1,   192000, 0xc568024c
+0,         41,         41,        1,   192000, 0xc568024c
+0,         42,         42,        1,   192000, 0xc568024c
+0,         43,         43,        1,   192000, 0xc568024c
+0,         44,         44,        1,   192000, 0xa93b440a
+0,         45,         45,        1,   192000, 0xa93b440a
+0,         46,         46,        1,   192000, 0xa93b440a
+0,         47,         47,        1,   192000, 0xa93b440a
+0,         48,         48,        1,   192000, 0x798a2f1f
+0,         49,         49,        1,   192000, 0x798a2f1f
+0,         50,         50,        1,   192000, 0x798a2f1f
+0,         51,         51,        1,   192000, 0x798a2f1f
+0,         52,         52,        1,   192000, 0x798a2f1f
+0,         53,         53,        1,   192000, 0xf04288c5
+0,         54,         54,        1,   192000, 0xf04288c5
+0,         55,         55,        1,   192000, 0xf04288c5
+0,         56,         56,        1,   192000, 0xf04288c5
+0,         57,         57,        1,   192000, 0x4aa04a04
+0,         58,         58,        1,   192000, 0x4aa04a04
+0,         59,         59,        1,   192000, 0x4aa04a04
+0,         60,         60,        1,   192000, 0x4aa04a04
+0,         61,         61,        1,   192000, 0x4aa04a04
+0,         62,         62,        1,   192000, 0xb0304d01
+0,         63,         63,        1,   192000, 0xb0304d01
+0,         64,         64,        1,   192000, 0xb0304d01
+0,         65,         65,        1,   192000, 0xb0304d01
+0,         66,         66,        1,   192000, 0xef353b13
+0,         67,         67,        1,   192000, 0xef353b13
+0,         68,         68,        1,   192000, 0xef353b13
+0,         69,         69,        1,   192000, 0xef353b13
+0,         70,         70,        1,   192000, 0xef353b13
+0,         71,         71,        1,   192000, 0xbf823519
+0,         72,         72,        1,   192000, 0xbf823519
+0,         73,         73,        1,   192000, 0xbf823519
+0,         74,         74,        1,   192000, 0xbf823519
+0,         75,         75,        1,   192000, 0xd0352c22
+0,         76,         76,        1,   192000, 0xd0352c22
+0,         77,         77,        1,   192000, 0xd0352c22
+0,         78,         78,        1,   192000, 0xd0352c22
+0,         79,         79,        1,   192000, 0xd0352c22
+0,         80,         80,        1,   192000, 0x817299a6
+0,         81,         81,        1,   192000, 0xfb1475ca
+0,         82,         82,        1,   192000, 0xfcd278c7
+0,         83,         83,        1,   192000, 0xa08742fd
+0,         84,         84,        1,   192000, 0x47c245fa
+0,         85,         85,        1,   192000, 0xf7e7b48b
+0,         86,         86,        1,   192000, 0xf56378c7
+0,         87,         87,        1,   192000, 0x80bc54eb
+0,         88,         88,        1,   192000, 0xae59221e
+0,         89,         89,        1,   192000, 0x7d0fc869
+0,         90,         90,        1,   192000, 0x8e89da57
+0,         91,         91,        1,   192000, 0xf0a9f53c
+0,         92,         92,        1,   192000, 0x658d013f
+0,         93,         93,        1,   192000, 0x90ef5ae5
+0,         94,         94,        1,   192000, 0x93b81f21
+0,         95,         95,        1,   192000, 0x61e545fa
+0,         96,         96,        1,   192000, 0xc6688ab5
+0,         97,         97,        1,   192000, 0x72032e12
+0,         98,         98,        1,   192000, 0xf28c3a06
+0,         99,         99,        1,   192000, 0xf1bc221e
+0,        100,        100,        1,   192000, 0x941bc869
+0,        101,        101,        1,   192000, 0xe95ead84
+0,        102,        102,        1,   192000, 0x61dbda57
+0,        103,        103,        1,   192000, 0x79800739
+0,        104,        104,        1,   192000, 0x00c31927
+0,        105,        105,        1,   192000, 0x74a3da57
+0,        106,        106,        1,   192000, 0xb98cf53c
+0,        107,        107,        1,   192000, 0xd3f9162a
+0,        108,        108,        1,   192000, 0x888c043c
+0,        109,        109,        1,   192000, 0x100f1f21
+0,        110,        110,        1,   192000, 0x41993d03
+0,        111,        111,        1,   192000, 0x01a548f7
+0,        112,        112,        1,   192000, 0xbe5372cd
+0,        113,        113,        1,   192000, 0x0fec4000
+0,        114,        114,        1,   192000, 0x80e9340c
+0,        115,        115,        1,   192000, 0xea582818
+0,        116,        116,        1,   192000, 0x5c3a2e12
+0,        117,        117,        1,   192000, 0x5c2b4ef1
+0,        118,        118,        1,   192000, 0xf2409fa0
+0,        119,        119,        1,   192000, 0x4bc472cd
+0,        120,        120,        1,   192000, 0x3dcb96a9
+0,        121,        121,        1,   192000, 0xff978ab5
+0,        122,        122,        1,   192000, 0xff72013f
+0,        123,        123,        1,   192000, 0x2f530d33
+0,        124,        124,        1,   192000, 0xa3350d33
+0,        125,        125,        1,   192000, 0x6be6251b
+0,        126,        126,        1,   192000, 0x07f081be
+0,        127,        127,        1,   192000, 0xb5d957e8
+0,        128,        128,        1,   192000, 0x43c551ee
+0,        129,        129,        1,   192000, 0x19224ef1
+0,        130,        130,        1,   192000, 0x0720e64b
+0,        131,        131,        1,   192000, 0x3c53f53c
+0,        132,        132,        1,   192000, 0x8534043c
+0,        133,        133,        1,   192000, 0xb7c7ef42
+0,        134,        134,        1,   192000, 0x9e3e0739
+0,        135,        135,        1,   192000, 0x95e43d03
+0,        136,        136,        1,   192000, 0x92473d03
+0,        137,        137,        1,   192000, 0x636757e8
+0,        138,        138,        1,   192000, 0xba3aec45
+0,        139,        139,        1,   192000, 0xfd9e013f
+0,        140,        140,        1,   192000, 0x108c1927
+0,        141,        141,        1,   192000, 0x29db1030
+0,        142,        142,        1,   192000, 0xe0172e12
+0,        143,        143,        1,   192000, 0x744260df
+0,        144,        144,        1,   192000, 0xc59478c7
+0,        145,        145,        1,   192000, 0xa84475ca
+0,        146,        146,        1,   192000, 0x9d2866d9
+0,        147,        147,        1,   192000, 0xc49342fd
+0,        148,        148,        1,   192000, 0x13e5bd82
+0,        149,        149,        1,   192000, 0x10d10549
+0,        150,        150,        1,   192000, 0xf5ca3b13
+0,        151,        151,        1,   192000, 0x8c27a9a4
+0,        152,        152,        1,   192000, 0xcc4f64e9
+0,        153,        153,        1,   192000, 0x020c67e6
+0,        154,        154,        1,   192000, 0xaf4773da
+0,        155,        155,        1,   192000, 0x62093e10
+0,        156,        156,        1,   192000, 0x96783519
+0,        157,        157,        1,   192000, 0x8b9a113d
+0,        158,        158,        1,   192000, 0x9050f946
diff --git a/tests/ref/fate/zmbv-16bit b/tests/ref/fate/zmbv-16bit
index b0c3df5513..d650e08ff2 100644
--- a/tests/ref/fate/zmbv-16bit
+++ b/tests/ref/fate/zmbv-16bit
@@ -1,123 +1,127 @@
 #tb 0: 250000/1585341
-0,          0,          0,        1,   192000, 0x11e62dbe
-0,          1,          1,        1,   192000, 0x31698b8f
-0,          2,          2,        1,   192000, 0x31698b8f
-0,          3,          3,        1,   192000, 0x31698b8f
-0,          4,          4,        1,   192000, 0x31698b8f
-0,          5,          5,        1,   192000, 0x31698b8f
-0,          6,          6,        1,   192000, 0x31698b8f
-0,          7,          7,        1,   192000, 0x31698b8f
-0,          8,          8,        1,   192000, 0x31698b8f
-0,          9,          9,        1,   192000, 0x31698b8f
-0,         10,         10,        1,   192000, 0x31698b8f
-0,         11,         11,        1,   192000, 0x31698b8f
-0,         12,         12,        1,   192000, 0x31698b8f
-0,         13,         13,        1,   192000, 0x4ca609ea
-0,         14,         14,        1,   192000, 0x4ca609ea
-0,         15,         15,        1,   192000, 0x4ca609ea
-0,         16,         16,        1,   192000, 0x4ca609ea
-0,         17,         17,        1,   192000, 0x33dd0a8b
-0,         18,         18,        1,   192000, 0x33dd0a8b
-0,         19,         19,        1,   192000, 0x33dd0a8b
-0,         20,         20,        1,   192000, 0x33dd0a8b
-0,         21,         21,        1,   192000, 0x33dd0a8b
-0,         22,         22,        1,   192000, 0x08e2420f
-0,         23,         23,        1,   192000, 0x08e2420f
-0,         24,         24,        1,   192000, 0x08e2420f
-0,         25,         25,        1,   192000, 0x08e2420f
-0,         26,         26,        1,   192000, 0x7b7b50ab
-0,         27,         27,        1,   192000, 0x7b7b50ab
-0,         28,         28,        1,   192000, 0x7b7b50ab
-0,         29,         29,        1,   192000, 0x7b7b50ab
-0,         30,         30,        1,   192000, 0x7b7b50ab
-0,         31,         31,        1,   192000, 0x128744fb
-0,         32,         32,        1,   192000, 0x128744fb
-0,         33,         33,        1,   192000, 0x128744fb
-0,         34,         34,        1,   192000, 0x128744fb
-0,         35,         35,        1,   192000, 0x8643163b
-0,         36,         36,        1,   192000, 0x8643163b
-0,         37,         37,        1,   192000, 0x8643163b
-0,         38,         38,        1,   192000, 0x8643163b
-0,         39,         39,        1,   192000, 0x8643163b
-0,         40,         40,        1,   192000, 0x4f7c596f
-0,         41,         41,        1,   192000, 0x4f7c596f
-0,         42,         42,        1,   192000, 0x4f7c596f
-0,         43,         43,        1,   192000, 0x4f7c596f
-0,         44,         44,        1,   192000, 0xa275420f
-0,         45,         45,        1,   192000, 0xa275420f
-0,         46,         46,        1,   192000, 0xa275420f
-0,         47,         47,        1,   192000, 0xa275420f
-0,         48,         48,        1,   192000, 0xa275420f
-0,         49,         49,        1,   192000, 0x2e4796cb
-0,         50,         50,        1,   192000, 0x2e4796cb
-0,         51,         51,        1,   192000, 0x2e4796cb
-0,         52,         52,        1,   192000, 0x2e4796cb
-0,         53,         53,        1,   192000, 0xebd45683
-0,         54,         54,        1,   192000, 0xebd45683
-0,         55,         55,        1,   192000, 0xebd45683
-0,         56,         56,        1,   192000, 0xebd45683
-0,         57,         57,        1,   192000, 0xebd45683
-0,         58,         58,        1,   192000, 0x0bf6596f
-0,         59,         59,        1,   192000, 0x0bf6596f
-0,         60,         60,        1,   192000, 0x0bf6596f
-0,         61,         61,        1,   192000, 0x0bf6596f
-0,         62,         62,        1,   192000, 0xb7af47e7
-0,         63,         63,        1,   192000, 0xb7af47e7
-0,         64,         64,        1,   192000, 0xb7af47e7
-0,         65,         65,        1,   192000, 0xb7af47e7
-0,         66,         66,        1,   192000, 0xb7af47e7
-0,         67,         67,        1,   192000, 0x8bc344fb
-0,         68,         68,        1,   192000, 0x8bc344fb
-0,         69,         69,        1,   192000, 0x8bc344fb
-0,         70,         70,        1,   192000, 0x8bc344fb
-0,         71,         71,        1,   192000, 0x8bc344fb
-0,         72,         72,        1,   192000, 0x02a23f23
-0,         73,         73,        1,   192000, 0x02a23f23
-0,         74,         74,        1,   192000, 0x02a23f23
-0,         75,         75,        1,   192000, 0x02a23f23
-0,         76,         76,        1,   192000, 0x17be3087
-0,         77,         77,        1,   192000, 0x52c7b2d4
-0,         78,         78,        1,   192000, 0xa05e9888
-0,         79,         79,        1,   192000, 0x4d6a6cb4
-0,         80,         80,        1,   192000, 0x3e2189ec
-0,         81,         81,        1,   192000, 0xfbe3ca34
-0,         82,         82,        1,   192000, 0xa9cd8fc4
-0,         83,         83,        1,   192000, 0x986e6cb4
-0,         84,         84,        1,   192000, 0x42373b08
-0,         85,         85,        1,   192000, 0xab96e351
-0,         86,         86,        1,   192000, 0x28ccf4d9
-0,         87,         87,        1,   192000, 0xc19e0f34
-0,         88,         88,        1,   192000, 0xd8da1ae4
-0,         89,         89,        1,   192000, 0xd015728c
-0,         90,         90,        1,   192000, 0x550623a8
-0,         91,         91,        1,   192000, 0x3c5c5268
-0,         92,         92,        1,   192000, 0x3eae8128
-0,         93,         93,        1,   192000, 0x3c51381c
-0,         94,         94,        1,   192000, 0x745046b8
-0,         95,         95,        1,   192000, 0xa8bd43cc
-0,         96,         96,        1,   192000, 0xde8fe351
-0,         97,         97,        1,   192000, 0x3d5cc905
-0,         98,         98,        1,   192000, 0xcf8df4d9
-0,         99,         99,        1,   192000, 0x698b20bc
-0,        100,        100,        1,   192000, 0x159d3244
-0,        101,        101,        1,   192000, 0xba1af4d9
-0,        102,        102,        1,   192000, 0x033a0f34
-0,        103,        103,        1,   192000, 0x72612f58
-0,        104,        104,        1,   192000, 0x11e11dd0
-0,        105,        105,        1,   192000, 0x4fc04f7c
-0,        106,        106,        1,   192000, 0x37779888
-0,        107,        107,        1,   192000, 0xabfc5e18
-0,        108,        108,        1,   192000, 0x0ad97e3c
-0,        109,        109,        1,   192000, 0xddf492b0
-0,        110,        110,        1,   192000, 0x198b23a8
-0,        111,        111,        1,   192000, 0x6b491220
-0,        112,        112,        1,   192000, 0x632417f8
-0,        113,        113,        1,   192000, 0x0dc5381c
-0,        114,        114,        1,   192000, 0x6d548700
-0,        115,        115,        1,   192000, 0xae0c5b2c
-0,        116,        116,        1,   192000, 0x23427e3c
-0,        117,        117,        1,   192000, 0x5def728c
-0,        118,        118,        1,   192000, 0xec831ae4
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
+0,          0,          0,        1,   192000, 0xe869dc94
+0,          1,          1,        1,   192000, 0x742932f2
+0,          2,          2,        1,   192000, 0x742932f2
+0,          3,          3,        1,   192000, 0x742932f2
+0,          4,          4,        1,   192000, 0x742932f2
+0,          5,          5,        1,   192000, 0x742932f2
+0,          6,          6,        1,   192000, 0x742932f2
+0,          7,          7,        1,   192000, 0x742932f2
+0,          8,          8,        1,   192000, 0x742932f2
+0,          9,          9,        1,   192000, 0x742932f2
+0,         10,         10,        1,   192000, 0x742932f2
+0,         11,         11,        1,   192000, 0x742932f2
+0,         12,         12,        1,   192000, 0x742932f2
+0,         13,         13,        1,   192000, 0xb718e72e
+0,         14,         14,        1,   192000, 0xb718e72e
+0,         15,         15,        1,   192000, 0xb718e72e
+0,         16,         16,        1,   192000, 0xb718e72e
+0,         17,         17,        1,   192000, 0x7507f946
+0,         18,         18,        1,   192000, 0x7507f946
+0,         19,         19,        1,   192000, 0x7507f946
+0,         20,         20,        1,   192000, 0x7507f946
+0,         21,         21,        1,   192000, 0x7507f946
+0,         22,         22,        1,   192000, 0xe620321c
+0,         23,         23,        1,   192000, 0xe620321c
+0,         24,         24,        1,   192000, 0xe620321c
+0,         25,         25,        1,   192000, 0xe620321c
+0,         26,         26,        1,   192000, 0x9b5f410d
+0,         27,         27,        1,   192000, 0x9b5f410d
+0,         28,         28,        1,   192000, 0x9b5f410d
+0,         29,         29,        1,   192000, 0x9b5f410d
+0,         30,         30,        1,   192000, 0x9b5f410d
+0,         31,         31,        1,   192000, 0xea2c3519
+0,         32,         32,        1,   192000, 0xea2c3519
+0,         33,         33,        1,   192000, 0xea2c3519
+0,         34,         34,        1,   192000, 0xea2c3519
+0,         35,         35,        1,   192000, 0x1acb0549
+0,         36,         36,        1,   192000, 0x1acb0549
+0,         37,         37,        1,   192000, 0x1acb0549
+0,         38,         38,        1,   192000, 0x1acb0549
+0,         39,         39,        1,   192000, 0x1acb0549
+0,         40,         40,        1,   192000, 0x3a064a04
+0,         41,         41,        1,   192000, 0x3a064a04
+0,         42,         42,        1,   192000, 0x3a064a04
+0,         43,         43,        1,   192000, 0x3a064a04
+0,         44,         44,        1,   192000, 0xcede321c
+0,         45,         45,        1,   192000, 0xcede321c
+0,         46,         46,        1,   192000, 0xcede321c
+0,         47,         47,        1,   192000, 0xcede321c
+0,         48,         48,        1,   192000, 0xcede321c
+0,         49,         49,        1,   192000, 0xef4988c5
+0,         50,         50,        1,   192000, 0xef4988c5
+0,         51,         51,        1,   192000, 0xef4988c5
+0,         52,         52,        1,   192000, 0xef4988c5
+0,         53,         53,        1,   192000, 0x1fc84707
+0,         54,         54,        1,   192000, 0x1fc84707
+0,         55,         55,        1,   192000, 0x1fc84707
+0,         56,         56,        1,   192000, 0x1fc84707
+0,         57,         57,        1,   192000, 0x1fc84707
+0,         58,         58,        1,   192000, 0xbabd4a04
+0,         59,         59,        1,   192000, 0xbabd4a04
+0,         60,         60,        1,   192000, 0xbabd4a04
+0,         61,         61,        1,   192000, 0xbabd4a04
+0,         62,         62,        1,   192000, 0x649b3816
+0,         63,         63,        1,   192000, 0x649b3816
+0,         64,         64,        1,   192000, 0x649b3816
+0,         65,         65,        1,   192000, 0x649b3816
+0,         66,         66,        1,   192000, 0x649b3816
+0,         67,         67,        1,   192000, 0x206b3519
+0,         68,         68,        1,   192000, 0x206b3519
+0,         69,         69,        1,   192000, 0x206b3519
+0,         70,         70,        1,   192000, 0x206b3519
+0,         71,         71,        1,   192000, 0x206b3519
+0,         72,         72,        1,   192000, 0x25982f1f
+0,         73,         73,        1,   192000, 0x25982f1f
+0,         74,         74,        1,   192000, 0x25982f1f
+0,         75,         75,        1,   192000, 0x25982f1f
+0,         76,         76,        1,   192000, 0xde0e202e
+0,         77,         77,        1,   192000, 0xced09fa0
+0,         78,         78,        1,   192000, 0x3b4f84bb
+0,         79,         79,        1,   192000, 0xa09c57e8
+0,         80,         80,        1,   192000, 0xf3dd75ca
+0,         81,         81,        1,   192000, 0x4d4ab788
+0,         82,         82,        1,   192000, 0x4ac67bc4
+0,         83,         83,        1,   192000, 0xd61057e8
+0,         84,         84,        1,   192000, 0x03bc251b
+0,         85,         85,        1,   192000, 0xd263cb66
+0,         86,         86,        1,   192000, 0xe3dddd54
+0,         87,         87,        1,   192000, 0x460cf839
+0,         88,         88,        1,   192000, 0xbae1043c
+0,         89,         89,        1,   192000, 0xe6435de2
+0,         90,         90,        1,   192000, 0x340e0d33
+0,         91,         91,        1,   192000, 0x9acd3d03
+0,         92,         92,        1,   192000, 0x1d346cd3
+0,         93,         93,        1,   192000, 0xdabe221e
+0,         94,         94,        1,   192000, 0xeb4b310f
+0,         95,         95,        1,   192000, 0xec8f2e12
+0,         96,         96,        1,   192000, 0xe96fcb66
+0,         97,         97,        1,   192000, 0x3ec1b081
+0,         98,         98,        1,   192000, 0xb72fdd54
+0,         99,         99,        1,   192000, 0xced40a36
+0,        100,        100,        1,   192000, 0x56171c24
+0,        101,        101,        1,   192000, 0xc9f7dd54
+0,        102,        102,        1,   192000, 0x0eeff839
+0,        103,        103,        1,   192000, 0x295c1927
+0,        104,        104,        1,   192000, 0xdde00739
+0,        105,        105,        1,   192000, 0x51903a06
+0,        106,        106,        1,   192000, 0xe16a84bb
+0,        107,        107,        1,   192000, 0xf5b248f7
+0,        108,        108,        1,   192000, 0x054769d6
+0,        109,        109,        1,   192000, 0x9d327ec1
+0,        110,        110,        1,   192000, 0x94470d33
+0,        111,        111,        1,   192000, 0x9671fb36
+0,        112,        112,        1,   192000, 0x0853013f
+0,        113,        113,        1,   192000, 0x0844221e
+0,        114,        114,        1,   192000, 0x9e5972cd
+0,        115,        115,        1,   192000, 0xf7ce45fa
+0,        116,        116,        1,   192000, 0xe9d569d6
+0,        117,        117,        1,   192000, 0xabb05de2
+0,        118,        118,        1,   192000, 0x54d5043c
 0,        119,        119,        1,   192000, 0x00000000
 0,        120,        120,        1,   192000, 0x00000000
 0,        121,        121,        1,   192000, 0x00000000
diff --git a/tests/ref/fate/zmbv-32bit b/tests/ref/fate/zmbv-32bit
index e1df12361a..ff4d69f613 100644
--- a/tests/ref/fate/zmbv-32bit
+++ b/tests/ref/fate/zmbv-32bit
@@ -1,4 +1,8 @@
 #tb 0: 250000/1585341
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
 0,          0,          0,        1,   192000, 0x3ac10e8e
 0,          1,          1,        1,   192000, 0xb772ee57
 0,          2,          2,        1,   192000, 0x9b6e648a
diff --git a/tests/ref/fate/zmbv-8bit b/tests/ref/fate/zmbv-8bit
index 9f02ae3668..7c2fab691f 100644
--- a/tests/ref/fate/zmbv-8bit
+++ b/tests/ref/fate/zmbv-8bit
@@ -1,4 +1,8 @@
 #tb 0: 1000000/70086303
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 320x200
+#sar 0: 0/1
 0,          0,          0,        1,   192000, 0x5234b617
 0,          1,          1,        1,   192000, 0x5234b617
 0,          2,          2,        1,   192000, 0x5234b617
diff --git a/tests/ref/lavf-fate/avi_cram b/tests/ref/lavf-fate/avi_cram
new file mode 100644
index 0000000000..82882fbb22
--- /dev/null
+++ b/tests/ref/lavf-fate/avi_cram
@@ -0,0 +1,3 @@
+6fc88702c23b895c305c5e1f51a0904e *./tests/data/lavf-fate/lavf.avi
+928260 ./tests/data/lavf-fate/lavf.avi
+./tests/data/lavf-fate/lavf.avi CRC=0xa4770de2
diff --git a/tests/ref/lavf-fate/latm b/tests/ref/lavf-fate/latm
new file mode 100644
index 0000000000..8c4f5412aa
--- /dev/null
+++ b/tests/ref/lavf-fate/latm
@@ -0,0 +1,3 @@
+eb13788e71c9b5bc7d62ceb748312bbb *./tests/data/lavf-fate/lavf.latm
+67876 ./tests/data/lavf-fate/lavf.latm
+./tests/data/lavf-fate/lavf.latm CRC=0xcf94c59d
diff --git a/tests/ref/lavf-fate/mov_qtrle_mace6 b/tests/ref/lavf-fate/mov_qtrle_mace6
new file mode 100644
index 0000000000..30c705ee4c
--- /dev/null
+++ b/tests/ref/lavf-fate/mov_qtrle_mace6
@@ -0,0 +1,3 @@
+dcc9c4c182a5809dee9a9366f4533797 *./tests/data/lavf-fate/lavf.mov
+1270387 ./tests/data/lavf-fate/lavf.mov
+./tests/data/lavf-fate/lavf.mov CRC=0x5ec66f68
diff --git a/tests/ref/lavf-fate/mp3 b/tests/ref/lavf-fate/mp3
new file mode 100644
index 0000000000..b5595387a6
--- /dev/null
+++ b/tests/ref/lavf-fate/mp3
@@ -0,0 +1,3 @@
+f231c5316357fd747573cbcb02f889c5 *./tests/data/lavf-fate/lavf.mp3
+96016 ./tests/data/lavf-fate/lavf.mp3
+./tests/data/lavf-fate/lavf.mp3 CRC=0x6c9850fe
diff --git a/tests/ref/lavf-fate/ogg_vp3 b/tests/ref/lavf-fate/ogg_vp3
new file mode 100644
index 0000000000..9e9cc7ea6b
--- /dev/null
+++ b/tests/ref/lavf-fate/ogg_vp3
@@ -0,0 +1,3 @@
+4bd51dac3194fa88ae33767c25b4b1e6 *./tests/data/lavf-fate/lavf.ogg
+417621 ./tests/data/lavf-fate/lavf.ogg
+./tests/data/lavf-fate/lavf.ogg CRC=0x037e3e79
diff --git a/tests/ref/lavf-fate/ogg_vp8 b/tests/ref/lavf-fate/ogg_vp8
new file mode 100644
index 0000000000..78131f30de
--- /dev/null
+++ b/tests/ref/lavf-fate/ogg_vp8
@@ -0,0 +1,3 @@
+c56d8dce728d46d4f0ab4c7cc9f86abc *./tests/data/lavf-fate/lavf.ogv
+95009 ./tests/data/lavf-fate/lavf.ogv
+./tests/data/lavf-fate/lavf.ogv CRC=0x8c067a66
diff --git a/tests/ref/lavf/aiff b/tests/ref/lavf/aiff
index c713d02909..c504c18c4a 100644
--- a/tests/ref/lavf/aiff
+++ b/tests/ref/lavf/aiff
@@ -1,3 +1,3 @@
-9d9e55431800bf6aea46a7d67509da4e *./tests/data/lavf/lavf.aif
-88254 ./tests/data/lavf/lavf.aif
+2c129d88acef834e32869145fe792b9c *./tests/data/lavf/lavf.aif
+88270 ./tests/data/lavf/lavf.aif
 ./tests/data/lavf/lavf.aif CRC=0x3a1da17e
diff --git a/tests/ref/lavf/apng b/tests/ref/lavf/apng
new file mode 100644
index 0000000000..8e9e5e6b73
--- /dev/null
+++ b/tests/ref/lavf/apng
@@ -0,0 +1,9 @@
+a4c46fad7716ad094eb3c78b74ca0244 *./tests/data/lavf/lavf.apng
+6209864 ./tests/data/lavf/lavf.apng
+./tests/data/lavf/lavf.apng CRC=0x87b3c15f
+a4c46fad7716ad094eb3c78b74ca0244 *./tests/data/lavf/lavf.copy.apng
+6209864 ./tests/data/lavf/lavf.copy.apng
+./tests/data/lavf/lavf.copy.apng CRC=0x87b3c15f
+c5900fdd1b2fc30b985793f5226fd0c4 *./tests/data/lavf/lavf.png
+248854 ./tests/data/lavf/lavf.png
+./tests/data/lavf/lavf.png CRC=0xd8c7b7a1
diff --git a/tests/ref/lavf/asf b/tests/ref/lavf/asf
index 2178435a52..911af72051 100644
--- a/tests/ref/lavf/asf
+++ b/tests/ref/lavf/asf
@@ -1,3 +1,3 @@
-33e857a06b2b5dedce0bf76c9973944c *./tests/data/lavf/lavf.asf
-333379 ./tests/data/lavf/lavf.asf
+76f131a5426f0ba5fc7409d1a1bbfdd7 *./tests/data/lavf/lavf.asf
+333585 ./tests/data/lavf/lavf.asf
 ./tests/data/lavf/lavf.asf CRC=0xf6340a10
diff --git a/tests/ref/lavf/ast b/tests/ref/lavf/ast
new file mode 100644
index 0000000000..513c612e76
--- /dev/null
+++ b/tests/ref/lavf/ast
@@ -0,0 +1,3 @@
+07f5d23aa8bade984034f7005bd72947 *./tests/data/lavf/lavf.ast
+177872 ./tests/data/lavf/lavf.ast
+./tests/data/lavf/lavf.ast CRC=0xe61e3bd0
diff --git a/tests/ref/lavf/au b/tests/ref/lavf/au
index 71cfdcb552..dcd02f335c 100644
--- a/tests/ref/lavf/au
+++ b/tests/ref/lavf/au
@@ -1,3 +1,3 @@
-b9396e3775ea009094e751e7128d614e *./tests/data/lavf/lavf.au
-88224 ./tests/data/lavf/lavf.au
+5228ad3783888c45a08dac5ab6118794 *./tests/data/lavf/lavf.au
+88240 ./tests/data/lavf/lavf.au
 ./tests/data/lavf/lavf.au CRC=0x3a1da17e
diff --git a/tests/ref/lavf/avi b/tests/ref/lavf/avi
index 08ae04206d..dfdb392de7 100644
--- a/tests/ref/lavf/avi
+++ b/tests/ref/lavf/avi
@@ -1,3 +1,3 @@
-e2e7b7ceaf038b259558f41df203ded9 *./tests/data/lavf/lavf.avi
-330786 ./tests/data/lavf/lavf.avi
-./tests/data/lavf/lavf.avi CRC=0x4c963cda
+ab696052289d8dfea193e4cf94a94a6f *./tests/data/lavf/lavf.avi
+330814 ./tests/data/lavf/lavf.avi
+./tests/data/lavf/lavf.avi CRC=0xec6c3c68
diff --git a/tests/ref/lavf/bmp b/tests/ref/lavf/bmp
index b79ee4d47c..8958855eee 100644
--- a/tests/ref/lavf/bmp
+++ b/tests/ref/lavf/bmp
@@ -1,3 +1,3 @@
 71f4d64a6b3c71f43a4eff526f84841c *./tests/data/images/bmp/02.bmp
-./tests/data/images/bmp/%02d.bmp CRC=0x3447369b
+./tests/data/images/bmp/%02d.bmp CRC=0xe6c71946
 304182 ./tests/data/images/bmp/02.bmp
diff --git a/tests/ref/lavf/caf b/tests/ref/lavf/caf
new file mode 100644
index 0000000000..7b2a67d1c0
--- /dev/null
+++ b/tests/ref/lavf/caf
@@ -0,0 +1,3 @@
+c3c38cba600722c87c0e75bd0688b7fc *./tests/data/lavf/lavf.caf
+88323 ./tests/data/lavf/lavf.caf
+./tests/data/lavf/lavf.caf CRC=0x3a1da17e
diff --git a/tests/ref/lavf/dpx b/tests/ref/lavf/dpx
index 42c0a335fb..7bbed3e8c0 100644
--- a/tests/ref/lavf/dpx
+++ b/tests/ref/lavf/dpx
@@ -1,3 +1,18 @@
-d2f0b4e854fda2d3b3bee84cef80593c *./tests/data/images/dpx/02.dpx
-./tests/data/images/dpx/%02d.dpx CRC=0x28c7369b
+4c8880d5835ffb5fe37c1ed8c8d404de *./tests/data/images/dpx/02.dpx
+./tests/data/images/dpx/%02d.dpx CRC=0x6da01946
 305792 ./tests/data/images/dpx/02.dpx
+7ca935d5d5e00c54acbc85565d3039b6 *./tests/data/images/dpx/02.dpx
+./tests/data/images/dpx/%02d.dpx CRC=0xe6663fba
+407168 ./tests/data/images/dpx/02.dpx
+a4cfea1797c928f2eff73573e559675d *./tests/data/images/dpx/02.dpx
+./tests/data/images/dpx/%02d.dpx CRC=0x1c755633
+609920 ./tests/data/images/dpx/02.dpx
+075963c3c08978b6a20555ba09161434 *./tests/data/images/dpx/02.dpx
+./tests/data/images/dpx/%02d.dpx CRC=0xe5b9c023
+609920 ./tests/data/images/dpx/02.dpx
+b9f22728f8ff393bf30cf6cbd624fa95 *./tests/data/images/dpx/02.dpx
+./tests/data/images/dpx/%02d.dpx CRC=0xf38d5830
+407168 ./tests/data/images/dpx/02.dpx
+545603630f30dec2768c8ae8d12eb8ea *./tests/data/images/dpx/02.dpx
+./tests/data/images/dpx/%02d.dpx CRC=0xe72ce131
+812672 ./tests/data/images/dpx/02.dpx
diff --git a/tests/ref/lavf/dv_fmt b/tests/ref/lavf/dv_fmt
index c2b7335001..0263202c8e 100644
--- a/tests/ref/lavf/dv_fmt
+++ b/tests/ref/lavf/dv_fmt
@@ -1,3 +1,9 @@
-eb51fbb48af28584ea5515f9f2400fcd *./tests/data/lavf/lavf.dv
+7830f9c6716ceb6011f865f1e521b951 *./tests/data/lavf/lavf.dv
 3600000 ./tests/data/lavf/lavf.dv
-./tests/data/lavf/lavf.dv CRC=0x0e868a82
+./tests/data/lavf/lavf.dv CRC=0xd428d3ee
+5569626370c7c72d40de2c4559e32856 *./tests/data/lavf/lavf.dv
+3480000 ./tests/data/lavf/lavf.dv
+./tests/data/lavf/lavf.dv CRC=0xa0088163
+2fb332aab8f2ba9c33b1b2368194392a *./tests/data/lavf/lavf.dv
+3600000 ./tests/data/lavf/lavf.dv
+./tests/data/lavf/lavf.dv CRC=0xbdaf7f52
diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm
new file mode 100644
index 0000000000..d9fa8d52cb
--- /dev/null
+++ b/tests/ref/lavf/ffm
@@ -0,0 +1,3 @@
+ca2a450cd0d1e299514a345923b4c82a *./tests/data/lavf/lavf.ffm
+376832 ./tests/data/lavf/lavf.ffm
+./tests/data/lavf/lavf.ffm CRC=0x000e23ae
diff --git a/tests/ref/lavf/fits b/tests/ref/lavf/fits
new file mode 100644
index 0000000000..489542b32b
--- /dev/null
+++ b/tests/ref/lavf/fits
@@ -0,0 +1,18 @@
+ed9fd697d0d782df6201f6a2db184552 *./tests/data/lavf/graylavf.fits
+5328000 ./tests/data/lavf/graylavf.fits
+./tests/data/lavf/graylavf.fits CRC=0xbacf446c
+48e6caf6a59e32f9a8a39979c9183a7f *./tests/data/lavf/gray16belavf.fits
+10368000 ./tests/data/lavf/gray16belavf.fits
+./tests/data/lavf/gray16belavf.fits CRC=0xae2b58d4
+be2f7112fd193c9a909304c81e662769 *./tests/data/lavf/gbrplavf.fits
+15408000 ./tests/data/lavf/gbrplavf.fits
+./tests/data/lavf/gbrplavf.fits CRC=0x04ed3828
+c89a72185cfad363aa9cc42e84fed301 *./tests/data/lavf/gbraplavf.fits
+20448000 ./tests/data/lavf/gbraplavf.fits
+./tests/data/lavf/gbraplavf.fits CRC=0x032a6409
+d539b9e02f5ab8fb85717c8adb60b6cc *./tests/data/lavf/gbrp16belavf.fits
+30672000 ./tests/data/lavf/gbrp16belavf.fits
+./tests/data/lavf/gbrp16belavf.fits CRC=0x81897ff7
+3dc3622fb09a338b406d8a12a30f2545 *./tests/data/lavf/gbrap16belavf.fits
+40752000 ./tests/data/lavf/gbrap16belavf.fits
+./tests/data/lavf/gbrap16belavf.fits CRC=0x247dd7b9
diff --git a/tests/ref/lavf/flm b/tests/ref/lavf/flm
new file mode 100644
index 0000000000..59aac922ae
--- /dev/null
+++ b/tests/ref/lavf/flm
@@ -0,0 +1,3 @@
+ef4783171ebbc38855331c9ead978322 *./tests/data/lavf/lavf.flm
+10137636 ./tests/data/lavf/lavf.flm
+./tests/data/lavf/lavf.flm CRC=0xcdf15757
diff --git a/tests/ref/lavf/flv_fmt b/tests/ref/lavf/flv_fmt
index 3414d1314c..f014bec708 100644
--- a/tests/ref/lavf/flv_fmt
+++ b/tests/ref/lavf/flv_fmt
@@ -1,3 +1,3 @@
-689e8e53031a2c0793fb5b99fc6f1024 *./tests/data/lavf/lavf.flv
-329521 ./tests/data/lavf/lavf.flv
-./tests/data/lavf/lavf.flv CRC=0x881785d1
+0d229f87b3aad778074ace499359d137 *./tests/data/lavf/lavf.flv
+329554 ./tests/data/lavf/lavf.flv
+./tests/data/lavf/lavf.flv CRC=0x4eac88c5
diff --git a/tests/ref/lavf/gif b/tests/ref/lavf/gif
index 4a4ebfb9dc..d2e2f11e9d 100644
--- a/tests/ref/lavf/gif
+++ b/tests/ref/lavf/gif
@@ -1,3 +1,3 @@
-e6089fd4ef3b9df44090ab3650bdd810 *./tests/data/lavf/lavf.gif
-2906401 ./tests/data/lavf/lavf.gif
-./tests/data/lavf/lavf.gif CRC=0xe5605ff6
+e35f5ea283bbcb249818e0078ec72664 *./tests/data/lavf/lavf.gif
+2011766 ./tests/data/lavf/lavf.gif
+./tests/data/lavf/lavf.gif CRC=0x2429faff
diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf
index 8dfd63d646..4dd463cd2a 100644
--- a/tests/ref/lavf/gxf
+++ b/tests/ref/lavf/gxf
@@ -1,3 +1,9 @@
-a1cf0a335ad64ec526bb69bbca0656c2 *./tests/data/lavf/lavf.gxf
-796428 ./tests/data/lavf/lavf.gxf
-./tests/data/lavf/lavf.gxf CRC=0xd04c769f
+6ef34e8bedf699cd1601022c4a0a4910 *./tests/data/lavf/lavf.gxf
+795876 ./tests/data/lavf/lavf.gxf
+./tests/data/lavf/lavf.gxf CRC=0x1dbfef76
+7780c428dde2c93a9ff04794f7168440 *./tests/data/lavf/lavf.gxf
+794656 ./tests/data/lavf/lavf.gxf
+./tests/data/lavf/lavf.gxf CRC=0xdcd39443
+0638c4d073ac224608baaba16732b68f *./tests/data/lavf/lavf.gxf
+795876 ./tests/data/lavf/lavf.gxf
+./tests/data/lavf/lavf.gxf CRC=0x5ade0285
diff --git a/tests/ref/lavf/ircam b/tests/ref/lavf/ircam
new file mode 100644
index 0000000000..47e07098e5
--- /dev/null
+++ b/tests/ref/lavf/ircam
@@ -0,0 +1,3 @@
+45d9a4667030e95d1d8fb6ab012f1aa0 *./tests/data/lavf/lavf.ircam
+89224 ./tests/data/lavf/lavf.ircam
+./tests/data/lavf/lavf.ircam CRC=0x3a1da17e
diff --git a/tests/ref/lavf/ismv b/tests/ref/lavf/ismv
new file mode 100644
index 0000000000..f29b5ff3ef
--- /dev/null
+++ b/tests/ref/lavf/ismv
@@ -0,0 +1,9 @@
+a9ccbb4cd1436d222ef4425567b4e03d *./tests/data/lavf/lavf.ismv
+312542 ./tests/data/lavf/lavf.ismv
+./tests/data/lavf/lavf.ismv CRC=0x9d9a638a
+440d85f9fd5b9f63c2676638782b5c15 *./tests/data/lavf/lavf.ismv
+321448 ./tests/data/lavf/lavf.ismv
+./tests/data/lavf/lavf.ismv CRC=0xe8130120
+a9ccbb4cd1436d222ef4425567b4e03d *./tests/data/lavf/lavf.ismv
+312542 ./tests/data/lavf/lavf.ismv
+./tests/data/lavf/lavf.ismv CRC=0x9d9a638a
diff --git a/tests/ref/lavf/jpg b/tests/ref/lavf/jpg
index 584a97a285..508066747f 100644
--- a/tests/ref/lavf/jpg
+++ b/tests/ref/lavf/jpg
@@ -1,3 +1,3 @@
-131878fee153a086d740543fbf2ab359 *./tests/data/images/jpg/02.jpg
-./tests/data/images/jpg/%02d.jpg CRC=0x9d770966
-28406 ./tests/data/images/jpg/02.jpg
+1e7c6d937f21c045e0b238a83f62f3c5 *./tests/data/images/jpg/02.jpg
+./tests/data/images/jpg/%02d.jpg CRC=0xe3509f33
+26037 ./tests/data/images/jpg/02.jpg
diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka
new file mode 100644
index 0000000000..ac0f6cf316
--- /dev/null
+++ b/tests/ref/lavf/mka
@@ -0,0 +1,3 @@
+2d9722c0691e140237af0036e3a178b0 *./tests/data/lavf/lavf.mka
+43684 ./tests/data/lavf/lavf.mka
+./tests/data/lavf/lavf.mka CRC=0x3a1da17e
diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv
index 04c5f3cac2..0083033958 100644
--- a/tests/ref/lavf/mkv
+++ b/tests/ref/lavf/mkv
@@ -1,3 +1,6 @@
-dad336329ef85127f97e9d12a3b57a59 *./tests/data/lavf/lavf.mkv
-320383 ./tests/data/lavf/lavf.mkv
-./tests/data/lavf/lavf.mkv CRC=0x63ed3cda
+7c8697c324e8ad79c5ea14364a6c39b8 *./tests/data/lavf/lavf.mkv
+472759 ./tests/data/lavf/lavf.mkv
+./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
+9767a3b526d7e56d7400164cb888990c *./tests/data/lavf/lavf.mkv
+320603 ./tests/data/lavf/lavf.mkv
+./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
diff --git a/tests/ref/lavf/mmf b/tests/ref/lavf/mmf
index 947abc746b..fae95cadd5 100644
--- a/tests/ref/lavf/mmf
+++ b/tests/ref/lavf/mmf
@@ -1,3 +1,3 @@
-1a3bbf19a41668c1e928bcafce88ff3e *./tests/data/lavf/lavf.mmf
-22617 ./tests/data/lavf/lavf.mmf
+643fadf7482f6d937ed75ec4f508e4f1 *./tests/data/lavf/lavf.mmf
+22611 ./tests/data/lavf/lavf.mmf
 ./tests/data/lavf/lavf.mmf CRC=0x8dea1388
diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov
index f34a006fb4..2e1f24dfc6 100644
--- a/tests/ref/lavf/mov
+++ b/tests/ref/lavf/mov
@@ -1,3 +1,21 @@
-e46f42ed71a589ac356e9cfad4e1e56a *./tests/data/lavf/lavf.mov
-356797 ./tests/data/lavf/lavf.mov
-./tests/data/lavf/lavf.mov CRC=0xe3f4950d
+a10d50f2679df92264e1fc21cb8be630 *./tests/data/lavf/lavf.mov
+366449 ./tests/data/lavf/lavf.mov
+./tests/data/lavf/lavf.mov CRC=0xbb2b949b
+6258f70f974e3c802e01d02ac33c7bbd *./tests/data/lavf/lavf.mov
+357539 ./tests/data/lavf/lavf.mov
+./tests/data/lavf/lavf.mov CRC=0xbb2b949b
+ba3b8b49e420510a0d417400dbedfc2d *./tests/data/lavf/lavf.mov
+366621 ./tests/data/lavf/lavf.mov
+./tests/data/lavf/lavf.mov CRC=0xa9793231
+fd0e4de8e7f6d0c8c0681d7020f00f50 *./tests/data/lavf/lavf.mov
+356921 ./tests/data/lavf/lavf.mov
+./tests/data/lavf/lavf.mov CRC=0xbb2b949b
+ebca72c186a4f3ba9bb17d9cb5b74fef *./tests/data/lavf/lavf.mp4
+312457 ./tests/data/lavf/lavf.mp4
+./tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
+9944512475d82d2d601f3c96101bdf9c *./tests/data/lavf/lavf.mp4
+321343 ./tests/data/lavf/lavf.mp4
+./tests/data/lavf/lavf.mp4 CRC=0xe8130120
+7b3e71f294901067046c09f03a426bdc *./tests/data/lavf/lavf.mp4
+312001 ./tests/data/lavf/lavf.mp4
+./tests/data/lavf/lavf.mp4 CRC=0x9d9a638a
diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg
index e4c8ae0c17..7aab14f84b 100644
--- a/tests/ref/lavf/mpg
+++ b/tests/ref/lavf/mpg
@@ -1,3 +1,9 @@
-7df31ba8a5909e3c88b1d1a3f93c4ec2 *./tests/data/lavf/lavf.mpg
+01bbdea588da51ab4a9d1d26f3443c96 *./tests/data/lavf/lavf.mpg
 372736 ./tests/data/lavf/lavf.mpg
-./tests/data/lavf/lavf.mpg CRC=0xdd24439e
+./tests/data/lavf/lavf.mpg CRC=0x000e23ae
+87b447b78a7d1141b9d41bb3aa50434d *./tests/data/lavf/lavf.mpg
+389120 ./tests/data/lavf/lavf.mpg
+./tests/data/lavf/lavf.mpg CRC=0x60ba4ab9
+284f41c914df75c12de01e223d65f87f *./tests/data/lavf/lavf.mpg
+372736 ./tests/data/lavf/lavf.mpg
+./tests/data/lavf/lavf.mpg CRC=0x000e23ae
diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf
index 09e3c36bbc..b9c37334a9 100644
--- a/tests/ref/lavf/mxf
+++ b/tests/ref/lavf/mxf
@@ -1,3 +1,9 @@
-051b982c1b5799eb107339735a090c70 *./tests/data/lavf/lavf.mxf
-525881 ./tests/data/lavf/lavf.mxf
-./tests/data/lavf/lavf.mxf CRC=0x773f059a
+1c06a9d69b6e309579784db5ecb0b69f *./tests/data/lavf/lavf.mxf
+525369 ./tests/data/lavf/lavf.mxf
+./tests/data/lavf/lavf.mxf CRC=0x8dddfaab
+50b4f9ca0493e6d83f4c52dc3aa2b7a5 *./tests/data/lavf/lavf.mxf
+560697 ./tests/data/lavf/lavf.mxf
+./tests/data/lavf/lavf.mxf CRC=0xf21b1b48
+4b71b154ae37364c8028cb50850a54c5 *./tests/data/lavf/lavf.mxf
+525369 ./tests/data/lavf/lavf.mxf
+./tests/data/lavf/lavf.mxf CRC=0x8dddfaab
diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10
index 8a62bb092a..134db876d5 100644
--- a/tests/ref/lavf/mxf_d10
+++ b/tests/ref/lavf/mxf_d10
@@ -1,3 +1,3 @@
-96f933913835a439dd97144303dc8929 *./tests/data/lavf/lavf.mxf_d10
+73c0cb416548c33d0651c59519a8f7e2 *./tests/data/lavf/lavf.mxf_d10
 5330989 ./tests/data/lavf/lavf.mxf_d10
-./tests/data/lavf/lavf.mxf_d10 CRC=0x4474d480
+./tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488
diff --git a/tests/ref/lavf/mxf_dv25 b/tests/ref/lavf/mxf_dv25
new file mode 100644
index 0000000000..85094828d1
--- /dev/null
+++ b/tests/ref/lavf/mxf_dv25
@@ -0,0 +1,3 @@
+1871bd11947924116776201f24fd0adf *./tests/data/lavf/lavf.mxf_dv25
+3833389 ./tests/data/lavf/lavf.mxf_dv25
+./tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52
diff --git a/tests/ref/lavf/mxf_dvcpro50 b/tests/ref/lavf/mxf_dvcpro50
new file mode 100644
index 0000000000..1d0cf79996
--- /dev/null
+++ b/tests/ref/lavf/mxf_dvcpro50
@@ -0,0 +1,3 @@
+6c9cb62911ac16c3b55f0ad0b052c05b *./tests/data/lavf/lavf.mxf_dvcpro50
+7430189 ./tests/data/lavf/lavf.mxf_dvcpro50
+./tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4
diff --git a/tests/ref/lavf/mxf_opatom b/tests/ref/lavf/mxf_opatom
new file mode 100644
index 0000000000..ea1190c06a
--- /dev/null
+++ b/tests/ref/lavf/mxf_opatom
@@ -0,0 +1,3 @@
+962c2cd582340f8961a8283636093abf *./tests/data/lavf/lavf.mxf_opatom
+4717113 ./tests/data/lavf/lavf.mxf_opatom
+./tests/data/lavf/lavf.mxf_opatom CRC=0xf55aa22a
diff --git a/tests/ref/lavf/mxf_opatom_audio b/tests/ref/lavf/mxf_opatom_audio
new file mode 100644
index 0000000000..953df9094f
--- /dev/null
+++ b/tests/ref/lavf/mxf_opatom_audio
@@ -0,0 +1,3 @@
+d4ad5a0faf410a9d9e99b3328143e89d *./tests/data/lavf/lavf.mxf_opatom_audio
+101945 ./tests/data/lavf/lavf.mxf_opatom_audio
+./tests/data/lavf/lavf.mxf_opatom_audio CRC=0xd155c6ff
diff --git a/tests/ref/lavf/nut b/tests/ref/lavf/nut
index bdbe8232ef..1c3d7107da 100644
--- a/tests/ref/lavf/nut
+++ b/tests/ref/lavf/nut
@@ -1,3 +1,3 @@
-d685d5af89cfddb2660f03b1dee3f9a2 *./tests/data/lavf/lavf.nut
-319711 ./tests/data/lavf/lavf.nut
-./tests/data/lavf/lavf.nut CRC=0x4c963cda
+424e8037d7b6f3d3c09cf76bf06a63cb *./tests/data/lavf/lavf.nut
+319958 ./tests/data/lavf/lavf.nut
+./tests/data/lavf/lavf.nut CRC=0xec6c3c68
diff --git a/tests/ref/lavf/ogg b/tests/ref/lavf/ogg
index ea827acd4c..a08fb5ed82 100644
--- a/tests/ref/lavf/ogg
+++ b/tests/ref/lavf/ogg
@@ -1,3 +1,3 @@
-8ca901bc8d24b80ebe79e387e454d1e9 *./tests/data/lavf/lavf.ogg
-13476 ./tests/data/lavf/lavf.ogg
+81b9366cacb23644c2803585dced9996 *./tests/data/lavf/lavf.ogg
+13516 ./tests/data/lavf/lavf.ogg
 ./tests/data/lavf/lavf.ogg CRC=0x3a1da17e
diff --git a/tests/ref/lavf/pam b/tests/ref/lavf/pam
index 636a419a47..97893f60c7 100644
--- a/tests/ref/lavf/pam
+++ b/tests/ref/lavf/pam
@@ -1,3 +1,18 @@
 0dce5565222cf0f8b309467f279aecd2 *./tests/data/images/pam/02.pam
-./tests/data/images/pam/%02d.pam CRC=0x28c7369b
+./tests/data/images/pam/%02d.pam CRC=0x6da01946
 304191 ./tests/data/images/pam/02.pam
+2ed31ca8d8de560afb3e0fd7a873cde5 *./tests/data/images/pam/02.pam
+./tests/data/images/pam/%02d.pam CRC=0xf07d29cd
+405573 ./tests/data/images/pam/02.pam
+35cb9e42b2d3181be494f8693af1ddea *./tests/data/images/pam/02.pam
+./tests/data/images/pam/%02d.pam CRC=0x0ff205be
+101445 ./tests/data/images/pam/02.pam
+740eb42157af9e9eed46b70ba6a6cf4d *./tests/data/images/pam/02.pam
+./tests/data/images/pam/%02d.pam CRC=0x893f10ef
+202823 ./tests/data/images/pam/02.pam
+032538f0313b4f240b44a5bef115f5bf *./tests/data/images/pam/02.pam
+./tests/data/images/pam/%02d.pam CRC=0x5984c023
+608321 ./tests/data/images/pam/02.pam
+d2f5eb2f959ca3a90c02f1887b6e0c4f *./tests/data/images/pam/02.pam
+./tests/data/images/pam/%02d.pam CRC=0xab19200d
+101447 ./tests/data/images/pam/02.pam
diff --git a/tests/ref/lavf/pbmpipe b/tests/ref/lavf/pbmpipe
index d50ed716bc..284f90b16b 100644
--- a/tests/ref/lavf/pbmpipe
+++ b/tests/ref/lavf/pbmpipe
@@ -1,3 +1,3 @@
-8ced96f5b6b7362358199ae993b4ceb7 *./tests/data/lavf/pbmpipe.pbm
+8b974da7f48f9e6d5ae327b4444a71fb *./tests/data/lavf/pbmpipe.pbm
 317075 ./tests/data/lavf/pbmpipe.pbm
-./tests/data/lavf/pbmpipe.pbm CRC=0xfae0a1ba
+./tests/data/lavf/pbmpipe.pbm CRC=0xfc010c66
diff --git a/tests/ref/lavf/pcx b/tests/ref/lavf/pcx
index e60ea782bc..6568b6028c 100644
--- a/tests/ref/lavf/pcx
+++ b/tests/ref/lavf/pcx
@@ -1,3 +1,3 @@
-2df1d747fba23d03b6ff9c91b8b465c9 *./tests/data/images/pcx/02.pcx
-./tests/data/images/pcx/%02d.pcx CRC=0x28c7369b
+c4faf65ecc812ec8412cc26140c13bd5 *./tests/data/images/pcx/02.pcx
+./tests/data/images/pcx/%02d.pcx CRC=0x6da01946
 364147 ./tests/data/images/pcx/02.pcx
diff --git a/tests/ref/lavf/pgm b/tests/ref/lavf/pgm
index 419fdaa46f..816579fa86 100644
--- a/tests/ref/lavf/pgm
+++ b/tests/ref/lavf/pgm
@@ -1,3 +1,3 @@
-388f5c51a678ca6a52cc006095c12f08 *./tests/data/images/pgm/02.pgm
-./tests/data/images/pgm/%02d.pgm CRC=0xa6866b82
+cc777c5fc4d116d4c5a996eac8d3133e *./tests/data/images/pgm/02.pgm
+./tests/data/images/pgm/%02d.pgm CRC=0x0ff205be
 101391 ./tests/data/images/pgm/02.pgm
diff --git a/tests/ref/lavf/pgmpipe b/tests/ref/lavf/pgmpipe
index 28ad60ea59..da6f9a6d3a 100644
--- a/tests/ref/lavf/pgmpipe
+++ b/tests/ref/lavf/pgmpipe
@@ -1,3 +1,3 @@
-04e66c8e9e064c8310bd657ee559bd70 *./tests/data/lavf/pgmpipe.pgm
+c34e37ea49237c2d1ea81a5944328e59 *./tests/data/lavf/pgmpipe.pgm
 2534775 ./tests/data/lavf/pgmpipe.pgm
-./tests/data/lavf/pgmpipe.pgm CRC=0xadf48ba9
+./tests/data/lavf/pgmpipe.pgm CRC=0x7aa0122f
diff --git a/tests/ref/lavf/pixfmt b/tests/ref/lavf/pixfmt
index 186dde5ed3..ec75d4ce24 100644
--- a/tests/ref/lavf/pixfmt
+++ b/tests/ref/lavf/pixfmt
@@ -16,21 +16,21 @@ e176bd14185788110e055f945de7f95f *./tests/data/pixfmt/yuvj420p.yuv
 304128 ./tests/data/pixfmt/yuvj422p.yuv
 c10442da177c9f1d12be3c53be6fa12c *./tests/data/pixfmt/yuvj444p.yuv
 304128 ./tests/data/pixfmt/yuvj444p.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/rgb24.yuv
+6bb61113e7b70eb09dbcec356122a0e2 *./tests/data/pixfmt/rgb24.yuv
 304128 ./tests/data/pixfmt/rgb24.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/bgr24.yuv
+6bb61113e7b70eb09dbcec356122a0e2 *./tests/data/pixfmt/bgr24.yuv
 304128 ./tests/data/pixfmt/bgr24.yuv
-c6e0f9b5817f484b175c1ec4ffb4e9c9 *./tests/data/pixfmt/rgb32.yuv
+6bb61113e7b70eb09dbcec356122a0e2 *./tests/data/pixfmt/rgb32.yuv
 304128 ./tests/data/pixfmt/rgb32.yuv
-66d39d464bd89ded2a124897f0a75ade *./tests/data/pixfmt/rgb565.yuv
+efa7c0337cc00c796c6df615223716f1 *./tests/data/pixfmt/rgb565.yuv
 304128 ./tests/data/pixfmt/rgb565.yuv
-c894c3bd8d2631ed1964500b90a0c350 *./tests/data/pixfmt/rgb555.yuv
+0df2a477af1415a1b8fbf2a3e552bc39 *./tests/data/pixfmt/rgb555.yuv
 304128 ./tests/data/pixfmt/rgb555.yuv
-6be306b0cce5f8e6c271ea17fef9745b *./tests/data/pixfmt/gray.yuv
+1e080c12bd9755c41ecb8e19b756f406 *./tests/data/pixfmt/gray.yuv
 304128 ./tests/data/pixfmt/gray.yuv
-31398104d2349dd48328a6862bc6711f *./tests/data/pixfmt/monow.yuv
+d87cf0c2e7a13cc693fe6ece22461c83 *./tests/data/pixfmt/monow.yuv
 304128 ./tests/data/pixfmt/monow.yuv
-31398104d2349dd48328a6862bc6711f *./tests/data/pixfmt/monob.yuv
+d87cf0c2e7a13cc693fe6ece22461c83 *./tests/data/pixfmt/monob.yuv
 304128 ./tests/data/pixfmt/monob.yuv
 00b85790df5740bab95e2559d81603a7 *./tests/data/pixfmt/yuv440p.yuv
 304128 ./tests/data/pixfmt/yuv440p.yuv
diff --git a/tests/ref/lavf/png b/tests/ref/lavf/png
index f216e7e904..9cf677b21b 100644
--- a/tests/ref/lavf/png
+++ b/tests/ref/lavf/png
@@ -1,3 +1,9 @@
-c162094e51dc1a3203de43e496086dfd *./tests/data/images/png/02.png
-./tests/data/images/png/%02d.png CRC=0x28c7369b
-248612 ./tests/data/images/png/02.png
+2af72da4468e61a37c220b25cb28618a *./tests/data/images/png/02.png
+./tests/data/images/png/%02d.png CRC=0x6da01946
+248633 ./tests/data/images/png/02.png
+6cf54c13aa407b77547cf6dfe23ecba3 *./tests/data/images/png/02.png
+./tests/data/images/png/%02d.png CRC=0x893f10ef
+47365 ./tests/data/images/png/02.png
+b4e38244c97debe3f528e7d1adb283ef *./tests/data/images/png/02.png
+./tests/data/images/png/%02d.png CRC=0x5984c023
+511900 ./tests/data/images/png/02.png
diff --git a/tests/ref/lavf/ppm b/tests/ref/lavf/ppm
index 33275e2d36..97093aaac5 100644
--- a/tests/ref/lavf/ppm
+++ b/tests/ref/lavf/ppm
@@ -1,3 +1,3 @@
 16d5dadf0b362fc8ba3cb676c5dde985 *./tests/data/images/ppm/02.ppm
-./tests/data/images/ppm/%02d.ppm CRC=0x28c7369b
+./tests/data/images/ppm/%02d.ppm CRC=0x6da01946
 304143 ./tests/data/images/ppm/02.ppm
diff --git a/tests/ref/lavf/rm b/tests/ref/lavf/rm
index 993310d4e3..62e0a31739 100644
--- a/tests/ref/lavf/rm
+++ b/tests/ref/lavf/rm
@@ -1,2 +1,2 @@
-9eeb3b91c0a45f519fd7f2efea882cf4 *./tests/data/lavf/lavf.rm
-346414 ./tests/data/lavf/lavf.rm
+e30681d05d6f3d24108d3614600bf116 *./tests/data/lavf/lavf.rm
+346424 ./tests/data/lavf/lavf.rm
diff --git a/tests/ref/lavf/sgi b/tests/ref/lavf/sgi
index 703b83cf66..6f45802d86 100644
--- a/tests/ref/lavf/sgi
+++ b/tests/ref/lavf/sgi
@@ -1,3 +1,3 @@
 d446e540a7c18da5fd3cc0e9942cd46f *./tests/data/images/sgi/02.sgi
-./tests/data/images/sgi/%02d.sgi CRC=0x28c7369b
+./tests/data/images/sgi/%02d.sgi CRC=0x6da01946
 307287 ./tests/data/images/sgi/02.sgi
diff --git a/tests/ref/lavf/smjpeg b/tests/ref/lavf/smjpeg
new file mode 100644
index 0000000000..fb8c6542fa
--- /dev/null
+++ b/tests/ref/lavf/smjpeg
@@ -0,0 +1,3 @@
+3fe90213ac4f5275eb85ad0a4e4bdb44 *./tests/data/lavf/lavf.smjpeg
+728642 ./tests/data/lavf/lavf.smjpeg
+./tests/data/lavf/lavf.smjpeg CRC=0x54bf6147
diff --git a/tests/ref/lavf/sunrast b/tests/ref/lavf/sunrast
index 097235b75c..4db0505140 100644
--- a/tests/ref/lavf/sunrast
+++ b/tests/ref/lavf/sunrast
@@ -1,3 +1,3 @@
 07518bcb0841bc677ce6aea8464ea240 *./tests/data/images/sun/02.sun
-./tests/data/images/sun/%02d.sun CRC=0x3447369b
+./tests/data/images/sun/%02d.sun CRC=0xe6c71946
 304123 ./tests/data/images/sun/02.sun
diff --git a/tests/ref/lavf/swf b/tests/ref/lavf/swf
index 1e07793e1e..7ce0fa46cb 100644
--- a/tests/ref/lavf/swf
+++ b/tests/ref/lavf/swf
@@ -1,3 +1,3 @@
-62c5aeb636fc82cf6ba6277d36e42cb5 *./tests/data/lavf/lavf.swf
-329479 ./tests/data/lavf/lavf.swf
-./tests/data/lavf/lavf.swf CRC=0x881785d1
+11e9e9bf99a0ae6a0ba5434b745eae21 *./tests/data/lavf/lavf.swf
+329474 ./tests/data/lavf/lavf.swf
+./tests/data/lavf/lavf.swf CRC=0x4eac88c5
diff --git a/tests/ref/lavf/tga b/tests/ref/lavf/tga
index ce6b6466bb..7efaf97828 100644
--- a/tests/ref/lavf/tga
+++ b/tests/ref/lavf/tga
@@ -1,3 +1,3 @@
 c0305c53e6d79d4ed9f35f04f671246c *./tests/data/images/tga/02.tga
-./tests/data/images/tga/%02d.tga CRC=0x3447369b
+./tests/data/images/tga/%02d.tga CRC=0xe6c71946
 304172 ./tests/data/images/tga/02.tga
diff --git a/tests/ref/lavf/tiff b/tests/ref/lavf/tiff
index b636bd9c8b..4b0b985f76 100644
--- a/tests/ref/lavf/tiff
+++ b/tests/ref/lavf/tiff
@@ -1,3 +1,3 @@
 b3299346a8959553a437e486d8f3bf76 *./tests/data/images/tiff/02.tiff
-./tests/data/images/tiff/%02d.tiff CRC=0x28c7369b
+./tests/data/images/tiff/%02d.tiff CRC=0x6da01946
 307131 ./tests/data/images/tiff/02.tiff
diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts
index caf08a85b7..2be3526c7c 100644
--- a/tests/ref/lavf/ts
+++ b/tests/ref/lavf/ts
@@ -1,3 +1,3 @@
-f74d6f4d4073f4242cec3d5fee099779 *./tests/data/lavf/lavf.ts
-406456 ./tests/data/lavf/lavf.ts
-./tests/data/lavf/lavf.ts CRC=0xb4ca6cdc
+38f4b14d43a0e416be8d598628997cbc *./tests/data/lavf/lavf.ts
+407020 ./tests/data/lavf/lavf.ts
+./tests/data/lavf/lavf.ts CRC=0x71287e25
diff --git a/tests/ref/lavf/tta b/tests/ref/lavf/tta
new file mode 100644
index 0000000000..d86d097e3d
--- /dev/null
+++ b/tests/ref/lavf/tta
@@ -0,0 +1,3 @@
+d86c5cccb2554143d34d1786ab460a31 *./tests/data/lavf/lavf.tta
+43200 ./tests/data/lavf/lavf.tta
+./tests/data/lavf/lavf.tta CRC=0x3a1da17e
diff --git a/tests/ref/lavf/voc b/tests/ref/lavf/voc
index 3131960237..ded8af7227 100644
--- a/tests/ref/lavf/voc
+++ b/tests/ref/lavf/voc
@@ -1,3 +1,3 @@
-ae01db5200e569371d4c27316575344c *./tests/data/lavf/lavf.voc
+bb5ad96a5e1b35683d50bf18115db821 *./tests/data/lavf/lavf.voc
 44305 ./tests/data/lavf/lavf.voc
 ./tests/data/lavf/lavf.voc CRC=0x298fd284
diff --git a/tests/ref/lavf/voc_s16 b/tests/ref/lavf/voc_s16
index deb7999485..d026090aff 100644
--- a/tests/ref/lavf/voc_s16
+++ b/tests/ref/lavf/voc_s16
@@ -1,3 +1,3 @@
-e55a9c632cfeab90bcfb9ff29a71728c *./tests/data/lavf/lavf.s16.voc
-176613 ./tests/data/lavf/lavf.s16.voc
+db9fa22ff71992bd8b6cc80047223c92 *./tests/data/lavf/lavf.s16.voc
+176615 ./tests/data/lavf/lavf.s16.voc
 ./tests/data/lavf/lavf.s16.voc CRC=0xe61e3bd0
diff --git a/tests/ref/lavf/w64 b/tests/ref/lavf/w64
new file mode 100644
index 0000000000..26c68688e5
--- /dev/null
+++ b/tests/ref/lavf/w64
@@ -0,0 +1,3 @@
+82c75c9cb61924fda68d9602ea69c445 *./tests/data/lavf/lavf.w64
+88304 ./tests/data/lavf/lavf.w64
+./tests/data/lavf/lavf.w64 CRC=0x3a1da17e
diff --git a/tests/ref/lavf/wav b/tests/ref/lavf/wav
index fa8a859cd0..da3bfc24ed 100644
--- a/tests/ref/lavf/wav
+++ b/tests/ref/lavf/wav
@@ -1,3 +1,3 @@
-41410d9bbe0603740d1c17050746f475 *./tests/data/lavf/lavf.wav
-88246 ./tests/data/lavf/lavf.wav
+fc958a32b4fca7b1c40cbdaef2d1416e *./tests/data/lavf/lavf.wav
+88274 ./tests/data/lavf/lavf.wav
 ./tests/data/lavf/lavf.wav CRC=0x3a1da17e
diff --git a/tests/ref/lavf/wav_peak b/tests/ref/lavf/wav_peak
new file mode 100644
index 0000000000..861b246d72
--- /dev/null
+++ b/tests/ref/lavf/wav_peak
@@ -0,0 +1,3 @@
+105805963fb767d00da056f42f32d9f3 *./tests/data/lavf/lavf.peak.wav
+89094 ./tests/data/lavf/lavf.peak.wav
+./tests/data/lavf/lavf.peak.wav CRC=0x3a1da17e
diff --git a/tests/ref/lavf/wav_peak_only b/tests/ref/lavf/wav_peak_only
new file mode 100644
index 0000000000..b203d0345b
--- /dev/null
+++ b/tests/ref/lavf/wav_peak_only
@@ -0,0 +1,2 @@
+f1a8aeeae8069f3992c4d780436c3d23 *./tests/data/lavf/lavf.peak_only.wav
+832 ./tests/data/lavf/lavf.peak_only.wav
diff --git a/tests/ref/lavf/wtv b/tests/ref/lavf/wtv
new file mode 100644
index 0000000000..11c04c5e61
--- /dev/null
+++ b/tests/ref/lavf/wtv
@@ -0,0 +1,3 @@
+c5328b1c3e5fe70468c3f587c34ffd82 *./tests/data/lavf/lavf.wtv
+413696 ./tests/data/lavf/lavf.wtv
+./tests/data/lavf/lavf.wtv CRC=0x71287e25
diff --git a/tests/ref/lavf/wv b/tests/ref/lavf/wv
new file mode 100644
index 0000000000..323c5df6d5
--- /dev/null
+++ b/tests/ref/lavf/wv
@@ -0,0 +1,3 @@
+47d9a381d9c3f99b8b059f3b17f1dc11 *./tests/data/lavf/lavf.wv
+59560 ./tests/data/lavf/lavf.wv
+./tests/data/lavf/lavf.wv CRC=0x3a1da17e
diff --git a/tests/ref/lavf/xbm b/tests/ref/lavf/xbm
new file mode 100644
index 0000000000..705713b22b
--- /dev/null
+++ b/tests/ref/lavf/xbm
@@ -0,0 +1,3 @@
+0629055fd82366317c651a0af4bb82d7 *./tests/data/images/xbm/02.xbm
+./tests/data/images/xbm/%02d.xbm CRC=0xc9a20204
+76411 ./tests/data/images/xbm/02.xbm
diff --git a/tests/ref/lavf/xwd b/tests/ref/lavf/xwd
index 3fd20c8f6c..3d638211cb 100644
--- a/tests/ref/lavf/xwd
+++ b/tests/ref/lavf/xwd
@@ -1,3 +1,24 @@
 50baa5560b7d1aa3188b19c1162bf7dc *./tests/data/images/xwd/02.xwd
-./tests/data/images/xwd/%02d.xwd CRC=0x28c7369b
+./tests/data/images/xwd/%02d.xwd CRC=0x6da01946
 304239 ./tests/data/images/xwd/02.xwd
+1cdb43599c956dc8563f1e09fac5df00 *./tests/data/images/xwd/02.xwd
+./tests/data/images/xwd/%02d.xwd CRC=0xf07d29cd
+405615 ./tests/data/images/xwd/02.xwd
+c0866e9e710fce735423594a93bee604 *./tests/data/images/xwd/02.xwd
+./tests/data/images/xwd/%02d.xwd CRC=0x53209216
+202863 ./tests/data/images/xwd/02.xwd
+1300938325d5ac12caa09a43bd58f37c *./tests/data/images/xwd/02.xwd
+./tests/data/images/xwd/%02d.xwd CRC=0x14555d6e
+202863 ./tests/data/images/xwd/02.xwd
+c6f3cb7c45f7238474a89d2ad61a1caf *./tests/data/images/xwd/02.xwd
+./tests/data/images/xwd/%02d.xwd CRC=0xfaafb59b
+104559 ./tests/data/images/xwd/02.xwd
+fe1af954966a40c2cd35fc27094ff823 *./tests/data/images/xwd/02.xwd
+./tests/data/images/xwd/%02d.xwd CRC=0xd69c3a09
+104559 ./tests/data/images/xwd/02.xwd
+85e9b8b814a1dea71d143aac2e487037 *./tests/data/images/xwd/02.xwd
+./tests/data/images/xwd/%02d.xwd CRC=0x0ff205be
+101487 ./tests/data/images/xwd/02.xwd
+796e2e309ac0844cfb2f4959816508ee *./tests/data/images/xwd/02.xwd
+./tests/data/images/xwd/%02d.xwd CRC=0xc9a20204
+12783 ./tests/data/images/xwd/02.xwd
diff --git a/tests/ref/seek/acodec-adpcm-ima_qt-trellis b/tests/ref/seek/acodec-adpcm-ima_qt-trellis
new file mode 100644
index 0000000000..bdaf1f0f0c
--- /dev/null
+++ b/tests/ref/seek/acodec-adpcm-ima_qt-trellis
@@ -0,0 +1,53 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     72 size:    68
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     72 size:    68
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.893878 pts: 1.893878 pos:  88812 size:    68
+ret: 0         st: 0 flags:0  ts: 0.788345
+ret: 0         st: 0 flags:1 dts: 0.789478 pts: 0.789478 pos:  37064 size:    68
+ret: 0         st: 0 flags:1  ts:-0.317506
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     72 size:    68
+ret: 0         st:-1 flags:0  ts: 2.576668
+ret: 0         st: 0 flags:1 dts: 2.577438 pts: 2.577438 pos: 120840 size:    68
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.470113 pts: 1.470113 pos:  68956 size:    68
+ret: 0         st: 0 flags:0  ts: 0.365011
+ret: 0         st: 0 flags:1 dts: 0.365714 pts: 0.365714 pos:  17208 size:    68
+ret: 0         st: 0 flags:1  ts:-0.740839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     72 size:    68
+ret: 0         st:-1 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1 dts: 2.153673 pts: 2.153673 pos: 100984 size:    68
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.046349 pts: 1.046349 pos:  49100 size:    68
+ret: 0         st: 0 flags:0  ts:-0.058322
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     72 size:    68
+ret: 0         st: 0 flags:1  ts: 2.835828
+ret: 0         st: 0 flags:1 dts: 2.835760 pts: 2.835760 pos: 132944 size:    68
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.731338 pts: 1.731338 pos:  81196 size:    68
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.624036 pts: 0.624036 pos:  29312 size:    68
+ret: 0         st: 0 flags:0  ts:-0.481655
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     72 size:    68
+ret: 0         st: 0 flags:1  ts: 2.412494
+ret: 0         st: 0 flags:1 dts: 2.411995 pts: 2.411995 pos: 113088 size:    68
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.307574 pts: 1.307574 pos:  61340 size:    68
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200272 pts: 0.200272 pos:   9456 size:    68
+ret: 0         st: 0 flags:0  ts:-0.904989
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     72 size:    68
+ret: 0         st: 0 flags:1  ts: 1.989184
+ret: 0         st: 0 flags:1 dts: 1.988209 pts: 1.988209 pos:  93232 size:    68
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.883810 pts: 0.883810 pos:  41484 size:    68
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     72 size:    68
+ret: 0         st: 0 flags:0  ts: 2.671678
+ret: 0         st: 0 flags:1 dts: 2.671769 pts: 2.671769 pos: 125260 size:    68
+ret: 0         st: 0 flags:1  ts: 1.565850
+ret: 0         st: 0 flags:1 dts: 1.564444 pts: 1.564444 pos:  73376 size:    68
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.460045 pts: 0.460045 pos:  21628 size:    68
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     72 size:    68
diff --git a/tests/ref/seek/acodec-adpcm-ima_wav-trellis b/tests/ref/seek/acodec-adpcm-ima_wav-trellis
new file mode 100644
index 0000000000..b6517c5438
--- /dev/null
+++ b/tests/ref/seek/acodec-adpcm-ima_wav-trellis
@@ -0,0 +1,53 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     60 size:  4096
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     60 size:  4096
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.856009 pts: 1.856009 pos:  29756 size:  4096
+ret: 0         st: 0 flags:0  ts: 0.788345
+ret: 0         st: 0 flags:1 dts: 0.831995 pts: 0.831995 pos:  13372 size:  4096
+ret: 0         st: 0 flags:1  ts:-0.317506
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     60 size:  4096
+ret: 0         st:-1 flags:0  ts: 2.576668
+ret: 0         st: 0 flags:1 dts: 2.623991 pts: 2.623991 pos:  42044 size:  4096
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.408005 pts: 1.408005 pos:  22588 size:  4096
+ret: 0         st: 0 flags:0  ts: 0.365011
+ret: 0         st: 0 flags:1 dts: 0.383991 pts: 0.383991 pos:   6204 size:  4096
+ret: 0         st: 0 flags:1  ts:-0.740839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     60 size:  4096
+ret: 0         st:-1 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1 dts: 2.176009 pts: 2.176009 pos:  34876 size:  4096
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.023991 pts: 1.023991 pos:  16444 size:  4096
+ret: 0         st: 0 flags:0  ts:-0.058322
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     60 size:  4096
+ret: 0         st: 0 flags:1  ts: 2.835828
+ret: 0         st: 0 flags:1 dts: 2.816009 pts: 2.816009 pos:  45116 size:  4096
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.791995 pts: 1.791995 pos:  28732 size:  4096
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.576009 pts: 0.576009 pos:   9276 size:  4096
+ret: 0         st: 0 flags:0  ts:-0.481655
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     60 size:  4096
+ret: 0         st: 0 flags:1  ts: 2.412494
+ret: 0         st: 0 flags:1 dts: 2.368005 pts: 2.368005 pos:  37948 size:  4096
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.343991 pts: 1.343991 pos:  21564 size:  4096
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.191995 pts: 0.191995 pos:   3132 size:  4096
+ret: 0         st: 0 flags:0  ts:-0.904989
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     60 size:  4096
+ret: 0         st: 0 flags:1  ts: 1.989184
+ret: 0         st: 0 flags:1 dts: 1.983991 pts: 1.983991 pos:  31804 size:  4096
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.896009 pts: 0.896009 pos:  14396 size:  4096
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     60 size:  4096
+ret: 0         st: 0 flags:0  ts: 2.671678
+ret: 0         st: 0 flags:1 dts: 2.688005 pts: 2.688005 pos:  43068 size:  4096
+ret: 0         st: 0 flags:1  ts: 1.565850
+ret: 0         st: 0 flags:1 dts: 1.536009 pts: 1.536009 pos:  24636 size:  4096
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.511995 pts: 0.511995 pos:   8252 size:  4096
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     60 size:  4096
diff --git a/tests/ref/seek/acodec-adpcm-ms-trellis b/tests/ref/seek/acodec-adpcm-ms-trellis
new file mode 100644
index 0000000000..579be7f416
--- /dev/null
+++ b/tests/ref/seek/acodec-adpcm-ms-trellis
@@ -0,0 +1,53 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     90 size:  4096
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     90 size:  4096
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.856009 pts: 1.856009 pos:  29786 size:  4096
+ret: 0         st: 0 flags:0  ts: 0.788345
+ret: 0         st: 0 flags:1 dts: 0.831995 pts: 0.831995 pos:  13402 size:  4096
+ret: 0         st: 0 flags:1  ts:-0.317506
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     90 size:  4096
+ret: 0         st:-1 flags:0  ts: 2.576668
+ret: 0         st: 0 flags:1 dts: 2.623991 pts: 2.623991 pos:  42074 size:  4096
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.408005 pts: 1.408005 pos:  22618 size:  4096
+ret: 0         st: 0 flags:0  ts: 0.365011
+ret: 0         st: 0 flags:1 dts: 0.383991 pts: 0.383991 pos:   6234 size:  4096
+ret: 0         st: 0 flags:1  ts:-0.740839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     90 size:  4096
+ret: 0         st:-1 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1 dts: 2.176009 pts: 2.176009 pos:  34906 size:  4096
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.023991 pts: 1.023991 pos:  16474 size:  4096
+ret: 0         st: 0 flags:0  ts:-0.058322
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     90 size:  4096
+ret: 0         st: 0 flags:1  ts: 2.835828
+ret: 0         st: 0 flags:1 dts: 2.816009 pts: 2.816009 pos:  45146 size:  4096
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.791995 pts: 1.791995 pos:  28762 size:  4096
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.576009 pts: 0.576009 pos:   9306 size:  4096
+ret: 0         st: 0 flags:0  ts:-0.481655
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     90 size:  4096
+ret: 0         st: 0 flags:1  ts: 2.412494
+ret: 0         st: 0 flags:1 dts: 2.368005 pts: 2.368005 pos:  37978 size:  4096
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.343991 pts: 1.343991 pos:  21594 size:  4096
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.191995 pts: 0.191995 pos:   3162 size:  4096
+ret: 0         st: 0 flags:0  ts:-0.904989
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     90 size:  4096
+ret: 0         st: 0 flags:1  ts: 1.989184
+ret: 0         st: 0 flags:1 dts: 1.983991 pts: 1.983991 pos:  31834 size:  4096
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.896009 pts: 0.896009 pos:  14426 size:  4096
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     90 size:  4096
+ret: 0         st: 0 flags:0  ts: 2.671678
+ret: 0         st: 0 flags:1 dts: 2.688005 pts: 2.688005 pos:  43098 size:  4096
+ret: 0         st: 0 flags:1  ts: 1.565850
+ret: 0         st: 0 flags:1 dts: 1.536009 pts: 1.536009 pos:  24666 size:  4096
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.511995 pts: 0.511995 pos:   8282 size:  4096
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     90 size:  4096
diff --git a/tests/ref/seek/acodec-adpcm-swf b/tests/ref/seek/acodec-adpcm-swf
index 2f9091325a..5905b33b6e 100644
--- a/tests/ref/seek/acodec-adpcm-swf
+++ b/tests/ref/seek/acodec-adpcm-swf
@@ -1,49 +1,49 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    208 size:  2053
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    196 size:  2053
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    208 size:  2053
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    196 size:  2053
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.858000 pts: 1.858000 pos:  82968 size:  2053
+ret: 0         st: 0 flags:1 dts: 1.858000 pts: 1.858000 pos:  82956 size:  2053
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 0.789000 pts: 0.789000 pos:  35381 size:  2053
+ret: 0         st: 0 flags:1 dts: 0.789000 pts: 0.789000 pos:  35369 size:  2053
 ret:-1         st: 0 flags:1  ts:-0.317000
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 2.601000 pts: 2.601000 pos: 116072 size:  2053
+ret: 0         st: 0 flags:1 dts: 2.601000 pts: 2.601000 pos: 116060 size:  2053
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  64347 size:  2053
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  64335 size:  2053
 ret: 0         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1 dts: 0.372000 pts: 0.372000 pos:  16760 size:  2053
+ret: 0         st: 0 flags:1 dts: 0.372000 pts: 0.372000 pos:  16748 size:  2053
 ret:-1         st: 0 flags:1  ts:-0.741000
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 2.183000 pts: 2.183000 pos:  97451 size:  2053
+ret: 0         st: 0 flags:1 dts: 2.183000 pts: 2.183000 pos:  97439 size:  2053
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.022000 pts: 1.022000 pos:  45726 size:  2053
+ret: 0         st: 0 flags:1 dts: 1.022000 pts: 1.022000 pos:  45714 size:  2053
 ret: 0         st: 0 flags:0  ts:-0.058000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    208 size:  2053
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    196 size:  2053
 ret: 0         st: 0 flags:1  ts: 2.836000
-ret: 0         st: 0 flags:1 dts: 2.833000 pts: 2.833000 pos: 126417 size:  2053
+ret: 0         st: 0 flags:1 dts: 2.833000 pts: 2.833000 pos: 126405 size:  2053
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.765000 pts: 1.765000 pos:  78830 size:  2053
+ret: 0         st: 0 flags:1 dts: 1.765000 pts: 1.765000 pos:  78818 size:  2053
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.604000 pts: 0.604000 pos:  27105 size:  2053
+ret: 0         st: 0 flags:1 dts: 0.604000 pts: 0.604000 pos:  27093 size:  2053
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    208 size:  2053
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    196 size:  2053
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 2.368000 pts: 2.368000 pos: 105727 size:  2053
+ret: 0         st: 0 flags:1 dts: 2.368000 pts: 2.368000 pos: 105715 size:  2053
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.347000 pts: 1.347000 pos:  60209 size:  2053
+ret: 0         st: 0 flags:1 dts: 1.347000 pts: 1.347000 pos:  60197 size:  2053
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.186000 pts: 0.186000 pos:   8484 size:  2053
+ret: 0         st: 0 flags:1 dts: 0.186000 pts: 0.186000 pos:   8472 size:  2053
 ret: 0         st: 0 flags:0  ts:-0.905000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    208 size:  2053
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    196 size:  2053
 ret: 0         st: 0 flags:1  ts: 1.989000
-ret: 0         st: 0 flags:1 dts: 1.950000 pts: 1.950000 pos:  87106 size:  2053
+ret: 0         st: 0 flags:1 dts: 1.950000 pts: 1.950000 pos:  87094 size:  2053
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.929000 pts: 0.929000 pos:  41588 size:  2053
+ret: 0         st: 0 flags:1 dts: 0.929000 pts: 0.929000 pos:  41576 size:  2053
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret: 0         st: 0 flags:0  ts: 2.672000
-ret: 0         st: 0 flags:1 dts: 2.694000 pts: 2.694000 pos: 120210 size:  2053
+ret: 0         st: 0 flags:1 dts: 2.694000 pts: 2.694000 pos: 120198 size:  2053
 ret: 0         st: 0 flags:1  ts: 1.566000
-ret: 0         st: 0 flags:1 dts: 1.533000 pts: 1.533000 pos:  68485 size:  2053
+ret: 0         st: 0 flags:1 dts: 1.533000 pts: 1.533000 pos:  68473 size:  2053
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.464000 pts: 0.464000 pos:  20898 size:  2053
+ret: 0         st: 0 flags:1 dts: 0.464000 pts: 0.464000 pos:  20886 size:  2053
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/acodec-adpcm-swf-trellis b/tests/ref/seek/acodec-adpcm-swf-trellis
new file mode 100644
index 0000000000..5905b33b6e
--- /dev/null
+++ b/tests/ref/seek/acodec-adpcm-swf-trellis
@@ -0,0 +1,49 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    196 size:  2053
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    196 size:  2053
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.858000 pts: 1.858000 pos:  82956 size:  2053
+ret: 0         st: 0 flags:0  ts: 0.788000
+ret: 0         st: 0 flags:1 dts: 0.789000 pts: 0.789000 pos:  35369 size:  2053
+ret:-1         st: 0 flags:1  ts:-0.317000
+ret: 0         st:-1 flags:0  ts: 2.576668
+ret: 0         st: 0 flags:1 dts: 2.601000 pts: 2.601000 pos: 116060 size:  2053
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  64335 size:  2053
+ret: 0         st: 0 flags:0  ts: 0.365000
+ret: 0         st: 0 flags:1 dts: 0.372000 pts: 0.372000 pos:  16748 size:  2053
+ret:-1         st: 0 flags:1  ts:-0.741000
+ret: 0         st:-1 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1 dts: 2.183000 pts: 2.183000 pos:  97439 size:  2053
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.022000 pts: 1.022000 pos:  45714 size:  2053
+ret: 0         st: 0 flags:0  ts:-0.058000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    196 size:  2053
+ret: 0         st: 0 flags:1  ts: 2.836000
+ret: 0         st: 0 flags:1 dts: 2.833000 pts: 2.833000 pos: 126405 size:  2053
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.765000 pts: 1.765000 pos:  78818 size:  2053
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.604000 pts: 0.604000 pos:  27093 size:  2053
+ret: 0         st: 0 flags:0  ts:-0.482000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    196 size:  2053
+ret: 0         st: 0 flags:1  ts: 2.413000
+ret: 0         st: 0 flags:1 dts: 2.368000 pts: 2.368000 pos: 105715 size:  2053
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.347000 pts: 1.347000 pos:  60197 size:  2053
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.186000 pts: 0.186000 pos:   8472 size:  2053
+ret: 0         st: 0 flags:0  ts:-0.905000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    196 size:  2053
+ret: 0         st: 0 flags:1  ts: 1.989000
+ret: 0         st: 0 flags:1 dts: 1.950000 pts: 1.950000 pos:  87094 size:  2053
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.929000 pts: 0.929000 pos:  41576 size:  2053
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:0  ts: 2.672000
+ret: 0         st: 0 flags:1 dts: 2.694000 pts: 2.694000 pos: 120198 size:  2053
+ret: 0         st: 0 flags:1  ts: 1.566000
+ret: 0         st: 0 flags:1 dts: 1.533000 pts: 1.533000 pos:  68473 size:  2053
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.464000 pts: 0.464000 pos:  20886 size:  2053
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/acodec-adpcm-yamaha-trellis b/tests/ref/seek/acodec-adpcm-yamaha-trellis
new file mode 100644
index 0000000000..5cbfaed73e
--- /dev/null
+++ b/tests/ref/seek/acodec-adpcm-yamaha-trellis
@@ -0,0 +1,53 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     58 size:  4096
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     58 size:  4096
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.856009 pts: 1.856009 pos:  29754 size:  4096
+ret: 0         st: 0 flags:0  ts: 0.788345
+ret: 0         st: 0 flags:1 dts: 0.831995 pts: 0.831995 pos:  13370 size:  4096
+ret: 0         st: 0 flags:1  ts:-0.317506
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     58 size:  4096
+ret: 0         st:-1 flags:0  ts: 2.576668
+ret: 0         st: 0 flags:1 dts: 2.623991 pts: 2.623991 pos:  42042 size:  4096
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.408005 pts: 1.408005 pos:  22586 size:  4096
+ret: 0         st: 0 flags:0  ts: 0.365011
+ret: 0         st: 0 flags:1 dts: 0.383991 pts: 0.383991 pos:   6202 size:  4096
+ret: 0         st: 0 flags:1  ts:-0.740839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     58 size:  4096
+ret: 0         st:-1 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1 dts: 2.176009 pts: 2.176009 pos:  34874 size:  4096
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.023991 pts: 1.023991 pos:  16442 size:  4096
+ret: 0         st: 0 flags:0  ts:-0.058322
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     58 size:  4096
+ret: 0         st: 0 flags:1  ts: 2.835828
+ret: 0         st: 0 flags:1 dts: 2.816009 pts: 2.816009 pos:  45114 size:  4096
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.791995 pts: 1.791995 pos:  28730 size:  4096
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.576009 pts: 0.576009 pos:   9274 size:  4096
+ret: 0         st: 0 flags:0  ts:-0.481655
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     58 size:  4096
+ret: 0         st: 0 flags:1  ts: 2.412494
+ret: 0         st: 0 flags:1 dts: 2.368005 pts: 2.368005 pos:  37946 size:  4096
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.343991 pts: 1.343991 pos:  21562 size:  4096
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.191995 pts: 0.191995 pos:   3130 size:  4096
+ret: 0         st: 0 flags:0  ts:-0.904989
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     58 size:  4096
+ret: 0         st: 0 flags:1  ts: 1.989184
+ret: 0         st: 0 flags:1 dts: 1.983991 pts: 1.983991 pos:  31802 size:  4096
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.896009 pts: 0.896009 pos:  14394 size:  4096
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     58 size:  4096
+ret: 0         st: 0 flags:0  ts: 2.671678
+ret: 0         st: 0 flags:1 dts: 2.688005 pts: 2.688005 pos:  43066 size:  4096
+ret: 0         st: 0 flags:1  ts: 1.565850
+ret: 0         st: 0 flags:1 dts: 1.536009 pts: 1.536009 pos:  24634 size:  4096
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.511995 pts: 0.511995 pos:   8250 size:  4096
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     58 size:  4096
diff --git a/tests/ref/seek/acodec-flac b/tests/ref/seek/acodec-flac
index 15ab0d2ee3..f6add9abd2 100644
--- a/tests/ref/seek/acodec-flac
+++ b/tests/ref/seek/acodec-flac
@@ -1,49 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8255 size:   614
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8256 size:   614
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8255 size:   614
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8256 size:   614
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880816 pts: 1.880816 pos:  86741 size:  2191
+ret: 0         st: 0 flags:1 dts: 1.880816 pts: 1.880816 pos:  86742 size:  2191
 ret: 0         st: 0 flags:0  ts: 0.788345
-ret: 0         st: 0 flags:1 dts: 0.809796 pts: 0.809796 pos:  27365 size:   615
-ret:-1         st: 0 flags:1  ts:-0.317506
+ret: 0         st: 0 flags:1 dts: 0.809796 pts: 0.809796 pos:  27366 size:   615
+ret: 0         st: 0 flags:1  ts:-0.317506
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8256 size:   614
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 2.586122 pts: 2.586122 pos: 145605 size:  2384
+ret: 0         st: 0 flags:1 dts: 2.586122 pts: 2.586122 pos: 145606 size:  2384
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.462857 pts: 1.462857 pos:  53387 size:  1851
+ret: 0         st: 0 flags:1 dts: 1.462857 pts: 1.462857 pos:  53388 size:  1851
 ret: 0         st: 0 flags:0  ts: 0.365011
-ret: 0         st: 0 flags:1 dts: 0.365714 pts: 0.365714 pos:  16889 size:   614
-ret:-1         st: 0 flags:1  ts:-0.740839
+ret: 0         st: 0 flags:1 dts: 0.365714 pts: 0.365714 pos:  16890 size:   614
+ret: 0         st: 0 flags:1  ts:-0.740839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8256 size:   614
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 2.168163 pts: 2.168163 pos: 110530 size:  2143
+ret: 0         st: 0 flags:1 dts: 2.168163 pts: 2.168163 pos: 110531 size:  2143
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.044898 pts: 1.044898 pos:  32879 size:   579
+ret: 0         st: 0 flags:1 dts: 1.044898 pts: 1.044898 pos:  32880 size:   579
 ret: 0         st: 0 flags:0  ts:-0.058322
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8255 size:   614
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8256 size:   614
 ret: 0         st: 0 flags:1  ts: 2.835828
-ret: 0         st: 0 flags:1 dts: 2.821224 pts: 2.821224 pos: 167111 size:  2391
+ret: 0         st: 0 flags:1 dts: 2.821224 pts: 2.821224 pos: 167112 size:  2391
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.750204 pts: 1.750204 pos:  75787 size:  2191
+ret: 0         st: 0 flags:1 dts: 1.750204 pts: 1.750204 pos:  75788 size:  2191
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.600816 pts: 0.600816 pos:  22445 size:   616
+ret: 0         st: 0 flags:1 dts: 0.600816 pts: 0.600816 pos:  22446 size:   616
 ret: 0         st: 0 flags:0  ts:-0.481655
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8255 size:   614
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8256 size:   614
 ret: 0         st: 0 flags:1  ts: 2.412494
-ret: 0         st: 0 flags:1 dts: 2.403265 pts: 2.403265 pos: 129792 size:  2138
+ret: 0         st: 0 flags:1 dts: 2.403265 pts: 2.403265 pos: 129793 size:  2138
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.332245 pts: 1.332245 pos:  44811 size:  1609
+ret: 0         st: 0 flags:1 dts: 1.332245 pts: 1.332245 pos:  44812 size:  1609
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.182857 pts: 0.182857 pos:  12571 size:   628
+ret: 0         st: 0 flags:1 dts: 0.182857 pts: 0.182857 pos:  12572 size:   628
 ret: 0         st: 0 flags:0  ts:-0.904989
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8255 size:   614
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8256 size:   614
 ret: 0         st: 0 flags:1  ts: 1.989184
-ret: 0         st: 0 flags:1 dts: 1.985306 pts: 1.985306 pos:  95507 size:  2169
+ret: 0         st: 0 flags:1 dts: 1.985306 pts: 1.985306 pos:  95508 size:  2169
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.888163 pts: 0.888163 pos:  29210 size:   620
-ret:-1         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts: 0.888163 pts: 0.888163 pos:  29211 size:   620
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8256 size:   614
 ret: 0         st: 0 flags:0  ts: 2.671678
-ret: 0         st: 0 flags:1 dts: 2.690612 pts: 2.690612 pos: 155153 size:  2394
+ret: 0         st: 0 flags:1 dts: 2.690612 pts: 2.690612 pos: 155154 size:  2394
 ret: 0         st: 0 flags:1  ts: 1.565850
-ret: 0         st: 0 flags:1 dts: 1.541224 pts: 1.541224 pos:  59081 size:  1974
+ret: 0         st: 0 flags:1 dts: 1.541224 pts: 1.541224 pos:  59082 size:  1974
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.470204 pts: 0.470204 pos:  19352 size:   608
-ret:-1         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.470204 pts: 0.470204 pos:  19353 size:   608
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   8256 size:   614
diff --git a/tests/ref/seek/acodec-pcm-f32be b/tests/ref/seek/acodec-pcm-f32be
index 886356a1a2..b838262b58 100644
--- a/tests/ref/seek/acodec-pcm-f32be
+++ b/tests/ref/seek/acodec-pcm-f32be
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  8192
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  8192
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.894172 pts: 1.894172 pos: 668288 size:  8192
+ret: 0         st: 0 flags:1 dts: 1.894172 pts: 1.894172 pos: 668296 size:  8192
 ret: 0         st: 0 flags:0  ts: 0.788345
-ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos: 278152 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos: 278160 size:  8192
 ret: 0         st: 0 flags:1  ts:-0.317506
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  8192
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 2.576667 pts: 2.576667 pos: 909072 size:  8192
+ret: 0         st: 0 flags:1 dts: 2.576667 pts: 2.576667 pos: 909080 size:  8192
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.470839 pts: 1.470839 pos: 518936 size:  8192
+ret: 0         st: 0 flags:1 dts: 1.470839 pts: 1.470839 pos: 518944 size:  8192
 ret: 0         st: 0 flags:0  ts: 0.365011
-ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos: 128800 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos: 128808 size:  8192
 ret: 0         st: 0 flags:1  ts:-0.740839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  8192
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 2.153333 pts: 2.153333 pos: 759720 size:  8192
+ret: 0         st: 0 flags:1 dts: 2.153333 pts: 2.153333 pos: 759728 size:  8192
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.047506 pts: 1.047506 pos: 369584 size:  8192
+ret: 0         st: 0 flags:1 dts: 1.047506 pts: 1.047506 pos: 369592 size:  8192
 ret: 0         st: 0 flags:0  ts:-0.058322
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  8192
 ret: 0         st: 0 flags:1  ts: 2.835828
-ret: 0         st: 0 flags:1 dts: 2.835828 pts: 2.835828 pos:1000504 size:  8192
+ret: 0         st: 0 flags:1 dts: 2.835828 pts: 2.835828 pos:1000512 size:  8192
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.730000 pts: 1.730000 pos: 610368 size:  8192
+ret: 0         st: 0 flags:1 dts: 1.730000 pts: 1.730000 pos: 610376 size:  8192
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos: 220232 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos: 220240 size:  8192
 ret: 0         st: 0 flags:0  ts:-0.481655
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  8192
 ret: 0         st: 0 flags:1  ts: 2.412494
-ret: 0         st: 0 flags:1 dts: 2.412494 pts: 2.412494 pos: 851152 size:  8192
+ret: 0         st: 0 flags:1 dts: 2.412494 pts: 2.412494 pos: 851160 size:  8192
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.306667 pts: 1.306667 pos: 461016 size:  8192
+ret: 0         st: 0 flags:1 dts: 1.306667 pts: 1.306667 pos: 461024 size:  8192
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  70880 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  70888 size:  8192
 ret: 0         st: 0 flags:0  ts:-0.904989
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  8192
 ret: 0         st: 0 flags:1  ts: 1.989184
-ret: 0         st: 0 flags:1 dts: 1.989184 pts: 1.989184 pos: 701808 size:  8192
+ret: 0         st: 0 flags:1 dts: 1.989184 pts: 1.989184 pos: 701816 size:  8192
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos: 311664 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos: 311672 size:  8192
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  8192
 ret: 0         st: 0 flags:0  ts: 2.671678
-ret: 0         st: 0 flags:1 dts: 2.671678 pts: 2.671678 pos: 942592 size:  8192
+ret: 0         st: 0 flags:1 dts: 2.671678 pts: 2.671678 pos: 942600 size:  8192
 ret: 0         st: 0 flags:1  ts: 1.565850
-ret: 0         st: 0 flags:1 dts: 1.565850 pts: 1.565850 pos: 552456 size:  8192
+ret: 0         st: 0 flags:1 dts: 1.565850 pts: 1.565850 pos: 552464 size:  8192
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos: 162312 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos: 162320 size:  8192
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  8192
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  8192
diff --git a/tests/ref/seek/acodec-pcm-f64be b/tests/ref/seek/acodec-pcm-f64be
index 9be3b4ec16..82223517d5 100644
--- a/tests/ref/seek/acodec-pcm-f64be
+++ b/tests/ref/seek/acodec-pcm-f64be
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size: 16384
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size: 16384
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.894172 pts: 1.894172 pos:1336552 size: 16384
+ret: 0         st: 0 flags:1 dts: 1.894172 pts: 1.894172 pos:1336560 size: 16384
 ret: 0         st: 0 flags:0  ts: 0.788345
-ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos: 556280 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos: 556288 size: 16384
 ret: 0         st: 0 flags:1  ts:-0.317506
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size: 16384
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 2.576667 pts: 2.576667 pos:1818120 size: 16384
+ret: 0         st: 0 flags:1 dts: 2.576667 pts: 2.576667 pos:1818128 size: 16384
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.470839 pts: 1.470839 pos:1037848 size: 16384
+ret: 0         st: 0 flags:1 dts: 1.470839 pts: 1.470839 pos:1037856 size: 16384
 ret: 0         st: 0 flags:0  ts: 0.365011
-ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos: 257576 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos: 257584 size: 16384
 ret: 0         st: 0 flags:1  ts:-0.740839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size: 16384
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 2.153333 pts: 2.153333 pos:1519416 size: 16384
+ret: 0         st: 0 flags:1 dts: 2.153333 pts: 2.153333 pos:1519424 size: 16384
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.047506 pts: 1.047506 pos: 739144 size: 16384
+ret: 0         st: 0 flags:1 dts: 1.047506 pts: 1.047506 pos: 739152 size: 16384
 ret: 0         st: 0 flags:0  ts:-0.058322
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size: 16384
 ret: 0         st: 0 flags:1  ts: 2.835828
-ret: 0         st: 0 flags:1 dts: 2.835828 pts: 2.835828 pos:2000984 size: 16384
+ret: 0         st: 0 flags:1 dts: 2.835828 pts: 2.835828 pos:2000992 size: 16384
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.730000 pts: 1.730000 pos:1220712 size: 16384
+ret: 0         st: 0 flags:1 dts: 1.730000 pts: 1.730000 pos:1220720 size: 16384
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos: 440440 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos: 440448 size: 16384
 ret: 0         st: 0 flags:0  ts:-0.481655
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size: 16384
 ret: 0         st: 0 flags:1  ts: 2.412494
-ret: 0         st: 0 flags:1 dts: 2.412494 pts: 2.412494 pos:1702280 size: 16384
+ret: 0         st: 0 flags:1 dts: 2.412494 pts: 2.412494 pos:1702288 size: 16384
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.306667 pts: 1.306667 pos: 922008 size: 16384
+ret: 0         st: 0 flags:1 dts: 1.306667 pts: 1.306667 pos: 922016 size: 16384
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos: 141736 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos: 141744 size: 16384
 ret: 0         st: 0 flags:0  ts:-0.904989
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size: 16384
 ret: 0         st: 0 flags:1  ts: 1.989184
-ret: 0         st: 0 flags:1 dts: 1.989184 pts: 1.989184 pos:1403592 size: 16384
+ret: 0         st: 0 flags:1 dts: 1.989184 pts: 1.989184 pos:1403600 size: 16384
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos: 623304 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos: 623312 size: 16384
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size: 16384
 ret: 0         st: 0 flags:0  ts: 2.671678
-ret: 0         st: 0 flags:1 dts: 2.671678 pts: 2.671678 pos:1885160 size: 16384
+ret: 0         st: 0 flags:1 dts: 2.671678 pts: 2.671678 pos:1885168 size: 16384
 ret: 0         st: 0 flags:1  ts: 1.565850
-ret: 0         st: 0 flags:1 dts: 1.565850 pts: 1.565850 pos:1104888 size: 16384
+ret: 0         st: 0 flags:1 dts: 1.565850 pts: 1.565850 pos:1104896 size: 16384
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos: 324600 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos: 324608 size: 16384
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size: 16384
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size: 16384
diff --git a/tests/ref/seek/acodec-pcm-s16le b/tests/ref/seek/acodec-pcm-s16le
index 4f1ffc5acd..41acc98d8d 100644
--- a/tests/ref/seek/acodec-pcm-s16le
+++ b/tests/ref/seek/acodec-pcm-s16le
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.894172 pts: 1.894172 pos: 334178 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.894172 pts: 1.894172 pos: 334176 size:  4096
 ret: 0         st: 0 flags:0  ts: 0.788345
-ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos: 139110 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos: 139108 size:  4096
 ret: 0         st: 0 flags:1  ts:-0.317506
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 2.576667 pts: 2.576667 pos: 454570 size:  4096
+ret: 0         st: 0 flags:1 dts: 2.576667 pts: 2.576667 pos: 454568 size:  4096
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.470839 pts: 1.470839 pos: 259502 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.470839 pts: 1.470839 pos: 259500 size:  4096
 ret: 0         st: 0 flags:0  ts: 0.365011
-ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos:  64434 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos:  64432 size:  4096
 ret: 0         st: 0 flags:1  ts:-0.740839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 2.153333 pts: 2.153333 pos: 379894 size:  4096
+ret: 0         st: 0 flags:1 dts: 2.153333 pts: 2.153333 pos: 379892 size:  4096
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.047506 pts: 1.047506 pos: 184826 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.047506 pts: 1.047506 pos: 184824 size:  4096
 ret: 0         st: 0 flags:0  ts:-0.058322
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st: 0 flags:1  ts: 2.835828
-ret: 0         st: 0 flags:1 dts: 2.835828 pts: 2.835828 pos: 500286 size:  4096
+ret: 0         st: 0 flags:1 dts: 2.835828 pts: 2.835828 pos: 500284 size:  4096
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.730000 pts: 1.730000 pos: 305218 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.730000 pts: 1.730000 pos: 305216 size:  4096
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos: 110150 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos: 110148 size:  4096
 ret: 0         st: 0 flags:0  ts:-0.481655
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st: 0 flags:1  ts: 2.412494
-ret: 0         st: 0 flags:1 dts: 2.412494 pts: 2.412494 pos: 425610 size:  4096
+ret: 0         st: 0 flags:1 dts: 2.412494 pts: 2.412494 pos: 425608 size:  4096
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.306667 pts: 1.306667 pos: 230542 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.306667 pts: 1.306667 pos: 230540 size:  4096
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  35474 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  35472 size:  4096
 ret: 0         st: 0 flags:0  ts:-0.904989
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st: 0 flags:1  ts: 1.989184
-ret: 0         st: 0 flags:1 dts: 1.989184 pts: 1.989184 pos: 350938 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.989184 pts: 1.989184 pos: 350936 size:  4096
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos: 155866 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos: 155864 size:  4096
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st: 0 flags:0  ts: 2.671678
-ret: 0         st: 0 flags:1 dts: 2.671678 pts: 2.671678 pos: 471330 size:  4096
+ret: 0         st: 0 flags:1 dts: 2.671678 pts: 2.671678 pos: 471328 size:  4096
 ret: 0         st: 0 flags:1  ts: 1.565850
-ret: 0         st: 0 flags:1 dts: 1.565850 pts: 1.565850 pos: 276262 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.565850 pts: 1.565850 pos: 276260 size:  4096
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  81190 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  81188 size:  4096
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
diff --git a/tests/ref/seek/acodec-pcm-u8 b/tests/ref/seek/acodec-pcm-u8
index 8348916432..afa33519d7 100644
--- a/tests/ref/seek/acodec-pcm-u8
+++ b/tests/ref/seek/acodec-pcm-u8
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.894172 pts: 1.894172 pos: 167112 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.894172 pts: 1.894172 pos: 167110 size:  4096
 ret: 0         st: 0 flags:0  ts: 0.788345
-ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos:  69578 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos:  69576 size:  4096
 ret: 0         st: 0 flags:1  ts:-0.317506
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 2.576667 pts: 2.576667 pos: 227308 size:  4096
+ret: 0         st: 0 flags:1 dts: 2.576667 pts: 2.576667 pos: 227306 size:  4096
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.470839 pts: 1.470839 pos: 129774 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.470839 pts: 1.470839 pos: 129772 size:  4096
 ret: 0         st: 0 flags:0  ts: 0.365011
-ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos:  32240 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos:  32238 size:  4096
 ret: 0         st: 0 flags:1  ts:-0.740839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 2.153333 pts: 2.153333 pos: 189970 size:  4096
+ret: 0         st: 0 flags:1 dts: 2.153333 pts: 2.153333 pos: 189968 size:  4096
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.047506 pts: 1.047506 pos:  92436 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.047506 pts: 1.047506 pos:  92434 size:  4096
 ret: 0         st: 0 flags:0  ts:-0.058322
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st: 0 flags:1  ts: 2.835828
-ret: 0         st: 0 flags:1 dts: 2.835828 pts: 2.835828 pos: 250166 size:  4096
+ret: 0         st: 0 flags:1 dts: 2.835828 pts: 2.835828 pos: 250164 size:  4096
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.730000 pts: 1.730000 pos: 152632 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.730000 pts: 1.730000 pos: 152630 size:  4096
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos:  55098 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos:  55096 size:  4096
 ret: 0         st: 0 flags:0  ts:-0.481655
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st: 0 flags:1  ts: 2.412494
-ret: 0         st: 0 flags:1 dts: 2.412494 pts: 2.412494 pos: 212828 size:  4096
+ret: 0         st: 0 flags:1 dts: 2.412494 pts: 2.412494 pos: 212826 size:  4096
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.306667 pts: 1.306667 pos: 115294 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.306667 pts: 1.306667 pos: 115292 size:  4096
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  17760 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  17758 size:  4096
 ret: 0         st: 0 flags:0  ts:-0.904989
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st: 0 flags:1  ts: 1.989184
-ret: 0         st: 0 flags:1 dts: 1.989184 pts: 1.989184 pos: 175492 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.989184 pts: 1.989184 pos: 175490 size:  4096
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  77956 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  77954 size:  4096
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
 ret: 0         st: 0 flags:0  ts: 2.671678
-ret: 0         st: 0 flags:1 dts: 2.671678 pts: 2.671678 pos: 235688 size:  4096
+ret: 0         st: 0 flags:1 dts: 2.671678 pts: 2.671678 pos: 235686 size:  4096
 ret: 0         st: 0 flags:1  ts: 1.565850
-ret: 0         st: 0 flags:1 dts: 1.565850 pts: 1.565850 pos: 138154 size:  4096
+ret: 0         st: 0 flags:1 dts: 1.565850 pts: 1.565850 pos: 138152 size:  4096
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  40618 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  40616 size:  4096
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  4096
diff --git a/tests/ref/seek/cache-pipe b/tests/ref/seek/cache-pipe
new file mode 100644
index 0000000000..ebe5946601
--- /dev/null
+++ b/tests/ref/seek/cache-pipe
@@ -0,0 +1,49 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.880816 pts: 1.880816 pos:  31544 size:   418
+ret: 0         st: 0 flags:0  ts: 0.788334
+ret: 0         st: 0 flags:1 dts: 0.809796 pts: 0.809796 pos:  14407 size:   418
+ret:-1         st: 0 flags:1  ts:-0.317499
+ret: 0         st:-1 flags:0  ts: 2.576668
+ret: 0         st: 0 flags:1 dts: 2.586122 pts: 2.586122 pos:  42828 size:   418
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.462857 pts: 1.462857 pos:  24856 size:   418
+ret: 0         st: 0 flags:0  ts: 0.365002
+ret: 0         st: 0 flags:1 dts: 0.365714 pts: 0.365714 pos:   7302 size:   418
+ret:-1         st: 0 flags:1  ts:-0.740831
+ret: 0         st:-1 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1 dts: 2.168163 pts: 2.168163 pos:  36141 size:   418
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.044898 pts: 1.044898 pos:  18169 size:   418
+ret: 0         st: 0 flags:0  ts:-0.058330
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st: 0 flags:1  ts: 2.835837
+ret: 0         st: 0 flags:1 dts: 2.821224 pts: 2.821224 pos:  46590 size:   418
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.750204 pts: 1.750204 pos:  29454 size:   418
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.600816 pts: 0.600816 pos:  11064 size:   418
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 0 flags:1 dts: 2.403265 pts: 2.403265 pos:  39903 size:   418
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.332245 pts: 1.332245 pos:  22766 size:   418
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.182857 pts: 0.182857 pos:   4376 size:   418
+ret: 0         st: 0 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st: 0 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 1.985306 pts: 1.985306 pos:  33215 size:   418
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.888163 pts: 0.888163 pos:  15661 size:   418
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1 dts: 2.690612 pts: 2.690612 pos:  44500 size:   418
+ret: 0         st: 0 flags:1  ts: 1.565841
+ret: 0         st: 0 flags:1 dts: 1.541224 pts: 1.541224 pos:  26110 size:   418
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.470204 pts: 0.470204 pos:   8974 size:   418
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/extra-mp3 b/tests/ref/seek/extra-mp3
new file mode 100644
index 0000000000..fdfb1a7c66
--- /dev/null
+++ b/tests/ref/seek/extra-mp3
@@ -0,0 +1,53 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.880816 pts: 1.880816 pos:  31544 size:   418
+ret: 0         st: 0 flags:0  ts: 0.788334
+ret: 0         st: 0 flags:1 dts: 0.809796 pts: 0.809796 pos:  14407 size:   418
+ret: 0         st: 0 flags:1  ts:-0.317499
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st:-1 flags:0  ts: 2.576668
+ret: 0         st: 0 flags:1 dts: 2.586122 pts: 2.586122 pos:  42828 size:   418
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.462857 pts: 1.462857 pos:  24856 size:   418
+ret: 0         st: 0 flags:0  ts: 0.365002
+ret: 0         st: 0 flags:1 dts: 0.365714 pts: 0.365714 pos:   7302 size:   418
+ret: 0         st: 0 flags:1  ts:-0.740831
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st:-1 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1 dts: 2.168163 pts: 2.168163 pos:  36141 size:   418
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.044898 pts: 1.044898 pos:  18169 size:   418
+ret: 0         st: 0 flags:0  ts:-0.058330
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st: 0 flags:1  ts: 2.835837
+ret: 0         st: 0 flags:1 dts: 2.821224 pts: 2.821224 pos:  46590 size:   418
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.750204 pts: 1.750204 pos:  29454 size:   418
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.600816 pts: 0.600816 pos:  11064 size:   418
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 0 flags:1 dts: 2.403265 pts: 2.403265 pos:  39903 size:   418
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.332245 pts: 1.332245 pos:  22766 size:   418
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.182857 pts: 0.182857 pos:   4376 size:   418
+ret: 0         st: 0 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st: 0 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 1.985306 pts: 1.985306 pos:  33215 size:   418
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.888163 pts: 0.888163 pos:  15661 size:   418
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
+ret: 0         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1 dts: 2.690612 pts: 2.690612 pos:  44500 size:   418
+ret: 0         st: 0 flags:1  ts: 1.565841
+ret: 0         st: 0 flags:1 dts: 1.567347 pts: 1.567347 pos:  26528 size:   418
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.470204 pts: 0.470204 pos:   8974 size:   418
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1451 size:   417
diff --git a/tests/ref/seek/extra-mp4 b/tests/ref/seek/extra-mp4
new file mode 100644
index 0000000000..c25544c095
--- /dev/null
+++ b/tests/ref/seek/extra-mp4
@@ -0,0 +1,134 @@
+ret: 0         st: 0 flags:1 dts:-0.033333 pts: 0.000000 pos:   1287 size:   183
+ret: 0         st: 0 flags:0 dts: 0.000000 pts: 0.033333 pos:   1470 size:    24
+ret: 0         st: 0 flags:0 dts: 0.033333 pts: 0.066667 pos:   1494 size:  6779
+ret: 0         st: 0 flags:0 dts: 0.066667 pts: 0.100000 pos:   8273 size: 11041
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts:-0.033333 pts: 0.000000 pos:   1287 size:   183
+ret: 0         st: 0 flags:0 dts: 0.000000 pts: 0.033333 pos:   1470 size:    24
+ret: 0         st: 0 flags:0 dts: 0.033333 pts: 0.066667 pos:   1494 size:  6779
+ret: 0         st: 0 flags:0 dts: 0.066667 pts: 0.100000 pos:   8273 size: 11041
+ret: 0         st:-1 flags:1  ts: 101.894167
+ret: 0         st: 0 flags:1 dts: 101.300000 pts: 101.333333 pos:10982311 size: 67237
+ret: 0         st: 0 flags:0 dts: 101.333333 pts: 101.433333 pos:11049548 size:  3524
+ret: 0         st: 0 flags:0 dts: 101.366667 pts: 101.366667 pos:11053072 size:   562
+ret: 0         st: 0 flags:0 dts: 101.400000 pts: 101.400000 pos:11053634 size:   599
+ret: 0         st: 0 flags:0  ts: 24.788333
+ret: 0         st: 0 flags:1 dts: 25.300000 pts: 25.333333 pos:2607246 size: 40273
+ret: 0         st: 0 flags:0 dts: 25.333333 pts: 25.433333 pos:2647519 size:  2959
+ret: 0         st: 0 flags:0 dts: 25.366667 pts: 25.366667 pos:2650478 size:   197
+ret: 0         st: 0 flags:0 dts: 25.400000 pts: 25.400000 pos:2650675 size:   230
+ret: 0         st: 0 flags:1  ts: 127.682500
+ret: 0         st: 0 flags:1 dts: 126.633333 pts: 126.666667 pos:13359975 size: 68741
+ret: 0         st: 0 flags:0 dts: 126.666667 pts: 126.766667 pos:13428716 size:  2914
+ret: 0         st: 0 flags:0 dts: 126.700000 pts: 126.700000 pos:13431630 size:   781
+ret: 0         st: 0 flags:0 dts: 126.733333 pts: 126.733333 pos:13432411 size:   817
+ret: 0         st:-1 flags:0  ts: 50.576668
+ret: 0         st: 0 flags:1 dts: 50.600000 pts: 50.633333 pos:5858254 size: 67903
+ret: 0         st: 0 flags:0 dts: 50.633333 pts: 50.733333 pos:5926157 size:  1307
+ret: 0         st: 0 flags:0 dts: 50.666667 pts: 50.666667 pos:5927464 size:   150
+ret: 0         st: 0 flags:0 dts: 50.700000 pts: 50.700000 pos:5927614 size:   176
+ret: 0         st:-1 flags:1  ts: 153.470835
+ret: 0         st: 0 flags:1 dts: 153.466667 pts: 153.500000 pos:15867700 size: 96169
+ret: 0         st: 0 flags:0 dts: 153.500000 pts: 153.533333 pos:15963869 size:   785
+ret: 0         st: 0 flags:0 dts: 153.533333 pts: 153.633333 pos:15964654 size:  3135
+ret: 0         st: 0 flags:0 dts: 153.566667 pts: 153.566667 pos:15967789 size:   859
+ret: 0         st: 0 flags:0  ts: 76.365000
+ret: 0         st: 0 flags:1 dts: 77.833333 pts: 77.866667 pos:8659657 size: 41182
+ret: 0         st: 0 flags:0 dts: 77.866667 pts: 77.966667 pos:8700839 size:  4197
+ret: 0         st: 0 flags:0 dts: 77.900000 pts: 77.900000 pos:8705036 size:   653
+ret: 0         st: 0 flags:0 dts: 77.933333 pts: 77.933333 pos:8705689 size:   751
+ret: 0         st: 0 flags:1  ts:-0.740833
+ret: 0         st: 0 flags:1 dts:-0.033333 pts: 0.000000 pos:   1287 size:   183
+ret: 0         st: 0 flags:0 dts: 0.000000 pts: 0.033333 pos:   1470 size:    24
+ret: 0         st: 0 flags:0 dts: 0.033333 pts: 0.066667 pos:   1494 size:  6779
+ret: 0         st: 0 flags:0 dts: 0.066667 pts: 0.100000 pos:   8273 size: 11041
+ret: 0         st:-1 flags:0  ts: 102.153336
+ret: 0         st: 0 flags:1 dts: 104.066667 pts: 104.100000 pos:11116461 size:112929
+ret: 0         st: 0 flags:0 dts: 104.100000 pts: 104.133333 pos:11229390 size:   585
+ret: 0         st: 0 flags:0 dts: 104.133333 pts: 104.166667 pos:11229975 size:   797
+ret: 0         st: 0 flags:0 dts: 104.166667 pts: 104.200000 pos:11230772 size:   810
+ret: 0         st:-1 flags:1  ts: 25.047503
+ret: 0         st: 0 flags:1 dts: 20.233333 pts: 20.266667 pos:2223959 size: 51823
+ret: 0         st: 0 flags:0 dts: 20.266667 pts: 20.300000 pos:2275782 size:   488
+ret: 0         st: 0 flags:0 dts: 20.300000 pts: 20.400000 pos:2276270 size:   670
+ret: 0         st: 0 flags:0 dts: 20.333333 pts: 20.333333 pos:2276940 size:    84
+ret: 0         st: 0 flags:0  ts: 127.941667
+ret: 0         st: 0 flags:1 dts: 131.233333 pts: 131.266667 pos:13727953 size: 62229
+ret: 0         st: 0 flags:0 dts: 131.266667 pts: 131.366667 pos:13790182 size:  2349
+ret: 0         st: 0 flags:0 dts: 131.300000 pts: 131.300000 pos:13792531 size:   571
+ret: 0         st: 0 flags:0 dts: 131.333333 pts: 131.333333 pos:13793102 size:  1190
+ret: 0         st: 0 flags:1  ts: 50.835833
+ret: 0         st: 0 flags:1 dts: 50.600000 pts: 50.633333 pos:5858254 size: 67903
+ret: 0         st: 0 flags:0 dts: 50.633333 pts: 50.733333 pos:5926157 size:  1307
+ret: 0         st: 0 flags:0 dts: 50.666667 pts: 50.666667 pos:5927464 size:   150
+ret: 0         st: 0 flags:0 dts: 50.700000 pts: 50.700000 pos:5927614 size:   176
+ret: 0         st:-1 flags:0  ts: 153.730004
+ret: 0         st: 0 flags:1 dts: 157.033333 pts: 157.066667 pos:16225365 size: 82738
+ret: 0         st: 0 flags:0 dts: 157.066667 pts: 157.166667 pos:16308103 size:  2273
+ret: 0         st: 0 flags:0 dts: 157.100000 pts: 157.100000 pos:16310376 size:   350
+ret: 0         st: 0 flags:0 dts: 157.133333 pts: 157.133333 pos:16310726 size:   337
+ret: 0         st:-1 flags:1  ts: 76.624171
+ret: 0         st: 0 flags:1 dts: 75.966667 pts: 76.000000 pos:8520178 size: 94395
+ret: 0         st: 0 flags:0 dts: 76.000000 pts: 76.100000 pos:8614573 size:   483
+ret: 0         st: 0 flags:0 dts: 76.033333 pts: 76.033333 pos:8615056 size:    37
+ret: 0         st: 0 flags:0 dts: 76.066667 pts: 76.066667 pos:8615093 size:    56
+ret: 0         st: 0 flags:0  ts:-0.481667
+ret: 0         st: 0 flags:1 dts:-0.033333 pts: 0.000000 pos:   1287 size:   183
+ret: 0         st: 0 flags:0 dts: 0.000000 pts: 0.033333 pos:   1470 size:    24
+ret: 0         st: 0 flags:0 dts: 0.033333 pts: 0.066667 pos:   1494 size:  6779
+ret: 0         st: 0 flags:0 dts: 0.066667 pts: 0.100000 pos:   8273 size: 11041
+ret: 0         st: 0 flags:1  ts: 102.412500
+ret: 0         st: 0 flags:1 dts: 101.300000 pts: 101.333333 pos:10982311 size: 67237
+ret: 0         st: 0 flags:0 dts: 101.333333 pts: 101.433333 pos:11049548 size:  3524
+ret: 0         st: 0 flags:0 dts: 101.366667 pts: 101.366667 pos:11053072 size:   562
+ret: 0         st: 0 flags:0 dts: 101.400000 pts: 101.400000 pos:11053634 size:   599
+ret: 0         st:-1 flags:0  ts: 25.306672
+ret: 0         st: 0 flags:1 dts: 27.400000 pts: 27.433333 pos:2674605 size:127383
+ret: 0         st: 0 flags:0 dts: 27.433333 pts: 27.466667 pos:2801988 size:    68
+ret: 0         st: 0 flags:0 dts: 27.466667 pts: 27.500000 pos:2802268 size:  1754
+ret: 0         st: 0 flags:0 dts: 27.500000 pts: 27.533333 pos:2804022 size:  4071
+ret: 0         st:-1 flags:1  ts: 128.200839
+ret: 0         st: 0 flags:1 dts: 127.833333 pts: 127.866667 pos:13514072 size: 67382
+ret: 0         st: 0 flags:0 dts: 127.866667 pts: 127.966667 pos:13581454 size:  2936
+ret: 0         st: 0 flags:0 dts: 127.900000 pts: 127.900000 pos:13584390 size:   451
+ret: 0         st: 0 flags:0 dts: 127.933333 pts: 127.933333 pos:13584841 size:   537
+ret: 0         st: 0 flags:0  ts: 51.095011
+ret: 0         st: 0 flags:1 dts: 52.033333 pts: 52.066667 pos:6028050 size:115809
+ret: 0         st: 0 flags:0 dts: 52.066667 pts: 52.166667 pos:6143859 size:  1620
+ret: 0         st: 0 flags:0 dts: 52.100000 pts: 52.100000 pos:6145479 size:    92
+ret: 0         st: 0 flags:0 dts: 52.133333 pts: 52.133333 pos:6145571 size:   533
+ret: 0         st: 0 flags:1  ts: 153.989178
+ret: 0         st: 0 flags:1 dts: 153.466667 pts: 153.500000 pos:15867700 size: 96169
+ret: 0         st: 0 flags:0 dts: 153.500000 pts: 153.533333 pos:15963869 size:   785
+ret: 0         st: 0 flags:0 dts: 153.533333 pts: 153.633333 pos:15964654 size:  3135
+ret: 0         st: 0 flags:0 dts: 153.566667 pts: 153.566667 pos:15967789 size:   859
+ret: 0         st:-1 flags:0  ts: 76.883340
+ret: 0         st: 0 flags:1 dts: 77.833333 pts: 77.866667 pos:8659657 size: 41182
+ret: 0         st: 0 flags:0 dts: 77.866667 pts: 77.966667 pos:8700839 size:  4197
+ret: 0         st: 0 flags:0 dts: 77.900000 pts: 77.900000 pos:8705036 size:   653
+ret: 0         st: 0 flags:0 dts: 77.933333 pts: 77.933333 pos:8705689 size:   751
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts:-0.033333 pts: 0.000000 pos:   1287 size:   183
+ret: 0         st: 0 flags:0 dts: 0.000000 pts: 0.033333 pos:   1470 size:    24
+ret: 0         st: 0 flags:0 dts: 0.033333 pts: 0.066667 pos:   1494 size:  6779
+ret: 0         st: 0 flags:0 dts: 0.066667 pts: 0.100000 pos:   8273 size: 11041
+ret: 0         st: 0 flags:0  ts: 102.671678
+ret: 0         st: 0 flags:1 dts: 104.066667 pts: 104.100000 pos:11116461 size:112929
+ret: 0         st: 0 flags:0 dts: 104.100000 pts: 104.133333 pos:11229390 size:   585
+ret: 0         st: 0 flags:0 dts: 104.133333 pts: 104.166667 pos:11229975 size:   797
+ret: 0         st: 0 flags:0 dts: 104.166667 pts: 104.200000 pos:11230772 size:   810
+ret: 0         st: 0 flags:1  ts: 25.565844
+ret: 0         st: 0 flags:1 dts: 25.300000 pts: 25.333333 pos:2607246 size: 40273
+ret: 0         st: 0 flags:0 dts: 25.333333 pts: 25.433333 pos:2647519 size:  2959
+ret: 0         st: 0 flags:0 dts: 25.366667 pts: 25.366667 pos:2650478 size:   197
+ret: 0         st: 0 flags:0 dts: 25.400000 pts: 25.400000 pos:2650675 size:   230
+ret: 0         st:-1 flags:0  ts: 128.460008
+ret: 0         st: 0 flags:1 dts: 131.233333 pts: 131.266667 pos:13727953 size: 62229
+ret: 0         st: 0 flags:0 dts: 131.266667 pts: 131.366667 pos:13790182 size:  2349
+ret: 0         st: 0 flags:0 dts: 131.300000 pts: 131.300000 pos:13792531 size:   571
+ret: 0         st: 0 flags:0 dts: 131.333333 pts: 131.333333 pos:13793102 size:  1190
+ret: 0         st:-1 flags:1  ts: 51.354175
+ret: 0         st: 0 flags:1 dts: 50.600000 pts: 50.633333 pos:5858254 size: 67903
+ret: 0         st: 0 flags:0 dts: 50.633333 pts: 50.733333 pos:5926157 size:  1307
+ret: 0         st: 0 flags:0 dts: 50.666667 pts: 50.666667 pos:5927464 size:   150
+ret: 0         st: 0 flags:0 dts: 50.700000 pts: 50.700000 pos:5927614 size:   176
diff --git a/tests/ref/seek/lavf-aiff b/tests/ref/seek/lavf-aiff
index 784b1448ae..eb9ada0b79 100644
--- a/tests/ref/seek/lavf-aiff
+++ b/tests/ref/seek/lavf-aiff
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     54 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     70 size:  4096
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     54 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     70 size:  4096
 ret: 0         st:-1 flags:1  ts: 1.894167
 ret:-EOF
 ret: 0         st: 0 flags:0  ts: 0.788345
-ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos:  69586 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos:  69602 size:  4096
 ret: 0         st: 0 flags:1  ts:-0.317506
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     54 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     70 size:  4096
 ret: 0         st:-1 flags:0  ts: 2.576668
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 1.470835
 ret:-EOF
 ret: 0         st: 0 flags:0  ts: 0.365011
-ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos:  32248 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos:  32264 size:  4096
 ret: 0         st: 0 flags:1  ts:-0.740839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     54 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     70 size:  4096
 ret: 0         st:-1 flags:0  ts: 2.153336
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 1.047503
 ret:-EOF
 ret: 0         st: 0 flags:0  ts:-0.058322
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     54 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     70 size:  4096
 ret: 0         st: 0 flags:1  ts: 2.835828
 ret:-EOF
 ret: 0         st:-1 flags:0  ts: 1.730004
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos:  55106 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos:  55122 size:  4096
 ret: 0         st: 0 flags:0  ts:-0.481655
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     54 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     70 size:  4096
 ret: 0         st: 0 flags:1  ts: 2.412494
 ret:-EOF
 ret: 0         st:-1 flags:0  ts: 1.306672
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  17768 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  17784 size:  4096
 ret: 0         st: 0 flags:0  ts:-0.904989
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     54 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     70 size:  4096
 ret: 0         st: 0 flags:1  ts: 1.989184
 ret:-EOF
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  77964 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  77980 size:  4096
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     54 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     70 size:  4096
 ret: 0         st: 0 flags:0  ts: 2.671678
 ret:-EOF
 ret: 0         st: 0 flags:1  ts: 1.565850
 ret:-EOF
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  40626 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  40642 size:  4096
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     54 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     70 size:  4096
diff --git a/tests/ref/seek/lavf-asf b/tests/ref/seek/lavf-asf
index 3da2c739ef..b64bec3ac3 100644
--- a/tests/ref/seek/lavf-asf
+++ b/tests/ref/seek/lavf-asf
@@ -1,53 +1,53 @@
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    693 size:   208
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 1 flags:1 dts: 0.261000 pts: 0.261000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    693 size:   208
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147893 size:   209
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 1 flags:1 dts: 0.732000 pts: 0.732000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147893 size:   209
 ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    693 size:   208
 ret: 0         st: 1 flags:0  ts: 2.577000
-ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330293 size:   209
 ret: 0         st: 1 flags:1  ts: 1.471000
-ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330293 size:   209
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 1 flags:1 dts: 0.261000 pts: 0.261000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147893 size:   209
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    693 size:   208
 ret: 0         st: 0 flags:0  ts: 2.153000
-ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301493 size:   209
 ret: 0         st: 0 flags:1  ts: 1.048000
-ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301493 size:   209
 ret: 0         st: 1 flags:0  ts:-0.058000
-ret: 0         st: 1 flags:1 dts: 0.261000 pts: 0.261000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    693 size:   208
 ret: 0         st: 1 flags:1  ts: 2.836000
-ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330293 size:   209
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301493 size:   209
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    693 size:   208
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    693 size:   208
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 1 flags:1 dts: 0.732000 pts: 0.732000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301493 size:   209
 ret: 0         st: 1 flags:0  ts: 1.307000
-ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330293 size:   209
 ret: 0         st: 1 flags:1  ts: 0.201000
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    693 size:   208
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    693 size:   208
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos: 301493 size:   209
 ret: 0         st: 0 flags:0  ts: 0.883000
-ret: 0         st: 1 flags:1 dts: 0.732000 pts: 0.732000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147893 size:   209
 ret: 0         st: 0 flags:1  ts:-0.222000
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    693 size:   208
 ret: 0         st: 1 flags:0  ts: 2.672000
-ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330293 size:   209
 ret: 0         st: 1 flags:1  ts: 1.566000
-ret: 0         st: 1 flags:1 dts: 0.941000 pts: 0.941000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 330293 size:   209
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 1 flags:1 dts: 0.261000 pts: 0.261000 pos:     -1 size:   209
+ret: 0         st: 1 flags:1 dts: 0.470000 pts: 0.470000 pos: 147893 size:   209
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    693 size:   208
diff --git a/tests/ref/seek/lavf-au b/tests/ref/seek/lavf-au
index a2c57eb786..8edce58f65 100644
--- a/tests/ref/seek/lavf-au
+++ b/tests/ref/seek/lavf-au
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  2048
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  2048
 ret: 0         st:-1 flags:1  ts: 1.894167
 ret:-EOF
 ret: 0         st: 0 flags:0  ts: 0.788345
-ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos:  69556 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos:  69572 size:  2048
 ret: 0         st: 0 flags:1  ts:-0.317506
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  2048
 ret: 0         st:-1 flags:0  ts: 2.576668
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 1.470835
 ret:-EOF
 ret: 0         st: 0 flags:0  ts: 0.365011
-ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos:  32218 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos:  32234 size:  2048
 ret: 0         st: 0 flags:1  ts:-0.740839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  2048
 ret: 0         st:-1 flags:0  ts: 2.153336
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 1.047503
 ret:-EOF
 ret: 0         st: 0 flags:0  ts:-0.058322
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  2048
 ret: 0         st: 0 flags:1  ts: 2.835828
 ret:-EOF
 ret: 0         st:-1 flags:0  ts: 1.730004
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos:  55076 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos:  55092 size:  2048
 ret: 0         st: 0 flags:0  ts:-0.481655
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  2048
 ret: 0         st: 0 flags:1  ts: 2.412494
 ret:-EOF
 ret: 0         st:-1 flags:0  ts: 1.306672
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  17738 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  17754 size:  2048
 ret: 0         st: 0 flags:0  ts:-0.904989
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  2048
 ret: 0         st: 0 flags:1  ts: 1.989184
 ret:-EOF
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  77934 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  77950 size:  2048
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  2048
 ret: 0         st: 0 flags:0  ts: 2.671678
 ret:-EOF
 ret: 0         st: 0 flags:1  ts: 1.565850
 ret:-EOF
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  40596 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  40612 size:  2048
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     24 size:  2048
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     40 size:  2048
diff --git a/tests/ref/seek/lavf-avi b/tests/ref/seek/lavf-avi
index 0cabe127ff..4f308d69fe 100644
--- a/tests/ref/seek/lavf-avi
+++ b/tests/ref/seek/lavf-avi
@@ -1,44 +1,44 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   9896 size: 27867
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   9934 size: 27867
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   9896 size: 27867
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   9934 size: 27867
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301454 size: 27864
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301482 size: 27864
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301454 size: 27864
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301482 size: 27864
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st: 1 flags:0  ts: 2.586122
 ret: 0         st: 1 flags:1  ts: 1.462857
-ret: 0         st: 1 flags:1 dts: 0.992653 pts: 0.992653 pos: 329544 size:   209
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301482 size: 27864
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 156154 size: 27955
+ret: 0         st: 1 flags:1 dts: 0.470204 pts: 0.470204 pos: 155964 size:   209
 ret:-1         st:-1 flags:1  ts:-0.740831
 ret:-1         st: 0 flags:0  ts: 2.160000
 ret: 0         st: 0 flags:1  ts: 1.040000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301454 size: 27864
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301482 size: 27864
 ret: 0         st: 1 flags:0  ts:-0.052245
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:  37772 size:   208
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   9934 size: 27867
 ret: 0         st: 1 flags:1  ts: 2.847347
-ret: 0         st: 1 flags:1 dts: 0.992653 pts: 0.992653 pos: 329544 size:   209
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301482 size: 27864
 ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 156154 size: 27955
+ret: 0         st: 1 flags:1 dts: 0.470204 pts: 0.470204 pos: 155964 size:   209
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   9896 size: 27867
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   9934 size: 27867
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301454 size: 27864
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301482 size: 27864
 ret:-1         st: 1 flags:0  ts: 1.306122
 ret: 0         st: 1 flags:1  ts: 0.208980
-ret: 0         st: 1 flags:1 dts: 0.208980 pts: 0.208980 pos:  92788 size:   209
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   9934 size: 27867
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   9896 size: 27867
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   9934 size: 27867
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301454 size: 27864
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301482 size: 27864
 ret: 0         st: 0 flags:0  ts: 0.880000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301454 size: 27864
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301482 size: 27864
 ret:-1         st: 0 flags:1  ts:-0.240000
 ret:-1         st: 1 flags:0  ts: 2.664490
 ret: 0         st: 1 flags:1  ts: 1.567347
-ret: 0         st: 1 flags:1 dts: 0.992653 pts: 0.992653 pos: 329544 size:   209
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 301482 size: 27864
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 156154 size: 27955
+ret: 0         st: 1 flags:1 dts: 0.470204 pts: 0.470204 pos: 155964 size:   209
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-bmp b/tests/ref/seek/lavf-bmp
index d60729b24c..0f0b152fb8 100644
--- a/tests/ref/seek/lavf-bmp
+++ b/tests/ref/seek/lavf-bmp
@@ -5,7 +5,8 @@ ret:-EINVAL    st: 0 flags:0  ts: 0.800000
 ret:-EINVAL    st: 0 flags:1  ts:-0.320000
 ret:-EINVAL    st:-1 flags:0  ts: 2.576668
 ret:-EINVAL    st:-1 flags:1  ts: 1.470835
-ret:-EINVAL    st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:304182
 ret:-EINVAL    st: 0 flags:1  ts:-0.760000
 ret:-EINVAL    st:-1 flags:0  ts: 2.153336
 ret:-EINVAL    st:-1 flags:1  ts: 1.047503
@@ -16,12 +17,14 @@ ret:-EINVAL    st:-1 flags:1  ts: 0.624171
 ret:-EINVAL    st: 0 flags:0  ts:-0.480000
 ret:-EINVAL    st: 0 flags:1  ts: 2.400000
 ret:-EINVAL    st:-1 flags:0  ts: 1.306672
-ret:-EINVAL    st:-1 flags:1  ts: 0.200839
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size:304182
 ret:-EINVAL    st: 0 flags:0  ts:-0.920000
 ret:-EINVAL    st: 0 flags:1  ts: 2.000000
 ret:-EINVAL    st:-1 flags:0  ts: 0.883340
 ret:-EINVAL    st:-1 flags:1  ts:-0.222493
 ret:-EINVAL    st: 0 flags:0  ts: 2.680000
 ret:-EINVAL    st: 0 flags:1  ts: 1.560000
-ret:-EINVAL    st:-1 flags:0  ts: 0.460008
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:304182
 ret:-EINVAL    st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-dv_fmt b/tests/ref/seek/lavf-dv_fmt
index 3c49749a6b..0000ff5abe 100644
--- a/tests/ref/seek/lavf-dv_fmt
+++ b/tests/ref/seek/lavf-dv_fmt
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:2880000 size:144000
 ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 1 flags:0  ts: 2.576667
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st: 1 flags:1  ts: 1.470833
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1296000 size:144000
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 0 flags:0  ts: 2.160000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st: 0 flags:1  ts: 1.040000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st: 1 flags:0  ts:-0.058333
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 1 flags:1  ts: 2.835833
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2304000 size:144000
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st: 1 flags:0  ts: 1.306667
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st: 1 flags:1  ts: 0.200833
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st: 0 flags:0  ts: 0.880000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3168000 size:144000
 ret: 0         st: 0 flags:1  ts:-0.240000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 1 flags:0  ts: 2.671667
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st: 1 flags:1  ts: 1.565833
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3456000 size:144000
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1728000 size:144000
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
diff --git a/tests/ref/seek/lavf-ffm b/tests/ref/seek/lavf-ffm
new file mode 100644
index 0000000000..eceed1a2c2
--- /dev/null
+++ b/tests/ref/seek/lavf-ffm
@@ -0,0 +1,53 @@
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24663
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24663
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
+ret: 0         st: 0 flags:0  ts: 0.788334
+ret: 0         st: 1 flags:1 dts: 0.825011 pts: 0.825011 pos: 327680 size:   209
+ret: 0         st: 0 flags:1  ts:-0.317499
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24663
+ret: 0         st: 1 flags:0  ts: 2.576668
+ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
+ret: 0         st: 1 flags:1  ts: 1.470835
+ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
+ret: 0         st:-1 flags:0  ts: 0.365002
+ret: 0         st: 1 flags:1 dts: 0.380930 pts: 0.380930 pos: 163840 size:   209
+ret: 0         st:-1 flags:1  ts:-0.740831
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24663
+ret: 0         st: 0 flags:0  ts: 2.153336
+ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
+ret: 0         st: 0 flags:1  ts: 1.047503
+ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
+ret: 0         st: 1 flags:0  ts:-0.058330
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24663
+ret: 0         st: 1 flags:1  ts: 2.835837
+ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 1 flags:1 dts: 0.642154 pts: 0.642154 pos: 274432 size:   209
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24663
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
+ret: 0         st: 1 flags:0  ts: 1.306672
+ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
+ret: 0         st: 1 flags:1  ts: 0.200839
+ret: 0         st: 1 flags:1 dts: 0.224195 pts: 0.224195 pos: 114688 size:   209
+ret: 0         st:-1 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24663
+ret: 0         st:-1 flags:1  ts: 1.989173
+ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
+ret: 0         st: 0 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:0 dts: 0.880000 pts: 0.920000 pos: 339968 size: 12307
+ret: 0         st: 0 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24663
+ret: 0         st: 1 flags:0  ts: 2.671674
+ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
+ret: 0         st: 1 flags:1  ts: 1.565841
+ret: 0         st: 1 flags:1 dts: 0.929501 pts: 0.929501 pos: 376832 size:   209
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 1 flags:1 dts: 0.485420 pts: 0.485420 pos: 221184 size:   209
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   8192 size: 24663
diff --git a/tests/ref/seek/lavf-flv_fmt b/tests/ref/seek/lavf-flv_fmt
index 77a106608a..9d86a811ea 100644
--- a/tests/ref/seek/lavf-flv_fmt
+++ b/tests/ref/seek/lavf-flv_fmt
@@ -1,44 +1,44 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size: 31074
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    205 size: 31074
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size: 31074
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    205 size: 31074
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298383 size: 31134
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298404 size: 31134
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298383 size: 31134
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298404 size: 31134
 ret:-1         st: 0 flags:1  ts:-0.317000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298383 size: 31134
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298404 size: 31134
 ret: 0         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 149421 size: 31125
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 149444 size: 31125
 ret:-1         st: 0 flags:1  ts:-0.741000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298383 size: 31134
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298404 size: 31134
 ret: 0         st: 0 flags:0  ts:-0.058000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size: 31074
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    205 size: 31074
 ret: 0         st: 0 flags:1  ts: 2.836000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298383 size: 31134
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298404 size: 31134
 ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 149421 size: 31125
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 149444 size: 31125
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size: 31074
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    205 size: 31074
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298383 size: 31134
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298404 size: 31134
 ret:-1         st:-1 flags:0  ts: 1.306672
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size: 31074
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    205 size: 31074
 ret: 0         st: 0 flags:0  ts:-0.905000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size: 31074
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    205 size: 31074
 ret: 0         st: 0 flags:1  ts: 1.989000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298383 size: 31134
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298404 size: 31134
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298383 size: 31134
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298404 size: 31134
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.672000
 ret: 0         st: 0 flags:1  ts: 1.566000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298383 size: 31134
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 298404 size: 31134
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 149421 size: 31125
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 149444 size: 31125
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-gif b/tests/ref/seek/lavf-gif
index 883f18761e..9ce8308767 100644
--- a/tests/ref/seek/lavf-gif
+++ b/tests/ref/seek/lavf-gif
@@ -1,27 +1,40 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:2906401
-ret:-EINVAL    st:-1 flags:0  ts:-1.000000
-ret:-EINVAL    st:-1 flags:1  ts: 1.894167
-ret:-EINVAL    st: 0 flags:0  ts: 0.800000
-ret:-EINVAL    st: 0 flags:1  ts:-0.320000
-ret:-EINVAL    st:-1 flags:0  ts: 2.576668
-ret:-EINVAL    st:-1 flags:1  ts: 1.470835
-ret:-EINVAL    st: 0 flags:0  ts: 0.360000
-ret:-EINVAL    st: 0 flags:1  ts:-0.760000
-ret:-EINVAL    st:-1 flags:0  ts: 2.153336
-ret:-EINVAL    st:-1 flags:1  ts: 1.047503
-ret:-EINVAL    st: 0 flags:0  ts:-0.040000
-ret:-EINVAL    st: 0 flags:1  ts: 2.840000
-ret:-EINVAL    st:-1 flags:0  ts: 1.730004
-ret:-EINVAL    st:-1 flags:1  ts: 0.624171
-ret:-EINVAL    st: 0 flags:0  ts:-0.480000
-ret:-EINVAL    st: 0 flags:1  ts: 2.400000
-ret:-EINVAL    st:-1 flags:0  ts: 1.306672
-ret:-EINVAL    st:-1 flags:1  ts: 0.200839
-ret:-EINVAL    st: 0 flags:0  ts:-0.920000
-ret:-EINVAL    st: 0 flags:1  ts: 2.000000
-ret:-EINVAL    st:-1 flags:0  ts: 0.883340
-ret:-EINVAL    st:-1 flags:1  ts:-0.222493
-ret:-EINVAL    st: 0 flags:0  ts: 2.680000
-ret:-EINVAL    st: 0 flags:1  ts: 1.560000
-ret:-EINVAL    st:-1 flags:0  ts: 0.460008
-ret:-EINVAL    st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret:-1         st: 0 flags:0  ts: 0.790000
+ret:-1         st: 0 flags:1  ts:-0.320000
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret:-1         st: 0 flags:0  ts: 0.370000
+ret:-1         st: 0 flags:1  ts:-0.740000
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret: 0         st: 0 flags:0  ts:-0.060000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret:-1         st:-1 flags:0  ts: 1.730004
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret: 0         st: 0 flags:1  ts: 2.410000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret:-1         st:-1 flags:0  ts: 1.306672
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret: 0         st: 0 flags:0  ts:-0.900000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret: 0         st: 0 flags:1  ts: 1.990000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret:-1         st:-1 flags:0  ts: 0.883340
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.670000
+ret: 0         st: 0 flags:1  ts: 1.570000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 81501
+ret:-1         st:-1 flags:0  ts: 0.460008
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-gxf b/tests/ref/seek/lavf-gxf
index c8f11c84d8..716246268b 100644
--- a/tests/ref/seek/lavf-gxf
+++ b/tests/ref/seek/lavf-gxf
@@ -2,52 +2,52 @@ ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:   5024 size: 65536
 ret: 0         st:-1 flags:0  ts:-1.000000
 ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:   5024 size: 65536
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741664 size: 54748
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741124 size: 54736
 ret: 0         st: 0 flags:0  ts: 0.780000
-ret: 0         st: 0 flags:0 dts: 0.800000 pts: NOPTS    pos: 653352 size: 22148
+ret: 0         st: 0 flags:0 dts: 0.800000 pts: NOPTS    pos: 653420 size: 22124
 ret: 0         st: 0 flags:1  ts:-0.320000
 ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:   5024 size: 65536
 ret: 0         st: 1 flags:0  ts: 2.580000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741664 size: 54748
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741124 size: 54736
 ret: 0         st: 1 flags:1  ts: 1.480000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741664 size: 54748
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741124 size: 54736
 ret: 0         st: 2 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:0 dts: 0.360000 pts: NOPTS    pos: 302688 size: 25108
+ret: 0         st: 0 flags:0 dts: 0.360000 pts: NOPTS    pos: 302672 size: 25116
 ret: 0         st: 2 flags:1  ts:-0.740000
 ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:   5024 size: 65536
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741664 size: 54748
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741124 size: 54736
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741664 size: 54748
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741124 size: 54736
 ret: 0         st: 0 flags:0  ts:-0.060000
 ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:   5024 size: 65536
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741664 size: 54748
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741124 size: 54736
 ret: 0         st: 1 flags:0  ts: 1.740000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741664 size: 54748
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741124 size: 54736
 ret: 0         st: 1 flags:1  ts: 0.620000
-ret: 0         st: 0 flags:0 dts: 0.640000 pts: NOPTS    pos: 497180 size: 21596
+ret: 0         st: 0 flags:0 dts: 0.640000 pts: NOPTS    pos: 497196 size: 21612
 ret: 0         st: 2 flags:0  ts:-0.480000
 ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:   5024 size: 65536
 ret: 0         st: 2 flags:1  ts: 2.420000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741664 size: 54748
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741124 size: 54736
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741664 size: 54748
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741124 size: 54736
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:0 dts: 0.200000 pts: NOPTS    pos: 209516 size: 22968
+ret: 0         st: 0 flags:0 dts: 0.200000 pts: NOPTS    pos: 209504 size: 22964
 ret: 0         st: 0 flags:0  ts:-0.900000
 ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:   5024 size: 65536
 ret: 0         st: 0 flags:1  ts: 1.980000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741664 size: 54748
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741124 size: 54736
 ret: 0         st: 1 flags:0  ts: 0.880000
-ret: 0         st: 0 flags:0 dts: 0.880000 pts: NOPTS    pos: 696068 size: 22484
+ret: 0         st: 0 flags:0 dts: 0.880000 pts: NOPTS    pos: 696160 size: 21820
 ret: 0         st: 1 flags:1  ts:-0.220000
 ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:   5024 size: 65536
 ret: 0         st: 2 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741664 size: 54748
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741124 size: 54736
 ret: 0         st: 2 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741664 size: 54748
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 741124 size: 54736
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos: 370672 size: 54640
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos: 370700 size: 54628
 ret: 0         st:-1 flags:1  ts:-0.645825
 ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:   5024 size: 65536
diff --git a/tests/ref/seek/lavf-jpg b/tests/ref/seek/lavf-jpg
index 88964cad05..545f59da57 100644
--- a/tests/ref/seek/lavf-jpg
+++ b/tests/ref/seek/lavf-jpg
@@ -1,11 +1,12 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size: 28070
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size: 25641
 ret:-EINVAL    st:-1 flags:0  ts:-1.000000
 ret:-EINVAL    st:-1 flags:1  ts: 1.894167
 ret:-EINVAL    st: 0 flags:0  ts: 0.800000
 ret:-EINVAL    st: 0 flags:1  ts:-0.320000
 ret:-EINVAL    st:-1 flags:0  ts: 2.576668
 ret:-EINVAL    st:-1 flags:1  ts: 1.470835
-ret:-EINVAL    st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size: 25316
 ret:-EINVAL    st: 0 flags:1  ts:-0.760000
 ret:-EINVAL    st:-1 flags:0  ts: 2.153336
 ret:-EINVAL    st:-1 flags:1  ts: 1.047503
@@ -16,12 +17,14 @@ ret:-EINVAL    st:-1 flags:1  ts: 0.624171
 ret:-EINVAL    st: 0 flags:0  ts:-0.480000
 ret:-EINVAL    st: 0 flags:1  ts: 2.400000
 ret:-EINVAL    st:-1 flags:0  ts: 1.306672
-ret:-EINVAL    st:-1 flags:1  ts: 0.200839
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size: 25788
 ret:-EINVAL    st: 0 flags:0  ts:-0.920000
 ret:-EINVAL    st: 0 flags:1  ts: 2.000000
 ret:-EINVAL    st:-1 flags:0  ts: 0.883340
 ret:-EINVAL    st:-1 flags:1  ts:-0.222493
 ret:-EINVAL    st: 0 flags:0  ts: 2.680000
 ret:-EINVAL    st: 0 flags:1  ts: 1.560000
-ret:-EINVAL    st:-1 flags:0  ts: 0.460008
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size: 25487
 ret:-EINVAL    st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv
index 8267a2a255..cea34e99ac 100644
--- a/tests/ref/seek/lavf-mkv
+++ b/tests/ref/seek/lavf-mkv
@@ -1,53 +1,48 @@
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    633 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    834 size:   208
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    849 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:   1050 size: 27837
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292271 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292271 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834
 ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    849 size: 27837
-ret: 0         st: 1 flags:0  ts: 2.577000
-ret:-EOF
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:   1050 size: 27837
+ret:-1         st: 1 flags:0  ts: 2.577000
 ret: 0         st: 1 flags:1  ts: 1.471000
-ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320112 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320317 size:   209
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146824 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147023 size: 27925
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    849 size: 27837
-ret: 0         st: 0 flags:0  ts: 2.153000
-ret:-EOF
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:   1050 size: 27837
+ret:-1         st: 0 flags:0  ts: 2.153000
 ret: 0         st: 0 flags:1  ts: 1.048000
-ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292271 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834
 ret: 0         st: 1 flags:0  ts:-0.058000
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    633 size:   208
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    834 size:   208
 ret: 0         st: 1 flags:1  ts: 2.836000
-ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320112 size:   209
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret:-EOF
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320317 size:   209
+ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146824 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147023 size: 27925
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    849 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:   1050 size: 27837
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292271 size: 27834
-ret: 0         st: 1 flags:0  ts: 1.307000
-ret:-EOF
+ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834
+ret:-1         st: 1 flags:0  ts: 1.307000
 ret: 0         st: 1 flags:1  ts: 0.201000
-ret: 0         st: 1 flags:1 dts: 0.183000 pts: 0.183000 pos:  72204 size:   209
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    834 size:   208
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    849 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:   1050 size: 27837
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292271 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834
 ret: 0         st: 0 flags:0  ts: 0.883000
-ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292271 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.971000 pts: 0.971000 pos: 292476 size: 27834
 ret: 0         st: 0 flags:1  ts:-0.222000
-ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    849 size: 27837
-ret: 0         st: 1 flags:0  ts: 2.672000
-ret:-EOF
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:   1050 size: 27837
+ret:-1         st: 1 flags:0  ts: 2.672000
 ret: 0         st: 1 flags:1  ts: 1.566000
-ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320112 size:   209
+ret: 0         st: 1 flags:1 dts: 0.993000 pts: 0.993000 pos: 320317 size:   209
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 146824 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.491000 pts: 0.491000 pos: 147023 size: 27925
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:    849 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.011000 pts: 0.011000 pos:   1050 size: 27837
diff --git a/tests/ref/seek/lavf-mmf b/tests/ref/seek/lavf-mmf
index 196d2632a0..0bc98fa9e3 100644
--- a/tests/ref/seek/lavf-mmf
+++ b/tests/ref/seek/lavf-mmf
@@ -1,27 +1,44 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:  4096
-ret:-1         st:-1 flags:0  ts:-1.000000
-ret:-1         st:-1 flags:1  ts: 1.894167
-ret:-1         st: 0 flags:0  ts: 0.788345
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     83 size:  4096
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     83 size:  4096
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos:  20563 size:  2048
+ret: 0         st: 0 flags:0  ts: 0.788345
+ret: 0         st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos:  20563 size:  2048
 ret:-1         st: 0 flags:1  ts:-0.317506
 ret:-1         st:-1 flags:0  ts: 2.576668
-ret:-1         st:-1 flags:1  ts: 1.470835
-ret:-1         st: 0 flags:0  ts: 0.365011
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos:  20563 size:  2048
+ret: 0         st: 0 flags:0  ts: 0.365011
+ret: 0         st: 0 flags:1 dts: 0.371519 pts: 0.371519 pos:   8275 size:  4096
 ret:-1         st: 0 flags:1  ts:-0.740839
 ret:-1         st:-1 flags:0  ts: 2.153336
-ret:-1         st:-1 flags:1  ts: 1.047503
-ret:-1         st: 0 flags:0  ts:-0.058322
-ret:-1         st: 0 flags:1  ts: 2.835828
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos:  20563 size:  2048
+ret: 0         st: 0 flags:0  ts:-0.058322
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     83 size:  4096
+ret: 0         st: 0 flags:1  ts: 2.835828
+ret: 0         st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos:  20563 size:  2048
 ret:-1         st:-1 flags:0  ts: 1.730004
-ret:-1         st:-1 flags:1  ts: 0.624171
-ret:-1         st: 0 flags:0  ts:-0.481655
-ret:-1         st: 0 flags:1  ts: 2.412494
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.557279 pts: 0.557279 pos:  12371 size:  4096
+ret: 0         st: 0 flags:0  ts:-0.481655
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     83 size:  4096
+ret: 0         st: 0 flags:1  ts: 2.412494
+ret: 0         st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos:  20563 size:  2048
 ret:-1         st:-1 flags:0  ts: 1.306672
-ret:-1         st:-1 flags:1  ts: 0.200839
-ret:-1         st: 0 flags:0  ts:-0.904989
-ret:-1         st: 0 flags:1  ts: 1.989184
-ret:-1         st:-1 flags:0  ts: 0.883340
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.185760 pts: 0.185760 pos:   4179 size:  4096
+ret: 0         st: 0 flags:0  ts:-0.904989
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     83 size:  4096
+ret: 0         st: 0 flags:1  ts: 1.989184
+ret: 0         st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos:  20563 size:  2048
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos:  20563 size:  2048
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.671678
-ret:-1         st: 0 flags:1  ts: 1.565850
-ret:-1         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1  ts: 1.565850
+ret: 0         st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos:  20563 size:  2048
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.557279 pts: 0.557279 pos:  12371 size:  4096
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-mov b/tests/ref/seek/lavf-mov
index 0091915e19..27ea7c7730 100644
--- a/tests/ref/seek/lavf-mov
+++ b/tests/ref/seek/lavf-mov
@@ -1,48 +1,48 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1767 size: 27837
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1767 size: 27837
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 325248 size:  1024
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326272 size: 27834
-ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 27837
+ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326971 size:  1024
+ret: 0         st: 0 flags:0  ts: 0.788359
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327995 size: 27834
+ret: 0         st: 0 flags:1  ts:-0.317500
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1767 size: 27837
 ret:-1         st: 1 flags:0  ts: 2.576667
 ret: 0         st: 1 flags:1  ts: 1.470839
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326272 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327995 size: 27834
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 163526 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165249 size: 27925
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 27837
-ret:-1         st: 0 flags:0  ts: 2.160000
-ret: 0         st: 0 flags:1  ts: 1.040000
-ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 325248 size:  1024
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1767 size: 27837
+ret:-1         st: 0 flags:0  ts: 2.153359
+ret: 0         st: 0 flags:1  ts: 1.047500
+ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326971 size:  1024
 ret: 0         st: 1 flags:0  ts:-0.058322
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1767 size: 27837
 ret: 0         st: 1 flags:1  ts: 2.835828
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326272 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327995 size: 27834
 ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 162502 size:  1024
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 27837
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 325248 size:  1024
+ret: 0         st: 1 flags:1 dts: 0.464399 pts: 0.464399 pos: 164225 size:  1024
+ret: 0         st: 0 flags:0  ts:-0.481641
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1767 size: 27837
+ret: 0         st: 0 flags:1  ts: 2.412500
+ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326971 size:  1024
 ret:-1         st: 1 flags:0  ts: 1.306667
 ret: 0         st: 1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1767 size: 27837
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1767 size: 27837
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 325248 size:  1024
-ret: 0         st: 0 flags:0  ts: 0.880000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326272 size: 27834
-ret: 0         st: 0 flags:1  ts:-0.240000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 27837
+ret: 0         st: 1 flags:1 dts: 0.952018 pts: 0.952018 pos: 326971 size:  1024
+ret: 0         st: 0 flags:0  ts: 0.883359
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327995 size: 27834
+ret: 0         st: 0 flags:1  ts:-0.222500
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1767 size: 27837
 ret:-1         st: 1 flags:0  ts: 2.671678
 ret: 0         st: 1 flags:1  ts: 1.565850
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326272 size: 27834
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 327995 size: 27834
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 163526 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 165249 size: 27925
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   1767 size: 27837
diff --git a/tests/ref/seek/lavf-mpg b/tests/ref/seek/lavf-mpg
index 6e27064684..e804b84739 100644
--- a/tests/ref/seek/lavf-mpg
+++ b/tests/ref/seek/lavf-mpg
@@ -1,53 +1,53 @@
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos:   2048 size:   208
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos:   2048 size:   208
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:0 dts: 1.880000 pts: 1.920000 pos: 315392 size: 12800
+ret: 0         st: 1 flags:1 dts: 1.051544 pts: 1.051544 pos: 342028 size:   314
 ret: 0         st: 0 flags:0  ts: 0.788333
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 0 flags:0 dts: 0.820000 pts: 0.860000 pos: 118784 size: 14717
 ret: 0         st: 0 flags:1  ts:-0.317500
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos:   2048 size:   208
 ret: 0         st: 1 flags:0  ts: 2.576667
-ret: 0         st: 1 flags:1 dts: 1.812767 pts: 1.812767 pos: 368652 size:   379
+ret: 0         st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 368652 size:   379
 ret: 0         st: 1 flags:1  ts: 1.470833
-ret: 0         st: 1 flags:1 dts: 1.290322 pts: 1.290322 pos: 145408 size:   261
+ret: 0         st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 368652 size:   379
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos:   2048 size:   208
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos:   2048 size:   208
 ret: 0         st: 0 flags:0  ts: 2.153333
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 2.000000 pos: 339968 size:   681
+ret: 0         st: 1 flags:1 dts: 1.051544 pts: 1.051544 pos: 342028 size:   314
 ret: 0         st: 0 flags:1  ts: 1.047500
-ret: 0         st: 0 flags:0 dts: 1.040000 pts: 1.080000 pos:  26624 size: 16303
+ret: 0         st: 0 flags:0 dts: 1.020000 pts: 1.060000 pos: 196608 size: 17639
 ret: 0         st: 1 flags:0  ts:-0.058333
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos:   2048 size:   208
 ret: 0         st: 1 flags:1  ts: 2.835833
-ret: 0         st: 1 flags:1 dts: 1.812767 pts: 1.812767 pos: 368652 size:   379
+ret: 0         st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 368652 size:   379
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:0 dts: 1.760000 pts: 1.800000 pos: 280588 size: 13050
+ret: 0         st: 1 flags:1 dts: 1.051544 pts: 1.051544 pos: 342028 size:   314
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 0 flags:0 dts: 0.620000 pts: 0.660000 pos:  55296 size: 14239
 ret: 0         st: 0 flags:0  ts:-0.481667
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos:   2048 size:   208
 ret: 0         st: 0 flags:1  ts: 2.412500
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 2.000000 pos: 339968 size:   681
+ret: 0         st: 1 flags:1 dts: 1.051544 pts: 1.051544 pos: 342028 size:   314
 ret: 0         st: 1 flags:0  ts: 1.306667
-ret: 0         st: 1 flags:1 dts: 1.551544 pts: 1.551544 pos: 342028 size:   314
+ret: 0         st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 368652 size:   379
 ret: 0         st: 1 flags:1  ts: 0.200844
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos:   2048 size:   208
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos:   2048 size:   208
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 2.000000 pos: 339968 size:   681
+ret: 0         st: 1 flags:1 dts: 1.051544 pts: 1.051544 pos: 342028 size:   314
 ret: 0         st: 0 flags:0  ts: 0.883344
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 0 flags:0 dts: 0.900000 pts: 0.940000 pos: 147456 size: 12755
 ret: 0         st: 0 flags:1  ts:-0.222489
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos:   2048 size:   208
 ret: 0         st: 1 flags:0  ts: 2.671678
-ret: 0         st: 1 flags:1 dts: 1.812767 pts: 1.812767 pos: 368652 size:   379
+ret: 0         st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 368652 size:   379
 ret: 0         st: 1 flags:1  ts: 1.565844
-ret: 0         st: 1 flags:1 dts: 1.551544 pts: 1.551544 pos: 342028 size:   314
+ret: 0         st: 1 flags:1 dts: 1.312767 pts: 1.312767 pos: 368652 size:   379
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos:   2048 size:   208
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 1 flags:1 dts: 1.029089 pts: 1.029089 pos:   2048 size:   208
+ret: 0         st: 1 flags:1 dts: 0.529089 pts: 0.529089 pos:   2048 size:   208
diff --git a/tests/ref/seek/lavf-mxf b/tests/ref/seek/lavf-mxf
index c65e868350..93d419722b 100644
--- a/tests/ref/seek/lavf-mxf
+++ b/tests/ref/seek/lavf-mxf
@@ -1,48 +1,48 @@
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24813
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24813
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24724
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460288 size: 24711
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24724
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460288 size: 24711
 ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24813
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
 ret:-1         st: 1 flags:0  ts: 2.576667
 ret: 0         st: 1 flags:1  ts: 1.470833
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24724
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460288 size: 24711
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 211968 size: 24799
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 211456 size: 24786
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24813
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
 ret:-1         st: 0 flags:0  ts: 2.160000
 ret: 0         st: 0 flags:1  ts: 1.040000
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24724
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460288 size: 24711
 ret: 0         st: 1 flags:0  ts:-0.058333
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24813
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
 ret: 0         st: 1 flags:1  ts: 2.835833
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24724
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460288 size: 24711
 ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 211968 size: 24799
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 211456 size: 24786
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24813
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24724
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460288 size: 24711
 ret:-1         st: 1 flags:0  ts: 1.306667
 ret: 0         st: 1 flags:1  ts: 0.200833
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24813
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24813
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24724
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460288 size: 24711
 ret: 0         st: 0 flags:0  ts: 0.880000
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24724
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460288 size: 24711
 ret: 0         st: 0 flags:1  ts:-0.240000
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24813
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
 ret:-1         st: 1 flags:0  ts: 2.671667
 ret: 0         st: 1 flags:1  ts: 1.565833
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24724
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460288 size: 24711
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: 0.960000 pos: 460800 size: 24724
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.480000 pos: 211456 size: 24786
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24813
+ret: 0         st: 0 flags:1 dts:-0.040000 pts: 0.000000 pos:   6144 size: 24801
diff --git a/tests/ref/seek/lavf-mxf_dv25 b/tests/ref/seek/lavf-mxf_dv25
new file mode 100644
index 0000000000..42b3bbdfce
--- /dev/null
+++ b/tests/ref/seek/lavf-mxf_dv25
@@ -0,0 +1,53 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:144000
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:144000
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680256 size:144000
+ret: 0         st: 0 flags:0  ts: 0.800000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3067904 size:144000
+ret: 0         st: 0 flags:1  ts:-0.320000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:144000
+ret: 0         st: 1 flags:0  ts: 2.576667
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680256 size:144000
+ret: 0         st: 1 flags:1  ts: 1.470833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680256 size:144000
+ret: 0         st:-1 flags:0  ts: 0.365002
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1383936 size:144000
+ret: 0         st:-1 flags:1  ts:-0.740831
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:144000
+ret: 0         st: 0 flags:0  ts: 2.160000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680256 size:144000
+ret: 0         st: 0 flags:1  ts: 1.040000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680256 size:144000
+ret: 0         st: 1 flags:0  ts:-0.058333
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:144000
+ret: 0         st: 1 flags:1  ts: 2.835833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680256 size:144000
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680256 size:144000
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2455552 size:144000
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:144000
+ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680256 size:144000
+ret: 0         st: 1 flags:0  ts: 1.306667
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680256 size:144000
+ret: 0         st: 1 flags:1  ts: 0.200833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 771584 size:144000
+ret: 0         st:-1 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:144000
+ret: 0         st:-1 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:3680256 size:144000
+ret: 0         st: 0 flags:0  ts: 0.880000
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3374080 size:144000
+ret: 0         st: 0 flags:1  ts:-0.240000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:144000
+ret: 0         st: 1 flags:0  ts: 2.671667
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680256 size:144000
+ret: 0         st: 1 flags:1  ts: 1.565833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:3680256 size:144000
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1843200 size:144000
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:144000
diff --git a/tests/ref/seek/lavf-mxf_dvcpro50 b/tests/ref/seek/lavf-mxf_dvcpro50
new file mode 100644
index 0000000000..c3d9d3afd7
--- /dev/null
+++ b/tests/ref/seek/lavf-mxf_dvcpro50
@@ -0,0 +1,53 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:288000
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:288000
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133184 size:288000
+ret: 0         st: 0 flags:0  ts: 0.800000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:5945344 size:288000
+ret: 0         st: 0 flags:1  ts:-0.320000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:288000
+ret: 0         st: 1 flags:0  ts: 2.576667
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133184 size:288000
+ret: 0         st: 1 flags:1  ts: 1.470833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133184 size:288000
+ret: 0         st:-1 flags:0  ts: 0.365002
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:2678784 size:288000
+ret: 0         st:-1 flags:1  ts:-0.740831
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:288000
+ret: 0         st: 0 flags:0  ts: 2.160000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133184 size:288000
+ret: 0         st: 0 flags:1  ts: 1.040000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133184 size:288000
+ret: 0         st: 1 flags:0  ts:-0.058333
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:288000
+ret: 0         st: 1 flags:1  ts: 2.835833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133184 size:288000
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133184 size:288000
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:4757504 size:288000
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:288000
+ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133184 size:288000
+ret: 0         st: 1 flags:0  ts: 1.306667
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133184 size:288000
+ret: 0         st: 1 flags:1  ts: 0.200833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:1490944 size:288000
+ret: 0         st:-1 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:288000
+ret: 0         st:-1 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:7133184 size:288000
+ret: 0         st: 0 flags:0  ts: 0.880000
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:6539264 size:288000
+ret: 0         st: 0 flags:1  ts:-0.240000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:288000
+ret: 0         st: 1 flags:0  ts: 2.671667
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133184 size:288000
+ret: 0         st: 1 flags:1  ts: 1.565833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:7133184 size:288000
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:3569664 size:288000
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   6144 size:288000
diff --git a/tests/ref/seek/vsynth2-dv-411 b/tests/ref/seek/lavf-mxf_opatom
index baaeefb2cf..ca17ba78f9 100644
--- a/tests/ref/seek/vsynth2-dv-411
+++ b/tests/ref/seek/lavf-mxf_opatom
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3773465 size:188416
 ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1700889 size:188416
 ret: 0         st: 0 flags:1  ts:-0.760000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:3019801 size:188416
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 947225 size:188416
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:4150297 size:188416
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
 ret: 0         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:4527129 size:188416
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2266137 size:188416
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5145 size:188416
diff --git a/tests/ref/seek/lavf-mxf_opatom_audio b/tests/ref/seek/lavf-mxf_opatom_audio
new file mode 100644
index 0000000000..2d1a7cc350
--- /dev/null
+++ b/tests/ref/seek/lavf-mxf_opatom_audio
@@ -0,0 +1,53 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   4633 size:  3840
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   4633 size:  3840
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 100631 size:     2
+ret: 0         st: 0 flags:0  ts: 0.788333
+ret: 0         st: 0 flags:1 dts: 0.788333 pts: 0.788333 pos:  80313 size:  3840
+ret: 0         st: 0 flags:1  ts:-0.317500
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   4633 size:  3840
+ret: 0         st:-1 flags:0  ts: 2.576668
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 100631 size:     2
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 100631 size:     2
+ret: 0         st: 0 flags:0  ts: 0.365000
+ret: 0         st: 0 flags:1 dts: 0.365000 pts: 0.365000 pos:  39673 size:  3840
+ret: 0         st: 0 flags:1  ts:-0.740833
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   4633 size:  3840
+ret: 0         st:-1 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 100631 size:     2
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 100631 size:     2
+ret: 0         st: 0 flags:0  ts:-0.058333
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   4633 size:  3840
+ret: 0         st: 0 flags:1  ts: 2.835833
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 100631 size:     2
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 100631 size:     2
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.624167 pts: 0.624167 pos:  64553 size:  3840
+ret: 0         st: 0 flags:0  ts:-0.481667
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   4633 size:  3840
+ret: 0         st: 0 flags:1  ts: 2.412500
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 100631 size:     2
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 100631 size:     2
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200833 pts: 0.200833 pos:  23913 size:  3840
+ret: 0         st: 0 flags:0  ts:-0.905000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   4633 size:  3840
+ret: 0         st: 0 flags:1  ts: 1.989167
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 100631 size:     2
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  89433 size:  3840
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   4633 size:  3840
+ret: 0         st: 0 flags:0  ts: 2.671667
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 100631 size:     2
+ret: 0         st: 0 flags:1  ts: 1.565833
+ret: 0         st: 0 flags:1 dts: 0.999979 pts: 0.999979 pos: 100631 size:     2
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  48793 size:  3840
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   4633 size:  3840
diff --git a/tests/ref/seek/lavf-nut b/tests/ref/seek/lavf-nut
index 46f1ea2cc9..b2da52629b 100644
--- a/tests/ref/seek/lavf-nut
+++ b/tests/ref/seek/lavf-nut
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    295 size: 27837
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    395 size:   208
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    295 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos:    623 size: 27837
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
-ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    295 size: 27837
-ret: 0         st: 1 flags:0  ts: 2.586122
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
-ret: 0         st: 1 flags:1  ts: 1.462857
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925
+ret: 0         st: 0 flags:0  ts: 0.788340
+ret: 0         st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925
+ret: 0         st: 0 flags:1  ts:-0.317500
+ret: 0         st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos:    623 size: 27837
+ret: 0         st: 1 flags:0  ts: 2.576667
+ret: 0         st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271315 size:   209
+ret: 0         st: 1 flags:1  ts: 1.470839
+ret: 0         st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271315 size:   209
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    295 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    295 size: 27837
-ret: 0         st: 0 flags:0  ts: 2.160000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
-ret: 0         st: 0 flags:1  ts: 1.040000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
-ret: 0         st: 1 flags:0  ts:-0.052245
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    295 size: 27837
-ret: 0         st: 1 flags:1  ts: 2.847347
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos:    623 size: 27837
+ret: 0         st: 0 flags:0  ts: 2.153340
+ret: 0         st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925
+ret: 0         st: 0 flags:1  ts: 1.047500
+ret: 0         st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925
+ret: 0         st: 1 flags:0  ts:-0.058322
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    395 size:   208
+ret: 0         st: 1 flags:1  ts: 2.835828
+ret: 0         st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271315 size:   209
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    295 size: 27837
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
-ret: 0         st: 1 flags:0  ts: 1.306122
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
-ret: 0         st: 1 flags:1  ts: 0.208980
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    295 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925
+ret: 0         st: 0 flags:0  ts:-0.481660
+ret: 0         st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos:    623 size: 27837
+ret: 0         st: 0 flags:1  ts: 2.412500
+ret: 0         st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925
+ret: 0         st: 1 flags:0  ts: 1.306667
+ret: 0         st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271315 size:   209
+ret: 0         st: 1 flags:1  ts: 0.200839
+ret: 0         st: 1 flags:1 dts: 0.182857 pts: 0.182857 pos:  71957 size:   209
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    295 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos:    623 size: 27837
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
-ret: 0         st: 0 flags:0  ts: 0.880000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
-ret: 0         st: 0 flags:1  ts:-0.240000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    295 size: 27837
-ret: 0         st: 1 flags:0  ts: 2.664490
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
-ret: 0         st: 1 flags:1  ts: 1.567347
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925
+ret: 0         st: 0 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925
+ret: 0         st: 0 flags:1  ts:-0.222500
+ret: 0         st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos:    623 size: 27837
+ret: 0         st: 1 flags:0  ts: 2.671678
+ret: 0         st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271315 size:   209
+ret: 0         st: 1 flags:1  ts: 1.565850
+ret: 0         st: 1 flags:1 dts: 0.862041 pts: 0.862041 pos: 271315 size:   209
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146353 size: 27925
+ret: 0         st: 0 flags:1 dts: 0.490918 pts: 0.490918 pos: 146490 size: 27925
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    295 size: 27837
+ret: 0         st: 0 flags:1 dts: 0.010918 pts: 0.010918 pos:    623 size: 27837
diff --git a/tests/ref/seek/lavf-ogg b/tests/ref/seek/lavf-ogg
index 109ae3226d..caf4879075 100644
--- a/tests/ref/seek/lavf-ogg
+++ b/tests/ref/seek/lavf-ogg
@@ -1,44 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    124 size:  1364
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    124 size:  1364
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret:-EOF
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st: 0 flags:0  ts: 0.788345
-ret:-EOF
-ret:-1         st: 0 flags:1  ts:-0.317506
-ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
+ret: 0         st: 0 flags:1  ts:-0.317506
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
+ret: 0         st:-1 flags:0  ts: 2.576668
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret:-EOF
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st: 0 flags:0  ts: 0.365011
-ret:-EOF
-ret:-1         st: 0 flags:1  ts:-0.740839
-ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
+ret: 0         st: 0 flags:1  ts:-0.740839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
+ret: 0         st:-1 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret:-EOF
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st: 0 flags:0  ts:-0.058322
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    124 size:  1364
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st: 0 flags:1  ts: 2.835828
-ret:-EOF
-ret:-1         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret:-EOF
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st: 0 flags:0  ts:-0.481655
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    124 size:  1364
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st: 0 flags:1  ts: 2.412494
-ret:-EOF
-ret:-1         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret:-EOF
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st: 0 flags:0  ts:-0.904989
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    124 size:  1364
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st: 0 flags:1  ts: 1.989184
-ret:-EOF
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret:-EOF
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.671678
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
+ret: 0         st: 0 flags:0  ts: 2.671678
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st: 0 flags:1  ts: 1.565850
-ret:-EOF
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret:-EOF
-ret:-1         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    164 size:  1364
diff --git a/tests/ref/seek/lavf-pbmpipe b/tests/ref/seek/lavf-pbmpipe
index 2858934786..2782a9f036 100644
--- a/tests/ref/seek/lavf-pbmpipe
+++ b/tests/ref/seek/lavf-pbmpipe
@@ -1,27 +1,31 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:317075
-ret:-EINVAL    st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 12683
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 12683
 ret:-EINVAL    st:-1 flags:1  ts: 1.894167
 ret:-EINVAL    st: 0 flags:0  ts: 0.800000
-ret:-EINVAL    st: 0 flags:1  ts:-0.320000
+ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-EINVAL    st:-1 flags:0  ts: 2.576668
 ret:-EINVAL    st:-1 flags:1  ts: 1.470835
 ret:-EINVAL    st: 0 flags:0  ts: 0.360000
-ret:-EINVAL    st: 0 flags:1  ts:-0.760000
+ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-EINVAL    st:-1 flags:0  ts: 2.153336
 ret:-EINVAL    st:-1 flags:1  ts: 1.047503
-ret:-EINVAL    st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 12683
 ret:-EINVAL    st: 0 flags:1  ts: 2.840000
 ret:-EINVAL    st:-1 flags:0  ts: 1.730004
 ret:-EINVAL    st:-1 flags:1  ts: 0.624171
-ret:-EINVAL    st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 12683
 ret:-EINVAL    st: 0 flags:1  ts: 2.400000
 ret:-EINVAL    st:-1 flags:0  ts: 1.306672
 ret:-EINVAL    st:-1 flags:1  ts: 0.200839
-ret:-EINVAL    st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 12683
 ret:-EINVAL    st: 0 flags:1  ts: 2.000000
 ret:-EINVAL    st:-1 flags:0  ts: 0.883340
-ret:-EINVAL    st:-1 flags:1  ts:-0.222493
+ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-EINVAL    st: 0 flags:0  ts: 2.680000
 ret:-EINVAL    st: 0 flags:1  ts: 1.560000
 ret:-EINVAL    st:-1 flags:0  ts: 0.460008
-ret:-EINVAL    st:-1 flags:1  ts:-0.645825
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-pcx b/tests/ref/seek/lavf-pcx
index 418674f7a2..ba21627e86 100644
--- a/tests/ref/seek/lavf-pcx
+++ b/tests/ref/seek/lavf-pcx
@@ -5,7 +5,8 @@ ret:-EINVAL    st: 0 flags:0  ts: 0.800000
 ret:-EINVAL    st: 0 flags:1  ts:-0.320000
 ret:-EINVAL    st:-1 flags:0  ts: 2.576668
 ret:-EINVAL    st:-1 flags:1  ts: 1.470835
-ret:-EINVAL    st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:363107
 ret:-EINVAL    st: 0 flags:1  ts:-0.760000
 ret:-EINVAL    st:-1 flags:0  ts: 2.153336
 ret:-EINVAL    st:-1 flags:1  ts: 1.047503
@@ -16,12 +17,14 @@ ret:-EINVAL    st:-1 flags:1  ts: 0.624171
 ret:-EINVAL    st: 0 flags:0  ts:-0.480000
 ret:-EINVAL    st: 0 flags:1  ts: 2.400000
 ret:-EINVAL    st:-1 flags:0  ts: 1.306672
-ret:-EINVAL    st:-1 flags:1  ts: 0.200839
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size:364760
 ret:-EINVAL    st: 0 flags:0  ts:-0.920000
 ret:-EINVAL    st: 0 flags:1  ts: 2.000000
 ret:-EINVAL    st:-1 flags:0  ts: 0.883340
 ret:-EINVAL    st:-1 flags:1  ts:-0.222493
 ret:-EINVAL    st: 0 flags:0  ts: 2.680000
 ret:-EINVAL    st: 0 flags:1  ts: 1.560000
-ret:-EINVAL    st:-1 flags:0  ts: 0.460008
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:362983
 ret:-EINVAL    st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-pgm b/tests/ref/seek/lavf-pgm
index 2836367b04..ceac0085bc 100644
--- a/tests/ref/seek/lavf-pgm
+++ b/tests/ref/seek/lavf-pgm
@@ -5,7 +5,8 @@ ret:-EINVAL    st: 0 flags:0  ts: 0.800000
 ret:-EINVAL    st: 0 flags:1  ts:-0.320000
 ret:-EINVAL    st:-1 flags:0  ts: 2.576668
 ret:-EINVAL    st:-1 flags:1  ts: 1.470835
-ret:-EINVAL    st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:101391
 ret:-EINVAL    st: 0 flags:1  ts:-0.760000
 ret:-EINVAL    st:-1 flags:0  ts: 2.153336
 ret:-EINVAL    st:-1 flags:1  ts: 1.047503
@@ -16,12 +17,14 @@ ret:-EINVAL    st:-1 flags:1  ts: 0.624171
 ret:-EINVAL    st: 0 flags:0  ts:-0.480000
 ret:-EINVAL    st: 0 flags:1  ts: 2.400000
 ret:-EINVAL    st:-1 flags:0  ts: 1.306672
-ret:-EINVAL    st:-1 flags:1  ts: 0.200839
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size:101391
 ret:-EINVAL    st: 0 flags:0  ts:-0.920000
 ret:-EINVAL    st: 0 flags:1  ts: 2.000000
 ret:-EINVAL    st:-1 flags:0  ts: 0.883340
 ret:-EINVAL    st:-1 flags:1  ts:-0.222493
 ret:-EINVAL    st: 0 flags:0  ts: 2.680000
 ret:-EINVAL    st: 0 flags:1  ts: 1.560000
-ret:-EINVAL    st:-1 flags:0  ts: 0.460008
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:101391
 ret:-EINVAL    st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-pgmpipe b/tests/ref/seek/lavf-pgmpipe
index 8ba51807d8..66415c4160 100644
--- a/tests/ref/seek/lavf-pgmpipe
+++ b/tests/ref/seek/lavf-pgmpipe
@@ -1,27 +1,31 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:2534775
-ret:-EINVAL    st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:101391
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:101391
 ret:-EINVAL    st:-1 flags:1  ts: 1.894167
 ret:-EINVAL    st: 0 flags:0  ts: 0.800000
-ret:-EINVAL    st: 0 flags:1  ts:-0.320000
+ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-EINVAL    st:-1 flags:0  ts: 2.576668
 ret:-EINVAL    st:-1 flags:1  ts: 1.470835
 ret:-EINVAL    st: 0 flags:0  ts: 0.360000
-ret:-EINVAL    st: 0 flags:1  ts:-0.760000
+ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-EINVAL    st:-1 flags:0  ts: 2.153336
 ret:-EINVAL    st:-1 flags:1  ts: 1.047503
-ret:-EINVAL    st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:101391
 ret:-EINVAL    st: 0 flags:1  ts: 2.840000
 ret:-EINVAL    st:-1 flags:0  ts: 1.730004
 ret:-EINVAL    st:-1 flags:1  ts: 0.624171
-ret:-EINVAL    st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:101391
 ret:-EINVAL    st: 0 flags:1  ts: 2.400000
 ret:-EINVAL    st:-1 flags:0  ts: 1.306672
 ret:-EINVAL    st:-1 flags:1  ts: 0.200839
-ret:-EINVAL    st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:101391
 ret:-EINVAL    st: 0 flags:1  ts: 2.000000
 ret:-EINVAL    st:-1 flags:0  ts: 0.883340
-ret:-EINVAL    st:-1 flags:1  ts:-0.222493
+ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-EINVAL    st: 0 flags:0  ts: 2.680000
 ret:-EINVAL    st: 0 flags:1  ts: 1.560000
 ret:-EINVAL    st:-1 flags:0  ts: 0.460008
-ret:-EINVAL    st:-1 flags:1  ts:-0.645825
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-ppm b/tests/ref/seek/lavf-ppm
index 6376b5ec4a..6d53ce06e6 100644
--- a/tests/ref/seek/lavf-ppm
+++ b/tests/ref/seek/lavf-ppm
@@ -5,7 +5,8 @@ ret:-EINVAL    st: 0 flags:0  ts: 0.800000
 ret:-EINVAL    st: 0 flags:1  ts:-0.320000
 ret:-EINVAL    st:-1 flags:0  ts: 2.576668
 ret:-EINVAL    st:-1 flags:1  ts: 1.470835
-ret:-EINVAL    st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:304143
 ret:-EINVAL    st: 0 flags:1  ts:-0.760000
 ret:-EINVAL    st:-1 flags:0  ts: 2.153336
 ret:-EINVAL    st:-1 flags:1  ts: 1.047503
@@ -16,12 +17,14 @@ ret:-EINVAL    st:-1 flags:1  ts: 0.624171
 ret:-EINVAL    st: 0 flags:0  ts:-0.480000
 ret:-EINVAL    st: 0 flags:1  ts: 2.400000
 ret:-EINVAL    st:-1 flags:0  ts: 1.306672
-ret:-EINVAL    st:-1 flags:1  ts: 0.200839
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size:304143
 ret:-EINVAL    st: 0 flags:0  ts:-0.920000
 ret:-EINVAL    st: 0 flags:1  ts: 2.000000
 ret:-EINVAL    st:-1 flags:0  ts: 0.883340
 ret:-EINVAL    st:-1 flags:1  ts:-0.222493
 ret:-EINVAL    st: 0 flags:0  ts: 2.680000
 ret:-EINVAL    st: 0 flags:1  ts: 1.560000
-ret:-EINVAL    st:-1 flags:0  ts: 0.460008
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:304143
 ret:-EINVAL    st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-ppmpipe b/tests/ref/seek/lavf-ppmpipe
index 46c535af75..29a9425905 100644
--- a/tests/ref/seek/lavf-ppmpipe
+++ b/tests/ref/seek/lavf-ppmpipe
@@ -1,27 +1,31 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:7603575
-ret:-EINVAL    st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:304143
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:304143
 ret:-EINVAL    st:-1 flags:1  ts: 1.894167
 ret:-EINVAL    st: 0 flags:0  ts: 0.800000
-ret:-EINVAL    st: 0 flags:1  ts:-0.320000
+ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-EINVAL    st:-1 flags:0  ts: 2.576668
 ret:-EINVAL    st:-1 flags:1  ts: 1.470835
 ret:-EINVAL    st: 0 flags:0  ts: 0.360000
-ret:-EINVAL    st: 0 flags:1  ts:-0.760000
+ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-EINVAL    st:-1 flags:0  ts: 2.153336
 ret:-EINVAL    st:-1 flags:1  ts: 1.047503
-ret:-EINVAL    st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:304143
 ret:-EINVAL    st: 0 flags:1  ts: 2.840000
 ret:-EINVAL    st:-1 flags:0  ts: 1.730004
 ret:-EINVAL    st:-1 flags:1  ts: 0.624171
-ret:-EINVAL    st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:304143
 ret:-EINVAL    st: 0 flags:1  ts: 2.400000
 ret:-EINVAL    st:-1 flags:0  ts: 1.306672
 ret:-EINVAL    st:-1 flags:1  ts: 0.200839
-ret:-EINVAL    st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:304143
 ret:-EINVAL    st: 0 flags:1  ts: 2.000000
 ret:-EINVAL    st:-1 flags:0  ts: 0.883340
-ret:-EINVAL    st:-1 flags:1  ts:-0.222493
+ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-EINVAL    st: 0 flags:0  ts: 2.680000
 ret:-EINVAL    st: 0 flags:1  ts: 1.560000
 ret:-EINVAL    st:-1 flags:0  ts: 0.460008
-ret:-EINVAL    st:-1 flags:1  ts:-0.645825
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-rm b/tests/ref/seek/lavf-rm
index adce9e0895..4b1917300e 100644
--- a/tests/ref/seek/lavf-rm
+++ b/tests/ref/seek/lavf-rm
@@ -1,53 +1,53 @@
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    387 size:   278
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    395 size:   278
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314992 size: 31143
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314992 size: 31143
 ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
 ret: 0         st: 1 flags:0  ts: 2.577000
-ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346128 size:   278
+ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346138 size:   278
 ret: 0         st: 1 flags:1  ts: 1.471000
-ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346128 size:   278
+ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346138 size:   278
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 158515 size: 31134
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 158523 size: 31134
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
 ret: 0         st: 0 flags:0  ts: 2.153000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314992 size: 31143
 ret: 0         st: 0 flags:1  ts: 1.048000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314992 size: 31143
 ret: 0         st: 1 flags:0  ts:-0.058000
-ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    387 size:   278
+ret: 0         st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos:    395 size:   278
 ret: 0         st: 1 flags:1  ts: 2.836000
-ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346128 size:   278
+ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346138 size:   278
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314992 size: 31143
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 158515 size: 31134
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 158523 size: 31134
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314992 size: 31143
 ret: 0         st: 1 flags:0  ts: 1.307000
-ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346128 size:   278
+ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346138 size:   278
 ret: 0         st: 1 flags:1  ts: 0.201000
-ret: 0         st: 1 flags:1 dts: 0.174000 pts: 0.174000 pos:  78969 size:   278
+ret: 0         st: 1 flags:1 dts: 0.174000 pts: 0.174000 pos:  78977 size:   278
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314992 size: 31143
 ret: 0         st: 0 flags:0  ts: 0.883000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314982 size: 31143
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 314992 size: 31143
 ret: 0         st: 0 flags:1  ts:-0.222000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
 ret: 0         st: 1 flags:0  ts: 2.672000
-ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346128 size:   278
+ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346138 size:   278
 ret: 0         st: 1 flags:1  ts: 1.566000
-ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346128 size:   278
+ret: 0         st: 1 flags:1 dts: 0.975000 pts: 0.975000 pos: 346138 size:   278
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 158515 size: 31134
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 158523 size: 31134
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    688 size: 31082
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    696 size: 31082
diff --git a/tests/ref/seek/lavf-sgi b/tests/ref/seek/lavf-sgi
index 04c7b2b1a4..fac6ad9769 100644
--- a/tests/ref/seek/lavf-sgi
+++ b/tests/ref/seek/lavf-sgi
@@ -5,7 +5,8 @@ ret:-EINVAL    st: 0 flags:0  ts: 0.800000
 ret:-EINVAL    st: 0 flags:1  ts:-0.320000
 ret:-EINVAL    st:-1 flags:0  ts: 2.576668
 ret:-EINVAL    st:-1 flags:1  ts: 1.470835
-ret:-EINVAL    st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:307708
 ret:-EINVAL    st: 0 flags:1  ts:-0.760000
 ret:-EINVAL    st:-1 flags:0  ts: 2.153336
 ret:-EINVAL    st:-1 flags:1  ts: 1.047503
@@ -16,12 +17,14 @@ ret:-EINVAL    st:-1 flags:1  ts: 0.624171
 ret:-EINVAL    st: 0 flags:0  ts:-0.480000
 ret:-EINVAL    st: 0 flags:1  ts: 2.400000
 ret:-EINVAL    st:-1 flags:0  ts: 1.306672
-ret:-EINVAL    st:-1 flags:1  ts: 0.200839
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size:307430
 ret:-EINVAL    st: 0 flags:0  ts:-0.920000
 ret:-EINVAL    st: 0 flags:1  ts: 2.000000
 ret:-EINVAL    st:-1 flags:0  ts: 0.883340
 ret:-EINVAL    st:-1 flags:1  ts:-0.222493
 ret:-EINVAL    st: 0 flags:0  ts: 2.680000
 ret:-EINVAL    st: 0 flags:1  ts: 1.560000
-ret:-EINVAL    st:-1 flags:0  ts: 0.460008
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:306909
 ret:-EINVAL    st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-tga b/tests/ref/seek/lavf-tga
index 8f9075364f..ee7552a15d 100644
--- a/tests/ref/seek/lavf-tga
+++ b/tests/ref/seek/lavf-tga
@@ -5,7 +5,8 @@ ret:-EINVAL    st: 0 flags:0  ts: 0.800000
 ret:-EINVAL    st: 0 flags:1  ts:-0.320000
 ret:-EINVAL    st:-1 flags:0  ts: 2.576668
 ret:-EINVAL    st:-1 flags:1  ts: 1.470835
-ret:-EINVAL    st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:304172
 ret:-EINVAL    st: 0 flags:1  ts:-0.760000
 ret:-EINVAL    st:-1 flags:0  ts: 2.153336
 ret:-EINVAL    st:-1 flags:1  ts: 1.047503
@@ -16,12 +17,14 @@ ret:-EINVAL    st:-1 flags:1  ts: 0.624171
 ret:-EINVAL    st: 0 flags:0  ts:-0.480000
 ret:-EINVAL    st: 0 flags:1  ts: 2.400000
 ret:-EINVAL    st:-1 flags:0  ts: 1.306672
-ret:-EINVAL    st:-1 flags:1  ts: 0.200839
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size:304172
 ret:-EINVAL    st: 0 flags:0  ts:-0.920000
 ret:-EINVAL    st: 0 flags:1  ts: 2.000000
 ret:-EINVAL    st:-1 flags:0  ts: 0.883340
 ret:-EINVAL    st:-1 flags:1  ts:-0.222493
 ret:-EINVAL    st: 0 flags:0  ts: 2.680000
 ret:-EINVAL    st: 0 flags:1  ts: 1.560000
-ret:-EINVAL    st:-1 flags:0  ts: 0.460008
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:304172
 ret:-EINVAL    st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-tiff b/tests/ref/seek/lavf-tiff
index 1b49f2f2e7..0d9fb04484 100644
--- a/tests/ref/seek/lavf-tiff
+++ b/tests/ref/seek/lavf-tiff
@@ -5,7 +5,8 @@ ret:-EINVAL    st: 0 flags:0  ts: 0.800000
 ret:-EINVAL    st: 0 flags:1  ts:-0.320000
 ret:-EINVAL    st:-1 flags:0  ts: 2.576668
 ret:-EINVAL    st:-1 flags:1  ts: 1.470835
-ret:-EINVAL    st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:307150
 ret:-EINVAL    st: 0 flags:1  ts:-0.760000
 ret:-EINVAL    st:-1 flags:0  ts: 2.153336
 ret:-EINVAL    st:-1 flags:1  ts: 1.047503
@@ -16,12 +17,14 @@ ret:-EINVAL    st:-1 flags:1  ts: 0.624171
 ret:-EINVAL    st: 0 flags:0  ts:-0.480000
 ret:-EINVAL    st: 0 flags:1  ts: 2.400000
 ret:-EINVAL    st:-1 flags:0  ts: 1.306672
-ret:-EINVAL    st:-1 flags:1  ts: 0.200839
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size:307140
 ret:-EINVAL    st: 0 flags:0  ts:-0.920000
 ret:-EINVAL    st: 0 flags:1  ts: 2.000000
 ret:-EINVAL    st:-1 flags:0  ts: 0.883340
 ret:-EINVAL    st:-1 flags:1  ts:-0.222493
 ret:-EINVAL    st: 0 flags:0  ts: 2.680000
 ret:-EINVAL    st: 0 flags:1  ts: 1.560000
-ret:-EINVAL    st:-1 flags:0  ts: 0.460008
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:307140
 ret:-EINVAL    st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-ts b/tests/ref/seek/lavf-ts
index b31fab052c..e57651ef9c 100644
--- a/tests/ref/seek/lavf-ts
+++ b/tests/ref/seek/lavf-ts
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24813
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos:  44932 size: 14502
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.920000 pos: 189692 size: 24786
 ret: 0         st: 0 flags:0  ts: 0.788333
-ret: 0         st: 0 flags:0 dts: 1.560000 pts: 1.600000 pos:  74260 size: 13388
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st: 0 flags:1  ts:-0.317500
-ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24813
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st: 1 flags:0  ts: 2.576667
-ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 404576 size:   209
 ret: 0         st: 1 flags:1  ts: 1.470833
-ret: 0         st: 0 flags:0 dts: 2.120000 pts: 2.160000 pos: 294032 size: 13839
+ret: 0         st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size:   208
 ret: 0         st:-1 flags:0  ts: 0.365002
-ret: 0         st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos:  44932 size: 14502
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st:-1 flags:1  ts:-0.740831
-ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24813
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st: 0 flags:0  ts: 2.153333
-ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 1.794811 pts: 1.794811 pos: 322608 size:   209
 ret: 0         st: 0 flags:1  ts: 1.047500
-ret: 0         st: 0 flags:0 dts: 1.720000 pts: 1.760000 pos: 130096 size: 14133
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st: 1 flags:0  ts:-0.058333
-ret: 0         st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos:  44932 size: 14502
+ret: 0         st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size:   208
 ret: 0         st: 1 flags:1  ts: 2.835833
-ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 404576 size:   209
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size:   208
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24813
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st: 0 flags:0  ts:-0.481667
-ret: 0         st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos:  44932 size: 14502
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st: 0 flags:1  ts: 2.412500
-ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 404576 size:   209
 ret: 0         st: 1 flags:0  ts: 1.306667
-ret: 0         st: 0 flags:0 dts: 2.040000 pts: 2.080000 pos: 265644 size: 12390
+ret: 0         st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size:   208
 ret: 0         st: 1 flags:1  ts: 0.200844
-ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24813
+ret: 0         st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size:   208
 ret: 0         st:-1 flags:0  ts:-0.904994
-ret: 0         st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos:  44932 size: 14502
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st:-1 flags:1  ts: 1.989173
-ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
+ret: 0         st: 0 flags:0 dts: 1.960000 pts: 2.000000 pos: 235000 size: 15019
 ret: 0         st: 0 flags:0  ts: 0.883344
-ret: 0         st: 0 flags:0 dts: 1.640000 pts: 1.680000 pos: 102836 size: 12781
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st: 0 flags:1  ts:-0.222489
-ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24813
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st: 1 flags:0  ts: 2.671678
-ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 403636 size:   209
+ret: 0         st: 1 flags:1 dts: 2.160522 pts: 2.160522 pos: 404576 size:   209
 ret: 0         st: 1 flags:1  ts: 1.565844
-ret: 0         st: 0 flags:0 dts: 2.200000 pts: 2.240000 pos: 325240 size: 12679
+ret: 0         st: 1 flags:1 dts: 1.429089 pts: 1.429089 pos: 159988 size:   208
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:0 dts: 1.480000 pts: 1.520000 pos:  44932 size: 14502
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24813
+ret: 0         st: 0 flags:1 dts: 1.400000 pts: 1.440000 pos:    564 size: 24801
diff --git a/tests/ref/seek/lavf-voc b/tests/ref/seek/lavf-voc
index 387aef6cb8..014c251129 100644
--- a/tests/ref/seek/lavf-voc
+++ b/tests/ref/seek/lavf-voc
@@ -1,27 +1,44 @@
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  1024
-ret:-1         st:-1 flags:0  ts:-1.000000
-ret:-1         st:-1 flags:1  ts: 1.894167
-ret:-1         st: 0 flags:0  ts: 0.788335
-ret:-1         st: 0 flags:1  ts:-0.317508
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  1024
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret:-EOF
+ret: 0         st: 0 flags:0  ts: 0.788330
+ret: 0         st: 0 flags:1 dts: 0.800773 pts: 0.800773 pos:  34984 size:  1024
+ret:-1         st: 0 flags:1  ts:-0.317494
 ret:-1         st:-1 flags:0  ts: 2.576668
-ret:-1         st:-1 flags:1  ts: 1.470835
-ret:-1         st: 0 flags:0  ts: 0.365006
-ret:-1         st: 0 flags:1  ts:-0.740837
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret:-EOF
+ret: 0         st: 0 flags:0  ts: 0.365012
+ret: 0         st: 0 flags:1 dts: 0.376834 pts: 0.376834 pos:  16480 size:  1024
+ret:-1         st: 0 flags:1  ts:-0.740834
 ret:-1         st:-1 flags:0  ts: 2.153336
-ret:-1         st:-1 flags:1  ts: 1.047503
-ret:-1         st: 0 flags:0  ts:-0.058323
-ret:-1         st: 0 flags:1  ts: 2.835834
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret:-EOF
+ret: 0         st: 0 flags:0  ts:-0.058328
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  1024
+ret: 0         st: 0 flags:1  ts: 2.835848
+ret:-EOF
 ret:-1         st:-1 flags:0  ts: 1.730004
-ret:-1         st:-1 flags:1  ts: 0.624171
-ret:-1         st: 0 flags:0  ts:-0.481652
-ret:-1         st: 0 flags:1  ts: 2.412505
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.612356 pts: 0.612356 pos:  26760 size:  1024
+ret: 0         st: 0 flags:0  ts:-0.481669
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  1024
+ret: 0         st: 0 flags:1  ts: 2.412507
+ret:-EOF
 ret:-1         st:-1 flags:0  ts: 1.306672
-ret:-1         st:-1 flags:1  ts: 0.200839
-ret:-1         st: 0 flags:0  ts:-0.905003
-ret:-1         st: 0 flags:1  ts: 1.989176
-ret:-1         st:-1 flags:0  ts: 0.883340
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.188417 pts: 0.188417 pos:   8256 size:  1024
+ret: 0         st: 0 flags:0  ts:-0.904986
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     32 size:  1024
+ret: 0         st: 0 flags:1  ts: 1.989167
+ret:-EOF
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.894981 pts: 0.894981 pos:  39096 size:  1024
 ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.671668
-ret:-1         st: 0 flags:1  ts: 1.565847
-ret:-1         st:-1 flags:0  ts: 0.460008
+ret:-1         st: 0 flags:0  ts: 2.671673
+ret: 0         st: 0 flags:1  ts: 1.565849
+ret:-EOF
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.471043 pts: 0.471043 pos:  20592 size:  1024
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/lavf-wav b/tests/ref/seek/lavf-wav
index 1a9cfc54c7..ed2f8d62de 100644
--- a/tests/ref/seek/lavf-wav
+++ b/tests/ref/seek/lavf-wav
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     74 size:  4096
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     74 size:  4096
 ret: 0         st:-1 flags:1  ts: 1.894167
 ret:-EOF
 ret: 0         st: 0 flags:0  ts: 0.788345
-ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos:  69578 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos:  69606 size:  4096
 ret: 0         st: 0 flags:1  ts:-0.317506
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     74 size:  4096
 ret: 0         st:-1 flags:0  ts: 2.576668
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 1.470835
 ret:-EOF
 ret: 0         st: 0 flags:0  ts: 0.365011
-ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos:  32240 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos:  32268 size:  4096
 ret: 0         st: 0 flags:1  ts:-0.740839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     74 size:  4096
 ret: 0         st:-1 flags:0  ts: 2.153336
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 1.047503
 ret:-EOF
 ret: 0         st: 0 flags:0  ts:-0.058322
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     74 size:  4096
 ret: 0         st: 0 flags:1  ts: 2.835828
 ret:-EOF
 ret: 0         st:-1 flags:0  ts: 1.730004
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos:  55098 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos:  55126 size:  4096
 ret: 0         st: 0 flags:0  ts:-0.481655
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     74 size:  4096
 ret: 0         st: 0 flags:1  ts: 2.412494
 ret:-EOF
 ret: 0         st:-1 flags:0  ts: 1.306672
 ret:-EOF
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  17760 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  17788 size:  4096
 ret: 0         st: 0 flags:0  ts:-0.904989
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     74 size:  4096
 ret: 0         st: 0 flags:1  ts: 1.989184
 ret:-EOF
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  77956 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  77984 size:  4096
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     74 size:  4096
 ret: 0         st: 0 flags:0  ts: 2.671678
 ret:-EOF
 ret: 0         st: 0 flags:1  ts: 1.565850
 ret:-EOF
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  40618 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  40646 size:  4096
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     74 size:  4096
diff --git a/tests/ref/seek/lavf-wtv b/tests/ref/seek/lavf-wtv
new file mode 100644
index 0000000000..355ab98d85
--- /dev/null
+++ b/tests/ref/seek/lavf-wtv
@@ -0,0 +1,48 @@
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294672 size:   209
+ret: 0         st: 0 flags:0  ts: 0.788334
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294672 size:   209
+ret: 0         st: 0 flags:1  ts:-0.317499
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
+ret:-1         st: 1 flags:0  ts: 2.576668
+ret: 0         st: 1 flags:1  ts: 1.470835
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294672 size:   209
+ret: 0         st:-1 flags:0  ts: 0.365002
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
+ret: 0         st:-1 flags:1  ts:-0.740831
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
+ret:-1         st: 0 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1  ts: 1.047503
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
+ret: 0         st: 1 flags:0  ts:-0.058330
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
+ret: 0         st: 1 flags:1  ts: 2.835837
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294672 size:   209
+ret:-1         st:-1 flags:0  ts: 1.730004
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294672 size:   209
+ret:-1         st: 1 flags:0  ts: 1.306672
+ret: 0         st: 1 flags:1  ts: 0.200839
+ret: 0         st: 1 flags:1 dts: 0.211950 pts: 0.211950 pos:  99280 size:   209
+ret: 0         st:-1 flags:0  ts:-0.904994
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
+ret: 0         st:-1 flags:1  ts: 1.989173
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294672 size:   209
+ret: 0         st: 0 flags:0  ts: 0.883340
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294672 size:   209
+ret: 0         st: 0 flags:1  ts:-0.222493
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
+ret:-1         st: 1 flags:0  ts: 2.671674
+ret: 0         st: 1 flags:1  ts: 1.565841
+ret: 0         st: 1 flags:1 dts: 0.734399 pts: 0.734399 pos: 294672 size:   209
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 1 flags:1 dts: 0.029093 pts: 0.029093 pos:  26272 size:   208
diff --git a/tests/ref/seek/lavf-yuv4mpeg b/tests/ref/seek/lavf-yuv4mpeg
index 81c1de9aa3..6be9ba9480 100644
--- a/tests/ref/seek/lavf-yuv4mpeg
+++ b/tests/ref/seek/lavf-yuv4mpeg
@@ -1,27 +1,45 @@
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     64 size:152064
 ret:-1         st:-1 flags:0  ts:-1.000000
-ret:-1         st:-1 flags:1  ts: 1.894167
-ret:-1         st: 0 flags:0  ts: 0.800000
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret:-EOF
+ret: 0         st: 0 flags:0  ts: 0.800000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3041464 size:152064
 ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret:-1         st:-1 flags:1  ts: 1.470835
-ret:-1         st: 0 flags:0  ts: 0.360000
+ret: 0         st:-1 flags:0  ts: 2.576668
+ret:-EOF
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret:-EOF
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1368694 size:152064
 ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret:-1         st:-1 flags:1  ts: 1.047503
+ret: 0         st:-1 flags:0  ts: 2.153336
+ret:-EOF
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret:-EOF
 ret:-1         st: 0 flags:0  ts:-0.040000
-ret:-1         st: 0 flags:1  ts: 2.840000
-ret:-1         st:-1 flags:0  ts: 1.730004
-ret:-1         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1  ts: 2.840000
+ret:-EOF
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret:-EOF
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2433184 size:152064
 ret:-1         st: 0 flags:0  ts:-0.480000
-ret:-1         st: 0 flags:1  ts: 2.400000
-ret:-1         st:-1 flags:0  ts: 1.306672
-ret:-1         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1  ts: 2.400000
+ret:-EOF
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret:-EOF
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 760414 size:152064
 ret:-1         st: 0 flags:0  ts:-0.920000
-ret:-1         st: 0 flags:1  ts: 2.000000
-ret:-1         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1  ts: 2.000000
+ret:-EOF
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3345604 size:152064
 ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret:-1         st: 0 flags:1  ts: 1.560000
-ret:-1         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:0  ts: 2.680000
+ret:-EOF
+ret: 0         st: 0 flags:1  ts: 1.560000
+ret:-EOF
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1824904 size:152064
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/mkv-codec-delay b/tests/ref/seek/mkv-codec-delay
new file mode 100644
index 0000000000..04561eb876
--- /dev/null
+++ b/tests/ref/seek/mkv-codec-delay
@@ -0,0 +1,48 @@
+ret: 0         st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos:    748 size:   320
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos:    748 size:   320
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos:   9306 size:   268
+ret: 0         st: 0 flags:0  ts: 0.788000
+ret: 0         st: 0 flags:1 dts: 0.794000 pts: 0.794000 pos:   7358 size:   154
+ret: 0         st: 0 flags:1  ts:-0.317000
+ret: 0         st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos:    748 size:   320
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos:   9306 size:   268
+ret: 0         st: 0 flags:0  ts: 0.365000
+ret: 0         st: 0 flags:1 dts: 0.374000 pts: 0.374000 pos:   3963 size:   150
+ret: 0         st: 0 flags:1  ts:-0.741000
+ret: 0         st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos:    748 size:   320
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos:   9306 size:   268
+ret: 0         st: 0 flags:0  ts:-0.058000
+ret: 0         st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos:    748 size:   320
+ret: 0         st: 0 flags:1  ts: 2.836000
+ret: 0         st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos:   9306 size:   268
+ret:-1         st:-1 flags:0  ts: 1.730004
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.614000 pts: 0.614000 pos:   5903 size:   159
+ret: 0         st: 0 flags:0  ts:-0.482000
+ret: 0         st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos:    748 size:   320
+ret: 0         st: 0 flags:1  ts: 2.413000
+ret: 0         st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos:   9306 size:   268
+ret:-1         st:-1 flags:0  ts: 1.306672
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.194000 pts: 0.194000 pos:   2512 size:   159
+ret: 0         st: 0 flags:0  ts:-0.905000
+ret: 0         st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos:    748 size:   320
+ret: 0         st: 0 flags:1  ts: 1.989000
+ret: 0         st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos:   9306 size:   268
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.894000 pts: 0.894000 pos:   8154 size:   155
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos:    748 size:   320
+ret:-1         st: 0 flags:0  ts: 2.672000
+ret: 0         st: 0 flags:1  ts: 1.566000
+ret: 0         st: 0 flags:1 dts: 1.014000 pts: 1.014000 pos:   9306 size:   268
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.474000 pts: 0.474000 pos:   4768 size:   153
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts:-0.007000 pts:-0.007000 pos:    748 size:   320
diff --git a/tests/ref/seek/vsynth2-jpegls b/tests/ref/seek/vsynth2-jpegls
deleted file mode 100644
index 1b27a3654a..0000000000
--- a/tests/ref/seek/vsynth2-jpegls
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:154766
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:154766
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:7767024 size:181048
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3057326 size:163405
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:5971676 size:177984
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1334822 size:150568
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:4056260 size:170347
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:154766
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:8129364 size:181472
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:7045426 size:180307
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2414840 size:159022
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:154766
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:8129364 size:181472
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:5265990 size:175400
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 742066 size:147109
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:154766
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:8129364 size:181472
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3385508 size:165810
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:6328220 size:178473
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1789916 size:154383
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-ljpeg b/tests/ref/seek/vsynth2-ljpeg
deleted file mode 100644
index 47f64c6dda..0000000000
--- a/tests/ref/seek/vsynth2-ljpeg
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 86580
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 86580
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:4406068 size:102731
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:1761620 size: 92236
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:3394414 size: 99800
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 778564 size: 87118
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:2323284 size: 95279
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 86580
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4611786 size:103108
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:3997920 size:101607
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:1397770 size: 90251
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 86580
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4611786 size:103108
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:2999316 size: 98183
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 433426 size: 85897
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 86580
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4611786 size:103108
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:1946636 size: 93348
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:3594390 size:100410
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1041206 size: 88501
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mjpeg b/tests/ref/seek/vsynth2-mjpeg
deleted file mode 100644
index 6072ddfb97..0000000000
--- a/tests/ref/seek/vsynth2-mjpeg
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 14531
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 14531
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 771990 size: 19172
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 294112 size: 15816
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 584836 size: 18250
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 130062 size: 14140
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 391598 size: 16843
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 14531
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 810344 size: 19135
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 696224 size: 18821
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 232462 size: 15159
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 14531
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 810344 size: 19135
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 512664 size: 17924
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:  74366 size: 13812
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 14531
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 810344 size: 19135
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 325950 size: 16219
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 621546 size: 18498
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 173092 size: 14609
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg1 b/tests/ref/seek/vsynth2-mpeg1
deleted file mode 100644
index 52eef058ae..0000000000
--- a/tests/ref/seek/vsynth2-mpeg1
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 11963
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11963
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 168537 size: 15165
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 103348 size: 13767
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 168537 size: 15165
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  48976 size: 12270
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 103348 size: 13767
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11963
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 240894 size: 16003
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 240894 size: 16003
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  48976 size: 12270
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11963
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 240894 size: 16003
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 168537 size: 15165
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11963
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11963
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 240894 size: 16003
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 103348 size: 13767
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 168537 size: 15165
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  48976 size: 12270
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg1b b/tests/ref/seek/vsynth2-mpeg1b
deleted file mode 100644
index 6e3af809f3..0000000000
--- a/tests/ref/seek/vsynth2-mpeg1b
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 14617
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 14617
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 255467 size: 19667
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: NOPTS    pos: 101700 size: 16809
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: NOPTS    pos: 172617 size: 18608
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: NOPTS    pos:  43550 size: 14859
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: NOPTS    pos: 101700 size: 16809
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 14617
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 255467 size: 19667
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 255467 size: 19667
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: NOPTS    pos:  43550 size: 14859
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 14617
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 255467 size: 19667
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: NOPTS    pos: 172617 size: 18608
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 14617
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 14617
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 255467 size: 19667
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: NOPTS    pos: 172617 size: 18608
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: NOPTS    pos: 172617 size: 18608
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.840000 pts: NOPTS    pos: 101700 size: 16809
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg2-422 b/tests/ref/seek/vsynth2-mpeg2-422
deleted file mode 100644
index d2a79baa06..0000000000
--- a/tests/ref/seek/vsynth2-mpeg2-422
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 19047
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 19047
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 349153 size: 20638
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 231235 size: 21776
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 291308 size: 22619
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 128388 size: 34098
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 231235 size: 21776
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 19047
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 349153 size: 20638
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 349153 size: 20638
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 128388 size: 34098
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 19047
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 349153 size: 20638
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 291308 size: 22619
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 19047
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 19047
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 349153 size: 20638
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 231235 size: 21776
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 291308 size: 22619
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 231235 size: 21776
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg2-idct-int b/tests/ref/seek/vsynth2-mpeg2-idct-int
deleted file mode 100644
index 0b369e2498..0000000000
--- a/tests/ref/seek/vsynth2-mpeg2-idct-int
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12092
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12092
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 172048 size: 15287
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 105687 size: 13892
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 172048 size: 15287
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  50238 size: 12392
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 105687 size: 13892
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12092
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 245946 size: 16133
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 245946 size: 16133
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  50238 size: 12392
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12092
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 245946 size: 16133
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 172048 size: 15287
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12092
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12092
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 245946 size: 16133
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 105687 size: 13892
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 172048 size: 15287
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  50238 size: 12392
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg2-ivlc-qprd b/tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
deleted file mode 100644
index 9b6174f2db..0000000000
--- a/tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17896
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17896
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 253840 size: 12176
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 192257 size: 13312
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 223884 size: 13628
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 119729 size: 33112
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 192257 size: 13312
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17896
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 253840 size: 12176
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 253840 size: 12176
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 119729 size: 33112
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17896
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 253840 size: 12176
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 223884 size: 13628
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17896
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17896
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 253840 size: 12176
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 192257 size: 13312
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 223884 size: 13628
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 192257 size: 13312
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg4 b/tests/ref/seek/vsynth2-mpeg4
deleted file mode 100644
index 36ba46c06c..0000000000
--- a/tests/ref/seek/vsynth2-mpeg4
+++ /dev/null
@@ -1,50 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size: 10965
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size: 10965
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  98347 size: 14396
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  60954 size: 12631
-ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size: 10965
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  98347 size: 14396
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29166 size: 10862
-ret: 0         st: 0 flags:1  ts:-0.760000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size: 10965
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  60954 size: 12631
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size: 10965
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 141019 size: 15358
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 141019 size: 15358
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29166 size: 10862
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size: 10965
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 141019 size: 15358
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  98347 size: 14396
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size: 10965
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size: 10965
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 141019 size: 15358
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  60954 size: 12631
-ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size: 10965
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  98347 size: 14396
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29166 size: 10862
-ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size: 10965
diff --git a/tests/ref/seek/vsynth2-mpeg4-adap b/tests/ref/seek/vsynth2-mpeg4-adap
deleted file mode 100644
index 152d020ff3..0000000000
--- a/tests/ref/seek/vsynth2-mpeg4-adap
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size:  6951
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size:  6951
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 189122 size: 18125
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 114966 size: 16429
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 151228 size: 18225
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  73890 size: 20238
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 114966 size: 16429
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size:  6951
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 189122 size: 18125
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 189122 size: 18125
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  73890 size: 20238
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size:  6951
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 189122 size: 18125
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 151228 size: 18225
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size:  6951
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size:  6951
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 189122 size: 18125
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 114966 size: 16429
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 151228 size: 18225
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 114966 size: 16429
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg4-error b/tests/ref/seek/vsynth2-mpeg4-error
deleted file mode 100644
index 45550476b1..0000000000
--- a/tests/ref/seek/vsynth2-mpeg4-error
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 14897
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 14897
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 158910 size: 19939
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 100670 size: 17313
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 158910 size: 19939
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  50630 size: 14739
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 100670 size: 17313
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 14897
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 226622 size: 19001
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 226622 size: 19001
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  50630 size: 14739
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 14897
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 226622 size: 19001
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 158910 size: 19939
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 14897
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 14897
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 226622 size: 19001
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 100670 size: 17313
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 158910 size: 19939
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  50630 size: 14739
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg4-rc b/tests/ref/seek/vsynth2-mpeg4-rc
deleted file mode 100644
index 21aca4c8ae..0000000000
--- a/tests/ref/seek/vsynth2-mpeg4-rc
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 20139
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 20139
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 236670 size: 14086
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 185808 size: 12662
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 210456 size: 14427
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 114894 size: 39545
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 185808 size: 12662
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 20139
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 236670 size: 14086
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 236670 size: 14086
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 114894 size: 39545
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 20139
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 236670 size: 14086
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 210456 size: 14427
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 20139
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 20139
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 236670 size: 14086
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 185808 size: 12662
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 210456 size: 14427
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 185808 size: 12662
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg4-thread b/tests/ref/seek/vsynth2-mpeg4-thread
deleted file mode 100644
index 2b0f0d310c..0000000000
--- a/tests/ref/seek/vsynth2-mpeg4-thread
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 18099
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 18099
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 247612 size: 15696
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 186128 size: 14685
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 215778 size: 16807
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 117134 size: 37486
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 186128 size: 14685
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 18099
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 247612 size: 15696
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 247612 size: 15696
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 117134 size: 37486
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 18099
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 247612 size: 15696
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 215778 size: 16807
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 18099
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 18099
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 247612 size: 15696
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 186128 size: 14685
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 215778 size: 16807
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 186128 size: 14685
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-svq1 b/tests/ref/seek/vsynth2-svq1
deleted file mode 100644
index 5b90ec8049..0000000000
--- a/tests/ref/seek/vsynth2-svq1
+++ /dev/null
@@ -1,50 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 25188
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 25188
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 630104 size: 31344
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 392428 size: 28568
-ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 25188
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 630104 size: 31344
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 185116 size: 25544
-ret: 0         st: 0 flags:1  ts:-0.760000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 25188
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 392428 size: 28568
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 25188
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 886184 size: 32128
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 886184 size: 32128
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 185116 size: 25544
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 25188
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 886184 size: 32128
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 630104 size: 31344
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 25188
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 25188
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 886184 size: 32128
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 392428 size: 28568
-ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 25188
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 630104 size: 31344
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 185116 size: 25544
-ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 25188
diff --git a/tests/ref/seek/vsynth2-wmv1 b/tests/ref/seek/vsynth2-wmv1
deleted file mode 100644
index 47b79b80ee..0000000000
--- a/tests/ref/seek/vsynth2-wmv1
+++ /dev/null
@@ -1,46 +0,0 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11126
-ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11126
-ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 108444 size: 14988
-ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  69132 size: 13137
-ret:-1         st: 0 flags:1  ts:-0.320000
-ret:-1         st:-1 flags:0  ts: 2.576668
-ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 108444 size: 14988
-ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35874 size: 11167
-ret:-1         st: 0 flags:1  ts:-0.760000
-ret:-1         st:-1 flags:0  ts: 2.153336
-ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  69132 size: 13137
-ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11126
-ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 153546 size: 15956
-ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 153546 size: 15956
-ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35874 size: 11167
-ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11126
-ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 153546 size: 15956
-ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 108444 size: 14988
-ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11126
-ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11126
-ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 153546 size: 15956
-ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  69132 size: 13137
-ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 108444 size: 14988
-ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35874 size: 11167
-ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-asv1 b/tests/ref/seek/vsynth_lena-asv1
index b3cca3b0c7..0957d84000 100644
--- a/tests/ref/seek/vsynth2-asv1
+++ b/tests/ref/seek/vsynth_lena-asv1
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size: 17484
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12152
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size: 17484
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12152
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 939696 size: 22704
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 643348 size: 15064
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 364636 size: 19476
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 255236 size: 13312
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 717284 size: 21768
+ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 493588 size: 14796
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 160544 size: 17672
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 114856 size: 12356
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 484496 size: 20396
+ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 336184 size: 13824
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size: 17484
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12152
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 985140 size: 22640
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 673508 size: 15104
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 849824 size: 22364
+ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 583316 size: 14956
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 288188 size: 18920
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 202876 size: 12944
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size: 17484
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12152
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 985140 size: 22640
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 673508 size: 15104
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 631032 size: 21416
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 435132 size: 14488
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:  90952 size: 17244
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:  65868 size: 12144
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size: 17484
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12152
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 985140 size: 22640
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 673508 size: 15104
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 403836 size: 20024
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 281888 size: 13412
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 761056 size: 22012
+ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 523328 size: 14972
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 214224 size: 18228
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 152060 size: 12540
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-asv2 b/tests/ref/seek/vsynth_lena-asv2
index 906c2358e4..1a3c93f5d3 100644
--- a/tests/ref/seek/vsynth2-asv2
+++ b/tests/ref/seek/vsynth_lena-asv2
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size: 16584
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12072
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size: 16584
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12072
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 891064 size: 21664
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 630032 size: 14892
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 343044 size: 18440
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 248840 size: 13024
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 678500 size: 20848
+ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 482704 size: 14532
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 151024 size: 16584
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 111604 size: 12016
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 456544 size: 19448
+ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 328256 size: 13532
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size: 16584
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12072
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 934400 size: 21624
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 659852 size: 14928
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 805248 size: 21364
+ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 570788 size: 14712
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 271044 size: 17784
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 197540 size: 12724
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size: 16584
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12072
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 934400 size: 21624
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 659852 size: 14928
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 596008 size: 20456
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 425320 size: 14116
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:  85924 size: 16152
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:  64108 size: 11780
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size: 16584
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5660 size: 12072
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 934400 size: 21624
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 659852 size: 14928
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 380220 size: 18948
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 274968 size: 13176
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 720420 size: 21060
+ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 511948 size: 14668
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 201408 size: 17128
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 147824 size: 12240
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-dnxhd-1080i b/tests/ref/seek/vsynth_lena-dnxhd-1080i
index 6c41d67986..a5f0ce916c 100644
--- a/tests/ref/seek/vsynth2-dnxhd-1080i
+++ b/tests/ref/seek/vsynth_lena-dnxhd-1080i
@@ -3,41 +3,41 @@ ret: 0         st:-1 flags:0  ts:-1.000000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:606208
 ret: 0         st:-1 flags:1  ts: 1.894167
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208
-ret:-1         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1  ts:-0.320000
+ret:-1         st: 0 flags:0  ts: 0.788359
+ret: 0         st: 0 flags:1  ts:-0.317500
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:606208
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208
-ret:-1         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1  ts:-0.760000
+ret:-1         st: 0 flags:0  ts: 0.365000
+ret: 0         st: 0 flags:1  ts:-0.740859
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:606208
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208
-ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:0  ts:-0.058359
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:606208
-ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1  ts: 2.835859
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208
 ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208
-ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:0  ts:-0.481641
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:606208
-ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1  ts: 2.412500
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208
 ret:-1         st:-1 flags:0  ts: 1.306672
 ret: 0         st:-1 flags:1  ts: 0.200839
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208
-ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:0  ts:-0.905000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:606208
-ret: 0         st: 0 flags:1  ts: 2.000000
+ret: 0         st: 0 flags:1  ts: 1.989141
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208
 ret:-1         st:-1 flags:0  ts: 0.883340
 ret: 0         st:-1 flags:1  ts:-0.222493
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size:606208
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
+ret:-1         st: 0 flags:0  ts: 2.671641
+ret: 0         st: 0 flags:1  ts: 1.565859
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:2424868 size:606208
 ret:-1         st:-1 flags:0  ts: 0.460008
 ret: 0         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-dnxhd-4k-hr-lb b/tests/ref/seek/vsynth_lena-dnxhd-4k-hr-lb
new file mode 100644
index 0000000000..115b977912
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-dnxhd-4k-hr-lb
@@ -0,0 +1,40 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:798720
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:798720
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:3194880 size:798720
+ret:-1         st: 0 flags:0  ts: 0.788334
+ret:-1         st: 0 flags:1  ts:-0.317499
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:3194880 size:798720
+ret:-1         st: 0 flags:0  ts: 0.365002
+ret:-1         st: 0 flags:1  ts:-0.740831
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:3194880 size:798720
+ret: 0         st: 0 flags:0  ts:-0.058330
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:798720
+ret: 0         st: 0 flags:1  ts: 2.835837
+ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:3194880 size:798720
+ret:-1         st:-1 flags:0  ts: 1.730004
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:3194880 size:798720
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:798720
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:3194880 size:798720
+ret:-1         st:-1 flags:0  ts: 1.306672
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:3194880 size:798720
+ret: 0         st: 0 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:798720
+ret: 0         st: 0 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:3194880 size:798720
+ret:-1         st:-1 flags:0  ts: 0.883340
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1  ts: 1.565841
+ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:3194880 size:798720
+ret:-1         st:-1 flags:0  ts: 0.460008
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-dnxhd-720p-rd b/tests/ref/seek/vsynth_lena-dnxhd-720p
index b6398b60d7..b57f07dd71 100644
--- a/tests/ref/seek/vsynth2-dnxhd-720p-rd
+++ b/tests/ref/seek/vsynth_lena-dnxhd-720p
@@ -3,38 +3,38 @@ ret: 0         st:-1 flags:0  ts:-1.000000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:458752
 ret: 0         st:-1 flags:1  ts: 1.894167
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
-ret:-1         st: 0 flags:0  ts: 0.800000
-ret:-1         st: 0 flags:1  ts:-0.320000
+ret:-1         st: 0 flags:0  ts: 0.788334
+ret:-1         st: 0 flags:1  ts:-0.317499
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
-ret:-1         st: 0 flags:0  ts: 0.360000
-ret:-1         st: 0 flags:1  ts:-0.760000
+ret:-1         st: 0 flags:0  ts: 0.365002
+ret:-1         st: 0 flags:1  ts:-0.740831
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
-ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:0  ts:-0.058330
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:458752
-ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1  ts: 2.835837
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
 ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
-ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:0  ts:-0.481662
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:458752
-ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1  ts: 2.412505
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
 ret:-1         st:-1 flags:0  ts: 1.306672
 ret: 0         st:-1 flags:1  ts: 0.200839
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
-ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:0  ts:-0.904994
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:458752
-ret: 0         st: 0 flags:1  ts: 2.000000
+ret: 0         st: 0 flags:1  ts: 1.989173
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
 ret:-1         st:-1 flags:0  ts: 0.883340
 ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
+ret:-1         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1  ts: 1.565841
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
 ret:-1         st:-1 flags:0  ts: 0.460008
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-dnxhd-720p b/tests/ref/seek/vsynth_lena-dnxhd-720p-rd
index b6398b60d7..b57f07dd71 100644
--- a/tests/ref/seek/vsynth2-dnxhd-720p
+++ b/tests/ref/seek/vsynth_lena-dnxhd-720p-rd
@@ -3,38 +3,38 @@ ret: 0         st:-1 flags:0  ts:-1.000000
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:458752
 ret: 0         st:-1 flags:1  ts: 1.894167
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
-ret:-1         st: 0 flags:0  ts: 0.800000
-ret:-1         st: 0 flags:1  ts:-0.320000
+ret:-1         st: 0 flags:0  ts: 0.788334
+ret:-1         st: 0 flags:1  ts:-0.317499
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
-ret:-1         st: 0 flags:0  ts: 0.360000
-ret:-1         st: 0 flags:1  ts:-0.760000
+ret:-1         st: 0 flags:0  ts: 0.365002
+ret:-1         st: 0 flags:1  ts:-0.740831
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
-ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:0  ts:-0.058330
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:458752
-ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1  ts: 2.835837
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
 ret:-1         st:-1 flags:0  ts: 1.730004
 ret: 0         st:-1 flags:1  ts: 0.624171
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
-ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:0  ts:-0.481662
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:458752
-ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1  ts: 2.412505
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
 ret:-1         st:-1 flags:0  ts: 1.306672
 ret: 0         st:-1 flags:1  ts: 0.200839
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
-ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:0  ts:-0.904994
 ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:458752
-ret: 0         st: 0 flags:1  ts: 2.000000
+ret: 0         st: 0 flags:1  ts: 1.989173
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
 ret:-1         st:-1 flags:0  ts: 0.883340
 ret:-1         st:-1 flags:1  ts:-0.222493
-ret:-1         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1  ts: 1.560000
+ret:-1         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1  ts: 1.565841
 ret: 0         st: 0 flags:1 dts: 0.160000 pts: 0.160000 pos:1835008 size:458752
 ret:-1         st:-1 flags:0  ts: 0.460008
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-dv-50 b/tests/ref/seek/vsynth_lena-dv
index 1f07e5b71f..d318794157 100644
--- a/tests/ref/seek/vsynth2-dv-50
+++ b/tests/ref/seek/vsynth_lena-dv
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:6768000 size:144000
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:2880000 size:144000
 ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:5328000 size:144000
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1296000 size:144000
 ret: 0         st: 0 flags:1  ts:-0.760000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:3744000 size:144000
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:6192000 size:144000
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2304000 size:144000
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:4752000 size:144000
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 720000 size:144000
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3168000 size:144000
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:5616000 size:144000
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1728000 size:144000
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:288000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
diff --git a/tests/ref/seek/vsynth2-dv b/tests/ref/seek/vsynth_lena-dv-411
index baaeefb2cf..d318794157 100644
--- a/tests/ref/seek/vsynth2-dv
+++ b/tests/ref/seek/vsynth_lena-dv-411
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:6768000 size:144000
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:2880000 size:144000
 ret: 0         st: 0 flags:1  ts:-0.320000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:5328000 size:144000
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1296000 size:144000
 ret: 0         st: 0 flags:1  ts:-0.760000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:3744000 size:144000
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:6192000 size:144000
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2304000 size:144000
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:4752000 size:144000
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 720000 size:144000
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3168000 size:144000
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
 ret: 0         st: 0 flags:0  ts: 2.680000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7056000 size:144000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:5616000 size:144000
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1728000 size:144000
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     -1 size:144000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:144000
diff --git a/tests/ref/seek/vsynth_lena-dv-50 b/tests/ref/seek/vsynth_lena-dv-50
new file mode 100644
index 0000000000..fae6d1b225
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-dv-50
@@ -0,0 +1,53 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:13536000 size:288000
+ret: 0         st: 0 flags:0  ts: 0.800000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:5760000 size:288000
+ret: 0         st: 0 flags:1  ts:-0.320000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ret: 0         st:-1 flags:0  ts: 2.576668
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:10656000 size:288000
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:2592000 size:288000
+ret: 0         st: 0 flags:1  ts:-0.760000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ret: 0         st:-1 flags:0  ts: 2.153336
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:7488000 size:288000
+ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:12384000 size:288000
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:4608000 size:288000
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:9504000 size:288000
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1440000 size:288000
+ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ret: 0         st: 0 flags:1  ts: 2.000000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:6336000 size:288000
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
+ret: 0         st: 0 flags:0  ts: 2.680000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14112000 size:288000
+ret: 0         st: 0 flags:1  ts: 1.560000
+ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:11232000 size:288000
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:3456000 size:288000
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:288000
diff --git a/tests/ref/seek/vsynth2-ffv1 b/tests/ref/seek/vsynth_lena-ffv1
index c0a89509ce..57583686d4 100644
--- a/tests/ref/seek/vsynth2-ffv1
+++ b/tests/ref/seek/vsynth_lena-ffv1
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5690 size: 71796
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5694 size: 71707
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5690 size: 71796
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5694 size: 71707
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2590398 size: 81816
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2499442 size: 75965
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1666848 size: 77232
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1631574 size: 72710
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2590398 size: 81816
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2499442 size: 75965
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 808720 size: 70724
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801638 size: 69485
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1666848 size: 77232
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1631574 size: 72710
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5690 size: 71796
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5694 size: 71707
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3552258 size: 83766
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3393894 size: 77489
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3552258 size: 83766
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3393894 size: 77489
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 808720 size: 70724
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801638 size: 69485
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5690 size: 71796
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5694 size: 71707
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3552258 size: 83766
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3393894 size: 77489
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2590398 size: 81816
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2499442 size: 75965
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5690 size: 71796
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5694 size: 71707
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5690 size: 71796
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5694 size: 71707
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3552258 size: 83766
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:3393894 size: 77489
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1666848 size: 77232
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1631574 size: 72710
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2590398 size: 81816
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:2499442 size: 75965
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 808720 size: 70724
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 801638 size: 69485
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-flashsv b/tests/ref/seek/vsynth_lena-flashsv
index 82acde81d6..25176ba817 100644
--- a/tests/ref/seek/vsynth2-flashsv
+++ b/tests/ref/seek/vsynth_lena-flashsv
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size:219405
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    187 size:240757
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size:219405
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    187 size:240757
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:10902646 size:244577
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:11605750 size:254053
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:4458610 size:230521
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:4820505 size:245503
 ret:-1         st: 0 flags:1  ts:-0.317000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:8234830 size:240794
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:8811899 size:253041
 ret: 0         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: 0.400000 pos:2201083 size:221959
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: 0.400000 pos:2387440 size:241101
 ret:-1         st: 0 flags:1  ts:-0.741000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:5853907 size:235507
+ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:6302822 size:248927
 ret: 0         st: 0 flags:0  ts:-0.058000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size:219405
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    187 size:240757
 ret: 0         st: 0 flags:1  ts: 2.836000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:11391906 size:244616
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:12114700 size:254237
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.760000 pts: 1.760000 pos:10170977 size:243403
+ret: 0         st: 0 flags:1 dts: 1.760000 pts: 1.760000 pos:10843564 size:253913
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.600000 pts: 0.600000 pos:3319311 size:226082
+ret: 0         st: 0 flags:1 dts: 0.600000 pts: 0.600000 pos:3598793 size:243372
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size:219405
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    187 size:240757
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:11391906 size:244616
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:12114700 size:254237
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:7515896 size:239079
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:8053704 size:252195
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1098674 size:220236
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1187809 size:238567
 ret: 0         st: 0 flags:0  ts:-0.905000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size:219405
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    187 size:240757
 ret: 0         st: 0 flags:1  ts: 1.989000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:11391906 size:244616
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:12114700 size:254237
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos:5152576 size:233102
+ret: 0         st: 0 flags:1 dts: 0.920000 pts: 0.920000 pos:5559226 size:247341
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.672000
 ret: 0         st: 0 flags:1  ts: 1.566000
-ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:8958199 size:241837
+ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:9572235 size:254219
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2645880 size:223865
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:2870241 size:242377
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-flv b/tests/ref/seek/vsynth_lena-flv
index ba2efdd1c9..ae9eedfa18 100644
--- a/tests/ref/seek/vsynth2-flv
+++ b/tests/ref/seek/vsynth_lena-flv
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size: 12771
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    187 size: 10380
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size: 12771
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    187 size: 10380
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 108745 size: 16158
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83228 size: 12295
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  67792 size: 14392
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  52573 size: 11127
 ret:-1         st: 0 flags:1  ts:-0.317000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 108745 size: 16158
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83228 size: 12295
 ret: 0         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  32529 size: 12708
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  25948 size: 10089
 ret:-1         st: 0 flags:1  ts:-0.741000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  67792 size: 14392
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  52573 size: 11127
 ret: 0         st: 0 flags:0  ts:-0.058000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size: 12771
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    187 size: 10380
 ret: 0         st: 0 flags:1  ts: 2.836000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 155318 size: 17185
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 117165 size: 12730
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 155318 size: 17185
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 117165 size: 12730
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  32529 size: 12708
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  25948 size: 10089
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size: 12771
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    187 size: 10380
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 155318 size: 17185
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 117165 size: 12730
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 108745 size: 16158
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83228 size: 12295
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size: 12771
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    187 size: 10380
 ret: 0         st: 0 flags:0  ts:-0.905000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    179 size: 12771
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    187 size: 10380
 ret: 0         st: 0 flags:1  ts: 1.989000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 155318 size: 17185
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 117165 size: 12730
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  67792 size: 14392
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  52573 size: 11127
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.672000
 ret: 0         st: 0 flags:1  ts: 1.566000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 108745 size: 16158
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83228 size: 12295
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  32529 size: 12708
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  25948 size: 10089
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-h263 b/tests/ref/seek/vsynth_lena-h261
index 3e0c9245dd..dabf6a3014 100644
--- a/tests/ref/seek/vsynth2-h263
+++ b/tests/ref/seek/vsynth_lena-h261
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 12772
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9645
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 12772
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9645
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 139428 size: 16159
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126498 size: 11377
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  88646 size: 14393
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  82056 size: 10322
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 139428 size: 16159
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126498 size: 11377
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  45784 size: 12709
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  44668 size:  9404
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  88646 size: 14393
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  82056 size: 10322
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 12772
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9645
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 195658 size: 17186
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175860 size: 11707
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 195658 size: 17186
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175860 size: 11707
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  45784 size: 12709
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  44668 size:  9404
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 12772
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9645
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 195658 size: 17186
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175860 size: 11707
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 139428 size: 16159
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126498 size: 11377
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 12772
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9645
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 12772
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9645
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 195658 size: 17186
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 175860 size: 11707
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  88646 size: 14393
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  82056 size: 10322
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 139428 size: 16159
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 126498 size: 11377
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  45784 size: 12709
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  44668 size:  9404
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-msmpeg4v2 b/tests/ref/seek/vsynth_lena-h263
index bf992fdc3a..5e50ca3b2a 100644
--- a/tests/ref/seek/vsynth2-msmpeg4v2
+++ b/tests/ref/seek/vsynth_lena-h263
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11321
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 10381
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11321
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 10381
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 108682 size: 14845
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 103706 size: 12296
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  69622 size: 13068
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  66796 size: 11128
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 108682 size: 14845
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 103706 size: 12296
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  36266 size: 11274
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  36442 size: 10090
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  69622 size: 13068
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  66796 size: 11128
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11321
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 10381
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 153222 size: 15792
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144556 size: 12731
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 153222 size: 15792
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144556 size: 12731
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  36266 size: 11274
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  36442 size: 10090
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11321
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 10381
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 153222 size: 15792
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144556 size: 12731
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 108682 size: 14845
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 103706 size: 12296
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11321
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 10381
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11321
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 10381
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 153222 size: 15792
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 144556 size: 12731
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  69622 size: 13068
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  66796 size: 11128
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 108682 size: 14845
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 103706 size: 12296
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  36266 size: 11274
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  36442 size: 10090
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-h263p b/tests/ref/seek/vsynth_lena-h263p
index 673f412d49..c87a90672d 100644
--- a/tests/ref/seek/vsynth2-h263p
+++ b/tests/ref/seek/vsynth_lena-h263p
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 43985
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 36208
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 43985
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 36208
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 733908 size: 56338
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569922 size: 45151
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 448856 size: 50481
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 355972 size: 40907
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 733908 size: 56338
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569922 size: 45151
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 210394 size: 43217
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 171046 size: 36514
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 448856 size: 50481
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 355972 size: 40907
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 43985
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 36208
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:1051592 size: 59232
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804362 size: 46411
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:1051592 size: 59232
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804362 size: 46411
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 210394 size: 43217
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 171046 size: 36514
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 43985
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 36208
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:1051592 size: 59232
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804362 size: 46411
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 733908 size: 56338
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569922 size: 45151
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 43985
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 36208
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 43985
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 36208
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:1051592 size: 59232
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 804362 size: 46411
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 448856 size: 50481
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 355972 size: 40907
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 733908 size: 56338
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 569922 size: 45151
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 210394 size: 43217
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 171046 size: 36514
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-huffyuv b/tests/ref/seek/vsynth_lena-huffyuv
index a3e176b9ca..79e29a0eea 100644
--- a/tests/ref/seek/vsynth2-huffyuv
+++ b/tests/ref/seek/vsynth_lena-huffyuv
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5724 size:120468
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5758 size:123508
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5724 size:120468
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5758 size:123508
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:6010684 size:136724
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:5745002 size:121152
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:2445132 size:126464
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:2437998 size:122516
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:4658492 size:133884
+ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:4523458 size:122784
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1085808 size:121284
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1093874 size:121320
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:3211900 size:129428
+ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:3173594 size:122784
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5724 size:120468
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5758 size:123508
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:6284380 size:137136
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:5987034 size:120672
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:5466432 size:135664
+ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:5258654 size:121992
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:1944388 size:124456
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:1947354 size:122568
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5724 size:120468
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5758 size:123508
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:6284380 size:137136
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:5987034 size:120672
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:4126904 size:132312
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:4032698 size:122544
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 604036 size:120044
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 609910 size:120724
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5724 size:120468
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5758 size:123508
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:6284380 size:137136
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:5987034 size:120672
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:2698592 size:127564
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:2683066 size:122588
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:4926660 size:134484
+ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:4768982 size:122556
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1451012 size:122720
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1458410 size:121888
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-jpegls b/tests/ref/seek/vsynth_lena-jpegls
new file mode 100644
index 0000000000..c773313ad5
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-jpegls
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:164074
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:164074
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:7804122 size:176295
+ret: 0         st: 0 flags:0  ts: 0.800000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3172784 size:164643
+ret:-1         st: 0 flags:1  ts:-0.320000
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:6052978 size:174097
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1402348 size:157283
+ret:-1         st: 0 flags:1  ts:-0.760000
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:4170252 size:168401
+ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:164074
+ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:8157020 size:176793
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:7101758 size:175326
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2519264 size:162522
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:164074
+ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:8157020 size:176793
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:5360822 size:172183
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 779838 size:154579
+ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:164074
+ret: 0         st: 0 flags:1  ts: 2.000000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:8157020 size:176793
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3502832 size:166017
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.680000
+ret: 0         st: 0 flags:1  ts: 1.560000
+ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:6401456 size:174815
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1876420 size:159659
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-ljpeg b/tests/ref/seek/vsynth_lena-ljpeg
new file mode 100644
index 0000000000..bb58fd91fc
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-ljpeg
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 96000
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 96000
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:4478628 size: 94801
+ret: 0         st: 0 flags:0  ts: 0.800000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:1900944 size: 95396
+ret:-1         st: 0 flags:1  ts:-0.320000
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:3525176 size: 95655
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 854326 size: 94566
+ret:-1         st: 0 flags:1  ts:-0.760000
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:2473780 size: 95580
+ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 96000
+ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4668124 size: 94526
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:4098378 size: 95284
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:1519186 size: 95341
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 96000
+ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4668124 size: 94526
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:3142842 size: 95518
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 476884 size: 94192
+ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 96000
+ret: 0         st: 0 flags:1  ts: 2.000000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:4668124 size: 94526
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:2091790 size: 95459
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.680000
+ret: 0         st: 0 flags:1  ts: 1.560000
+ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:3716442 size: 95546
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1138412 size: 94963
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-mjpeg b/tests/ref/seek/vsynth_lena-mjpeg
new file mode 100644
index 0000000000..71f798e929
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-mjpeg
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11209
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11209
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos: 592412 size: 14066
+ret: 0         st: 0 flags:0  ts: 0.800000
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos: 232652 size: 12269
+ret:-1         st: 0 flags:1  ts:-0.320000
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos: 453104 size: 13735
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos: 104118 size: 11213
+ret:-1         st: 0 flags:1  ts:-0.760000
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos: 307404 size: 12723
+ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11209
+ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 620564 size: 14125
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos: 536264 size: 13966
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos: 184478 size: 11981
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11209
+ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 620564 size: 14125
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos: 398934 size: 13340
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:  59904 size: 10972
+ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11209
+ret: 0         st: 0 flags:1  ts: 2.000000
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos: 620564 size: 14125
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos: 257220 size: 12407
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.680000
+ret: 0         st: 0 flags:1  ts: 1.560000
+ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos: 480710 size: 13831
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 137920 size: 11458
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-mpeg1 b/tests/ref/seek/vsynth_lena-mpeg1
new file mode 100644
index 0000000000..0ec751a8b4
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-mpeg1
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size:  9779
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9779
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 124255 size: 11796
+ret: 0         st: 0 flags:0  ts: 0.788334
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  76706 size: 10792
+ret:-1         st: 0 flags:1  ts:-0.317499
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 124255 size: 11796
+ret: 0         st: 0 flags:0  ts: 0.365002
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  37721 size:  9873
+ret:-1         st: 0 flags:1  ts:-0.740831
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  76706 size: 10792
+ret: 0         st: 0 flags:0  ts:-0.058330
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9779
+ret: 0         st: 0 flags:1  ts: 2.835837
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 177099 size: 12057
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 177099 size: 12057
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  37721 size:  9873
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9779
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 177099 size: 12057
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 124255 size: 11796
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9779
+ret: 0         st: 0 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9779
+ret: 0         st: 0 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 177099 size: 12057
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  76706 size: 10792
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1  ts: 1.565841
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 124255 size: 11796
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  37721 size:  9873
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-mpeg1b b/tests/ref/seek/vsynth_lena-mpeg1b
new file mode 100644
index 0000000000..e079e343f8
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-mpeg1b
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:      0 size: 11817
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11817
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 194424 size: 14837
+ret: 0         st: 0 flags:0  ts: 0.788334
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: NOPTS    pos:  80757 size: 13267
+ret:-1         st: 0 flags:1  ts:-0.317499
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: NOPTS    pos: 133899 size: 14470
+ret: 0         st: 0 flags:0  ts: 0.365002
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: NOPTS    pos:  80757 size: 13267
+ret:-1         st: 0 flags:1  ts:-0.740831
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: NOPTS    pos:  80757 size: 13267
+ret: 0         st: 0 flags:0  ts:-0.058330
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11817
+ret: 0         st: 0 flags:1  ts: 2.835837
+ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 194424 size: 14837
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 194424 size: 14837
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: NOPTS    pos:  34797 size: 12009
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11817
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 194424 size: 14837
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: NOPTS    pos: 133899 size: 14470
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11817
+ret: 0         st: 0 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11817
+ret: 0         st: 0 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 1.800000 pts: NOPTS    pos: 194424 size: 14837
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: NOPTS    pos: 133899 size: 14470
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1  ts: 1.565841
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: NOPTS    pos: 133899 size: 14470
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.840000 pts: NOPTS    pos:  80757 size: 13267
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-mpeg2-422 b/tests/ref/seek/vsynth_lena-mpeg2-422
new file mode 100644
index 0000000000..06d8f7ac3a
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-mpeg2-422
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17497
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17497
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 325397 size: 19967
+ret: 0         st: 0 flags:0  ts: 0.788334
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 200747 size: 22575
+ret:-1         st: 0 flags:1  ts:-0.317499
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 265466 size: 21329
+ret: 0         st: 0 flags:0  ts: 0.365002
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 104454 size: 28984
+ret:-1         st: 0 flags:1  ts:-0.740831
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 200747 size: 22575
+ret: 0         st: 0 flags:0  ts:-0.058330
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17497
+ret: 0         st: 0 flags:1  ts: 2.835837
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 325397 size: 19967
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 325397 size: 19967
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 104454 size: 28984
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17497
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 325397 size: 19967
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 265466 size: 21329
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17497
+ret: 0         st: 0 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 17497
+ret: 0         st: 0 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 325397 size: 19967
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 265466 size: 21329
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1  ts: 1.565841
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 265466 size: 21329
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 200747 size: 22575
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-mpeg2-idct-int b/tests/ref/seek/vsynth_lena-mpeg2-idct-int
new file mode 100644
index 0000000000..b096f6fe7c
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-mpeg2-idct-int
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9911
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9911
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 127925 size: 11918
+ret: 0         st: 0 flags:0  ts: 0.788334
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  79103 size: 10909
+ret:-1         st: 0 flags:1  ts:-0.317499
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 127925 size: 11918
+ret: 0         st: 0 flags:0  ts: 0.365002
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  38992 size:  9985
+ret:-1         st: 0 flags:1  ts:-0.740831
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  79103 size: 10909
+ret: 0         st: 0 flags:0  ts:-0.058330
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9911
+ret: 0         st: 0 flags:1  ts: 2.835837
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 182138 size: 12183
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 182138 size: 12183
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  38992 size:  9985
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9911
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 182138 size: 12183
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 127925 size: 11918
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9911
+ret: 0         st: 0 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9911
+ret: 0         st: 0 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 182138 size: 12183
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  79103 size: 10909
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1  ts: 1.565841
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 127925 size: 11918
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  38992 size:  9985
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-mpeg2-ilace b/tests/ref/seek/vsynth_lena-mpeg2-ilace
new file mode 100644
index 0000000000..d2a7838484
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-mpeg2-ilace
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 132603 size: 11970
+ret: 0         st: 0 flags:0  ts: 0.788334
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  82152 size: 10965
+ret:-1         st: 0 flags:1  ts:-0.317499
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 132603 size: 11970
+ret: 0         st: 0 flags:0  ts: 0.365002
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  40546 size: 10045
+ret:-1         st: 0 flags:1  ts:-0.740831
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  82152 size: 10965
+ret: 0         st: 0 flags:0  ts:-0.058330
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ret: 0         st: 0 flags:1  ts: 2.835837
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 188425 size: 12232
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 188425 size: 12232
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  40546 size: 10045
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 188425 size: 12232
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 132603 size: 11970
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ret: 0         st: 0 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ret: 0         st: 0 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 188425 size: 12232
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos:  82152 size: 10965
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1  ts: 1.565841
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 132603 size: 11970
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  40546 size: 10045
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-mpeg2-ivlc-qprd b/tests/ref/seek/vsynth_lena-mpeg2-ivlc-qprd
new file mode 100644
index 0000000000..330dc16a47
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-mpeg2-ivlc-qprd
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 16239
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 16239
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 227500 size: 12725
+ret: 0         st: 0 flags:0  ts: 0.788334
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 164167 size: 13921
+ret:-1         st: 0 flags:1  ts:-0.317499
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 196681 size: 13159
+ret: 0         st: 0 flags:0  ts: 0.365002
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  98748 size: 29165
+ret:-1         st: 0 flags:1  ts:-0.740831
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 164167 size: 13921
+ret: 0         st: 0 flags:0  ts:-0.058330
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 16239
+ret: 0         st: 0 flags:1  ts: 2.835837
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 227500 size: 12725
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 227500 size: 12725
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  98748 size: 29165
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 16239
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 227500 size: 12725
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 196681 size: 13159
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 16239
+ret: 0         st: 0 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 16239
+ret: 0         st: 0 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 227500 size: 12725
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 196681 size: 13159
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1  ts: 1.565841
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 196681 size: 13159
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 164167 size: 13921
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-mpeg2-thread b/tests/ref/seek/vsynth_lena-mpeg2-thread
new file mode 100644
index 0000000000..8e16f43a9a
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-mpeg2-thread
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 158232 size: 12232
+ret: 0         st: 0 flags:0  ts: 0.788334
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67783 size: 10965
+ret:-1         st: 0 flags:1  ts:-0.317499
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110336 size: 11970
+ret: 0         st: 0 flags:0  ts: 0.365002
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  30747 size: 10045
+ret:-1         st: 0 flags:1  ts:-0.740831
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67783 size: 10965
+ret: 0         st: 0 flags:0  ts:-0.058330
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ret: 0         st: 0 flags:1  ts: 2.835837
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 158232 size: 12232
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 158232 size: 12232
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  30747 size: 10045
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 158232 size: 12232
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110336 size: 11970
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ret: 0         st: 0 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9961
+ret: 0         st: 0 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 158232 size: 12232
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110336 size: 11970
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1  ts: 1.565841
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110336 size: 11970
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67783 size: 10965
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-mpeg2-thread-ivlc b/tests/ref/seek/vsynth_lena-mpeg2-thread-ivlc
new file mode 100644
index 0000000000..49ec819f76
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-mpeg2-thread-ivlc
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9954
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9954
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 157685 size: 11930
+ret: 0         st: 0 flags:0  ts: 0.788334
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67716 size: 10791
+ret:-1         st: 0 flags:1  ts:-0.317499
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110086 size: 11697
+ret: 0         st: 0 flags:0  ts: 0.365002
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  30744 size:  9980
+ret:-1         st: 0 flags:1  ts:-0.740831
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67716 size: 10791
+ret: 0         st: 0 flags:0  ts:-0.058330
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9954
+ret: 0         st: 0 flags:1  ts: 2.835837
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 157685 size: 11930
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 157685 size: 11930
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  30744 size:  9980
+ret: 0         st: 0 flags:0  ts:-0.481662
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9954
+ret: 0         st: 0 flags:1  ts: 2.412505
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 157685 size: 11930
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110086 size: 11697
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9954
+ret: 0         st: 0 flags:0  ts:-0.904994
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size:  9954
+ret: 0         st: 0 flags:1  ts: 1.989173
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 157685 size: 11930
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110086 size: 11697
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.671674
+ret: 0         st: 0 flags:1  ts: 1.565841
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 110086 size: 11697
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  67716 size: 10791
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-mpeg4 b/tests/ref/seek/vsynth_lena-mpeg4
new file mode 100644
index 0000000000..b1c8a19db8
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-mpeg4
@@ -0,0 +1,50 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  8719
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  8719
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  75140 size: 10776
+ret: 0         st: 0 flags:0  ts: 0.788359
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  47228 size:  9634
+ret: 0         st: 0 flags:1  ts:-0.317500
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  8719
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  75140 size: 10776
+ret: 0         st: 0 flags:0  ts: 0.365000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  23271 size:  8524
+ret: 0         st: 0 flags:1  ts:-0.740859
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  8719
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  47228 size:  9634
+ret: 0         st: 0 flags:0  ts:-0.058359
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  8719
+ret: 0         st: 0 flags:1  ts: 2.835859
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 106181 size: 11182
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 106181 size: 11182
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  23271 size:  8524
+ret: 0         st: 0 flags:0  ts:-0.481641
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  8719
+ret: 0         st: 0 flags:1  ts: 2.412500
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 106181 size: 11182
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  75140 size: 10776
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  8719
+ret: 0         st: 0 flags:0  ts:-0.905000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  8719
+ret: 0         st: 0 flags:1  ts: 1.989141
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 106181 size: 11182
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  47228 size:  9634
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  8719
+ret:-1         st: 0 flags:0  ts: 2.671641
+ret: 0         st: 0 flags:1  ts: 1.565859
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  75140 size: 10776
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  23271 size:  8524
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     44 size:  8719
diff --git a/tests/ref/seek/vsynth2-mpeg2-thread-ivlc b/tests/ref/seek/vsynth_lena-mpeg4-adap
index a799f0a782..0611ee4511 100644
--- a/tests/ref/seek/vsynth2-mpeg2-thread-ivlc
+++ b/tests/ref/seek/vsynth_lena-mpeg4-adap
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11855
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size:  6855
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11855
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size:  6855
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 199749 size: 15473
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174446 size: 16883
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  82883 size: 13398
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  98220 size: 17063
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 137402 size: 14693
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 135582 size: 17525
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  37332 size: 12068
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  59446 size: 17261
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  82883 size: 13398
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  98220 size: 17063
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11855
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size:  6855
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 199749 size: 15473
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174446 size: 16883
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 199749 size: 15473
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174446 size: 16883
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  37332 size: 12068
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  59446 size: 17261
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11855
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size:  6855
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 199749 size: 15473
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174446 size: 16883
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 137402 size: 14693
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 135582 size: 17525
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11855
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size:  6855
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 11855
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size:  6855
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 199749 size: 15473
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 174446 size: 16883
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  82883 size: 13398
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  98220 size: 17063
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 137402 size: 14693
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 135582 size: 17525
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  82883 size: 13398
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  98220 size: 17063
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-msmpeg4 b/tests/ref/seek/vsynth_lena-mpeg4-adv
index c2a708166a..9a51eaeaea 100644
--- a/tests/ref/seek/vsynth2-msmpeg4
+++ b/tests/ref/seek/vsynth_lena-mpeg4-adv
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10925
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8653
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10925
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8653
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 107648 size: 14494
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  91722 size: 11013
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  68772 size: 12670
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  59496 size:  9815
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 107648 size: 14494
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  91722 size: 11013
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35828 size: 10859
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  31936 size:  8753
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  68772 size: 12670
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  59496 size:  9815
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10925
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8653
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 152100 size: 15457
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 127616 size: 11279
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 152100 size: 15457
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 127616 size: 11279
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35828 size: 10859
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  31936 size:  8753
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10925
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8653
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 152100 size: 15457
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 127616 size: 11279
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 107648 size: 14494
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  91722 size: 11013
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10925
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8653
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10925
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8653
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 152100 size: 15457
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 127616 size: 11279
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  68772 size: 12670
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  59496 size:  9815
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 107648 size: 14494
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  91722 size: 11013
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35828 size: 10859
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  31936 size:  8753
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg4-adv b/tests/ref/seek/vsynth_lena-mpeg4-error
index 06d88ae796..9608a7b34c 100644
--- a/tests/ref/seek/vsynth2-mpeg4-adv
+++ b/tests/ref/seek/vsynth_lena-mpeg4-error
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10951
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9729
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10951
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9729
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 118586 size: 14495
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113186 size: 15063
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  75418 size: 12802
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  73146 size: 10235
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 118586 size: 14495
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113186 size: 15063
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  38714 size: 11015
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  38232 size: 10303
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  75418 size: 12802
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  73146 size: 10235
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10951
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9729
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 168206 size: 15537
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 163068 size: 13980
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 168206 size: 15537
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 163068 size: 13980
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  38714 size: 11015
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  38232 size: 10303
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10951
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9729
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 168206 size: 15537
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 163068 size: 13980
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 118586 size: 14495
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113186 size: 15063
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10951
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9729
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 10951
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9729
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 168206 size: 15537
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 163068 size: 13980
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  75418 size: 12802
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  73146 size: 10235
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 118586 size: 14495
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 113186 size: 15063
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  38714 size: 11015
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  38232 size: 10303
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-wmv2 b/tests/ref/seek/vsynth_lena-mpeg4-nr
index 3ba67649e1..6de31b7f08 100644
--- a/tests/ref/seek/vsynth2-wmv2
+++ b/tests/ref/seek/vsynth_lena-mpeg4-nr
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11264
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 10673
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11264
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 10673
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 109154 size: 15153
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100656 size: 12464
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  69348 size: 13297
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  65492 size: 11180
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 109154 size: 15153
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100656 size: 12464
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35954 size: 11342
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35314 size:  9987
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  69348 size: 13297
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  65492 size: 11180
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11264
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 10673
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 154736 size: 16130
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139376 size: 12911
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 154736 size: 16130
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139376 size: 12911
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35954 size: 11342
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35314 size:  9987
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11264
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 10673
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 154736 size: 16130
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139376 size: 12911
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 109154 size: 15153
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100656 size: 12464
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11264
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 10673
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11264
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 10673
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 154736 size: 16130
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139376 size: 12911
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  69348 size: 13297
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  65492 size: 11180
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 109154 size: 15153
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 100656 size: 12464
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35954 size: 11342
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  35314 size:  9987
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg4-nr b/tests/ref/seek/vsynth_lena-mpeg4-nsse
index e0abfe8544..e73ce6033c 100644
--- a/tests/ref/seek/vsynth2-mpeg4-nr
+++ b/tests/ref/seek/vsynth_lena-mpeg4-nsse
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 13402
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11937
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 13402
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11937
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 130650 size: 16609
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 127876 size: 15054
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  83222 size: 14678
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  81656 size: 13376
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 130650 size: 16609
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 127876 size: 15054
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  42834 size: 12656
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  42642 size: 11805
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  83222 size: 14678
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  81656 size: 13376
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 13402
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11937
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 184792 size: 17684
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 179516 size: 15553
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 184792 size: 17684
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 179516 size: 15553
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  42834 size: 12656
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  42642 size: 11805
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 13402
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11937
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 184792 size: 17684
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 179516 size: 15553
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 130650 size: 16609
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 127876 size: 15054
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 13402
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11937
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 13402
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 11937
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 184792 size: 17684
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 179516 size: 15553
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  83222 size: 14678
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  81656 size: 13376
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 130650 size: 16609
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 127876 size: 15054
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  42834 size: 12656
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  42642 size: 11805
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg4-qpel b/tests/ref/seek/vsynth_lena-mpeg4-qpel
index 6f23d126ab..cf5da07680 100644
--- a/tests/ref/seek/vsynth2-mpeg4-qpel
+++ b/tests/ref/seek/vsynth_lena-mpeg4-qpel
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 15135
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 11938
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 15135
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 11938
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 180366 size: 21181
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141530 size: 15554
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  79512 size: 17332
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64114 size: 13377
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 126396 size: 19941
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 100340 size: 15055
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  39736 size: 14805
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  32840 size: 11806
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  79512 size: 17332
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64114 size: 13377
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 15135
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 11938
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 180366 size: 21181
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141530 size: 15554
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 180366 size: 21181
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141530 size: 15554
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  39736 size: 14805
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  32840 size: 11806
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 15135
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 11938
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 180366 size: 21181
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141530 size: 15554
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 126396 size: 19941
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 100340 size: 15055
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 15135
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 11938
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 15135
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 11938
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 180366 size: 21181
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 141530 size: 15554
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  79512 size: 17332
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64114 size: 13377
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 126396 size: 19941
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 100340 size: 15055
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  79512 size: 17332
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  64114 size: 13377
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg2-ilace b/tests/ref/seek/vsynth_lena-mpeg4-qprd
index 590d10d3a9..b92e3d225d 100644
--- a/tests/ref/seek/vsynth2-mpeg2-ilace
+++ b/tests/ref/seek/vsynth_lena-mpeg4-qprd
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12146
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 14873
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12146
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 14873
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 177672 size: 15343
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211034 size: 14638
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 109003 size: 13947
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 150658 size: 14502
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 177672 size: 15343
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180782 size: 14371
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  51717 size: 12445
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  93028 size: 29366
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 109003 size: 13947
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 150658 size: 14502
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12146
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 14873
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 253343 size: 16183
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211034 size: 14638
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 253343 size: 16183
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211034 size: 14638
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  51717 size: 12445
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  93028 size: 29366
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12146
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 14873
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 253343 size: 16183
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211034 size: 14638
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 177672 size: 15343
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180782 size: 14371
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12146
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 14873
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12146
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 14873
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: NOPTS    pos: 253343 size: 16183
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 211034 size: 14638
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: NOPTS    pos: 109003 size: 13947
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 150658 size: 14502
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: NOPTS    pos: 177672 size: 15343
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180782 size: 14371
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: NOPTS    pos:  51717 size: 12445
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 150658 size: 14502
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg2-thread b/tests/ref/seek/vsynth_lena-mpeg4-rc
index 644513bf8c..e1994af948 100644
--- a/tests/ref/seek/vsynth2-mpeg2-thread
+++ b/tests/ref/seek/vsynth_lena-mpeg4-rc
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12146
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 15766
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12146
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 15766
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 201811 size: 16183
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207954 size: 13826
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  83616 size: 13947
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153788 size: 13377
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 138764 size: 15343
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180950 size: 13326
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  37634 size: 12445
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  94578 size: 32807
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  83616 size: 13947
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153788 size: 13377
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12146
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 15766
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 201811 size: 16183
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207954 size: 13826
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 201811 size: 16183
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207954 size: 13826
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  37634 size: 12445
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  94578 size: 32807
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12146
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 15766
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 201811 size: 16183
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207954 size: 13826
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 138764 size: 15343
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180950 size: 13326
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12146
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 15766
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:      0 size: 12146
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 15766
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 201811 size: 16183
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 207954 size: 13826
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  83616 size: 13947
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153788 size: 13377
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 138764 size: 15343
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 180950 size: 13326
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos:  83616 size: 13947
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 153788 size: 13377
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-mpeg4-qprd b/tests/ref/seek/vsynth_lena-mpeg4-thread
index 675e993a9b..287b96d566 100644
--- a/tests/ref/seek/vsynth2-mpeg4-qprd
+++ b/tests/ref/seek/vsynth_lena-mpeg4-thread
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 16904
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 14874
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 16904
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 14874
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228068 size: 15339
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228190 size: 16323
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 169864 size: 14172
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162160 size: 16462
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 198340 size: 15560
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 195334 size: 16153
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 111330 size: 29024
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  97836 size: 33332
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 169864 size: 14172
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162160 size: 16462
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 16904
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 14874
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228068 size: 15339
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228190 size: 16323
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228068 size: 15339
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228190 size: 16323
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos: 111330 size: 29024
+ret: 0         st: 0 flags:1 dts: 0.400000 pts: NOPTS    pos:  97836 size: 33332
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 16904
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 14874
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228068 size: 15339
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228190 size: 16323
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 198340 size: 15560
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 195334 size: 16153
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 16904
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 14874
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5648 size: 16904
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: NOPTS    pos:   5652 size: 14874
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228068 size: 15339
+ret: 0         st: 0 flags:1 dts: 1.840000 pts: NOPTS    pos: 228190 size: 16323
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 169864 size: 14172
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162160 size: 16462
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 198340 size: 15560
+ret: 0         st: 0 flags:1 dts: 1.360000 pts: NOPTS    pos: 195334 size: 16153
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 169864 size: 14172
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: NOPTS    pos: 162160 size: 16462
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-h261 b/tests/ref/seek/vsynth_lena-msmpeg4
index 4aa0c43cc9..0bb9f75056 100644
--- a/tests/ref/seek/vsynth2-h261
+++ b/tests/ref/seek/vsynth_lena-msmpeg4
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11732
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8637
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11732
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8637
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 168350 size: 14793
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  82512 size: 10783
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 106950 size: 13195
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  53850 size:  9624
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 168350 size: 14793
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  82512 size: 10783
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  55568 size: 11639
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29392 size:  8502
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 106950 size: 13195
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  53850 size:  9624
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11732
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8637
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 237672 size: 15734
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114260 size: 11180
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 237672 size: 15734
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114260 size: 11180
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  55568 size: 11639
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29392 size:  8502
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11732
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8637
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 237672 size: 15734
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114260 size: 11180
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 168350 size: 14793
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  82512 size: 10783
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11732
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8637
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size: 11732
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8637
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 237672 size: 15734
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 114260 size: 11180
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 106950 size: 13195
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  53850 size:  9624
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 168350 size: 14793
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  82512 size: 10783
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  55568 size: 11639
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29392 size:  8502
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-msmpeg4v2 b/tests/ref/seek/vsynth_lena-msmpeg4v2
new file mode 100644
index 0000000000..27ed0ed5a7
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-msmpeg4v2
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9003
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9003
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83874 size: 11165
+ret: 0         st: 0 flags:0  ts: 0.800000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54782 size: 10010
+ret:-1         st: 0 flags:1  ts:-0.320000
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83874 size: 11165
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29774 size:  8869
+ret:-1         st: 0 flags:1  ts:-0.760000
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54782 size: 10010
+ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9003
+ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116116 size: 11578
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116116 size: 11578
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29774 size:  8869
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9003
+ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116116 size: 11578
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83874 size: 11165
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9003
+ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  9003
+ret: 0         st: 0 flags:1  ts: 2.000000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116116 size: 11578
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54782 size: 10010
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.680000
+ret: 0         st: 0 flags:1  ts: 1.560000
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83874 size: 11165
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29774 size:  8869
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-rgb b/tests/ref/seek/vsynth_lena-rgb
index 91f7260bfb..8173ca988a 100644
--- a/tests/ref/seek/vsynth2-rgb
+++ b/tests/ref/seek/vsynth_lena-rgb
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:304128
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:304128
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:304128
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:304128
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:14300040 size:304128
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:14300044 size:304128
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:6088368 size:304128
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:6088372 size:304128
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:11258680 size:304128
+ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:11258684 size:304128
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:2742872 size:304128
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:2742876 size:304128
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:7913184 size:304128
+ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:7913188 size:304128
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:304128
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:304128
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14908312 size:304128
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14908316 size:304128
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:13083496 size:304128
+ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:13083500 size:304128
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:4871824 size:304128
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:4871828 size:304128
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:304128
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:304128
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14908312 size:304128
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14908316 size:304128
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:10042136 size:304128
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:10042140 size:304128
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1526328 size:304128
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos:1526332 size:304128
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:304128
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:304128
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14908312 size:304128
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:14908316 size:304128
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:6696640 size:304128
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:6696644 size:304128
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:11866952 size:304128
+ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:11866956 size:304128
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:3655280 size:304128
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:3655284 size:304128
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-roqvideo b/tests/ref/seek/vsynth_lena-roqvideo
index 6ed78b54ed..50a0a335c7 100644
--- a/tests/ref/seek/vsynth2-roqvideo
+++ b/tests/ref/seek/vsynth_lena-roqvideo
@@ -1,4 +1,4 @@
-ret: 0         st: 0 flags:0 dts: 0.000000 pts: 0.000000 pos:     24 size: 25810
+ret: 0         st: 0 flags:0 dts: 0.000000 pts: 0.000000 pos:     24 size: 26814
 ret:-1         st:-1 flags:0  ts:-1.000000
 ret:-1         st:-1 flags:1  ts: 1.894167
 ret:-1         st: 0 flags:0  ts: 0.800000
diff --git a/tests/ref/seek/vsynth2-rv10 b/tests/ref/seek/vsynth_lena-rv10
index e31a7f9f10..818040def9 100644
--- a/tests/ref/seek/vsynth2-rv10
+++ b/tests/ref/seek/vsynth_lena-rv10
@@ -1,52 +1,52 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 12779
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 10388
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 12779
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 10388
 ret:-1         st:-1 flags:1  ts: 1.894167
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  83441 size: 14400
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  61592 size: 11135
 ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 12779
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 10388
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 190667 size: 17194
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139566 size: 12738
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 134324 size: 16167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  98608 size: 12303
 ret: 0         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  40479 size: 12716
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  31132 size: 10097
 ret: 0         st: 0 flags:1  ts:-0.741000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 12779
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 10388
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 190667 size: 17194
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139566 size: 12738
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  83441 size: 14400
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  61592 size: 11135
 ret: 0         st: 0 flags:0  ts:-0.058000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 12779
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 10388
 ret: 0         st: 0 flags:1  ts: 2.836000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 190667 size: 17194
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139566 size: 12738
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 190667 size: 17194
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139566 size: 12738
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  40479 size: 12716
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  31132 size: 10097
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 12779
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 10388
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 190667 size: 17194
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139566 size: 12738
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 134324 size: 16167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  98608 size: 12303
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 12779
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 10388
 ret: 0         st: 0 flags:0  ts:-0.905000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 12779
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 10388
 ret: 0         st: 0 flags:1  ts: 1.989000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 190667 size: 17194
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139566 size: 12738
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  83441 size: 14400
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  61592 size: 11135
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 12779
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 10388
 ret: 0         st: 0 flags:0  ts: 2.672000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 190667 size: 17194
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139566 size: 12738
 ret: 0         st: 0 flags:1  ts: 1.566000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 134324 size: 16167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  98608 size: 12303
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  40479 size: 12716
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  31132 size: 10097
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 12779
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 10388
diff --git a/tests/ref/seek/vsynth2-rv20 b/tests/ref/seek/vsynth_lena-rv20
index 0a69c7165e..7f1ad39243 100644
--- a/tests/ref/seek/vsynth2-rv20
+++ b/tests/ref/seek/vsynth_lena-rv20
@@ -1,53 +1,53 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 11720
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size:  9361
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 11720
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size:  9361
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 134767 size: 14896
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  98158 size: 11344
 ret: 0         st: 0 flags:0  ts: 0.788000
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  83421 size: 13120
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  61133 size: 10166
 ret: 0         st: 0 flags:1  ts:-0.317000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 11720
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size:  9361
 ret: 0         st:-1 flags:0  ts: 2.576668
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 191423 size: 15859
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139147 size: 11803
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 134767 size: 14896
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  98158 size: 11344
 ret: 0         st: 0 flags:0  ts: 0.365000
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  40479 size: 11414
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  30753 size:  9101
 ret: 0         st: 0 flags:1  ts:-0.741000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 11720
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size:  9361
 ret: 0         st:-1 flags:0  ts: 2.153336
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 191423 size: 15859
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139147 size: 11803
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  83421 size: 13120
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  61133 size: 10166
 ret: 0         st: 0 flags:0  ts:-0.058000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 11720
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size:  9361
 ret: 0         st: 0 flags:1  ts: 2.836000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 191423 size: 15859
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139147 size: 11803
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 191423 size: 15859
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139147 size: 11803
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  40479 size: 11414
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  30753 size:  9101
 ret: 0         st: 0 flags:0  ts:-0.482000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 11720
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size:  9361
 ret: 0         st: 0 flags:1  ts: 2.413000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 191423 size: 15859
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139147 size: 11803
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 134767 size: 14896
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  98158 size: 11344
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 11720
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size:  9361
 ret: 0         st: 0 flags:0  ts:-0.905000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 11720
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size:  9361
 ret: 0         st: 0 flags:1  ts: 1.989000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 191423 size: 15859
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139147 size: 11803
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  83421 size: 13120
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  61133 size: 10166
 ret: 0         st:-1 flags:1  ts:-0.222493
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 11720
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size:  9361
 ret: 0         st: 0 flags:0  ts: 2.672000
-ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 191423 size: 15859
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 139147 size: 11803
 ret: 0         st: 0 flags:1  ts: 1.566000
-ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 134767 size: 14896
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  98158 size: 11344
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  40479 size: 11414
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  30753 size:  9101
 ret: 0         st:-1 flags:1  ts:-0.645825
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size: 11720
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:    239 size:  9361
diff --git a/tests/ref/seek/vsynth_lena-snow b/tests/ref/seek/vsynth_lena-snow
new file mode 100644
index 0000000000..33d6c27463
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-snow
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  3035
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  3035
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  39806 size:  3640
+ret: 0         st: 0 flags:0  ts: 0.800000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  27442 size:  3494
+ret:-1         st: 0 flags:1  ts:-0.320000
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  39806 size:  3640
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  16134 size:  3244
+ret:-1         st: 0 flags:1  ts:-0.760000
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  27442 size:  3494
+ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  3035
+ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:  52608 size:  3582
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:  52608 size:  3582
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  16134 size:  3244
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  3035
+ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:  52608 size:  3582
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  39806 size:  3640
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  3035
+ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  3035
+ret: 0         st: 0 flags:1  ts: 2.000000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:  52608 size:  3582
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  27442 size:  3494
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.680000
+ret: 0         st: 0 flags:1  ts: 1.560000
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  39806 size:  3640
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  16134 size:  3244
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-snow-ll b/tests/ref/seek/vsynth_lena-snow-ll
new file mode 100644
index 0000000000..039db705d3
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-snow-ll
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 72476
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 72476
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:1902792 size: 78837
+ret: 0         st: 0 flags:0  ts: 0.800000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1239094 size: 74994
+ret:-1         st: 0 flags:1  ts:-0.320000
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:1902792 size: 78837
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 605632 size: 71059
+ret:-1         st: 0 flags:1  ts:-0.760000
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1239094 size: 74994
+ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 72476
+ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:2585618 size: 79731
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:2585618 size: 79731
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 605632 size: 71059
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 72476
+ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:2585618 size: 79731
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:1902792 size: 78837
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 72476
+ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size: 72476
+ret: 0         st: 0 flags:1  ts: 2.000000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos:2585618 size: 79731
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:1239094 size: 74994
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.680000
+ret: 0         st: 0 flags:1  ts: 1.560000
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:1902792 size: 78837
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 605632 size: 71059
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-svq1 b/tests/ref/seek/vsynth_lena-svq1
new file mode 100644
index 0000000000..33fe33e916
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-svq1
@@ -0,0 +1,50 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 22300
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 22300
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 517568 size: 25636
+ret: 0         st: 0 flags:0  ts: 0.788359
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326556 size: 23552
+ret: 0         st: 0 flags:1  ts:-0.317500
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 22300
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 517568 size: 25636
+ret: 0         st: 0 flags:0  ts: 0.365000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 157040 size: 21896
+ret: 0         st: 0 flags:1  ts:-0.740859
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 22300
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326556 size: 23552
+ret: 0         st: 0 flags:0  ts:-0.058359
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 22300
+ret: 0         st: 0 flags:1  ts: 2.835859
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 722804 size: 25888
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 722804 size: 25888
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 157040 size: 21896
+ret: 0         st: 0 flags:0  ts:-0.481641
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 22300
+ret: 0         st: 0 flags:1  ts: 2.412500
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 722804 size: 25888
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 517568 size: 25636
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 22300
+ret: 0         st: 0 flags:0  ts:-0.905000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 22300
+ret: 0         st: 0 flags:1  ts: 1.989141
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 722804 size: 25888
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 326556 size: 23552
+ret: 0         st:-1 flags:1  ts:-0.222493
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 22300
+ret:-1         st: 0 flags:0  ts: 2.671641
+ret: 0         st: 0 flags:1  ts: 1.565859
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos: 517568 size: 25636
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 157040 size: 21896
+ret: 0         st:-1 flags:1  ts:-0.645825
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     36 size: 22300
diff --git a/tests/ref/seek/vsynth_lena-wmv1 b/tests/ref/seek/vsynth_lena-wmv1
new file mode 100644
index 0000000000..125e6cd3c4
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-wmv1
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8990
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8990
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83746 size: 11099
+ret: 0         st: 0 flags:0  ts: 0.800000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54762 size:  9931
+ret:-1         st: 0 flags:1  ts:-0.320000
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83746 size: 11099
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29798 size:  8796
+ret:-1         st: 0 flags:1  ts:-0.760000
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54762 size:  9931
+ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8990
+ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115810 size: 11486
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115810 size: 11486
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29798 size:  8796
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8990
+ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115810 size: 11486
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83746 size: 11099
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8990
+ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:  8990
+ret: 0         st: 0 flags:1  ts: 2.000000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 115810 size: 11486
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54762 size:  9931
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.680000
+ret: 0         st: 0 flags:1  ts: 1.560000
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83746 size: 11099
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29798 size:  8796
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth_lena-wmv2 b/tests/ref/seek/vsynth_lena-wmv2
new file mode 100644
index 0000000000..ffa576208b
--- /dev/null
+++ b/tests/ref/seek/vsynth_lena-wmv2
@@ -0,0 +1,46 @@
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size:  8917
+ret: 0         st:-1 flags:0  ts:-1.000000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size:  8917
+ret: 0         st:-1 flags:1  ts: 1.894167
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83768 size: 11169
+ret: 0         st: 0 flags:0  ts: 0.800000
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54538 size:  9989
+ret:-1         st: 0 flags:1  ts:-0.320000
+ret:-1         st:-1 flags:0  ts: 2.576668
+ret: 0         st:-1 flags:1  ts: 1.470835
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83768 size: 11169
+ret: 0         st: 0 flags:0  ts: 0.360000
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29592 size:  8839
+ret:-1         st: 0 flags:1  ts:-0.760000
+ret:-1         st:-1 flags:0  ts: 2.153336
+ret: 0         st:-1 flags:1  ts: 1.047503
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54538 size:  9989
+ret: 0         st: 0 flags:0  ts:-0.040000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size:  8917
+ret: 0         st: 0 flags:1  ts: 2.840000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116070 size: 11554
+ret: 0         st:-1 flags:0  ts: 1.730004
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116070 size: 11554
+ret: 0         st:-1 flags:1  ts: 0.624171
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29592 size:  8839
+ret: 0         st: 0 flags:0  ts:-0.480000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size:  8917
+ret: 0         st: 0 flags:1  ts: 2.400000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116070 size: 11554
+ret: 0         st:-1 flags:0  ts: 1.306672
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83768 size: 11169
+ret: 0         st:-1 flags:1  ts: 0.200839
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size:  8917
+ret: 0         st: 0 flags:0  ts:-0.920000
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5656 size:  8917
+ret: 0         st: 0 flags:1  ts: 2.000000
+ret: 0         st: 0 flags:1 dts: 1.920000 pts: 1.920000 pos: 116070 size: 11554
+ret: 0         st:-1 flags:0  ts: 0.883340
+ret: 0         st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos:  54538 size:  9989
+ret:-1         st:-1 flags:1  ts:-0.222493
+ret:-1         st: 0 flags:0  ts: 2.680000
+ret: 0         st: 0 flags:1  ts: 1.560000
+ret: 0         st: 0 flags:1 dts: 1.440000 pts: 1.440000 pos:  83768 size: 11169
+ret: 0         st:-1 flags:0  ts: 0.460008
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:  29592 size:  8839
+ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/seek/vsynth2-yuv b/tests/ref/seek/vsynth_lena-yuv
index d440761cf7..f899d7f518 100644
--- a/tests/ref/seek/vsynth2-yuv
+++ b/tests/ref/seek/vsynth_lena-yuv
@@ -1,46 +1,46 @@
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:152064
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:152064
 ret: 0         st:-1 flags:0  ts:-1.000000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:152064
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:152064
 ret: 0         st:-1 flags:1  ts: 1.894167
-ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:7153032 size:152064
+ret: 0         st: 0 flags:1 dts: 1.880000 pts: 1.880000 pos:7153036 size:152064
 ret: 0         st: 0 flags:0  ts: 0.800000
-ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3047088 size:152064
+ret: 0         st: 0 flags:1 dts: 0.800000 pts: 0.800000 pos:3047092 size:152064
 ret:-1         st: 0 flags:1  ts:-0.320000
 ret:-1         st:-1 flags:0  ts: 2.576668
 ret: 0         st:-1 flags:1  ts: 1.470835
-ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:5632312 size:152064
+ret: 0         st: 0 flags:1 dts: 1.480000 pts: 1.480000 pos:5632316 size:152064
 ret: 0         st: 0 flags:0  ts: 0.360000
-ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1374296 size:152064
+ret: 0         st: 0 flags:1 dts: 0.360000 pts: 0.360000 pos:1374300 size:152064
 ret:-1         st: 0 flags:1  ts:-0.760000
 ret:-1         st:-1 flags:0  ts: 2.153336
 ret: 0         st:-1 flags:1  ts: 1.047503
-ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:3959520 size:152064
+ret: 0         st: 0 flags:1 dts: 1.040000 pts: 1.040000 pos:3959524 size:152064
 ret: 0         st: 0 flags:0  ts:-0.040000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:152064
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:152064
 ret: 0         st: 0 flags:1  ts: 2.840000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7457176 size:152064
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7457180 size:152064
 ret: 0         st:-1 flags:0  ts: 1.730004
-ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:6544744 size:152064
+ret: 0         st: 0 flags:1 dts: 1.720000 pts: 1.720000 pos:6544748 size:152064
 ret: 0         st:-1 flags:1  ts: 0.624171
-ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2438800 size:152064
+ret: 0         st: 0 flags:1 dts: 0.640000 pts: 0.640000 pos:2438804 size:152064
 ret: 0         st: 0 flags:0  ts:-0.480000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:152064
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:152064
 ret: 0         st: 0 flags:1  ts: 2.400000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7457176 size:152064
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7457180 size:152064
 ret: 0         st:-1 flags:0  ts: 1.306672
-ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:5024024 size:152064
+ret: 0         st: 0 flags:1 dts: 1.320000 pts: 1.320000 pos:5024028 size:152064
 ret: 0         st:-1 flags:1  ts: 0.200839
-ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 766008 size:152064
+ret: 0         st: 0 flags:1 dts: 0.200000 pts: 0.200000 pos: 766012 size:152064
 ret: 0         st: 0 flags:0  ts:-0.920000
-ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5648 size:152064
+ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:   5652 size:152064
 ret: 0         st: 0 flags:1  ts: 2.000000
-ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7457176 size:152064
+ret: 0         st: 0 flags:1 dts: 1.960000 pts: 1.960000 pos:7457180 size:152064
 ret: 0         st:-1 flags:0  ts: 0.883340
-ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3351232 size:152064
+ret: 0         st: 0 flags:1 dts: 0.880000 pts: 0.880000 pos:3351236 size:152064
 ret:-1         st:-1 flags:1  ts:-0.222493
 ret:-1         st: 0 flags:0  ts: 2.680000
 ret: 0         st: 0 flags:1  ts: 1.560000
-ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:5936456 size:152064
+ret: 0         st: 0 flags:1 dts: 1.560000 pts: 1.560000 pos:5936460 size:152064
 ret: 0         st:-1 flags:0  ts: 0.460008
-ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1830512 size:152064
+ret: 0         st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos:1830516 size:152064
 ret:-1         st:-1 flags:1  ts:-0.645825
diff --git a/tests/ref/vsynth/vsynth1-amv b/tests/ref/vsynth/vsynth1-amv
new file mode 100644
index 0000000000..e4652c5c90
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-amv
@@ -0,0 +1,4 @@
+9e155fcedb3b853876e9ea4233971803 *tests/data/fate/vsynth1-amv.avi
+1365500 tests/data/fate/vsynth1-amv.avi
+e38681b9527b6d2531942f8a176a0265 *tests/data/fate/vsynth1-amv.out.rawvideo
+stddev:   10.07 PSNR: 28.06 MAXDIFF:   98 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-asv1 b/tests/ref/vsynth/vsynth1-asv1
index e640f1c145..99ce220f89 100644
--- a/tests/ref/vsynth/vsynth1-asv1
+++ b/tests/ref/vsynth/vsynth1-asv1
@@ -1,4 +1,4 @@
-41b011551d23ddadaab1083cb2106d9f *tests/data/fate/vsynth1-asv1.avi
-1489644 tests/data/fate/vsynth1-asv1.avi
-2dfc5dfc2c1cbbc2543257cd3d2df6af *tests/data/fate/vsynth1-asv1.out.rawvideo
-stddev:   20.00 PSNR: 22.11 MAXDIFF:  158 bytes:  7603200/  7603200
+8f1ab10246da351b6be88dd74319f76e *tests/data/fate/vsynth1-asv1.avi
+1298620 tests/data/fate/vsynth1-asv1.avi
+a4f95c58e8b9258da52b9d09153b1078 *tests/data/fate/vsynth1-asv1.out.rawvideo
+stddev:   11.89 PSNR: 26.62 MAXDIFF:  132 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-asv2 b/tests/ref/vsynth/vsynth1-asv2
index 6282ad4acf..2932147dd3 100644
--- a/tests/ref/vsynth/vsynth1-asv2
+++ b/tests/ref/vsynth/vsynth1-asv2
@@ -1,4 +1,4 @@
-a0773690d0e772ff832adea1e8c16773 *tests/data/fate/vsynth1-asv2.avi
-1456044 tests/data/fate/vsynth1-asv2.avi
-d451be09793cd0f35b6d91fc36e2571a *tests/data/fate/vsynth1-asv2.out.rawvideo
-stddev:   18.82 PSNR: 22.63 MAXDIFF:  131 bytes:  7603200/  7603200
+ea142aefed8e72a2e39cdef350c315ed *tests/data/fate/vsynth1-asv2.avi
+1434412 tests/data/fate/vsynth1-asv2.avi
+cb1f5560005800e889bfbb36cdc9fc40 *tests/data/fate/vsynth1-asv2.out.rawvideo
+stddev:    8.36 PSNR: 29.68 MAXDIFF:   58 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-avui b/tests/ref/vsynth/vsynth1-avui
new file mode 100644
index 0000000000..1f080532b5
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-avui
@@ -0,0 +1,4 @@
+25ef49e1aee0b20d4feee89b8dc093b4 *tests/data/fate/vsynth1-avui.mov
+42625037 tests/data/fate/vsynth1-avui.mov
+c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-avui.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-bpp1 b/tests/ref/vsynth/vsynth1-bpp1
new file mode 100644
index 0000000000..b647ba0a14
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-bpp1
@@ -0,0 +1,4 @@
+1c78e77c971b1ce31f229c6fc23d0902 *tests/data/fate/vsynth1-bpp1.avi
+640460 tests/data/fate/vsynth1-bpp1.avi
+cd1e1448d9895561347ceb66d0add34d *tests/data/fate/vsynth1-bpp1.out.rawvideo
+stddev:   84.48 PSNR:  9.60 MAXDIFF:  218 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-bpp15 b/tests/ref/vsynth/vsynth1-bpp15
new file mode 100644
index 0000000000..d687b963d6
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-bpp15
@@ -0,0 +1,4 @@
+6147f5f235657fa9ced6ec6146be6ff0 *tests/data/fate/vsynth1-bpp15.avi
+10144452 tests/data/fate/vsynth1-bpp15.avi
+3aee2d6e82a9507d7f01844c04d2b57b *tests/data/fate/vsynth1-bpp15.out.rawvideo
+stddev:   38.44 PSNR: 16.43 MAXDIFF:  159 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-cinepak b/tests/ref/vsynth/vsynth1-cinepak
new file mode 100644
index 0000000000..f1dfcd81db
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-cinepak
@@ -0,0 +1,4 @@
+546c7c1069f9e418aa787f469b693b94 *tests/data/fate/vsynth1-cinepak.mov
+99465 tests/data/fate/vsynth1-cinepak.mov
+bee091c200262be3427a233a2812388c *tests/data/fate/vsynth1-cinepak.out.rawvideo
+stddev:    8.46 PSNR: 29.58 MAXDIFF:  105 bytes:  7603200/   456192
diff --git a/tests/ref/vsynth/vsynth1-cljr b/tests/ref/vsynth/vsynth1-cljr
index cdd6ca2308..4260d9eff8 100644
--- a/tests/ref/vsynth/vsynth1-cljr
+++ b/tests/ref/vsynth/vsynth1-cljr
@@ -1,4 +1,4 @@
-41fc45d5e8bca3cf2be35457b188cdb3 *tests/data/fate/vsynth1-cljr.avi
-5075648 tests/data/fate/vsynth1-cljr.avi
-72e01607bae16527bc6389cf6db00b5f *tests/data/fate/vsynth1-cljr.out.rawvideo
-stddev:    6.95 PSNR: 31.28 MAXDIFF:   86 bytes:  7603200/  7603200
+085c6c83b0ef1ff6b3abd598f296e01e *tests/data/fate/vsynth1-cljr.avi
+5075652 tests/data/fate/vsynth1-cljr.avi
+7bd979b8b397f7bac22a0102c7889452 *tests/data/fate/vsynth1-cljr.out.rawvideo
+stddev:    6.74 PSNR: 31.55 MAXDIFF:   84 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-1080i b/tests/ref/vsynth/vsynth1-dnxhd-1080i
index 8d396e819f..02f989f307 100644
--- a/tests/ref/vsynth/vsynth1-dnxhd-1080i
+++ b/tests/ref/vsynth/vsynth1-dnxhd-1080i
@@ -1,4 +1,4 @@
-9e55c9ec332cc6ee002da67de34ca6d1 *tests/data/fate/vsynth1-dnxhd-1080i.mov
-3031875 tests/data/fate/vsynth1-dnxhd-1080i.mov
-34076f61254997c8157eafed1c916472 *tests/data/fate/vsynth1-dnxhd-1080i.out.rawvideo
-stddev:    6.29 PSNR: 32.15 MAXDIFF:   64 bytes:  7603200/   760320
+a0234e0a8516d958f423b119aa9e35c4 *tests/data/fate/vsynth1-dnxhd-1080i.mov
+3031911 tests/data/fate/vsynth1-dnxhd-1080i.mov
+fed9ed2a5179c9df0ef58772b025e303 *tests/data/fate/vsynth1-dnxhd-1080i.out.rawvideo
+stddev:    6.18 PSNR: 32.31 MAXDIFF:   64 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-1080i-10bit b/tests/ref/vsynth/vsynth1-dnxhd-1080i-10bit
new file mode 100644
index 0000000000..dd96e1423e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd-1080i-10bit
@@ -0,0 +1,4 @@
+f562845d1848bf5d3e524b418b742e01 *tests/data/fate/vsynth1-dnxhd-1080i-10bit.mov
+4588391 tests/data/fate/vsynth1-dnxhd-1080i-10bit.mov
+31032fcb7e6af79daaac02288254c6d6 *tests/data/fate/vsynth1-dnxhd-1080i-10bit.out.rawvideo
+stddev:    5.69 PSNR: 33.02 MAXDIFF:   55 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-1080i-colr b/tests/ref/vsynth/vsynth1-dnxhd-1080i-colr
new file mode 100644
index 0000000000..ac429667d6
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd-1080i-colr
@@ -0,0 +1,4 @@
+5fccdb16c0f14dea1b6b603bac90b97e *tests/data/fate/vsynth1-dnxhd-1080i-colr.mov
+3031929 tests/data/fate/vsynth1-dnxhd-1080i-colr.mov
+6f2d5429ffc4529a76acfeb28b560542 *tests/data/fate/vsynth1-dnxhd-1080i-colr.out.rawvideo
+stddev:    5.65 PSNR: 33.09 MAXDIFF:   55 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-2k-hr-hq b/tests/ref/vsynth/vsynth1-dnxhd-2k-hr-hq
new file mode 100644
index 0000000000..a9d229e5b0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd-2k-hr-hq
@@ -0,0 +1,4 @@
+75cade089b56bb2f7a7a2133403cd3ac *tests/data/fate/vsynth1-dnxhd-2k-hr-hq.dnxhd
+4894720 tests/data/fate/vsynth1-dnxhd-2k-hr-hq.dnxhd
+1bab73266d809d523edb6ab7802001a8 *tests/data/fate/vsynth1-dnxhd-2k-hr-hq.out.rawvideo
+stddev:    5.73 PSNR: 32.96 MAXDIFF:   55 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-4k-hr-lb b/tests/ref/vsynth/vsynth1-dnxhd-4k-hr-lb
new file mode 100644
index 0000000000..96b1f86cbb
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd-4k-hr-lb
@@ -0,0 +1,4 @@
+c6b6b35ffd147297983da4ad94887ac6 *tests/data/fate/vsynth1-dnxhd-4k-hr-lb.dnxhd
+3993600 tests/data/fate/vsynth1-dnxhd-4k-hr-lb.dnxhd
+1dc1984e4a315a35e97ed9e99940d124 *tests/data/fate/vsynth1-dnxhd-4k-hr-lb.out.rawvideo
+stddev:    5.58 PSNR: 33.19 MAXDIFF:   55 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-720p b/tests/ref/vsynth/vsynth1-dnxhd-720p
index 94c28ed2fc..16cf20c3dd 100644
--- a/tests/ref/vsynth/vsynth1-dnxhd-720p
+++ b/tests/ref/vsynth/vsynth1-dnxhd-720p
@@ -1,4 +1,4 @@
-81f5be451dc18cf8a1d333c7885de60b *tests/data/fate/vsynth1-dnxhd-720p.dnxhd
+af03d57b8320568027162132643f7814 *tests/data/fate/vsynth1-dnxhd-720p.dnxhd
 2293760 tests/data/fate/vsynth1-dnxhd-720p.dnxhd
-94b21e5e68ccf9471eff74afd0ebe319 *tests/data/fate/vsynth1-dnxhd-720p.out.rawvideo
-stddev:    6.32 PSNR: 32.11 MAXDIFF:  183 bytes:  7603200/   760320
+5f9fba5bacda81e77a72d8a816612564 *tests/data/fate/vsynth1-dnxhd-720p.out.rawvideo
+stddev:    6.22 PSNR: 32.24 MAXDIFF:   64 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-720p-10bit b/tests/ref/vsynth/vsynth1-dnxhd-720p-10bit
index 59423e7279..dc808f3836 100644
--- a/tests/ref/vsynth/vsynth1-dnxhd-720p-10bit
+++ b/tests/ref/vsynth/vsynth1-dnxhd-720p-10bit
@@ -1,4 +1,4 @@
 f8c4b7aa165a80df2485d526161290a3 *tests/data/fate/vsynth1-dnxhd-720p-10bit.dnxhd
 2293760 tests/data/fate/vsynth1-dnxhd-720p-10bit.dnxhd
-790777baa4bb70c4e32cb13649cc26bf *tests/data/fate/vsynth1-dnxhd-720p-10bit.out.rawvideo
-stddev:    6.27 PSNR: 32.18 MAXDIFF:   64 bytes:  7603200/   760320
+87f1f0e074466facd3a9922ecc8311db *tests/data/fate/vsynth1-dnxhd-720p-10bit.out.rawvideo
+stddev:    6.23 PSNR: 32.23 MAXDIFF:   64 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-720p-hr-lb b/tests/ref/vsynth/vsynth1-dnxhd-720p-hr-lb
new file mode 100644
index 0000000000..27e593120a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd-720p-hr-lb
@@ -0,0 +1,4 @@
+08cbfe9b9f671cdb9dddc9307121d107 *tests/data/fate/vsynth1-dnxhd-720p-hr-lb.dnxhd
+409600 tests/data/fate/vsynth1-dnxhd-720p-hr-lb.dnxhd
+77e510e3538313b1cbafb86ed248d2df *tests/data/fate/vsynth1-dnxhd-720p-hr-lb.out.rawvideo
+stddev:    7.50 PSNR: 30.62 MAXDIFF:   64 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-720p-rd b/tests/ref/vsynth/vsynth1-dnxhd-720p-rd
index 1de576a870..f030e92ae1 100644
--- a/tests/ref/vsynth/vsynth1-dnxhd-720p-rd
+++ b/tests/ref/vsynth/vsynth1-dnxhd-720p-rd
@@ -1,4 +1,4 @@
-1dc6e95925c4f3a230848ec17c02abed *tests/data/fate/vsynth1-dnxhd-720p-rd.dnxhd
+276e5175376051218b0e3eb36f9e9a63 *tests/data/fate/vsynth1-dnxhd-720p-rd.dnxhd
 2293760 tests/data/fate/vsynth1-dnxhd-720p-rd.dnxhd
-02972d2aec120ec1577ec9053d68ae0f *tests/data/fate/vsynth1-dnxhd-720p-rd.out.rawvideo
-stddev:    6.26 PSNR: 32.19 MAXDIFF:   65 bytes:  7603200/   760320
+1c75ad86ccd5cc2112da7d43ace50dbf *tests/data/fate/vsynth1-dnxhd-720p-rd.out.rawvideo
+stddev:    6.23 PSNR: 32.23 MAXDIFF:   64 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-edge1-hr b/tests/ref/vsynth/vsynth1-dnxhd-edge1-hr
new file mode 100644
index 0000000000..681babd8bc
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd-edge1-hr
@@ -0,0 +1,4 @@
+58dfc47406a4cb7ca344dd7b2fe3fcdb *tests/data/fate/vsynth1-dnxhd-edge1-hr.dnxhd
+81920 tests/data/fate/vsynth1-dnxhd-edge1-hr.dnxhd
+6e4070ef8005ca5c56be1ad63e7ee596 *tests/data/fate/vsynth1-dnxhd-edge1-hr.out.rawvideo
+stddev:   16.03 PSNR: 24.03 MAXDIFF:  150 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-edge2-hr b/tests/ref/vsynth/vsynth1-dnxhd-edge2-hr
new file mode 100644
index 0000000000..47db3327f8
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd-edge2-hr
@@ -0,0 +1,4 @@
+3ebeb52ae53a5b2ae4a0d90fa728c4fa *tests/data/fate/vsynth1-dnxhd-edge2-hr.dnxhd
+81920 tests/data/fate/vsynth1-dnxhd-edge2-hr.dnxhd
+1763637504f89c4e1a50a4de25c5e58a *tests/data/fate/vsynth1-dnxhd-edge2-hr.out.rawvideo
+stddev:   15.86 PSNR: 24.12 MAXDIFF:  157 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-edge3-hr b/tests/ref/vsynth/vsynth1-dnxhd-edge3-hr
new file mode 100644
index 0000000000..d4a124b8e1
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd-edge3-hr
@@ -0,0 +1,4 @@
+d509f1f4a48aa2d11a6c2940e330a96d *tests/data/fate/vsynth1-dnxhd-edge3-hr.dnxhd
+81920 tests/data/fate/vsynth1-dnxhd-edge3-hr.dnxhd
+1798764ddce650db42e6e75c7c5330e0 *tests/data/fate/vsynth1-dnxhd-edge3-hr.out.rawvideo
+stddev:   16.36 PSNR: 23.85 MAXDIFF:  152 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-hr-hq-mov b/tests/ref/vsynth/vsynth1-dnxhd-hr-hq-mov
new file mode 100644
index 0000000000..559c2f0183
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd-hr-hq-mov
@@ -0,0 +1,4 @@
+c8b5d2bde45776bbf13f0262c915f5b9 *tests/data/fate/vsynth1-dnxhd-hr-hq-mov.mov
+4772599 tests/data/fate/vsynth1-dnxhd-hr-hq-mov.mov
+388c7c84573abe28cc963e3ad5e15a31 *tests/data/fate/vsynth1-dnxhd-hr-hq-mov.out.rawvideo
+stddev:    5.73 PSNR: 32.96 MAXDIFF:   56 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-hr-lb-mov b/tests/ref/vsynth/vsynth1-dnxhd-hr-lb-mov
new file mode 100644
index 0000000000..2e2b4a3017
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd-hr-lb-mov
@@ -0,0 +1,4 @@
+254aa3f0be811882ff351172fd391492 *tests/data/fate/vsynth1-dnxhd-hr-lb-mov.mov
+3748599 tests/data/fate/vsynth1-dnxhd-hr-lb-mov.mov
+21c68252f500bada13ccce232e1ecfca *tests/data/fate/vsynth1-dnxhd-hr-lb-mov.out.rawvideo
+stddev:    5.59 PSNR: 33.17 MAXDIFF:   55 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-hr-sq-mov b/tests/ref/vsynth/vsynth1-dnxhd-hr-sq-mov
new file mode 100644
index 0000000000..2c52e3e923
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd-hr-sq-mov
@@ -0,0 +1,4 @@
+7d7fb47e926aa565b51661264f1a39e9 *tests/data/fate/vsynth1-dnxhd-hr-sq-mov.mov
+2560763 tests/data/fate/vsynth1-dnxhd-hr-sq-mov.mov
+66d29f91cdf038753894dd42e65d997a *tests/data/fate/vsynth1-dnxhd-hr-sq-mov.out.rawvideo
+stddev:    5.77 PSNR: 32.91 MAXDIFF:   58 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd-uhd-hr-sq b/tests/ref/vsynth/vsynth1-dnxhd-uhd-hr-sq
new file mode 100644
index 0000000000..7c0b421f32
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd-uhd-hr-sq
@@ -0,0 +1,4 @@
+2c53759ba6cfa1136604558224879054 *tests/data/fate/vsynth1-dnxhd-uhd-hr-sq.dnxhd
+12042240 tests/data/fate/vsynth1-dnxhd-uhd-hr-sq.dnxhd
+c91ca079d81d02dca7b6ae0161f6e2db *tests/data/fate/vsynth1-dnxhd-uhd-hr-sq.out.rawvideo
+stddev:    5.62 PSNR: 33.12 MAXDIFF:   55 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-dnxhd_1080i b/tests/ref/vsynth/vsynth1-dnxhd_1080i
new file mode 100644
index 0000000000..f8f6df09bf
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dnxhd_1080i
@@ -0,0 +1,4 @@
+027c985483caab9397592bf27477dce1 *./tests/data/vsynth1/dnxhd-1080i.mov
+3031911 ./tests/data/vsynth1/dnxhd-1080i.mov
+0c651e840f860592f0d5b66030d9fa32 *./tests/data/dnxhd_1080i.vsynth1.out.yuv
+stddev:    6.29 PSNR: 32.15 MAXDIFF:   64 bytes:   760320/  7603200
diff --git a/tests/ref/vsynth/vsynth1-dv b/tests/ref/vsynth/vsynth1-dv
index f5a37adb95..ea357b7723 100644
--- a/tests/ref/vsynth/vsynth1-dv
+++ b/tests/ref/vsynth/vsynth1-dv
@@ -1,4 +1,4 @@
-27ade3031b17214cf81c19cbf70f37d7 *tests/data/fate/vsynth1-dv.dv
+4246668d61439617101d051d7a995108 *tests/data/fate/vsynth1-dv.dv
 7200000 tests/data/fate/vsynth1-dv.dv
-02ac7cdeab91d4d5621e7ce96dddc498 *tests/data/fate/vsynth1-dv.out.rawvideo
+d52e7a9eac459ade9561d0b89bba58e7 *tests/data/fate/vsynth1-dv.out.rawvideo
 stddev:    6.90 PSNR: 31.34 MAXDIFF:   76 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-dv-411 b/tests/ref/vsynth/vsynth1-dv-411
index a1f07da3fc..ec88d67ece 100644
--- a/tests/ref/vsynth/vsynth1-dv-411
+++ b/tests/ref/vsynth/vsynth1-dv-411
@@ -1,4 +1,4 @@
-bd67f2431db160d4bb6dcd791cea6efd *tests/data/fate/vsynth1-dv-411.dv
+df067afe65f1712d9e8efa7117aab6ea *tests/data/fate/vsynth1-dv-411.dv
 7200000 tests/data/fate/vsynth1-dv-411.dv
-53946d51762b7826773e681fb02f377b *tests/data/fate/vsynth1-dv-411.out.rawvideo
+ed493bad827dc903188fce8d3b597fcb *tests/data/fate/vsynth1-dv-411.out.rawvideo
 stddev:    9.45 PSNR: 28.62 MAXDIFF:   84 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-dv-50 b/tests/ref/vsynth/vsynth1-dv-50
index 18ee398864..4a2ff00110 100644
--- a/tests/ref/vsynth/vsynth1-dv-50
+++ b/tests/ref/vsynth/vsynth1-dv-50
@@ -1,4 +1,4 @@
-26dba84f0ea895b914ef5b333d8394ac *tests/data/fate/vsynth1-dv-50.dv
+adb1df1a65cecab225677003a5de9f28 *tests/data/fate/vsynth1-dv-50.dv
 14400000 tests/data/fate/vsynth1-dv-50.dv
-a2ff093e93ffed10f730fa21df02fc50 *tests/data/fate/vsynth1-dv-50.out.rawvideo
-stddev:    1.72 PSNR: 43.38 MAXDIFF:   29 bytes:  7603200/  7603200
+4ab1f5b7aad15fab9e3c1ea5b96da39b *tests/data/fate/vsynth1-dv-50.out.rawvideo
+stddev:    1.72 PSNR: 43.37 MAXDIFF:   29 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-dv_411 b/tests/ref/vsynth/vsynth1-dv_411
new file mode 100644
index 0000000000..c45b593c02
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-dv_411
@@ -0,0 +1,4 @@
+f179899efba432c6f01149c36c709092 *./tests/data/vsynth1/dv411.dv
+7200000 ./tests/data/vsynth1/dv411.dv
+b6640a3a572353f51284acb746eb00c4 *./tests/data/dv_411.vsynth1.out.yuv
+stddev:   30.76 PSNR: 18.37 MAXDIFF:  205 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ffv1 b/tests/ref/vsynth/vsynth1-ffv1
index c9c4cf9258..001f10aae5 100644
--- a/tests/ref/vsynth/vsynth1-ffv1
+++ b/tests/ref/vsynth/vsynth1-ffv1
@@ -1,4 +1,4 @@
-a6703280a623fe42de7f7a53c2383073 *tests/data/fate/vsynth1-ffv1.avi
-2691264 tests/data/fate/vsynth1-ffv1.avi
+26b1296a0ef80a3b5c8b63cc57c52bc2 *tests/data/fate/vsynth1-ffv1.avi
+2691268 tests/data/fate/vsynth1-ffv1.avi
 c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1.out.rawvideo
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ffv1-v0 b/tests/ref/vsynth/vsynth1-ffv1-v0
new file mode 100644
index 0000000000..8c722e4b38
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-ffv1-v0
@@ -0,0 +1,4 @@
+36011c9a2b288fb04bf6c520371646d4 *tests/data/fate/vsynth1-ffv1-v0.avi
+2655368 tests/data/fate/vsynth1-ffv1-v0.avi
+c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1-v0.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0 b/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0
new file mode 100644
index 0000000000..3808f49408
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0
@@ -0,0 +1,4 @@
+3c68357b239479fc26656f6dd76b0b58 *tests/data/fate/vsynth1-ffv1-v3-bgr0.avi
+6883176 tests/data/fate/vsynth1-ffv1-v3-bgr0.avi
+49c03ab1b73b7cd3cabc3c77a9479c9e *tests/data/fate/vsynth1-ffv1-v3-bgr0.out.rawvideo
+stddev:    3.16 PSNR: 38.12 MAXDIFF:   50 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ffv1-v3-rgb48 b/tests/ref/vsynth/vsynth1-ffv1-v3-rgb48
new file mode 100644
index 0000000000..5c44488312
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-ffv1-v3-rgb48
@@ -0,0 +1,4 @@
+f457dba7d58f0c28aedcfef518758d23 *tests/data/fate/vsynth1-ffv1-v3-rgb48.avi
+16858304 tests/data/fate/vsynth1-ffv1-v3-rgb48.avi
+b91ddc45eb70b4377dc7439e16733232 *tests/data/fate/vsynth1-ffv1-v3-rgb48.out.rawvideo
+stddev:    3.58 PSNR: 37.04 MAXDIFF:   75 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p
new file mode 100644
index 0000000000..a4af95bbef
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p
@@ -0,0 +1,4 @@
+26b1296a0ef80a3b5c8b63cc57c52bc2 *tests/data/fate/vsynth1-ffv1-v3-yuv420p.avi
+2691268 tests/data/fate/vsynth1-ffv1-v3-yuv420p.avi
+c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1-v3-yuv420p.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10 b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10
new file mode 100644
index 0000000000..d56cf2760c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10
@@ -0,0 +1,4 @@
+aa8c5630213381c7b2afdec4a91405ed *tests/data/fate/vsynth1-ffv1-v3-yuv422p10.avi
+2845574 tests/data/fate/vsynth1-ffv1-v3-yuv422p10.avi
+c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1-v3-yuv422p10.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16 b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16
new file mode 100644
index 0000000000..5d919ea290
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16
@@ -0,0 +1,4 @@
+f6b6943455d8b2c3010ff898df5dc9db *tests/data/fate/vsynth1-ffv1-v3-yuv444p16.avi
+5357816 tests/data/fate/vsynth1-ffv1-v3-yuv444p16.avi
+c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1-v3-yuv444p16.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ffvhuff b/tests/ref/vsynth/vsynth1-ffvhuff
index cf86f570fe..c982fb9437 100644
--- a/tests/ref/vsynth/vsynth1-ffvhuff
+++ b/tests/ref/vsynth/vsynth1-ffvhuff
@@ -1,4 +1,4 @@
-2279cfd5efce9dc3435b814f1f95dcbc *tests/data/fate/vsynth1-ffvhuff.avi
-5987196 tests/data/fate/vsynth1-ffvhuff.avi
+be797b3c97bea941c5df720b44b779d4 *tests/data/fate/vsynth1-ffvhuff.avi
+6809214 tests/data/fate/vsynth1-ffvhuff.avi
 c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffvhuff.out.rawvideo
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ffvhuff420p12 b/tests/ref/vsynth/vsynth1-ffvhuff420p12
new file mode 100644
index 0000000000..d4b22f3b4b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-ffvhuff420p12
@@ -0,0 +1,4 @@
+866485c954242232878e40f0389790dd *tests/data/fate/vsynth1-ffvhuff420p12.avi
+14205356 tests/data/fate/vsynth1-ffvhuff420p12.avi
+c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffvhuff420p12.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ffvhuff422p10left b/tests/ref/vsynth/vsynth1-ffvhuff422p10left
new file mode 100644
index 0000000000..25c2ded4a3
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-ffvhuff422p10left
@@ -0,0 +1,4 @@
+d29edc22816fd865d3075ad6c1eaaffa *tests/data/fate/vsynth1-ffvhuff422p10left.avi
+13860684 tests/data/fate/vsynth1-ffvhuff422p10left.avi
+c31e6caada921ffa3daad3432ef3b754 *tests/data/fate/vsynth1-ffvhuff422p10left.out.rawvideo
+stddev:    1.85 PSNR: 42.78 MAXDIFF:   29 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ffvhuff444 b/tests/ref/vsynth/vsynth1-ffvhuff444
new file mode 100644
index 0000000000..978a0af9f0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-ffvhuff444
@@ -0,0 +1,4 @@
+b013f0933ef27f7e23a62a13226e0510 *tests/data/fate/vsynth1-ffvhuff444.avi
+11712342 tests/data/fate/vsynth1-ffvhuff444.avi
+10fb42f1abf40a289c3edafc0390482c *tests/data/fate/vsynth1-ffvhuff444.out.rawvideo
+stddev:    2.67 PSNR: 39.60 MAXDIFF:   43 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ffvhuff444p16 b/tests/ref/vsynth/vsynth1-ffvhuff444p16
new file mode 100644
index 0000000000..f3a6d7d21c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-ffvhuff444p16
@@ -0,0 +1,4 @@
+2f780c186d2549aa257511a951918617 *tests/data/fate/vsynth1-ffvhuff444p16.avi
+24706276 tests/data/fate/vsynth1-ffvhuff444p16.avi
+ee8379fa217dfd023de3aa6974a14d1e *tests/data/fate/vsynth1-ffvhuff444p16.out.rawvideo
+stddev:    2.66 PSNR: 39.62 MAXDIFF:   44 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-flashsv b/tests/ref/vsynth/vsynth1-flashsv
index d9bad3e19e..8b2783032b 100644
--- a/tests/ref/vsynth/vsynth1-flashsv
+++ b/tests/ref/vsynth/vsynth1-flashsv
@@ -1,4 +1,4 @@
-d0ac97a2bbf78fc02718934b70d12e70 *tests/data/fate/vsynth1-flashsv.flv
-14681905 tests/data/fate/vsynth1-flashsv.flv
-947cb24ec45a453348ae6fe3fa278071 *tests/data/fate/vsynth1-flashsv.out.rawvideo
-stddev:    2.85 PSNR: 39.03 MAXDIFF:   49 bytes:  7603200/  7603200
+97894502b4cb57aca1105b6333f72dae *tests/data/fate/vsynth1-flashsv.flv
+14681925 tests/data/fate/vsynth1-flashsv.flv
+791e1fb999deb2e4156e2286d48c4ed1 *tests/data/fate/vsynth1-flashsv.out.rawvideo
+stddev:    2.84 PSNR: 39.04 MAXDIFF:   49 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-flashsv2 b/tests/ref/vsynth/vsynth1-flashsv2
new file mode 100644
index 0000000000..a01ccbee53
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-flashsv2
@@ -0,0 +1,4 @@
+adbbdd25c1ed2f87ea589d2314307cdf *tests/data/fate/vsynth1-flashsv2.flv
+9368395 tests/data/fate/vsynth1-flashsv2.flv
+efa88d09115a2e947eff00ee435ba3f3 *tests/data/fate/vsynth1-flashsv2.out.rawvideo
+stddev:    3.47 PSNR: 37.31 MAXDIFF:   49 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-flv b/tests/ref/vsynth/vsynth1-flv
index 2aaa32cbf9..3a21e6a680 100644
--- a/tests/ref/vsynth/vsynth1-flv
+++ b/tests/ref/vsynth/vsynth1-flv
@@ -1,4 +1,4 @@
-87b9e73ada2a512ffd5abec51695e44d *tests/data/fate/vsynth1-flv.flv
-636249 tests/data/fate/vsynth1-flv.flv
-5ab46d8dd01dbb1d63df2a84858a4b05 *tests/data/fate/vsynth1-flv.out.rawvideo
+7f6ece1acc4163e33a982dd77dfad58a *tests/data/fate/vsynth1-flv.flv
+636264 tests/data/fate/vsynth1-flv.flv
+00ffbd9dac9233e53f4a4a19589a0efe *tests/data/fate/vsynth1-flv.out.rawvideo
 stddev:    8.02 PSNR: 30.04 MAXDIFF:  105 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-h261 b/tests/ref/vsynth/vsynth1-h261
index 5d667fc0fb..65efd6011c 100644
--- a/tests/ref/vsynth/vsynth1-h261
+++ b/tests/ref/vsynth/vsynth1-h261
@@ -1,4 +1,4 @@
-e7adc829541417888df4ac031768679f *tests/data/fate/vsynth1-h261.avi
-707576 tests/data/fate/vsynth1-h261.avi
-716e83cb51afb1246bfaa80967df48ea *tests/data/fate/vsynth1-h261.out.rawvideo
+5a1114f9356235172ba9ad13f88108cf *tests/data/fate/vsynth1-h261.avi
+707550 tests/data/fate/vsynth1-h261.avi
+85fde92037c2ccecc02e2d6c21a169b0 *tests/data/fate/vsynth1-h261.out.rawvideo
 stddev:    9.11 PSNR: 28.93 MAXDIFF:  113 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-h261-trellis b/tests/ref/vsynth/vsynth1-h261-trellis
new file mode 100644
index 0000000000..87b078b0d5
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-h261-trellis
@@ -0,0 +1,4 @@
+02b4109ce5343b7ef24fb11c2635498a *tests/data/fate/vsynth1-h261-trellis.avi
+655416 tests/data/fate/vsynth1-h261-trellis.avi
+70ceba944548ba680b1101c91707ea25 *tests/data/fate/vsynth1-h261-trellis.out.rawvideo
+stddev:    8.75 PSNR: 29.28 MAXDIFF:   90 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-h263 b/tests/ref/vsynth/vsynth1-h263
index d5916fa21d..53885bf2e8 100644
--- a/tests/ref/vsynth/vsynth1-h263
+++ b/tests/ref/vsynth/vsynth1-h263
@@ -1,4 +1,4 @@
-130ae384b6f12fd7d18979aa5371523a *tests/data/fate/vsynth1-h263.avi
-659674 tests/data/fate/vsynth1-h263.avi
-1a1ba9a3a63ec1a1a9585fded0a7c954 *tests/data/fate/vsynth1-h263.out.rawvideo
+0d94f4a01b959b21de8d351b092d3fd8 *tests/data/fate/vsynth1-h263.avi
+659678 tests/data/fate/vsynth1-h263.avi
+aef88517578fa7f53fe5159c4b6754ef *tests/data/fate/vsynth1-h263.out.rawvideo
 stddev:    8.03 PSNR: 30.03 MAXDIFF:  103 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-h263-obmc b/tests/ref/vsynth/vsynth1-h263-obmc
index ca3d4bf9df..b7a267a8cb 100644
--- a/tests/ref/vsynth/vsynth1-h263-obmc
+++ b/tests/ref/vsynth/vsynth1-h263-obmc
@@ -1,4 +1,4 @@
-4e7faa9203abf55a492802d30a8d80ea *tests/data/fate/vsynth1-h263-obmc.avi
-657354 tests/data/fate/vsynth1-h263-obmc.avi
-eba1d733a0c4b71322a78f718f312599 *tests/data/fate/vsynth1-h263-obmc.out.rawvideo
+7dec64380f375e5118b66f3baaaa1e24 *tests/data/fate/vsynth1-h263-obmc.avi
+657320 tests/data/fate/vsynth1-h263-obmc.avi
+844f7ee27fa122e199fe20987b41a15c *tests/data/fate/vsynth1-h263-obmc.out.rawvideo
 stddev:    8.16 PSNR: 29.89 MAXDIFF:  113 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-h263p b/tests/ref/vsynth/vsynth1-h263p
index 9e1765fb4b..ac3a660f1e 100644
--- a/tests/ref/vsynth/vsynth1-h263p
+++ b/tests/ref/vsynth/vsynth1-h263p
@@ -1,4 +1,4 @@
-b34c1a52bb504e702485d8d268dd1068 *tests/data/fate/vsynth1-h263p.avi
-2328336 tests/data/fate/vsynth1-h263p.avi
-9554cda00c3487ab3ffda2c3ea22fa2f *tests/data/fate/vsynth1-h263p.out.rawvideo
+7fbb9a42f7047643fa4e1d533bc61f57 *tests/data/fate/vsynth1-h263p.avi
+2328366 tests/data/fate/vsynth1-h263p.avi
+911330cb57c99c440234392be1588081 *tests/data/fate/vsynth1-h263p.out.rawvideo
 stddev:    2.06 PSNR: 41.83 MAXDIFF:   20 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-huffyuv b/tests/ref/vsynth/vsynth1-huffyuv
index 246da192b4..6bf79442e4 100644
--- a/tests/ref/vsynth/vsynth1-huffyuv
+++ b/tests/ref/vsynth/vsynth1-huffyuv
@@ -1,4 +1,4 @@
-cd93849c8e9846490d8f950f1b2319d5 *tests/data/fate/vsynth1-huffyuv.avi
-7933788 tests/data/fate/vsynth1-huffyuv.avi
+9a89f73cb2e305c15dda99c99c39b9d1 *tests/data/fate/vsynth1-huffyuv.avi
+8876474 tests/data/fate/vsynth1-huffyuv.avi
 c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-huffyuv.out.rawvideo
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-huffyuvbgr24 b/tests/ref/vsynth/vsynth1-huffyuvbgr24
new file mode 100644
index 0000000000..e4e7723cc0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-huffyuvbgr24
@@ -0,0 +1,4 @@
+54032b56a1727c1ad940d8c66d65169e *tests/data/fate/vsynth1-huffyuvbgr24.avi
+13196990 tests/data/fate/vsynth1-huffyuvbgr24.avi
+49c03ab1b73b7cd3cabc3c77a9479c9e *tests/data/fate/vsynth1-huffyuvbgr24.out.rawvideo
+stddev:    3.16 PSNR: 38.12 MAXDIFF:   50 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-huffyuvbgra b/tests/ref/vsynth/vsynth1-huffyuvbgra
new file mode 100644
index 0000000000..f4ea59b8ff
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-huffyuvbgra
@@ -0,0 +1,4 @@
+98e1f0bd1734cfb0eb0b442259a7de32 *tests/data/fate/vsynth1-huffyuvbgra.avi
+14464170 tests/data/fate/vsynth1-huffyuvbgra.avi
+49c03ab1b73b7cd3cabc3c77a9479c9e *tests/data/fate/vsynth1-huffyuvbgra.out.rawvideo
+stddev:    3.16 PSNR: 38.12 MAXDIFF:   50 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-jpeg2000 b/tests/ref/vsynth/vsynth1-jpeg2000
new file mode 100644
index 0000000000..48accf500a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-jpeg2000
@@ -0,0 +1,4 @@
+d2a06ad916711d29b30977a06335bb76 *tests/data/fate/vsynth1-jpeg2000.avi
+2265698 tests/data/fate/vsynth1-jpeg2000.avi
+15a8e49f6fd014193bbafd72f84936c7 *tests/data/fate/vsynth1-jpeg2000.out.rawvideo
+stddev:    5.36 PSNR: 33.55 MAXDIFF:   61 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-jpeg2000-97 b/tests/ref/vsynth/vsynth1-jpeg2000-97
new file mode 100644
index 0000000000..33b3299ad1
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-jpeg2000-97
@@ -0,0 +1,4 @@
+8bb707e596f97451fd325dec2dd610a7 *tests/data/fate/vsynth1-jpeg2000-97.avi
+3654620 tests/data/fate/vsynth1-jpeg2000-97.avi
+5073771a78e1f5366a7eb0df341662fc *tests/data/fate/vsynth1-jpeg2000-97.out.rawvideo
+stddev:    4.23 PSNR: 35.59 MAXDIFF:   53 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-jpegls b/tests/ref/vsynth/vsynth1-jpegls
index b54bd5d1f7..87372494e5 100644
--- a/tests/ref/vsynth/vsynth1-jpegls
+++ b/tests/ref/vsynth/vsynth1-jpegls
@@ -1,4 +1,4 @@
-f8acf917e24ea6c9200f2cdf99744ca9 *tests/data/fate/vsynth1-jpegls.avi
-9089800 tests/data/fate/vsynth1-jpegls.avi
-947cb24ec45a453348ae6fe3fa278071 *tests/data/fate/vsynth1-jpegls.out.rawvideo
-stddev:    2.85 PSNR: 39.03 MAXDIFF:   49 bytes:  7603200/  7603200
+29cea344136c89ef4e9da29888f7bf34 *tests/data/fate/vsynth1-jpegls.avi
+9089804 tests/data/fate/vsynth1-jpegls.avi
+791e1fb999deb2e4156e2286d48c4ed1 *tests/data/fate/vsynth1-jpegls.out.rawvideo
+stddev:    2.84 PSNR: 39.04 MAXDIFF:   49 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-ljpeg b/tests/ref/vsynth/vsynth1-ljpeg
index 702de39a8b..4e38aee3d0 100644
--- a/tests/ref/vsynth/vsynth1-ljpeg
+++ b/tests/ref/vsynth/vsynth1-ljpeg
@@ -1,4 +1,4 @@
-aed2be6710c0dddacfa410dff7ce7e79 *tests/data/fate/vsynth1-ljpeg.avi
-6312924 tests/data/fate/vsynth1-ljpeg.avi
+a9c92718692c7eb3fdce5041a6a21eb6 *tests/data/fate/vsynth1-ljpeg.avi
+6309482 tests/data/fate/vsynth1-ljpeg.avi
 c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ljpeg.out.rawvideo
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mjpeg b/tests/ref/vsynth/vsynth1-mjpeg
index 3c6fb4b796..aa441d312a 100644
--- a/tests/ref/vsynth/vsynth1-mjpeg
+++ b/tests/ref/vsynth/vsynth1-mjpeg
@@ -1,4 +1,4 @@
-b3ff9a5a9699ceddfee9abbf1b06bb00 *tests/data/fate/vsynth1-mjpeg.avi
-1516128 tests/data/fate/vsynth1-mjpeg.avi
-c6ae81b5b896e4d05ff584311aebdb18 *tests/data/fate/vsynth1-mjpeg.out.rawvideo
+63ea9bd494e16bad8f3a0c8dbb3dc11e *tests/data/fate/vsynth1-mjpeg.avi
+1391380 tests/data/fate/vsynth1-mjpeg.avi
+9a3b8169c251d19044f7087a95458c55 *tests/data/fate/vsynth1-mjpeg.out.rawvideo
 stddev:    7.87 PSNR: 30.21 MAXDIFF:   63 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mjpeg-422 b/tests/ref/vsynth/vsynth1-mjpeg-422
new file mode 100644
index 0000000000..dda3928a4b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-mjpeg-422
@@ -0,0 +1,4 @@
+82d8874bfe13f56ec466b206a08a4402 *tests/data/fate/vsynth1-mjpeg-422.avi
+1611832 tests/data/fate/vsynth1-mjpeg-422.avi
+c35eea486c6d72050f4848eab64032b5 *tests/data/fate/vsynth1-mjpeg-422.out.rawvideo
+stddev:    7.45 PSNR: 30.69 MAXDIFF:   63 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mjpeg-444 b/tests/ref/vsynth/vsynth1-mjpeg-444
new file mode 100644
index 0000000000..66a0efcf95
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-mjpeg-444
@@ -0,0 +1,4 @@
+2dd741cbee9b3499826beca7c7d3b8dc *tests/data/fate/vsynth1-mjpeg-444.avi
+1831614 tests/data/fate/vsynth1-mjpeg-444.avi
+313a4a76af13d5879ea4910107b7ea74 *tests/data/fate/vsynth1-mjpeg-444.out.rawvideo
+stddev:    7.37 PSNR: 30.77 MAXDIFF:   63 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mjpeg-huffman b/tests/ref/vsynth/vsynth1-mjpeg-huffman
new file mode 100644
index 0000000000..e8c3f0fb63
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-mjpeg-huffman
@@ -0,0 +1,4 @@
+63ea9bd494e16bad8f3a0c8dbb3dc11e *tests/data/fate/vsynth1-mjpeg-huffman.avi
+1391380 tests/data/fate/vsynth1-mjpeg-huffman.avi
+9a3b8169c251d19044f7087a95458c55 *tests/data/fate/vsynth1-mjpeg-huffman.out.rawvideo
+stddev:    7.87 PSNR: 30.21 MAXDIFF:   63 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mjpeg-trell b/tests/ref/vsynth/vsynth1-mjpeg-trell
new file mode 100644
index 0000000000..cf2a7ff16e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-mjpeg-trell
@@ -0,0 +1,4 @@
+d9410fa80c07edbd2a2b44ceb06086ca *tests/data/fate/vsynth1-mjpeg-trell.avi
+1360456 tests/data/fate/vsynth1-mjpeg-trell.avi
+0266b223bdd7928426a951164bb4a366 *tests/data/fate/vsynth1-mjpeg-trell.out.rawvideo
+stddev:    7.68 PSNR: 30.42 MAXDIFF:   62 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mjpeg-trell-huffman b/tests/ref/vsynth/vsynth1-mjpeg-trell-huffman
new file mode 100644
index 0000000000..20ce783a6b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-mjpeg-trell-huffman
@@ -0,0 +1,4 @@
+d9410fa80c07edbd2a2b44ceb06086ca *tests/data/fate/vsynth1-mjpeg-trell-huffman.avi
+1360456 tests/data/fate/vsynth1-mjpeg-trell-huffman.avi
+0266b223bdd7928426a951164bb4a366 *tests/data/fate/vsynth1-mjpeg-trell-huffman.out.rawvideo
+stddev:    7.68 PSNR: 30.42 MAXDIFF:   62 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mov-bgr24 b/tests/ref/vsynth/vsynth1-mov-bgr24
new file mode 100644
index 0000000000..ec60442fae
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-mov-bgr24
@@ -0,0 +1,4 @@
+93d3a2e5701c3da06da27cffa04fb730 *tests/data/fate/vsynth1-mov-bgr24.mov
+15207169 tests/data/fate/vsynth1-mov-bgr24.mov
+93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-mov-bgr24.out.rawvideo
+stddev:    3.42 PSNR: 37.44 MAXDIFF:   48 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mov-bpp15 b/tests/ref/vsynth/vsynth1-mov-bpp15
new file mode 100644
index 0000000000..cfb5e861d5
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-mov-bpp15
@@ -0,0 +1,4 @@
+00cd1f0cf8c335b8f4d7dfa81e188e75 *tests/data/fate/vsynth1-mov-bpp15.mov
+10138329 tests/data/fate/vsynth1-mov-bpp15.mov
+99bece160cfb0da47f446b60d42fa3ae *tests/data/fate/vsynth1-mov-bpp15.out.rawvideo
+stddev:    4.06 PSNR: 35.94 MAXDIFF:   47 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mov-bpp16 b/tests/ref/vsynth/vsynth1-mov-bpp16
new file mode 100644
index 0000000000..8b17895c0e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-mov-bpp16
@@ -0,0 +1,4 @@
+623f62ed23abf406c2d67bf65adaf421 *tests/data/fate/vsynth1-mov-bpp16.mov
+10138329 tests/data/fate/vsynth1-mov-bpp16.mov
+0cea382b9b0a4ce88260c1edc20b3f5b *tests/data/fate/vsynth1-mov-bpp16.out.rawvideo
+stddev:    3.79 PSNR: 36.55 MAXDIFF:   46 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg1 b/tests/ref/vsynth/vsynth1-mpeg1
index 5f3d703d68..902b201eb5 100644
--- a/tests/ref/vsynth/vsynth1-mpeg1
+++ b/tests/ref/vsynth/vsynth1-mpeg1
@@ -1,4 +1,4 @@
-1428744c6d5835f27506e69be4f837f4 *tests/data/fate/vsynth1-mpeg1.mpeg1video
-712006 tests/data/fate/vsynth1-mpeg1.mpeg1video
-58f0c332bf689117b57fa629a2bc0d2b *tests/data/fate/vsynth1-mpeg1.out.rawvideo
-stddev:    7.62 PSNR: 30.48 MAXDIFF:   84 bytes:  7603200/  7603200
+746ae4adb7d1921800b9cc30257d7231 *tests/data/fate/vsynth1-mpeg1.mpeg1video
+711835 tests/data/fate/vsynth1-mpeg1.mpeg1video
+c126c7dd12e7161df192d253e3100475 *tests/data/fate/vsynth1-mpeg1.out.rawvideo
+stddev:    7.63 PSNR: 30.48 MAXDIFF:   84 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg1b b/tests/ref/vsynth/vsynth1-mpeg1b
index ddd9bef6c2..6d7afa4915 100644
--- a/tests/ref/vsynth/vsynth1-mpeg1b
+++ b/tests/ref/vsynth/vsynth1-mpeg1b
@@ -1,4 +1,4 @@
-777639666b449ab0a7ef260511e40532 *tests/data/fate/vsynth1-mpeg1b.mpeg1video
-1030337 tests/data/fate/vsynth1-mpeg1b.mpeg1video
-91a7fce732b34748e7bf753ebabe2483 *tests/data/fate/vsynth1-mpeg1b.out.rawvideo
+f99bb6797faddeb48863a49a244793fc *tests/data/fate/vsynth1-mpeg1b.mpeg1video
+1031387 tests/data/fate/vsynth1-mpeg1b.mpeg1video
+22289cbbeb1e40c5fd68dcc73a07d8f5 *tests/data/fate/vsynth1-mpeg1b.out.rawvideo
 stddev:    6.30 PSNR: 32.13 MAXDIFF:   75 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg2 b/tests/ref/vsynth/vsynth1-mpeg2
index d0baa0ac81..0f06f380cf 100644
--- a/tests/ref/vsynth/vsynth1-mpeg2
+++ b/tests/ref/vsynth/vsynth1-mpeg2
@@ -1,4 +1,4 @@
-50c344f0e0e3c65001a68b2c899a283f *tests/data/fate/vsynth1-mpeg2.mpeg2video
-728104 tests/data/fate/vsynth1-mpeg2.mpeg2video
-b41ca49c1a02e66ce64d262e2cdaec15 *tests/data/fate/vsynth1-mpeg2.out.rawvideo
+89d9481c12d2342e256b322d317e81c4 *tests/data/fate/vsynth1-mpeg2.mpeg2video
+728400 tests/data/fate/vsynth1-mpeg2.mpeg2video
+66c2a14725ba0a6f1535b9a62768977b *tests/data/fate/vsynth1-mpeg2.out.rawvideo
 stddev:    7.65 PSNR: 30.45 MAXDIFF:   84 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg2-422 b/tests/ref/vsynth/vsynth1-mpeg2-422
index 1209e8879f..e936ba463e 100644
--- a/tests/ref/vsynth/vsynth1-mpeg2-422
+++ b/tests/ref/vsynth/vsynth1-mpeg2-422
@@ -1,4 +1,4 @@
-c2124749526d2d4d41398d52557fad1b *tests/data/fate/vsynth1-mpeg2-422.mpeg2video
-728260 tests/data/fate/vsynth1-mpeg2-422.mpeg2video
-eb7fe83ce09af2d79ec16577c9d44e3c *tests/data/fate/vsynth1-mpeg2-422.out.rawvideo
-stddev:   10.29 PSNR: 27.88 MAXDIFF:  168 bytes:  7603200/  7603200
+6e135a1a27235a320311a932147846b4 *tests/data/fate/vsynth1-mpeg2-422.mpeg2video
+730780 tests/data/fate/vsynth1-mpeg2-422.mpeg2video
+0273cd8463d1fc115378748239951560 *tests/data/fate/vsynth1-mpeg2-422.out.rawvideo
+stddev:   10.27 PSNR: 27.90 MAXDIFF:  162 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg2-idct-int b/tests/ref/vsynth/vsynth1-mpeg2-idct-int
index cc789bbc28..89356d060b 100644
--- a/tests/ref/vsynth/vsynth1-mpeg2-idct-int
+++ b/tests/ref/vsynth/vsynth1-mpeg2-idct-int
@@ -1,4 +1,4 @@
-d0cc23c61c4afcfdf0fea53b31c6df38 *tests/data/fate/vsynth1-mpeg2-idct-int.mpeg2video
-725728 tests/data/fate/vsynth1-mpeg2-idct-int.mpeg2video
+b63161625d83d39c9114c7018cac5e9b *tests/data/fate/vsynth1-mpeg2-idct-int.mpeg2video
+725668 tests/data/fate/vsynth1-mpeg2-idct-int.mpeg2video
 8130f71a467315c9e7bd1a25a01dbb23 *tests/data/fate/vsynth1-mpeg2-idct-int.out.rawvideo
 stddev:    7.65 PSNR: 30.45 MAXDIFF:   80 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg2-ilace b/tests/ref/vsynth/vsynth1-mpeg2-ilace
index 81e43c5c92..b9144b67a2 100644
--- a/tests/ref/vsynth/vsynth1-mpeg2-ilace
+++ b/tests/ref/vsynth/vsynth1-mpeg2-ilace
@@ -1,4 +1,4 @@
-c8e27cddb2da4d76816c258b6e3d1fab *tests/data/fate/vsynth1-mpeg2-ilace.mpeg2video
-737533 tests/data/fate/vsynth1-mpeg2-ilace.mpeg2video
-97615390fdd69abfcbc7e02df863a7d2 *tests/data/fate/vsynth1-mpeg2-ilace.out.rawvideo
+a92e79aa97a2d6b3b48b6cd9ceee1701 *tests/data/fate/vsynth1-mpeg2-ilace.mpeg2video
+738127 tests/data/fate/vsynth1-mpeg2-ilace.mpeg2video
+d0f2fab8d3a3fb8bc67aca068447d2db *tests/data/fate/vsynth1-mpeg2-ilace.out.rawvideo
 stddev:    7.67 PSNR: 30.43 MAXDIFF:   84 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd b/tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd
index 647525dbb1..392f9bb7f9 100644
--- a/tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd
+++ b/tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd
@@ -1,4 +1,4 @@
-ba08be2c6209f6b88be97e6fe74911db *tests/data/fate/vsynth1-mpeg2-ivlc-qprd.mpeg2video
-783612 tests/data/fate/vsynth1-mpeg2-ivlc-qprd.mpeg2video
-98eb9da15f880978e7f2ee1e7ce476ef *tests/data/fate/vsynth1-mpeg2-ivlc-qprd.out.rawvideo
-stddev:   10.07 PSNR: 28.06 MAXDIFF:  165 bytes:  7603200/  7603200
+2e5882eeaaae088750d9854c93bbf68e *tests/data/fate/vsynth1-mpeg2-ivlc-qprd.mpeg2video
+783518 tests/data/fate/vsynth1-mpeg2-ivlc-qprd.mpeg2video
+0876d78f40971c5a8eb2367cbd27c5a6 *tests/data/fate/vsynth1-mpeg2-ivlc-qprd.out.rawvideo
+stddev:   10.07 PSNR: 28.07 MAXDIFF:  165 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg2-thread b/tests/ref/vsynth/vsynth1-mpeg2-thread
index 1a479bcd90..5f750b914e 100644
--- a/tests/ref/vsynth/vsynth1-mpeg2-thread
+++ b/tests/ref/vsynth/vsynth1-mpeg2-thread
@@ -1,4 +1,4 @@
-c17bee51286e13b0c95a504391632087 *tests/data/fate/vsynth1-mpeg2-thread.mpeg2video
-801373 tests/data/fate/vsynth1-mpeg2-thread.mpeg2video
-d1658911ca83f5616c1d32abc40750de *tests/data/fate/vsynth1-mpeg2-thread.out.rawvideo
+b4026056b8b903c37f6adfe2cd2d1894 *tests/data/fate/vsynth1-mpeg2-thread.mpeg2video
+801214 tests/data/fate/vsynth1-mpeg2-thread.mpeg2video
+d433c9b07b40b0d6c4fd5426699efb7f *tests/data/fate/vsynth1-mpeg2-thread.out.rawvideo
 stddev:    7.63 PSNR: 30.48 MAXDIFF:  110 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc b/tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc
index b211c94a9e..618125c541 100644
--- a/tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc
+++ b/tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc
@@ -1,4 +1,4 @@
-9f3991d18d5dc5240ca61b158ce76521 *tests/data/fate/vsynth1-mpeg2-thread-ivlc.mpeg2video
-791833 tests/data/fate/vsynth1-mpeg2-thread-ivlc.mpeg2video
-d1658911ca83f5616c1d32abc40750de *tests/data/fate/vsynth1-mpeg2-thread-ivlc.out.rawvideo
+08310d12ac77af11a0ac564552322e08 *tests/data/fate/vsynth1-mpeg2-thread-ivlc.mpeg2video
+791673 tests/data/fate/vsynth1-mpeg2-thread-ivlc.mpeg2video
+d433c9b07b40b0d6c4fd5426699efb7f *tests/data/fate/vsynth1-mpeg2-thread-ivlc.out.rawvideo
 stddev:    7.63 PSNR: 30.48 MAXDIFF:  110 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg4 b/tests/ref/vsynth/vsynth1-mpeg4
index ac1ebc7780..4e9b4bd03a 100644
--- a/tests/ref/vsynth/vsynth1-mpeg4
+++ b/tests/ref/vsynth/vsynth1-mpeg4
@@ -1,4 +1,4 @@
-173f524d5cd2591709bf1d5d2818b420 *tests/data/fate/vsynth1-mpeg4.mp4
-540241 tests/data/fate/vsynth1-mpeg4.mp4
-8828a375448dc5c2215163ba70656f89 *tests/data/fate/vsynth1-mpeg4.out.rawvideo
+b4e8871c504a22c8c874c7e845b73da7 *tests/data/fate/vsynth1-mpeg4.mp4
+540085 tests/data/fate/vsynth1-mpeg4.mp4
+f80ec173d37f2f91add031e95579a220 *tests/data/fate/vsynth1-mpeg4.out.rawvideo
 stddev:    7.97 PSNR: 30.10 MAXDIFF:  105 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg4-adap b/tests/ref/vsynth/vsynth1-mpeg4-adap
index 840eb475f6..e6bd6a59bd 100644
--- a/tests/ref/vsynth/vsynth1-mpeg4-adap
+++ b/tests/ref/vsynth/vsynth1-mpeg4-adap
@@ -1,4 +1,4 @@
-eb70136b050f0b216febe57e7766b6a8 *tests/data/fate/vsynth1-mpeg4-adap.avi
-403444 tests/data/fate/vsynth1-mpeg4-adap.avi
-fa2049396479b5f170aa764fed5b2a31 *tests/data/fate/vsynth1-mpeg4-adap.out.rawvideo
+f120f0bf976bb510c5b5305fe7d8159a *tests/data/fate/vsynth1-mpeg4-adap.avi
+403436 tests/data/fate/vsynth1-mpeg4-adap.avi
+fad0b9dc08fe4a95b297af1a7411c1e9 *tests/data/fate/vsynth1-mpeg4-adap.out.rawvideo
 stddev:   14.05 PSNR: 25.17 MAXDIFF:  184 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg4-adv b/tests/ref/vsynth/vsynth1-mpeg4-adv
index 8ca1f2f1e8..f45077912e 100644
--- a/tests/ref/vsynth/vsynth1-mpeg4-adv
+++ b/tests/ref/vsynth/vsynth1-mpeg4-adv
@@ -1,4 +1,4 @@
-c67ccefff2a038c1a149eceef8b08d1e *tests/data/fate/vsynth1-mpeg4-adv.avi
-589704 tests/data/fate/vsynth1-mpeg4-adv.avi
-f8b226876b1b2c0b98fd6928fd9adbd8 *tests/data/fate/vsynth1-mpeg4-adv.out.rawvideo
+0700d773f269babdaea4c6c71a3d7876 *tests/data/fate/vsynth1-mpeg4-adv.avi
+589708 tests/data/fate/vsynth1-mpeg4-adv.avi
+b651bd94456005a1990fb64c28306262 *tests/data/fate/vsynth1-mpeg4-adv.out.rawvideo
 stddev:    6.98 PSNR: 31.25 MAXDIFF:   84 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg4-error b/tests/ref/vsynth/vsynth1-mpeg4-error
index 918091173d..b3b8d66e49 100644
--- a/tests/ref/vsynth/vsynth1-mpeg4-error
+++ b/tests/ref/vsynth/vsynth1-mpeg4-error
@@ -1,4 +1,4 @@
-63fdc6877c299fe94a061e276ca77bad *tests/data/fate/vsynth1-mpeg4-error.avi
-756824 tests/data/fate/vsynth1-mpeg4-error.avi
-79e94ba32b37759397362cbcb479d4d3 *tests/data/fate/vsynth1-mpeg4-error.out.rawvideo
-stddev:   18.36 PSNR: 22.85 MAXDIFF:  243 bytes:  7603200/  7603200
+d23ad508e15bf6af8de8799c59acd6dc *tests/data/fate/vsynth1-mpeg4-error.avi
+752350 tests/data/fate/vsynth1-mpeg4-error.avi
+5853c8c789f260ae4dcbf37a17d04b66 *tests/data/fate/vsynth1-mpeg4-error.out.rawvideo
+stddev:   17.33 PSNR: 23.35 MAXDIFF:  229 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg4-nr b/tests/ref/vsynth/vsynth1-mpeg4-nr
index 28f8c6a9cd..94b5b4fa2f 100644
--- a/tests/ref/vsynth/vsynth1-mpeg4-nr
+++ b/tests/ref/vsynth/vsynth1-mpeg4-nr
@@ -1,4 +1,4 @@
-d9eabca19ca600f18539b35a94663603 *tests/data/fate/vsynth1-mpeg4-nr.avi
-675626 tests/data/fate/vsynth1-mpeg4-nr.avi
-d2b89d5958fb7331f6c9e5b7ecaaa5b6 *tests/data/fate/vsynth1-mpeg4-nr.out.rawvideo
-stddev:    6.99 PSNR: 31.23 MAXDIFF:   86 bytes:  7603200/  7603200
+793b77835fe8073bba19a22e9039d6e1 *tests/data/fate/vsynth1-mpeg4-nr.avi
+675456 tests/data/fate/vsynth1-mpeg4-nr.avi
+5fee518cde41e5567f800fbe14210fb8 *tests/data/fate/vsynth1-mpeg4-nr.out.rawvideo
+stddev:    6.99 PSNR: 31.24 MAXDIFF:   86 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg4-nsse b/tests/ref/vsynth/vsynth1-mpeg4-nsse
new file mode 100644
index 0000000000..48cc851518
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-mpeg4-nsse
@@ -0,0 +1,4 @@
+1c2eac81a7768afe8dba1df85e977aec *tests/data/fate/vsynth1-mpeg4-nsse.avi
+886846 tests/data/fate/vsynth1-mpeg4-nsse.avi
+a987cb2e49284ea83174e3a2c6527173 *tests/data/fate/vsynth1-mpeg4-nsse.out.rawvideo
+stddev:    6.00 PSNR: 32.57 MAXDIFF:   73 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg4-qpel b/tests/ref/vsynth/vsynth1-mpeg4-qpel
index 1ff1dceafb..f845542a42 100644
--- a/tests/ref/vsynth/vsynth1-mpeg4-qpel
+++ b/tests/ref/vsynth/vsynth1-mpeg4-qpel
@@ -1,4 +1,4 @@
-c02be5680307d8f97a2f442d27f48f3c *tests/data/fate/vsynth1-mpeg4-qpel.avi
-860666 tests/data/fate/vsynth1-mpeg4-qpel.avi
-756928496245ecc701f79eebeec8e5e6 *tests/data/fate/vsynth1-mpeg4-qpel.out.rawvideo
-stddev:    5.63 PSNR: 33.12 MAXDIFF:   70 bytes:  7603200/  7603200
+cb55178feaf790db7bca758708f989dd *tests/data/fate/vsynth1-mpeg4-qpel.avi
+858684 tests/data/fate/vsynth1-mpeg4-qpel.avi
+5089090df7169eb482532df5471d7f5f *tests/data/fate/vsynth1-mpeg4-qpel.out.rawvideo
+stddev:    5.63 PSNR: 33.11 MAXDIFF:   70 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg4-qprd b/tests/ref/vsynth/vsynth1-mpeg4-qprd
index 0b2892dfc8..d5c75ab92c 100644
--- a/tests/ref/vsynth/vsynth1-mpeg4-qprd
+++ b/tests/ref/vsynth/vsynth1-mpeg4-qprd
@@ -1,4 +1,4 @@
-5a95ba2c240fcb28963fe90fba4ce52b *tests/data/fate/vsynth1-mpeg4-qprd.avi
-710932 tests/data/fate/vsynth1-mpeg4-qprd.avi
-e65f4c7f343fe2bad1cac44b7da5f7c4 *tests/data/fate/vsynth1-mpeg4-qprd.out.rawvideo
+14612d85cd7f77de7b5e6345240535ba *tests/data/fate/vsynth1-mpeg4-qprd.avi
+710676 tests/data/fate/vsynth1-mpeg4-qprd.avi
+693231ac7e6fbf8758415f9f2509408d *tests/data/fate/vsynth1-mpeg4-qprd.out.rawvideo
 stddev:    9.79 PSNR: 28.31 MAXDIFF:  176 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg4-rc b/tests/ref/vsynth/vsynth1-mpeg4-rc
index 0c2abf3e71..5b1d7ff1e3 100644
--- a/tests/ref/vsynth/vsynth1-mpeg4-rc
+++ b/tests/ref/vsynth/vsynth1-mpeg4-rc
@@ -1,4 +1,4 @@
-49ac6ed095ea2dccf53737e6beab7ad7 *tests/data/fate/vsynth1-mpeg4-rc.avi
-830148 tests/data/fate/vsynth1-mpeg4-rc.avi
-4d95e340db9bc57a559162c039f3784e *tests/data/fate/vsynth1-mpeg4-rc.out.rawvideo
+91c127f2acc04f51e0e62bcf0752e064 *tests/data/fate/vsynth1-mpeg4-rc.avi
+830498 tests/data/fate/vsynth1-mpeg4-rc.avi
+9dcd9d022ae14fe1e4a53aa4865464c6 *tests/data/fate/vsynth1-mpeg4-rc.out.rawvideo
 stddev:   10.24 PSNR: 27.92 MAXDIFF:  196 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpeg4-thread b/tests/ref/vsynth/vsynth1-mpeg4-thread
index b0bf7d88fe..6b69fb4c12 100644
--- a/tests/ref/vsynth/vsynth1-mpeg4-thread
+++ b/tests/ref/vsynth/vsynth1-mpeg4-thread
@@ -1,4 +1,4 @@
-c081bc20f1eb048626ea783d8b08a531 *tests/data/fate/vsynth1-mpeg4-thread.avi
-774748 tests/data/fate/vsynth1-mpeg4-thread.avi
-64b96cddf5301990e118978b3a3bcd0d *tests/data/fate/vsynth1-mpeg4-thread.out.rawvideo
+369ace2f9613261af869efd9fbb3c149 *tests/data/fate/vsynth1-mpeg4-thread.avi
+774754 tests/data/fate/vsynth1-mpeg4-thread.avi
+9aa327a244d5179acf7fe64dc1459bff *tests/data/fate/vsynth1-mpeg4-thread.out.rawvideo
 stddev:   10.13 PSNR: 28.02 MAXDIFF:  183 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-mpng b/tests/ref/vsynth/vsynth1-mpng
new file mode 100644
index 0000000000..9b394d7629
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-mpng
@@ -0,0 +1,4 @@
+6a27410a07ed1c5556e15b7a7c6a586d *tests/data/fate/vsynth1-mpng.avi
+12158280 tests/data/fate/vsynth1-mpng.avi
+93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-mpng.out.rawvideo
+stddev:    3.42 PSNR: 37.44 MAXDIFF:   48 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-msmpeg4 b/tests/ref/vsynth/vsynth1-msmpeg4
index cd1b6db036..7ff497415f 100644
--- a/tests/ref/vsynth/vsynth1-msmpeg4
+++ b/tests/ref/vsynth/vsynth1-msmpeg4
@@ -1,4 +1,4 @@
-c1d04df31764c0ca281dc6fe023287fb *tests/data/fate/vsynth1-msmpeg4.avi
+3957ca57ac97f651c828ab00d8f0e088 *tests/data/fate/vsynth1-msmpeg4.avi
 624706 tests/data/fate/vsynth1-msmpeg4.avi
-5ca72c39e3fc5df8e62f223c869589f5 *tests/data/fate/vsynth1-msmpeg4.out.rawvideo
+4529fee96b8073e02974f5355e5f6c4e *tests/data/fate/vsynth1-msmpeg4.out.rawvideo
 stddev:    7.98 PSNR: 30.09 MAXDIFF:  104 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-msmpeg4v2 b/tests/ref/vsynth/vsynth1-msmpeg4v2
index fb9862c0e0..514ca99d3e 100644
--- a/tests/ref/vsynth/vsynth1-msmpeg4v2
+++ b/tests/ref/vsynth/vsynth1-msmpeg4v2
@@ -1,4 +1,4 @@
-48c76c638b43ee53bde9c58185b25e80 *tests/data/fate/vsynth1-msmpeg4v2.avi
-623776 tests/data/fate/vsynth1-msmpeg4v2.avi
-c6ff1041a0ef62c2a2e5ef519e5e94c4 *tests/data/fate/vsynth1-msmpeg4v2.out.rawvideo
+d13c6aaf0d3842d3e50cc96574572f6f *tests/data/fate/vsynth1-msmpeg4v2.avi
+623770 tests/data/fate/vsynth1-msmpeg4v2.avi
+0476d9aafc4358654f411fa9648f9560 *tests/data/fate/vsynth1-msmpeg4v2.out.rawvideo
 stddev:    7.97 PSNR: 30.10 MAXDIFF:  105 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-msvideo1 b/tests/ref/vsynth/vsynth1-msvideo1
new file mode 100644
index 0000000000..e7435a97ad
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-msvideo1
@@ -0,0 +1,4 @@
+41c8ec9813bb32831c4cf279677e631b *tests/data/fate/vsynth1-msvideo1.avi
+2051896 tests/data/fate/vsynth1-msvideo1.avi
+f4605ac6df556a3ca7053c49aaac04d8 *tests/data/fate/vsynth1-msvideo1.out.rawvideo
+stddev:   11.89 PSNR: 26.62 MAXDIFF:  159 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-prores b/tests/ref/vsynth/vsynth1-prores
index 12aa7582c8..14de8b9cf3 100644
--- a/tests/ref/vsynth/vsynth1-prores
+++ b/tests/ref/vsynth/vsynth1-prores
@@ -1,4 +1,4 @@
-7dfcca40f50ff1d72541bc095c904784 *tests/data/fate/vsynth1-prores.mov
-3859037 tests/data/fate/vsynth1-prores.mov
-0a4153637d0cc0a88a8bcbf04cfaf8c6 *tests/data/fate/vsynth1-prores.out.rawvideo
-stddev:    3.17 PSNR: 38.09 MAXDIFF:   39 bytes:  7603200/  7603200
+7ca7d2f9f5d8ac2ead691b1b6a70d409 *tests/data/fate/vsynth1-prores.mov
+5022821 tests/data/fate/vsynth1-prores.mov
+fb4a9e025d12afc0dbbca8d82831858f *tests/data/fate/vsynth1-prores.out.rawvideo
+stddev:    2.47 PSNR: 40.27 MAXDIFF:   31 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-prores_ks b/tests/ref/vsynth/vsynth1-prores_ks
new file mode 100644
index 0000000000..6e5ed172b2
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-prores_ks
@@ -0,0 +1,4 @@
+fe41a284da97ea5ec8866ca9a55b84da *tests/data/fate/vsynth1-prores_ks.mov
+3858911 tests/data/fate/vsynth1-prores_ks.mov
+100eb002413fe7a632d440dfbdf7e3ff *tests/data/fate/vsynth1-prores_ks.out.rawvideo
+stddev:    3.17 PSNR: 38.09 MAXDIFF:   39 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-qtrle b/tests/ref/vsynth/vsynth1-qtrle
index 4ddd1d8a2a..4b920815ce 100644
--- a/tests/ref/vsynth/vsynth1-qtrle
+++ b/tests/ref/vsynth/vsynth1-qtrle
@@ -1,4 +1,4 @@
-24650c5b226d054c57be7c06c9220058 *tests/data/fate/vsynth1-qtrle.mov
-15263232 tests/data/fate/vsynth1-qtrle.mov
-243325fb2cae1a9245efd49aff936327 *tests/data/fate/vsynth1-qtrle.out.rawvideo
-stddev:    3.42 PSNR: 37.43 MAXDIFF:   48 bytes:  7603200/  7603200
+35d8a1446d886fadcdffae192bed7e4e *tests/data/fate/vsynth1-qtrle.mov
+15263158 tests/data/fate/vsynth1-qtrle.mov
+93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-qtrle.out.rawvideo
+stddev:    3.42 PSNR: 37.44 MAXDIFF:   48 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-qtrlegray b/tests/ref/vsynth/vsynth1-qtrlegray
new file mode 100644
index 0000000000..c3d571d92b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-qtrlegray
@@ -0,0 +1,4 @@
+651b745a37a06ddd52adfe8e0a45b115 *tests/data/fate/vsynth1-qtrlegray.mov
+5113293 tests/data/fate/vsynth1-qtrlegray.mov
+cb20af0e5a65aad7cf47002fcb52288e *tests/data/fate/vsynth1-qtrlegray.out.rawvideo
+stddev:   25.34 PSNR: 20.05 MAXDIFF:  122 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-r210 b/tests/ref/vsynth/vsynth1-r210
new file mode 100644
index 0000000000..825e1d4789
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-r210
@@ -0,0 +1,4 @@
+1ea72f280b110ed65fc535c3438d27f9 *tests/data/fate/vsynth1-r210.avi
+22125252 tests/data/fate/vsynth1-r210.avi
+ecaafa9eec11b5e1453a63ed6d194eed *tests/data/fate/vsynth1-r210.out.rawvideo
+stddev:    3.23 PSNR: 37.94 MAXDIFF:   48 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-rgb b/tests/ref/vsynth/vsynth1-rgb
index f72b737adb..6d9629b5e9 100644
--- a/tests/ref/vsynth/vsynth1-rgb
+++ b/tests/ref/vsynth/vsynth1-rgb
@@ -1,4 +1,4 @@
-d78bcd5828862c3342388ec8a2c34fef *tests/data/fate/vsynth1-rgb.avi
-15213248 tests/data/fate/vsynth1-rgb.avi
-243325fb2cae1a9245efd49aff936327 *tests/data/fate/vsynth1-rgb.out.rawvideo
-stddev:    3.42 PSNR: 37.43 MAXDIFF:   48 bytes:  7603200/  7603200
+9d2bd1fa569a803c41b5dc5dd03f088e *tests/data/fate/vsynth1-rgb.avi
+15213252 tests/data/fate/vsynth1-rgb.avi
+93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-rgb.out.rawvideo
+stddev:    3.42 PSNR: 37.44 MAXDIFF:   48 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-roqvideo b/tests/ref/vsynth/vsynth1-roqvideo
index 5adba69490..2cca94224b 100644
--- a/tests/ref/vsynth/vsynth1-roqvideo
+++ b/tests/ref/vsynth/vsynth1-roqvideo
@@ -1,4 +1,4 @@
-cf8b7b0e539bab3169c234ca63d71dd8 *tests/data/fate/vsynth1-roqvideo.roq
-101671 tests/data/fate/vsynth1-roqvideo.roq
-0ad983c291b1ed373645c5b12a108c61 *tests/data/fate/vsynth1-roqvideo.out.rawvideo
-stddev:    7.74 PSNR: 30.35 MAXDIFF:   89 bytes:  7603200/   760320
+8037e62b2707a246e787bb1723b752b9 *tests/data/fate/vsynth1-roqvideo.roq
+102571 tests/data/fate/vsynth1-roqvideo.roq
+9e3bb47e5e9708392d7eba8f944b6920 *tests/data/fate/vsynth1-roqvideo.out.rawvideo
+stddev:    7.75 PSNR: 30.34 MAXDIFF:   88 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-rv10 b/tests/ref/vsynth/vsynth1-rv10
index 234015f46d..d414bd68d1 100644
--- a/tests/ref/vsynth/vsynth1-rv10
+++ b/tests/ref/vsynth/vsynth1-rv10
@@ -1,4 +1,4 @@
-4d7e82de72a83905cf84b8abc3e70b8f *tests/data/fate/vsynth1-rv10.rm
-653905 tests/data/fate/vsynth1-rv10.rm
-1a1ba9a3a63ec1a1a9585fded0a7c954 *tests/data/fate/vsynth1-rv10.out.rawvideo
+5ef46004d474669d19ad06133a1cf137 *tests/data/fate/vsynth1-rv10.rm
+653907 tests/data/fate/vsynth1-rv10.rm
+aef88517578fa7f53fe5159c4b6754ef *tests/data/fate/vsynth1-rv10.out.rawvideo
 stddev:    8.03 PSNR: 30.03 MAXDIFF:  103 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-rv20 b/tests/ref/vsynth/vsynth1-rv20
index abcc4a1f7a..5b3310a51a 100644
--- a/tests/ref/vsynth/vsynth1-rv20
+++ b/tests/ref/vsynth/vsynth1-rv20
@@ -1,4 +1,4 @@
-81868601e602eee5b6d80f5ece4aaa98 *tests/data/fate/vsynth1-rv20.rm
-646016 tests/data/fate/vsynth1-rv20.rm
-b45fdb0201b06f7649f44050e262c54c *tests/data/fate/vsynth1-rv20.out.rawvideo
+0f04eec24aaa8ea06eafc58082c2e2ef *tests/data/fate/vsynth1-rv20.rm
+646019 tests/data/fate/vsynth1-rv20.rm
+3f55bcfb3c672d74f0fa64aa90aa0395 *tests/data/fate/vsynth1-rv20.out.rawvideo
 stddev:    8.26 PSNR: 29.79 MAXDIFF:  103 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-snow b/tests/ref/vsynth/vsynth1-snow
new file mode 100644
index 0000000000..f20abd2ee4
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-snow
@@ -0,0 +1,4 @@
+67c10f8d52fcd1103caa675a1408bf6e *tests/data/fate/vsynth1-snow.avi
+136088 tests/data/fate/vsynth1-snow.avi
+bfc0bcc4bc7b956933aa58acc587018d *tests/data/fate/vsynth1-snow.out.rawvideo
+stddev:   22.77 PSNR: 20.98 MAXDIFF:  175 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-snow-hpel b/tests/ref/vsynth/vsynth1-snow-hpel
new file mode 100644
index 0000000000..39780ad8a2
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-snow-hpel
@@ -0,0 +1,4 @@
+e62ae25d5040d04622a965bcb27fdb1e *tests/data/fate/vsynth1-snow-hpel.avi
+138446 tests/data/fate/vsynth1-snow-hpel.avi
+57c914cd150f8fc260b5989ce3e5884c *tests/data/fate/vsynth1-snow-hpel.out.rawvideo
+stddev:   22.74 PSNR: 20.99 MAXDIFF:  172 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-snow-ll b/tests/ref/vsynth/vsynth1-snow-ll
new file mode 100644
index 0000000000..ca5007fefb
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-snow-ll
@@ -0,0 +1,4 @@
+47690bd6f32d8f5ce11b9f6e7f090be2 *tests/data/fate/vsynth1-snow-ll.avi
+3419972 tests/data/fate/vsynth1-snow-ll.avi
+c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-snow-ll.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-svq1 b/tests/ref/vsynth/vsynth1-svq1
index f610fdc1ce..9c1b6ff7ac 100644
--- a/tests/ref/vsynth/vsynth1-svq1
+++ b/tests/ref/vsynth/vsynth1-svq1
@@ -1,4 +1,4 @@
-3c90c6c0c4db7993660cee642de05bb4 *tests/data/fate/vsynth1-svq1.mov
-1334367 tests/data/fate/vsynth1-svq1.mov
+a3206831d34197a2d236d82dd0248646 *tests/data/fate/vsynth1-svq1.mov
+1334233 tests/data/fate/vsynth1-svq1.mov
 9cc35c54b2c77d36bd7e308b393c1f81 *tests/data/fate/vsynth1-svq1.out.rawvideo
 stddev:    9.58 PSNR: 28.50 MAXDIFF:  210 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-v210 b/tests/ref/vsynth/vsynth1-v210
index e2f4588c54..1b69da4e9f 100644
--- a/tests/ref/vsynth/vsynth1-v210
+++ b/tests/ref/vsynth/vsynth1-v210
@@ -1,4 +1,4 @@
-a38de84bfef53ed69204480c979dd6c4 *tests/data/fate/vsynth1-v210.avi
-14752448 tests/data/fate/vsynth1-v210.avi
+767471c71d60daf46ca3a758771c4f8e *tests/data/fate/vsynth1-v210.avi
+14752452 tests/data/fate/vsynth1-v210.avi
 2ba7f4ca302f3c4147860b9dfb12b6e4 *tests/data/fate/vsynth1-v210.out.rawvideo
 stddev:    1.84 PSNR: 42.81 MAXDIFF:   29 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-v210-10 b/tests/ref/vsynth/vsynth1-v210-10
index bf6afdf870..f459cfa8e1 100644
--- a/tests/ref/vsynth/vsynth1-v210-10
+++ b/tests/ref/vsynth/vsynth1-v210-10
@@ -1,4 +1,4 @@
-054d7e903fb4d9e68700c56b93d45916 *tests/data/fate/vsynth1-v210-10.avi
-14752448 tests/data/fate/vsynth1-v210-10.avi
+9269ce2a5294a4c9a8346328d06b23af *tests/data/fate/vsynth1-v210-10.avi
+14752452 tests/data/fate/vsynth1-v210-10.avi
 50973792d3f1abe04a51ee0121f077f2 *tests/data/fate/vsynth1-v210-10.out.rawvideo
 stddev:    1.85 PSNR: 42.78 MAXDIFF:   29 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-v308 b/tests/ref/vsynth/vsynth1-v308
new file mode 100644
index 0000000000..162624e286
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-v308
@@ -0,0 +1,4 @@
+5d868b73c554a9a2422d6c8a18ce9c02 *tests/data/fate/vsynth1-v308.avi
+15213252 tests/data/fate/vsynth1-v308.avi
+10fb42f1abf40a289c3edafc0390482c *tests/data/fate/vsynth1-v308.out.rawvideo
+stddev:    2.67 PSNR: 39.60 MAXDIFF:   43 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-v408 b/tests/ref/vsynth/vsynth1-v408
new file mode 100644
index 0000000000..5d5f816fc0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-v408
@@ -0,0 +1,4 @@
+4e977bec707cda2b09edb717805cb960 *tests/data/fate/vsynth1-v408.avi
+20282052 tests/data/fate/vsynth1-v408.avi
+c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-v408.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-vc2-420p b/tests/ref/vsynth/vsynth1-vc2-420p
new file mode 100644
index 0000000000..e925c53bae
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-420p
@@ -0,0 +1,4 @@
+fb8fffcfc17558c87dd11a67ccb0f615 *tests/data/fate/vsynth1-vc2-420p.mov
+1155415 tests/data/fate/vsynth1-vc2-420p.mov
+387696707c79cf1a6c9aeff4024226b9 *tests/data/fate/vsynth1-vc2-420p.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-vc2-420p10 b/tests/ref/vsynth/vsynth1-vc2-420p10
new file mode 100644
index 0000000000..025a1cc779
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-420p10
@@ -0,0 +1,4 @@
+1365742985b6315f6796c765aa17f39e *tests/data/fate/vsynth1-vc2-420p10.mov
+1417047 tests/data/fate/vsynth1-vc2-420p10.mov
+387696707c79cf1a6c9aeff4024226b9 *tests/data/fate/vsynth1-vc2-420p10.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-vc2-420p12 b/tests/ref/vsynth/vsynth1-vc2-420p12
new file mode 100644
index 0000000000..719f0d5f37
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-420p12
@@ -0,0 +1,4 @@
+08a844d17940cd612da269fb08430628 *tests/data/fate/vsynth1-vc2-420p12.mov
+1746007 tests/data/fate/vsynth1-vc2-420p12.mov
+387696707c79cf1a6c9aeff4024226b9 *tests/data/fate/vsynth1-vc2-420p12.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-vc2-422p b/tests/ref/vsynth/vsynth1-vc2-422p
new file mode 100644
index 0000000000..8fc61887d7
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-422p
@@ -0,0 +1,4 @@
+19f01a985e87e14664e0e5d14c02d046 *tests/data/fate/vsynth1-vc2-422p.mov
+1229783 tests/data/fate/vsynth1-vc2-422p.mov
+57a7f41235e7f9f094aa7ba5bdc82f02 *tests/data/fate/vsynth1-vc2-422p.out.rawvideo
+stddev:    1.89 PSNR: 42.58 MAXDIFF:   23 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-vc2-422p10 b/tests/ref/vsynth/vsynth1-vc2-422p10
new file mode 100644
index 0000000000..ac1072f3d1
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-422p10
@@ -0,0 +1,4 @@
+88e3488e4689cf06e75959c71e2f9d96 *tests/data/fate/vsynth1-vc2-422p10.mov
+1684055 tests/data/fate/vsynth1-vc2-422p10.mov
+f35dd1c1df4726bb1d75d95e321b0698 *tests/data/fate/vsynth1-vc2-422p10.out.rawvideo
+stddev:    1.88 PSNR: 42.61 MAXDIFF:   23 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-vc2-422p12 b/tests/ref/vsynth/vsynth1-vc2-422p12
new file mode 100644
index 0000000000..0ad4798e6b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-422p12
@@ -0,0 +1,4 @@
+b162a7c531fb06f436c79b38fb3d7403 *tests/data/fate/vsynth1-vc2-422p12.mov
+2135131 tests/data/fate/vsynth1-vc2-422p12.mov
+1b56b3d127320c0e6c643e3430b7ffd1 *tests/data/fate/vsynth1-vc2-422p12.out.rawvideo
+stddev:    1.88 PSNR: 42.62 MAXDIFF:   23 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-vc2-444p b/tests/ref/vsynth/vsynth1-vc2-444p
new file mode 100644
index 0000000000..d01e9381b3
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-444p
@@ -0,0 +1,4 @@
+b3f0d987dcb0b5d1eb0b87f356ad21c4 *tests/data/fate/vsynth1-vc2-444p.mov
+1593810 tests/data/fate/vsynth1-vc2-444p.mov
+791cf0f21558ad4a4cad43da05628e06 *tests/data/fate/vsynth1-vc2-444p.out.rawvideo
+stddev:    2.69 PSNR: 39.51 MAXDIFF:   37 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-vc2-444p10 b/tests/ref/vsynth/vsynth1-vc2-444p10
new file mode 100644
index 0000000000..af00746782
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-444p10
@@ -0,0 +1,4 @@
+ef286696c5d37277b4064c4f87f6e564 *tests/data/fate/vsynth1-vc2-444p10.mov
+2167643 tests/data/fate/vsynth1-vc2-444p10.mov
+0e2cd6d0e1d68ffee64d269dcb57d66d *tests/data/fate/vsynth1-vc2-444p10.out.rawvideo
+stddev:    2.69 PSNR: 39.53 MAXDIFF:   37 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-vc2-444p12 b/tests/ref/vsynth/vsynth1-vc2-444p12
new file mode 100644
index 0000000000..6a71b6735b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-vc2-444p12
@@ -0,0 +1,4 @@
+21aaed7828fa847ce5b75399efbc768c *tests/data/fate/vsynth1-vc2-444p12.mov
+2755159 tests/data/fate/vsynth1-vc2-444p12.mov
+55998114d7386d219a49011c8b804a58 *tests/data/fate/vsynth1-vc2-444p12.out.rawvideo
+stddev:    2.69 PSNR: 39.53 MAXDIFF:   37 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth1-wmv1 b/tests/ref/vsynth/vsynth1-wmv1
index 78bd0f03ea..8603ba2fa0 100644
--- a/tests/ref/vsynth/vsynth1-wmv1
+++ b/tests/ref/vsynth/vsynth1-wmv1
@@ -1,4 +1,4 @@
-5f896b2c7d6a0906f5252a5088fbc64a *tests/data/fate/vsynth1-wmv1.avi
-626896 tests/data/fate/vsynth1-wmv1.avi
-5182edba5b5e0354b39ce4f3604b62da *tests/data/fate/vsynth1-wmv1.out.rawvideo
+871a92dc2fe36ca94211830160f9f406 *tests/data/fate/vsynth1-wmv1.avi
+626874 tests/data/fate/vsynth1-wmv1.avi
+3354066ebdd8cd8098394be2384744e7 *tests/data/fate/vsynth1-wmv1.out.rawvideo
 stddev:    7.97 PSNR: 30.09 MAXDIFF:  110 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-wmv2 b/tests/ref/vsynth/vsynth1-wmv2
index 6a3cd3be78..4039d86b24 100644
--- a/tests/ref/vsynth/vsynth1-wmv2
+++ b/tests/ref/vsynth/vsynth1-wmv2
@@ -1,4 +1,4 @@
-3c8a93fa645574f5b11eb51cf0efd227 *tests/data/fate/vsynth1-wmv2.avi
-659162 tests/data/fate/vsynth1-wmv2.avi
-2d61f24836d54766e8d370f243d83dcd *tests/data/fate/vsynth1-wmv2.out.rawvideo
+be5c5985d7f4d5b7797aeb0c825bf4f8 *tests/data/fate/vsynth1-wmv2.avi
+659142 tests/data/fate/vsynth1-wmv2.avi
+8a6061ef825e79d887705db656d51247 *tests/data/fate/vsynth1-wmv2.out.rawvideo
 stddev:    7.97 PSNR: 30.09 MAXDIFF:  105 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-xface b/tests/ref/vsynth/vsynth1-xface
new file mode 100644
index 0000000000..f4d382189b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-xface
@@ -0,0 +1,4 @@
+98a6c85c83454c3209eedbe704a09cb5 *tests/data/fate/vsynth1-xface.nut
+19800 tests/data/fate/vsynth1-xface.nut
+cb1d399fcf818a70e5bc5769934d0094 *tests/data/fate/vsynth1-xface.out.rawvideo
+stddev:  103.97 PSNR:  7.79 MAXDIFF:  254 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-y41p b/tests/ref/vsynth/vsynth1-y41p
new file mode 100644
index 0000000000..84e790b4a0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-y41p
@@ -0,0 +1,4 @@
+7355fc7614e1ba50d364fc13af5fc3e1 *tests/data/fate/vsynth1-y41p.avi
+7610052 tests/data/fate/vsynth1-y41p.avi
+3aef1d83732a3f9835ee2523a11c95c1 *tests/data/fate/vsynth1-y41p.out.rawvideo
+stddev:    5.98 PSNR: 32.59 MAXDIFF:   87 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-yuv b/tests/ref/vsynth/vsynth1-yuv
index 3db5ab0891..9f73c6fc26 100644
--- a/tests/ref/vsynth/vsynth1-yuv
+++ b/tests/ref/vsynth/vsynth1-yuv
@@ -1,4 +1,4 @@
-a9c708ba20f5c562fb1c89f6aa841c8c *tests/data/fate/vsynth1-yuv.avi
-7610048 tests/data/fate/vsynth1-yuv.avi
+795ce63f1fe371b98822b1cb385b062f *tests/data/fate/vsynth1-yuv.avi
+7610052 tests/data/fate/vsynth1-yuv.avi
 c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-yuv.out.rawvideo
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-yuv4 b/tests/ref/vsynth/vsynth1-yuv4
new file mode 100644
index 0000000000..22ba3b0c9d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-yuv4
@@ -0,0 +1,4 @@
+71d07cf8dd5631f8669294aa86db363e *tests/data/fate/vsynth1-yuv4.avi
+7610052 tests/data/fate/vsynth1-yuv4.avi
+c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-yuv4.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-zlib b/tests/ref/vsynth/vsynth1-zlib
new file mode 100644
index 0000000000..419c6a6b3a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-zlib
@@ -0,0 +1,4 @@
+fd44e7bf6322f4be46f4f0dada728849 *tests/data/fate/vsynth1-zlib.avi
+12108636 tests/data/fate/vsynth1-zlib.avi
+93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-zlib.out.rawvideo
+stddev:    3.42 PSNR: 37.44 MAXDIFF:   48 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth1-zmbv b/tests/ref/vsynth/vsynth1-zmbv
new file mode 100644
index 0000000000..c608c4bb36
--- /dev/null
+++ b/tests/ref/vsynth/vsynth1-zmbv
@@ -0,0 +1,4 @@
+09bae55394f86ddb9e5c3254b174f865 *tests/data/fate/vsynth1-zmbv.avi
+2285442 tests/data/fate/vsynth1-zmbv.avi
+4ad1ca9de7c65eab68a619c54fffaec8 *tests/data/fate/vsynth1-zmbv.out.rawvideo
+stddev:    8.61 PSNR: 29.43 MAXDIFF:   64 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-amv b/tests/ref/vsynth/vsynth2-amv
new file mode 100644
index 0000000000..088b5ce143
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-amv
@@ -0,0 +1,4 @@
+a77c55410820d0e0883c76f557774bcf *tests/data/fate/vsynth2-amv.avi
+912552 tests/data/fate/vsynth2-amv.avi
+5b7fe07a366b176e35d2564ecf95ebe9 *tests/data/fate/vsynth2-amv.out.rawvideo
+stddev:    4.91 PSNR: 34.31 MAXDIFF:   71 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-asv1 b/tests/ref/vsynth/vsynth2-asv1
index de8892fcc1..a466ec0927 100644
--- a/tests/ref/vsynth/vsynth2-asv1
+++ b/tests/ref/vsynth/vsynth2-asv1
@@ -1,4 +1,4 @@
-50f5bba0ab3f7ebe687619368b20d29a *tests/data/fate/vsynth2-asv1.avi
-1008588 tests/data/fate/vsynth2-asv1.avi
-bd8e5390a51f062d3ec9545fc93e7ca2 *tests/data/fate/vsynth2-asv1.out.rawvideo
-stddev:   12.39 PSNR: 26.26 MAXDIFF:  110 bytes:  7603200/  7603200
+375a52cafcd2b2d7bd2fc2841e945bf8 *tests/data/fate/vsynth2-asv1.avi
+836556 tests/data/fate/vsynth2-asv1.avi
+da15fb1affc65904161dc37eff4cdc7a *tests/data/fate/vsynth2-asv1.out.rawvideo
+stddev:    5.78 PSNR: 32.88 MAXDIFF:   75 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-asv2 b/tests/ref/vsynth/vsynth2-asv2
index b7a8f1345d..d4bb4c82d0 100644
--- a/tests/ref/vsynth/vsynth2-asv2
+++ b/tests/ref/vsynth/vsynth2-asv2
@@ -1,4 +1,4 @@
-fc746339bb82e299d14049ea8c7e9a4e *tests/data/fate/vsynth2-asv2.avi
-956832 tests/data/fate/vsynth2-asv2.avi
-4b3fe82b31221ac2b0f292760017668f *tests/data/fate/vsynth2-asv2.out.rawvideo
-stddev:   12.19 PSNR: 26.41 MAXDIFF:  111 bytes:  7603200/  7603200
+ad6e4a2adf55b04ba42bea1db19d360f *tests/data/fate/vsynth2-asv2.avi
+822232 tests/data/fate/vsynth2-asv2.avi
+15329433bcccfb9ca874d949423cef47 *tests/data/fate/vsynth2-asv2.out.rawvideo
+stddev:    5.13 PSNR: 33.92 MAXDIFF:   50 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-avui b/tests/ref/vsynth/vsynth2-avui
new file mode 100644
index 0000000000..2423916f4d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-avui
@@ -0,0 +1,4 @@
+8f6ab410bb6b5dc4599e12968dbd0366 *tests/data/fate/vsynth2-avui.mov
+42625037 tests/data/fate/vsynth2-avui.mov
+36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-avui.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-bpp1 b/tests/ref/vsynth/vsynth2-bpp1
new file mode 100644
index 0000000000..3b512e9a6a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-bpp1
@@ -0,0 +1,4 @@
+22664dc7e6cefc580b1456502c46eb10 *tests/data/fate/vsynth2-bpp1.avi
+640460 tests/data/fate/vsynth2-bpp1.avi
+f0dfc0e87e5d96bce29a5944b1bd7471 *tests/data/fate/vsynth2-bpp1.out.rawvideo
+stddev:   68.98 PSNR: 11.36 MAXDIFF:  218 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-bpp15 b/tests/ref/vsynth/vsynth2-bpp15
new file mode 100644
index 0000000000..9236c25b95
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-bpp15
@@ -0,0 +1,4 @@
+1760b76ddf1df0092333434f1a97407b *tests/data/fate/vsynth2-bpp15.avi
+10144452 tests/data/fate/vsynth2-bpp15.avi
+9a40133384e3f22c960d70c8cfe51781 *tests/data/fate/vsynth2-bpp15.out.rawvideo
+stddev:   33.97 PSNR: 17.51 MAXDIFF:  154 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-cinepak b/tests/ref/vsynth/vsynth2-cinepak
new file mode 100644
index 0000000000..18eb1d59a8
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-cinepak
@@ -0,0 +1,4 @@
+cc0879f1993cdd6231e2c3b9c2c015a0 *tests/data/fate/vsynth2-cinepak.mov
+88400 tests/data/fate/vsynth2-cinepak.mov
+12c480911ebb89762dc49af003b176c7 *tests/data/fate/vsynth2-cinepak.out.rawvideo
+stddev:    5.07 PSNR: 34.02 MAXDIFF:   59 bytes:  7603200/   456192
diff --git a/tests/ref/vsynth/vsynth2-cljr b/tests/ref/vsynth/vsynth2-cljr
index b372fa43d7..e3d02c9bb4 100644
--- a/tests/ref/vsynth/vsynth2-cljr
+++ b/tests/ref/vsynth/vsynth2-cljr
@@ -1,4 +1,4 @@
-624a1bcef30a52b39f616d73ded8bb30 *tests/data/fate/vsynth2-cljr.avi
-5075648 tests/data/fate/vsynth2-cljr.avi
-273b2f8fb471602a683049f91f7c4cbb *tests/data/fate/vsynth2-cljr.out.rawvideo
-stddev:    3.69 PSNR: 36.79 MAXDIFF:   36 bytes:  7603200/  7603200
+4ccffc9ea4a5e260b9867b03d127f85c *tests/data/fate/vsynth2-cljr.avi
+5075652 tests/data/fate/vsynth2-cljr.avi
+14e64b6e6c1d7fdefbb111920911f301 *tests/data/fate/vsynth2-cljr.out.rawvideo
+stddev:    3.34 PSNR: 37.65 MAXDIFF:   37 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-1080i b/tests/ref/vsynth/vsynth2-dnxhd-1080i
index 4a4424b6ab..eabb6a2b28 100644
--- a/tests/ref/vsynth/vsynth2-dnxhd-1080i
+++ b/tests/ref/vsynth/vsynth2-dnxhd-1080i
@@ -1,4 +1,4 @@
-1bc9fe8d89bae57ed54ae4d5b5262209 *tests/data/fate/vsynth2-dnxhd-1080i.mov
-3031875 tests/data/fate/vsynth2-dnxhd-1080i.mov
-da7f9fbf6034c3a99a1467e77dd62f6b *tests/data/fate/vsynth2-dnxhd-1080i.out.rawvideo
-stddev:    1.53 PSNR: 44.43 MAXDIFF:   31 bytes:  7603200/   760320
+2b75889122f8d918e1b068d128b618ca *tests/data/fate/vsynth2-dnxhd-1080i.mov
+3031911 tests/data/fate/vsynth2-dnxhd-1080i.mov
+e941d2587cfeccddc450da7f41f7f911 *tests/data/fate/vsynth2-dnxhd-1080i.out.rawvideo
+stddev:    1.50 PSNR: 44.56 MAXDIFF:   31 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-1080i-10bit b/tests/ref/vsynth/vsynth2-dnxhd-1080i-10bit
new file mode 100644
index 0000000000..3361c9341d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-dnxhd-1080i-10bit
@@ -0,0 +1,4 @@
+514607eecfd9004aa4da1d216f7620ce *tests/data/fate/vsynth2-dnxhd-1080i-10bit.mov
+4588391 tests/data/fate/vsynth2-dnxhd-1080i-10bit.mov
+e4ca9be476869afb94962d945f90bdf6 *tests/data/fate/vsynth2-dnxhd-1080i-10bit.out.rawvideo
+stddev:    1.57 PSNR: 44.18 MAXDIFF:   33 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-1080i-colr b/tests/ref/vsynth/vsynth2-dnxhd-1080i-colr
new file mode 100644
index 0000000000..06731a885c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-dnxhd-1080i-colr
@@ -0,0 +1,4 @@
+f9827e9867b0ea4f7585d8e362a58413 *tests/data/fate/vsynth2-dnxhd-1080i-colr.mov
+3031929 tests/data/fate/vsynth2-dnxhd-1080i-colr.mov
+ec40a8014b819d02951b2f06bee7b514 *tests/data/fate/vsynth2-dnxhd-1080i-colr.out.rawvideo
+stddev:    1.54 PSNR: 44.33 MAXDIFF:   33 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-2k-hr-hq b/tests/ref/vsynth/vsynth2-dnxhd-2k-hr-hq
new file mode 100644
index 0000000000..6a7a032d48
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-dnxhd-2k-hr-hq
@@ -0,0 +1,4 @@
+dea0fb4bd16c552837e4ad0ddd67194a *tests/data/fate/vsynth2-dnxhd-2k-hr-hq.dnxhd
+4894720 tests/data/fate/vsynth2-dnxhd-2k-hr-hq.dnxhd
+5fc4378c1f2e577e4366baa9b22cbda3 *tests/data/fate/vsynth2-dnxhd-2k-hr-hq.out.rawvideo
+stddev:    1.56 PSNR: 44.26 MAXDIFF:   34 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-4k-hr-lb b/tests/ref/vsynth/vsynth2-dnxhd-4k-hr-lb
new file mode 100644
index 0000000000..553566fc51
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-dnxhd-4k-hr-lb
@@ -0,0 +1,4 @@
+90a59e7600362d156922be89aa966199 *tests/data/fate/vsynth2-dnxhd-4k-hr-lb.dnxhd
+3993600 tests/data/fate/vsynth2-dnxhd-4k-hr-lb.dnxhd
+ed9d27aa5a9686cf0055085c5157ff7a *tests/data/fate/vsynth2-dnxhd-4k-hr-lb.out.rawvideo
+stddev:    1.51 PSNR: 44.54 MAXDIFF:   32 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-720p b/tests/ref/vsynth/vsynth2-dnxhd-720p
index a6e3ae0c33..fa26c2c058 100644
--- a/tests/ref/vsynth/vsynth2-dnxhd-720p
+++ b/tests/ref/vsynth/vsynth2-dnxhd-720p
@@ -1,4 +1,4 @@
-71c7491a41545882b36f07ee98021b4b *tests/data/fate/vsynth2-dnxhd-720p.dnxhd
+3bb2d4fe12b49eae830918d68bde0675 *tests/data/fate/vsynth2-dnxhd-720p.dnxhd
 2293760 tests/data/fate/vsynth2-dnxhd-720p.dnxhd
-adef978dc9c9e4f10dc7c30418af62af *tests/data/fate/vsynth2-dnxhd-720p.out.rawvideo
-stddev:    6.69 PSNR: 31.62 MAXDIFF:  171 bytes:  7603200/   760320
+bf3c208086609fea7cb40a9ad97b1fd4 *tests/data/fate/vsynth2-dnxhd-720p.out.rawvideo
+stddev:    1.52 PSNR: 44.49 MAXDIFF:   31 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-720p-10bit b/tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
index 30f546ae21..0d2068d40d 100644
--- a/tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
+++ b/tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
@@ -1,4 +1,4 @@
 e49cb87f69acc809aee55d64990c84a9 *tests/data/fate/vsynth2-dnxhd-720p-10bit.dnxhd
 2293760 tests/data/fate/vsynth2-dnxhd-720p-10bit.dnxhd
-6354193e59c7b39a2781c41a2500c793 *tests/data/fate/vsynth2-dnxhd-720p-10bit.out.rawvideo
-stddev:    1.56 PSNR: 44.25 MAXDIFF:   31 bytes:  7603200/   760320
+1e6e1ef90e5c9b16a80acc17fde596ff *tests/data/fate/vsynth2-dnxhd-720p-10bit.out.rawvideo
+stddev:    1.54 PSNR: 44.36 MAXDIFF:   31 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-720p-hr-lb b/tests/ref/vsynth/vsynth2-dnxhd-720p-hr-lb
new file mode 100644
index 0000000000..3b280536ac
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-dnxhd-720p-hr-lb
@@ -0,0 +1,4 @@
+cefe318822be828a03c9eab92f4b2187 *tests/data/fate/vsynth2-dnxhd-720p-hr-lb.dnxhd
+409600 tests/data/fate/vsynth2-dnxhd-720p-hr-lb.dnxhd
+d7a6f4bdb30f2b24bc6d4df890e03957 *tests/data/fate/vsynth2-dnxhd-720p-hr-lb.out.rawvideo
+stddev:    1.94 PSNR: 42.37 MAXDIFF:   35 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-720p-rd b/tests/ref/vsynth/vsynth2-dnxhd-720p-rd
index d9500e33cd..f21299812d 100644
--- a/tests/ref/vsynth/vsynth2-dnxhd-720p-rd
+++ b/tests/ref/vsynth/vsynth2-dnxhd-720p-rd
@@ -1,4 +1,4 @@
-819a7714098e098981bf08253ef2e490 *tests/data/fate/vsynth2-dnxhd-720p-rd.dnxhd
+b723c7412a4c93f500b917ad721f6d21 *tests/data/fate/vsynth2-dnxhd-720p-rd.dnxhd
 2293760 tests/data/fate/vsynth2-dnxhd-720p-rd.dnxhd
-a05c35b99e5e74a9c8b3a9c66da01775 *tests/data/fate/vsynth2-dnxhd-720p-rd.out.rawvideo
-stddev:    1.53 PSNR: 44.39 MAXDIFF:   31 bytes:  7603200/   760320
+b7c5de5578317654792c6ea31bfeeb7d *tests/data/fate/vsynth2-dnxhd-720p-rd.out.rawvideo
+stddev:    1.52 PSNR: 44.48 MAXDIFF:   31 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-edge1-hr b/tests/ref/vsynth/vsynth2-dnxhd-edge1-hr
new file mode 100644
index 0000000000..057129dbdf
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-dnxhd-edge1-hr
@@ -0,0 +1,4 @@
+e0837e973c1f03330f57194be254eb62 *tests/data/fate/vsynth2-dnxhd-edge1-hr.dnxhd
+81920 tests/data/fate/vsynth2-dnxhd-edge1-hr.dnxhd
+3fc73167079a12e181613b6578598cb0 *tests/data/fate/vsynth2-dnxhd-edge1-hr.out.rawvideo
+stddev:    7.01 PSNR: 31.21 MAXDIFF:  107 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-edge2-hr b/tests/ref/vsynth/vsynth2-dnxhd-edge2-hr
new file mode 100644
index 0000000000..18212ae6d6
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-dnxhd-edge2-hr
@@ -0,0 +1,4 @@
+cc7d61221237f08493c2c4405742593c *tests/data/fate/vsynth2-dnxhd-edge2-hr.dnxhd
+81920 tests/data/fate/vsynth2-dnxhd-edge2-hr.dnxhd
+58370b3a671e9a1aaa3ff0f04f6b65ff *tests/data/fate/vsynth2-dnxhd-edge2-hr.out.rawvideo
+stddev:    6.77 PSNR: 31.52 MAXDIFF:  106 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-edge3-hr b/tests/ref/vsynth/vsynth2-dnxhd-edge3-hr
new file mode 100644
index 0000000000..f869be5f63
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-dnxhd-edge3-hr
@@ -0,0 +1,4 @@
+4b9649af0908c027c57432cbbacd5bc5 *tests/data/fate/vsynth2-dnxhd-edge3-hr.dnxhd
+81920 tests/data/fate/vsynth2-dnxhd-edge3-hr.dnxhd
+a32d6ce6d693cbeb35b93a97fb68c088 *tests/data/fate/vsynth2-dnxhd-edge3-hr.out.rawvideo
+stddev:    7.45 PSNR: 30.68 MAXDIFF:  111 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-hr-hq-mov b/tests/ref/vsynth/vsynth2-dnxhd-hr-hq-mov
new file mode 100644
index 0000000000..ab49a3aae9
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-dnxhd-hr-hq-mov
@@ -0,0 +1,4 @@
+a15a4d267dcaeba7a366733be0b508df *tests/data/fate/vsynth2-dnxhd-hr-hq-mov.mov
+4772599 tests/data/fate/vsynth2-dnxhd-hr-hq-mov.mov
+9c087836b5e07bddb96533d27939219f *tests/data/fate/vsynth2-dnxhd-hr-hq-mov.out.rawvideo
+stddev:    1.56 PSNR: 44.25 MAXDIFF:   33 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-hr-lb-mov b/tests/ref/vsynth/vsynth2-dnxhd-hr-lb-mov
new file mode 100644
index 0000000000..1f0f496885
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-dnxhd-hr-lb-mov
@@ -0,0 +1,4 @@
+f8c366051fb16025e97f1bf78f13e1af *tests/data/fate/vsynth2-dnxhd-hr-lb-mov.mov
+3748599 tests/data/fate/vsynth2-dnxhd-hr-lb-mov.mov
+6d4cdd8822ead300690af9ce52db037c *tests/data/fate/vsynth2-dnxhd-hr-lb-mov.out.rawvideo
+stddev:    1.52 PSNR: 44.49 MAXDIFF:   33 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-hr-sq-mov b/tests/ref/vsynth/vsynth2-dnxhd-hr-sq-mov
new file mode 100644
index 0000000000..7bffbedb4c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-dnxhd-hr-sq-mov
@@ -0,0 +1,4 @@
+863b1780cfdabfd713ddf722792a5e61 *tests/data/fate/vsynth2-dnxhd-hr-sq-mov.mov
+2560763 tests/data/fate/vsynth2-dnxhd-hr-sq-mov.mov
+ba86d472b3f160e2f1d00cf569231e3f *tests/data/fate/vsynth2-dnxhd-hr-sq-mov.out.rawvideo
+stddev:    1.58 PSNR: 44.13 MAXDIFF:   35 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dnxhd-uhd-hr-sq b/tests/ref/vsynth/vsynth2-dnxhd-uhd-hr-sq
new file mode 100644
index 0000000000..4e35a36882
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-dnxhd-uhd-hr-sq
@@ -0,0 +1,4 @@
+63b4e6456d98b12d5d88617e21a56220 *tests/data/fate/vsynth2-dnxhd-uhd-hr-sq.dnxhd
+12042240 tests/data/fate/vsynth2-dnxhd-uhd-hr-sq.dnxhd
+6f480e2c0c106b172d4d477ca0cba130 *tests/data/fate/vsynth2-dnxhd-uhd-hr-sq.out.rawvideo
+stddev:    1.52 PSNR: 44.46 MAXDIFF:   33 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-dv b/tests/ref/vsynth/vsynth2-dv
index fd1f3c6778..3127b56288 100644
--- a/tests/ref/vsynth/vsynth2-dv
+++ b/tests/ref/vsynth/vsynth2-dv
@@ -1,4 +1,4 @@
-dbea9acebf1bd2e3a827ab37777ff4bf *tests/data/fate/vsynth2-dv.dv
+6a059698f1f619312dd91504697cca98 *tests/data/fate/vsynth2-dv.dv
 7200000 tests/data/fate/vsynth2-dv.dv
-be0a13c96af0065541aa7b3f6a1d688f *tests/data/fate/vsynth2-dv.out.rawvideo
-stddev:    1.99 PSNR: 42.11 MAXDIFF:   38 bytes:  7603200/  7603200
+528fd407b6d19f5fe3b3446a3080d148 *tests/data/fate/vsynth2-dv.out.rawvideo
+stddev:    1.99 PSNR: 42.13 MAXDIFF:   38 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-dv-411 b/tests/ref/vsynth/vsynth2-dv-411
index 608ee665eb..3cee4de303 100644
--- a/tests/ref/vsynth/vsynth2-dv-411
+++ b/tests/ref/vsynth/vsynth2-dv-411
@@ -1,4 +1,4 @@
-1bf5ee0be63310b567fe01235c6b81d7 *tests/data/fate/vsynth2-dv-411.dv
+a4afd3c595b4242fb5f1329c82a0b0c2 *tests/data/fate/vsynth2-dv-411.dv
 7200000 tests/data/fate/vsynth2-dv-411.dv
-653619342dbecd1e1314fa1eed0488fa *tests/data/fate/vsynth2-dv-411.out.rawvideo
-stddev:    3.48 PSNR: 37.28 MAXDIFF:   56 bytes:  7603200/  7603200
+1ef9bd89b72a942c02571f32af03bb04 *tests/data/fate/vsynth2-dv-411.out.rawvideo
+stddev:    3.48 PSNR: 37.29 MAXDIFF:   56 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-dv-50 b/tests/ref/vsynth/vsynth2-dv-50
index 0ba19befc4..707fd5c734 100644
--- a/tests/ref/vsynth/vsynth2-dv-50
+++ b/tests/ref/vsynth/vsynth2-dv-50
@@ -1,4 +1,4 @@
-ef9ec02d39b706ce491c027567ffb41a *tests/data/fate/vsynth2-dv-50.dv
+8774632954e780697c472d945c597daf *tests/data/fate/vsynth2-dv-50.dv
 14400000 tests/data/fate/vsynth2-dv-50.dv
-8ba68c2a400fd4974a8489dcecd3d82c *tests/data/fate/vsynth2-dv-50.out.rawvideo
-stddev:    0.88 PSNR: 49.21 MAXDIFF:   17 bytes:  7603200/  7603200
+11167de05c205f974d462f91f56eb837 *tests/data/fate/vsynth2-dv-50.out.rawvideo
+stddev:    0.86 PSNR: 49.43 MAXDIFF:   17 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ffv1 b/tests/ref/vsynth/vsynth2-ffv1
index 024fafdc24..b38bb38d21 100644
--- a/tests/ref/vsynth/vsynth2-ffv1
+++ b/tests/ref/vsynth/vsynth2-ffv1
@@ -1,4 +1,4 @@
-2acd1edd97eb98895bae47770b700f89 *tests/data/fate/vsynth2-ffv1.avi
-3718022 tests/data/fate/vsynth2-ffv1.avi
+6d7b6352f49e21153bb891df411e60ec *tests/data/fate/vsynth2-ffv1.avi
+3718026 tests/data/fate/vsynth2-ffv1.avi
 36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1.out.rawvideo
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ffv1-v0 b/tests/ref/vsynth/vsynth2-ffv1-v0
new file mode 100644
index 0000000000..e1e71f1fcf
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-ffv1-v0
@@ -0,0 +1,4 @@
+9647e906f0739ed84303bd03d1cb8105 *tests/data/fate/vsynth2-ffv1-v0.avi
+3692542 tests/data/fate/vsynth2-ffv1-v0.avi
+36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1-v0.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0 b/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0
new file mode 100644
index 0000000000..11f516bd61
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0
@@ -0,0 +1,4 @@
+4e8ea4c31ddb7703638989c6251e37fe *tests/data/fate/vsynth2-ffv1-v3-bgr0.avi
+6386312 tests/data/fate/vsynth2-ffv1-v3-bgr0.avi
+835a86f8dff88917c3e5f2776954c5b7 *tests/data/fate/vsynth2-ffv1-v3-bgr0.out.rawvideo
+stddev:    1.57 PSNR: 44.18 MAXDIFF:   20 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ffv1-v3-rgb48 b/tests/ref/vsynth/vsynth2-ffv1-v3-rgb48
new file mode 100644
index 0000000000..983c381e93
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-ffv1-v3-rgb48
@@ -0,0 +1,4 @@
+99b39b0286428ccf9c788545dfccb49f *tests/data/fate/vsynth2-ffv1-v3-rgb48.avi
+15089212 tests/data/fate/vsynth2-ffv1-v3-rgb48.avi
+b7278d99ea84fe8becf02de773fee0a5 *tests/data/fate/vsynth2-ffv1-v3-rgb48.out.rawvideo
+stddev:    1.43 PSNR: 44.97 MAXDIFF:   28 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p
new file mode 100644
index 0000000000..5d85ffce0e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p
@@ -0,0 +1,4 @@
+6d7b6352f49e21153bb891df411e60ec *tests/data/fate/vsynth2-ffv1-v3-yuv420p.avi
+3718026 tests/data/fate/vsynth2-ffv1-v3-yuv420p.avi
+36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1-v3-yuv420p.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10 b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10
new file mode 100644
index 0000000000..b1a6c19f93
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10
@@ -0,0 +1,4 @@
+b43b20163948e44a6c806714e69ac3bf *tests/data/fate/vsynth2-ffv1-v3-yuv422p10.avi
+4069370 tests/data/fate/vsynth2-ffv1-v3-yuv422p10.avi
+36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1-v3-yuv422p10.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16 b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16
new file mode 100644
index 0000000000..4d0a0c28ad
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16
@@ -0,0 +1,4 @@
+ae0bad7ece3ceacc9554f342ab489a4d *tests/data/fate/vsynth2-ffv1-v3-yuv444p16.avi
+5086918 tests/data/fate/vsynth2-ffv1-v3-yuv444p16.avi
+36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1-v3-yuv444p16.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ffvhuff b/tests/ref/vsynth/vsynth2-ffvhuff
index 40c29bbb76..4a791804e4 100644
--- a/tests/ref/vsynth/vsynth2-ffvhuff
+++ b/tests/ref/vsynth/vsynth2-ffvhuff
@@ -1,4 +1,4 @@
-9884966783a0d092b45462ea586df2f8 *tests/data/fate/vsynth2-ffvhuff.avi
-4951180 tests/data/fate/vsynth2-ffvhuff.avi
+bf05520f43523ffde8952c23f36cc6a9 *tests/data/fate/vsynth2-ffvhuff.avi
+4865622 tests/data/fate/vsynth2-ffvhuff.avi
 36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffvhuff.out.rawvideo
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ffvhuff420p12 b/tests/ref/vsynth/vsynth2-ffvhuff420p12
new file mode 100644
index 0000000000..f97edfbf4e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-ffvhuff420p12
@@ -0,0 +1,4 @@
+3ab9567895bf1ec31a82aadf16a5da0e *tests/data/fate/vsynth2-ffvhuff420p12.avi
+10562808 tests/data/fate/vsynth2-ffvhuff420p12.avi
+36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffvhuff420p12.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ffvhuff422p10left b/tests/ref/vsynth/vsynth2-ffvhuff422p10left
new file mode 100644
index 0000000000..a4284cf36e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-ffvhuff422p10left
@@ -0,0 +1,4 @@
+d13c20fb63b70b81dd6100be47a3f07c *tests/data/fate/vsynth2-ffvhuff422p10left.avi
+9870628 tests/data/fate/vsynth2-ffvhuff422p10left.avi
+8bb1c449e1a2a94fd0d98841c04246bb *tests/data/fate/vsynth2-ffvhuff422p10left.out.rawvideo
+stddev:    0.39 PSNR: 56.17 MAXDIFF:    9 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ffvhuff444 b/tests/ref/vsynth/vsynth2-ffvhuff444
new file mode 100644
index 0000000000..7c7242eba1
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-ffvhuff444
@@ -0,0 +1,4 @@
+770909cb12fc8a1b2ce020e5f9b421d4 *tests/data/fate/vsynth2-ffvhuff444.avi
+7635774 tests/data/fate/vsynth2-ffvhuff444.avi
+8394327c14ef0b6fbaae3b69fcc5572a *tests/data/fate/vsynth2-ffvhuff444.out.rawvideo
+stddev:    0.50 PSNR: 54.10 MAXDIFF:   13 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ffvhuff444p16 b/tests/ref/vsynth/vsynth2-ffvhuff444p16
new file mode 100644
index 0000000000..ebc3840ef7
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-ffvhuff444p16
@@ -0,0 +1,4 @@
+63ad1a32444c67d7092735fd74a7193d *tests/data/fate/vsynth2-ffvhuff444p16.avi
+26612924 tests/data/fate/vsynth2-ffvhuff444p16.avi
+410af07de7ae21936aaeae03fc90cbc9 *tests/data/fate/vsynth2-ffvhuff444p16.out.rawvideo
+stddev:    0.53 PSNR: 53.63 MAXDIFF:   13 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-flashsv b/tests/ref/vsynth/vsynth2-flashsv
index 75e5d8f917..9bda896687 100644
--- a/tests/ref/vsynth/vsynth2-flashsv
+++ b/tests/ref/vsynth/vsynth2-flashsv
@@ -1,4 +1,4 @@
-9980ac31d9312c38e23883063c2cc269 *tests/data/fate/vsynth2-flashsv.flv
-11636526 tests/data/fate/vsynth2-flashsv.flv
-eed2322f11b95fc7abe5356306f00d97 *tests/data/fate/vsynth2-flashsv.out.rawvideo
-stddev:    1.21 PSNR: 46.42 MAXDIFF:   20 bytes:  7603200/  7603200
+f4b45770dd93b43b4077532e8ef90bfc *tests/data/fate/vsynth2-flashsv.flv
+11636546 tests/data/fate/vsynth2-flashsv.flv
+7f0fc12c02e68faddc153e69ddd6841c *tests/data/fate/vsynth2-flashsv.out.rawvideo
+stddev:    1.20 PSNR: 46.52 MAXDIFF:   20 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-flashsv2 b/tests/ref/vsynth/vsynth2-flashsv2
new file mode 100644
index 0000000000..f68095483e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-flashsv2
@@ -0,0 +1,4 @@
+22bdec26851a2003c9f37dd1828284da *tests/data/fate/vsynth2-flashsv2.flv
+8660168 tests/data/fate/vsynth2-flashsv2.flv
+c1b3691276c2982ea55c34c130b2fdb1 *tests/data/fate/vsynth2-flashsv2.out.rawvideo
+stddev:    2.87 PSNR: 38.97 MAXDIFF:   28 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-flv b/tests/ref/vsynth/vsynth2-flv
index 343ce42c5e..9b2651c8b7 100644
--- a/tests/ref/vsynth/vsynth2-flv
+++ b/tests/ref/vsynth/vsynth2-flv
@@ -1,4 +1,4 @@
-6336a28db20719d12dfd3a8a6950d0fc *tests/data/fate/vsynth2-flv.flv
-174657 tests/data/fate/vsynth2-flv.flv
-c6e9b6c165558d052541309e48b5f551 *tests/data/fate/vsynth2-flv.out.rawvideo
+9c5da517eec395fd98318a4a86578f03 *tests/data/fate/vsynth2-flv.flv
+174673 tests/data/fate/vsynth2-flv.flv
+b49557d32c0a4a230a1201b270cfadc3 *tests/data/fate/vsynth2-flv.out.rawvideo
 stddev:    6.02 PSNR: 32.53 MAXDIFF:   83 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-h261 b/tests/ref/vsynth/vsynth2-h261
index 465e2f92d4..cc46cfc10c 100644
--- a/tests/ref/vsynth/vsynth2-h261
+++ b/tests/ref/vsynth/vsynth2-h261
@@ -1,4 +1,4 @@
-0292ca022247f978f6e894831310682b *tests/data/fate/vsynth2-h261.avi
-257928 tests/data/fate/vsynth2-h261.avi
-1a9bb0d52bd24cb62162c5e3c2aed317 *tests/data/fate/vsynth2-h261.out.rawvideo
+49ae672f343b45e9d18523634176b857 *tests/data/fate/vsynth2-h261.avi
+257938 tests/data/fate/vsynth2-h261.avi
+8962b6ea3153a828e5a4df68e1d5da44 *tests/data/fate/vsynth2-h261.out.rawvideo
 stddev:    7.21 PSNR: 30.97 MAXDIFF:   96 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-h261-trellis b/tests/ref/vsynth/vsynth2-h261-trellis
new file mode 100644
index 0000000000..b9c694f016
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-h261-trellis
@@ -0,0 +1,4 @@
+f5e0cfc70bbe4f4048c15be88dea4378 *tests/data/fate/vsynth2-h261-trellis.avi
+249856 tests/data/fate/vsynth2-h261-trellis.avi
+15452237f6c333690d3e05f354f63196 *tests/data/fate/vsynth2-h261-trellis.out.rawvideo
+stddev:    7.10 PSNR: 31.10 MAXDIFF:   96 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-h263 b/tests/ref/vsynth/vsynth2-h263
index ce63aab7e7..057021bdd6 100644
--- a/tests/ref/vsynth/vsynth2-h263
+++ b/tests/ref/vsynth/vsynth2-h263
@@ -1,4 +1,4 @@
-350cf3bdc9b0ddbac5648d3343f6311f *tests/data/fate/vsynth2-h263.avi
-216468 tests/data/fate/vsynth2-h263.avi
-4d9c35b109b48f49a62d2a9208e3f0e7 *tests/data/fate/vsynth2-h263.out.rawvideo
+8f765ba6afa2a0a1e33d7bf9d168ae2f *tests/data/fate/vsynth2-h263.avi
+216474 tests/data/fate/vsynth2-h263.avi
+d77291a0611eeec0667bbc3aba7190b8 *tests/data/fate/vsynth2-h263.out.rawvideo
 stddev:    6.12 PSNR: 32.39 MAXDIFF:   83 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-h263-obmc b/tests/ref/vsynth/vsynth2-h263-obmc
index 40ab3f5f68..2cef7f551b 100644
--- a/tests/ref/vsynth/vsynth2-h263-obmc
+++ b/tests/ref/vsynth/vsynth2-h263-obmc
@@ -1,4 +1,4 @@
-c42dc221b17353b814c72202eb2d9e54 *tests/data/fate/vsynth2-h263-obmc.avi
-208520 tests/data/fate/vsynth2-h263-obmc.avi
-cec8aa66f5ee1c8569f40b572c1ea100 *tests/data/fate/vsynth2-h263-obmc.out.rawvideo
+2d8a58b295e03f94e6a41468b2d3909e *tests/data/fate/vsynth2-h263-obmc.avi
+208522 tests/data/fate/vsynth2-h263-obmc.avi
+4a939ef99fc759293f2e609bfcacd2a4 *tests/data/fate/vsynth2-h263-obmc.out.rawvideo
 stddev:    6.10 PSNR: 32.41 MAXDIFF:   90 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-h263p b/tests/ref/vsynth/vsynth2-h263p
index 5a72e729d1..487d282dd2 100644
--- a/tests/ref/vsynth/vsynth2-h263p
+++ b/tests/ref/vsynth/vsynth2-h263p
@@ -1,4 +1,4 @@
-a0527f9eab97e5e6543a5feb901283d0 *tests/data/fate/vsynth2-h263p.avi
-1134962 tests/data/fate/vsynth2-h263p.avi
+f18d6a61cb0b581b0c4835f4055f0905 *tests/data/fate/vsynth2-h263p.avi
+1134966 tests/data/fate/vsynth2-h263p.avi
 66e8c0bd40918f970e62b6cdd7df79a5 *tests/data/fate/vsynth2-h263p.out.rawvideo
 stddev:    2.01 PSNR: 42.04 MAXDIFF:   21 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-huffyuv b/tests/ref/vsynth/vsynth2-huffyuv
index 0d4f1f92e0..a10d430815 100644
--- a/tests/ref/vsynth/vsynth2-huffyuv
+++ b/tests/ref/vsynth/vsynth2-huffyuv
@@ -1,4 +1,4 @@
-37c68caa7a0bd66a7511e6439c1ada49 *tests/data/fate/vsynth2-huffyuv.avi
-6422324 tests/data/fate/vsynth2-huffyuv.avi
+0f56e00a2850c0156de419d979782f29 *tests/data/fate/vsynth2-huffyuv.avi
+6159098 tests/data/fate/vsynth2-huffyuv.avi
 36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-huffyuv.out.rawvideo
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-huffyuvbgr24 b/tests/ref/vsynth/vsynth2-huffyuvbgr24
new file mode 100644
index 0000000000..4263e0f72b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-huffyuvbgr24
@@ -0,0 +1,4 @@
+f7a321d9dc6b2cdef377067eae413954 *tests/data/fate/vsynth2-huffyuvbgr24.avi
+8809210 tests/data/fate/vsynth2-huffyuvbgr24.avi
+835a86f8dff88917c3e5f2776954c5b7 *tests/data/fate/vsynth2-huffyuvbgr24.out.rawvideo
+stddev:    1.57 PSNR: 44.18 MAXDIFF:   20 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-huffyuvbgra b/tests/ref/vsynth/vsynth2-huffyuvbgra
new file mode 100644
index 0000000000..1451f6b018
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-huffyuvbgra
@@ -0,0 +1,4 @@
+7f591295660b0a4dd93cc436e51d1a87 *tests/data/fate/vsynth2-huffyuvbgra.avi
+10076390 tests/data/fate/vsynth2-huffyuvbgra.avi
+835a86f8dff88917c3e5f2776954c5b7 *tests/data/fate/vsynth2-huffyuvbgra.out.rawvideo
+stddev:    1.57 PSNR: 44.18 MAXDIFF:   20 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-jpeg2000 b/tests/ref/vsynth/vsynth2-jpeg2000
new file mode 100644
index 0000000000..094f416882
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-jpeg2000
@@ -0,0 +1,4 @@
+6c2f979e4a33a36f36aec86f2d464143 *tests/data/fate/vsynth2-jpeg2000.avi
+1494516 tests/data/fate/vsynth2-jpeg2000.avi
+36afd96d6e55bc83166fd615351ba366 *tests/data/fate/vsynth2-jpeg2000.out.rawvideo
+stddev:    5.00 PSNR: 34.15 MAXDIFF:   59 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-jpeg2000-97 b/tests/ref/vsynth/vsynth2-jpeg2000-97
new file mode 100644
index 0000000000..38153ea0ea
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-jpeg2000-97
@@ -0,0 +1,4 @@
+2e43f004a55f4a55a19c4b79fc8e8743 *tests/data/fate/vsynth2-jpeg2000-97.avi
+2448706 tests/data/fate/vsynth2-jpeg2000-97.avi
+a6e2453118a0de135836a868b2ca0e60 *tests/data/fate/vsynth2-jpeg2000-97.out.rawvideo
+stddev:    3.23 PSNR: 37.94 MAXDIFF:   29 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-jpegls b/tests/ref/vsynth/vsynth2-jpegls
index fba01fe610..02cdf09c65 100644
--- a/tests/ref/vsynth/vsynth2-jpegls
+++ b/tests/ref/vsynth/vsynth2-jpegls
@@ -1,4 +1,4 @@
-d5901351df4887fd45c6e5da9bdaffcf *tests/data/fate/vsynth2-jpegls.avi
-8311644 tests/data/fate/vsynth2-jpegls.avi
-eed2322f11b95fc7abe5356306f00d97 *tests/data/fate/vsynth2-jpegls.out.rawvideo
-stddev:    1.21 PSNR: 46.42 MAXDIFF:   20 bytes:  7603200/  7603200
+b26c90f2661ccfe8a68b6cde71e9ccf0 *tests/data/fate/vsynth2-jpegls.avi
+8311648 tests/data/fate/vsynth2-jpegls.avi
+7f0fc12c02e68faddc153e69ddd6841c *tests/data/fate/vsynth2-jpegls.out.rawvideo
+stddev:    1.20 PSNR: 46.52 MAXDIFF:   20 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-ljpeg b/tests/ref/vsynth/vsynth2-ljpeg
index fe78d715e8..776cfcfef1 100644
--- a/tests/ref/vsynth/vsynth2-ljpeg
+++ b/tests/ref/vsynth/vsynth2-ljpeg
@@ -1,4 +1,4 @@
-5198a8578e3a4a82a622eaf91ac13548 *tests/data/fate/vsynth2-ljpeg.avi
-4715702 tests/data/fate/vsynth2-ljpeg.avi
+ae8b43d92240077d7a80b6d543a63d0c *tests/data/fate/vsynth2-ljpeg.avi
+4712248 tests/data/fate/vsynth2-ljpeg.avi
 36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ljpeg.out.rawvideo
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mjpeg b/tests/ref/vsynth/vsynth2-mjpeg
index 4fc585893d..cf80937dc6 100644
--- a/tests/ref/vsynth/vsynth2-mjpeg
+++ b/tests/ref/vsynth/vsynth2-mjpeg
@@ -1,4 +1,4 @@
-972d25dee3c6fe965304fa34e2f75f8a *tests/data/fate/vsynth2-mjpeg.avi
-830288 tests/data/fate/vsynth2-mjpeg.avi
-5f979b021284f8b2868f558f6cc593fe *tests/data/fate/vsynth2-mjpeg.out.rawvideo
+9bf00cd3188b7395b798bb10df376243 *tests/data/fate/vsynth2-mjpeg.avi
+792742 tests/data/fate/vsynth2-mjpeg.avi
+2b8c59c59e33d6ca7c85d31c5eeab7be *tests/data/fate/vsynth2-mjpeg.out.rawvideo
 stddev:    4.87 PSNR: 34.37 MAXDIFF:   55 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mjpeg-422 b/tests/ref/vsynth/vsynth2-mjpeg-422
new file mode 100644
index 0000000000..b162bb32c7
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-mjpeg-422
@@ -0,0 +1,4 @@
+e37720892c9ee9d02842cc50bf20181e *tests/data/fate/vsynth2-mjpeg-422.avi
+877786 tests/data/fate/vsynth2-mjpeg-422.avi
+4a1b18eeb8b0f3dccc2c0e6a9f8c876d *tests/data/fate/vsynth2-mjpeg-422.out.rawvideo
+stddev:    4.69 PSNR: 34.69 MAXDIFF:   55 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mjpeg-444 b/tests/ref/vsynth/vsynth2-mjpeg-444
new file mode 100644
index 0000000000..c461e87cbf
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-mjpeg-444
@@ -0,0 +1,4 @@
+28c9331da946a4ba76947cef290fe184 *tests/data/fate/vsynth2-mjpeg-444.avi
+1005052 tests/data/fate/vsynth2-mjpeg-444.avi
+6417f5a4be03ca7854f0a1be429a286e *tests/data/fate/vsynth2-mjpeg-444.out.rawvideo
+stddev:    4.57 PSNR: 34.93 MAXDIFF:   55 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mjpeg-huffman b/tests/ref/vsynth/vsynth2-mjpeg-huffman
new file mode 100644
index 0000000000..0cf998b4fe
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-mjpeg-huffman
@@ -0,0 +1,4 @@
+9bf00cd3188b7395b798bb10df376243 *tests/data/fate/vsynth2-mjpeg-huffman.avi
+792742 tests/data/fate/vsynth2-mjpeg-huffman.avi
+2b8c59c59e33d6ca7c85d31c5eeab7be *tests/data/fate/vsynth2-mjpeg-huffman.out.rawvideo
+stddev:    4.87 PSNR: 34.37 MAXDIFF:   55 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mjpeg-trell b/tests/ref/vsynth/vsynth2-mjpeg-trell
new file mode 100644
index 0000000000..e1acb33d88
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-mjpeg-trell
@@ -0,0 +1,4 @@
+a59d99d31d24875161504820d4266e4d *tests/data/fate/vsynth2-mjpeg-trell.avi
+734728 tests/data/fate/vsynth2-mjpeg-trell.avi
+42376126213c73c86b408882e24ba015 *tests/data/fate/vsynth2-mjpeg-trell.out.rawvideo
+stddev:    5.03 PSNR: 34.09 MAXDIFF:   67 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mjpeg-trell-huffman b/tests/ref/vsynth/vsynth2-mjpeg-trell-huffman
new file mode 100644
index 0000000000..36867400d2
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-mjpeg-trell-huffman
@@ -0,0 +1,4 @@
+a59d99d31d24875161504820d4266e4d *tests/data/fate/vsynth2-mjpeg-trell-huffman.avi
+734728 tests/data/fate/vsynth2-mjpeg-trell-huffman.avi
+42376126213c73c86b408882e24ba015 *tests/data/fate/vsynth2-mjpeg-trell-huffman.out.rawvideo
+stddev:    5.03 PSNR: 34.09 MAXDIFF:   67 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mov-bgr24 b/tests/ref/vsynth/vsynth2-mov-bgr24
new file mode 100644
index 0000000000..8d9adc1f3d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-mov-bgr24
@@ -0,0 +1,4 @@
+ed8dbb665820659d9c4fa659e0a20c65 *tests/data/fate/vsynth2-mov-bgr24.mov
+15207169 tests/data/fate/vsynth2-mov-bgr24.mov
+32fae3e665407bb4317b3f90fedb903c *tests/data/fate/vsynth2-mov-bgr24.out.rawvideo
+stddev:    1.54 PSNR: 44.37 MAXDIFF:   17 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mov-bpp15 b/tests/ref/vsynth/vsynth2-mov-bpp15
new file mode 100644
index 0000000000..c61b88a73f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-mov-bpp15
@@ -0,0 +1,4 @@
+d694493c1fe20211e12d797620d622ec *tests/data/fate/vsynth2-mov-bpp15.mov
+10138329 tests/data/fate/vsynth2-mov-bpp15.mov
+eb3f0c974ed17ede7cd3ce30ce417d8d *tests/data/fate/vsynth2-mov-bpp15.out.rawvideo
+stddev:    2.81 PSNR: 39.14 MAXDIFF:   19 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mov-bpp16 b/tests/ref/vsynth/vsynth2-mov-bpp16
new file mode 100644
index 0000000000..1839e55cc2
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-mov-bpp16
@@ -0,0 +1,4 @@
+c2685405eaec39007a68108c4533ba0e *tests/data/fate/vsynth2-mov-bpp16.mov
+10138329 tests/data/fate/vsynth2-mov-bpp16.mov
+7747ab837f0e832be2124120d4f7df1c *tests/data/fate/vsynth2-mov-bpp16.out.rawvideo
+stddev:    2.21 PSNR: 41.24 MAXDIFF:   18 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg1 b/tests/ref/vsynth/vsynth2-mpeg1
index eebc514546..83c18c1c7c 100644
--- a/tests/ref/vsynth/vsynth2-mpeg1
+++ b/tests/ref/vsynth/vsynth2-mpeg1
@@ -1,4 +1,4 @@
-9daec4f4e4b6fb8960c3509c84eae0c7 *tests/data/fate/vsynth2-mpeg1.mpeg1video
-262171 tests/data/fate/vsynth2-mpeg1.mpeg1video
-33916bea6d2bc5db93aaf38ee706ba46 *tests/data/fate/vsynth2-mpeg1.out.rawvideo
+2e5441dfaf41f9afc1934c9f475afa5d *tests/data/fate/vsynth2-mpeg1.mpeg1video
+262153 tests/data/fate/vsynth2-mpeg1.mpeg1video
+5fd6c2afc4f880cdf65637bfd8d94d9d *tests/data/fate/vsynth2-mpeg1.out.rawvideo
 stddev:    5.54 PSNR: 33.26 MAXDIFF:   77 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg1b b/tests/ref/vsynth/vsynth2-mpeg1b
index 4aab85ecce..5c3f9bc53b 100644
--- a/tests/ref/vsynth/vsynth2-mpeg1b
+++ b/tests/ref/vsynth/vsynth2-mpeg1b
@@ -1,4 +1,4 @@
-30d6d3f9b7b4234e74d3ed22c012ab31 *tests/data/fate/vsynth2-mpeg1b.mpeg1video
-298135 tests/data/fate/vsynth2-mpeg1b.mpeg1video
-bbac65e2e1fd7e14d83f50072e188852 *tests/data/fate/vsynth2-mpeg1b.out.rawvideo
+1496c950cd3d3b61b08b5888c5ae42a1 *tests/data/fate/vsynth2-mpeg1b.mpeg1video
+298132 tests/data/fate/vsynth2-mpeg1b.mpeg1video
+e300711fe39a914c66793b806360b754 *tests/data/fate/vsynth2-mpeg1b.out.rawvideo
 stddev:    4.60 PSNR: 34.87 MAXDIFF:   77 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg2 b/tests/ref/vsynth/vsynth2-mpeg2
index 7f441cb1f7..869948adeb 100644
--- a/tests/ref/vsynth/vsynth2-mpeg2
+++ b/tests/ref/vsynth/vsynth2-mpeg2
@@ -1,4 +1,4 @@
-48d5feed5d7866457216577a75b60d59 *tests/data/fate/vsynth2-mpeg2.mpeg2video
-268229 tests/data/fate/vsynth2-mpeg2.mpeg2video
-5887392ff0a05babc480e9f29a1797a3 *tests/data/fate/vsynth2-mpeg2.out.rawvideo
+38afa638d9ac0b9c7ccebb8073412920 *tests/data/fate/vsynth2-mpeg2.mpeg2video
+268153 tests/data/fate/vsynth2-mpeg2.mpeg2video
+bbddc9948fadfcc79487b391417ba8ed *tests/data/fate/vsynth2-mpeg2.out.rawvideo
 stddev:    5.55 PSNR: 33.23 MAXDIFF:   77 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg2-422 b/tests/ref/vsynth/vsynth2-mpeg2-422
index ea30134fe8..ec7244f9f9 100644
--- a/tests/ref/vsynth/vsynth2-mpeg2-422
+++ b/tests/ref/vsynth/vsynth2-mpeg2-422
@@ -1,4 +1,4 @@
-392cd150d65892060374ef0ca98b53c3 *tests/data/fate/vsynth2-mpeg2-422.mpeg2video
-379371 tests/data/fate/vsynth2-mpeg2-422.mpeg2video
-fa9fda9c92a455b39ae7e516b7de6919 *tests/data/fate/vsynth2-mpeg2-422.out.rawvideo
-stddev:    4.16 PSNR: 35.73 MAXDIFF:   70 bytes:  7603200/  7603200
+b2fa9b73c3547191ecc01b8163abd4e5 *tests/data/fate/vsynth2-mpeg2-422.mpeg2video
+379164 tests/data/fate/vsynth2-mpeg2-422.mpeg2video
+704f6a96f93c2409219bd48b74169041 *tests/data/fate/vsynth2-mpeg2-422.out.rawvideo
+stddev:    4.17 PSNR: 35.73 MAXDIFF:   70 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg2-idct-int b/tests/ref/vsynth/vsynth2-mpeg2-idct-int
index fe1ed8d3b0..3cbfde939c 100644
--- a/tests/ref/vsynth/vsynth2-mpeg2-idct-int
+++ b/tests/ref/vsynth/vsynth2-mpeg2-idct-int
@@ -1,4 +1,4 @@
-4fa4ce9e167fb1816522126d36acfd3c *tests/data/fate/vsynth2-mpeg2-idct-int.mpeg2video
-267430 tests/data/fate/vsynth2-mpeg2-idct-int.mpeg2video
+67a99a21e2b88e22b64d8e3d1b5572e8 *tests/data/fate/vsynth2-mpeg2-idct-int.mpeg2video
+267370 tests/data/fate/vsynth2-mpeg2-idct-int.mpeg2video
 b750f48d58f157da94613fe92012e7a5 *tests/data/fate/vsynth2-mpeg2-idct-int.out.rawvideo
 stddev:    5.56 PSNR: 33.22 MAXDIFF:   77 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg2-ilace b/tests/ref/vsynth/vsynth2-mpeg2-ilace
index 565caf3d02..ba9c0f0caf 100644
--- a/tests/ref/vsynth/vsynth2-mpeg2-ilace
+++ b/tests/ref/vsynth/vsynth2-mpeg2-ilace
@@ -1,4 +1,4 @@
-be3bd3d5393320419e82afaaea6c6fb6 *tests/data/fate/vsynth2-mpeg2-ilace.mpeg2video
-275014 tests/data/fate/vsynth2-mpeg2-ilace.mpeg2video
-fe069b1be5c6aa5808c0840008485912 *tests/data/fate/vsynth2-mpeg2-ilace.out.rawvideo
+b7d52a6496d439f61e8199bfa53e8af8 *tests/data/fate/vsynth2-mpeg2-ilace.mpeg2video
+274976 tests/data/fate/vsynth2-mpeg2-ilace.mpeg2video
+7c5b9f6986686e1c3accbc16efd02408 *tests/data/fate/vsynth2-mpeg2-ilace.out.rawvideo
 stddev:    5.57 PSNR: 33.20 MAXDIFF:   77 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd b/tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
index 58feb93943..16de39edfc 100644
--- a/tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
+++ b/tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
@@ -1,4 +1,4 @@
-5e938746a4b50f496db6faa10cbe98d6 *tests/data/fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
-269774 tests/data/fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
-91316e6e990ee20b4a8de33f9e6adc56 *tests/data/fate/vsynth2-mpeg2-ivlc-qprd.out.rawvideo
+907a30295ed8323780eee08e606af0ab *tests/data/fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
+269722 tests/data/fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
+d2d9793bf8f3427b5cc17a1be78ddd64 *tests/data/fate/vsynth2-mpeg2-ivlc-qprd.out.rawvideo
 stddev:    5.54 PSNR: 33.25 MAXDIFF:   94 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg2-thread b/tests/ref/vsynth/vsynth2-mpeg2-thread
index 9c44e9f2cd..ee9092f821 100644
--- a/tests/ref/vsynth/vsynth2-mpeg2-thread
+++ b/tests/ref/vsynth/vsynth2-mpeg2-thread
@@ -1,4 +1,4 @@
-722c04a6a442e0ae716e879dff4b6639 *tests/data/fate/vsynth2-mpeg2-thread.mpeg2video
-230678 tests/data/fate/vsynth2-mpeg2-thread.mpeg2video
-f35531461e7b31bfba66802954329f2e *tests/data/fate/vsynth2-mpeg2-thread.out.rawvideo
+a451384397f9b64a48fbb52e70be85ec *tests/data/fate/vsynth2-mpeg2-thread.mpeg2video
+230624 tests/data/fate/vsynth2-mpeg2-thread.mpeg2video
+6d666990137b894baf28aadc306f7c2b *tests/data/fate/vsynth2-mpeg2-thread.out.rawvideo
 stddev:    5.31 PSNR: 33.62 MAXDIFF:   73 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc b/tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
index 6e6763ee18..4ef6211748 100644
--- a/tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
+++ b/tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
@@ -1,4 +1,4 @@
-32abf166f7a6fdb8e4b46795a60761cc *tests/data/fate/vsynth2-mpeg2-thread-ivlc.mpeg2video
-227906 tests/data/fate/vsynth2-mpeg2-thread-ivlc.mpeg2video
-f35531461e7b31bfba66802954329f2e *tests/data/fate/vsynth2-mpeg2-thread-ivlc.out.rawvideo
+ec4005f89785d14fbb3da14e9e3b18f5 *tests/data/fate/vsynth2-mpeg2-thread-ivlc.mpeg2video
+227850 tests/data/fate/vsynth2-mpeg2-thread-ivlc.mpeg2video
+6d666990137b894baf28aadc306f7c2b *tests/data/fate/vsynth2-mpeg2-thread-ivlc.out.rawvideo
 stddev:    5.31 PSNR: 33.62 MAXDIFF:   73 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg4 b/tests/ref/vsynth/vsynth2-mpeg4
index bd47f14e3a..85899ff88e 100644
--- a/tests/ref/vsynth/vsynth2-mpeg4
+++ b/tests/ref/vsynth/vsynth2-mpeg4
@@ -1,4 +1,4 @@
-5476cf4dc144eac67b12737fd8966641 *tests/data/fate/vsynth2-mpeg4.mp4
-159493 tests/data/fate/vsynth2-mpeg4.mp4
-871fda3853f4766669ad875923920bd5 *tests/data/fate/vsynth2-mpeg4.out.rawvideo
+adbd883d1701beabd04522d003dafab6 *tests/data/fate/vsynth2-mpeg4.mp4
+159310 tests/data/fate/vsynth2-mpeg4.mp4
+2645405bc5350acc85ad72f3352f5135 *tests/data/fate/vsynth2-mpeg4.out.rawvideo
 stddev:    6.02 PSNR: 32.53 MAXDIFF:   89 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg4-adap b/tests/ref/vsynth/vsynth2-mpeg4-adap
index 4cfbf4936f..a3223f6363 100644
--- a/tests/ref/vsynth/vsynth2-mpeg4-adap
+++ b/tests/ref/vsynth/vsynth2-mpeg4-adap
@@ -1,4 +1,4 @@
-00b903b1de8c943b344d493312cea9e7 *tests/data/fate/vsynth2-mpeg4-adap.avi
-214026 tests/data/fate/vsynth2-mpeg4-adap.avi
-a004e972aebc9baf8c84965226115526 *tests/data/fate/vsynth2-mpeg4-adap.out.rawvideo
-stddev:    4.87 PSNR: 34.37 MAXDIFF:   86 bytes:  7603200/  7603200
+4bff98da2342836476da817428594403 *tests/data/fate/vsynth2-mpeg4-adap.avi
+213508 tests/data/fate/vsynth2-mpeg4-adap.avi
+0c709f2b81f4593eaa29490332c2cb39 *tests/data/fate/vsynth2-mpeg4-adap.out.rawvideo
+stddev:    4.87 PSNR: 34.36 MAXDIFF:   86 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg4-adv b/tests/ref/vsynth/vsynth2-mpeg4-adv
index 4ae4a84eb7..6132b58618 100644
--- a/tests/ref/vsynth/vsynth2-mpeg4-adv
+++ b/tests/ref/vsynth/vsynth2-mpeg4-adv
@@ -1,4 +1,4 @@
-e18d6c882c22ac06bffffeb8ef0c1899 *tests/data/fate/vsynth2-mpeg4-adv.avi
-187242 tests/data/fate/vsynth2-mpeg4-adv.avi
+b2021365c46e52a93492e2a8697762e5 *tests/data/fate/vsynth2-mpeg4-adv.avi
+187246 tests/data/fate/vsynth2-mpeg4-adv.avi
 505bdffb9b051dc2123d07a4ae183faf *tests/data/fate/vsynth2-mpeg4-adv.out.rawvideo
 stddev:    5.51 PSNR: 33.30 MAXDIFF:   80 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg4-error b/tests/ref/vsynth/vsynth2-mpeg4-error
index fd908aa293..e1adba478b 100644
--- a/tests/ref/vsynth/vsynth2-mpeg4-error
+++ b/tests/ref/vsynth/vsynth2-mpeg4-error
@@ -1,4 +1,4 @@
-054264098fa7da0a04d154a7e76ae0e5 *tests/data/fate/vsynth2-mpeg4-error.avi
-248248 tests/data/fate/vsynth2-mpeg4-error.avi
-d341895eb9a76a2236f0eac8b4e331c3 *tests/data/fate/vsynth2-mpeg4-error.out.rawvideo
-stddev:    6.52 PSNR: 31.83 MAXDIFF:  209 bytes:  7603200/  7603200
+0bee773ac15fd1edd56e1dd28704292f *tests/data/fate/vsynth2-mpeg4-error.avi
+236060 tests/data/fate/vsynth2-mpeg4-error.avi
+f67a99fe41cd22a2a6713965eebb990e *tests/data/fate/vsynth2-mpeg4-error.out.rawvideo
+stddev:   15.66 PSNR: 24.23 MAXDIFF:  236 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg4-nr b/tests/ref/vsynth/vsynth2-mpeg4-nr
index 63e6c43760..debf3bad06 100644
--- a/tests/ref/vsynth/vsynth2-mpeg4-nr
+++ b/tests/ref/vsynth/vsynth2-mpeg4-nr
@@ -1,4 +1,4 @@
-cf978cf6801e09440877c04cd09bee3b *tests/data/fate/vsynth2-mpeg4-nr.avi
-205964 tests/data/fate/vsynth2-mpeg4-nr.avi
-2968ea4618c7fe646fb3e142cea0b8ee *tests/data/fate/vsynth2-mpeg4-nr.out.rawvideo
+83bb3f4618f8d6259d48a51bc65b3cbc *tests/data/fate/vsynth2-mpeg4-nr.avi
+206038 tests/data/fate/vsynth2-mpeg4-nr.avi
+b1b0edaec04620b5f9149dce5171939c *tests/data/fate/vsynth2-mpeg4-nr.out.rawvideo
 stddev:    5.32 PSNR: 33.61 MAXDIFF:   78 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg4-nsse b/tests/ref/vsynth/vsynth2-mpeg4-nsse
new file mode 100644
index 0000000000..cae57160a2
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-mpeg4-nsse
@@ -0,0 +1,4 @@
+4fdc2aaa4761f245590a3c78c85f0ae2 *tests/data/fate/vsynth2-mpeg4-nsse.avi
+266100 tests/data/fate/vsynth2-mpeg4-nsse.avi
+9123b1641394250a6edd389d02f249e8 *tests/data/fate/vsynth2-mpeg4-nsse.out.rawvideo
+stddev:    4.83 PSNR: 34.45 MAXDIFF:   59 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg4-qpel b/tests/ref/vsynth/vsynth2-mpeg4-qpel
index 18860d5153..495b9f057d 100644
--- a/tests/ref/vsynth/vsynth2-mpeg4-qpel
+++ b/tests/ref/vsynth/vsynth2-mpeg4-qpel
@@ -1,4 +1,4 @@
-41eaa93241ac0eeda43326d063191c05 *tests/data/fate/vsynth2-mpeg4-qpel.avi
-209952 tests/data/fate/vsynth2-mpeg4-qpel.avi
-597bcb0df5f17cbbac0c1e9fcfeadc0b *tests/data/fate/vsynth2-mpeg4-qpel.out.rawvideo
+d05dbd6c6b8a57953aea3caa6cab57b0 *tests/data/fate/vsynth2-mpeg4-qpel.avi
+209870 tests/data/fate/vsynth2-mpeg4-qpel.avi
+5313cb1ef8c520de548389d541842c51 *tests/data/fate/vsynth2-mpeg4-qpel.out.rawvideo
 stddev:    4.42 PSNR: 35.22 MAXDIFF:   56 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg4-qprd b/tests/ref/vsynth/vsynth2-mpeg4-qprd
index 6971ca4303..0a8786b89a 100644
--- a/tests/ref/vsynth/vsynth2-mpeg4-qprd
+++ b/tests/ref/vsynth/vsynth2-mpeg4-qprd
@@ -1,4 +1,4 @@
-a8b93de39254468708ebf2744ff8239e *tests/data/fate/vsynth2-mpeg4-qprd.avi
-248702 tests/data/fate/vsynth2-mpeg4-qprd.avi
+4ddd2fef35854d9b387bbcbda03dc7f0 *tests/data/fate/vsynth2-mpeg4-qprd.avi
+248706 tests/data/fate/vsynth2-mpeg4-qprd.avi
 baa8d0d57a7fb5e393642cb20efed2c2 *tests/data/fate/vsynth2-mpeg4-qprd.out.rawvideo
 stddev:    4.85 PSNR: 34.40 MAXDIFF:   85 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg4-rc b/tests/ref/vsynth/vsynth2-mpeg4-rc
index 7ead7f624e..ec7d7ba031 100644
--- a/tests/ref/vsynth/vsynth2-mpeg4-rc
+++ b/tests/ref/vsynth/vsynth2-mpeg4-rc
@@ -1,4 +1,4 @@
-0e2fdca5f87e09c33c638aadd11cadfd *tests/data/fate/vsynth2-mpeg4-rc.avi
-254748 tests/data/fate/vsynth2-mpeg4-rc.avi
-4cf9c72a43a42af3eedef8483a33abef *tests/data/fate/vsynth2-mpeg4-rc.out.rawvideo
+0cf3a444622becc5d56e9034b226cfe2 *tests/data/fate/vsynth2-mpeg4-rc.avi
+254738 tests/data/fate/vsynth2-mpeg4-rc.avi
+53ef615a87c8ae49c379242385315f61 *tests/data/fate/vsynth2-mpeg4-rc.out.rawvideo
 stddev:    5.57 PSNR: 33.20 MAXDIFF:  116 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpeg4-thread b/tests/ref/vsynth/vsynth2-mpeg4-thread
index 902d2a858b..49c0ce0241 100644
--- a/tests/ref/vsynth/vsynth2-mpeg4-thread
+++ b/tests/ref/vsynth/vsynth2-mpeg4-thread
@@ -1,4 +1,4 @@
-8dfa6ee464e24417797af572398befdb *tests/data/fate/vsynth2-mpeg4-thread.avi
-268392 tests/data/fate/vsynth2-mpeg4-thread.avi
-75042fdb02de159446ab599cb7fe6bb9 *tests/data/fate/vsynth2-mpeg4-thread.out.rawvideo
+92128f8adc4ac70a66fdddf58e46b923 *tests/data/fate/vsynth2-mpeg4-thread.avi
+268396 tests/data/fate/vsynth2-mpeg4-thread.avi
+f432bd8d897c7c8e286e385b77cedcfa *tests/data/fate/vsynth2-mpeg4-thread.out.rawvideo
 stddev:    4.89 PSNR: 34.34 MAXDIFF:   86 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-mpng b/tests/ref/vsynth/vsynth2-mpng
new file mode 100644
index 0000000000..e49714a3b0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-mpng
@@ -0,0 +1,4 @@
+481e2d148f411bb61783aa688ec22943 *tests/data/fate/vsynth2-mpng.avi
+11816978 tests/data/fate/vsynth2-mpng.avi
+32fae3e665407bb4317b3f90fedb903c *tests/data/fate/vsynth2-mpng.out.rawvideo
+stddev:    1.54 PSNR: 44.37 MAXDIFF:   17 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-msmpeg4 b/tests/ref/vsynth/vsynth2-msmpeg4
index 162e420ecc..375f21c085 100644
--- a/tests/ref/vsynth/vsynth2-msmpeg4
+++ b/tests/ref/vsynth/vsynth2-msmpeg4
@@ -1,4 +1,4 @@
-5c1986c0a11537a6fe8d42c56bd0794e *tests/data/fate/vsynth2-msmpeg4.avi
-170436 tests/data/fate/vsynth2-msmpeg4.avi
-ce58683e7a261aedd4958de6cdbcffd9 *tests/data/fate/vsynth2-msmpeg4.out.rawvideo
+3f4e6d746b71f367ce5964fd1e421c91 *tests/data/fate/vsynth2-msmpeg4.avi
+170440 tests/data/fate/vsynth2-msmpeg4.avi
+81135454c184b78040c49a2aadca6394 *tests/data/fate/vsynth2-msmpeg4.out.rawvideo
 stddev:    6.02 PSNR: 32.53 MAXDIFF:   89 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-msmpeg4v2 b/tests/ref/vsynth/vsynth2-msmpeg4v2
index aee7782f6b..3af9f1ddd3 100644
--- a/tests/ref/vsynth/vsynth2-msmpeg4v2
+++ b/tests/ref/vsynth/vsynth2-msmpeg4v2
@@ -1,4 +1,4 @@
-84a9d7579bbaac6b48b5c319d22a8f55 *tests/data/fate/vsynth2-msmpeg4v2.avi
+67358757350de1b3ba39ab074e92b5a7 *tests/data/fate/vsynth2-msmpeg4v2.avi
 171910 tests/data/fate/vsynth2-msmpeg4v2.avi
-0213600e1a77c1f28708233cb5a790ac *tests/data/fate/vsynth2-msmpeg4v2.out.rawvideo
+c4ca06487e0fdfdfccdccdb671acab42 *tests/data/fate/vsynth2-msmpeg4v2.out.rawvideo
 stddev:    6.02 PSNR: 32.53 MAXDIFF:   83 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-msvideo1 b/tests/ref/vsynth/vsynth2-msvideo1
new file mode 100644
index 0000000000..0d13c90dfc
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-msvideo1
@@ -0,0 +1,4 @@
+92708a8eb94d1dc80ae3508c4f712e54 *tests/data/fate/vsynth2-msvideo1.avi
+1301740 tests/data/fate/vsynth2-msvideo1.avi
+9b6e5905b00c64ed936293f85abbd6cf *tests/data/fate/vsynth2-msvideo1.out.rawvideo
+stddev:    9.04 PSNR: 29.01 MAXDIFF:  169 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-prores b/tests/ref/vsynth/vsynth2-prores
index 248b7ce643..a1b4bb748f 100644
--- a/tests/ref/vsynth/vsynth2-prores
+++ b/tests/ref/vsynth/vsynth2-prores
@@ -1,4 +1,4 @@
-b7e8f1fc9cba6db205a89b16ca7ae1da *tests/data/fate/vsynth2-prores.mov
-3868288 tests/data/fate/vsynth2-prores.mov
-549787c514c9172f1f698e9282f009f2 *tests/data/fate/vsynth2-prores.out.rawvideo
-stddev:    1.17 PSNR: 46.72 MAXDIFF:   14 bytes:  7603200/  7603200
+aa57fd1221b7eefaf1f34f9d57d6a7cb *tests/data/fate/vsynth2-prores.mov
+3265056 tests/data/fate/vsynth2-prores.mov
+537b0ff66d7c8c3c12faa89d042e6a49 *tests/data/fate/vsynth2-prores.out.rawvideo
+stddev:    1.38 PSNR: 45.29 MAXDIFF:   12 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-prores_ks b/tests/ref/vsynth/vsynth2-prores_ks
new file mode 100644
index 0000000000..b42e7b38cf
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-prores_ks
@@ -0,0 +1,4 @@
+00c75fc738859e41c48cbe36ad60c2e2 *tests/data/fate/vsynth2-prores_ks.mov
+3868162 tests/data/fate/vsynth2-prores_ks.mov
+fe7ad707205c6100e9a3956d4e1c300e *tests/data/fate/vsynth2-prores_ks.out.rawvideo
+stddev:    1.17 PSNR: 46.72 MAXDIFF:   14 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-qtrle b/tests/ref/vsynth/vsynth2-qtrle
index b55bc5bb2a..4adf913d18 100644
--- a/tests/ref/vsynth/vsynth2-qtrle
+++ b/tests/ref/vsynth/vsynth2-qtrle
@@ -1,4 +1,4 @@
-3ad59e9e4586a67328d0642dea77782e *tests/data/fate/vsynth2-qtrle.mov
-14036000 tests/data/fate/vsynth2-qtrle.mov
-abbfc86dbfdac158525addbf48cbb15f *tests/data/fate/vsynth2-qtrle.out.rawvideo
-stddev:    1.54 PSNR: 44.34 MAXDIFF:   17 bytes:  7603200/  7603200
+b44d1cd0bb4c1e7c57d668bd9c1d319a *tests/data/fate/vsynth2-qtrle.mov
+14035926 tests/data/fate/vsynth2-qtrle.mov
+32fae3e665407bb4317b3f90fedb903c *tests/data/fate/vsynth2-qtrle.out.rawvideo
+stddev:    1.54 PSNR: 44.37 MAXDIFF:   17 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-qtrlegray b/tests/ref/vsynth/vsynth2-qtrlegray
new file mode 100644
index 0000000000..824e64b283
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-qtrlegray
@@ -0,0 +1,4 @@
+4910471607743da624ef7339637a33e2 *tests/data/fate/vsynth2-qtrlegray.mov
+4988372 tests/data/fate/vsynth2-qtrlegray.mov
+510a92a21b552c51fcafab8188982f4d *tests/data/fate/vsynth2-qtrlegray.out.rawvideo
+stddev:   16.31 PSNR: 23.88 MAXDIFF:   89 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-r210 b/tests/ref/vsynth/vsynth2-r210
new file mode 100644
index 0000000000..dc5ff1849c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-r210
@@ -0,0 +1,4 @@
+2f928096d892ce0239832afc369e117c *tests/data/fate/vsynth2-r210.avi
+22125252 tests/data/fate/vsynth2-r210.avi
+2ade5f6167d7a4a1589e168ddbbc35d0 *tests/data/fate/vsynth2-r210.out.rawvideo
+stddev:    1.17 PSNR: 46.71 MAXDIFF:   15 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-rgb b/tests/ref/vsynth/vsynth2-rgb
index b50d064a75..6d44b25489 100644
--- a/tests/ref/vsynth/vsynth2-rgb
+++ b/tests/ref/vsynth/vsynth2-rgb
@@ -1,4 +1,4 @@
-f218f8f0e6bdaf486b8a20ebf8363944 *tests/data/fate/vsynth2-rgb.avi
-15213248 tests/data/fate/vsynth2-rgb.avi
-abbfc86dbfdac158525addbf48cbb15f *tests/data/fate/vsynth2-rgb.out.rawvideo
-stddev:    1.54 PSNR: 44.34 MAXDIFF:   17 bytes:  7603200/  7603200
+3f8f04636aa027d1fc8245b08c7a8414 *tests/data/fate/vsynth2-rgb.avi
+15213252 tests/data/fate/vsynth2-rgb.avi
+32fae3e665407bb4317b3f90fedb903c *tests/data/fate/vsynth2-rgb.out.rawvideo
+stddev:    1.54 PSNR: 44.37 MAXDIFF:   17 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-roqvideo b/tests/ref/vsynth/vsynth2-roqvideo
index 3343765e55..32a90fd8a7 100644
--- a/tests/ref/vsynth/vsynth2-roqvideo
+++ b/tests/ref/vsynth/vsynth2-roqvideo
@@ -1,4 +1,4 @@
-217bc0f8cc28558f88a6c8e1aba56ebd *tests/data/fate/vsynth2-roqvideo.roq
-91575 tests/data/fate/vsynth2-roqvideo.roq
-64385eb8f2c5a15a44f23c914b7d007f *tests/data/fate/vsynth2-roqvideo.out.rawvideo
-stddev:    4.82 PSNR: 34.45 MAXDIFF:   71 bytes:  7603200/   760320
+f6caa394394e07b16c73fa2bb4807a88 *tests/data/fate/vsynth2-roqvideo.roq
+92517 tests/data/fate/vsynth2-roqvideo.roq
+a80f3f01b06b062ae416bee6a65917e9 *tests/data/fate/vsynth2-roqvideo.out.rawvideo
+stddev:    4.87 PSNR: 34.37 MAXDIFF:   73 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-rv10 b/tests/ref/vsynth/vsynth2-rv10
index e1fd75d811..ca5ae17f08 100644
--- a/tests/ref/vsynth/vsynth2-rv10
+++ b/tests/ref/vsynth/vsynth2-rv10
@@ -1,4 +1,4 @@
-3b46a4ecefe76e021bb81cc8cbd09fdc *tests/data/fate/vsynth2-rv10.rm
-210685 tests/data/fate/vsynth2-rv10.rm
-4d9c35b109b48f49a62d2a9208e3f0e7 *tests/data/fate/vsynth2-rv10.out.rawvideo
+45a1e6800af36b7e2d42cadd2b6d1447 *tests/data/fate/vsynth2-rv10.rm
+210679 tests/data/fate/vsynth2-rv10.rm
+d77291a0611eeec0667bbc3aba7190b8 *tests/data/fate/vsynth2-rv10.out.rawvideo
 stddev:    6.12 PSNR: 32.39 MAXDIFF:   83 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-rv20 b/tests/ref/vsynth/vsynth2-rv20
index 38c0c8b633..921236e136 100644
--- a/tests/ref/vsynth/vsynth2-rv20
+++ b/tests/ref/vsynth/vsynth2-rv20
@@ -1,4 +1,4 @@
-1bfdb1840495e6c2876ddab73d1c98b6 *tests/data/fate/vsynth2-rv20.rm
-210666 tests/data/fate/vsynth2-rv20.rm
-d32edd26c6a04dceb75b19cf837b9d95 *tests/data/fate/vsynth2-rv20.out.rawvideo
+17ea9a2979ce2a39a390643af5112fa6 *tests/data/fate/vsynth2-rv20.rm
+210658 tests/data/fate/vsynth2-rv20.rm
+3aa8e0c1d5dcf3f07960ac0a2d439b48 *tests/data/fate/vsynth2-rv20.out.rawvideo
 stddev:    6.19 PSNR: 32.28 MAXDIFF:   81 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-snow b/tests/ref/vsynth/vsynth2-snow
new file mode 100644
index 0000000000..e9607bb7d0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-snow
@@ -0,0 +1,4 @@
+0a41e73ddd2f54936490655b46dad4a3 *tests/data/fate/vsynth2-snow.avi
+72868 tests/data/fate/vsynth2-snow.avi
+34a75f5cf8a71159f1a572d9cedcfef9 *tests/data/fate/vsynth2-snow.out.rawvideo
+stddev:   13.73 PSNR: 25.37 MAXDIFF:  162 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-snow-hpel b/tests/ref/vsynth/vsynth2-snow-hpel
new file mode 100644
index 0000000000..66839fd6f6
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-snow-hpel
@@ -0,0 +1,4 @@
+9bc409e4794ee50691a26c9c836d31a7 *tests/data/fate/vsynth2-snow-hpel.avi
+79728 tests/data/fate/vsynth2-snow-hpel.avi
+2cc64d8171175a1532fd7d3ed3011fbf *tests/data/fate/vsynth2-snow-hpel.out.rawvideo
+stddev:   13.70 PSNR: 25.39 MAXDIFF:  162 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-snow-ll b/tests/ref/vsynth/vsynth2-snow-ll
new file mode 100644
index 0000000000..54b7d431c8
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-snow-ll
@@ -0,0 +1,4 @@
+4934defc7c2d3f3b6b74a8d3d877cd96 *tests/data/fate/vsynth2-snow-ll.avi
+2829418 tests/data/fate/vsynth2-snow-ll.avi
+36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-snow-ll.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-svq1 b/tests/ref/vsynth/vsynth2-svq1
index 9d8dcead95..9c7db7f035 100644
--- a/tests/ref/vsynth/vsynth2-svq1
+++ b/tests/ref/vsynth/vsynth2-svq1
@@ -1,4 +1,4 @@
-9118e474af8b119c6c44e828a8dfaa8d *tests/data/fate/vsynth2-svq1.mov
-940439 tests/data/fate/vsynth2-svq1.mov
+c767386f0f6f36b554d278592bc6e9a4 *tests/data/fate/vsynth2-svq1.mov
+940289 tests/data/fate/vsynth2-svq1.mov
 a8cd3b833cd7f570ddbf1e6b3eb125b6 *tests/data/fate/vsynth2-svq1.out.rawvideo
 stddev:    3.71 PSNR: 36.72 MAXDIFF:  210 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-v210 b/tests/ref/vsynth/vsynth2-v210
index 245e2822a9..3bd4598b40 100644
--- a/tests/ref/vsynth/vsynth2-v210
+++ b/tests/ref/vsynth/vsynth2-v210
@@ -1,4 +1,4 @@
-3aae4d5b25a4d91e4812a297c6a9ef8a *tests/data/fate/vsynth2-v210.avi
-14752448 tests/data/fate/vsynth2-v210.avi
+7a4f5840860ae0bec0c354025b488118 *tests/data/fate/vsynth2-v210.avi
+14752452 tests/data/fate/vsynth2-v210.avi
 99e367a50da75c2c187230889bee8e2e *tests/data/fate/vsynth2-v210.out.rawvideo
 stddev:    0.40 PSNR: 56.06 MAXDIFF:    9 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-v210-10 b/tests/ref/vsynth/vsynth2-v210-10
index b36aea63fc..4e973aa2a4 100644
--- a/tests/ref/vsynth/vsynth2-v210-10
+++ b/tests/ref/vsynth/vsynth2-v210-10
@@ -1,4 +1,4 @@
-87bb634932b3f5cacd4d08142798db17 *tests/data/fate/vsynth2-v210-10.avi
-14752448 tests/data/fate/vsynth2-v210-10.avi
+d078cb3cbbbc022ed7c5c448026b050a *tests/data/fate/vsynth2-v210-10.avi
+14752452 tests/data/fate/vsynth2-v210-10.avi
 8bb1c449e1a2a94fd0d98841c04246bb *tests/data/fate/vsynth2-v210-10.out.rawvideo
 stddev:    0.39 PSNR: 56.17 MAXDIFF:    9 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-v308 b/tests/ref/vsynth/vsynth2-v308
new file mode 100644
index 0000000000..cc36d8a3a1
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-v308
@@ -0,0 +1,4 @@
+866fb5095976d62279c402023526d7a9 *tests/data/fate/vsynth2-v308.avi
+15213252 tests/data/fate/vsynth2-v308.avi
+8394327c14ef0b6fbaae3b69fcc5572a *tests/data/fate/vsynth2-v308.out.rawvideo
+stddev:    0.50 PSNR: 54.10 MAXDIFF:   13 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-v408 b/tests/ref/vsynth/vsynth2-v408
new file mode 100644
index 0000000000..688e4e469a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-v408
@@ -0,0 +1,4 @@
+a9b25bf6f9559cdbe795913cc69d5c0f *tests/data/fate/vsynth2-v408.avi
+20282052 tests/data/fate/vsynth2-v408.avi
+36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-v408.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-vc2-420p b/tests/ref/vsynth/vsynth2-vc2-420p
new file mode 100644
index 0000000000..f355e8d30c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-vc2-420p
@@ -0,0 +1,4 @@
+ac4df937fed73532bd8713b0e07870c9 *tests/data/fate/vsynth2-vc2-420p.mov
+860743 tests/data/fate/vsynth2-vc2-420p.mov
+01389f7ae4f2a3dc0d7b8384d435fd83 *tests/data/fate/vsynth2-vc2-420p.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-vc2-420p10 b/tests/ref/vsynth/vsynth2-vc2-420p10
new file mode 100644
index 0000000000..48d97d60e4
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-vc2-420p10
@@ -0,0 +1,4 @@
+1197f8108683b9eb6b0777adb2db1aa8 *tests/data/fate/vsynth2-vc2-420p10.mov
+1181271 tests/data/fate/vsynth2-vc2-420p10.mov
+01389f7ae4f2a3dc0d7b8384d435fd83 *tests/data/fate/vsynth2-vc2-420p10.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-vc2-420p12 b/tests/ref/vsynth/vsynth2-vc2-420p12
new file mode 100644
index 0000000000..9b9ccb8ec1
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-vc2-420p12
@@ -0,0 +1,4 @@
+0e6b3aefd70fca45e67dc8cbc99640e8 *tests/data/fate/vsynth2-vc2-420p12.mov
+1525079 tests/data/fate/vsynth2-vc2-420p12.mov
+01389f7ae4f2a3dc0d7b8384d435fd83 *tests/data/fate/vsynth2-vc2-420p12.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-vc2-422p b/tests/ref/vsynth/vsynth2-vc2-422p
new file mode 100644
index 0000000000..83689a73ef
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-vc2-422p
@@ -0,0 +1,4 @@
+b2573399e0ed62ede66b1708de86412a *tests/data/fate/vsynth2-vc2-422p.mov
+1035207 tests/data/fate/vsynth2-vc2-422p.mov
+c14eb0038a5dba9382f42f750d46ed3c *tests/data/fate/vsynth2-vc2-422p.out.rawvideo
+stddev:    0.35 PSNR: 57.21 MAXDIFF:    7 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-vc2-422p10 b/tests/ref/vsynth/vsynth2-vc2-422p10
new file mode 100644
index 0000000000..af9a0b15f7
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-vc2-422p10
@@ -0,0 +1,4 @@
+ca65de033b17c67be94356e0b6e0b128 *tests/data/fate/vsynth2-vc2-422p10.mov
+1321687 tests/data/fate/vsynth2-vc2-422p10.mov
+8f629e5cea24cc804d6aeadceacf0b2a *tests/data/fate/vsynth2-vc2-422p10.out.rawvideo
+stddev:    0.37 PSNR: 56.66 MAXDIFF:    7 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-vc2-422p12 b/tests/ref/vsynth/vsynth2-vc2-422p12
new file mode 100644
index 0000000000..16f978a87f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-vc2-422p12
@@ -0,0 +1,4 @@
+4e95706b063adbcc1f7f82a4e7d7d027 *tests/data/fate/vsynth2-vc2-422p12.mov
+1752535 tests/data/fate/vsynth2-vc2-422p12.mov
+7241b922e7c17d14701567db6c743a9e *tests/data/fate/vsynth2-vc2-422p12.out.rawvideo
+stddev:    0.37 PSNR: 56.73 MAXDIFF:    7 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-vc2-444p b/tests/ref/vsynth/vsynth2-vc2-444p
new file mode 100644
index 0000000000..83979964dd
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-vc2-444p
@@ -0,0 +1,4 @@
+644a39d1b853f44722a4332d5a13797e *tests/data/fate/vsynth2-vc2-444p.mov
+1202386 tests/data/fate/vsynth2-vc2-444p.mov
+6b35f3ddc3b52f4424237d4191a2461f *tests/data/fate/vsynth2-vc2-444p.out.rawvideo
+stddev:    0.44 PSNR: 55.07 MAXDIFF:   10 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-vc2-444p10 b/tests/ref/vsynth/vsynth2-vc2-444p10
new file mode 100644
index 0000000000..7d9367a4c5
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-vc2-444p10
@@ -0,0 +1,4 @@
+36cfc3da2ab6ff6d48f17ab43e77774d *tests/data/fate/vsynth2-vc2-444p10.mov
+1603927 tests/data/fate/vsynth2-vc2-444p10.mov
+d5c80ee1881a0306b0487e3c868529a3 *tests/data/fate/vsynth2-vc2-444p10.out.rawvideo
+stddev:    0.48 PSNR: 54.46 MAXDIFF:   10 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-vc2-444p12 b/tests/ref/vsynth/vsynth2-vc2-444p12
new file mode 100644
index 0000000000..00098309af
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-vc2-444p12
@@ -0,0 +1,4 @@
+6117c2ee6d5c22ee5a0b0ac6b70e6c17 *tests/data/fate/vsynth2-vc2-444p12.mov
+2145499 tests/data/fate/vsynth2-vc2-444p12.mov
+38836be5c12b951c9b280d15fe3b31ce *tests/data/fate/vsynth2-vc2-444p12.out.rawvideo
+stddev:    0.48 PSNR: 54.46 MAXDIFF:   10 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth2-wmv1 b/tests/ref/vsynth/vsynth2-wmv1
index 1e20493c62..5d65d61592 100644
--- a/tests/ref/vsynth/vsynth2-wmv1
+++ b/tests/ref/vsynth/vsynth2-wmv1
@@ -1,4 +1,4 @@
-54e3a0432da62f1a11543a1df4aa05eb *tests/data/fate/vsynth2-wmv1.avi
-172394 tests/data/fate/vsynth2-wmv1.avi
-73fbdc771422e590afe213d1242943a2 *tests/data/fate/vsynth2-wmv1.out.rawvideo
+1e041a3ffcdbc4ebfe5e4b43c3d177e2 *tests/data/fate/vsynth2-wmv1.avi
+172404 tests/data/fate/vsynth2-wmv1.avi
+da619b78881243205024fca4c525d8cc *tests/data/fate/vsynth2-wmv1.out.rawvideo
 stddev:    6.01 PSNR: 32.54 MAXDIFF:   88 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-wmv2 b/tests/ref/vsynth/vsynth2-wmv2
index 6cc0642465..9608f7a533 100644
--- a/tests/ref/vsynth/vsynth2-wmv2
+++ b/tests/ref/vsynth/vsynth2-wmv2
@@ -1,4 +1,4 @@
-2e22f5024860163d1e11a125b283f261 *tests/data/fate/vsynth2-wmv2.avi
-173824 tests/data/fate/vsynth2-wmv2.avi
-65c4485e592d7fc48b55ba3b6051ddff *tests/data/fate/vsynth2-wmv2.out.rawvideo
+a999f38b25de2ff43438802e40c1ce70 *tests/data/fate/vsynth2-wmv2.avi
+173822 tests/data/fate/vsynth2-wmv2.avi
+cfcdca2c4b183c5502cd6ec69e573127 *tests/data/fate/vsynth2-wmv2.out.rawvideo
 stddev:    6.02 PSNR: 32.54 MAXDIFF:   88 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-xface b/tests/ref/vsynth/vsynth2-xface
new file mode 100644
index 0000000000..54dc29e821
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-xface
@@ -0,0 +1,4 @@
+c498ec3b58b86b8164cef9d63184fa6d *tests/data/fate/vsynth2-xface.nut
+16423 tests/data/fate/vsynth2-xface.nut
+9106961054b226c360f284272cfd4474 *tests/data/fate/vsynth2-xface.out.rawvideo
+stddev:   85.41 PSNR:  9.50 MAXDIFF:  250 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-y41p b/tests/ref/vsynth/vsynth2-y41p
new file mode 100644
index 0000000000..164a84581e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-y41p
@@ -0,0 +1,4 @@
+4eda6db518001a8f2bbb2ec4b414b05a *tests/data/fate/vsynth2-y41p.avi
+7610052 tests/data/fate/vsynth2-y41p.avi
+7c760febffcf1c2e43e494f38b010af1 *tests/data/fate/vsynth2-y41p.out.rawvideo
+stddev:    1.32 PSNR: 45.72 MAXDIFF:   34 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-yuv b/tests/ref/vsynth/vsynth2-yuv
index 335660a78f..7199968024 100644
--- a/tests/ref/vsynth/vsynth2-yuv
+++ b/tests/ref/vsynth/vsynth2-yuv
@@ -1,4 +1,4 @@
-57fa20652deda0945e57251bf261399a *tests/data/fate/vsynth2-yuv.avi
-7610048 tests/data/fate/vsynth2-yuv.avi
+5eda550fac21e8913cbb2c88e4f0791a *tests/data/fate/vsynth2-yuv.avi
+7610052 tests/data/fate/vsynth2-yuv.avi
 36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-yuv.out.rawvideo
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-yuv4 b/tests/ref/vsynth/vsynth2-yuv4
new file mode 100644
index 0000000000..557a71a3a3
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-yuv4
@@ -0,0 +1,4 @@
+a62377e0d0a7eba811aada12434959f0 *tests/data/fate/vsynth2-yuv4.avi
+7610052 tests/data/fate/vsynth2-yuv4.avi
+36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-yuv4.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth2-zlib b/tests/ref/vsynth/vsynth2-zlib
new file mode 100644
index 0000000000..9dfb0d679e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth2-zlib
@@ -0,0 +1,4 @@
+8d2783483b354e7836cfc45a7241c4eb *tests/data/fate/vsynth2-zlib.avi
+11760520 tests/data/fate/vsynth2-zlib.avi
+32fae3e665407bb4317b3f90fedb903c *tests/data/fate/vsynth2-zlib.out.rawvideo
+stddev:    1.54 PSNR: 44.37 MAXDIFF:   17 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth3-amv b/tests/ref/vsynth/vsynth3-amv
new file mode 100644
index 0000000000..d2859c7c23
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-amv
@@ -0,0 +1,4 @@
+be6f013af371ab9d350e4998e86d2ea4 *tests/data/fate/vsynth3-amv.avi
+33932 tests/data/fate/vsynth3-amv.avi
+f916c620790a9cf2674391610985ae27 *tests/data/fate/vsynth3-amv.out.rawvideo
+stddev:   11.58 PSNR: 26.85 MAXDIFF:   89 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-asv1 b/tests/ref/vsynth/vsynth3-asv1
new file mode 100644
index 0000000000..0abbf787ec
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-asv1
@@ -0,0 +1,4 @@
+81eeea0d0e6219b2f381cf2100e9a12f *tests/data/fate/vsynth3-asv1.avi
+34704 tests/data/fate/vsynth3-asv1.avi
+3c8636e22a96267451684f42d7a6f608 *tests/data/fate/vsynth3-asv1.out.rawvideo
+stddev:   13.16 PSNR: 25.74 MAXDIFF:  112 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-asv2 b/tests/ref/vsynth/vsynth3-asv2
new file mode 100644
index 0000000000..90b8a47f34
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-asv2
@@ -0,0 +1,4 @@
+8402fb1112fb8119c019154a472b5cd0 *tests/data/fate/vsynth3-asv2.avi
+36208 tests/data/fate/vsynth3-asv2.avi
+5469c0735b7c9279e5e8e3439fc6acab *tests/data/fate/vsynth3-asv2.out.rawvideo
+stddev:    9.07 PSNR: 28.97 MAXDIFF:   51 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-bpp1 b/tests/ref/vsynth/vsynth3-bpp1
new file mode 100644
index 0000000000..639a2b15de
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-bpp1
@@ -0,0 +1,4 @@
+7eafab02a501b3b0ac9f854cd334f47a *tests/data/fate/vsynth3-bpp1.avi
+20460 tests/data/fate/vsynth3-bpp1.avi
+52ae74ef7910e5b603c12288d425b9ae *tests/data/fate/vsynth3-bpp1.out.rawvideo
+stddev:   84.76 PSNR:  9.57 MAXDIFF:  232 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-bpp15 b/tests/ref/vsynth/vsynth3-bpp15
new file mode 100644
index 0000000000..fe67e1a980
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-bpp15
@@ -0,0 +1,4 @@
+ad67910bcee1f3fe49ba7312499a3b16 *tests/data/fate/vsynth3-bpp15.avi
+122452 tests/data/fate/vsynth3-bpp15.avi
+85ac2fa98252ae907b97a7a561ca676f *tests/data/fate/vsynth3-bpp15.out.rawvideo
+stddev:   37.76 PSNR: 16.59 MAXDIFF:  156 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-cljr b/tests/ref/vsynth/vsynth3-cljr
new file mode 100644
index 0000000000..53a2e3878e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-cljr
@@ -0,0 +1,4 @@
+34c26d901c5ccfcd10fd63a1494ae23a *tests/data/fate/vsynth3-cljr.avi
+68052 tests/data/fate/vsynth3-cljr.avi
+ac4c80dda332b6311beb1e8f723c13ca *tests/data/fate/vsynth3-cljr.out.rawvideo
+stddev:    7.51 PSNR: 30.61 MAXDIFF:   84 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-dnxhd-1080i-10bit b/tests/ref/vsynth/vsynth3-dnxhd-1080i-10bit
new file mode 100644
index 0000000000..006af6c5d4
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-dnxhd-1080i-10bit
@@ -0,0 +1,4 @@
+dea8862f8ae9fb03f665f358dde75962 *tests/data/fate/vsynth3-dnxhd-1080i-10bit.mov
+4588391 tests/data/fate/vsynth3-dnxhd-1080i-10bit.mov
+c192f36ef8687e56c72a3dc416c7e191 *tests/data/fate/vsynth3-dnxhd-1080i-10bit.out.rawvideo
+stddev:    6.92 PSNR: 31.32 MAXDIFF:   50 bytes:    86700/     8670
diff --git a/tests/ref/vsynth/vsynth3-dnxhd-1080i-colr b/tests/ref/vsynth/vsynth3-dnxhd-1080i-colr
new file mode 100644
index 0000000000..8d7d3b6533
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-dnxhd-1080i-colr
@@ -0,0 +1,4 @@
+ee7a70832f37793b62642f770d988bdb *tests/data/fate/vsynth3-dnxhd-1080i-colr.mov
+3031929 tests/data/fate/vsynth3-dnxhd-1080i-colr.mov
+f907fd2d48bedbc5283fbfc3fb9f61a0 *tests/data/fate/vsynth3-dnxhd-1080i-colr.out.rawvideo
+stddev:    6.92 PSNR: 31.32 MAXDIFF:   50 bytes:    86700/     8670
diff --git a/tests/ref/vsynth/vsynth3-dnxhd-2k-hr-hq b/tests/ref/vsynth/vsynth3-dnxhd-2k-hr-hq
new file mode 100644
index 0000000000..9373bb3b1d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-dnxhd-2k-hr-hq
@@ -0,0 +1,4 @@
+fa0cc58e64c981a45d1c6d667ba4e584 *tests/data/fate/vsynth3-dnxhd-2k-hr-hq.dnxhd
+4894720 tests/data/fate/vsynth3-dnxhd-2k-hr-hq.dnxhd
+1128a9cf1a6ccb4614be69adef557bf1 *tests/data/fate/vsynth3-dnxhd-2k-hr-hq.out.rawvideo
+stddev:    6.91 PSNR: 31.33 MAXDIFF:   50 bytes:    86700/     8670
diff --git a/tests/ref/vsynth/vsynth3-dnxhd-4k-hr-lb b/tests/ref/vsynth/vsynth3-dnxhd-4k-hr-lb
new file mode 100644
index 0000000000..bd859d71c5
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-dnxhd-4k-hr-lb
@@ -0,0 +1,4 @@
+1dc788461df79c2a1e7b64309cd9f131 *tests/data/fate/vsynth3-dnxhd-4k-hr-lb.dnxhd
+3993600 tests/data/fate/vsynth3-dnxhd-4k-hr-lb.dnxhd
+2d70a847288c6b194e7c38f42ed3c840 *tests/data/fate/vsynth3-dnxhd-4k-hr-lb.out.rawvideo
+stddev:    6.92 PSNR: 31.32 MAXDIFF:   50 bytes:    86700/     8670
diff --git a/tests/ref/vsynth/vsynth3-dnxhd-720p-hr-lb b/tests/ref/vsynth/vsynth3-dnxhd-720p-hr-lb
new file mode 100644
index 0000000000..10003d9884
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-dnxhd-720p-hr-lb
@@ -0,0 +1,4 @@
+09f95ea080635205a4b6e681822b25d6 *tests/data/fate/vsynth3-dnxhd-720p-hr-lb.dnxhd
+409600 tests/data/fate/vsynth3-dnxhd-720p-hr-lb.dnxhd
+b3349ba1bba0281d575f7650aa8e7c72 *tests/data/fate/vsynth3-dnxhd-720p-hr-lb.out.rawvideo
+stddev:    6.92 PSNR: 31.32 MAXDIFF:   50 bytes:    86700/     8670
diff --git a/tests/ref/vsynth/vsynth3-dnxhd-edge1-hr b/tests/ref/vsynth/vsynth3-dnxhd-edge1-hr
new file mode 100644
index 0000000000..ec5445b211
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-dnxhd-edge1-hr
@@ -0,0 +1,4 @@
+178cbf39ee530bfa190b332ce3fa3498 *tests/data/fate/vsynth3-dnxhd-edge1-hr.dnxhd
+81920 tests/data/fate/vsynth3-dnxhd-edge1-hr.dnxhd
+714fd3f9f467cb60d606548b98e5d52b *tests/data/fate/vsynth3-dnxhd-edge1-hr.out.rawvideo
+stddev:    7.11 PSNR: 31.09 MAXDIFF:   52 bytes:    86700/     8670
diff --git a/tests/ref/vsynth/vsynth3-dnxhd-edge2-hr b/tests/ref/vsynth/vsynth3-dnxhd-edge2-hr
new file mode 100644
index 0000000000..37aebd3edc
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-dnxhd-edge2-hr
@@ -0,0 +1,4 @@
+a115494fe55740743b4a1a75e8f940ec *tests/data/fate/vsynth3-dnxhd-edge2-hr.dnxhd
+81920 tests/data/fate/vsynth3-dnxhd-edge2-hr.dnxhd
+3bdf0df4e807f5c10362618ba572978c *tests/data/fate/vsynth3-dnxhd-edge2-hr.out.rawvideo
+stddev:    7.08 PSNR: 31.13 MAXDIFF:   52 bytes:    86700/     8670
diff --git a/tests/ref/vsynth/vsynth3-dnxhd-edge3-hr b/tests/ref/vsynth/vsynth3-dnxhd-edge3-hr
new file mode 100644
index 0000000000..d1ce719bb1
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-dnxhd-edge3-hr
@@ -0,0 +1,4 @@
+db949ad0c841bc6cf603646e14a5da53 *tests/data/fate/vsynth3-dnxhd-edge3-hr.dnxhd
+81920 tests/data/fate/vsynth3-dnxhd-edge3-hr.dnxhd
+d34c4c4324e40370a78eb178c9745126 *tests/data/fate/vsynth3-dnxhd-edge3-hr.out.rawvideo
+stddev:    7.12 PSNR: 31.08 MAXDIFF:   51 bytes:    86700/     8670
diff --git a/tests/ref/vsynth/vsynth3-dnxhd-hr-hq-mov b/tests/ref/vsynth/vsynth3-dnxhd-hr-hq-mov
new file mode 100644
index 0000000000..e46e1514b0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-dnxhd-hr-hq-mov
@@ -0,0 +1,4 @@
+ca442de6ac8971a1da0afed0ee7fbd18 *tests/data/fate/vsynth3-dnxhd-hr-hq-mov.mov
+4772599 tests/data/fate/vsynth3-dnxhd-hr-hq-mov.mov
+aa2e6c13a1e7760a22fccfca9faacdf3 *tests/data/fate/vsynth3-dnxhd-hr-hq-mov.out.rawvideo
+stddev:    6.92 PSNR: 31.32 MAXDIFF:   50 bytes:    86700/     8670
diff --git a/tests/ref/vsynth/vsynth3-dnxhd-hr-lb-mov b/tests/ref/vsynth/vsynth3-dnxhd-hr-lb-mov
new file mode 100644
index 0000000000..f869caf0c7
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-dnxhd-hr-lb-mov
@@ -0,0 +1,4 @@
+921f16751950320d8da7a1dde215c2ff *tests/data/fate/vsynth3-dnxhd-hr-lb-mov.mov
+3748599 tests/data/fate/vsynth3-dnxhd-hr-lb-mov.mov
+1a4d12fd893e4585944dd9c68fb23edf *tests/data/fate/vsynth3-dnxhd-hr-lb-mov.out.rawvideo
+stddev:    6.92 PSNR: 31.32 MAXDIFF:   50 bytes:    86700/     8670
diff --git a/tests/ref/vsynth/vsynth3-dnxhd-hr-sq-mov b/tests/ref/vsynth/vsynth3-dnxhd-hr-sq-mov
new file mode 100644
index 0000000000..b247ce787a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-dnxhd-hr-sq-mov
@@ -0,0 +1,4 @@
+aa51e1aaf9bd8899e282096d2dcb4f25 *tests/data/fate/vsynth3-dnxhd-hr-sq-mov.mov
+2560763 tests/data/fate/vsynth3-dnxhd-hr-sq-mov.mov
+730c00cc5a24e13ee99a75789806cb28 *tests/data/fate/vsynth3-dnxhd-hr-sq-mov.out.rawvideo
+stddev:    6.91 PSNR: 31.33 MAXDIFF:   50 bytes:    86700/     8670
diff --git a/tests/ref/vsynth/vsynth3-dnxhd-uhd-hr-sq b/tests/ref/vsynth/vsynth3-dnxhd-uhd-hr-sq
new file mode 100644
index 0000000000..c7396c527f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-dnxhd-uhd-hr-sq
@@ -0,0 +1,4 @@
+067a66401b915f54171b65f086822bbb *tests/data/fate/vsynth3-dnxhd-uhd-hr-sq.dnxhd
+12042240 tests/data/fate/vsynth3-dnxhd-uhd-hr-sq.dnxhd
+8491cb6cf111fdeccdf5e4f5712a33c1 *tests/data/fate/vsynth3-dnxhd-uhd-hr-sq.out.rawvideo
+stddev:    6.92 PSNR: 31.32 MAXDIFF:   50 bytes:    86700/     8670
diff --git a/tests/ref/vsynth/vsynth3-ffv1 b/tests/ref/vsynth/vsynth3-ffv1
new file mode 100644
index 0000000000..8ffdd3f48f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ffv1
@@ -0,0 +1,4 @@
+f969ca8542c8384c27233f362b661f8a *tests/data/fate/vsynth3-ffv1.avi
+62194 tests/data/fate/vsynth3-ffv1.avi
+a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-ffv1-v0 b/tests/ref/vsynth/vsynth3-ffv1-v0
new file mode 100644
index 0000000000..967a0220d3
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ffv1-v0
@@ -0,0 +1,4 @@
+91ddf7723476e2b084253ffca69f382e *tests/data/fate/vsynth3-ffv1-v0.avi
+52256 tests/data/fate/vsynth3-ffv1-v0.avi
+a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1-v0.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0 b/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0
new file mode 100644
index 0000000000..2adffedb3a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0
@@ -0,0 +1,4 @@
+bdb5f694222e91bb7cb7264d2d5d419b *tests/data/fate/vsynth3-ffv1-v3-bgr0.avi
+112780 tests/data/fate/vsynth3-ffv1-v3-bgr0.avi
+5d031d2e891b13593b8cd79e63d083b4 *tests/data/fate/vsynth3-ffv1-v3-bgr0.out.rawvideo
+stddev:    3.23 PSNR: 37.92 MAXDIFF:   50 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-ffv1-v3-rgb48 b/tests/ref/vsynth/vsynth3-ffv1-v3-rgb48
new file mode 100644
index 0000000000..9a7b6f5362
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ffv1-v3-rgb48
@@ -0,0 +1,4 @@
+3bec2f4381dc362c24d1bbc304d0af58 *tests/data/fate/vsynth3-ffv1-v3-rgb48.avi
+244742 tests/data/fate/vsynth3-ffv1-v3-rgb48.avi
+d37e1507abd3233e27b0b00441149ddc *tests/data/fate/vsynth3-ffv1-v3-rgb48.out.rawvideo
+stddev:    3.52 PSNR: 37.19 MAXDIFF:   59 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p
new file mode 100644
index 0000000000..38fb24ae49
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p
@@ -0,0 +1,4 @@
+f969ca8542c8384c27233f362b661f8a *tests/data/fate/vsynth3-ffv1-v3-yuv420p.avi
+62194 tests/data/fate/vsynth3-ffv1-v3-yuv420p.avi
+a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1-v3-yuv420p.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10 b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10
new file mode 100644
index 0000000000..d86c9c9e8f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10
@@ -0,0 +1,4 @@
+4fc113caac00ada68e19639ae6f7bc47 *tests/data/fate/vsynth3-ffv1-v3-yuv422p10.avi
+63840 tests/data/fate/vsynth3-ffv1-v3-yuv422p10.avi
+a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1-v3-yuv422p10.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16 b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16
new file mode 100644
index 0000000000..5d61f119bf
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16
@@ -0,0 +1,4 @@
+1e8981cec92407938b25cd82381d1c64 *tests/data/fate/vsynth3-ffv1-v3-yuv444p16.avi
+82908 tests/data/fate/vsynth3-ffv1-v3-yuv444p16.avi
+a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1-v3-yuv444p16.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-ffvhuff b/tests/ref/vsynth/vsynth3-ffvhuff
new file mode 100644
index 0000000000..b2772b0552
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ffvhuff
@@ -0,0 +1,4 @@
+9f355bfe2abe63b06e325a078151f784 *tests/data/fate/vsynth3-ffvhuff.avi
+90210 tests/data/fate/vsynth3-ffvhuff.avi
+a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffvhuff.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-ffvhuff420p12 b/tests/ref/vsynth/vsynth3-ffvhuff420p12
new file mode 100644
index 0000000000..201ec7658b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ffvhuff420p12
@@ -0,0 +1,4 @@
+e5a178d75afeda6df1d4eb6f7cdfa3a0 *tests/data/fate/vsynth3-ffvhuff420p12.avi
+175260 tests/data/fate/vsynth3-ffvhuff420p12.avi
+a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffvhuff420p12.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-ffvhuff422p10left b/tests/ref/vsynth/vsynth3-ffvhuff422p10left
new file mode 100644
index 0000000000..d395829bf0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ffvhuff422p10left
@@ -0,0 +1,4 @@
+37e15f58570aeeafc86972524756136a *tests/data/fate/vsynth3-ffvhuff422p10left.avi
+173552 tests/data/fate/vsynth3-ffvhuff422p10left.avi
+0cf7cf68724fa5146b1667e4fa08b0e1 *tests/data/fate/vsynth3-ffvhuff422p10left.out.rawvideo
+stddev:    2.12 PSNR: 41.58 MAXDIFF:   26 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-ffvhuff444 b/tests/ref/vsynth/vsynth3-ffvhuff444
new file mode 100644
index 0000000000..37e20e130f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ffvhuff444
@@ -0,0 +1,4 @@
+dc07c964dad37768d1a021afe7c3612e *tests/data/fate/vsynth3-ffvhuff444.avi
+151366 tests/data/fate/vsynth3-ffvhuff444.avi
+02a85ec07377df6b483281038f8882ee *tests/data/fate/vsynth3-ffvhuff444.out.rawvideo
+stddev:    3.06 PSNR: 38.40 MAXDIFF:   40 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-ffvhuff444p16 b/tests/ref/vsynth/vsynth3-ffvhuff444p16
new file mode 100644
index 0000000000..0f4bc77242
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ffvhuff444p16
@@ -0,0 +1,4 @@
+93571f2ddceadebd534c6d76fe93fc93 *tests/data/fate/vsynth3-ffvhuff444p16.avi
+320088 tests/data/fate/vsynth3-ffvhuff444p16.avi
+e5933e1e6dbacddb78e6d90cd5ed2b5d *tests/data/fate/vsynth3-ffvhuff444p16.out.rawvideo
+stddev:    3.06 PSNR: 38.40 MAXDIFF:   40 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-flashsv b/tests/ref/vsynth/vsynth3-flashsv
new file mode 100644
index 0000000000..38a34bd71d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-flashsv
@@ -0,0 +1,4 @@
+832fe60169f4d91339458c60a5292924 *tests/data/fate/vsynth3-flashsv.flv
+171419 tests/data/fate/vsynth3-flashsv.flv
+faa660b0ecaaab1bf9b5d7284019aa01 *tests/data/fate/vsynth3-flashsv.out.rawvideo
+stddev:    2.97 PSNR: 38.67 MAXDIFF:   49 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-flashsv2 b/tests/ref/vsynth/vsynth3-flashsv2
new file mode 100644
index 0000000000..31d0d3f2be
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-flashsv2
@@ -0,0 +1,4 @@
+ba57c9555329e60250905def79fe6257 *tests/data/fate/vsynth3-flashsv2.flv
+107956 tests/data/fate/vsynth3-flashsv2.flv
+fb6b5134561d86fc05ccce9323553b80 *tests/data/fate/vsynth3-flashsv2.out.rawvideo
+stddev:    3.62 PSNR: 36.95 MAXDIFF:   49 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-flv b/tests/ref/vsynth/vsynth3-flv
new file mode 100644
index 0000000000..7abe2b54c4
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-flv
@@ -0,0 +1,4 @@
+c36dbc8109d1ceed68bd5590084eb375 *tests/data/fate/vsynth3-flv.flv
+28496 tests/data/fate/vsynth3-flv.flv
+b82944d78d1ee68a36d01933c9602520 *tests/data/fate/vsynth3-flv.out.rawvideo
+stddev:    9.71 PSNR: 28.38 MAXDIFF:   86 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-huffyuv b/tests/ref/vsynth/vsynth3-huffyuv
new file mode 100644
index 0000000000..2d79e56f00
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-huffyuv
@@ -0,0 +1,4 @@
+4468635f2c221d7744cc6f87ff9e9b48 *tests/data/fate/vsynth3-huffyuv.avi
+116350 tests/data/fate/vsynth3-huffyuv.avi
+a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-huffyuv.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-huffyuvbgr24 b/tests/ref/vsynth/vsynth3-huffyuvbgr24
new file mode 100644
index 0000000000..91cd51e879
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-huffyuvbgr24
@@ -0,0 +1,4 @@
+758d6b72a396743c096b003f41f54023 *tests/data/fate/vsynth3-huffyuvbgr24.avi
+165158 tests/data/fate/vsynth3-huffyuvbgr24.avi
+5d031d2e891b13593b8cd79e63d083b4 *tests/data/fate/vsynth3-huffyuvbgr24.out.rawvideo
+stddev:    3.23 PSNR: 37.92 MAXDIFF:   50 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-huffyuvbgra b/tests/ref/vsynth/vsynth3-huffyuvbgra
new file mode 100644
index 0000000000..c155f74574
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-huffyuvbgra
@@ -0,0 +1,4 @@
+79a2b229d1c105b4b20de226f254f4b2 *tests/data/fate/vsynth3-huffyuvbgra.avi
+179602 tests/data/fate/vsynth3-huffyuvbgra.avi
+5d031d2e891b13593b8cd79e63d083b4 *tests/data/fate/vsynth3-huffyuvbgra.out.rawvideo
+stddev:    3.23 PSNR: 37.92 MAXDIFF:   50 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-jpeg2000 b/tests/ref/vsynth/vsynth3-jpeg2000
new file mode 100644
index 0000000000..a1e3a8090a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-jpeg2000
@@ -0,0 +1,4 @@
+0b8aa8113c10772cffff60f9c8ffd902 *tests/data/fate/vsynth3-jpeg2000.avi
+65548 tests/data/fate/vsynth3-jpeg2000.avi
+2d8bd94d558755c47d7e23fd9556e164 *tests/data/fate/vsynth3-jpeg2000.out.rawvideo
+stddev:    5.48 PSNR: 33.34 MAXDIFF:   47 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-jpeg2000-97 b/tests/ref/vsynth/vsynth3-jpeg2000-97
new file mode 100644
index 0000000000..191956f580
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-jpeg2000-97
@@ -0,0 +1,4 @@
+b6c88a623c3296ca945346d2203f0af0 *tests/data/fate/vsynth3-jpeg2000-97.avi
+83870 tests/data/fate/vsynth3-jpeg2000-97.avi
+0cd707bfb1bbe5312b00c094f695b1fa *tests/data/fate/vsynth3-jpeg2000-97.out.rawvideo
+stddev:    4.52 PSNR: 35.02 MAXDIFF:   47 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-jpegls b/tests/ref/vsynth/vsynth3-jpegls
new file mode 100644
index 0000000000..da005eccba
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-jpegls
@@ -0,0 +1,4 @@
+7651480a59692e77e346f9cc4d2fdb96 *tests/data/fate/vsynth3-jpegls.avi
+133168 tests/data/fate/vsynth3-jpegls.avi
+faa660b0ecaaab1bf9b5d7284019aa01 *tests/data/fate/vsynth3-jpegls.out.rawvideo
+stddev:    2.97 PSNR: 38.67 MAXDIFF:   49 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-ljpeg b/tests/ref/vsynth/vsynth3-ljpeg
new file mode 100644
index 0000000000..b104c6a343
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-ljpeg
@@ -0,0 +1,4 @@
+d3cd7906eecc70b882b7cae300d08646 *tests/data/fate/vsynth3-ljpeg.avi
+105844 tests/data/fate/vsynth3-ljpeg.avi
+a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ljpeg.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mjpeg b/tests/ref/vsynth/vsynth3-mjpeg
new file mode 100644
index 0000000000..4b3371ec22
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mjpeg
@@ -0,0 +1,4 @@
+eec435352485fec167179a63405505be *tests/data/fate/vsynth3-mjpeg.avi
+48156 tests/data/fate/vsynth3-mjpeg.avi
+c4fe7a2669afbd96c640748693fc4e30 *tests/data/fate/vsynth3-mjpeg.out.rawvideo
+stddev:    8.60 PSNR: 29.43 MAXDIFF:   58 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mjpeg-422 b/tests/ref/vsynth/vsynth3-mjpeg-422
new file mode 100644
index 0000000000..c364c79a11
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mjpeg-422
@@ -0,0 +1,4 @@
+396394fab0d456443a3929a33f8c0d59 *tests/data/fate/vsynth3-mjpeg-422.avi
+52606 tests/data/fate/vsynth3-mjpeg-422.avi
+a332893cb0603f2f505fe5d3bf105519 *tests/data/fate/vsynth3-mjpeg-422.out.rawvideo
+stddev:    8.23 PSNR: 29.82 MAXDIFF:   58 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mjpeg-444 b/tests/ref/vsynth/vsynth3-mjpeg-444
new file mode 100644
index 0000000000..0e38744fd2
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mjpeg-444
@@ -0,0 +1,4 @@
+3f2dca7be789eb7818c69ec716c0d831 *tests/data/fate/vsynth3-mjpeg-444.avi
+53958 tests/data/fate/vsynth3-mjpeg-444.avi
+79a901f2ed85d82cf1c674fab3d3ef72 *tests/data/fate/vsynth3-mjpeg-444.out.rawvideo
+stddev:    8.21 PSNR: 29.84 MAXDIFF:   58 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mjpeg-huffman b/tests/ref/vsynth/vsynth3-mjpeg-huffman
new file mode 100644
index 0000000000..634a1a52fc
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mjpeg-huffman
@@ -0,0 +1,4 @@
+eec435352485fec167179a63405505be *tests/data/fate/vsynth3-mjpeg-huffman.avi
+48156 tests/data/fate/vsynth3-mjpeg-huffman.avi
+c4fe7a2669afbd96c640748693fc4e30 *tests/data/fate/vsynth3-mjpeg-huffman.out.rawvideo
+stddev:    8.60 PSNR: 29.43 MAXDIFF:   58 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mjpeg-trell b/tests/ref/vsynth/vsynth3-mjpeg-trell
new file mode 100644
index 0000000000..5b386c7eed
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mjpeg-trell
@@ -0,0 +1,4 @@
+484fa337b71c06a0206243814c4894b0 *tests/data/fate/vsynth3-mjpeg-trell.avi
+47816 tests/data/fate/vsynth3-mjpeg-trell.avi
+f0ccfe4584d193fd6d690a85a70db188 *tests/data/fate/vsynth3-mjpeg-trell.out.rawvideo
+stddev:    8.27 PSNR: 29.78 MAXDIFF:   55 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mjpeg-trell-huffman b/tests/ref/vsynth/vsynth3-mjpeg-trell-huffman
new file mode 100644
index 0000000000..719029f37a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mjpeg-trell-huffman
@@ -0,0 +1,4 @@
+484fa337b71c06a0206243814c4894b0 *tests/data/fate/vsynth3-mjpeg-trell-huffman.avi
+47816 tests/data/fate/vsynth3-mjpeg-trell-huffman.avi
+f0ccfe4584d193fd6d690a85a70db188 *tests/data/fate/vsynth3-mjpeg-trell-huffman.out.rawvideo
+stddev:    8.27 PSNR: 29.78 MAXDIFF:   55 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mov-bgr24 b/tests/ref/vsynth/vsynth3-mov-bgr24
new file mode 100644
index 0000000000..9ceb69eed5
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mov-bgr24
@@ -0,0 +1,4 @@
+9af1caa30e99cc422c8a0734051f7f95 *tests/data/fate/vsynth3-mov-bgr24.mov
+174093 tests/data/fate/vsynth3-mov-bgr24.mov
+693aff10c094f8bd31693f74cf79d2b2 *tests/data/fate/vsynth3-mov-bgr24.out.rawvideo
+stddev:    3.67 PSNR: 36.82 MAXDIFF:   43 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mov-bpp15 b/tests/ref/vsynth/vsynth3-mov-bpp15
new file mode 100644
index 0000000000..dfee45858f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mov-bpp15
@@ -0,0 +1,4 @@
+3d64ea4e9c78e72fcedca5e00363db7b *tests/data/fate/vsynth3-mov-bpp15.mov
+116293 tests/data/fate/vsynth3-mov-bpp15.mov
+19f61c34cbdef98b0f4aca6c19f59ed4 *tests/data/fate/vsynth3-mov-bpp15.out.rawvideo
+stddev:    4.35 PSNR: 35.35 MAXDIFF:   46 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mov-bpp16 b/tests/ref/vsynth/vsynth3-mov-bpp16
new file mode 100644
index 0000000000..86c6d7ae65
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mov-bpp16
@@ -0,0 +1,4 @@
+ddff7831e0d3e950cee4fdb7fceeb76a *tests/data/fate/vsynth3-mov-bpp16.mov
+116293 tests/data/fate/vsynth3-mov-bpp16.mov
+756f68dd5412d245d4bbeda7b5d51829 *tests/data/fate/vsynth3-mov-bpp16.out.rawvideo
+stddev:    4.07 PSNR: 35.93 MAXDIFF:   46 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg1 b/tests/ref/vsynth/vsynth3-mpeg1
new file mode 100644
index 0000000000..7a3b484d6f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg1
@@ -0,0 +1,4 @@
+972ddac6afa89f1344d02b25542fc469 *tests/data/fate/vsynth3-mpeg1.mpeg1video
+28028 tests/data/fate/vsynth3-mpeg1.mpeg1video
+bffc40252da80b55302666b0046468c2 *tests/data/fate/vsynth3-mpeg1.out.rawvideo
+stddev:    9.10 PSNR: 28.94 MAXDIFF:   63 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg1b b/tests/ref/vsynth/vsynth3-mpeg1b
new file mode 100644
index 0000000000..adfa418875
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg1b
@@ -0,0 +1,4 @@
+a2e36336e35f9466c883ade059c6485e *tests/data/fate/vsynth3-mpeg1b.mpeg1video
+38251 tests/data/fate/vsynth3-mpeg1b.mpeg1video
+c44023d27be27deb7f3793321655ca75 *tests/data/fate/vsynth3-mpeg1b.out.rawvideo
+stddev:    7.00 PSNR: 31.22 MAXDIFF:   56 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg2 b/tests/ref/vsynth/vsynth3-mpeg2
new file mode 100644
index 0000000000..d2e5b9fffc
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg2
@@ -0,0 +1,4 @@
+d95da92e3e77e32e3766ed9a95241f98 *tests/data/fate/vsynth3-mpeg2.mpeg2video
+29567 tests/data/fate/vsynth3-mpeg2.mpeg2video
+1df6a406c3959c6de7651b4e4fd98a36 *tests/data/fate/vsynth3-mpeg2.out.rawvideo
+stddev:    9.12 PSNR: 28.93 MAXDIFF:   63 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg2-422 b/tests/ref/vsynth/vsynth3-mpeg2-422
new file mode 100644
index 0000000000..2247f286e6
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg2-422
@@ -0,0 +1,4 @@
+4d108b861715f1fa010fd70baea91793 *tests/data/fate/vsynth3-mpeg2-422.mpeg2video
+68612 tests/data/fate/vsynth3-mpeg2-422.mpeg2video
+73b16e906d07b6bbccf4b00d4a25302c *tests/data/fate/vsynth3-mpeg2-422.out.rawvideo
+stddev:    4.02 PSNR: 36.05 MAXDIFF:   46 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg2-idct-int b/tests/ref/vsynth/vsynth3-mpeg2-idct-int
new file mode 100644
index 0000000000..3b2f714654
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg2-idct-int
@@ -0,0 +1,4 @@
+e79b543bed136bca385b2a870d532870 *tests/data/fate/vsynth3-mpeg2-idct-int.mpeg2video
+29614 tests/data/fate/vsynth3-mpeg2-idct-int.mpeg2video
+aebaf03348e2e114d9f487101f61fe3d *tests/data/fate/vsynth3-mpeg2-idct-int.out.rawvideo
+stddev:    9.10 PSNR: 28.94 MAXDIFF:   65 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg2-ilace b/tests/ref/vsynth/vsynth3-mpeg2-ilace
new file mode 100644
index 0000000000..fe2720ef57
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg2-ilace
@@ -0,0 +1,4 @@
+c13776ac25a9a9553847abddabd41915 *tests/data/fate/vsynth3-mpeg2-ilace.mpeg2video
+35773 tests/data/fate/vsynth3-mpeg2-ilace.mpeg2video
+78861ce7b0d433205e45960e1fadd911 *tests/data/fate/vsynth3-mpeg2-ilace.out.rawvideo
+stddev:    9.10 PSNR: 28.95 MAXDIFF:   62 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg2-ivlc-qprd b/tests/ref/vsynth/vsynth3-mpeg2-ivlc-qprd
new file mode 100644
index 0000000000..d732912b8b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg2-ivlc-qprd
@@ -0,0 +1,4 @@
+15a7db418ab54b6827d0bf53999de58f *tests/data/fate/vsynth3-mpeg2-ivlc-qprd.mpeg2video
+59765 tests/data/fate/vsynth3-mpeg2-ivlc-qprd.mpeg2video
+92048d455345edebc2b21a5ff102c3e4 *tests/data/fate/vsynth3-mpeg2-ivlc-qprd.out.rawvideo
+stddev:    2.66 PSNR: 39.61 MAXDIFF:   22 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg2-thread b/tests/ref/vsynth/vsynth3-mpeg2-thread
new file mode 100644
index 0000000000..faf10716a2
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg2-thread
@@ -0,0 +1,4 @@
+adceaea1136d072c629d8be517f8d96d *tests/data/fate/vsynth3-mpeg2-thread.mpeg2video
+40356 tests/data/fate/vsynth3-mpeg2-thread.mpeg2video
+917f425ebc14d29783d184d90f493e86 *tests/data/fate/vsynth3-mpeg2-thread.out.rawvideo
+stddev:    8.93 PSNR: 29.11 MAXDIFF:   64 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg2-thread-ivlc b/tests/ref/vsynth/vsynth3-mpeg2-thread-ivlc
new file mode 100644
index 0000000000..8ac72f1fae
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg2-thread-ivlc
@@ -0,0 +1,4 @@
+221231dae1cd87b8c51a8f4772be6632 *tests/data/fate/vsynth3-mpeg2-thread-ivlc.mpeg2video
+40091 tests/data/fate/vsynth3-mpeg2-thread-ivlc.mpeg2video
+917f425ebc14d29783d184d90f493e86 *tests/data/fate/vsynth3-mpeg2-thread-ivlc.out.rawvideo
+stddev:    8.93 PSNR: 29.11 MAXDIFF:   64 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg4 b/tests/ref/vsynth/vsynth3-mpeg4
new file mode 100644
index 0000000000..02cf68d55d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg4
@@ -0,0 +1,4 @@
+ddcff996543900496f0b374a2d5cae74 *tests/data/fate/vsynth3-mpeg4.mp4
+26017 tests/data/fate/vsynth3-mpeg4.mp4
+fc0d8c1e58d254031e6207dfcae8f867 *tests/data/fate/vsynth3-mpeg4.out.rawvideo
+stddev:    9.66 PSNR: 28.43 MAXDIFF:   79 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg4-adap b/tests/ref/vsynth/vsynth3-mpeg4-adap
new file mode 100644
index 0000000000..0942f83015
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg4-adap
@@ -0,0 +1,4 @@
+c16e5c2436ca9953517eadba562768e9 *tests/data/fate/vsynth3-mpeg4-adap.avi
+43706 tests/data/fate/vsynth3-mpeg4-adap.avi
+b42b614e19e7c4859fca1af6d4e36eae *tests/data/fate/vsynth3-mpeg4-adap.out.rawvideo
+stddev:    5.48 PSNR: 33.34 MAXDIFF:   53 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg4-adv b/tests/ref/vsynth/vsynth3-mpeg4-adv
new file mode 100644
index 0000000000..7a9ecb6a80
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg4-adv
@@ -0,0 +1,4 @@
+140ecea2eb7d85cbe647adb666f09aa5 *tests/data/fate/vsynth3-mpeg4-adv.avi
+32296 tests/data/fate/vsynth3-mpeg4-adv.avi
+9f80b96af57556d53ce44008bd687f55 *tests/data/fate/vsynth3-mpeg4-adv.out.rawvideo
+stddev:    7.60 PSNR: 30.51 MAXDIFF:   63 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg4-error b/tests/ref/vsynth/vsynth3-mpeg4-error
new file mode 100644
index 0000000000..c33dad9f52
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg4-error
@@ -0,0 +1,4 @@
+7f1fb64c5a37be6e5606f92adb84f273 *tests/data/fate/vsynth3-mpeg4-error.avi
+38212 tests/data/fate/vsynth3-mpeg4-error.avi
+f9fd24e26f4ffb5ed597b9bbf0ea731b *tests/data/fate/vsynth3-mpeg4-error.out.rawvideo
+stddev:    6.06 PSNR: 32.47 MAXDIFF:   54 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg4-nr b/tests/ref/vsynth/vsynth3-mpeg4-nr
new file mode 100644
index 0000000000..590e1332d5
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg4-nr
@@ -0,0 +1,4 @@
+62790bdb7c2bb4da94dba992ea967fc8 *tests/data/fate/vsynth3-mpeg4-nr.avi
+36500 tests/data/fate/vsynth3-mpeg4-nr.avi
+d0ad9918a12019dd2eacfb804d1f7e78 *tests/data/fate/vsynth3-mpeg4-nr.out.rawvideo
+stddev:    8.27 PSNR: 29.78 MAXDIFF:   70 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg4-nsse b/tests/ref/vsynth/vsynth3-mpeg4-nsse
new file mode 100644
index 0000000000..6ad377cd17
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg4-nsse
@@ -0,0 +1,4 @@
+88b1aa2dcea6a45c527487ba8f441feb *tests/data/fate/vsynth3-mpeg4-nsse.avi
+41980 tests/data/fate/vsynth3-mpeg4-nsse.avi
+69d86dec0d73e00608e03855a79dbdc0 *tests/data/fate/vsynth3-mpeg4-nsse.out.rawvideo
+stddev:    6.70 PSNR: 31.60 MAXDIFF:   68 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg4-qpel b/tests/ref/vsynth/vsynth3-mpeg4-qpel
new file mode 100644
index 0000000000..2d9158676b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg4-qpel
@@ -0,0 +1,4 @@
+8e60ed0013bfc28f48ed4d826fd26a6a *tests/data/fate/vsynth3-mpeg4-qpel.avi
+42622 tests/data/fate/vsynth3-mpeg4-qpel.avi
+50af37a5ae05f0af34bd56dcef997c8d *tests/data/fate/vsynth3-mpeg4-qpel.out.rawvideo
+stddev:    6.59 PSNR: 31.75 MAXDIFF:   54 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg4-qprd b/tests/ref/vsynth/vsynth3-mpeg4-qprd
new file mode 100644
index 0000000000..db6e58d245
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg4-qprd
@@ -0,0 +1,4 @@
+e3b49e22e8acbd21f34a2909bb35075e *tests/data/fate/vsynth3-mpeg4-qprd.avi
+61830 tests/data/fate/vsynth3-mpeg4-qprd.avi
+c59f2bead1c81b23fabc0a740048b110 *tests/data/fate/vsynth3-mpeg4-qprd.out.rawvideo
+stddev:    2.68 PSNR: 39.55 MAXDIFF:   27 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg4-rc b/tests/ref/vsynth/vsynth3-mpeg4-rc
new file mode 100644
index 0000000000..fae06773d4
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg4-rc
@@ -0,0 +1,4 @@
+5b51e8f91fecd621cd3aa5d687659fbc *tests/data/fate/vsynth3-mpeg4-rc.avi
+81092 tests/data/fate/vsynth3-mpeg4-rc.avi
+07ba5baf141a24561f7dba43645a3400 *tests/data/fate/vsynth3-mpeg4-rc.out.rawvideo
+stddev:    2.62 PSNR: 39.74 MAXDIFF:   23 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpeg4-thread b/tests/ref/vsynth/vsynth3-mpeg4-thread
new file mode 100644
index 0000000000..d61803152a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpeg4-thread
@@ -0,0 +1,4 @@
+b071631783ee76df554161fc3966f567 *tests/data/fate/vsynth3-mpeg4-thread.avi
+74582 tests/data/fate/vsynth3-mpeg4-thread.avi
+7eb4d38b01c71064406ce6705c471439 *tests/data/fate/vsynth3-mpeg4-thread.out.rawvideo
+stddev:    1.99 PSNR: 42.12 MAXDIFF:   18 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-mpng b/tests/ref/vsynth/vsynth3-mpng
new file mode 100644
index 0000000000..e708a60d98
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-mpng
@@ -0,0 +1,4 @@
+3f64b66a1f46e31d45dd7f5514422ed0 *tests/data/fate/vsynth3-mpng.avi
+179804 tests/data/fate/vsynth3-mpng.avi
+693aff10c094f8bd31693f74cf79d2b2 *tests/data/fate/vsynth3-mpng.out.rawvideo
+stddev:    3.67 PSNR: 36.82 MAXDIFF:   43 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-msmpeg4 b/tests/ref/vsynth/vsynth3-msmpeg4
new file mode 100644
index 0000000000..a73cb2cdbb
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-msmpeg4
@@ -0,0 +1,4 @@
+31c27687a8bda16ef9cafc9b43f1a016 *tests/data/fate/vsynth3-msmpeg4.avi
+32444 tests/data/fate/vsynth3-msmpeg4.avi
+216b15fb02691b662d0f0112507d5583 *tests/data/fate/vsynth3-msmpeg4.out.rawvideo
+stddev:    9.63 PSNR: 28.45 MAXDIFF:  104 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-msmpeg4v2 b/tests/ref/vsynth/vsynth3-msmpeg4v2
new file mode 100644
index 0000000000..81854f1346
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-msmpeg4v2
@@ -0,0 +1,4 @@
+206b95674f0d7d77b894c17bf81b6b2d *tests/data/fate/vsynth3-msmpeg4v2.avi
+32630 tests/data/fate/vsynth3-msmpeg4v2.avi
+575bfa06fd3f3944faf92205fabf5f22 *tests/data/fate/vsynth3-msmpeg4v2.out.rawvideo
+stddev:    9.66 PSNR: 28.43 MAXDIFF:   86 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-prores b/tests/ref/vsynth/vsynth3-prores
new file mode 100644
index 0000000000..f63a7a736f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-prores
@@ -0,0 +1,4 @@
+b060c59be88b4b089ece5ee8dc4f1c58 *tests/data/fate/vsynth3-prores.mov
+105367 tests/data/fate/vsynth3-prores.mov
+fff5e7ad21d78501c8fa4749bf4bf289 *tests/data/fate/vsynth3-prores.out.rawvideo
+stddev:    2.80 PSNR: 39.17 MAXDIFF:   27 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-prores_ks b/tests/ref/vsynth/vsynth3-prores_ks
new file mode 100644
index 0000000000..99cfc1397e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-prores_ks
@@ -0,0 +1,4 @@
+7ceff8c9cffca766f8a167ba73dad0e2 *tests/data/fate/vsynth3-prores_ks.mov
+95053 tests/data/fate/vsynth3-prores_ks.mov
+9ab6d3e3cc7749796cd9fa984c60d890 *tests/data/fate/vsynth3-prores_ks.out.rawvideo
+stddev:    4.09 PSNR: 35.88 MAXDIFF:   35 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-qtrle b/tests/ref/vsynth/vsynth3-qtrle
new file mode 100644
index 0000000000..6f93232789
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-qtrle
@@ -0,0 +1,4 @@
+33ec7d4f0a18fcf6da3bdacb494e2035 *tests/data/fate/vsynth3-qtrle.mov
+179656 tests/data/fate/vsynth3-qtrle.mov
+693aff10c094f8bd31693f74cf79d2b2 *tests/data/fate/vsynth3-qtrle.out.rawvideo
+stddev:    3.67 PSNR: 36.82 MAXDIFF:   43 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-r210 b/tests/ref/vsynth/vsynth3-r210
new file mode 100644
index 0000000000..75c424cf28
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-r210
@@ -0,0 +1,4 @@
+229e700e0fab4e81481e99a70e00bec9 *tests/data/fate/vsynth3-r210.avi
+442052 tests/data/fate/vsynth3-r210.avi
+e1d882babc8754f7418aa91ce48f7ab0 *tests/data/fate/vsynth3-r210.out.rawvideo
+stddev:    3.48 PSNR: 37.28 MAXDIFF:   42 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-rgb b/tests/ref/vsynth/vsynth3-rgb
new file mode 100644
index 0000000000..1a882ce104
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-rgb
@@ -0,0 +1,4 @@
+3e2909a69865eb88df72916c38d265de *tests/data/fate/vsynth3-rgb.avi
+183652 tests/data/fate/vsynth3-rgb.avi
+693aff10c094f8bd31693f74cf79d2b2 *tests/data/fate/vsynth3-rgb.out.rawvideo
+stddev:    3.67 PSNR: 36.82 MAXDIFF:   43 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-svq1 b/tests/ref/vsynth/vsynth3-svq1
new file mode 100644
index 0000000000..b51fa03e83
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-svq1
@@ -0,0 +1,4 @@
+1eaf318269afd7426406d73397c39a48 *tests/data/fate/vsynth3-svq1.mov
+40773 tests/data/fate/vsynth3-svq1.mov
+a1e5334cf67649bf8c7d95dc4d1bf148 *tests/data/fate/vsynth3-svq1.out.rawvideo
+stddev:   14.49 PSNR: 24.91 MAXDIFF:  183 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-v210 b/tests/ref/vsynth/vsynth3-v210
new file mode 100644
index 0000000000..f5282eee4b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-v210
@@ -0,0 +1,4 @@
+6824f941ed079952cdf22cc9cdfaa35d *tests/data/fate/vsynth3-v210.avi
+224452 tests/data/fate/vsynth3-v210.avi
+198ffb24c06927d8aaac5e59d81a0934 *tests/data/fate/vsynth3-v210.out.rawvideo
+stddev:    2.11 PSNR: 41.61 MAXDIFF:   27 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-v210-10 b/tests/ref/vsynth/vsynth3-v210-10
new file mode 100644
index 0000000000..46fe24dc7e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-v210-10
@@ -0,0 +1,4 @@
+83eef7004f81a2f9529941ed27554509 *tests/data/fate/vsynth3-v210-10.avi
+224452 tests/data/fate/vsynth3-v210-10.avi
+0cf7cf68724fa5146b1667e4fa08b0e1 *tests/data/fate/vsynth3-v210-10.out.rawvideo
+stddev:    2.12 PSNR: 41.58 MAXDIFF:   26 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-v308 b/tests/ref/vsynth/vsynth3-v308
new file mode 100644
index 0000000000..b823c7bad4
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-v308
@@ -0,0 +1,4 @@
+e1259287375d05431ee718e50eb7f37b *tests/data/fate/vsynth3-v308.avi
+180252 tests/data/fate/vsynth3-v308.avi
+02a85ec07377df6b483281038f8882ee *tests/data/fate/vsynth3-v308.out.rawvideo
+stddev:    3.06 PSNR: 38.40 MAXDIFF:   40 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-v408 b/tests/ref/vsynth/vsynth3-v408
new file mode 100644
index 0000000000..b64f7d8e1a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-v408
@@ -0,0 +1,4 @@
+c75fc69c19c6c578ec95c3972f4af339 *tests/data/fate/vsynth3-v408.avi
+238052 tests/data/fate/vsynth3-v408.avi
+a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-v408.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-wmv1 b/tests/ref/vsynth/vsynth3-wmv1
new file mode 100644
index 0000000000..4344acd55a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-wmv1
@@ -0,0 +1,4 @@
+de255d5f4838784e18af6ff86cf97e0b *tests/data/fate/vsynth3-wmv1.avi
+32658 tests/data/fate/vsynth3-wmv1.avi
+4dafe3c433c7f48c6c9e56d59ca0f7c3 *tests/data/fate/vsynth3-wmv1.out.rawvideo
+stddev:    9.65 PSNR: 28.44 MAXDIFF:   91 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-wmv2 b/tests/ref/vsynth/vsynth3-wmv2
new file mode 100644
index 0000000000..2276e7ec43
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-wmv2
@@ -0,0 +1,4 @@
+d9c2a235b43d1704bb41c73f285d86a8 *tests/data/fate/vsynth3-wmv2.avi
+33980 tests/data/fate/vsynth3-wmv2.avi
+691e00ebbb56c061f74ade70088102e7 *tests/data/fate/vsynth3-wmv2.out.rawvideo
+stddev:    9.60 PSNR: 28.48 MAXDIFF:   81 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-xface b/tests/ref/vsynth/vsynth3-xface
new file mode 100644
index 0000000000..b6ef0978e2
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-xface
@@ -0,0 +1,4 @@
+367fa226e570b30935305a22982a54ba *tests/data/fate/vsynth3-xface.nut
+15772 tests/data/fate/vsynth3-xface.nut
+83a8c44631fbc8b185df932679db0e5b *tests/data/fate/vsynth3-xface.out.rawvideo
+stddev:   97.23 PSNR:  8.37 MAXDIFF:  238 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-yuv b/tests/ref/vsynth/vsynth3-yuv
new file mode 100644
index 0000000000..ceeb1059c6
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-yuv
@@ -0,0 +1,4 @@
+7935fee60d3eb567baf312900616dec0 *tests/data/fate/vsynth3-yuv.avi
+93552 tests/data/fate/vsynth3-yuv.avi
+a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-yuv.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-yuv4 b/tests/ref/vsynth/vsynth3-yuv4
new file mode 100644
index 0000000000..7c7b54e3b5
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-yuv4
@@ -0,0 +1,4 @@
+88bcfebb7710fc17137459c104d7de4e *tests/data/fate/vsynth3-yuv4.avi
+93552 tests/data/fate/vsynth3-yuv4.avi
+a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-yuv4.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth3-zlib b/tests/ref/vsynth/vsynth3-zlib
new file mode 100644
index 0000000000..55d65f30e0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth3-zlib
@@ -0,0 +1,4 @@
+d3705acfc90b16968d0d4a3ac56b049c *tests/data/fate/vsynth3-zlib.avi
+174882 tests/data/fate/vsynth3-zlib.avi
+693aff10c094f8bd31693f74cf79d2b2 *tests/data/fate/vsynth3-zlib.out.rawvideo
+stddev:    3.67 PSNR: 36.82 MAXDIFF:   43 bytes:    86700/    86700
diff --git a/tests/ref/vsynth/vsynth_lena-amv b/tests/ref/vsynth/vsynth_lena-amv
new file mode 100644
index 0000000000..e4bf72574c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-amv
@@ -0,0 +1,4 @@
+49552a6ac39f27568fab1a4644aa5ddd *tests/data/fate/vsynth_lena-amv.avi
+761980 tests/data/fate/vsynth_lena-amv.avi
+f256ad9feefb499c6569d06d868eb496 *tests/data/fate/vsynth_lena-amv.out.rawvideo
+stddev:    4.30 PSNR: 35.46 MAXDIFF:   65 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-asv1 b/tests/ref/vsynth/vsynth_lena-asv1
new file mode 100644
index 0000000000..d64bf49c79
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-asv1
@@ -0,0 +1,4 @@
+fc74737b0ea7de84609e1207d0ee9d93 *tests/data/fate/vsynth_lena-asv1.avi
+689420 tests/data/fate/vsynth_lena-asv1.avi
+a7cdefad200f48ab308c746461a8792e *tests/data/fate/vsynth_lena-asv1.out.rawvideo
+stddev:    5.07 PSNR: 34.03 MAXDIFF:   70 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-asv2 b/tests/ref/vsynth/vsynth_lena-asv2
new file mode 100644
index 0000000000..bebb5ac7b0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-asv2
@@ -0,0 +1,4 @@
+36b7ff52186fd87027f57f880eb67fd7 *tests/data/fate/vsynth_lena-asv2.avi
+675588 tests/data/fate/vsynth_lena-asv2.avi
+5990db66c7ac0bbe2f98ec2770c1bf3b *tests/data/fate/vsynth_lena-asv2.out.rawvideo
+stddev:    4.57 PSNR: 34.93 MAXDIFF:   47 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-avui b/tests/ref/vsynth/vsynth_lena-avui
new file mode 100644
index 0000000000..c2fced8e6c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-avui
@@ -0,0 +1,4 @@
+26805e15d9e732cd24aea91ae564d5c3 *tests/data/fate/vsynth_lena-avui.mov
+42625037 tests/data/fate/vsynth_lena-avui.mov
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-avui.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-bpp1 b/tests/ref/vsynth/vsynth_lena-bpp1
new file mode 100644
index 0000000000..a3772551ba
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-bpp1
@@ -0,0 +1,4 @@
+8dc90696dabf220a8f4413af20e93073 *tests/data/fate/vsynth_lena-bpp1.avi
+640460 tests/data/fate/vsynth_lena-bpp1.avi
+6183ba861d4e48d4aaefc514fde270e5 *tests/data/fate/vsynth_lena-bpp1.out.rawvideo
+stddev:   83.28 PSNR:  9.72 MAXDIFF:  215 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-bpp15 b/tests/ref/vsynth/vsynth_lena-bpp15
new file mode 100644
index 0000000000..65bff0bfd0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-bpp15
@@ -0,0 +1,4 @@
+64516ba947d531db2bccc2ecc338b7be *tests/data/fate/vsynth_lena-bpp15.avi
+10144452 tests/data/fate/vsynth_lena-bpp15.avi
+ccf6fc507e938e8cc5c2a97b644de51c *tests/data/fate/vsynth_lena-bpp15.out.rawvideo
+stddev:   32.84 PSNR: 17.80 MAXDIFF:   92 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-cinepak b/tests/ref/vsynth/vsynth_lena-cinepak
new file mode 100644
index 0000000000..39b1d68268
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-cinepak
@@ -0,0 +1,4 @@
+e3837018f84929f07019ae2eccd303e2 *tests/data/fate/vsynth_lena-cinepak.mov
+88900 tests/data/fate/vsynth_lena-cinepak.mov
+f54ffa70f335ac7b701d7ae34462e001 *tests/data/fate/vsynth_lena-cinepak.out.rawvideo
+stddev:    4.09 PSNR: 35.88 MAXDIFF:   46 bytes:  7603200/   456192
diff --git a/tests/ref/vsynth/vsynth_lena-cljr b/tests/ref/vsynth/vsynth_lena-cljr
new file mode 100644
index 0000000000..6ee6150298
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-cljr
@@ -0,0 +1,4 @@
+e3579621c868e464da096a41af0674e4 *tests/data/fate/vsynth_lena-cljr.avi
+5075652 tests/data/fate/vsynth_lena-cljr.avi
+965c4a134144b30b24d6d138b03ddb8c *tests/data/fate/vsynth_lena-cljr.out.rawvideo
+stddev:    3.29 PSNR: 37.76 MAXDIFF:   23 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-1080i b/tests/ref/vsynth/vsynth_lena-dnxhd-1080i
new file mode 100644
index 0000000000..16702db712
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-1080i
@@ -0,0 +1,4 @@
+f7412afbcb4454692f7492f6710189e3 *tests/data/fate/vsynth_lena-dnxhd-1080i.mov
+3031911 tests/data/fate/vsynth_lena-dnxhd-1080i.mov
+7d0ca92f12711535d57eff3609462b31 *tests/data/fate/vsynth_lena-dnxhd-1080i.out.rawvideo
+stddev:    1.29 PSNR: 45.87 MAXDIFF:   22 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-10bit b/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-10bit
new file mode 100644
index 0000000000..109e3d5623
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-10bit
@@ -0,0 +1,4 @@
+72144676d0c6e320ff2c9b28bc3e4fa2 *tests/data/fate/vsynth_lena-dnxhd-1080i-10bit.mov
+4588391 tests/data/fate/vsynth_lena-dnxhd-1080i-10bit.mov
+f2dc4375c58e0406d442e0cb28573e91 *tests/data/fate/vsynth_lena-dnxhd-1080i-10bit.out.rawvideo
+stddev:    1.36 PSNR: 45.40 MAXDIFF:   22 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr b/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr
new file mode 100644
index 0000000000..8e43a3f9de
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-1080i-colr
@@ -0,0 +1,4 @@
+5ba3ddb58b10e5f0069cb4f82d594695 *tests/data/fate/vsynth_lena-dnxhd-1080i-colr.mov
+3031929 tests/data/fate/vsynth_lena-dnxhd-1080i-colr.mov
+ce4993a69ef55c8c4b18138716f17b6f *tests/data/fate/vsynth_lena-dnxhd-1080i-colr.out.rawvideo
+stddev:    1.33 PSNR: 45.59 MAXDIFF:   22 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-2k-hr-hq b/tests/ref/vsynth/vsynth_lena-dnxhd-2k-hr-hq
new file mode 100644
index 0000000000..b457ec6d2d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-2k-hr-hq
@@ -0,0 +1,4 @@
+aea59b04d0e5b095559d4f3079be208c *tests/data/fate/vsynth_lena-dnxhd-2k-hr-hq.dnxhd
+4894720 tests/data/fate/vsynth_lena-dnxhd-2k-hr-hq.dnxhd
+a001dd521e7ac397f88077653b1f5ad0 *tests/data/fate/vsynth_lena-dnxhd-2k-hr-hq.out.rawvideo
+stddev:    1.34 PSNR: 45.56 MAXDIFF:   23 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-4k-hr-lb b/tests/ref/vsynth/vsynth_lena-dnxhd-4k-hr-lb
new file mode 100644
index 0000000000..b678274b85
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-4k-hr-lb
@@ -0,0 +1,4 @@
+c166f5e1355784eae8b82bbaeef79273 *tests/data/fate/vsynth_lena-dnxhd-4k-hr-lb.dnxhd
+3993600 tests/data/fate/vsynth_lena-dnxhd-4k-hr-lb.dnxhd
+49c22d3eb9de0194b572f75491444772 *tests/data/fate/vsynth_lena-dnxhd-4k-hr-lb.out.rawvideo
+stddev:    1.30 PSNR: 45.82 MAXDIFF:   21 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-720p b/tests/ref/vsynth/vsynth_lena-dnxhd-720p
new file mode 100644
index 0000000000..eaa1af8812
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-720p
@@ -0,0 +1,4 @@
+4ca9473a8d106bdfe36e9bf7c516b648 *tests/data/fate/vsynth_lena-dnxhd-720p.dnxhd
+2293760 tests/data/fate/vsynth_lena-dnxhd-720p.dnxhd
+9ccd48d24b4f1af2323b65abb6d65d7f *tests/data/fate/vsynth_lena-dnxhd-720p.out.rawvideo
+stddev:    1.31 PSNR: 45.77 MAXDIFF:   22 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-720p-10bit b/tests/ref/vsynth/vsynth_lena-dnxhd-720p-10bit
new file mode 100644
index 0000000000..b9c9e03579
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-720p-10bit
@@ -0,0 +1,4 @@
+e96fc4a7d994b9369c50da32fd325822 *tests/data/fate/vsynth_lena-dnxhd-720p-10bit.dnxhd
+2293760 tests/data/fate/vsynth_lena-dnxhd-720p-10bit.dnxhd
+0e9fcec94aeff70bac5dec02cf2391bc *tests/data/fate/vsynth_lena-dnxhd-720p-10bit.out.rawvideo
+stddev:    1.33 PSNR: 45.61 MAXDIFF:   22 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-720p-hr-lb b/tests/ref/vsynth/vsynth_lena-dnxhd-720p-hr-lb
new file mode 100644
index 0000000000..c693c42072
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-720p-hr-lb
@@ -0,0 +1,4 @@
+2cc387afd3e5a244dca45add1e0742bb *tests/data/fate/vsynth_lena-dnxhd-720p-hr-lb.dnxhd
+409600 tests/data/fate/vsynth_lena-dnxhd-720p-hr-lb.dnxhd
+8a7fe93d1fb2971d82dd8c8f14498567 *tests/data/fate/vsynth_lena-dnxhd-720p-hr-lb.out.rawvideo
+stddev:    1.63 PSNR: 43.86 MAXDIFF:   23 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-720p-rd b/tests/ref/vsynth/vsynth_lena-dnxhd-720p-rd
new file mode 100644
index 0000000000..b9aa690858
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-720p-rd
@@ -0,0 +1,4 @@
+b305b03708e905717b42fc0b304367d4 *tests/data/fate/vsynth_lena-dnxhd-720p-rd.dnxhd
+2293760 tests/data/fate/vsynth_lena-dnxhd-720p-rd.dnxhd
+3793391df8448937b17d876b6df0d26d *tests/data/fate/vsynth_lena-dnxhd-720p-rd.out.rawvideo
+stddev:    1.31 PSNR: 45.75 MAXDIFF:   22 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-edge1-hr b/tests/ref/vsynth/vsynth_lena-dnxhd-edge1-hr
new file mode 100644
index 0000000000..7ebc0b3d43
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-edge1-hr
@@ -0,0 +1,4 @@
+c2802b8a262fd6fc304d01819ad49f31 *tests/data/fate/vsynth_lena-dnxhd-edge1-hr.dnxhd
+81920 tests/data/fate/vsynth_lena-dnxhd-edge1-hr.dnxhd
+12818941028a00036756031e4268e9af *tests/data/fate/vsynth_lena-dnxhd-edge1-hr.out.rawvideo
+stddev:    4.94 PSNR: 34.25 MAXDIFF:   78 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-edge2-hr b/tests/ref/vsynth/vsynth_lena-dnxhd-edge2-hr
new file mode 100644
index 0000000000..59b8c1ec30
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-edge2-hr
@@ -0,0 +1,4 @@
+e84602720da8933dd68ef480fb7857c0 *tests/data/fate/vsynth_lena-dnxhd-edge2-hr.dnxhd
+81920 tests/data/fate/vsynth_lena-dnxhd-edge2-hr.dnxhd
+86784a85131a975cf656c63009d3242d *tests/data/fate/vsynth_lena-dnxhd-edge2-hr.out.rawvideo
+stddev:    4.70 PSNR: 34.68 MAXDIFF:   79 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-edge3-hr b/tests/ref/vsynth/vsynth_lena-dnxhd-edge3-hr
new file mode 100644
index 0000000000..3adad9be7c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-edge3-hr
@@ -0,0 +1,4 @@
+a0ad1f4433b9ab253fc78e96e75ce024 *tests/data/fate/vsynth_lena-dnxhd-edge3-hr.dnxhd
+81920 tests/data/fate/vsynth_lena-dnxhd-edge3-hr.dnxhd
+a6de77789a2e04d85cc0e86c21b0c2ec *tests/data/fate/vsynth_lena-dnxhd-edge3-hr.out.rawvideo
+stddev:    5.09 PSNR: 33.98 MAXDIFF:   84 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-hr-hq-mov b/tests/ref/vsynth/vsynth_lena-dnxhd-hr-hq-mov
new file mode 100644
index 0000000000..9cea762423
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-hr-hq-mov
@@ -0,0 +1,4 @@
+b232775e04c6a6a7995799db6cd8c255 *tests/data/fate/vsynth_lena-dnxhd-hr-hq-mov.mov
+4772599 tests/data/fate/vsynth_lena-dnxhd-hr-hq-mov.mov
+e6c3531cb32eb3d0c465c44098746fea *tests/data/fate/vsynth_lena-dnxhd-hr-hq-mov.out.rawvideo
+stddev:    1.34 PSNR: 45.54 MAXDIFF:   23 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-hr-lb-mov b/tests/ref/vsynth/vsynth_lena-dnxhd-hr-lb-mov
new file mode 100644
index 0000000000..a582b882d9
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-hr-lb-mov
@@ -0,0 +1,4 @@
+2c6881ebb8efdb02189862f67cd72851 *tests/data/fate/vsynth_lena-dnxhd-hr-lb-mov.mov
+3748599 tests/data/fate/vsynth_lena-dnxhd-hr-lb-mov.mov
+0951de00b90d1bf34d2ff10a51db705d *tests/data/fate/vsynth_lena-dnxhd-hr-lb-mov.out.rawvideo
+stddev:    1.31 PSNR: 45.72 MAXDIFF:   21 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-hr-sq-mov b/tests/ref/vsynth/vsynth_lena-dnxhd-hr-sq-mov
new file mode 100644
index 0000000000..80a6897852
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-hr-sq-mov
@@ -0,0 +1,4 @@
+b3b2380b019f0f655af5d61caa76cf12 *tests/data/fate/vsynth_lena-dnxhd-hr-sq-mov.mov
+2560763 tests/data/fate/vsynth_lena-dnxhd-hr-sq-mov.mov
+95e7da46fc066ed795de4ec1cf4d4ab5 *tests/data/fate/vsynth_lena-dnxhd-hr-sq-mov.out.rawvideo
+stddev:    1.35 PSNR: 45.51 MAXDIFF:   23 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd-uhd-hr-sq b/tests/ref/vsynth/vsynth_lena-dnxhd-uhd-hr-sq
new file mode 100644
index 0000000000..f9cf8bdaa4
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd-uhd-hr-sq
@@ -0,0 +1,4 @@
+5ae3072820e217e21ca9a818d9150acc *tests/data/fate/vsynth_lena-dnxhd-uhd-hr-sq.dnxhd
+12042240 tests/data/fate/vsynth_lena-dnxhd-uhd-hr-sq.dnxhd
+77c6a7feb43d6eff94baf08570368bda *tests/data/fate/vsynth_lena-dnxhd-uhd-hr-sq.out.rawvideo
+stddev:    1.32 PSNR: 45.69 MAXDIFF:   21 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-dnxhd_1080i b/tests/ref/vsynth/vsynth_lena-dnxhd_1080i
new file mode 100644
index 0000000000..125c7a8e16
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dnxhd_1080i
@@ -0,0 +1,4 @@
+204e80f2e406ada90fca596ab2810b3e *./tests/data/vsynth_lena/dnxhd-1080i.mov
+3031911 ./tests/data/vsynth_lena/dnxhd-1080i.mov
+3c559af629ae0a8fb1a9a0e4b4da7733 *./tests/data/dnxhd_1080i.vsynth_lena.out.yuv
+stddev:    1.31 PSNR: 45.77 MAXDIFF:   23 bytes:   760320/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-dv b/tests/ref/vsynth/vsynth_lena-dv
new file mode 100644
index 0000000000..a8041f36a5
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dv
@@ -0,0 +1,4 @@
+ab03241e988dcd5bd36a76b25372343f *tests/data/fate/vsynth_lena-dv.dv
+7200000 tests/data/fate/vsynth_lena-dv.dv
+6e4b90be39ad408ddc1c0dc4ced40bf0 *tests/data/fate/vsynth_lena-dv.out.rawvideo
+stddev:    1.69 PSNR: 43.54 MAXDIFF:   33 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-dv-411 b/tests/ref/vsynth/vsynth_lena-dv-411
new file mode 100644
index 0000000000..164dd359b2
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dv-411
@@ -0,0 +1,4 @@
+1a7f091993eb6fe5b6f9d927ba60387d *tests/data/fate/vsynth_lena-dv-411.dv
+7200000 tests/data/fate/vsynth_lena-dv-411.dv
+e5624f3d4de96e514ac9b96c2b4b447c *tests/data/fate/vsynth_lena-dv-411.out.rawvideo
+stddev:    2.87 PSNR: 38.97 MAXDIFF:   45 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-dv-50 b/tests/ref/vsynth/vsynth_lena-dv-50
new file mode 100644
index 0000000000..2149fd553c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dv-50
@@ -0,0 +1,4 @@
+c678b291e58a277725aa4557387efc58 *tests/data/fate/vsynth_lena-dv-50.dv
+14400000 tests/data/fate/vsynth_lena-dv-50.dv
+bda4f98f387f82986e521b78a9bc1eef *tests/data/fate/vsynth_lena-dv-50.out.rawvideo
+stddev:    0.78 PSNR: 50.28 MAXDIFF:   12 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-dv_411 b/tests/ref/vsynth/vsynth_lena-dv_411
new file mode 100644
index 0000000000..1ca2bc03d9
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-dv_411
@@ -0,0 +1,4 @@
+e428508f400327aeb96969c08fb9e1b5 *./tests/data/vsynth_lena/dv411.dv
+7200000 ./tests/data/vsynth_lena/dv411.dv
+7f9fa421028aabb11eaf4c6513a5a843 *./tests/data/dv_411.vsynth_lena.out.yuv
+stddev:   10.09 PSNR: 28.05 MAXDIFF:   60 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffv1 b/tests/ref/vsynth/vsynth_lena-ffv1
new file mode 100644
index 0000000000..4060d8e25d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ffv1
@@ -0,0 +1,4 @@
+ed72c22374718589ffacd7ea15424687 *tests/data/fate/vsynth_lena-ffv1.avi
+3547792 tests/data/fate/vsynth_lena-ffv1.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffv1-v0 b/tests/ref/vsynth/vsynth_lena-ffv1-v0
new file mode 100644
index 0000000000..cbfb4af9b4
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ffv1-v0
@@ -0,0 +1,4 @@
+ad518c7014bdd6a72514a79a9102f64f *tests/data/fate/vsynth_lena-ffv1-v0.avi
+3525796 tests/data/fate/vsynth_lena-ffv1-v0.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1-v0.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0 b/tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0
new file mode 100644
index 0000000000..cfc98f665a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0
@@ -0,0 +1,4 @@
+edf0987619d4d63f8b7e3022a8d0a724 *tests/data/fate/vsynth_lena-ffv1-v3-bgr0.avi
+6013028 tests/data/fate/vsynth_lena-ffv1-v3-bgr0.avi
+0a8b7ddfec03622e37c869c5b552f9fc *tests/data/fate/vsynth_lena-ffv1-v3-bgr0.out.rawvideo
+stddev:    1.24 PSNR: 46.26 MAXDIFF:   17 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffv1-v3-rgb48 b/tests/ref/vsynth/vsynth_lena-ffv1-v3-rgb48
new file mode 100644
index 0000000000..629d6850ad
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-rgb48
@@ -0,0 +1,4 @@
+294d4f9fdf53ba0fe9d224d28ba700f0 *tests/data/fate/vsynth_lena-ffv1-v3-rgb48.avi
+13795036 tests/data/fate/vsynth_lena-ffv1-v3-rgb48.avi
+7bd82d1860095ae1e10ec0ace9cb04b6 *tests/data/fate/vsynth_lena-ffv1-v3-rgb48.out.rawvideo
+stddev:    0.91 PSNR: 48.91 MAXDIFF:   21 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p
new file mode 100644
index 0000000000..1cffcb6518
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p
@@ -0,0 +1,4 @@
+ed72c22374718589ffacd7ea15424687 *tests/data/fate/vsynth_lena-ffv1-v3-yuv420p.avi
+3547792 tests/data/fate/vsynth_lena-ffv1-v3-yuv420p.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1-v3-yuv420p.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10 b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10
new file mode 100644
index 0000000000..ab1cd3470a
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10
@@ -0,0 +1,4 @@
+cd3f5b3d4544a30bd08a9a11945a8adc *tests/data/fate/vsynth_lena-ffv1-v3-yuv422p10.avi
+3910306 tests/data/fate/vsynth_lena-ffv1-v3-yuv422p10.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1-v3-yuv422p10.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16 b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16
new file mode 100644
index 0000000000..08f9f0e38d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16
@@ -0,0 +1,4 @@
+e65ad01440ad756b1872b22d3cfa23d7 *tests/data/fate/vsynth_lena-ffv1-v3-yuv444p16.avi
+4871266 tests/data/fate/vsynth_lena-ffv1-v3-yuv444p16.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1-v3-yuv444p16.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffvhuff b/tests/ref/vsynth/vsynth_lena-ffvhuff
new file mode 100644
index 0000000000..88711a52bf
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ffvhuff
@@ -0,0 +1,4 @@
+c8bcad0cd3babf63ce96525f6c11ae6e *tests/data/fate/vsynth_lena-ffvhuff.avi
+4845026 tests/data/fate/vsynth_lena-ffvhuff.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffvhuff.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffvhuff420p12 b/tests/ref/vsynth/vsynth_lena-ffvhuff420p12
new file mode 100644
index 0000000000..e77698ba0c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ffvhuff420p12
@@ -0,0 +1,4 @@
+b2f3d04ca30c113b79877bb5518dd6ea *tests/data/fate/vsynth_lena-ffvhuff420p12.avi
+10925580 tests/data/fate/vsynth_lena-ffvhuff420p12.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffvhuff420p12.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffvhuff422p10left b/tests/ref/vsynth/vsynth_lena-ffvhuff422p10left
new file mode 100644
index 0000000000..d650427e1f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ffvhuff422p10left
@@ -0,0 +1,4 @@
+f6eae87090fcccc682f84a794784b4dd *tests/data/fate/vsynth_lena-ffvhuff422p10left.avi
+10041836 tests/data/fate/vsynth_lena-ffvhuff422p10left.avi
+a627fb50c8276200fd71383977d87ca3 *tests/data/fate/vsynth_lena-ffvhuff422p10left.out.rawvideo
+stddev:    0.34 PSNR: 57.43 MAXDIFF:    6 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffvhuff444 b/tests/ref/vsynth/vsynth_lena-ffvhuff444
new file mode 100644
index 0000000000..366498d186
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ffvhuff444
@@ -0,0 +1,4 @@
+1afdc5e87de165520f2b7e0fab18b241 *tests/data/fate/vsynth_lena-ffvhuff444.avi
+7530718 tests/data/fate/vsynth_lena-ffvhuff444.avi
+d43cb310c130c69214332d74f6ee5f9a *tests/data/fate/vsynth_lena-ffvhuff444.out.rawvideo
+stddev:    0.41 PSNR: 55.80 MAXDIFF:    7 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffvhuff444p16 b/tests/ref/vsynth/vsynth_lena-ffvhuff444p16
new file mode 100644
index 0000000000..3161b41976
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ffvhuff444p16
@@ -0,0 +1,4 @@
+94e2c25a08522071ca4d2314ddb2a4a1 *tests/data/fate/vsynth_lena-ffvhuff444p16.avi
+26360720 tests/data/fate/vsynth_lena-ffvhuff444p16.avi
+05ccd9a38f9726030b3099c0c99d3a13 *tests/data/fate/vsynth_lena-ffvhuff444p16.out.rawvideo
+stddev:    0.45 PSNR: 55.06 MAXDIFF:    7 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-flashsv b/tests/ref/vsynth/vsynth_lena-flashsv
new file mode 100644
index 0000000000..52046cdf2e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-flashsv
@@ -0,0 +1,4 @@
+0667077971e0cb63b5f49c580006e90e *tests/data/fate/vsynth_lena-flashsv.flv
+12368953 tests/data/fate/vsynth_lena-flashsv.flv
+3a984506f1ebfc9fb73b6814cab201cc *tests/data/fate/vsynth_lena-flashsv.out.rawvideo
+stddev:    0.66 PSNR: 51.73 MAXDIFF:   14 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-flashsv2 b/tests/ref/vsynth/vsynth_lena-flashsv2
new file mode 100644
index 0000000000..6186a1acc1
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-flashsv2
@@ -0,0 +1,4 @@
+01e0aa4da9ccc8e12fd03df63625eea4 *tests/data/fate/vsynth_lena-flashsv2.flv
+9291162 tests/data/fate/vsynth_lena-flashsv2.flv
+8f63e24049ba1789a7f8353c695a3d99 *tests/data/fate/vsynth_lena-flashsv2.out.rawvideo
+stddev:    2.39 PSNR: 40.55 MAXDIFF:   21 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-flv b/tests/ref/vsynth/vsynth_lena-flv
new file mode 100644
index 0000000000..e9f5e6b9f9
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-flv
@@ -0,0 +1,4 @@
+dee04bdab18c2eed81373faec89fd5a7 *tests/data/fate/vsynth_lena-flv.flv
+131380 tests/data/fate/vsynth_lena-flv.flv
+184034553ceb801bb1d1521d2d998a67 *tests/data/fate/vsynth_lena-flv.out.rawvideo
+stddev:    5.33 PSNR: 33.59 MAXDIFF:   79 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-h261 b/tests/ref/vsynth/vsynth_lena-h261
new file mode 100644
index 0000000000..2522ad938f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-h261
@@ -0,0 +1,4 @@
+9a2104849cbcf03a612e5906ef4d264b *tests/data/fate/vsynth_lena-h261.avi
+191064 tests/data/fate/vsynth_lena-h261.avi
+08f65e9aeeeaf189548c2bb417d5114f *tests/data/fate/vsynth_lena-h261.out.rawvideo
+stddev:    6.37 PSNR: 32.03 MAXDIFF:   77 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-h261-trellis b/tests/ref/vsynth/vsynth_lena-h261-trellis
new file mode 100644
index 0000000000..a306508032
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-h261-trellis
@@ -0,0 +1,4 @@
+41522be50f14b7fff6b1fb8d10b1ff00 *tests/data/fate/vsynth_lena-h261-trellis.avi
+184586 tests/data/fate/vsynth_lena-h261-trellis.avi
+f9df8cd110a2f3d9706dd2f29a1d0a89 *tests/data/fate/vsynth_lena-h261-trellis.out.rawvideo
+stddev:    6.32 PSNR: 32.11 MAXDIFF:   89 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-h263 b/tests/ref/vsynth/vsynth_lena-h263
new file mode 100644
index 0000000000..862231b7de
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-h263
@@ -0,0 +1,4 @@
+005cba8a5e8f10adc8973fd3c66ea236 *tests/data/fate/vsynth_lena-h263.avi
+160106 tests/data/fate/vsynth_lena-h263.avi
+b7d733ebedbaa04f49bf7493a907e223 *tests/data/fate/vsynth_lena-h263.out.rawvideo
+stddev:    5.43 PSNR: 33.42 MAXDIFF:   77 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-h263-obmc b/tests/ref/vsynth/vsynth_lena-h263-obmc
new file mode 100644
index 0000000000..5b963107f6
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-h263-obmc
@@ -0,0 +1,4 @@
+3c6946f808412ac320be9e0c36051ea2 *tests/data/fate/vsynth_lena-h263-obmc.avi
+154730 tests/data/fate/vsynth_lena-h263-obmc.avi
+588d992d9d8096da8bdc5027268da914 *tests/data/fate/vsynth_lena-h263-obmc.out.rawvideo
+stddev:    5.39 PSNR: 33.49 MAXDIFF:   82 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-h263p b/tests/ref/vsynth/vsynth_lena-h263p
new file mode 100644
index 0000000000..3aa8223a8d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-h263p
@@ -0,0 +1,4 @@
+de3a8bca32aba3bd5138cbb40fe0099e *tests/data/fate/vsynth_lena-h263p.avi
+868002 tests/data/fate/vsynth_lena-h263p.avi
+dca18571c05c13dd691d7b0b232e43fc *tests/data/fate/vsynth_lena-h263p.out.rawvideo
+stddev:    1.91 PSNR: 42.50 MAXDIFF:   19 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-huffyuv b/tests/ref/vsynth/vsynth_lena-huffyuv
new file mode 100644
index 0000000000..25dac4591d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-huffyuv
@@ -0,0 +1,4 @@
+e0027fb7a9ab8ac964bba02186b4a829 *tests/data/fate/vsynth_lena-huffyuv.avi
+6108514 tests/data/fate/vsynth_lena-huffyuv.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-huffyuv.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-huffyuvbgr24 b/tests/ref/vsynth/vsynth_lena-huffyuvbgr24
new file mode 100644
index 0000000000..6bb71fcf41
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-huffyuvbgr24
@@ -0,0 +1,4 @@
+baa4da184fd977f1d6040d63644cbd55 *tests/data/fate/vsynth_lena-huffyuvbgr24.avi
+8872414 tests/data/fate/vsynth_lena-huffyuvbgr24.avi
+0a8b7ddfec03622e37c869c5b552f9fc *tests/data/fate/vsynth_lena-huffyuvbgr24.out.rawvideo
+stddev:    1.24 PSNR: 46.26 MAXDIFF:   17 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-huffyuvbgra b/tests/ref/vsynth/vsynth_lena-huffyuvbgra
new file mode 100644
index 0000000000..509275da32
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-huffyuvbgra
@@ -0,0 +1,4 @@
+bf52b827c5fabea0949ce4776d3d66c8 *tests/data/fate/vsynth_lena-huffyuvbgra.avi
+10139602 tests/data/fate/vsynth_lena-huffyuvbgra.avi
+0a8b7ddfec03622e37c869c5b552f9fc *tests/data/fate/vsynth_lena-huffyuvbgra.out.rawvideo
+stddev:    1.24 PSNR: 46.26 MAXDIFF:   17 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-jpeg2000 b/tests/ref/vsynth/vsynth_lena-jpeg2000
new file mode 100644
index 0000000000..72550eb816
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-jpeg2000
@@ -0,0 +1,4 @@
+1f2cf6061c78905b8011091a9a7c425f *tests/data/fate/vsynth_lena-jpeg2000.avi
+1138054 tests/data/fate/vsynth_lena-jpeg2000.avi
+955653ca7a08447e7b1501b444f24562 *tests/data/fate/vsynth_lena-jpeg2000.out.rawvideo
+stddev:    4.40 PSNR: 35.25 MAXDIFF:   58 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-jpeg2000-97 b/tests/ref/vsynth/vsynth_lena-jpeg2000-97
new file mode 100644
index 0000000000..5c12665b66
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-jpeg2000-97
@@ -0,0 +1,4 @@
+e5a756e97910420c90e76259c56261cb *tests/data/fate/vsynth_lena-jpeg2000-97.avi
+1918956 tests/data/fate/vsynth_lena-jpeg2000-97.avi
+93a4ba0c230f2430a813df594676e58a *tests/data/fate/vsynth_lena-jpeg2000-97.out.rawvideo
+stddev:    2.84 PSNR: 39.04 MAXDIFF:   28 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-jpegls b/tests/ref/vsynth/vsynth_lena-jpegls
new file mode 100644
index 0000000000..72a619bc2b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-jpegls
@@ -0,0 +1,4 @@
+517b3a8d84f1ec5d502ddb9ed0bb8580 *tests/data/fate/vsynth_lena-jpegls.avi
+8334622 tests/data/fate/vsynth_lena-jpegls.avi
+3a984506f1ebfc9fb73b6814cab201cc *tests/data/fate/vsynth_lena-jpegls.out.rawvideo
+stddev:    0.66 PSNR: 51.73 MAXDIFF:   14 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ljpeg b/tests/ref/vsynth/vsynth_lena-ljpeg
new file mode 100644
index 0000000000..81f9cdbbf6
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-ljpeg
@@ -0,0 +1,4 @@
+dc136b224f01c757a887d5672d5edfd2 *tests/data/fate/vsynth_lena-ljpeg.avi
+4763458 tests/data/fate/vsynth_lena-ljpeg.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ljpeg.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mjpeg b/tests/ref/vsynth/vsynth_lena-mjpeg
new file mode 100644
index 0000000000..e30ddc7677
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mjpeg
@@ -0,0 +1,4 @@
+007c989af621445dc7c9bd248b9df3b4 *tests/data/fate/vsynth_lena-mjpeg.avi
+635498 tests/data/fate/vsynth_lena-mjpeg.avi
+9d4bd90e9abfa18192383b4adc23c8d4 *tests/data/fate/vsynth_lena-mjpeg.out.rawvideo
+stddev:    4.32 PSNR: 35.40 MAXDIFF:   49 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mjpeg-422 b/tests/ref/vsynth/vsynth_lena-mjpeg-422
new file mode 100644
index 0000000000..f94ae5815d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mjpeg-422
@@ -0,0 +1,4 @@
+e867bc5e8e4e4555846c61b3cb4580a6 *tests/data/fate/vsynth_lena-mjpeg-422.avi
+707376 tests/data/fate/vsynth_lena-mjpeg-422.avi
+451ac80989c4e14445cf951fd7f83b6d *tests/data/fate/vsynth_lena-mjpeg-422.out.rawvideo
+stddev:    4.18 PSNR: 35.70 MAXDIFF:   49 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mjpeg-444 b/tests/ref/vsynth/vsynth_lena-mjpeg-444
new file mode 100644
index 0000000000..cb4c0a12db
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mjpeg-444
@@ -0,0 +1,4 @@
+9a36b201c4f68051441b1ee1307a2cc2 *tests/data/fate/vsynth_lena-mjpeg-444.avi
+807628 tests/data/fate/vsynth_lena-mjpeg-444.avi
+34edcb9c87ff7aac456a4fb07f43504b *tests/data/fate/vsynth_lena-mjpeg-444.out.rawvideo
+stddev:    4.05 PSNR: 35.96 MAXDIFF:   49 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mjpeg-huffman b/tests/ref/vsynth/vsynth_lena-mjpeg-huffman
new file mode 100644
index 0000000000..6ac1b740a4
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mjpeg-huffman
@@ -0,0 +1,4 @@
+007c989af621445dc7c9bd248b9df3b4 *tests/data/fate/vsynth_lena-mjpeg-huffman.avi
+635498 tests/data/fate/vsynth_lena-mjpeg-huffman.avi
+9d4bd90e9abfa18192383b4adc23c8d4 *tests/data/fate/vsynth_lena-mjpeg-huffman.out.rawvideo
+stddev:    4.32 PSNR: 35.40 MAXDIFF:   49 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mjpeg-trell b/tests/ref/vsynth/vsynth_lena-mjpeg-trell
new file mode 100644
index 0000000000..86332b2010
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mjpeg-trell
@@ -0,0 +1,4 @@
+6eb36ab28a082f496f1f3bc165704a68 *tests/data/fate/vsynth_lena-mjpeg-trell.avi
+582534 tests/data/fate/vsynth_lena-mjpeg-trell.avi
+dcb183a6a5fa06e7234d46dd97ceb8ec *tests/data/fate/vsynth_lena-mjpeg-trell.out.rawvideo
+stddev:    4.51 PSNR: 35.05 MAXDIFF:   60 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mjpeg-trell-huffman b/tests/ref/vsynth/vsynth_lena-mjpeg-trell-huffman
new file mode 100644
index 0000000000..91fcd19994
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mjpeg-trell-huffman
@@ -0,0 +1,4 @@
+6eb36ab28a082f496f1f3bc165704a68 *tests/data/fate/vsynth_lena-mjpeg-trell-huffman.avi
+582534 tests/data/fate/vsynth_lena-mjpeg-trell-huffman.avi
+dcb183a6a5fa06e7234d46dd97ceb8ec *tests/data/fate/vsynth_lena-mjpeg-trell-huffman.out.rawvideo
+stddev:    4.51 PSNR: 35.05 MAXDIFF:   60 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mov-bgr24 b/tests/ref/vsynth/vsynth_lena-mov-bgr24
new file mode 100644
index 0000000000..3117bf2a8f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mov-bgr24
@@ -0,0 +1,4 @@
+f1eccd8c8719e3fabfe7855dad997699 *tests/data/fate/vsynth_lena-mov-bgr24.mov
+15207169 tests/data/fate/vsynth_lena-mov-bgr24.mov
+98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth_lena-mov-bgr24.out.rawvideo
+stddev:    1.26 PSNR: 46.10 MAXDIFF:   13 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mov-bpp15 b/tests/ref/vsynth/vsynth_lena-mov-bpp15
new file mode 100644
index 0000000000..2a7ddd6713
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mov-bpp15
@@ -0,0 +1,4 @@
+286e9e0712da1efb186a7228b6d4a177 *tests/data/fate/vsynth_lena-mov-bpp15.mov
+10138329 tests/data/fate/vsynth_lena-mov-bpp15.mov
+be0e64bdf519ce1097613063804eded9 *tests/data/fate/vsynth_lena-mov-bpp15.out.rawvideo
+stddev:    2.16 PSNR: 41.43 MAXDIFF:   17 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mov-bpp16 b/tests/ref/vsynth/vsynth_lena-mov-bpp16
new file mode 100644
index 0000000000..2c478b9046
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mov-bpp16
@@ -0,0 +1,4 @@
+1da4058a0cfb241d735ed46a0b18efa3 *tests/data/fate/vsynth_lena-mov-bpp16.mov
+10138329 tests/data/fate/vsynth_lena-mov-bpp16.mov
+789bfa1dc2a72f498928f2ae85e461c3 *tests/data/fate/vsynth_lena-mov-bpp16.out.rawvideo
+stddev:    1.76 PSNR: 43.18 MAXDIFF:   17 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg1 b/tests/ref/vsynth/vsynth_lena-mpeg1
new file mode 100644
index 0000000000..58539e5e39
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg1
@@ -0,0 +1,4 @@
+a77a8eb6e2ad32a5b20b41abda16f4c1 *tests/data/fate/vsynth_lena-mpeg1.mpeg1video
+192794 tests/data/fate/vsynth_lena-mpeg1.mpeg1video
+b3584042c60385e0fb988b8ec5b36409 *tests/data/fate/vsynth_lena-mpeg1.out.rawvideo
+stddev:    4.95 PSNR: 34.22 MAXDIFF:   57 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg1b b/tests/ref/vsynth/vsynth_lena-mpeg1b
new file mode 100644
index 0000000000..23fe024974
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg1b
@@ -0,0 +1,4 @@
+333395b113b8045bac4e3fd90839ca6a *tests/data/fate/vsynth_lena-mpeg1b.mpeg1video
+225201 tests/data/fate/vsynth_lena-mpeg1b.mpeg1video
+f17fb3eef4ed3d03eeaaee45b217f7a5 *tests/data/fate/vsynth_lena-mpeg1b.out.rawvideo
+stddev:    4.10 PSNR: 35.86 MAXDIFF:   59 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg2 b/tests/ref/vsynth/vsynth_lena-mpeg2
new file mode 100644
index 0000000000..699a47b652
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg2
@@ -0,0 +1,4 @@
+6071414a26d41ae9c4cc5477d8ca19eb *tests/data/fate/vsynth_lena-mpeg2.mpeg2video
+198673 tests/data/fate/vsynth_lena-mpeg2.mpeg2video
+9efe4846a75d9b7387d1e3bb1e5db29a *tests/data/fate/vsynth_lena-mpeg2.out.rawvideo
+stddev:    4.96 PSNR: 34.20 MAXDIFF:   59 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg2-422 b/tests/ref/vsynth/vsynth_lena-mpeg2-422
new file mode 100644
index 0000000000..5f11d4e7cd
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg2-422
@@ -0,0 +1,4 @@
+521ec92c0b8672011a43dd13db98c400 *tests/data/fate/vsynth_lena-mpeg2-422.mpeg2video
+356431 tests/data/fate/vsynth_lena-mpeg2-422.mpeg2video
+51ca353620f85db8b5b1c56f1a275add *tests/data/fate/vsynth_lena-mpeg2-422.out.rawvideo
+stddev:    3.15 PSNR: 38.14 MAXDIFF:   49 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg2-idct-int b/tests/ref/vsynth/vsynth_lena-mpeg2-idct-int
new file mode 100644
index 0000000000..35269dca14
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg2-idct-int
@@ -0,0 +1,4 @@
+505371e1b10f5af01b63b3f57606b26e *tests/data/fate/vsynth_lena-mpeg2-idct-int.mpeg2video
+198041 tests/data/fate/vsynth_lena-mpeg2-idct-int.mpeg2video
+92794e70e4a19a494f10efe353d9895d *tests/data/fate/vsynth_lena-mpeg2-idct-int.out.rawvideo
+stddev:    4.97 PSNR: 34.19 MAXDIFF:   58 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg2-ilace b/tests/ref/vsynth/vsynth_lena-mpeg2-ilace
new file mode 100644
index 0000000000..400be575bc
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg2-ilace
@@ -0,0 +1,4 @@
+dbc7dd0272f3711f50722f4753e3bfb0 *tests/data/fate/vsynth_lena-mpeg2-ilace.mpeg2video
+204576 tests/data/fate/vsynth_lena-mpeg2-ilace.mpeg2video
+d69be0d4ba1cb9c1fef9fb0d94a912ba *tests/data/fate/vsynth_lena-mpeg2-ilace.out.rawvideo
+stddev:    4.98 PSNR: 34.18 MAXDIFF:   65 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg2-ivlc-qprd b/tests/ref/vsynth/vsynth_lena-mpeg2-ivlc-qprd
new file mode 100644
index 0000000000..2112cd2fde
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg2-ivlc-qprd
@@ -0,0 +1,4 @@
+5731a196498d4e8097c0ebe57e383ef6 *tests/data/fate/vsynth_lena-mpeg2-ivlc-qprd.mpeg2video
+244694 tests/data/fate/vsynth_lena-mpeg2-ivlc-qprd.mpeg2video
+b26e21599dee48a174bdbc40b2817e55 *tests/data/fate/vsynth_lena-mpeg2-ivlc-qprd.out.rawvideo
+stddev:    4.15 PSNR: 35.76 MAXDIFF:   74 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg2-thread b/tests/ref/vsynth/vsynth_lena-mpeg2-thread
new file mode 100644
index 0000000000..01b60a3c1c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg2-thread
@@ -0,0 +1,4 @@
+9e734d384b4234d075203dffffa5174c *tests/data/fate/vsynth_lena-mpeg2-thread.mpeg2video
+179656 tests/data/fate/vsynth_lena-mpeg2-thread.mpeg2video
+f8f084b7f51fbe4f82d57b8aeec17edf *tests/data/fate/vsynth_lena-mpeg2-thread.out.rawvideo
+stddev:    4.72 PSNR: 34.65 MAXDIFF:   72 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg2-thread-ivlc b/tests/ref/vsynth/vsynth_lena-mpeg2-thread-ivlc
new file mode 100644
index 0000000000..2d0d42fd3f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg2-thread-ivlc
@@ -0,0 +1,4 @@
+39ae4e15e3da14218ebf250180badd92 *tests/data/fate/vsynth_lena-mpeg2-thread-ivlc.mpeg2video
+178807 tests/data/fate/vsynth_lena-mpeg2-thread-ivlc.mpeg2video
+f8f084b7f51fbe4f82d57b8aeec17edf *tests/data/fate/vsynth_lena-mpeg2-thread-ivlc.out.rawvideo
+stddev:    4.72 PSNR: 34.65 MAXDIFF:   72 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4 b/tests/ref/vsynth/vsynth_lena-mpeg4
new file mode 100644
index 0000000000..8d8cccef40
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg4
@@ -0,0 +1,4 @@
+4a029747434d24d128b078a5e6aa1e88 *tests/data/fate/vsynth_lena-mpeg4.mp4
+119722 tests/data/fate/vsynth_lena-mpeg4.mp4
+9a1e085d9e488c5ead0c940c9612a37a *tests/data/fate/vsynth_lena-mpeg4.out.rawvideo
+stddev:    5.34 PSNR: 33.57 MAXDIFF:   83 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4-adap b/tests/ref/vsynth/vsynth_lena-mpeg4-adap
new file mode 100644
index 0000000000..10af80b397
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg4-adap
@@ -0,0 +1,4 @@
+c6108621b1202d32dac68b1944c5b8c2 *tests/data/fate/vsynth_lena-mpeg4-adap.avi
+198500 tests/data/fate/vsynth_lena-mpeg4-adap.avi
+87b6dbe98d276137fceaae2fa672eced *tests/data/fate/vsynth_lena-mpeg4-adap.out.rawvideo
+stddev:    3.75 PSNR: 36.65 MAXDIFF:   71 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4-adv b/tests/ref/vsynth/vsynth_lena-mpeg4-adv
new file mode 100644
index 0000000000..c725264553
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg4-adv
@@ -0,0 +1,4 @@
+68117f01abe704a4ce6a664efffcfb40 *tests/data/fate/vsynth_lena-mpeg4-adv.avi
+141538 tests/data/fate/vsynth_lena-mpeg4-adv.avi
+3f3a21e9db85a9c0f7022f557a5374c1 *tests/data/fate/vsynth_lena-mpeg4-adv.out.rawvideo
+stddev:    4.94 PSNR: 34.25 MAXDIFF:   69 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4-error b/tests/ref/vsynth/vsynth_lena-mpeg4-error
new file mode 100644
index 0000000000..b5ebd5e010
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg4-error
@@ -0,0 +1,4 @@
+0126f46feb09b49144136be09ce6d26b *tests/data/fate/vsynth_lena-mpeg4-error.avi
+180368 tests/data/fate/vsynth_lena-mpeg4-error.avi
+4537ba5320f1ae0971cc6e329c366776 *tests/data/fate/vsynth_lena-mpeg4-error.out.rawvideo
+stddev:    7.65 PSNR: 30.45 MAXDIFF:  158 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4-nr b/tests/ref/vsynth/vsynth_lena-mpeg4-nr
new file mode 100644
index 0000000000..e6b5dc4d18
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg4-nr
@@ -0,0 +1,4 @@
+c1cf10bd999899bce94be0efd15c3605 *tests/data/fate/vsynth_lena-mpeg4-nr.avi
+154998 tests/data/fate/vsynth_lena-mpeg4-nr.avi
+d89cd5d0b1707f48fa9c4747c66d2d56 *tests/data/fate/vsynth_lena-mpeg4-nr.out.rawvideo
+stddev:    4.73 PSNR: 34.63 MAXDIFF:   64 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4-nsse b/tests/ref/vsynth/vsynth_lena-mpeg4-nsse
new file mode 100644
index 0000000000..31cddaa689
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg4-nsse
@@ -0,0 +1,4 @@
+f09593231b2137ae2064845c315b6a0b *tests/data/fate/vsynth_lena-mpeg4-nsse.avi
+198438 tests/data/fate/vsynth_lena-mpeg4-nsse.avi
+59864a1050e641eaed8b0ee077bc780b *tests/data/fate/vsynth_lena-mpeg4-nsse.out.rawvideo
+stddev:    4.32 PSNR: 35.40 MAXDIFF:   60 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4-qpel b/tests/ref/vsynth/vsynth_lena-mpeg4-qpel
new file mode 100644
index 0000000000..e656130255
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg4-qpel
@@ -0,0 +1,4 @@
+04d020deb9956fb2b5970a16986d688c *tests/data/fate/vsynth_lena-mpeg4-qpel.avi
+163666 tests/data/fate/vsynth_lena-mpeg4-qpel.avi
+e2ce994dbb66da51c2e1ad26617d7c2f *tests/data/fate/vsynth_lena-mpeg4-qpel.out.rawvideo
+stddev:    3.97 PSNR: 36.14 MAXDIFF:   54 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4-qprd b/tests/ref/vsynth/vsynth_lena-mpeg4-qprd
new file mode 100644
index 0000000000..831300b994
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg4-qprd
@@ -0,0 +1,4 @@
+5342abedb8fdc788e08c344d4122f2dc *tests/data/fate/vsynth_lena-mpeg4-qprd.avi
+231454 tests/data/fate/vsynth_lena-mpeg4-qprd.avi
+3071250e0864546c2455c9f9c9b8604e *tests/data/fate/vsynth_lena-mpeg4-qprd.out.rawvideo
+stddev:    3.71 PSNR: 36.72 MAXDIFF:   61 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4-rc b/tests/ref/vsynth/vsynth_lena-mpeg4-rc
new file mode 100644
index 0000000000..fd6a998046
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg4-rc
@@ -0,0 +1,4 @@
+396a76466dee56e2714dfa42cebe3d2d *tests/data/fate/vsynth_lena-mpeg4-rc.avi
+226314 tests/data/fate/vsynth_lena-mpeg4-rc.avi
+6e8b62e8c3bcbfdcc58afb69a0b1c4e3 *tests/data/fate/vsynth_lena-mpeg4-rc.out.rawvideo
+stddev:    4.23 PSNR: 35.60 MAXDIFF:   85 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpeg4-thread b/tests/ref/vsynth/vsynth_lena-mpeg4-thread
new file mode 100644
index 0000000000..c0b7978b67
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpeg4-thread
@@ -0,0 +1,4 @@
+af5ea0bab124371051eb104552344b2e *tests/data/fate/vsynth_lena-mpeg4-thread.avi
+250096 tests/data/fate/vsynth_lena-mpeg4-thread.avi
+045fe9f226bbcc3d41644bffaed03b31 *tests/data/fate/vsynth_lena-mpeg4-thread.out.rawvideo
+stddev:    3.69 PSNR: 36.78 MAXDIFF:   65 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-mpng b/tests/ref/vsynth/vsynth_lena-mpng
new file mode 100644
index 0000000000..20258433b0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-mpng
@@ -0,0 +1,4 @@
+319ca02f8465a9c53128442f4b0dd528 *tests/data/fate/vsynth_lena-mpng.avi
+12558334 tests/data/fate/vsynth_lena-mpng.avi
+98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth_lena-mpng.out.rawvideo
+stddev:    1.26 PSNR: 46.10 MAXDIFF:   13 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-msmpeg4 b/tests/ref/vsynth/vsynth_lena-msmpeg4
new file mode 100644
index 0000000000..37bf7916e0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-msmpeg4
@@ -0,0 +1,4 @@
+9f48dd3b88a931ba25963a02d33261ca *tests/data/fate/vsynth_lena-msmpeg4.avi
+127664 tests/data/fate/vsynth_lena-msmpeg4.avi
+bb14902d5850d6b0ab70fdb017855775 *tests/data/fate/vsynth_lena-msmpeg4.out.rawvideo
+stddev:    5.33 PSNR: 33.58 MAXDIFF:   78 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-msmpeg4v2 b/tests/ref/vsynth/vsynth_lena-msmpeg4v2
new file mode 100644
index 0000000000..c355eacd14
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-msmpeg4v2
@@ -0,0 +1,4 @@
+7e3376dea39d44edd6ee3b0a59a87cbd *tests/data/fate/vsynth_lena-msmpeg4v2.avi
+129922 tests/data/fate/vsynth_lena-msmpeg4v2.avi
+537c114e1d47c54a4bccd31f4073e9bd *tests/data/fate/vsynth_lena-msmpeg4v2.out.rawvideo
+stddev:    5.33 PSNR: 33.59 MAXDIFF:   79 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-msvideo1 b/tests/ref/vsynth/vsynth_lena-msvideo1
new file mode 100644
index 0000000000..4f7de4010d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-msvideo1
@@ -0,0 +1,4 @@
+f2d42ddffd6546b6ca71bbb6e3b62c00 *tests/data/fate/vsynth_lena-msvideo1.avi
+914564 tests/data/fate/vsynth_lena-msvideo1.avi
+9a6ac7c0171286f009d159b59fdc1154 *tests/data/fate/vsynth_lena-msvideo1.out.rawvideo
+stddev:    7.97 PSNR: 30.10 MAXDIFF:  123 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-prores b/tests/ref/vsynth/vsynth_lena-prores
new file mode 100644
index 0000000000..5b8c3fe1b4
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-prores
@@ -0,0 +1,4 @@
+637f34b5fd81f072f76a967595fa6af7 *tests/data/fate/vsynth_lena-prores.mov
+2844076 tests/data/fate/vsynth_lena-prores.mov
+03fd29e3963716a09d232b6f817ecb57 *tests/data/fate/vsynth_lena-prores.out.rawvideo
+stddev:    1.31 PSNR: 45.77 MAXDIFF:   11 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-prores_ks b/tests/ref/vsynth/vsynth_lena-prores_ks
new file mode 100644
index 0000000000..0cdfa9bb2c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-prores_ks
@@ -0,0 +1,4 @@
+b03741c69037cbdcd2809278c00c0350 *tests/data/fate/vsynth_lena-prores_ks.mov
+3884596 tests/data/fate/vsynth_lena-prores_ks.mov
+6cfe987de99cf8ac9d43bdc5cd150838 *tests/data/fate/vsynth_lena-prores_ks.out.rawvideo
+stddev:    0.92 PSNR: 48.78 MAXDIFF:   10 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-qtrle b/tests/ref/vsynth/vsynth_lena-qtrle
new file mode 100644
index 0000000000..9ce6abe5ba
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-qtrle
@@ -0,0 +1,4 @@
+4863978263d966d704ffaaa6d23123bb *tests/data/fate/vsynth_lena-qtrle.mov
+14798345 tests/data/fate/vsynth_lena-qtrle.mov
+98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth_lena-qtrle.out.rawvideo
+stddev:    1.26 PSNR: 46.10 MAXDIFF:   13 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-qtrlegray b/tests/ref/vsynth/vsynth_lena-qtrlegray
new file mode 100644
index 0000000000..951e7a7688
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-qtrlegray
@@ -0,0 +1,4 @@
+2c4e69b59d8e8e19903c843575806d5f *tests/data/fate/vsynth_lena-qtrlegray.mov
+5111283 tests/data/fate/vsynth_lena-qtrlegray.mov
+d7bfbe259af9ae323bb94b09c33570a5 *tests/data/fate/vsynth_lena-qtrlegray.out.rawvideo
+stddev:   18.65 PSNR: 22.72 MAXDIFF:   72 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-r210 b/tests/ref/vsynth/vsynth_lena-r210
new file mode 100644
index 0000000000..8fd1a666af
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-r210
@@ -0,0 +1,4 @@
+94874a48987fd401494f4d7ca8e1273b *tests/data/fate/vsynth_lena-r210.avi
+22125252 tests/data/fate/vsynth_lena-r210.avi
+6ea4fcd93fc83defc8770e85b64b60bb *tests/data/fate/vsynth_lena-r210.out.rawvideo
+stddev:    0.70 PSNR: 51.12 MAXDIFF:   12 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-rgb b/tests/ref/vsynth/vsynth_lena-rgb
new file mode 100644
index 0000000000..f3d232e76c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-rgb
@@ -0,0 +1,4 @@
+6ffbbd6939b3fe9f5dcf036ee46aad2d *tests/data/fate/vsynth_lena-rgb.avi
+15213252 tests/data/fate/vsynth_lena-rgb.avi
+98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth_lena-rgb.out.rawvideo
+stddev:    1.26 PSNR: 46.10 MAXDIFF:   13 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-roqvideo b/tests/ref/vsynth/vsynth_lena-roqvideo
new file mode 100644
index 0000000000..10f2014089
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-roqvideo
@@ -0,0 +1,4 @@
+1a43cd71c91f2ef42d11a81419bff3bd *tests/data/fate/vsynth_lena-roqvideo.roq
+94810 tests/data/fate/vsynth_lena-roqvideo.roq
+97cda6096430c0ab7a43a0e120cd3e91 *tests/data/fate/vsynth_lena-roqvideo.out.rawvideo
+stddev:    3.81 PSNR: 36.50 MAXDIFF:   49 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-rv10 b/tests/ref/vsynth/vsynth_lena-rv10
new file mode 100644
index 0000000000..651587b55e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-rv10
@@ -0,0 +1,4 @@
+33a2aae3351b0b2121f823057c0e226f *tests/data/fate/vsynth_lena-rv10.rm
+154321 tests/data/fate/vsynth_lena-rv10.rm
+b7d733ebedbaa04f49bf7493a907e223 *tests/data/fate/vsynth_lena-rv10.out.rawvideo
+stddev:    5.43 PSNR: 33.42 MAXDIFF:   77 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-rv20 b/tests/ref/vsynth/vsynth_lena-rv20
new file mode 100644
index 0000000000..b8b6adfd04
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-rv20
@@ -0,0 +1,4 @@
+4d23a72fe7e29f98f38888804eacd111 *tests/data/fate/vsynth_lena-rv20.rm
+153304 tests/data/fate/vsynth_lena-rv20.rm
+6fa5dc1c2f00f858fc4895ad640891a2 *tests/data/fate/vsynth_lena-rv20.out.rawvideo
+stddev:    5.48 PSNR: 33.35 MAXDIFF:   81 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-snow b/tests/ref/vsynth/vsynth_lena-snow
new file mode 100644
index 0000000000..ec29a78483
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-snow
@@ -0,0 +1,4 @@
+8e96f337e8f4ccac7d72ef517e1d2208 *tests/data/fate/vsynth_lena-snow.avi
+57680 tests/data/fate/vsynth_lena-snow.avi
+90963cfd2359d460001c94d94256dc2b *tests/data/fate/vsynth_lena-snow.out.rawvideo
+stddev:   10.48 PSNR: 27.72 MAXDIFF:  119 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-snow-hpel b/tests/ref/vsynth/vsynth_lena-snow-hpel
new file mode 100644
index 0000000000..2d6edd8a79
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-snow-hpel
@@ -0,0 +1,4 @@
+56b14cb1cbb637536233982e87f7ac3e *tests/data/fate/vsynth_lena-snow-hpel.avi
+61764 tests/data/fate/vsynth_lena-snow-hpel.avi
+244b0266127fa354d8485234b2c388e4 *tests/data/fate/vsynth_lena-snow-hpel.out.rawvideo
+stddev:   10.45 PSNR: 27.74 MAXDIFF:  119 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-snow-ll b/tests/ref/vsynth/vsynth_lena-snow-ll
new file mode 100644
index 0000000000..aa8566f7e0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-snow-ll
@@ -0,0 +1,4 @@
+c0b349dadc1d1714960df23b7c92961c *tests/data/fate/vsynth_lena-snow-ll.avi
+2721750 tests/data/fate/vsynth_lena-snow-ll.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-snow-ll.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-svq1 b/tests/ref/vsynth/vsynth_lena-svq1
new file mode 100644
index 0000000000..1558c504fb
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-svq1
@@ -0,0 +1,4 @@
+6e9678439ab7460db1fcc8e41ca1a1e0 *tests/data/fate/vsynth_lena-svq1.mov
+766701 tests/data/fate/vsynth_lena-svq1.mov
+aa03471dac3f49455a33a2b19fda1098 *tests/data/fate/vsynth_lena-svq1.out.rawvideo
+stddev:    3.23 PSNR: 37.93 MAXDIFF:   61 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-v210 b/tests/ref/vsynth/vsynth_lena-v210
new file mode 100644
index 0000000000..549bf43fe1
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-v210
@@ -0,0 +1,4 @@
+0e0db58fa269cffbfb15f81277fa2828 *tests/data/fate/vsynth_lena-v210.avi
+14752452 tests/data/fate/vsynth_lena-v210.avi
+7ba6e411e43c6b57c95c49d6848f41e6 *tests/data/fate/vsynth_lena-v210.out.rawvideo
+stddev:    0.34 PSNR: 57.41 MAXDIFF:    6 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-v210-10 b/tests/ref/vsynth/vsynth_lena-v210-10
new file mode 100644
index 0000000000..9541b57d7f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-v210-10
@@ -0,0 +1,4 @@
+0d638c575c7784c2d445f7f7e3b889bc *tests/data/fate/vsynth_lena-v210-10.avi
+14752452 tests/data/fate/vsynth_lena-v210-10.avi
+a627fb50c8276200fd71383977d87ca3 *tests/data/fate/vsynth_lena-v210-10.out.rawvideo
+stddev:    0.34 PSNR: 57.43 MAXDIFF:    6 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-v308 b/tests/ref/vsynth/vsynth_lena-v308
new file mode 100644
index 0000000000..81766df82f
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-v308
@@ -0,0 +1,4 @@
+eabb002088244fa802b67aea78271641 *tests/data/fate/vsynth_lena-v308.avi
+15213252 tests/data/fate/vsynth_lena-v308.avi
+d43cb310c130c69214332d74f6ee5f9a *tests/data/fate/vsynth_lena-v308.out.rawvideo
+stddev:    0.41 PSNR: 55.80 MAXDIFF:    7 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-v408 b/tests/ref/vsynth/vsynth_lena-v408
new file mode 100644
index 0000000000..2c67dcdac8
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-v408
@@ -0,0 +1,4 @@
+ba166cd36099177b3942b16cd2c200fc *tests/data/fate/vsynth_lena-v408.avi
+20282052 tests/data/fate/vsynth_lena-v408.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-v408.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-vc2-420p b/tests/ref/vsynth/vsynth_lena-vc2-420p
new file mode 100644
index 0000000000..89966c2a54
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-vc2-420p
@@ -0,0 +1,4 @@
+b920eaf484af9ed3fbff4a85d043b544 *tests/data/fate/vsynth_lena-vc2-420p.mov
+849735 tests/data/fate/vsynth_lena-vc2-420p.mov
+b1c660113acab8eb4075f3d9fbb9cee9 *tests/data/fate/vsynth_lena-vc2-420p.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-vc2-420p10 b/tests/ref/vsynth/vsynth_lena-vc2-420p10
new file mode 100644
index 0000000000..2558ef8e9b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-vc2-420p10
@@ -0,0 +1,4 @@
+5bccec653c330f03b90065a84fad9b4b *tests/data/fate/vsynth_lena-vc2-420p10.mov
+1154775 tests/data/fate/vsynth_lena-vc2-420p10.mov
+b1c660113acab8eb4075f3d9fbb9cee9 *tests/data/fate/vsynth_lena-vc2-420p10.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-vc2-420p12 b/tests/ref/vsynth/vsynth_lena-vc2-420p12
new file mode 100644
index 0000000000..bc60116ffe
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-vc2-420p12
@@ -0,0 +1,4 @@
+d27a6d3517cc9a6d22e338f4b206545c *tests/data/fate/vsynth_lena-vc2-420p12.mov
+1516759 tests/data/fate/vsynth_lena-vc2-420p12.mov
+b1c660113acab8eb4075f3d9fbb9cee9 *tests/data/fate/vsynth_lena-vc2-420p12.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-vc2-422p b/tests/ref/vsynth/vsynth_lena-vc2-422p
new file mode 100644
index 0000000000..6f958387c1
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-vc2-422p
@@ -0,0 +1,4 @@
+94d3a24e9eec6cb88c84780796adbec5 *tests/data/fate/vsynth_lena-vc2-422p.mov
+1049287 tests/data/fate/vsynth_lena-vc2-422p.mov
+c4b2e69278c822f22655344068ea486d *tests/data/fate/vsynth_lena-vc2-422p.out.rawvideo
+stddev:    0.26 PSNR: 59.82 MAXDIFF:    5 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-vc2-422p10 b/tests/ref/vsynth/vsynth_lena-vc2-422p10
new file mode 100644
index 0000000000..11904c2d8e
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-vc2-422p10
@@ -0,0 +1,4 @@
+fc955b863eb3f22694d37e8a70085a6c *tests/data/fate/vsynth_lena-vc2-422p10.mov
+1294039 tests/data/fate/vsynth_lena-vc2-422p10.mov
+e5ea17416bda234ae58f27dea27e8135 *tests/data/fate/vsynth_lena-vc2-422p10.out.rawvideo
+stddev:    0.30 PSNR: 58.58 MAXDIFF:    5 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-vc2-422p12 b/tests/ref/vsynth/vsynth_lena-vc2-422p12
new file mode 100644
index 0000000000..51a62d0cc8
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-vc2-422p12
@@ -0,0 +1,4 @@
+2cef57ce35f32642c829f24a0ca3e260 *tests/data/fate/vsynth_lena-vc2-422p12.mov
+1768027 tests/data/fate/vsynth_lena-vc2-422p12.mov
+bd374304997834410a69ee6c6e047d19 *tests/data/fate/vsynth_lena-vc2-422p12.out.rawvideo
+stddev:    0.29 PSNR: 58.76 MAXDIFF:    5 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-vc2-444p b/tests/ref/vsynth/vsynth_lena-vc2-444p
new file mode 100644
index 0000000000..bf779181f9
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-vc2-444p
@@ -0,0 +1,4 @@
+cbdf2421fdd6cf0789c1f308009666f6 *tests/data/fate/vsynth_lena-vc2-444p.mov
+1174738 tests/data/fate/vsynth_lena-vc2-444p.mov
+f9306b14ff827ced1a992301d1ab02ca *tests/data/fate/vsynth_lena-vc2-444p.out.rawvideo
+stddev:    0.38 PSNR: 56.43 MAXDIFF:    6 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-vc2-444p10 b/tests/ref/vsynth/vsynth_lena-vc2-444p10
new file mode 100644
index 0000000000..10a33e22db
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-vc2-444p10
@@ -0,0 +1,4 @@
+acda7042ecc5b917824d9cf62ee3b46c *tests/data/fate/vsynth_lena-vc2-444p10.mov
+1577815 tests/data/fate/vsynth_lena-vc2-444p10.mov
+da13c67fe1c6d98dd73e92a6ba006edc *tests/data/fate/vsynth_lena-vc2-444p10.out.rawvideo
+stddev:    0.42 PSNR: 55.56 MAXDIFF:    7 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-vc2-444p12 b/tests/ref/vsynth/vsynth_lena-vc2-444p12
new file mode 100644
index 0000000000..7d6c21161c
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-vc2-444p12
@@ -0,0 +1,4 @@
+a31f2e6a54896fb8c02272c9f50db716 *tests/data/fate/vsynth_lena-vc2-444p12.mov
+2134875 tests/data/fate/vsynth_lena-vc2-444p12.mov
+a505434ec95362772a57d274f63a3f5a *tests/data/fate/vsynth_lena-vc2-444p12.out.rawvideo
+stddev:    0.42 PSNR: 55.58 MAXDIFF:    7 bytes:  7603200/   760320
diff --git a/tests/ref/vsynth/vsynth_lena-wmv1 b/tests/ref/vsynth/vsynth_lena-wmv1
new file mode 100644
index 0000000000..f407d17f7b
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-wmv1
@@ -0,0 +1,4 @@
+a9f43b25c3235a6cf922a2c5abd086e8 *tests/data/fate/vsynth_lena-wmv1.avi
+129514 tests/data/fate/vsynth_lena-wmv1.avi
+dec44e3c04db4fef49a7728f164d9159 *tests/data/fate/vsynth_lena-wmv1.out.rawvideo
+stddev:    5.33 PSNR: 33.60 MAXDIFF:   77 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-wmv2 b/tests/ref/vsynth/vsynth_lena-wmv2
new file mode 100644
index 0000000000..fca01993c0
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-wmv2
@@ -0,0 +1,4 @@
+62ef27d48181d8256ad476e02c536145 *tests/data/fate/vsynth_lena-wmv2.avi
+129856 tests/data/fate/vsynth_lena-wmv2.avi
+b4de16a0d302c52702f7a4362da989bc *tests/data/fate/vsynth_lena-wmv2.out.rawvideo
+stddev:    5.33 PSNR: 33.59 MAXDIFF:   77 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-xface b/tests/ref/vsynth/vsynth_lena-xface
new file mode 100644
index 0000000000..a38fed53cd
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-xface
@@ -0,0 +1,4 @@
+0dd4e19b989cb102ffb06768740d940f *tests/data/fate/vsynth_lena-xface.nut
+17551 tests/data/fate/vsynth_lena-xface.nut
+88ff6155a8b88872e6581d08febdb050 *tests/data/fate/vsynth_lena-xface.out.rawvideo
+stddev:   99.20 PSNR:  8.20 MAXDIFF:  238 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-y41p b/tests/ref/vsynth/vsynth_lena-y41p
new file mode 100644
index 0000000000..325d752073
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-y41p
@@ -0,0 +1,4 @@
+159548ec0881286674e4a1bd75b89f9e *tests/data/fate/vsynth_lena-y41p.avi
+7610052 tests/data/fate/vsynth_lena-y41p.avi
+d27a84ccdac09055724d122e03fea82a *tests/data/fate/vsynth_lena-y41p.out.rawvideo
+stddev:    1.07 PSNR: 47.54 MAXDIFF:   21 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-yuv b/tests/ref/vsynth/vsynth_lena-yuv
new file mode 100644
index 0000000000..645ef8bb8d
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-yuv
@@ -0,0 +1,4 @@
+2f4102cd4375383c0a3b6114a502996f *tests/data/fate/vsynth_lena-yuv.avi
+7610052 tests/data/fate/vsynth_lena-yuv.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-yuv.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-yuv4 b/tests/ref/vsynth/vsynth_lena-yuv4
new file mode 100644
index 0000000000..97a1374a67
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-yuv4
@@ -0,0 +1,4 @@
+0686b8b4cbd3398f8b9f9d8c12922442 *tests/data/fate/vsynth_lena-yuv4.avi
+7610052 tests/data/fate/vsynth_lena-yuv4.avi
+dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-yuv4.out.rawvideo
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-zlib b/tests/ref/vsynth/vsynth_lena-zlib
new file mode 100644
index 0000000000..009bcad853
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-zlib
@@ -0,0 +1,4 @@
+abbfccc551b173a357024d8392de21dd *tests/data/fate/vsynth_lena-zlib.avi
+12517180 tests/data/fate/vsynth_lena-zlib.avi
+98d0e2854731472c5bf13d8638502d0a *tests/data/fate/vsynth_lena-zlib.out.rawvideo
+stddev:    1.26 PSNR: 46.10 MAXDIFF:   13 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth/vsynth_lena-zmbv b/tests/ref/vsynth/vsynth_lena-zmbv
new file mode 100644
index 0000000000..e6c994f844
--- /dev/null
+++ b/tests/ref/vsynth/vsynth_lena-zmbv
@@ -0,0 +1,4 @@
+e9cc761eb3fedc36ce5f97744196ed8b *tests/data/fate/vsynth_lena-zmbv.avi
+1808720 tests/data/fate/vsynth_lena-zmbv.avi
+ee68a5292fd0745834246b4ec0d85e9b *tests/data/fate/vsynth_lena-zmbv.out.rawvideo
+stddev:    8.12 PSNR: 29.94 MAXDIFF:   32 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth1/cljr b/tests/ref/vsynth1/cljr
new file mode 100644
index 0000000000..6002bbbbb6
--- /dev/null
+++ b/tests/ref/vsynth1/cljr
@@ -0,0 +1,4 @@
+041982e4fa83428c621a127647d47b3f *./tests/data/vsynth1/cljr.avi
+5075660 ./tests/data/vsynth1/cljr.avi
+e1c4c96c74de3435d0f9f6118c5ed9b5 *./tests/data/cljr.vsynth1.out.yuv
+stddev:   30.53 PSNR: 18.43 MAXDIFF:  225 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth1/yuv b/tests/ref/vsynth1/yuv
new file mode 100644
index 0000000000..6d8b1431db
--- /dev/null
+++ b/tests/ref/vsynth1/yuv
@@ -0,0 +1,4 @@
+eaa66c3b27a2602e882befe154a8b119 *./tests/data/vsynth1/yuv.avi
+7610060 ./tests/data/vsynth1/yuv.avi
+c5ccac874dbf808e9088bc3107860042 *./tests/data/yuv.vsynth1.out.yuv
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth_lena/cljr b/tests/ref/vsynth_lena/cljr
new file mode 100644
index 0000000000..e3bbc05f4b
--- /dev/null
+++ b/tests/ref/vsynth_lena/cljr
@@ -0,0 +1,4 @@
+fdc1926e0a599de94513f0a3472b598f *./tests/data/vsynth_lena/cljr.avi
+5075660 ./tests/data/vsynth_lena/cljr.avi
+7df03229ee6361ea11a0d83d4926cb10 *./tests/data/cljr.vsynth_lena.out.yuv
+stddev:   10.30 PSNR: 27.87 MAXDIFF:   65 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth_lena/huffyuv b/tests/ref/vsynth_lena/huffyuv
new file mode 100644
index 0000000000..c0e374d615
--- /dev/null
+++ b/tests/ref/vsynth_lena/huffyuv
@@ -0,0 +1,4 @@
+ed66182be0d515e8b6cb970ad63162da *./tests/data/vsynth_lena/huffyuv.avi
+6455232 ./tests/data/vsynth_lena/huffyuv.avi
+dde5895817ad9d219f79a52d0bdfb001 *./tests/data/huffyuv.vsynth_lena.out.yuv
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/ref/vsynth_lena/yuv b/tests/ref/vsynth_lena/yuv
new file mode 100644
index 0000000000..eff44c3276
--- /dev/null
+++ b/tests/ref/vsynth_lena/yuv
@@ -0,0 +1,4 @@
+3d5ee6d2023bc15bba898819e4977e46 *./tests/data/vsynth_lena/yuv.avi
+7610060 ./tests/data/vsynth_lena/yuv.avi
+dde5895817ad9d219f79a52d0bdfb001 *./tests/data/yuv.vsynth_lena.out.yuv
+stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  7603200/  7603200
diff --git a/tests/refcmp-metadata.awk b/tests/refcmp-metadata.awk
new file mode 100644
index 0000000000..fa21aad0e0
--- /dev/null
+++ b/tests/refcmp-metadata.awk
@@ -0,0 +1,64 @@
+# Compare metadata filter output containing float value strings to reference
+# output data. Returns the whole reference data if delta of each value is below
+# threshold, else returns the whole input data.
+
+function abs(val) {
+    return ((val < 0.0) ? -val : val);
+}
+
+function max(val1, val2) {
+    return ((val1 >= val2) ? val1 : val2);
+}
+
+function is_numeric_str(str) {
+    return (str ~ /^[+-]?[0-9]*\.?[0-9]+$/);
+}
+
+BEGIN {
+    FS = "=";
+    # check for "fuzz" (threshold) program parameter, else use default
+    if (fuzz <= 0.0) {
+        fuzz = 0.1;
+    }
+    # check for "ref" (reference file) program parameter
+    if (ref) {
+        ref_nr = 0;
+        while ((getline line < ref) > 0) {
+            ref_nr++;
+            ref_lines[ref_nr] = line;
+            if (split(line, fields) == 2 && is_numeric_str(fields[2])) {
+                ref_keys[ref_nr] = fields[1];
+                ref_vals[ref_nr] = fields[2] + 0;  # convert to number
+            }
+        }
+        close(ref);
+    }
+    delta_max = 0;
+    result = (ref ? 1 : 0);
+}
+
+{
+    cmp_lines[NR] = $0;
+    if (NF == 2 && is_numeric_str($2) && ref_vals[NR]) {
+        val = $2 + 0;  # convert to number
+        delta = abs((val / ref_vals[NR]) - 1);
+        delta_max = max(delta_max, delta);
+        result = result && ($1 == ref_keys[NR]) && (delta <= fuzz);
+    } else {
+        result = result && ($0 == ref_lines[NR]);
+    }
+}
+
+END {
+    if (result) {
+        for (i = 1; i <= ref_nr; i++)
+            print ref_lines[i];
+    } else {
+        for (i = 1; i <= NR; i++)
+            print cmp_lines[i];
+        if (NR != ref_nr)
+            print "[refcmp] lines: " NR " != " ref_nr > "/dev/stderr";
+        if (delta_max >= fuzz)
+            print "[refcmp] delta_max: " delta_max " >= " fuzz > "/dev/stderr";
+    }
+}
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 3728d44980..0c7d34bea3 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# common regression functions for avconv
+# common regression functions for ffmpeg
 #
 #
 
@@ -11,6 +11,7 @@ target_exec=$4
 target_path=$5
 threads=${6:-1}
 cpuflags=${8:-all}
+target_samples=$9
 
 datadir="./tests/data"
 target_datadir="${target_path}/${datadir}"
@@ -18,11 +19,13 @@ target_datadir="${target_path}/${datadir}"
 this="$test.$test_ref"
 outfile="$datadir/$test_ref/"
 
-# various files
-avconv="$target_exec ${target_path}/avconv"
+ # various files
+ffmpeg="$target_exec ${target_path}/ffmpeg${PROGSUF}"
 raw_src="${target_path}/$raw_src_dir/%02d.pgm"
 raw_dst="$datadir/$this.out.yuv"
 pcm_src="$target_datadir/asynth1.sw"
+pcm_src_1ch="$target_datadir/asynth-16000-1.wav"
+pcm_ref_1ch="$datadir/$test_ref-16000-1.ref.wav"
 crcfile="$datadir/$this.crc"
 target_crcfile="$target_datadir/$this.crc"
 
@@ -40,15 +43,15 @@ echov(){
 
 . $(dirname $0)/md5.sh
 
-AVCONV_OPTS="-nostats -y -cpuflags $cpuflags"
+AVCONV_OPTS="-nostdin -nostats -y -cpuflags $cpuflags"
 COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact"
 DEC_OPTS="$COMMON_OPTS -threads $threads"
-ENC_OPTS="$COMMON_OPTS -threads 1 -dct fastint"
+ENC_OPTS="$COMMON_OPTS -threads $threads -dct fastint"
 
 run_avconv()
 {
-    $echov $avconv $AVCONV_OPTS $*
-    $avconv $AVCONV_OPTS $*
+    $echov $ffmpeg $AVCONV_OPTS $*
+    $ffmpeg $AVCONV_OPTS $*
 }
 
 do_avconv()
@@ -61,6 +64,21 @@ do_avconv()
     echo $(wc -c $f)
 }
 
+do_avconv_nomd5()
+{
+    f="$1"
+    shift
+    set -- $* ${target_path}/$f
+    run_avconv $*
+    if [ $f = $raw_dst ] ; then
+        $tiny_psnr $f $raw_ref
+    elif [ $f = $pcm_dst ] ; then
+        $tiny_psnr $f $pcm_ref 2
+    else
+        echo $(wc -c $f)
+    fi
+}
+
 do_avconv_crc()
 {
     f="$1"
diff --git a/tests/rotozoom.c b/tests/rotozoom.c
index 69c88c2e95..cfa7f81369 100644
--- a/tests/rotozoom.c
+++ b/tests/rotozoom.c
@@ -3,20 +3,20 @@
  *
  * copyright (c) Sebastien Bechet <s.bechet@av7.net>
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * 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.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
diff --git a/tests/simple1.ffconcat b/tests/simple1.ffconcat
new file mode 100644
index 0000000000..0a754af421
--- /dev/null
+++ b/tests/simple1.ffconcat
@@ -0,0 +1,12 @@
+ffconcat version 1.0
+
+file      %SRCFILE%
+
+file      %SRCFILE%
+inpoint   00:00.80
+
+file      %SRCFILE%
+inpoint   00:00.20
+outpoint  00:00.40
+file_packet_metadata dummy=1
+
diff --git a/tests/simple2.ffconcat b/tests/simple2.ffconcat
new file mode 100644
index 0000000000..2a0a1b5c9e
--- /dev/null
+++ b/tests/simple2.ffconcat
@@ -0,0 +1,19 @@
+ffconcat version 1.0
+
+stream    0
+exact_stream_id 257
+stream    1
+exact_stream_id 256
+
+file      %SRCFILE%
+
+file      %SRCFILE%
+duration  0.5
+
+file      %SRCFILE%
+inpoint   00:02.20
+
+file      %SRCFILE%
+inpoint   00:01.80
+outpoint  00:02.00
+
diff --git a/tests/test.ffmeta b/tests/test.ffmeta
new file mode 100644
index 0000000000..ad37b020e2
--- /dev/null
+++ b/tests/test.ffmeta
@@ -0,0 +1,9 @@
+;FFMETADATA1
+title=ffprobe test file
+comment='A comment with CSV, XML & JSON special chars': <tag value=\"x\">
+comment2=I ♥ Üñîçød€
+[STREAM]
+E=mc²
+[STREAM]
+title=foobar
+duration_ts=field-and-tags-conflict-attempt
diff --git a/tests/tiny_psnr.c b/tests/tiny_psnr.c
index 1afdd4d6bc..d01aa29dad 100644
--- a/tests/tiny_psnr.c
+++ b/tests/tiny_psnr.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * 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.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -24,6 +24,7 @@
 #include <inttypes.h>
 #include <math.h>
 #include <float.h>
+#include <limits.h>
 
 #include "libavutil/intfloat.h"
 #include "libavutil/intreadwrite.h"
@@ -56,6 +57,21 @@ uint64_t exp16_table[21] = {
     582360139072LL,
 };
 
+#if 0
+// 16.16 fixpoint exp()
+static unsigned int exp16(unsigned int a){
+    int i;
+    int out= 1<<16;
+
+    for(i=19;i>=0;i--){
+        if(a&(1<<i))
+            out= (out*exp16_table[i] + (1<<15))>>16;
+    }
+
+    return out;
+}
+#endif
+
 // 16.16 fixpoint log()
 static int64_t log16(uint64_t a)
 {
@@ -114,79 +130,47 @@ static double get_f64l(uint8_t *p)
     return av_int2double(AV_RL64(p));
 }
 
-int main(int argc, char *argv[])
+static int run_psnr(FILE *f[2], int len, int shift, int skip_bytes)
 {
     uint64_t i, j;
     uint64_t sse = 0;
     double sse_d = 0.0;
-    FILE *f[2];
     uint8_t buf[2][SIZE];
-    int len = 1;
-    int64_t max;
-    int shift      = argc < 5 ? 0 : atoi(argv[4]);
-    int skip_bytes = argc < 6 ? 0 : atoi(argv[5]);
+    int64_t max    = (1LL << (8 * len)) - 1;
     uint64_t size0   = 0;
     uint64_t size1   = 0;
     uint64_t maxdist = 0;
     double maxdist_d = 0.0;
+    int noseek;
 
-    if (argc < 3) {
-        printf("tiny_psnr <file1> <file2> [<elem size> [<shift> [<skip bytes>]]]\n");
-        printf("WAV headers are skipped automatically.\n");
-        return 1;
-    }
-
-    if (argc > 3) {
-        if (!strcmp(argv[3], "u8")) {
-            len = 1;
-        } else if (!strcmp(argv[3], "s16")) {
-            len = 2;
-        } else if (!strcmp(argv[3], "f32")) {
-            len = 4;
-        } else if (!strcmp(argv[3], "f64")) {
-            len = 8;
-        } else {
-            char *end;
-            len = strtol(argv[3], &end, 0);
-            if (*end || len < 1 || len > 2) {
-                fprintf(stderr, "Unsupported sample format: %s\n", argv[3]);
-                return 1;
-            }
-        }
-    }
-
-    max = (1LL << (8 * len)) - 1;
+    noseek = fseek(f[0], 0, SEEK_SET) ||
+             fseek(f[1], 0, SEEK_SET);
 
-    f[0] = fopen(argv[1], "rb");
-    f[1] = fopen(argv[2], "rb");
-    if (!f[0] || !f[1]) {
-        fprintf(stderr, "Could not open input files.\n");
-        return 1;
-    }
-
-    for (i = 0; i < 2; i++) {
-        uint8_t *p = buf[i];
-        if (fread(p, 1, 12, f[i]) != 12)
-            return 1;
-        if (!memcmp(p, "RIFF", 4) &&
-            !memcmp(p + 8, "WAVE", 4)) {
-            if (fread(p, 1, 8, f[i]) != 8)
-                return 1;
-            while (memcmp(p, "data", 4)) {
-                int s = p[4] | p[5] << 8 | p[6] << 16 | p[7] << 24;
-                fseek(f[i], s, SEEK_CUR);
+    if (!noseek) {
+        for (i = 0; i < 2; i++) {
+            uint8_t *p = buf[i];
+            if (fread(p, 1, 12, f[i]) != 12)
+                return -1;
+            if (!memcmp(p, "RIFF", 4) &&
+                !memcmp(p + 8, "WAVE", 4)) {
                 if (fread(p, 1, 8, f[i]) != 8)
-                    return 1;
+                    return -1;
+                while (memcmp(p, "data", 4)) {
+                    int s = p[4] | p[5] << 8 | p[6] << 16 | p[7] << 24;
+                    fseek(f[i], s, SEEK_CUR);
+                    if (fread(p, 1, 8, f[i]) != 8)
+                        return -1;
+                }
+            } else {
+                fseek(f[i], -12, SEEK_CUR);
             }
-        } else {
-            fseek(f[i], -12, SEEK_CUR);
         }
-    }
 
-    fseek(f[shift < 0], abs(shift), SEEK_CUR);
+        fseek(f[shift < 0], abs(shift), SEEK_CUR);
 
-    fseek(f[0], skip_bytes, SEEK_CUR);
-    fseek(f[1], skip_bytes, SEEK_CUR);
+        fseek(f[0], skip_bytes, SEEK_CUR);
+        fseek(f[1], skip_bytes, SEEK_CUR);
+    }
 
     for (;;) {
         int s0 = fread(buf[0], 1, SIZE, f[0]);
@@ -196,8 +180,7 @@ int main(int argc, char *argv[])
             switch (len) {
             case 1:
             case 2: {
-                int64_t a = buf[0][j];
-                int64_t b = buf[1][j];
+                int64_t a, b;
                 int dist;
                 if (len == 2) {
                     a = get_s16l(buf[0] + j);
@@ -254,16 +237,17 @@ int main(int argc, char *argv[])
                (int)(dev / F), (int)(dev % F),
                (int)(psnr / F), (int)(psnr % F),
                maxdist, size0, size1);
-        break;
+        return psnr;
         }
     case 4:
     case 8: {
         char psnr_str[64];
+        double psnr = INT_MAX;
         double dev = sqrt(sse_d / i);
         uint64_t scale = (len == 4) ? (1ULL << 24) : (1ULL << 32);
 
         if (sse_d) {
-            double psnr = 2 * log(DBL_MAX) - log(i / sse_d);
+            psnr = 2 * log(DBL_MAX) - log(i / sse_d);
             snprintf(psnr_str, sizeof(psnr_str), "%5.02f", psnr);
         } else
             snprintf(psnr_str, sizeof(psnr_str), "inf");
@@ -272,8 +256,69 @@ int main(int argc, char *argv[])
 
         printf("stddev:%10.2f PSNR:%s MAXDIFF:%10"PRIu64" bytes:%9"PRIu64"/%9"PRIu64"\n",
                dev * scale, psnr_str, maxdist, size0, size1);
-        break;
+        return psnr;
+    }
+    }
+    return -1;
+}
+
+int main(int argc, char *argv[])
+{
+    FILE *f[2];
+    int len = 1;
+    int shift_first= argc < 5 ? 0 : atoi(argv[4]);
+    int skip_bytes = argc < 6 ? 0 : atoi(argv[5]);
+    int shift_last = shift_first + (argc < 7 ? 0 : atoi(argv[6]));
+    int shift;
+    int max_psnr   = -1;
+    int max_psnr_shift = 0;
+
+    if (shift_last > shift_first)
+        shift_first -= shift_last - shift_first;
+
+    if (argc > 3) {
+        if (!strcmp(argv[3], "u8")) {
+            len = 1;
+        } else if (!strcmp(argv[3], "s16")) {
+            len = 2;
+        } else if (!strcmp(argv[3], "f32")) {
+            len = 4;
+        } else if (!strcmp(argv[3], "f64")) {
+            len = 8;
+        } else {
+            char *end;
+            len = strtol(argv[3], &end, 0);
+            if (*end || len < 1 || len > 2) {
+                fprintf(stderr, "Unsupported sample format: %s\nSupported: u8, s16, f32, f64\n", argv[3]);
+                return 1;
+            }
+        }
+    }
+
+    if (argc < 3) {
+        printf("tiny_psnr <file1> <file2> [<elem size>|u8|s16|f32|f64 [<shift> [<skip bytes> [<shift search range>]]]]\n");
+        printf("WAV headers are skipped automatically.\n");
+        return 1;
     }
+
+    f[0] = fopen(argv[1], "rb");
+    f[1] = fopen(argv[2], "rb");
+    if (!f[0] || !f[1]) {
+        fprintf(stderr, "Could not open input files.\n");
+        return 1;
     }
+
+    for (shift = shift_first; shift <= shift_last; shift++) {
+        int psnr = run_psnr(f, len, shift, skip_bytes);
+        if (psnr > max_psnr || (shift < 0 && psnr == max_psnr)) {
+            max_psnr = psnr;
+            max_psnr_shift = shift;
+        }
+    }
+    if (max_psnr < 0)
+        return 2;
+
+    if (shift_last > shift_first)
+        printf("Best PSNR is %3d.%02d for shift %i\n", (int)(max_psnr / F), (int)(max_psnr % F), max_psnr_shift);
     return 0;
 }
diff --git a/tests/tiny_ssim.c b/tests/tiny_ssim.c
new file mode 100644
index 0000000000..08f8e92a03
--- /dev/null
+++ b/tests/tiny_ssim.c
@@ -0,0 +1,245 @@
+/*
+ * Copyright (c) 2003-2013 Loren Merritt
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110 USA
+ */
+/*
+ * tiny_ssim.c
+ * Computes the Structural Similarity Metric between two rawYV12 video files.
+ * original algorithm:
+ * Z. Wang, A. C. Bovik, H. R. Sheikh and E. P. Simoncelli,
+ *   "Image quality assessment: From error visibility to structural similarity,"
+ *   IEEE Transactions on Image Processing, vol. 13, no. 4, pp. 600-612, Apr. 2004.
+ *
+ * To improve speed, this implementation uses the standard approximation of
+ * overlapped 8x8 block sums, rather than the original gaussian weights.
+ */
+
+#include "config.h"
+#include <inttypes.h>
+#include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
+#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
+
+#define BIT_DEPTH 8
+#define PIXEL_MAX ((1 << BIT_DEPTH)-1)
+typedef uint8_t  pixel;
+
+/****************************************************************************
+ * structural similarity metric
+ ****************************************************************************/
+static void ssim_4x4x2_core( const pixel *pix1, intptr_t stride1,
+                             const pixel *pix2, intptr_t stride2,
+                             int sums[2][4] )
+{
+    int x,y,z;
+
+    for( z = 0; z < 2; z++ )
+    {
+        uint32_t s1 = 0, s2 = 0, ss = 0, s12 = 0;
+        for( y = 0; y < 4; y++ )
+            for( x = 0; x < 4; x++ )
+            {
+                int a = pix1[x+y*stride1];
+                int b = pix2[x+y*stride2];
+                s1  += a;
+                s2  += b;
+                ss  += a*a;
+                ss  += b*b;
+                s12 += a*b;
+            }
+        sums[z][0] = s1;
+        sums[z][1] = s2;
+        sums[z][2] = ss;
+        sums[z][3] = s12;
+        pix1 += 4;
+        pix2 += 4;
+    }
+}
+
+static float ssim_end1( int s1, int s2, int ss, int s12 )
+{
+/* Maximum value for 10-bit is: ss*64 = (2^10-1)^2*16*4*64 = 4286582784, which will overflow in some cases.
+ * s1*s1, s2*s2, and s1*s2 also obtain this value for edge cases: ((2^10-1)*16*4)^2 = 4286582784.
+ * Maximum value for 9-bit is: ss*64 = (2^9-1)^2*16*4*64 = 1069551616, which will not overflow. */
+#if BIT_DEPTH > 9
+    typedef float type;
+    static const float ssim_c1 = .01*.01*PIXEL_MAX*PIXEL_MAX*64;
+    static const float ssim_c2 = .03*.03*PIXEL_MAX*PIXEL_MAX*64*63;
+#else
+    typedef int type;
+    static const int ssim_c1 = (int)(.01*.01*PIXEL_MAX*PIXEL_MAX*64 + .5);
+    static const int ssim_c2 = (int)(.03*.03*PIXEL_MAX*PIXEL_MAX*64*63 + .5);
+#endif
+    type fs1 = s1;
+    type fs2 = s2;
+    type fss = ss;
+    type fs12 = s12;
+    type vars = fss*64 - fs1*fs1 - fs2*fs2;
+    type covar = fs12*64 - fs1*fs2;
+    return (float)(2*fs1*fs2 + ssim_c1) * (float)(2*covar + ssim_c2)
+         / ((float)(fs1*fs1 + fs2*fs2 + ssim_c1) * (float)(vars + ssim_c2));
+}
+
+static float ssim_end4( int sum0[5][4], int sum1[5][4], int width )
+{
+    float ssim = 0.0;
+    int i;
+
+    for( i = 0; i < width; i++ )
+        ssim += ssim_end1( sum0[i][0] + sum0[i+1][0] + sum1[i][0] + sum1[i+1][0],
+                           sum0[i][1] + sum0[i+1][1] + sum1[i][1] + sum1[i+1][1],
+                           sum0[i][2] + sum0[i+1][2] + sum1[i][2] + sum1[i+1][2],
+                           sum0[i][3] + sum0[i+1][3] + sum1[i][3] + sum1[i+1][3] );
+    return ssim;
+}
+
+float ssim_plane(
+                           pixel *pix1, intptr_t stride1,
+                           pixel *pix2, intptr_t stride2,
+                           int width, int height, void *buf, int *cnt )
+{
+    int z = 0;
+    int x, y;
+    float ssim = 0.0;
+    int (*sum0)[4] = buf;
+    int (*sum1)[4] = sum0 + (width >> 2) + 3;
+    width >>= 2;
+    height >>= 2;
+    for( y = 1; y < height; y++ )
+    {
+        for( ; z <= y; z++ )
+        {
+            FFSWAP( void*, sum0, sum1 );
+            for( x = 0; x < width; x+=2 )
+                ssim_4x4x2_core( &pix1[4*(x+z*stride1)], stride1, &pix2[4*(x+z*stride2)], stride2, &sum0[x] );
+        }
+        for( x = 0; x < width-1; x += 4 )
+            ssim += ssim_end4( sum0+x, sum1+x, FFMIN(4,width-x-1) );
+    }
+//     *cnt = (height-1) * (width-1);
+    return ssim / ((height-1) * (width-1));
+}
+
+
+uint64_t ssd_plane( const uint8_t *pix1, const uint8_t *pix2, int size )
+{
+    uint64_t ssd = 0;
+    int i;
+    for( i=0; i<size; i++ )
+    {
+        int d = pix1[i] - pix2[i];
+        ssd += d*d;
+    }
+    return ssd;
+}
+
+static double ssd_to_psnr( uint64_t ssd, uint64_t denom )
+{
+    return -10*log((double)ssd/(denom*255*255))/log(10);
+}
+
+static double ssim_db( double ssim, double weight )
+{
+    return 10*(log(weight)/log(10)-log(weight-ssim)/log(10));
+}
+
+static void print_results(uint64_t ssd[3], double ssim[3], int frames, int w, int h)
+{
+    printf( "PSNR Y:%.3f  U:%.3f  V:%.3f  All:%.3f | ",
+            ssd_to_psnr( ssd[0], (uint64_t)frames*w*h ),
+            ssd_to_psnr( ssd[1], (uint64_t)frames*w*h/4 ),
+            ssd_to_psnr( ssd[2], (uint64_t)frames*w*h/4 ),
+            ssd_to_psnr( ssd[0] + ssd[1] + ssd[2], (uint64_t)frames*w*h*3/2 ) );
+    printf( "SSIM Y:%.5f U:%.5f V:%.5f All:%.5f (%.5f)",
+            ssim[0] / frames,
+            ssim[1] / frames,
+            ssim[2] / frames,
+            (ssim[0]*4 + ssim[1] + ssim[2]) / (frames*6),
+            ssim_db(ssim[0] * 4 + ssim[1] + ssim[2], frames*6));
+}
+
+int main(int argc, char* argv[])
+{
+    FILE *f[2];
+    uint8_t *buf[2], *plane[2][3];
+    int *temp;
+    uint64_t ssd[3] = {0,0,0};
+    double ssim[3] = {0,0,0};
+    int frame_size, w, h;
+    int frames, seek;
+    int i;
+
+    if( argc<4 || 2 != sscanf(argv[3], "%dx%d", &w, &h) )
+    {
+        printf("tiny_ssim <file1.yuv> <file2.yuv> <width>x<height> [<seek>]\n");
+        return -1;
+    }
+
+    f[0] = fopen(argv[1], "rb");
+    f[1] = fopen(argv[2], "rb");
+    sscanf(argv[3], "%dx%d", &w, &h);
+
+    if (w<=0 || h<=0 || w*(int64_t)h >= INT_MAX/3 || 2LL*w+12 >= INT_MAX / sizeof(*temp)) {
+        fprintf(stderr, "Dimensions are too large, or invalid\n");
+        return -2;
+    }
+
+    frame_size = w*h*3LL/2;
+    for( i=0; i<2; i++ )
+    {
+        buf[i] = malloc(frame_size);
+        plane[i][0] = buf[i];
+        plane[i][1] = plane[i][0] + w*h;
+        plane[i][2] = plane[i][1] + w*h/4;
+    }
+    temp = malloc((2*w+12)*sizeof(*temp));
+    seek = argc<5 ? 0 : atoi(argv[4]);
+    fseek(f[seek<0], seek < 0 ? -seek : seek, SEEK_SET);
+
+    for( frames=0;; frames++ )
+    {
+        uint64_t ssd_one[3];
+        double ssim_one[3];
+        if( fread(buf[0], frame_size, 1, f[0]) != 1) break;
+        if( fread(buf[1], frame_size, 1, f[1]) != 1) break;
+        for( i=0; i<3; i++ )
+        {
+            ssd_one[i]  = ssd_plane ( plane[0][i], plane[1][i], w*h>>2*!!i );
+            ssim_one[i] = ssim_plane( plane[0][i], w>>!!i,
+                                     plane[1][i], w>>!!i,
+                                     w>>!!i, h>>!!i, temp, NULL );
+            ssd[i] += ssd_one[i];
+            ssim[i] += ssim_one[i];
+        }
+
+        printf("Frame %d | ", frames);
+        print_results(ssd_one, ssim_one, 1, w, h);
+        printf("                \r");
+        fflush(stdout);
+    }
+
+    if( !frames ) return 0;
+
+    printf("Total %d frames | ", frames);
+    print_results(ssd, ssim, frames, w, h);
+    printf("\n");
+
+    return 0;
+}
diff --git a/tests/utils.c b/tests/utils.c
index 2fdc491f49..f2441046c3 100644
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -1,18 +1,20 @@
 /*
- * This file is part of Libav.
+ * copyright (c) Sebastien Bechet <s.bechet@av7.net>
  *
- * Libav is free software; you can redistribute it and/or
+ * 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.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -23,7 +25,7 @@
 
 #define SCALEBITS 8
 #define ONE_HALF  (1 << (SCALEBITS - 1))
-#define FIX(x)    ((int) ((x) * (1L << SCALEBITS) + 0.5))
+#define FIX(x)    ((int) ((x) * (1 << SCALEBITS) + 0.5))
 
 #define err_if(expr) do {                                              \
     if (expr) {                                                        \
@@ -33,12 +35,12 @@
 } while (0)
 
 static void rgb24_to_yuv420p(unsigned char *lum, unsigned char *cb,
-                             unsigned char *cr, unsigned char *src,
+                             unsigned char *cr, const unsigned char *src,
                              int width, int height)
 {
     int wrap, wrap3, x, y;
     int r, g, b, r1, g1, b1;
-    unsigned char *p;
+    const unsigned char *p;
 
     wrap  = width;
     wrap3 = width * 3;
@@ -102,7 +104,7 @@ static void rgb24_to_yuv420p(unsigned char *lum, unsigned char *cb,
 #define DEFAULT_NB_PICT  50
 
 static void pgmyuv_save(const char *filename, int w, int h,
-                        unsigned char *rgb_tab)
+                        const unsigned char *rgb_tab)
 {
     FILE *f;
     int i, h2, w2;
diff --git a/tests/videogen.c b/tests/videogen.c
index 0b7f67eb18..91da8b540c 100644
--- a/tests/videogen.c
+++ b/tests/videogen.c
@@ -4,20 +4,20 @@
  *
  * Copyright (c) 2002 Fabrice Bellard
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * 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.
  *
- * Libav is distributed in the hope that it will be useful,
+ * 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 Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -141,23 +141,37 @@ static void gen_image(int num, int w, int h)
     }
 }
 
+void print_help(const char* name)
+{
+    printf("usage: %s file|dir [w=%i] [h=%i]\n"
+            "generate a test video stream\n",
+            name, DEFAULT_WIDTH, DEFAULT_HEIGHT);
+    exit(1);
+}
+
 int main(int argc, char **argv)
 {
     int w, h, i;
     char buf[1024];
     int isdir = 0;
 
-    if (argc != 2) {
-        printf("usage: %s file|dir\n"
-               "generate a test video stream\n", argv[0]);
-        exit(1);
+    if (argc < 2 || argc > 4) {
+        print_help(argv[0]);
     }
 
     if (!freopen(argv[1], "wb", stdout))
         isdir = 1;
 
     w = DEFAULT_WIDTH;
+    if(argc > 2) {
+        w = atoi(argv[2]);
+        if (w < 1) print_help(argv[0]);
+    }
     h = DEFAULT_HEIGHT;
+    if(argc > 3) {
+        h = atoi(argv[3]);
+        if (h < 1) print_help(argv[0]);
+    }
 
     rgb_tab = malloc(w * h * 3);
     wrap    = w * 3;