diff options
| author | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-25 17:38:16 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-25 17:38:16 +0000 |
| commit | e43cfb1e4f40298c7bacb997d0588d32068c3527 (patch) | |
| tree | 86f46d5b88169d1d9bba02fbdc4bc6eacef74549 | |
| parent | 00e3a6c8b98dcb13cfe2a422159c39fce956f0a1 (diff) | |
| download | mpv-e43cfb1e4f40298c7bacb997d0588d32068c3527.tar.bz2 mpv-e43cfb1e4f40298c7bacb997d0588d32068c3527.tar.xz | |
Use fli decoder from libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11848 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 8 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index e36fa318e3..2950026e5f 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -118,6 +118,14 @@ videocodec ffindeo3 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 --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 184626a740..b30589b27f 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -287,7 +287,8 @@ static int init(sh_video_t *sh){ 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); |