vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Jun 20 19:15:57 2013 +0300| [df252eac618091d156cf986f38a98c2bddbc8437] | committer: Rémi Denis-Courmont
avcodec: disable threading when decoding in hardware(fixes #8786) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=df252eac618091d156cf986f38a98c2bddbc8437 --- modules/codec/avcodec/video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index 2b55e89..7f5b8ab 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" ); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
