Remove ffmpegdecall, it's been removed ages ago, and add matroska pipelines

Original commit message from CVS:
Remove ffmpegdecall, it's been removed ages ago, and add matroska pipelines
This commit is contained in:
Ronald S. Bultje 2003-12-13 18:31:12 +00:00
parent fd6b022682
commit 1e645fe4ef

View file

@ -103,8 +103,8 @@ read_config ($0);
%pipes = ( %pipes = (
"ac3", "a52dec ! $cfg{AUDIOSINK}", "ac3", "a52dec ! $cfg{AUDIOSINK}",
"au", "auparse ! $cfg{AUDIOSINK}", "au", "auparse ! $cfg{AUDIOSINK}",
"avi", "avidemux name=demux ! { queue ! jpegdec ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }", "avi", "avidemux name=demux ! { queue ! spider ! $cfg{VIDEOSINK} } { demux. ! queue ! spider ! $cfg{AUDIOSINK} }",
"asf", "asfdemux name=demux ! { queue ! ffmpegdecall ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }", "asf", "asfdemux name=demux ! { queue ! spider ! $cfg{VIDEOSINK} } { demux. ! queue ! spider ! $cfg{AUDIOSINK} }",
"flac", "flacdec ! $cfg{AUDIOSINK}", "flac", "flacdec ! $cfg{AUDIOSINK}",
"fli", "flxdec ! colorspace ! $cfg{VIDEOSINK}", "fli", "flxdec ! colorspace ! $cfg{VIDEOSINK}",
"m1v", "mpegdemux ! { queue ! mpeg2dec ! $cfg{VIDEOSINK} }", "m1v", "mpegdemux ! { queue ! mpeg2dec ! $cfg{VIDEOSINK} }",
@ -120,10 +120,12 @@ read_config ($0);
"swf", "swfdec name=swfdec ! { queue ! colorspace ! $cfg{VIDEOSINK} } { swfdec. ! queue ! $cfg{AUDIOSINK} }", "swf", "swfdec name=swfdec ! { queue ! colorspace ! $cfg{VIDEOSINK} } { swfdec. ! queue ! $cfg{AUDIOSINK} }",
"vob", "mpegdemux name=demux ! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } { demux. ! queue ! a52dec ! $cfg{AUDIOSINK} }", "vob", "mpegdemux name=demux ! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } { demux. ! queue ! a52dec ! $cfg{AUDIOSINK} }",
"wav", "wavparse ! $cfg{AUDIOSINK}", "wav", "wavparse ! $cfg{AUDIOSINK}",
"wm", "asfdemux name=demux ! { queue ! ffmpegdecall ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }", "wm", "asfdemux name=demux ! { queue ! spider ! $cfg{VIDEOSINK} } { demux. ! queue ! spider ! $cfg{AUDIOSINK} }",
### a wma file can use wmav1 or wmav2 codec so we must use spider to decode it ### a wma file can use wmav1 or wmav2 codec so we must use spider to decode it
"wma", "asfdemux name=demux ! spider ! $cfg{AUDIOSINK}", "wma", "asfdemux name=demux ! spider ! $cfg{AUDIOSINK}",
"wmv", "asfdemux name=demux ! { queue ! ffmpegdecall ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }", "wmv", "asfdemux name=demux ! { queue ! spider ! $cfg{VIDEOSINK} } { demux. ! queue ! spider ! $cfg{AUDIOSINK} }",
"mkv", "matroskademux name=demux ! { queue ! spider ! $cfg{VIDEOSINK} } { demux. ! queue ! spider ! $cfg{AUDIOSINK} }",
"mka", "matroskademux ! spider ! $cfg{AUDIOSINK}",
); );
if ($cfg{VISUALIZER}) { if ($cfg{VISUALIZER}) {