Merge pull request #3307 from ilya-lavrenov:ffmpeg_rtsp

modules/highgui/src/cap_ffmpeg_impl.hpp

@@ -260,6 +260,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()
@@ -280,6 +284,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
 }
 
 
@@ -329,6 +337,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();
 }
 
@@ -536,7 +549,8 @@ bool CvCapture_FFMPEG::open( const char* _filename )
     close();
 
 #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(52, 111, 0)
-    int err = avformat_open_input(&ic, _filename, NULL, NULL);
+    av_dict_set(&dict, "rtsp_transport", "tcp", 0);
+    int err = avformat_open_input(&ic, _filename, NULL, &dict);
 #else
     int err = av_open_input_file(&ic, _filename, NULL, 0, NULL);
 #endif