[vlc-commits] avcodec: remove unecessary check for thread safety on safe libavcodec builds

Steve Lhomme git at videolan.org
Mon Mar 27 08:56:09 CEST 2017


vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Tue Mar 21 11:27:59 2017 +0100| [869db8d97312545567506a4c06df045c14c6d02d] | committer: Jean-Baptiste Kempf

avcodec: remove unecessary check for thread safety on safe libavcodec builds

Technically there's not a version set after Anton's patches merge in FFmpeg yet

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=869db8d97312545567506a4c06df045c14c6d02d
---

 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 570d8e1..f49e82d 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -1348,7 +1348,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
     if (!can_hwaccel)
         return swfmt;
 
-#if (LIBAVCODEC_VERSION_MICRO >= 100) /* FFmpeg only */
+#if !LIBAVCODEC_VERSION_CHECK(57, 30, 1, 83, 101)
     if (p_context->active_thread_type)
     {
         msg_Warn(p_dec, "thread type %d: disabling hardware acceleration",



More information about the vlc-commits mailing list