Mercurial > mplayer.hg

changeset 34302:945ef73454c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author cehoyos
date Sun, 04 Dec 2011 22:41:31 +0000
parents d3488ac22468
children 99a27279dcd0
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	Sun Dec 04 13:30:54 2011 +0000
+++ b/etc/codecs.conf	Sun Dec 04 22:41:31 2011 +0000
@@ -3543,6 +3543,14 @@
   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
--- a/libmpdemux/mp_taglists.c	Sun Dec 04 13:30:54 2011 +0000
+++ b/libmpdemux/mp_taglists.c	Sun Dec 04 22:41:31 2011 +0000
@@ -81,6 +81,7 @@
     { 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')},