[vlc-devel] [PATCH 1/1] avcodec: always remove slice threading type when using a hwaccel

[Janne Grunau]

MPEG1/2 are not the only two codecs which support slice based threading.
---
 modules/codec/avcodec/video.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index ab5bc66..87b009d 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -347,8 +347,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
             msg_Warn( p_dec, "threaded frame decoding is not compatible with libavcodec-hw, disabled" );
             p_sys->p_context->thread_type &= ~FF_THREAD_FRAME;
         }
-        if( ( p_sys->p_context->thread_type & FF_THREAD_SLICE ) &&
-            ( i_codec_id == AV_CODEC_ID_MPEG1VIDEO || i_codec_id == AV_CODEC_ID_MPEG2VIDEO ) )
+        if( p_sys->p_context->thread_type & FF_THREAD_SLICE )
         {
             msg_Warn( p_dec, "threaded slice decoding is not compatible with libavcodec-hw, disabled" );
             p_sys->p_context->thread_type &= ~FF_THREAD_SLICE;
-- 
1.8.1.5