Merge commit '5846b496f0a1dd5be4ef714622940674305ec00f'

* commit '5846b496f0a1dd5be4ef714622940674305ec00f':
  tests: Use a predefined function for lavf-rm test

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

diff --cc tests/lavf-regression.sh
index ed2a44e3f940edea4055c0e98231611ced08843b,4161e375eec252f7b3571fd80eb387bc66092725..c5b6734815b219102ca7202e89d3931471832303
--- 1/tests/lavf-regression.sh
--- 2/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@@ -24,20 -14,11 +24,21 @@@ do_lavf_fate(
  do_lavf()
  {
      file=${outfile}lavf.$1
-     do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $2 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $3
-     do_avconv_crc $file $DEC_OPTS -i $target_path/$file $4
+     do_avconv $file $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $2 -i $pcm_src $ENC_OPTS -b:a 64k -t 1 -qscale:v 10 $3
+     test $5 = "disable_crc" ||
+         do_avconv_crc $file $DEC_OPTS -i $target_path/$file $4
  }
  
 +do_lavf_timecode_nodrop() { do_lavf $1 "" "$2 -timecode 02:56:14:13"; }
 +do_lavf_timecode_drop()   { do_lavf $1 "" "$2 -timecode 02:56:14.13 -r 30000/1001"; }
 +
 +do_lavf_timecode()
 +{
 +    do_lavf_timecode_nodrop "$@"
 +    do_lavf_timecode_drop "$@"
 +    do_lavf $1 "" "$2"
 +}
 +
  do_streamed_images()
  {
      file=${outfile}${1}pipe.$1