summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-02-27 18:11:17 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-02-27 18:11:17 +0000
commit4eb1b755bb6df1bd35ae07c9c67eb3644ad63bd8 (patch)
treef243be3bbd584b76020c8a255200ad7d63e6b19b /etc
parent0fc2c5de815c9f64d10a4609cca3c0e1c11d32ab (diff)
downloadmpv-4eb1b755bb6df1bd35ae07c9c67eb3644ad63bd8.tar.bz2
mpv-4eb1b755bb6df1bd35ae07c9c67eb3644ad63bd8.tar.xz
Fix the ogg fourcc nightmare!!!
The problem: once upon a time, windows idiots decided to try to store vorbis-in-ogg-in-avi. Of course this failed miserably, but they used the audio format tag 0xfffe for "extended" to do this. Later someone working on MPlayer somehow decided 0xfffe was the format for vorbis, which is nonsense, and now that's conflicting with real wav files with extended audio format. This patch changes demux_ogg (and mkv) to use sane fourcc's for vorbis and theora and gets rid of the 0xfffe nonsense so hopefully wav files with extended audio will work now. If there are problems, we'll have to find workarounds...and drive an 18-wheeler full of cola thru the house of whoever wrote this 0xfffe nonsense in MPlayer to begin with... git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14844 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/codecs.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 6d9061b1a0..51d31896fb 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -200,7 +200,6 @@ videocodec theora
info "Theora (free, reworked VP3)"
status working
fourcc theo,Thra
- format 0xFFFC
driver theora
dll libtheora
out YV12
@@ -2173,6 +2172,7 @@ audiocodec pcm
format 0x0
format 0x1
format 0x3 ; IEEE float
+ format 0xfffe ; Extended
format 0x20776172 ; "raw " (MOV files)
format 0x736f7774 ; "twos" (MOV files)
format 0x74776f73 ; "sowt" (MOV files)
@@ -2479,7 +2479,7 @@ audiocodec vorbis
info "OggVorbis Audio Decoder"
status working
comment "OggVorbis driver using libvorbis"
- format 0xFFFE
+ fourcc vrbs
driver libvorbis
dll "libvorbis"
; acm codec doesn't work, haven't tried zorannt dshow codec