mjpeg codecs reordered - now it plays almost everything by default

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6897 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-08-04 16:06:24 +00:00
parent e2422e4683
commit 561e93faa6
1 changed files with 27 additions and 23 deletions

View File

@ -430,6 +430,31 @@ videocodec ubmp4
; mjpegs: ; mjpegs:
; Notes: m3jpeg+mjpeg are mmx optimized. avid is very stable but slow. ; Notes: m3jpeg+mjpeg are mmx optimized. avid is very stable but slow.
; ijpg only decodes jpeg images (no mjpg), and slow. ffmjpeg is buggy. ; ijpg only decodes jpeg images (no mjpg), and slow. ffmjpeg is buggy.
; Update: ffmjpeg is almost perfect now, prefer it to others.
; fails only with Spectralfan.mov (marker bug?) & imgp1066.avi (0x0 size)
videocodec ffmjpeg
info "FFmpeg MJPEG decoder"
status working
fourcc MJPG,mjpg
fourcc AVRn,AVDJ ; AVID
fourcc jpeg ; photo-jpeg
driver ffmpeg
dll mjpeg
out 422P
out YUY2 ; queryed (conversion from yuv422p)
out YV12,I420,IYUV
; slow. usable only for standalone jpegs, like -mf, avid or photojpeg:
videocodec ijpg
info "Independent JPEG Group's codec"
status working
fourcc ijpg,IJPG ; -mf type=jpeg
fourcc jpeg ; MOV Photo Jpeg
fourcc AVRn,AVDJ ; AVID
driver ijpg
dll libjpeg
out RGB24,BGR24,BGR32
; http://www.morgan-multimedia.com/dev/codec_spec.htm ; http://www.morgan-multimedia.com/dev/codec_spec.htm
videocodec m3jpeg videocodec m3jpeg
@ -458,6 +483,7 @@ videocodec mjpeg
videocodec avid videocodec avid
info "AVID Motion JPEG" info "AVID Motion JPEG"
status working status working
comment "slooooooooow but stable"
fourcc AVRn fourcc AVRn
fourcc AVDJ AVRn fourcc AVDJ AVRn
fourcc MJPG,mjpg AVRn fourcc MJPG,mjpg AVRn
@ -470,33 +496,11 @@ videocodec LEAD
status working status working
comment "supports interlaced MJPEG" comment "supports interlaced MJPEG"
fourcc MJPG fourcc MJPG
fourcc jpeg MJPG fourcc jpeg MJPG ; MOV Photo Jpeg
driver vfw driver vfw
dll "LCodcCMP.dll" dll "LCodcCMP.dll"
out BGR24,BGR15 out BGR24,BGR15
videocodec ijpg
info "Independent JPEG Group's codec"
status working
fourcc ijpg,IJPG
fourcc jpeg ; MOV Photo Jpeg
fourcc AVRn,AVDJ ; AVID
driver ijpg
dll libjpeg
out RGB24,BGR24,BGR32
videocodec ffmjpeg
info "FFmpeg MJPEG decoder"
status working
fourcc MJPG,mjpg
; fourcc AVRn
fourcc jpeg ; photo-jpeg
driver ffmpeg
dll mjpeg
out 422P
out YUY2 ; queryed (conversion from yuv422p)
out YV12,I420,IYUV
; http://www.morgan-multimedia.com/dev/directshow_dec_spec.htm ; http://www.morgan-multimedia.com/dev/directshow_dec_spec.htm
videocodec m3jpegds videocodec m3jpegds
info "Morgan MJPEG" info "Morgan MJPEG"