Commit 7029ccb8 authored by Laurent Aimar's avatar Laurent Aimar Committed by Jean-Baptiste Kempf

Clip number of thread to 16 when using threaded decoding in avcodec.

It workarounds an avcodec issue.
(cherry picked from commit e587ce36787d2519a774d27465d71b2272c9c6c4)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent ab36432e
...@@ -337,6 +337,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, ...@@ -337,6 +337,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
int i_thread_count = var_InheritInteger( p_dec, "ffmpeg-threads" ); int i_thread_count = var_InheritInteger( p_dec, "ffmpeg-threads" );
if( i_thread_count <= 0 ) if( i_thread_count <= 0 )
i_thread_count = vlc_GetCPUCount(); i_thread_count = vlc_GetCPUCount();
i_thread_count = __MIN( i_thread_count, 16 );
msg_Dbg( p_dec, "allowing %d thread(s) for decoding", i_thread_count ); msg_Dbg( p_dec, "allowing %d thread(s) for decoding", i_thread_count );
p_sys->p_context->thread_count = i_thread_count; p_sys->p_context->thread_count = i_thread_count;
#endif #endif
......
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