From 34ad2e0fa44340f5a7d2aec993ab541770a4be7d Mon Sep 17 00:00:00 2001
From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri, 13 Feb 2015 15:12:52 +0300
Subject: [PATCH] Fix a memory leak in CvCapture_FFMPEG::close

FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.

(cherry picked from commit 77578d415f4d2b22a4ee1989ef0afda73c9d649b)

Conflicts:
	modules/highgui/src/cap_ffmpeg_impl.hpp
---
 modules/videoio/src/cap_ffmpeg_impl.hpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp
index 5870f4bc7..5e371d21e 100644
--- a/modules/videoio/src/cap_ffmpeg_impl.hpp
+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp
@@ -302,7 +302,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 )
     {