diff options
| author |  rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-12 22:48:03 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-12 22:48:03 +0000 |
| commit | 2e7229ae120b59c974f18dc869b40c75d0a254da (patch) | |
| tree | 4f3205a0e224b0234ae5917463900c341d91944f | |
| parent | 0a29f9acdebc8c14ae6ba69976a4ed47efaa896b (diff) | |
Use MSZH and ZLIB decoders from libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11785 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | etc/codecs.conf | 16 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 4 |
3 files changed, 22 insertions, 1 deletions
@@ -6131,6 +6131,9 @@ $_def_kstat /* Define this if you have zlib */ $_def_zlib +#ifdef HAVE_ZLIB +#define CONFIG_ZLIB +#endif /* Define this if you have shm support */ $_def_shm diff --git a/etc/codecs.conf b/etc/codecs.conf index 9771ef4642..e36fa318e3 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -258,6 +258,22 @@ videocodec cvid 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 diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index b8972b9eb4..184626a740 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -285,7 +285,9 @@ static int init(sh_video_t *sh){ 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); |