summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_ffmpeg.c
diff options
context:
space:
mode:
authorrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-12 22:48:03 +0000
committerrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-12 22:48:03 +0000
commit2e7229ae120b59c974f18dc869b40c75d0a254da (patch)
tree4f3205a0e224b0234ae5917463900c341d91944f /libmpcodecs/vd_ffmpeg.c
parent0a29f9acdebc8c14ae6ba69976a4ed47efaa896b (diff)
downloadmpv-2e7229ae120b59c974f18dc869b40c75d0a254da.tar.bz2
mpv-2e7229ae120b59c974f18dc869b40c75d0a254da.tar.xz
Use MSZH and ZLIB decoders from libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11785 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
-rw-r--r--libmpcodecs/vd_ffmpeg.c4
1 files changed, 3 insertions, 1 deletions
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);