Commit b72986e8 authored by Janne Grunau's avatar Janne Grunau Committed by Jean-Baptiste Kempf
Browse files

avcodec: hw accel with frame multithreading works since libavcodec 55.01.00



This is mostly useful if the hw accelerator cannot handle the stream.
The software decoder fallback will then use frame multithreading if it
supports it.
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 51f0570e
...@@ -341,7 +341,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, ...@@ -341,7 +341,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
i_codec_id == AV_CODEC_ID_H264 || i_codec_id == AV_CODEC_ID_H264 ||
i_codec_id == AV_CODEC_ID_VC1 || i_codec_id == AV_CODEC_ID_WMV3) ) i_codec_id == AV_CODEC_ID_VC1 || i_codec_id == AV_CODEC_ID_WMV3) )
{ {
#ifdef HAVE_AVCODEC_MT #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 libavcodec-hw, disabled" ); msg_Warn( p_dec, "threaded frame decoding is not compatible with libavcodec-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