diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-11-24 08:31:44 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-11-24 08:31:44 +0000 |
| commit | 5351098826082eac9b98bf614952f59a6f435e95 (patch) | |
| tree | e475a2dff091f088ca06b8c2bb9481f321342a69 | |
| parent | 17aebba77f4087e4780ae783babecd25790c732c (diff) | |
| download | mpv-5351098826082eac9b98bf614952f59a6f435e95.tar.bz2 mpv-5351098826082eac9b98bf614952f59a6f435e95.tar.xz | |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28014 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 9 | ||||
| -rw-r--r-- | libmpcodecs/ad_libvorbis.c | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index a4989bc057..1068a14fc0 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -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 diff --git a/libmpcodecs/ad_libvorbis.c b/libmpcodecs/ad_libvorbis.c index dd20c34984..30e6604080 100644 --- a/libmpcodecs/ad_libvorbis.c +++ b/libmpcodecs/ad_libvorbis.c @@ -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", "" |