From 418bc6dbe9e2bc29262a8f6d91a5d242c37b6e4e Mon Sep 17 00:00:00 2001 From: Andrey Morozov Date: Fri, 29 Jul 2011 14:37:54 +0000 Subject: [PATCH] minor fix for ffmpeg --- modules/highgui/src/cap_ffmpeg_impl.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp index 147a52553e..3ae00d54ea 100644 --- a/modules/highgui/src/cap_ffmpeg_impl.hpp +++ b/modules/highgui/src/cap_ffmpeg_impl.hpp @@ -491,11 +491,11 @@ bool CvCapture_FFMPEG::open( const char* _filename ) AVCodecContext *enc = &ic->streams[i]->codec; #endif - avcodec_thread_init(enc, count_threads); + avcodec_thread_init(enc, count_threads); - //#ifndef AVMEDIA_TYPE_VIDEO - // #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO - //#endif + #ifndef AVMEDIA_TYPE_VIDEO + #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO + #endif if( AVMEDIA_TYPE_VIDEO == enc->codec_type && video_stream < 0) { AVCodec *codec = avcodec_find_decoder(enc->codec_id);