From: Jan Palus <atler@pld-linux.org>
Date: Sun, 9 Jul 2017 22:29:30 +0000 (+0200)
Subject: updated ffmpeg3 patch
X-Git-Tag: auto/th/vlc-2.2.6-2~2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=7ab5dbd8349592aad23832c4caa3ddbd14441261;p=packages%2Fvlc.git

updated ffmpeg3 patch

fixes hwaccel in default setup without enforcing avcodec-threads=1
---

diff --git a/ffmpeg3.patch b/ffmpeg3.patch
index c0d06a9..2ca88b7 100644
--- a/ffmpeg3.patch
+++ b/ffmpeg3.patch
@@ -190,11 +190,12 @@ diff -ruNp vlc-2.2.3.orig/modules/codec/avcodec/video.c vlc-2.2.3/modules/codec/
  {
      decoder_t *p_dec = p_context->opaque;
      decoder_sys_t *p_sys = p_dec->p_sys;
-@@ -1341,6 +1341,15 @@ static enum PixelFormat ffmpeg_GetFormat
+@@ -1341,6 +1341,16 @@ static enum PixelFormat ffmpeg_GetFormat
      if (!can_hwaccel)
          goto end;
  
-+#if (LIBAVCODEC_VERSION_MICRO >= 100) /* FFmpeg only */
++#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",