]> git.sesse.net Git - casparcg/commitdiff
Fixed bug where optimal code path was never taken when copying frame data in ffmpeg
authorHelge Norberg <helge.norberg@gmail.com>
Tue, 8 Oct 2013 15:06:55 +0000 (17:06 +0200)
committerHelge Norberg <helge.norberg@gmail.com>
Tue, 8 Oct 2013 15:06:55 +0000 (17:06 +0200)
modules/ffmpeg/producer/util/util.cpp

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