From 375c0f74d190083ca1d0bf8f452afd9cd4502c37 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 12 Jul 2012 21:36:22 +0200 Subject: [PATCH] av_samples_copy: support overlapping copies Signed-off-by: Michael Niedermayer --- libavutil/samplefmt.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index ae192ff3d4..a9c12ed6fd 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -208,8 +208,13 @@ int av_samples_copy(uint8_t **dst, uint8_t * const *src, int dst_offset, dst_offset *= block_align; src_offset *= block_align; - for (i = 0; i < planes; i++) - memcpy(dst[i] + dst_offset, src[i] + src_offset, data_size); + if((dst[0] < src[0] ? src[0] - dst[0] : dst[0] - src[0]) >= data_size) { + for (i = 0; i < planes; i++) + memcpy(dst[i] + dst_offset, src[i] + src_offset, data_size); + } else { + for (i = 0; i < planes; i++) + memmove(dst[i] + dst_offset, src[i] + src_offset, data_size); + } return 0; }