[FFmpeg-cvslog] Merge commit 'dad5fd59f3d6a8311365314cfcde0ebcd15c2b01'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun Mar 10 22:22:50 2019 -0300| [bad70b7af6b909691f5389e14eb7d0c03db10af9] | committer: James Almer

Merge commit 'dad5fd59f3d6a8311365314cfcde0ebcd15c2b01'

* commit 'dad5fd59f3d6a8311365314cfcde0ebcd15c2b01':
  tests: Enable CRC test for yuv4mpeg

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bad70b7af6b909691f5389e14eb7d0c03db10af9
---

 tests/lavf-regression.sh | 2 +-
 tests/ref/lavf/yuv4mpeg  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index f3dc84d295..ed2a44e3f9 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -235,7 +235,7 @@ fi
 if [ -n "$do_yuv4mpeg" ] ; then
 file=${outfile}lavf.y4m
 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
+do_avconv_crc $file -i $target_path/$file
 fi
 
 if [ -n "$do_fits" ] ; then
diff --git a/tests/ref/lavf/yuv4mpeg b/tests/ref/lavf/yuv4mpeg
index 8c1566ea0d..367b37621d 100644
--- a/tests/ref/lavf/yuv4mpeg
+++ b/tests/ref/lavf/yuv4mpeg
@@ -1,2 +1,3 @@
 ec8178cb152f9cdbfd9cb724d977db2e *./tests/data/lavf/lavf.y4m
 3801808 ./tests/data/lavf/lavf.y4m
+./tests/data/lavf/lavf.y4m CRC=0x0a941f26


======================================================================

diff --cc tests/lavf-regression.sh
index f3dc84d295,326319c6db..ed2a44e3f9
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@@ -234,19 -129,10 +234,19 @@@ f
  
  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
+ 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