Mercurial > mplayer.hg
changeset 11847:f5effe037458
Use fli decoder from libavcodec
| author | rtognimp |
|---|---|
| date | Sun, 25 Jan 2004 17:38:16 +0000 |
| parents | e3c3d01e9b86 |
| children | 63fecc69c3fb |
| files | etc/codecs.conf libmpcodecs/vd_ffmpeg.c |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);