diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:05:30 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:05:30 +0200 |
| commit | 231b33a02fae95b260120349040106bfa34a3750 (patch) | |
| tree | 23c4de0e6263b2d99966348d7003177b3b3e3740 /libmpcodecs/vd_ffmpeg.c | |
| parent | 52126e574c7872ca95e7974cfe5445421b74f24c (diff) | |
| parent | 92cd6dc3e916ae4275ff05d2b238fc778cfbfc6b (diff) | |
| download | mpv-231b33a02fae95b260120349040106bfa34a3750.tar.bz2 mpv-231b33a02fae95b260120349040106bfa34a3750.tar.xz | |
Merge svn changes up to r30165
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index a89e0a4dbe..9b833dac72 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -579,6 +579,7 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ pic->data[0]= mpi->planes[0]; pic->data[1]= mpi->planes[1]; pic->data[2]= mpi->planes[2]; + pic->data[3]= mpi->planes[3]; #if 0 assert(mpi->width >= ((width +align)&(~align))); @@ -603,6 +604,7 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *pic){ pic->linesize[0]= mpi->stride[0]; pic->linesize[1]= mpi->stride[1]; pic->linesize[2]= mpi->stride[2]; + pic->linesize[3]= mpi->stride[3]; pic->opaque = mpi; //printf("%X\n", (int)mpi->planes[0]); @@ -837,9 +839,11 @@ static struct mp_image *decode(struct sh_video *sh, void *data, int len, mpi->planes[0]=pic->data[0]; mpi->planes[1]=pic->data[1]; mpi->planes[2]=pic->data[2]; + mpi->planes[3]=pic->data[3]; mpi->stride[0]=pic->linesize[0]; mpi->stride[1]=pic->linesize[1]; mpi->stride[2]=pic->linesize[2]; + mpi->stride[3]=pic->linesize[3]; } if (!mpi->planes[0]) |