comparison etc/codecs.conf @ 14843:bbb693d3b130

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...
author rfelker
date Sun, 27 Feb 2005 18:11:17 +0000
parents a7cc851f72ad
children ed06939c5217
comparison
equal deleted inserted replaced
14842:31ab04004943 14843:bbb693d3b130
198 198
199 videocodec theora 199 videocodec theora
200 info "Theora (free, reworked VP3)" 200 info "Theora (free, reworked VP3)"
201 status working 201 status working
202 fourcc theo,Thra 202 fourcc theo,Thra
203 format 0xFFFC
204 driver theora 203 driver theora
205 dll libtheora 204 dll libtheora
206 out YV12 205 out YV12
207 206
208 ; prefer native codecs over win32? 207 ; prefer native codecs over win32?
2171 info "Uncompressed PCM" 2170 info "Uncompressed PCM"
2172 status working 2171 status working
2173 format 0x0 2172 format 0x0
2174 format 0x1 2173 format 0x1
2175 format 0x3 ; IEEE float 2174 format 0x3 ; IEEE float
2175 format 0xfffe ; Extended
2176 format 0x20776172 ; "raw " (MOV files) 2176 format 0x20776172 ; "raw " (MOV files)
2177 format 0x736f7774 ; "twos" (MOV files) 2177 format 0x736f7774 ; "twos" (MOV files)
2178 format 0x74776f73 ; "sowt" (MOV files) 2178 format 0x74776f73 ; "sowt" (MOV files)
2179 format 0x32336c66 ; "fl32" (MOV files) 2179 format 0x32336c66 ; "fl32" (MOV files)
2180 format 0x454e4f4e ; "NONE" (MOV files from Kodak CX6320) 2180 format 0x454e4f4e ; "NONE" (MOV files from Kodak CX6320)
2477 2477
2478 audiocodec vorbis 2478 audiocodec vorbis
2479 info "OggVorbis Audio Decoder" 2479 info "OggVorbis Audio Decoder"
2480 status working 2480 status working
2481 comment "OggVorbis driver using libvorbis" 2481 comment "OggVorbis driver using libvorbis"
2482 format 0xFFFE 2482 fourcc vrbs
2483 driver libvorbis 2483 driver libvorbis
2484 dll "libvorbis" 2484 dll "libvorbis"
2485 ; acm codec doesn't work, haven't tried zorannt dshow codec 2485 ; acm codec doesn't work, haven't tried zorannt dshow codec
2486 ; driver acm 2486 ; driver acm
2487 ; dll "vorbis.acm" 2487 ; dll "vorbis.acm"