diff options
| author | James Almer <jamrial@gmail.com> | 2019-03-10 22:26:17 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-03-10 22:28:03 -0300 |
| commit | 5ab44ff20cdc0e05adecbd0cd352d25fcb930094 (patch) | |
| tree | b5fab960082b5f6da2d9449feacd4cd150eee64e /tests | |
| parent | bad70b7af6b909691f5389e14eb7d0c03db10af9 (diff) | |
| parent | 5846b496f0a1dd5be4ef714622940674305ec00f (diff) | |
| download | ffmpeg-streaming-5ab44ff20cdc0e05adecbd0cd352d25fcb930094.zip ffmpeg-streaming-5ab44ff20cdc0e05adecbd0cd352d25fcb930094.tar.gz | |
Merge commit '5846b496f0a1dd5be4ef714622940674305ec00f'
* commit '5846b496f0a1dd5be4ef714622940674305ec00f':
tests: Use a predefined function for lavf-rm test
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/lavf-regression.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index ed2a44e..c5b6734 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 |
