factorize read_header failure freeing code

[ffmpeg] / tests / test.conf

diff --git a/tests/test.conf b/tests/test.conf
index 5e58975f183b9b5793cf5726e20767b30662546a..13b597f7f0c1e153da81833e3fd1da796d2d7bd2 100644 (file)
--- a/tests/test.conf
+++ b/tests/test.conf
@@ -42,7 +42,7 @@ CustomLog -
 
 # You must use 'ffmpeg' to send a live feed to ffserver. In this
 # example, you can type:
-# 
+#
 # ffmpeg http://localhost:8090/feed1.ffm
 
 # ffserver can also do time shifting. It means that it can stream any
@@ -52,13 +52,14 @@ CustomLog -
 # maximum size of the feed (100M bytes here). Default:
 # File=/tmp/feed_name.ffm FileMaxSize=5M
 
-File /tmp/feed.ffm
+File tests/feed1.ffm
 FileMaxSize 100M
 
 # Fire up ffmpeg pointing at this stream
 
-Launch -loop -bitexact -dct_algo 1 -idct_algo 2 -y -f pgmyuv -i vsynth1/%d.pgm
-acl allow localhost
+Launch ./ffmpeg -v 0 -y -f pgmyuv -i tests/vsynth1/%02d.pgm
+
+ACL allow localhost
 </Feed>
 
 ##################################################################
@@ -71,6 +72,9 @@ acl allow localhost
 Feed feed1.ffm
 Format avi
 #
+BitExact
+DctFastint
+IdctSimple
 VideoFrameRate 10
 VideoSize 352x288
 VideoBitRate 100
@@ -87,6 +91,9 @@ MaxTime 100
 Feed feed1.ffm
 Format avi
 #
+BitExact
+DctFastint
+IdctSimple
 VideoFrameRate 2
 VideoSize 320x240
 VideoBitRate 40
@@ -132,6 +139,10 @@ MaxTime 100
 <Stream test.swf>
 Feed feed1.ffm
 #
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
 VideoFrameRate 10
 VideoSize 352x288
 VideoBitRate 100
@@ -148,6 +159,10 @@ MaxTime 100
 Feed feed1.ffm
 Format asf
 #
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
 VideoFrameRate 10
 VideoSize 320x240
 VideoBitRate 100
@@ -166,6 +181,10 @@ Title "Test data stream"
 Feed feed1.ffm
 Format asf
 #
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
 VideoFrameRate 2
 VideoSize 320x240
 VideoBitRate 40
@@ -185,6 +204,10 @@ Title "Test data stream"
 Feed feed1.ffm
 Format rm
 
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
 VideoBitRate 100
 VideoFrameRate 10
 VideoGopSize 30
@@ -202,6 +225,10 @@ MaxTime 100
 Feed feed1.ffm
 Format rm
 
+BitExact
+DctFastint
+IdctSimple
+Qscale 10
 VideoBitRate 40
 VideoFrameRate 2
 VideoGopSize 20
@@ -218,8 +245,12 @@ MaxTime 100
 <Stream test.jpg>
 
 Feed feed1.ffm
-Format singlejpeg
+Format jpeg
+Strict -1
 
+BitExact
+DctFastint
+IdctSimple
 VideoFrameRate 1
 VideoSize 352x288
 NoAudio
@@ -231,8 +262,12 @@ PreRoll 2
 <Stream test_small.jpg>
 
 Feed feed1.ffm
-Format singlejpeg
+Format jpeg
+Strict -1
 
+BitExact
+DctFastint
+IdctSimple
 VideoFrameRate 1
 VideoSize 160x128
 NoAudio
@@ -245,7 +280,11 @@ PreRoll 2
 
 Feed feed1.ffm
 Format mpjpeg
+Strict -1
 
+BitExact
+DctFastint
+IdctSimple
 VideoFrameRate 1
 VideoSize    320x240
 NoAudio