Browse Source

fate: remove do_ffmpeg_nocheck function

This function is essentially an alias for run_ffmpeg and is only
used in one place.  This patch removes the function and replaces
the call with the equivalent (simpler) run_ffmpeg call.

Signed-off-by: Mans Rullgard <mans@mansr.com>
tags/n0.8
Mans Rullgard 14 years ago
parent
commit
1a14a27603
2 changed files with 2 additions and 9 deletions
  1. +2
    -2
      tests/lavf-regression.sh
  2. +0
    -7
      tests/regression-funcs.sh

+ 2
- 2
tests/lavf-regression.sh View File

@@ -226,8 +226,8 @@ conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
monob yuv440p yuvj440p" monob yuv440p yuvj440p"
for pix_fmt in $conversions ; do for pix_fmt in $conversions ; do
file=${outfile}${pix_fmt}.yuv file=${outfile}${pix_fmt}.yuv
do_ffmpeg_nocheck $file $DEC_OPTS -r 1 -t 1 -f image2 -vcodec pgmyuv -i $raw_src \
$ENC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst
run_ffmpeg $DEC_OPTS -r 1 -t 1 -f image2 -vcodec pgmyuv -i $raw_src \
$ENC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt $target_path/$raw_dst
do_ffmpeg $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $target_path/$raw_dst \ do_ffmpeg $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $target_path/$raw_dst \
$ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
done done


+ 0
- 7
tests/regression-funcs.sh View File

@@ -100,13 +100,6 @@ do_ffmpeg_crc()
echo "$f $(cat $crcfile)" >> $logfile echo "$f $(cat $crcfile)" >> $logfile
} }


do_ffmpeg_nocheck()
{
f="$1"
shift
run_ffmpeg $*
}

do_video_decoding() do_video_decoding()
{ {
do_ffmpeg $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo $ENC_OPTS $2 do_ffmpeg $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo $ENC_OPTS $2


Loading…
Cancel
Save