From efa2baed832a6c0a4b19653f638acf49aa0f069c Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 6 Oct 2014 07:56:30 +0000 Subject: [PATCH] TCP instead of UDP Conflicts: modules/highgui/src/cap_ffmpeg_impl.hpp --- modules/videoio/src/cap_ffmpeg_impl.hpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp index e9a6721d33..1504d2ae6f 100644 --- a/modules/videoio/src/cap_ffmpeg_impl.hpp +++ b/modules/videoio/src/cap_ffmpeg_impl.hpp @@ -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);