diff options
| author | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-11-22 15:32:08 +0000 |
|---|---|---|
| committer | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-11-22 15:32:08 +0000 |
| commit | 3533bc959c373c41351730b308cfbe561ed5529d (patch) | |
| tree | 9f7b6d90b7b05c41b91c19c08ce359817e0ea532 /libmpcodecs | |
| parent | 5a2e413baf14061a306c34e33bf09e888938fe04 (diff) | |
| download | mpv-3533bc959c373c41351730b308cfbe561ed5529d.tar.bz2 mpv-3533bc959c373c41351730b308cfbe561ed5529d.tar.xz | |
fix segfault with (height|width)%6!=0
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14017 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_libmpeg2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c index 3eb96021a6..002cfe6ada 100644 --- a/libmpcodecs/vd_libmpeg2.c +++ b/libmpcodecs/vd_libmpeg2.c @@ -157,13 +157,13 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ if (info->sequence->width >> 1 == info->sequence->chroma_width && info->sequence->height >> 1 == info->sequence->chroma_height) { if(!mpcodecs_config_vo(sh, - info->sequence->width, - info->sequence->height, IMGFMT_YV12)) return 0; + info->sequence->picture_width, + info->sequence->picture_height, IMGFMT_YV12)) return 0; } else if (info->sequence->width >> 1 == info->sequence->chroma_width && info->sequence->height == info->sequence->chroma_height) { if(!mpcodecs_config_vo(sh, - info->sequence->width, - info->sequence->height, IMGFMT_422P)) return 0; + info->sequence->picture_width, + info->sequence->picture_height, IMGFMT_422P)) return 0; } else return 0; break; case STATE_PICTURE: @@ -186,8 +186,8 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ mpi_new=mpcodecs_get_image(sh,MP_IMGTYPE_IPB, (type==PIC_FLAG_CODING_TYPE_B) ? use_callback : (MP_IMGFLAG_PRESERVE|MP_IMGFLAG_READABLE), - (info->sequence->picture_width+15)&(~15), - (info->sequence->picture_height+15)&(~15) ); + info->sequence->picture_width, + info->sequence->picture_height ); if(!mpi_new) return 0; // VO ERROR!!!!!!!! mpeg2_set_buf(mpeg2dec, mpi_new->planes, mpi_new); @@ -201,8 +201,8 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ #ifdef MPEG12_POSTPROC if(!mpi_new->qscale){ - mpi_new->qstride=(info->sequence->picture_width+15)>>4; - mpi_new->qscale=malloc(mpi_new->qstride*((info->sequence->picture_height+15)>>4)); + mpi_new->qstride=info->sequence->width>>4; + mpi_new->qscale=malloc(mpi_new->qstride*(info->sequence->height>>4)); } mpeg2dec->decoder.quant_store=mpi_new->qscale; mpeg2dec->decoder.quant_stride=mpi_new->qstride; |