Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
56e7852e
Commit
56e7852e
authored
Apr 05, 2012
by
Alexander Reshetnikov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a problem with AVI reading (removed avcodec_context)
parent
a5a3c313
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
16 deletions
+0
-16
cap_ffmpeg_impl_v2.hpp
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+0
-16
No files found.
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View file @
56e7852e
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment