aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2008-03-07 19:27:14 +0000
committerMåns Rullgård <mans@mansr.com>2008-03-07 19:27:14 +0000
commit88b5db9f0881b8d22dc9a5f9e824ed1d22b375a0 (patch)
treee5009d12e528098f415963a6bf728e55f45442f6
parent5b67e4f8b8674a01e80ece5294199b177684b8a6 (diff)
downloadffmpeg-88b5db9f0881b8d22dc9a5f9e824ed1d22b375a0.tar.gz
replace -f pgmyuv with -f image2 -vcodec pgmyuv
Originally committed as revision 12361 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xtests/regression.sh18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/regression.sh b/tests/regression.sh
index 0b660cf551..99231513b1 100755
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -132,7 +132,7 @@ do_audio_decoding()
do_libav()
{
file=${outfile}libav.$1
- do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $2 $file
+ do_ffmpeg $file -t 1 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src -f s16le -i $pcm_src $2 $file
do_ffmpeg_crc $file -i $file $3
}
@@ -140,14 +140,14 @@ do_libav()
do_streamed_images()
{
file=${outfile}${1}pipe.$1
- do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f image2pipe $file
+ do_ffmpeg $file -t 1 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src -f image2pipe $file
do_ffmpeg_crc $file -f image2pipe -i $file
}
do_image_formats()
{
file=${outfile}libav%02d.$1
- $ffmpeg -t 0.5 -y -qscale 10 -f pgmyuv -i $raw_src $2 $3 -flags +bitexact $file
+ $ffmpeg -t 0.5 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src $2 $3 -flags +bitexact $file
do_ffmpeg_crc $file $3 -i $file
do_md5sum ${outfile}libav02.$1 >> $logfile
}
@@ -164,7 +164,7 @@ rm -f "$benchfile"
# generate reference for quality check
if [ -n "$do_ref" ]; then
-do_ffmpeg_nocheck $raw_ref -y -f pgmyuv -i $raw_src -an -f rawvideo $raw_ref
+do_ffmpeg_nocheck $raw_ref -y -f image2 -vcodec pgmyuv -i $raw_src -an -f rawvideo $raw_ref
do_ffmpeg_nocheck $pcm_ref -y -ab 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav $pcm_ref
fi
@@ -452,7 +452,7 @@ fi
if [ -n "$do_rm" ] ; then
file=${outfile}libav.rm
-do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file
+do_ffmpeg $file -t 1 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src -f s16le -i $pcm_src $file
# broken
#do_ffmpeg_crc $file -i $file
fi
@@ -501,7 +501,7 @@ fi
# streamed images
# mjpeg
#file=${outfile}libav.mjpeg
-#do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src $file
+#do_ffmpeg $file -t 1 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src $file
#do_ffmpeg_crc $file -i $file
if [ -n "$do_pbmpipe" ] ; then
@@ -518,13 +518,13 @@ fi
if [ -n "$do_gif" ] ; then
file=${outfile}libav.gif
-do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -pix_fmt rgb24 $file
+do_ffmpeg $file -t 1 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src -pix_fmt rgb24 $file
#do_ffmpeg_crc $file -i $file
fi
if [ -n "$do_yuv4mpeg" ] ; then
file=${outfile}libav.y4m
-do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src $file
+do_ffmpeg $file -t 1 -y -qscale 10 -f image2 -vcodec pgmyuv -i $raw_src $file
#do_ffmpeg_crc $file -i $file
fi
@@ -600,7 +600,7 @@ conversions="yuv420p yuv422p yuv444p yuyv422 yuv410p yuv411p yuvj420p \
monob pal8 yuv440p yuvj440p"
for pix_fmt in $conversions ; do
file=${outfile}libav-${pix_fmt}.yuv
- do_ffmpeg_nocheck $file -r 1 -t 1 -y -f pgmyuv -i $raw_src \
+ do_ffmpeg_nocheck $file -r 1 -t 1 -y -f image2 -vcodec pgmyuv -i $raw_src \
-f rawvideo -s 352x288 -pix_fmt $pix_fmt $raw_dst
do_ffmpeg $file -f rawvideo -s 352x288 -pix_fmt $pix_fmt -i $raw_dst \
-f rawvideo -s 352x288 -pix_fmt yuv444p $file