Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
  fate: fix acodec/vsynth tests for make 3.81
  pcm_mpeg: fix number of consumed bytes to include the header.
  avfilter: include required header file avfilter.h in video.h
  x86: Avoid movs on BUTTERFLYPS when in AVX mode
  x86: use new schema for ASM macros
  fate: convert codec-regression.sh to makefile rules
  fate: allow tests to specify unit size for psnr comparison
  fate: teach videogen/rotozoom to output a single raw video stream
  http: Add support for reusing the http socket for subsequent requests
  http: Add support for using persistent connections

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 2 insertions, 34 deletions

diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index c4a0f40684..5f47b567fc 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -21,19 +21,15 @@ outfile="$datadir/$test_ref/"
 
 # various files
 ffmpeg="$target_exec ${target_path}/ffmpeg"
-tiny_psnr="tests/tiny_psnr"
 raw_src="${target_path}/$raw_src_dir/%02d.pgm"
 raw_dst="$datadir/$this.out.yuv"
-raw_ref="$datadir/$test_ref.ref.yuv"
 pcm_src="$target_datadir/asynth1.sw"
-pcm_dst="$datadir/$this.out.wav"
-pcm_ref="$datadir/$test_ref.ref.wav"
 pcm_src_1ch="$target_datadir/asynth-16000-1.wav"
 pcm_ref_1ch="$datadir/$test_ref-16000-1.ref.wav"
 crcfile="$datadir/$this.crc"
 target_crcfile="$target_datadir/$this.crc"
 
-cleanfiles="$raw_dst $pcm_dst $crcfile"
+cleanfiles="$raw_dst $crcfile"
 trap 'rm -f -- $cleanfiles' EXIT
 
 mkdir -p "$datadir"
@@ -65,13 +61,7 @@ do_avconv()
     set -- $* ${target_path}/$f
     run_avconv $*
     do_md5sum $f
-    if [ $f = $raw_dst ] ; then
-        $tiny_psnr $f $raw_ref
-    elif [ $f = $pcm_dst ] ; then
-        $tiny_psnr $f $pcm_ref 2
-    else
-        echo $(wc -c $f)
-    fi
+    echo $(wc -c $f)
 }
 
 do_avconv_nomd5()
@@ -97,34 +87,12 @@ do_avconv_crc()
     echo "$f $(cat $crcfile)"
 }
 
-do_video_decoding()
-{
-    do_avconv $raw_dst $DEC_OPTS $1 -i $target_path/$file -f rawvideo $ENC_OPTS -vsync 0 $2
-}
-
-do_video_encoding()
-{
-    file=${outfile}$1
-    do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS $2
-}
-
 do_video_encoding_nomd5()
 {
     file=${outfile}$1
     do_avconv_nomd5 $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS $2
 }
 
-do_audio_encoding()
-{
-    file=${outfile}$1
-    do_avconv $file $DEC_OPTS -ac 2 -ar 44100 -f s16le -i $pcm_src -ab 128k $ENC_OPTS $2
-}
-
-do_audio_decoding()
-{
-    do_avconv $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav $1
-}
-
 do_audio_decoding_nomd5()
 {
     do_avconv_nomd5 $pcm_dst $DEC_OPTS -i $target_path/$file -sample_fmt s16 -f wav $1