Mercurial > mplayer.hg

changeset 27980:21779d5ea61c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Create a separate codecs.conf entry for Tremor and use it if MPlayer is with Tremor support instead of libvorbis. Previously MPlayer would show the same output on the console when decoding with libvorbis and Tremor.
author diego
date Mon, 24 Nov 2008 08:31:44 +0000
parents 5c4dbd36c0cf
children 53912f852a86
files etc/codecs.conf libmpcodecs/ad_libvorbis.c
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Mon Nov 24 08:29:34 2008 +0000
+++ b/etc/codecs.conf	Mon Nov 24 08:31:44 2008 +0000
@@ -3491,6 +3491,15 @@
   driver libvorbis
   dll "libvorbis"
 
+audiocodec tremor
+  info "OggVorbis audio decoder"
+  status working
+  comment "OggVorbis driver using Tremor"
+  fourcc vrbs
+  format 0x566F
+  driver tremor
+  dll "tremor"
+
 audiocodec vorbisacm
   info "OggVorbis ACM"
   status working
--- a/libmpcodecs/ad_libvorbis.c	Mon Nov 24 08:29:34 2008 +0000
+++ b/libmpcodecs/ad_libvorbis.c	Mon Nov 24 08:31:44 2008 +0000
@@ -12,7 +12,11 @@
 static ad_info_t info = 
 {
 	"Ogg/Vorbis audio decoder",
+#ifdef CONFIG_TREMOR
+	"tremor",
+#else
 	"libvorbis",
+#endif
 	"Felix Buenemann, A'rpi",
 	"libvorbis",
 	""