diff --git a/etc/codecs.conf b/etc/codecs.conf index 7f51d7b057..dc1171a289 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -126,7 +126,7 @@ videocodec cram fourcc wham,WHAM CRAM driver vfw dll "msvidc32.dll" - out BGR8,BGR15,BGR24 + out BGR24,BGR15,BGR8 videocodec cvidvfw info "Cinepak Video" @@ -381,6 +381,7 @@ videocodec ubmp4 ; Notes: m3jpeg+mjpeg are mmx optimized. avid is very stable but slow. ; ijpg only decodes jpeg images (no mjpg), and slow. ffmjpeg is buggy. +; http://www.morgan-multimedia.com/dev/codec_spec.htm videocodec m3jpeg info "Morgan Motion JPEG Codec" status working @@ -389,6 +390,8 @@ videocodec m3jpeg fourcc dmb1 MJPG ; MJPEG by Matrox Rainbow Runner driver vfw dll "m3jpeg32.dll" + out I420 + out YV12 out YUY2 out UYVY out BGR32,BGR24,BGR15 @@ -445,6 +448,7 @@ videocodec ffmjpeg out YUY2 ; queryed (conversion from yuv422p) out YV12,I420,IYUV +; http://www.morgan-multimedia.com/dev/directshow_dec_spec.htm videocodec m3jpegds info "Morgan MJPEG" status crashing @@ -454,6 +458,7 @@ videocodec m3jpegds driver dshow dll "m3jpegdec.ax" guid 0x6988b440, 0x8352, 0x11d3, 0x9b, 0xda, 0xca, 0x86, 0x73, 0x7c, 0x71, 0x68 + out I420 out YUY2 out UYVY out BGR32,BGR24,BGR16,BGR15 @@ -497,7 +502,7 @@ videocodec vivo in BGR24 videocodec u263 - info "UB Video H.263+ Decoder" + info "UB Video H.263/H.263+/H.263++ Decoder" comment "added by Juanjo" status working fourcc U263 @@ -506,11 +511,8 @@ videocodec u263 driver dshow dll "ubv263d+.ax" guid 0x00af1181, 0x6ebb, 0x11d4, 0x9d, 0x5a, 0x00, 0x50, 0x04, 0x79, 0x6c, 0xc0 -; out I420 flip -; out YVYU flip,noflip -; out YV12 flip -; out UYVY flip,noflip -; out YUY2 flip +; out UYVY +; BGR32,BGR16,BGR15 seems to work too out BGR24 flip videocodec i263 @@ -521,7 +523,7 @@ videocodec i263 fourcc viv1 I263 driver vfw dll "i263_32.drv" -; out I420 + out I420 out YUY2 out BGR32,BGR24,BGR15 @@ -711,9 +713,7 @@ videocodec mwv1 fourcc MWV1 driver vfw dll "icmw_32.dll" -; out YV12 flip -; out YUY2 flip - out BGR32,BGR24,BGR15 flip + out BGR24,BGR15 flip videocodec asv2 info "ASUS V2"