From 56e7852e2f0d7c921f65beba23db7d55aeb7c240 Mon Sep 17 00:00:00 2001
From: Alexander Reshetnikov <no@email>
Date: Thu, 5 Apr 2012 15:53:03 +0000
Subject: [PATCH] Fixed a problem with AVI reading (removed avcodec_context)

---
 modules/highgui/src/cap_ffmpeg_impl_v2.hpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
index 50ef663..4ae0982 100755
--- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
@@ -218,7 +218,6 @@ struct CvCapture_FFMPEG
     double  dts_to_sec(int64_t dts);
 
     AVFormatContext * ic;
-    AVCodecContext  * avcodec_context;
     AVCodec         * avcodec;
     int               video_stream;
     AVStream        * video_st;
@@ -260,7 +259,6 @@ void CvCapture_FFMPEG::init()
 		img_convert_ctx = 0;
 	#endif
 
-    avcodec_context = 0;
     avcodec = 0;
     frame_number = 0;
     eps_zero = 0.000025;
@@ -284,18 +282,6 @@ void CvCapture_FFMPEG::close()
                 video_st = NULL;
     }
 
-    if ( avcodec_context )
-    {
-        #if LIBAVFORMAT_BUILD > 4628
-                avcodec_close( avcodec_context );
-
-        #else
-                avcodec_close( &avcodec_context );
-
-        #endif
-                avcodec_context = NULL;
-    }
-
     if( ic )
     {
      #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 24, 2)
@@ -331,10 +317,8 @@ bool CvCapture_FFMPEG::reopen()
 
 	#if LIBAVFORMAT_BUILD > 4628
 		avcodec_close( video_st->codec );
-		avcodec_close( avcodec_context );
 	#else
 		avcodec_close( &video_st->codec );
-		avcodec_close( &avcodec_context );
 	#endif
     #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 24, 2)
         av_close_input_file(ic);
-- 
2.7.4