diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-28 00:01:28 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-28 00:01:28 +0000 |
| commit | c8166827b5dfbe226dd7ca44e7401cd1e399d593 (patch) | |
| tree | 57f745cc9eb42f0e8e836792a7fa70f2963de16e /libmpcodecs | |
| parent | bf46a109ede5d25f506cc75ae80fe1acc5b34edd (diff) | |
| download | mpv-c8166827b5dfbe226dd7ca44e7401cd1e399d593.tar.bz2 mpv-c8166827b5dfbe226dd7ca44e7401cd1e399d593.tar.xz | |
5l - fixed asserts... mpi->width is allocated width, not the effective one
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8587 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index f90ab2a4bf..39b5b767aa 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -412,12 +412,12 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ pic->data[1]= mpi->planes[1]; pic->data[2]= mpi->planes[2]; - assert(mpi->width >= ((width +align)&(~align))); - assert(mpi->height >= ((height+align)&(~align))); - assert(mpi->stride[0] >= mpi->width); + assert(mpi->w >= ((width +align)&(~align))); + assert(mpi->h >= ((height+align)&(~align))); + assert(mpi->stride[0] >= mpi->w); if(mpi->imgfmt==IMGFMT_I420 || mpi->imgfmt==IMGFMT_YV12 || mpi->imgfmt==IMGFMT_IYUV){ - const int y_size= mpi->stride[0] * mpi->height; - const int c_size= mpi->stride[1] * mpi->chroma_height; + const int y_size= mpi->stride[0] * (mpi->h-1) + mpi->w; + const int c_size= mpi->stride[1] * ((mpi->h>>1)-1) + (mpi->w>>1); assert(mpi->planes[0] > mpi->planes[1] || mpi->planes[0] + y_size <= mpi->planes[1]); assert(mpi->planes[0] > mpi->planes[2] || mpi->planes[0] + y_size <= mpi->planes[2]); |