Merge pull request #19663 from mshabunin:fix-ffmpeg-1x

4 years ago · 325bdf952c
parent 6fbf93750b 137ec1c846
commit 325bdf952c
1 changed files with 4 additions and 1 deletions
--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
@ -1469,9 +1469,12 @@ bool CvCapture_FFMPEG::retrieveFrame(int, unsigned char** data, int* step, int*
    *height = frame.height;
    *cn = frame.cn;

-    if (sw_picture != picture) {
+#if USE_AV_HW_CODECS
+    if (sw_picture != picture)
+    {
        av_frame_unref(sw_picture);
    }
+#endif
    return true;
 }