Commit a9a8c830 authored by Art Clarke's avatar Art Clarke Committed by Diego Biurrun

Fix av_picture_copy missing pixels on packed planar AVPictures with odd size.

patch by Art Clarke, aclarke vlideshow com

Originally committed as revision 15744 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a56fbe2a
......@@ -870,7 +870,7 @@ int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane)
break;
case FF_PIXEL_PLANAR:
if (plane == 1 || plane == 2)
width >>= pf->x_chroma_shift;
width= -((-width)>>pf->x_chroma_shift);
return (width * pf->depth + 7) >> 3;
break;
......@@ -900,7 +900,7 @@ void av_picture_copy(AVPicture *dst, const AVPicture *src,
h = height;
if (i == 1 || i == 2) {
w >>= pf->x_chroma_shift;
h >>= pf->y_chroma_shift;
h= -((-height)>>pf->y_chroma_shift);
}
ff_img_copy_plane(dst->data[i], dst->linesize[i],
src->data[i], src->linesize[i],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment