Mercurial > mplayer.hg

changeset 35186:130cdc6e5a00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support FFmpeg YOP decoder.
author cehoyos
date Tue, 30 Oct 2012 11:32:05 +0000
parents dff978cf2aa9
children 0c3fae9845fd
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 Oct 28 20:55:47 2012 +0000
+++ b/etc/codecs.conf	Tue Oct 30 11:32:05 2012 +0000
@@ -724,6 +724,14 @@
   dll sunrast
   out BGR24,BGR8,Y800,RGB24,RGBA,BGRA
 
+videocodec ffyop
+  info "FFmpeg Psygnosis YOP"
+  status working
+  fourcc YOP1
+  driver ffmpeg
+  dll yop
+  out BGR8
+
 videocodec ffindeo3
   info "FFmpeg Intel Indeo 3.1/3.2"
   status working
--- a/libmpdemux/mp_taglists.c	Sun Oct 28 20:55:47 2012 +0000
+++ b/libmpdemux/mp_taglists.c	Tue Oct 30 11:32:05 2012 +0000
@@ -170,6 +170,7 @@
     { CODEC_ID_VMDVIDEO,          MKTAG('V', 'M', 'D', 'V')},
     { CODEC_ID_WS_VQA,            MKTAG('V', 'Q', 'A', 'V')},
     { CODEC_ID_XAN_WC3,           MKTAG('W', 'C', '3', 'V')},
+    { CODEC_ID_YOP,               MKTAG('Y', 'O', 'P', '1')},
     { 0, 0 },
 };