[FFmpeg-cvslog] Merge commit '5846b496f0a1dd5be4ef714622940674305ec00f'

[James Almer]

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

Merge commit '5846b496f0a1dd5be4ef714622940674305ec00f'

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

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

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

 tests/lavf-regression.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index ed2a44e3f9..c5b6734815 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -24,8 +24,9 @@ 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"; }
@@ -73,9 +74,8 @@ fi
 
 if [ -n "$do_rm" ] ; then
 file=${outfile}lavf.rm
-do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le -i $pcm_src $ENC_OPTS -t 1 -qscale 10 -acodec ac3_fixed -ab 64k
-# broken
-#do_avconv_crc $file -i $target_path/$file
+# The RealMedia muxer is broken.
+do_lavf rm "" "-c:a ac3_fixed" "" disable_crc
 fi
 
 if [ -n "$do_mpg" ] ; then


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

diff --cc tests/lavf-regression.sh
index ed2a44e3f9,4161e375ee..c5b6734815
--- a/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