From: Rémi Denis-Courmont <remi@remlab.net>
Date: Thu, 20 Jun 2013 16:15:57 +0000 (+0300)
Subject: avcodec: disable threading when decoding in hardware(fixes #8786)
X-Git-Tag: 2.1.0-git~79
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=df252eac618091d156cf986f38a98c2bddbc8437;p=vlc

avcodec: disable threading when decoding in hardware(fixes #8786)
---

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 2b55e89fa0..7f5b8abb93 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -344,7 +344,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
          i_codec_id == AV_CODEC_ID_H264 ||
          i_codec_id == AV_CODEC_ID_VC1 || i_codec_id == AV_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 )
         {
             msg_Warn( p_dec, "threaded frame decoding is not compatible with avcodec-hw, disabled" );