[MPlayer-cvslog] r34390 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c

[cehoyos]

Author: cehoyos
Date: Sun Dec  4 23:41:31 2011
New Revision: 34390

Log:
Map FFmpeg's Escape 124 decoder to new MPlayer internal FourCC.

Based on a patch by Paul B. Mahol, onemda gmail

Playback does not work correctly.

Partially fixes bug 2023.

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sun Dec  4 14:30:54 2011	(r34389)
+++ trunk/etc/codecs.conf	Sun Dec  4 23:41:31 2011	(r34390)
@@ -3543,6 +3543,14 @@ videocodec ffeatgv
   dll eatgv
   out BGR8
 
+videocodec ffescape124
+  info "FFmpeg Escape 124"
+  status buggy
+  fourcc E124 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll escape124
+  out BGR15
+
 ; raw formats:  (now RGB formats are autodetected)
 
 ; these raw codecs are used mostly by TV input

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Sun Dec  4 14:30:54 2011	(r34389)
+++ trunk/libmpdemux/mp_taglists.c	Sun Dec  4 23:41:31 2011	(r34390)
@@ -81,6 +81,7 @@ static const struct AVCodecTag mp_codeci
     { CODEC_ID_DTS,               0x2001},
     { CODEC_ID_DVVIDEO,           MKTAG('d', 'v', 's', 'd')},
     { CODEC_ID_EAC3,              MKTAG('E', 'A', 'C', '3')},
+    { CODEC_ID_ESCAPE124,         MKTAG('E', '1', '2', '4')},
     { CODEC_ID_FLV1,              MKTAG('F', 'L', 'V', '1')},
     { CODEC_ID_G729,              MKTAG('G', '7', '2', '9')},
     { CODEC_ID_H264,              MKTAG('H', '2', '6', '4')},