Merge pull request #3698 from SpecLad:avcodec-free-frame

6a3a6416 · Vadim Pisarevsky · 9e3a8262 · 77578d41 · 6a3a6416
Commit 6a3a6416 authored Feb 16, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

cap_ffmpeg_impl.hpp modules/highgui/src/cap_ffmpeg_impl.hpp +8 -0

No files found.
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -300,7 +300,15 @@ void CvCapture_FFMPEG::close()
    }

    if( picture )
+    {
+        // FFmpeg and Libav added avcodec_free_frame in different versions.
+#if LIBAVCODEC_BUILD >= (LIBAVCODEC_VERSION_MICRO >= 100 \
+    ? CALC_FFMPEG_VERSION(54, 59, 100) : CALC_FFMPEG_VERSION(54, 28, 0))
+        avcodec_free_frame(&picture);
+#else
        av_free(picture);
+#endif
+    }

    if( video_st )
    {