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
efa2baed
Commit
efa2baed
authored
Oct 06, 2014
by
Ilya Lavrenov
Committed by
Dikay900
May 24, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TCP instead of UDP
Conflicts: modules/highgui/src/cap_ffmpeg_impl.hpp
parent
c9481b0f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
0 deletions
+14
-0
cap_ffmpeg_impl.hpp
modules/videoio/src/cap_ffmpeg_impl.hpp
+14
-0
No files found.
modules/videoio/src/cap_ffmpeg_impl.hpp
View file @
efa2baed
...
...
@@ -270,6 +270,10 @@ struct CvCapture_FFMPEG
and so the filename is needed to reopen the file on backward seeking.
*/
char
*
filename
;
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
AVDictionary
*
dict
;
#endif
};
void
CvCapture_FFMPEG
::
init
()
...
...
@@ -290,6 +294,10 @@ void CvCapture_FFMPEG::init()
avcodec
=
0
;
frame_number
=
0
;
eps_zero
=
0.000025
;
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
dict
=
NULL
;
#endif
}
...
...
@@ -347,6 +355,11 @@ void CvCapture_FFMPEG::close()
packet
.
data
=
NULL
;
}
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
if
(
dict
!=
NULL
)
av_dict_free
(
&
dict
);
#endif
init
();
}
...
...
@@ -554,6 +567,7 @@ bool CvCapture_FFMPEG::open( const char* _filename )
close
();
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
av_dict_set
(
&
dict
,
"rtsp_transport"
,
"tcp"
,
0
);
int
err
=
avformat_open_input
(
&
ic
,
_filename
,
NULL
,
NULL
);
#else
int
err
=
av_open_input_file
(
&
ic
,
_filename
,
NULL
,
0
,
NULL
);
...
...
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