diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-12-13 18:31:12 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2003-12-13 18:31:12 +0000 |
| commit | 1e645fe4efe9938acec469d6396d564548932601 (patch) | |
| tree | 797beff90853fcee9bb9c8d0389c9a78765c5ea7 /tools | |
| parent | fd6b02268238e8c12b484852807830118957d84b (diff) | |
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
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/gst-launch-ext.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/gst-launch-ext.in b/tools/gst-launch-ext.in index 5ff7f7ad..643ba877 100755 --- a/tools/gst-launch-ext.in +++ b/tools/gst-launch-ext.in @@ -103,8 +103,8 @@ read_config ($0); %pipes = ( "ac3", "a52dec ! $cfg{AUDIOSINK}", "au", "auparse ! $cfg{AUDIOSINK}", - "avi", "avidemux name=demux ! { queue ! jpegdec ! $cfg{VIDEOSINK} } { demux. ! queue ! mad ! $cfg{AUDIOSINK} }", - "asf", "asfdemux name=demux ! { queue ! ffmpegdecall ! $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 ! spider ! $cfg{VIDEOSINK} } { demux. ! queue ! spider ! $cfg{AUDIOSINK} }", "flac", "flacdec ! $cfg{AUDIOSINK}", "fli", "flxdec ! colorspace ! $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} }", "vob", "mpegdemux name=demux ! { queue ! mpeg2dec ! $cfg{VIDEOSINK} } { demux. ! queue ! a52dec ! $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 "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}) { |