3 files changed, 20 insertions, 19 deletions
diff --git a/tests/Makefile b/tests/Makefile
index f54f76f1a8..6e3a5ffb3d 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -14,13 +14,14 @@ SERVER_REFFILE=$(SRC_PATH)/tests/ffserver.regression.ref
 
 LIBAV_REFFILE=$(SRC_PATH)/tests/libav.regression.ref
 
-all fulltest: test libavtest test-server
+all fulltest: codectest libavtest test-server
+test: codectest libavtest
 
 test-server: vsynth1/0.pgm asynth1.sw
 	@$(SRC_PATH)/tests/server-regression.sh $(SERVER_REFFILE) $(SRC_PATH)/tests/test.conf
 
 # fast regression tests for all codecs
-test mpeg4 mpeg ac3: vsynth1/0.pgm vsynth2/0.pgm asynth1.sw tiny_psnr
+codectest mpeg4 mpeg ac3: vsynth1/0.pgm vsynth2/0.pgm asynth1.sw tiny_psnr
 	@$(SRC_PATH)/tests/regression.sh $@ $(REFFILE1) vsynth1
 	@$(SRC_PATH)/tests/regression.sh $@ $(REFFILE2) vsynth2
 
diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index 9e8566de23..f581f5cd85 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -2,18 +2,18 @@ ffmpeg regression test
 3dc28f3e65addfcf907624805e92c34e *./data/b-libav.avi
 ./data/b-libav.avi CRC=a08a5739
 f34176ef4f8577c93d51d7c403c8776d *./data/b-libav.asf
-./data/b-libav.asf CRC=07970214
+./data/b-libav.asf CRC=d9682c23
 59c71a1bef09beb4a4e6f203967d12de *./data/b-libav.rm
-3e16badd4824d590f91356a5e63425c0 *./data/b-libav.mpg
-./data/b-libav.mpg CRC=b4d90f9b
-976a303a3f2f3c262d52b6dd5e744328 *./data/b-libav.swf
-./data/b-libav.swf CRC=acd21fcb
-3db96a1e2309b38a048605403496eec2 *./data/b-libav.ffm
-./data/b-libav.ffm CRC=eb51d2a4
+a2ac19d68574d38e84138e0b06e609c2 *./data/b-libav.mpg
+./data/b-libav.mpg CRC=b67a9677
+dde4b41bc9a9a182242108318aa70903 *./data/b-libav.swf
+./data/b-libav.swf CRC=066545e4
 964bf9fc730fa66e449b6670b705a56f *./data/b-libav.flv
 ./data/b-libav.flv CRC=e2e5bc81
-090ad4fe8f00144a2b782703d1e587d2 *./data/b-libav.nut
-./data/b-libav.nut CRC=a08a5739
+64b8a73fba1601648009298a6ad5ccf4 *./data/b-libav.mov
+./data/b-libav.mov CRC=8965cc31
+1422e60a67928a2d308bab86cce46721 *./data/b-libav.nut
+./data/b-libav.nut CRC=85260e12
 9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm
 ./data/b-libav.pbm CRC=a1057fd1
 6ea0e1faf08f6fcdb44db4a104361b57 *./data/b-libav.pgm
@@ -21,7 +21,7 @@ f34176ef4f8577c93d51d7c403c8776d *./data/b-libav.asf
 0c5fe86621b7377705837f304d4ba1e9 *./data/b-libav.ppm
 ./data/b-libav.ppm CRC=b2bb8e92
 1cac531652ea2ff2fb141d5ae992caa8 *./data/b-libav.gif
-85188c97f621d64af3b59e4528da6171 *./data/b-libav.yuv4mpeg
+995ab62524fd85ea1c017b69ead611c2 *./data/b-libav.yuv4mpeg
 ./data/b-libav%d.pgm CRC=84c09106
 ./data/b-libav%d.ppm CRC=25c06ecf
 4b7690747c49e4e8e910359768e4a77e *./data/b-libav.wav
diff --git a/tests/regression.sh b/tests/regression.sh
index 69e8a849cb..f12925709e 100755
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -449,13 +449,13 @@ do_ffmpeg_crc $file -i $file
 
 # swf (decode audio only)
 file=${outfile}libav.swf
-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 pgmyuv -i $raw_src -f s16le -i $pcm_src -acodec mp2 $file
 do_ffmpeg_crc $file -i $file
 
 # ffm
-file=${outfile}libav.ffm
-do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file
-do_ffmpeg_crc $file -i $file
+#file=${outfile}libav.ffm
+#do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file
+#do_ffmpeg_crc $file -i $file
 
 # flv
 file=${outfile}libav.flv
@@ -463,9 +463,9 @@ do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $f
 do_ffmpeg_crc $file -i $file
 
 # mov
-#file=${outfile}libav.mov
-#do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src $file
-#do_ffmpeg_crc $file -i $file
+file=${outfile}libav.mov
+do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src -f s16le -i $pcm_src -acodec pcm_alaw $file
+do_ffmpeg_crc $file -i $file
 
 # nut
 file=${outfile}libav.nut