From e2fba1fe09f285ba5e97cd7f85af5546eb8c1bed Mon Sep 17 00:00:00 2001 From: Helge Norberg Date: Tue, 8 Oct 2013 17:06:55 +0200 Subject: [PATCH] Fixed bug where optimal code path was never taken when copying frame data in ffmpeg --- modules/ffmpeg/producer/util/util.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp index 6c74d22f4..b34f0e29a 100644 --- a/modules/ffmpeg/producer/util/util.cpp +++ b/modules/ffmpeg/producer/util/util.cpp @@ -273,7 +273,7 @@ safe_ptr make_write_frame(const void* tag, const safe_ptrimage_data(n).begin()); - if(decoded_linesize != static_cast(plane.width)) + if(decoded_linesize != static_cast(plane.linesize)) { // Copy line by line since ffmpeg sometimes pads each line. tbb::parallel_for(0, desc.planes[n].height, [&](size_t y) -- 2.39.2