Mercurial > mplayer.hg
changeset 11784:6d19216b4f2c
Use MSZH and ZLIB decoders from libavcodec
| author | rtognimp |
|---|---|
| date | Mon, 12 Jan 2004 22:48:03 +0000 |
| parents | c2e36b3193a1 |
| children | 3f488aa0d646 |
| files | configure etc/codecs.conf libmpcodecs/vd_ffmpeg.c |
| diffstat | 3 files changed, 22 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Jan 12 13:43:30 2004 +0000 +++ b/configure Mon Jan 12 22:48:03 2004 +0000 @@ -6131,6 +6131,9 @@ /* Define this if you have zlib */ $_def_zlib +#ifdef HAVE_ZLIB +#define CONFIG_ZLIB +#endif /* Define this if you have shm support */ $_def_shm
--- a/etc/codecs.conf Mon Jan 12 13:43:30 2004 +0000 +++ b/etc/codecs.conf Mon Jan 12 22:48:03 2004 +0000 @@ -258,6 +258,22 @@ out YUY2 out BGR32,BGR24 +videocodec ffmszh + info "AVImszh (native codec)" + status working + fourcc MSZH + driver ffmpeg + dll "mszh" + out BGR24 + +videocodec ffzlib + info "AVIzlib (native codec)" + status working + fourcc ZLIB + driver ffmpeg + dll "zlib" + out BGR24 + videocodec mpmszh info "AVImszh (native codec)" status working
--- a/libmpcodecs/vd_ffmpeg.c Mon Jan 12 13:43:30 2004 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Mon Jan 12 22:48:03 2004 +0000 @@ -285,7 +285,9 @@ sh->format == mmioFOURCC('W','M','V','2') || sh->format == mmioFOURCC('A','S','V','1') || sh->format == mmioFOURCC('A','S','V','2') || - sh->format == mmioFOURCC('V','S','S','H') + sh->format == mmioFOURCC('V','S','S','H') || + sh->format == mmioFOURCC('M','S','Z','H') || + sh->format == mmioFOURCC('Z','L','I','B') )) { avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);