diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/codecs.conf | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 27aa98265d..34ecad60cd 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -153,19 +153,28 @@ videocodec i263 out YUY2 out BGR32,BGR24,BGR15 +videocodec m3jpeg + info "Morgan Motion JPEG Codec" + status working + fourcc MJPG + fourcc mjpa,mjpb,mjpg MJPG ; MOV files + driver vfw + dll "m3jpeg32.dll" + out YUY2 + out UYVY + out BGR32,BGR24,BGR15 + videocodec mjpeg - info "Motion JPEG" + info "MainConcept Motion JPEG" status working fourcc MJPG fourcc mjpa,mjpb,mjpg MJPG ; MOV files driver vfw dll "mcmjpg32.dll" -; dll "m3jpeg32.dll" out YUY2 out UYVY out BGR32,BGR24,BGR15 - ; =============== FFMPEG MPEG CODECS ========================= videocodec ffmjpeg @@ -264,7 +273,7 @@ videocodec indeo5ds driver dshow dll "ir50_32.dll" guid 0x30355649, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 -; out YV12,I420 + out YV12 out YUY2 out BGR32,BGR24,BGR16,BGR15 |