diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2012-07-26 17:41:56 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2012-07-26 17:46:44 +0300 |
| commit | b7fb2daff40c7ad599722490dd11bf0765cc8f69 (patch) | |
| tree | aa34767cfbd4499e52df95ba21109f57f8c6d71f | |
| parent | 8079f4ff821aa811de449f08dfdba777e8dd0397 (diff) | |
| download | mpv-b7fb2daff40c7ad599722490dd11bf0765cc8f69.tar.bz2 mpv-b7fb2daff40c7ad599722490dd11bf0765cc8f69.tar.xz | |
vd_vfw.c: fix part missing from previous commit
vd_vfw.c was missing a change to rename field used from 'flags' to
'keyframe'. This broke compilation with 32-bit Windows codec support
enabled.
| -rw-r--r-- | libmpcodecs/vd_vfw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c index 331755a2b1..707589c869 100644 --- a/libmpcodecs/vd_vfw.c +++ b/libmpcodecs/vd_vfw.c @@ -330,8 +330,9 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ #else ret = ICDecompress(priv->handle, #endif - ( (sh->ds->flags&1) ? 0 : ICDECOMPRESS_NOTKEYFRAME ) | - ( ((flags&3)==2 && !(sh->ds->flags&1))?(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL):0 ), + ( sh->ds->keyframe ? 0 : ICDECOMPRESS_NOTKEYFRAME ) | + ( (flags&3) == 2 && !sh->ds->keyframe ? + ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL : 0 ), sh->bih, data, priv->o_bih, (flags&3) ? 0 : mpi->planes[0]); if ((int)ret){ |