Merge the avutil branch; port the "raw" video output plugin.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c
rename : src/combined/ffmpeg/ffmpeg_encoder.c => src/dxr3/ffmpeg_encoder.c

1 files changed, 0 insertions, 47 deletions

diff --git a/contrib/ffmpeg/tests/server-regression.sh b/contrib/ffmpeg/tests/server-regression.sh
deleted file mode 100755
index 8e764410f..000000000
--- a/contrib/ffmpeg/tests/server-regression.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# Make sure that the data directory exists
-mkdir -p tests/data
-
-#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/test.conf
-#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/test.conf
-
-FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html`
-
-rm -f tests/feed1.ffm
-./ffserver -d -f tests/test.conf 2> /dev/null &
-FFSERVER_PID=$!
-sleep 2
-echo "Waiting for feeds to startup..."
-./ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i tests/vsynth1/%02d.pgm http://localhost:9999/feed1.ffm 2> /dev/null &
-FFMPEG_PID=$!
-sleep 5
-(
-    cd tests/data || exit $?
-    rm -f ff-*;
-    WGET_OPTIONS="--user-agent=NSPlayer -q --proxy=off -e verbose=off -e server_response=off"
-    for file in $FILES; do
-        if [ `expr $file : "a-*"` != 0 ]; then
-            wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file > ff-$file
-        else
-            wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file?date=19700101T000000Z | dd bs=1 count=20000 > ff-$file 2>/dev/null
-        fi
-        MDFILES="$MDFILES ff-$file"
-    done
-    wait
-    # the status page is always different
-    md5sum $MDFILES > ffserver.regression
-)
-kill $FFMPEG_PID
-kill $FFSERVER_PID
-wait > /dev/null 2>&1
-rm -f tests/feed1.ffm
-if diff -u tests/data/ffserver.regression "$1" ; then
-    echo
-    echo Server regression test succeeded.
-    exit 0
-else
-    echo
-    echo Server regression test: Error.
-    exit 1
-fi