summaryrefslogtreecommitdiff
path: root/contrib/ffmpeg/tests/test.conf
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-03 01:18:24 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-03 01:18:24 +0200
commitfb09531720a4aa2dfa97e5a9a246a453b6278fd2 (patch)
tree61525c3a8ddb419d3838a26e488fc3659079bbcd /contrib/ffmpeg/tests/test.conf
parent294d01046724e28b7193bcb65bf2a0391b0135b6 (diff)
downloadxine-lib-fb09531720a4aa2dfa97e5a9a246a453b6278fd2.tar.gz
xine-lib-fb09531720a4aa2dfa97e5a9a246a453b6278fd2.tar.bz2
Sync with a more recent version of FFmpeg.
Diffstat (limited to 'contrib/ffmpeg/tests/test.conf')
-rw-r--r--contrib/ffmpeg/tests/test.conf7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/ffmpeg/tests/test.conf b/contrib/ffmpeg/tests/test.conf
index cc2038a60..afd4c16fb 100644
--- a/contrib/ffmpeg/tests/test.conf
+++ b/contrib/ffmpeg/tests/test.conf
@@ -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 feed1.ffm
FileMaxSize 100M
# Fire up ffmpeg pointing at this stream
-Launch ../ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i vsynth1/%02d.pgm
-acl allow localhost
+#Launch ../../ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i vsynth1/%02d.pgm
+
+ACL allow localhost
</Feed>
##################################################################