From 1a14a27603fec02498627b6f92cea7bd57c8d41f Mon Sep 17 00:00:00 2001
From: Mans Rullgard <mans@mansr.com>
Date: Wed, 18 May 2011 15:13:58 +0100
Subject: [PATCH] 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>
---
tests/lavf-regression.sh | 4 ++--
tests/regression-funcs.sh | 7 -------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index 32d92de0b9d..94d258334bf 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -226,8 +226,8 @@ conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
monob yuv440p yuvj440p"
for pix_fmt in $conversions ; do
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 \
$ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p
done
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 035cbdb2f32..b79c258e77b 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -100,13 +100,6 @@ do_ffmpeg_crc()
echo "$f $(cat $crcfile)" >> $logfile
}
-do_ffmpeg_nocheck()
-{
- f="$1"
- shift
- run_ffmpeg $*
-}
-
do_video_decoding()
{
do_ffmpeg $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo $ENC_OPTS $2
--
GitLab