mirror of https://github.com/mpv-player/mpv
3ivx dshow added, ulaw/vbr mp3/cbr mp3 for MOV files added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2376 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
2ded98ac46
commit
a21a9c496c
|
@ -148,6 +148,8 @@ videocodec mjpeg
|
||||||
info "Motion JPEG"
|
info "Motion JPEG"
|
||||||
status working
|
status working
|
||||||
fourcc MJPG
|
fourcc MJPG
|
||||||
|
; fourcc mjpa ; MOV files
|
||||||
|
; fourcc mjpb ; MOV files
|
||||||
driver vfw
|
driver vfw
|
||||||
dll "mcmjpg32.dll"
|
dll "mcmjpg32.dll"
|
||||||
; dll "m3jpeg32.dll"
|
; dll "m3jpeg32.dll"
|
||||||
|
@ -453,6 +455,17 @@ videocodec msrle
|
||||||
dll "xa_rle8"
|
dll "xa_rle8"
|
||||||
out BGR32,BGR24,BGR16,BGR15
|
out BGR32,BGR24,BGR16,BGR15
|
||||||
|
|
||||||
|
videocodec 3ivx
|
||||||
|
info "3IVX MPEG4 Codec"
|
||||||
|
status crashing
|
||||||
|
fourcc 3IV1,3ivx
|
||||||
|
driver dshow
|
||||||
|
dll "3ivxdmo.dll"
|
||||||
|
guid 0x0E6772C0, 0xDD80, 0x11D4, 0xB5, 0x8f, 0xA8, 0x6B, 0x66, 0xd0, 0x61, 0x1c
|
||||||
|
out YUY2
|
||||||
|
out UYVY
|
||||||
|
out BGR32,BGR24,BGR16,BGR15
|
||||||
|
|
||||||
videocodec null
|
videocodec null
|
||||||
info "NULL codec (no decoding)"
|
info "NULL codec (no decoding)"
|
||||||
status working
|
status working
|
||||||
|
@ -464,6 +477,7 @@ videocodec null
|
||||||
out UYVY
|
out UYVY
|
||||||
out BGR32,BGR24,BGR16,BGR15
|
out BGR32,BGR24,BGR16,BGR15
|
||||||
|
|
||||||
|
|
||||||
;=============================================================================
|
;=============================================================================
|
||||||
; AUDIO CODECS
|
; AUDIO CODECS
|
||||||
;=============================================================================
|
;=============================================================================
|
||||||
|
@ -505,6 +519,8 @@ audiocodec mp3
|
||||||
comment "Optimized to MMX/SSE/3Dnow!"
|
comment "Optimized to MMX/SSE/3Dnow!"
|
||||||
format 0x50
|
format 0x50
|
||||||
format 0x55
|
format 0x55
|
||||||
|
format 0x33706d2e ; ".mp3" VBR MP3 (MOV files)
|
||||||
|
format 0x4400736d ; "ms\0\x55" CBR MP3 (MOV files)
|
||||||
driver mp3lib
|
driver mp3lib
|
||||||
dll "mp3lib (mpglib)"
|
dll "mp3lib (mpglib)"
|
||||||
flags seekable
|
flags seekable
|
||||||
|
@ -562,6 +578,7 @@ audiocodec ulaw
|
||||||
info "uLaw"
|
info "uLaw"
|
||||||
status working
|
status working
|
||||||
format 0x7
|
format 0x7
|
||||||
|
format 0x66515c75 ; "ulaw" (MOV files)
|
||||||
driver alaw
|
driver alaw
|
||||||
dll "ulaw"
|
dll "ulaw"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue