[MPlayer-cvslog] r28014 - in trunk: etc/codecs.conf libmpcodecs/ad_libvorbis.c

[diego]

Author: diego
Date: Mon Nov 24 09:31:44 2008
New Revision: 28014

Log:
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.


Modified:
   trunk/etc/codecs.conf
   trunk/libmpcodecs/ad_libvorbis.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	(original)
+++ trunk/etc/codecs.conf	Mon Nov 24 09:31:44 2008
@@ -3491,6 +3491,15 @@ audiocodec vorbis
   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

Modified: trunk/libmpcodecs/ad_libvorbis.c
==============================================================================
--- trunk/libmpcodecs/ad_libvorbis.c	(original)
+++ trunk/libmpcodecs/ad_libvorbis.c	Mon Nov 24 09:31:44 2008
@@ -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",
 	""