From d0176d69f239d2f5a9e635ba5089a8e2f1f67e22 Mon Sep 17 00:00:00 2001
From: Andrey Morozov <no@email>
Date: Mon, 1 Aug 2011 16:05:34 +0000
Subject: [PATCH] fixed property for ffmpeg

---
 modules/highgui/src/cap_ffmpeg_impl.hpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp
index a69667fc4a..e2e678bbec 100644
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -446,6 +446,9 @@ bool CvCapture_FFMPEG::reopen()
 #else
     AVCodecContext *enc = &ic->streams[video_stream]->codec;
 #endif
+
+    avcodec_thread_init(enc, count_threads);
+
     AVCodec *codec = avcodec_find_decoder(enc->codec_id);
     avcodec_open(enc, codec);
     video_st = ic->streams[video_stream];
@@ -714,7 +717,7 @@ double CvCapture_FFMPEG::getProperty( int property_id )
         return (double)video_st->codec.codec_tag;
 #endif
     break;
-	case CV_FFMPEG_CAP_PROP_THREADS: 
+    case CV_CAP_PROP_THREADS:
 		return count_threads;
 	break;
     }
@@ -802,7 +805,7 @@ bool CvCapture_FFMPEG::setProperty( int property_id, double value )
         }
         break;
 		
-	case CV_FFMPEG_CAP_PROP_THREADS:
+    case CV_CAP_PROP_THREADS:
 	{
 		count_threads = (int)value;
 	}