[vlc-commits] avcodec: unbreak libav hardware acceleration (fixes #18170)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri May  5 20:04:51 2017 +0300| [e167dd4e80a4afc7fc0e692c96e09977468cf037] | committer: Rémi Denis-Courmont

avcodec: unbreak libav hardware acceleration (fixes #18170)

Regression from commit 869db8d97312545567506a4c06df045c14c6d02d.

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

 modules/codec/avcodec/video.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 632b317b2f..85e9bf7a04 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -1463,7 +1463,8 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
     if (!can_hwaccel)
         return swfmt;
 
-#if !LIBAVCODEC_VERSION_CHECK(57, 30, 1, 83, 101)
+#if (LIBAVCODEC_VERSION_MICRO >= 100) \
+  && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 83, 101))
     if (p_context->active_thread_type)
     {
         msg_Warn(p_dec, "thread type %d: disabling hardware acceleration",