Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavutil / samplefmt.c

diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c
index ae192ff3d46996d2d37eace3e21608f3b2442f16..a9c12ed6fd06802764edc5ea79f8c2efb1a7663d 100644 (file)
--- 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;
 }