New patch set. Forget the old one.
From the Microsoft documentation for BITMAPINFOHEADER at
https://msdn.microsoft.com/en-us/library/windows/desktop/dd318229%28v=vs.85%29.aspx:
"biSize: Specifies the number of bytes required by the structure. This
value does not include the size of the color table or the size of the
color masks, if they are appended to the end of structure."
So, biSize is 40 for palettized video as well. And Windows Media Player
won't display any video when using Microsoft Video 1 in 8 bpp mode or
RLE4/RLE8 if this value is set to anything else than 40.
For non-palette extra data in huffyuv, ffvhuff, asv1 and asv2, the extra
data will be included in biSize. There are possibly more codecs with
special global headers, but we can fix that as they are discovered.
Currently these are the only ones I know of.
Regarding the biClrUsed field, I'm setting it to 1 <<
bits_per_coded_sample if palettized video, since setting it to 0 won't
work with Windows Media Player and AVI files with xxpc (palette change)
chunks for some reason.
Mats
>From a54f3d793990d10f1fd99645d85580bbdaf8e7c4 Mon Sep 17 00:00:00 2001
From: Mats Peterson <matsp...@yahoo.com>
Date: Sat, 12 Mar 2016 07:03:51 +0100
Subject: [PATCH 1/2] lavf/riffenc: Improve spec compliance; Fix WMP playback of AVI with xxpc chunks
---
libavformat/riffenc.c | 14 +++++++++++---
tests/ref/fate/mpeg4-bsf-unpack-bframes | 2 +-
tests/ref/lavf-fate/avi_cram | 2 +-
tests/ref/vsynth/vsynth1-bpp1 | 2 +-
tests/ref/vsynth/vsynth1-ffv1 | 2 +-
tests/ref/vsynth/vsynth1-ffv1-v3-bgr0 | 2 +-
tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p | 2 +-
tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10 | 2 +-
tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16 | 2 +-
tests/ref/vsynth/vsynth1-wmv2 | 2 +-
tests/ref/vsynth/vsynth1-zlib | 2 +-
tests/ref/vsynth/vsynth2-bpp1 | 2 +-
tests/ref/vsynth/vsynth2-ffv1 | 2 +-
tests/ref/vsynth/vsynth2-ffv1-v3-bgr0 | 2 +-
tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p | 2 +-
tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10 | 2 +-
tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16 | 2 +-
tests/ref/vsynth/vsynth2-wmv2 | 2 +-
tests/ref/vsynth/vsynth2-zlib | 2 +-
tests/ref/vsynth/vsynth3-bpp1 | 2 +-
tests/ref/vsynth/vsynth3-ffv1 | 2 +-
tests/ref/vsynth/vsynth3-ffv1-v3-bgr0 | 2 +-
tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p | 2 +-
tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10 | 2 +-
tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16 | 2 +-
tests/ref/vsynth/vsynth3-wmv2 | 2 +-
tests/ref/vsynth/vsynth3-zlib | 2 +-
tests/ref/vsynth/vsynth_lena-bpp1 | 2 +-
tests/ref/vsynth/vsynth_lena-ffv1 | 2 +-
tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0 | 2 +-
tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420 | 4 ----
tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p | 2 +-
tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10 | 2 +-
tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16 | 2 +-
tests/ref/vsynth/vsynth_lena-wmv2 | 2 +-
tests/ref/vsynth/vsynth_lena-zlib | 2 +-
36 files changed, 45 insertions(+), 41 deletions(-)
delete mode 100644 tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420
diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c
index 195a58e..0851ff9 100644
--- a/libavformat/riffenc.c
+++ b/libavformat/riffenc.c
@@ -222,8 +222,13 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc,
if (!enc->extradata_size && pal_avi)
extradata_size = 4 * (1 << enc->bits_per_coded_sample);
- /* size */
- avio_wl32(pb, 40 + (ignore_extradata ? 0 :extradata_size));
+ /* Size (not including the size of the color table or color masks) */
+ avio_wl32(pb, 40 + (!ignore_extradata && (
+ enc->codec_id == AV_CODEC_ID_ASV1 ||
+ enc->codec_id == AV_CODEC_ID_ASV2 ||
+ enc->codec_id == AV_CODEC_ID_FFVHUFF ||
+ enc->codec_id == AV_CODEC_ID_HUFFYUV
+ ) ? extradata_size : 0));
avio_wl32(pb, enc->width);
//We always store RGB TopDown
avio_wl32(pb, enc->codec_tag || keep_height ? enc->height : -enc->height);
@@ -236,7 +241,10 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc,
avio_wl32(pb, (enc->width * enc->height * (enc->bits_per_coded_sample ? enc->bits_per_coded_sample : 24)+7) / 8);
avio_wl32(pb, 0);
avio_wl32(pb, 0);
- avio_wl32(pb, 0);
+ /* Number of color indices in the color table that are used.
+ * A value of 0 means 2^biBitCount indices, but this doesn't work
+ * with Windows Media Player and files containing xxpc chunks. */
+ avio_wl32(pb, pal_avi ? 1 << enc->bits_per_coded_sample : 0);
avio_wl32(pb, 0);
if (!ignore_extradata) {
diff --git a/tests/ref/fate/mpeg4-bsf-unpack-bframes b/tests/ref/fate/mpeg4-bsf-unpack-bframes
index 21e58f6..718ca5e 100644
--- a/tests/ref/fate/mpeg4-bsf-unpack-bframes
+++ b/tests/ref/fate/mpeg4-bsf-unpack-bframes
@@ -1 +1 @@
-5db6b7b766c7a9fd5f42292d7467a36d
+46386c4d2c3c63d17e03f92c2af60726
diff --git a/tests/ref/lavf-fate/avi_cram b/tests/ref/lavf-fate/avi_cram
index 7864ab9..7b4e69c 100644
--- a/tests/ref/lavf-fate/avi_cram
+++ b/tests/ref/lavf-fate/avi_cram
@@ -1,3 +1,3 @@
-e202447ccd6660149c17070204d258a4 *./tests/data/lavf-fate/lavf.avi
+ba77c5c8bd2b0d1e0478d143346cc3b3 *./tests/data/lavf-fate/lavf.avi
928228 ./tests/data/lavf-fate/lavf.avi
./tests/data/lavf-fate/lavf.avi CRC=0xa4770de2
diff --git a/tests/ref/vsynth/vsynth1-bpp1 b/tests/ref/vsynth/vsynth1-bpp1
index 92d5987..af1fb0e 100644
--- a/tests/ref/vsynth/vsynth1-bpp1
+++ b/tests/ref/vsynth/vsynth1-bpp1
@@ -1,4 +1,4 @@
-0fcba876d3e499c0bebf7bb32a7f83f2 *tests/data/fate/vsynth1-bpp1.avi
+a0b35707a9aa7144e3e1c70c1d01f4ce *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-ffv1 b/tests/ref/vsynth/vsynth1-ffv1
index 001f10a..3d8b9cd 100644
--- a/tests/ref/vsynth/vsynth1-ffv1
+++ b/tests/ref/vsynth/vsynth1-ffv1
@@ -1,4 +1,4 @@
-26b1296a0ef80a3b5c8b63cc57c52bc2 *tests/data/fate/vsynth1-ffv1.avi
+19a075c19ed08adeb615b3ff9d852fb2 *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-v3-bgr0 b/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0
index 3808f49..e8fe4c3 100644
--- a/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0
+++ b/tests/ref/vsynth/vsynth1-ffv1-v3-bgr0
@@ -1,4 +1,4 @@
-3c68357b239479fc26656f6dd76b0b58 *tests/data/fate/vsynth1-ffv1-v3-bgr0.avi
+f126ee07210c605b0e0d6f3847d9c982 *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-yuv420p b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p
index a4af95b..ab3acf6 100644
--- a/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p
+++ b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv420p
@@ -1,4 +1,4 @@
-26b1296a0ef80a3b5c8b63cc57c52bc2 *tests/data/fate/vsynth1-ffv1-v3-yuv420p.avi
+19a075c19ed08adeb615b3ff9d852fb2 *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
index d56cf27..2e94a90 100644
--- a/tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10
+++ b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv422p10
@@ -1,4 +1,4 @@
-aa8c5630213381c7b2afdec4a91405ed *tests/data/fate/vsynth1-ffv1-v3-yuv422p10.avi
+a3ac70483bf9316a47d651b0c5dc8799 *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
index 5d919ea..81b2aa2 100644
--- a/tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16
+++ b/tests/ref/vsynth/vsynth1-ffv1-v3-yuv444p16
@@ -1,4 +1,4 @@
-f6b6943455d8b2c3010ff898df5dc9db *tests/data/fate/vsynth1-ffv1-v3-yuv444p16.avi
+bb46c26744eddc4dab8b29bdfc0507ef *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-wmv2 b/tests/ref/vsynth/vsynth1-wmv2
index 4039d86..ce0c32d 100644
--- a/tests/ref/vsynth/vsynth1-wmv2
+++ b/tests/ref/vsynth/vsynth1-wmv2
@@ -1,4 +1,4 @@
-be5c5985d7f4d5b7797aeb0c825bf4f8 *tests/data/fate/vsynth1-wmv2.avi
+d08f8e1d7d7e979281608f526d1631dd *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-zlib b/tests/ref/vsynth/vsynth1-zlib
index 419c6a6..7f54c49 100644
--- a/tests/ref/vsynth/vsynth1-zlib
+++ b/tests/ref/vsynth/vsynth1-zlib
@@ -1,4 +1,4 @@
-fd44e7bf6322f4be46f4f0dada728849 *tests/data/fate/vsynth1-zlib.avi
+edfdf7112338f4c348edf337363718b0 *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/vsynth2-bpp1 b/tests/ref/vsynth/vsynth2-bpp1
index 2a2a63e..4005755 100644
--- a/tests/ref/vsynth/vsynth2-bpp1
+++ b/tests/ref/vsynth/vsynth2-bpp1
@@ -1,4 +1,4 @@
-af7eae5293b820493d1f4e6d258d8da0 *tests/data/fate/vsynth2-bpp1.avi
+a0330430d7dbd76cbd6d099b778397e8 *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-ffv1 b/tests/ref/vsynth/vsynth2-ffv1
index b38bb38..8d5f655 100644
--- a/tests/ref/vsynth/vsynth2-ffv1
+++ b/tests/ref/vsynth/vsynth2-ffv1
@@ -1,4 +1,4 @@
-6d7b6352f49e21153bb891df411e60ec *tests/data/fate/vsynth2-ffv1.avi
+3c98bf6af72c4a8f0b998f8bbddb3b83 *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-v3-bgr0 b/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0
index 11f516b..8c9f231 100644
--- a/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0
+++ b/tests/ref/vsynth/vsynth2-ffv1-v3-bgr0
@@ -1,4 +1,4 @@
-4e8ea4c31ddb7703638989c6251e37fe *tests/data/fate/vsynth2-ffv1-v3-bgr0.avi
+4c5c0841b4a2bd04e90b5c6370a958df *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-yuv420p b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p
index 5d85ffc..6f3b4a5 100644
--- a/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p
+++ b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv420p
@@ -1,4 +1,4 @@
-6d7b6352f49e21153bb891df411e60ec *tests/data/fate/vsynth2-ffv1-v3-yuv420p.avi
+3c98bf6af72c4a8f0b998f8bbddb3b83 *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
index b1a6c19..e1b6032 100644
--- a/tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10
+++ b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv422p10
@@ -1,4 +1,4 @@
-b43b20163948e44a6c806714e69ac3bf *tests/data/fate/vsynth2-ffv1-v3-yuv422p10.avi
+6ae12a5f412b567b6410652e685045e4 *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
index 4d0a0c2..4ec6cb0 100644
--- a/tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16
+++ b/tests/ref/vsynth/vsynth2-ffv1-v3-yuv444p16
@@ -1,4 +1,4 @@
-ae0bad7ece3ceacc9554f342ab489a4d *tests/data/fate/vsynth2-ffv1-v3-yuv444p16.avi
+4189fbf26e9f2a45c5b177d186b82e7e *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-wmv2 b/tests/ref/vsynth/vsynth2-wmv2
index 9608f7a..5788e11 100644
--- a/tests/ref/vsynth/vsynth2-wmv2
+++ b/tests/ref/vsynth/vsynth2-wmv2
@@ -1,4 +1,4 @@
-a999f38b25de2ff43438802e40c1ce70 *tests/data/fate/vsynth2-wmv2.avi
+f36fb6af057a5d6d16e75b073acd13ba *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-zlib b/tests/ref/vsynth/vsynth2-zlib
index 9dfb0d6..3fc8d46 100644
--- a/tests/ref/vsynth/vsynth2-zlib
+++ b/tests/ref/vsynth/vsynth2-zlib
@@ -1,4 +1,4 @@
-8d2783483b354e7836cfc45a7241c4eb *tests/data/fate/vsynth2-zlib.avi
+eda5c0298edb8d59a565fa34bcf3d53a *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-bpp1 b/tests/ref/vsynth/vsynth3-bpp1
index b3b757c..3c8c47a 100644
--- a/tests/ref/vsynth/vsynth3-bpp1
+++ b/tests/ref/vsynth/vsynth3-bpp1
@@ -1,4 +1,4 @@
-01b0fbf35305b50b1c148c0a23f2cff4 *tests/data/fate/vsynth3-bpp1.avi
+4c8777a88a9e52b99d5a345acffcbf06 *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-ffv1 b/tests/ref/vsynth/vsynth3-ffv1
index 8ffdd3f..ae325c2 100644
--- a/tests/ref/vsynth/vsynth3-ffv1
+++ b/tests/ref/vsynth/vsynth3-ffv1
@@ -1,4 +1,4 @@
-f969ca8542c8384c27233f362b661f8a *tests/data/fate/vsynth3-ffv1.avi
+bc27a3e99f578d31cc9aa9afb2b2dc46 *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-v3-bgr0 b/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0
index 2adffed..4f25811 100644
--- a/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0
+++ b/tests/ref/vsynth/vsynth3-ffv1-v3-bgr0
@@ -1,4 +1,4 @@
-bdb5f694222e91bb7cb7264d2d5d419b *tests/data/fate/vsynth3-ffv1-v3-bgr0.avi
+f7eba01c6ef63e3863865cce0b020278 *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-yuv420p b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p
index 38fb24a..1452f43 100644
--- a/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p
+++ b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv420p
@@ -1,4 +1,4 @@
-f969ca8542c8384c27233f362b661f8a *tests/data/fate/vsynth3-ffv1-v3-yuv420p.avi
+bc27a3e99f578d31cc9aa9afb2b2dc46 *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
index d86c9c9..63d435b 100644
--- a/tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10
+++ b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv422p10
@@ -1,4 +1,4 @@
-4fc113caac00ada68e19639ae6f7bc47 *tests/data/fate/vsynth3-ffv1-v3-yuv422p10.avi
+bba0e2ccc1bda8dea2dc74fe4de0c301 *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
index 5d61f11..5aee426 100644
--- a/tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16
+++ b/tests/ref/vsynth/vsynth3-ffv1-v3-yuv444p16
@@ -1,4 +1,4 @@
-1e8981cec92407938b25cd82381d1c64 *tests/data/fate/vsynth3-ffv1-v3-yuv444p16.avi
+c96f773656f9552585b805111d3cdc72 *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-wmv2 b/tests/ref/vsynth/vsynth3-wmv2
index 2276e7e..5c2f872 100644
--- a/tests/ref/vsynth/vsynth3-wmv2
+++ b/tests/ref/vsynth/vsynth3-wmv2
@@ -1,4 +1,4 @@
-d9c2a235b43d1704bb41c73f285d86a8 *tests/data/fate/vsynth3-wmv2.avi
+535d1956124bd3dea265b473916778ef *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-zlib b/tests/ref/vsynth/vsynth3-zlib
index 55d65f3..75fea2f 100644
--- a/tests/ref/vsynth/vsynth3-zlib
+++ b/tests/ref/vsynth/vsynth3-zlib
@@ -1,4 +1,4 @@
-d3705acfc90b16968d0d4a3ac56b049c *tests/data/fate/vsynth3-zlib.avi
+75656c17b2095b4959e529be81c31e3b *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-bpp1 b/tests/ref/vsynth/vsynth_lena-bpp1
index 57219cc..3489989 100644
--- a/tests/ref/vsynth/vsynth_lena-bpp1
+++ b/tests/ref/vsynth/vsynth_lena-bpp1
@@ -1,4 +1,4 @@
-930d019cbf8e06c67bdec58a3639c045 *tests/data/fate/vsynth_lena-bpp1.avi
+32673399a8442e397a608839eb3e95cb *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-ffv1 b/tests/ref/vsynth/vsynth_lena-ffv1
index 4060d8e..e6c9f9a 100644
--- a/tests/ref/vsynth/vsynth_lena-ffv1
+++ b/tests/ref/vsynth/vsynth_lena-ffv1
@@ -1,4 +1,4 @@
-ed72c22374718589ffacd7ea15424687 *tests/data/fate/vsynth_lena-ffv1.avi
+8ac3a00fc8a4594b7e480148b8ca193d *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-v3-bgr0 b/tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0
index cfc98f6..25f7794 100644
--- a/tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0
+++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-bgr0
@@ -1,4 +1,4 @@
-edf0987619d4d63f8b7e3022a8d0a724 *tests/data/fate/vsynth_lena-ffv1-v3-bgr0.avi
+38d5c9e3e7201c79d6072487ba44d3c6 *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-yuv420 b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420
deleted file mode 100644
index 7db437e..0000000
--- a/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420
+++ /dev/null
@@ -1,4 +0,0 @@
-ed72c22374718589ffacd7ea15424687 *tests/data/fate/vsynth_lena-ffv1-v3-yuv420.avi
-3547792 tests/data/fate/vsynth_lena-ffv1-v3-yuv420.avi
-dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1-v3-yuv420.out.rawvideo
-stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200
diff --git a/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p
index 1cffcb6..9027bb5 100644
--- a/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p
+++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv420p
@@ -1,4 +1,4 @@
-ed72c22374718589ffacd7ea15424687 *tests/data/fate/vsynth_lena-ffv1-v3-yuv420p.avi
+8ac3a00fc8a4594b7e480148b8ca193d *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
index ab1cd34..59640f7 100644
--- a/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10
+++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv422p10
@@ -1,4 +1,4 @@
-cd3f5b3d4544a30bd08a9a11945a8adc *tests/data/fate/vsynth_lena-ffv1-v3-yuv422p10.avi
+9df829e5f282412bcace851503f91b4f *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
index 08f9f0e..eab13f5 100644
--- a/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16
+++ b/tests/ref/vsynth/vsynth_lena-ffv1-v3-yuv444p16
@@ -1,4 +1,4 @@
-e65ad01440ad756b1872b22d3cfa23d7 *tests/data/fate/vsynth_lena-ffv1-v3-yuv444p16.avi
+3641a4811c30e564df87fea9de498e02 *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-wmv2 b/tests/ref/vsynth/vsynth_lena-wmv2
index fca0199..a012f07 100644
--- a/tests/ref/vsynth/vsynth_lena-wmv2
+++ b/tests/ref/vsynth/vsynth_lena-wmv2
@@ -1,4 +1,4 @@
-62ef27d48181d8256ad476e02c536145 *tests/data/fate/vsynth_lena-wmv2.avi
+66407e5e6f17546bd2d0a510bb4a12b1 *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-zlib b/tests/ref/vsynth/vsynth_lena-zlib
index 009bcad..1688eeb 100644
--- a/tests/ref/vsynth/vsynth_lena-zlib
+++ b/tests/ref/vsynth/vsynth_lena-zlib
@@ -1,4 +1,4 @@
-abbfccc551b173a357024d8392de21dd *tests/data/fate/vsynth_lena-zlib.avi
+bb869835619ac580f589b91a2633e6f8 *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
--
1.7.10.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
