Skip to content

V
vlc-2-2
Commit e811fe62 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed compilation with avcodec without MT support.

parent f6bc0f43
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
modules/codec/avcodec/video.c
View file @ e811fe62
...@@ -349,11 +349,13 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, ...@@ -349,11 +349,13 @@ 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) )
{ {
#ifdef HAVE_AVCODEC_MT
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" );
p_sys->p_context->thread_type &= ~FF_THREAD_FRAME; p_sys->p_context->thread_type &= ~FF_THREAD_FRAME;
} }
#endif
p_sys->p_context->get_format = ffmpeg_GetFormat; p_sys->p_context->get_format = ffmpeg_GetFormat;
} }
#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