mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-06-19 19:03:00 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: h264: stricter reference limit enforcement. h264: increase reference poc list from 16 to 32. xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns. snow: check reference frame indices. snow: reject unsupported chroma shifts. Add ffvhuff encoding and decoding regression test anm: convert to bytestream2 API bytestream: add more unchecked variants for bytestream2 API jvdec: unbreak video decoding jv demux: set video stream duration fate: add pam image regression test Conflicts: libavcodec/adpcm.c libavcodec/anm.c libavcodec/h264.c libavcodec/mpegvideo.h libavcodec/snowdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -227,6 +227,11 @@ do_video_encoding ffv1.avi "-strict -2 -an -vcodec ffv1"
|
||||
do_video_decoding
|
||||
fi
|
||||
|
||||
if [ -n "$do_ffvhuff" ] ; then
|
||||
do_video_encoding ffvhuff.avi "-an -vcodec ffvhuff"
|
||||
do_video_decoding ""
|
||||
fi
|
||||
|
||||
if [ -n "$do_snow" ] ; then
|
||||
do_video_encoding snow.avi "-strict -2 -an -vcodec snow -qscale 2 -flags +qpel -me_method iter -dia_size 2 -cmp 12 -subcmp 12 -s 128x64"
|
||||
do_video_decoding "" "-s 352x288"
|
||||
|
||||
@@ -211,6 +211,10 @@ if [ -n "$do_jpg" ] ; then
|
||||
do_image_formats jpg "-pix_fmt yuvj420p" "-f image2"
|
||||
fi
|
||||
|
||||
if [ -n "$do_pam" ] ; then
|
||||
do_image_formats pam
|
||||
fi
|
||||
|
||||
if [ -n "$do_pcx" ] ; then
|
||||
do_image_formats pcx
|
||||
fi
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
0dce5565222cf0f8b309467f279aecd2 *./tests/data/images/pam/02.pam
|
||||
./tests/data/images/pam/%02d.pam CRC=0x6da01946
|
||||
304191 ./tests/data/images/pam/02.pam
|
||||
@@ -0,0 +1,4 @@
|
||||
0632ffae6f1e06dd299bf41a845b9099 *./tests/data/vsynth1/ffvhuff.avi
|
||||
5987208 ./tests/data/vsynth1/ffvhuff.avi
|
||||
c5ccac874dbf808e9088bc3107860042 *./tests/data/ffvhuff.vsynth1.out.yuv
|
||||
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200
|
||||
@@ -0,0 +1,4 @@
|
||||
63926d8835dd5779dca0a4bc081ca8ae *./tests/data/vsynth2/ffvhuff.avi
|
||||
4988056 ./tests/data/vsynth2/ffvhuff.avi
|
||||
dde5895817ad9d219f79a52d0bdfb001 *./tests/data/ffvhuff.vsynth2.out.yuv
|
||||
stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200
|
||||
Reference in New Issue
Block a user