diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-31 19:06:26 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-31 19:16:44 +0400 |
commit | 879aa062f973bf0f357bde8e5722522bc85d1884 (patch) | |
tree | 62fc4aa30da094c55d12c4412beffb407e257e2c /libavutil | |
parent | e868f84e83473221e98b56bb51c6cd1bedf91625 (diff) |
avutil/frame: frame_copy_video: support copying from a smaller to a larger frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/frame.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index 85208b8644..89557ed164 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -589,8 +589,8 @@ static int frame_copy_video(AVFrame *dst, const AVFrame *src) const uint8_t *src_data[4]; int i, planes; - if (dst->width != src->width || - dst->height != src->height) + if (dst->width < src->width || + dst->height < src->height) return AVERROR(EINVAL); planes = av_pix_fmt_count_planes(dst->format); @@ -601,7 +601,7 @@ static int frame_copy_video(AVFrame *dst, const AVFrame *src) memcpy(src_data, src->data, sizeof(src_data)); av_image_copy(dst->data, dst->linesize, src_data, src->linesize, - dst->format, dst->width, dst->height); + dst->format, src->width, src->height); return 0; } |