generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed property for ffmpeg

Browse Source
This commit is contained in:
Andrey Morozov 2011-08-01 16:05:34 +00:00
parent d8b93b3569
commit d0176d69f2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/highgui/src/cap_ffmpeg_impl.hpp
View File

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