mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a problem with AVI reading (removed avcodec_context)

Browse Source
This commit is contained in:
Alexander Reshetnikov 2012-04-05 15:53:03 +00:00
parent a5a3c3139f
commit 56e7852e2f
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View File

@ -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);