generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avienc: Fix rawvideo 32bit

Browse Source 
Bug found by: Rik Maes <rik.maes54@gmail.com>
Change based on suggestion by Rik Maes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 53b6503184)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-12-17 03:25:46 +01:00
parent 8c2fe23b1c
commit cb2d66a470
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/riff.c
View File

@@ -519,7 +519,7 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *t
avio_wl16(pb, enc->bits_per_coded_sample ? enc->bits_per_coded_sample : 24); /* depth */ avio_wl16(pb, enc->bits_per_coded_sample ? enc->bits_per_coded_sample : 24); /* depth */
/* compression type */ /* compression type */
avio_wl32(pb, enc->codec_tag); avio_wl32(pb, enc->codec_tag);
avio_wl32(pb, enc->width * enc->height * 3); 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); avio_wl32(pb, 0);
avio_wl32(pb, 0); avio_wl32(pb, 0);

2
tests/ref/vsynth1/huffyuv
View File

@@ -1,4 +1,4 @@
ace2536fa169d835d0fb332abde28d51 *./tests/data/vsynth1/huffyuv.avi f5f2e109af0612694ff3cd6464063e82 *./tests/data/vsynth1/huffyuv.avi
7933800 ./tests/data/vsynth1/huffyuv.avi 7933800 ./tests/data/vsynth1/huffyuv.avi
c5ccac874dbf808e9088bc3107860042 *./tests/data/huffyuv.vsynth1.out.yuv c5ccac874dbf808e9088bc3107860042 *./tests/data/huffyuv.vsynth1.out.yuv
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200

2
tests/ref/vsynth1/yuv
View File

@@ -1,4 +1,4 @@
aa6b9e862aebcf8902a6d770e7729d59 *./tests/data/vsynth1/yuv.avi eaa66c3b27a2602e882befe154a8b119 *./tests/data/vsynth1/yuv.avi
7610060 ./tests/data/vsynth1/yuv.avi 7610060 ./tests/data/vsynth1/yuv.avi
c5ccac874dbf808e9088bc3107860042 *./tests/data/yuv.vsynth1.out.yuv c5ccac874dbf808e9088bc3107860042 *./tests/data/yuv.vsynth1.out.yuv
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200

2
tests/ref/vsynth2/huffyuv
View File

@@ -1,4 +1,4 @@
56cd44907a48990e06bd065e189ff461 *./tests/data/vsynth2/huffyuv.avi ed66182be0d515e8b6cb970ad63162da *./tests/data/vsynth2/huffyuv.avi
6455232 ./tests/data/vsynth2/huffyuv.avi 6455232 ./tests/data/vsynth2/huffyuv.avi
dde5895817ad9d219f79a52d0bdfb001 *./tests/data/huffyuv.vsynth2.out.yuv dde5895817ad9d219f79a52d0bdfb001 *./tests/data/huffyuv.vsynth2.out.yuv
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200

2
tests/ref/vsynth2/yuv
View File

@@ -1,4 +1,4 @@
30a400773ab26f2c83e469198b156f1d *./tests/data/vsynth2/yuv.avi 3d5ee6d2023bc15bba898819e4977e46 *./tests/data/vsynth2/yuv.avi
7610060 ./tests/data/vsynth2/yuv.avi 7610060 ./tests/data/vsynth2/yuv.avi
dde5895817ad9d219f79a52d0bdfb001 *./tests/data/yuv.vsynth2.out.yuv dde5895817ad9d219f79a52d0bdfb001 *./tests/data/yuv.vsynth2.out.yuv
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200