vlc | branch: master | Laurent Aimar <[email protected]> | Sun Jun 5 16:44:08 2011 +0200| [e811fe62a60e62f2666d913c20bc1e7f88e5a59c] | committer: Laurent Aimar
Fixed compilation with avcodec without MT support. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e811fe62a60e62f2666d913c20bc1e7f88e5a59c --- modules/codec/avcodec/video.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index 5b13a5a..8cb66cc 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -349,11 +349,13 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, i_codec_id == CODEC_ID_H264 || 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 ) { msg_Warn( p_dec, "threaded frame decoding is not compatible with ffmpeg-hw, disabled" ); p_sys->p_context->thread_type &= ~FF_THREAD_FRAME; } +#endif p_sys->p_context->get_format = ffmpeg_GetFormat; } #endif _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
