# HG changeset patch
# User rtognimp
# Date 1075052296 0
# Node ID f5effe0374587df9a785e7e5d4052f13a5267fb6
# Parent  e3c3d01e9b863b100b3dd59ac206a018b1655902
Use fli decoder from libavcodec

diff -r e3c3d01e9b86 -r f5effe037458 etc/codecs.conf
--- a/etc/codecs.conf	Sun Jan 25 17:36:30 2004 +0000
+++ b/etc/codecs.conf	Sun Jan 25 17:38:16 2004 +0000
@@ -118,6 +118,14 @@
   dll indeo3
   out YVU9
 
+videocodec fffli
+  info "Autodesk FLI/FLC Animation"
+  status working
+  fourcc FLIC ; FLIC is an internal MPlayer FOURCC
+  driver ffmpeg
+  dll "flic"
+  out BGR8
+
 videocodec fli
   info "Autodesk FLI/FLC Animation"
   status working
diff -r e3c3d01e9b86 -r f5effe037458 libmpcodecs/vd_ffmpeg.c
--- a/libmpcodecs/vd_ffmpeg.c	Sun Jan 25 17:36:30 2004 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Sun Jan 25 17:38:16 2004 +0000
@@ -287,7 +287,8 @@
 	 sh->format == mmioFOURCC('A','S','V','2') ||
 	 sh->format == mmioFOURCC('V','S','S','H') ||
 	 sh->format == mmioFOURCC('M','S','Z','H') ||
-	 sh->format == mmioFOURCC('Z','L','I','B')
+	 sh->format == mmioFOURCC('Z','L','I','B') ||
+	 sh->format == mmioFOURCC('F','L','I','C')
          ))
     {
 	avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);