Author: reimar Date: Sat Mar 24 20:26:36 2012 New Revision: 34830 Log: Switch FLIC tag to the one used by FLIC-in-MOV. Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Mar 24 20:22:16 2012 (r34829) +++ trunk/etc/codecs.conf Sat Mar 24 20:26:36 2012 (r34830) @@ -701,7 +701,8 @@ videocodec ffindeo3 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 Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Sat Mar 24 20:22:16 2012 (r34829) +++ trunk/libmpdemux/mp_taglists.c Sat Mar 24 20:26:36 2012 (r34830) @@ -131,7 +131,7 @@ static const struct AVCodecTag mp_bmp_ta { 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')},