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

[cehoyos]

Author: cehoyos
Date: Thu Dec  8 13:09:00 2011
New Revision: 34404

Log:
Support decoding newer rpl files with FFmpeg's Escape 130 decoder.

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Thu Dec  8 13:05:00 2011	(r34403)
+++ trunk/etc/codecs.conf	Thu Dec  8 13:09:00 2011	(r34404)
@@ -3559,6 +3559,14 @@ videocodec ffescape124
   dll escape124
   out BGR15
 
+videocodec ffescape130
+  info "FFmpeg Escape 130"
+  status working
+  fourcc E130 ; internal MPlayer FourCC
+  driver ffmpeg
+  dll escape130
+  out YV12
+
 ; 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	Thu Dec  8 13:05:00 2011	(r34403)
+++ trunk/libmpdemux/mp_taglists.c	Thu Dec  8 13:09:00 2011	(r34404)
@@ -32,7 +32,6 @@ static const struct AVCodecTag mp_wav_ta
     { CODEC_ID_ADPCM_EA,          MKTAG('A', 'D', 'E', 'A')},
     { CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')},
     { CODEC_ID_ADPCM_IMA_EA_EACS, MKTAG('E', 'A', 'C', 'S')},
-    { CODEC_ID_ADPCM_IMA_EA_SEAD, MKTAG('S', 'E', 'A', 'D')},
     { CODEC_ID_ADPCM_IMA_ISS,     MKTAG('A', 'I', 'S', 'S')},
     { CODEC_ID_ADPCM_IMA_WS,      MKTAG('A', 'I', 'W', 'S')},
     { CODEC_ID_ADPCM_THP,         MKTAG('T', 'H', 'P', 'A')},
@@ -79,11 +78,13 @@ static const struct AVCodecTag mp_codeci
     { CODEC_ID_AAC,               MKTAG('M', 'P', '4', 'A')},
     { CODEC_ID_AAC_LATM,          MKTAG('M', 'P', '4', 'L')},
     { CODEC_ID_AC3,               0x2000},
+    { CODEC_ID_ADPCM_IMA_EA_SEAD, MKTAG('S', 'E', 'A', 'D')},
     { CODEC_ID_ADPCM_IMA_AMV,     MKTAG('A', 'M', 'V', 'A')},
     { 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_ESCAPE130,         MKTAG('E', '1', '3', '0')},
     { CODEC_ID_FLV1,              MKTAG('F', 'L', 'V', '1')},
     { CODEC_ID_G729,              MKTAG('G', '7', '2', '9')},
     { CODEC_ID_H264,              MKTAG('H', '2', '6', '4')},