Skip to content

O
opencv
Commit d0176d69 authored by Andrey Morozov's avatar Andrey Morozov
Browse files
Options

fixed property for ffmpeg

parent d8b93b35
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
modules/highgui/src/cap_ffmpeg_impl.hpp
View file @ d0176d69
...@@ -446,6 +446,9 @@ bool CvCapture_FFMPEG::reopen() ...@@ -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 ) ...@@ -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 ) ...@@ -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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment