RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '5846b496f0a1dd5be4ef714622940674305ec00f' 

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

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-03-10 22:26:17 -03:00
parent bad70b7af6 5846b496f0
commit 5ab44ff20c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/lavf-regression.sh
View File

@ -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