From 2c3a712b436f1a6afc0912b7c205b58923738022 Mon Sep 17 00:00:00 2001
From: Alexander Reshetnikov <no@email>
Date: Thu, 12 Apr 2012 11:29:02 +0000
Subject: [PATCH] Minor refactoring of condition for avformat_find_stream_info
 (ticket #1790)

---
 modules/highgui/src/cap_ffmpeg_impl_v2.hpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
index 9bc2e7b..f356134 100755
--- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
@@ -332,12 +332,8 @@ bool CvCapture_FFMPEG::reopen()
         avformat_open_input(&ic, filename, NULL, NULL);
     #endif
 
-    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0)
-        #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 24, 2)
-            avformat_find_stream_info(ic);
-        #else
-            avformat_find_stream_info(ic, NULL);
-        #endif
+    #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 3, 0)
+             avformat_find_stream_info(ic, NULL);
     #else
         av_find_stream_info(ic);
     #endif
@@ -395,12 +391,8 @@ bool CvCapture_FFMPEG::open( const char* _filename )
         goto exit_func;
     }
     err =
-#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 6, 0)
-#if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 24, 2)
-            avformat_find_stream_info(ic);
-#else
+#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 3, 0)
     avformat_find_stream_info(ic, NULL);
-#endif
 #else
     av_find_stream_info(ic);
 #endif
-- 
2.7.4