Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2026-07-31 00:03:03 +04:00 · 2022-06-26 14:21:40 +00:00
parent 35f1a90df7 5e1c9099e8
commit 2a4926f417
12 changed files with 316 additions and 66 deletions
@@ -1633,7 +1633,7 @@ bool CvCapture_FFMPEG::retrieveFrame(int flag, unsigned char** data, int* step,
            img_convert_ctx,
            sw_picture->data,
            sw_picture->linesize,
-            0, context->coded_height,
+            0, sw_picture->height,
            rgb_picture.data,
            rgb_picture.linesize
            );