Skip to content

V
vlc-gpu
Commit 848a0b43 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

avcodec: disable multithreaded decoding when 'ffmpeg-hw' is used.

parent b84f741a
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/codec/avcodec/video.c
View file @ 848a0b43
...@@ -369,7 +369,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, ...@@ -369,7 +369,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
i_codec_id == CODEC_ID_H264 || i_codec_id == CODEC_ID_H264 ||
i_codec_id == CODEC_ID_VC1 || i_codec_id == CODEC_ID_WMV3) ) i_codec_id == CODEC_ID_VC1 || i_codec_id == CODEC_ID_WMV3) )
{ {
#if defined(HAVE_AVCODEC_MT) && LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 1, 0) #if defined(HAVE_AVCODEC_MT)/* && LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 1, 0) */
if( p_sys->p_context->thread_type & FF_THREAD_FRAME ) if( p_sys->p_context->thread_type & FF_THREAD_FRAME )
{ {
msg_Warn( p_dec, "threaded frame decoding is not compatible with ffmpeg-hw, disabled" ); msg_Warn( p_dec, "threaded frame decoding is not compatible with ffmpeg-hw, disabled" );
......
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