RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-12 09:56:30 +00:00
Code Issues Releases Wiki Activity

10l. IMGFLAG_ALLOCATED shouldn't be set from vd driver\! - it's for internal use by the core

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5278 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-03-23 16:56:05 +00:00
parent 8d4022576e
commit b1594708a7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libmpcodecs/vd_zlib.c
View File

@ -26,7 +26,6 @@ typedef struct {
int height;
int depth;
z_stream zstrm;
mp_image_t *mpi;
} vd_zlib_ctx;
// to set/get/query special features/parameters
@ -92,6 +91,7 @@ static void uninit(sh_video_t *sh)
// decode a frame
static mp_image_t* decode(sh_video_t *sh, void* data, int len, int flags)
{
mp_image_t *mpi;
vd_zlib_ctx *ctx = sh->context;
int zret;
int decomp_size = ctx->width*ctx->height*((ctx->depth+7)/8);
@ -100,14 +100,12 @@ static mp_image_t* decode(sh_video_t *sh, void* data, int len, int flags)
if (len <= 0)
return(NULL); // skipped frame
ctx->mpi = mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_ALLOCATED,
ctx->width, ctx->height);
if (!ctx->mpi)
return(NULL);
mpi = mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0, ctx->width, ctx->height);
if (!mpi) return(NULL);
zstrm->next_in = data;
zstrm->avail_in = len;
zstrm->next_out = ctx->mpi->planes[0];
zstrm->next_out = mpi->planes[0];
zstrm->avail_out = decomp_size;
mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "[vd_zlib] input: %p (%d bytes), output: %p (%d bytes)\n",
@ -128,6 +126,6 @@ static mp_image_t* decode(sh_video_t *sh, void* data, int len, int flags)
return(NULL);
}
return(ctx->mpi);
return mpi;
}
#endif