From: Helge Norberg <helge.norberg@gmail.com>
Date: Tue, 8 Oct 2013 15:06:55 +0000 (+0200)
Subject: Fixed bug where optimal code path was never taken when copying frame data in ffmpeg
X-Git-Tag: 2.0.6~39
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=e2fba1fe09f285ba5e97cd7f85af5546eb8c1bed;p=casparcg

Fixed bug where optimal code path was never taken when copying frame data in ffmpeg
---

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<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVF
 			CASPAR_ASSERT(decoded);
 			CASPAR_ASSERT(write->image_data(n).begin());
 
-			if(decoded_linesize != static_cast<int>(plane.width))
+			if(decoded_linesize != static_cast<int>(plane.linesize))
 			{
 				// Copy line by line since ffmpeg sometimes pads each line.
 				tbb::parallel_for<size_t>(0, desc.planes[n].height, [&](size_t y)