Mercurial > mplayer.hg

changeset 34207:82e08cd39ae2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support Mobotix MxPEG decoding (bug 2004).
author cehoyos
date Fri, 04 Nov 2011 08:41:11 +0000
parents 92841858c5cb
children f7a3e6ad8eef
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Thu Nov 03 19:33:05 2011 +0000
+++ b/etc/codecs.conf	Fri Nov 04 08:41:11 2011 +0000
@@ -2713,6 +2713,14 @@
   dll "amv"
   out YV12
 
+videocodec ffmxpeg
+  info "FFmpeg MxPEG"
+  status working
+  fourcc MXPG ; internal MPlayer FourCC
+  driver ffmpeg
+  dll mxpeg
+  out YV12
+
 videocodec ffsp5x
   info "SP5x codec - used by Aiptek MegaCam"
   status working
--- a/libmpdemux/mp_taglists.c	Thu Nov 03 19:33:05 2011 +0000
+++ b/libmpdemux/mp_taglists.c	Fri Nov 04 08:41:11 2011 +0000
@@ -118,6 +118,7 @@
     { CODEC_ID_JV,                MKTAG('F', 'F', 'J', 'V')},
     { CODEC_ID_MDEC,              MKTAG('M', 'D', 'E', 'C')},
     { CODEC_ID_MOTIONPIXELS,      MKTAG('M', 'V', 'I', '1')},
+    { CODEC_ID_MXPEG,             MKTAG('M', 'X', 'P', 'G')},
     { CODEC_ID_NUV,               MKTAG('R', 'J', 'P', 'G')},
     { CODEC_ID_RL2,               MKTAG('R', 'L', '2', 'V')},
     { CODEC_ID_ROQ,               MKTAG('R', 'o', 'Q', 'V')},