Merge commit 'dad5fd59f3d6a8311365314cfcde0ebcd15c2b01'

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

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

diff --cc tests/lavf-regression.sh
index f3dc84d2954395f26d33c1d9ec35ccc9c3465e9f,326319c6db65b7de11903765a323761fba508c5c..ed2a44e3f940edea4055c0e98231611ced08843b
--- 1/tests/lavf-regression.sh
--- 2/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