diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tools/gst-launch-ext-m.m | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2005-01-17 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * tools/gst-launch-ext-m.m: + Add .aac, fix .m1v/.m2v (#163891). + +2005-01-17 Ronald S. Bultje <rbultje@ronald.bitfreak.net> + * ext/alsa/gstalsaclock.c: (gst_alsa_clock_wait): Sanity check, don't wait endlessly since the clock might not actually run at this point (which is a deadlock). Fixes #164069. diff --git a/tools/gst-launch-ext-m.m b/tools/gst-launch-ext-m.m index 1711bcda..0c0e78cc 100644 --- a/tools/gst-launch-ext-m.m +++ b/tools/gst-launch-ext-m.m @@ -107,9 +107,10 @@ read_config ($0); "asf", "decodebin name=d ! { d. ! queue ! ffmpegcolorspace ! $cfg{VIDEOSINK} } { d. ! queue ! audioconvert ! audioscale ! $cfg{AUDIOSINK} }", "flac", "flacdec ! $cfg{AUDIOSINK}", "fli", "flxdec ! colorspace ! $cfg{VIDEOSINK}", - "m1v", "mpegdemux ! { queue ! mpeg2dec ! $cfg{VIDEOSINK} }", - "m2v", "mpegdemux ! { queue ! mpeg2dec ! $cfg{VIDEOSINK} }", + "m1v", "mpeg2dec ! $cfg{VIDEOSINK}", + "m2v", "mpeg2dec ! $cfg{VIDEOSINK}", "m4a", "qtdemux .audio_00 ! { queue ! faad ! $cfg{AUDIOSINK} }", + "aac", "faad ! $cfg{AUDIOSINK}", "mod", "modplug ! $cfg{AUDIOSINK}", "mpc", "musepackdec ! $cfg{AUDIOSINK}", "mp2", "mad ! $cfg{AUDIOSINK}", |