[MPlayer-cvslog] CVS: main/etc codecs.conf,1.401,1.402

[Richard Felker CVS]

CVS change done by Richard Felker CVS

Update of /cvsroot/mplayer/main/etc
In directory mail:/var2/tmp/cvs-serv30894/etc

Modified Files:
	codecs.conf 
Log Message:
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...



Index: codecs.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -r1.401 -r1.402
--- codecs.conf	27 Feb 2005 14:07:28 -0000	1.401
+++ codecs.conf	27 Feb 2005 18:11:17 -0000	1.402
@@ -200,7 +200,6 @@
   info "Theora (free, reworked VP3)"
   status working
   fourcc theo,Thra
-  format 0xFFFC
   driver theora
   dll libtheora
   out YV12
@@ -2173,6 +2172,7 @@
   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 @@
   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