Mercurial > mplayer.hg

changeset 34742:6b1b5a34a94e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch FLIC tag to the one used by FLIC-in-MOV.
author reimar
date Sat, 24 Mar 2012 19:26:36 +0000
parents 6cfaa555bec1
children e48eefbb92d2
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Sat Mar 24 19:22:16 2012 +0000
+++ b/etc/codecs.conf	Sat Mar 24 19:26:36 2012 +0000
@@ -701,7 +701,8 @@
 videocodec fffli
   info "Autodesk FLI/FLC Animation"
   status working
-  fourcc FLIC ; FLIC is an internal MPlayer FOURCC
+  fourcc FLIC ; former internal MPlayer FOURCC
+  fourcc flic ; used by flic in mov (ffmpeg trac issue #626)
   driver ffmpeg
   dll "flic"
   out BGR16,BGR15,BGR8 query
--- a/libmpdemux/mp_taglists.c	Sat Mar 24 19:22:16 2012 +0000
+++ b/libmpdemux/mp_taglists.c	Sat Mar 24 19:26:36 2012 +0000
@@ -131,7 +131,7 @@
     { CODEC_ID_DNXHD,             MKTAG('A', 'V', 'd', 'n')},
     { CODEC_ID_DSICINVIDEO,       MKTAG('D', 'C', 'I', 'V')},
     { CODEC_ID_DXA,               MKTAG('D', 'X', 'A', '1')},
-    { CODEC_ID_FLIC,              MKTAG('F', 'L', 'I', 'C')},
+    { CODEC_ID_FLIC,              MKTAG('f', 'l', 'i', 'c')},
     { CODEC_ID_IDCIN,             MKTAG('I', 'D', 'C', 'I')},
     { CODEC_ID_INTERPLAY_VIDEO,   MKTAG('I', 'N', 'P', 'V')},
     { CODEC_ID_JV,                MKTAG('F', 'F', 'J', 'V')},