[hedgewars] 01/01: Fix previous patch

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository hedgewars.

commit 6f06388580e606d30c4587abaab4896c485bb4fc
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Nov 4 14:59:23 2015 +0100

    Fix previous patch
---
 ...More-refinements-about-version-contraints.patch | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0001-More-refinements-about-version-contraints.patch b/debian/patches/0001-More-refinements-about-version-contraints.patch
index 8d09ad2..5558930 100644
--- a/debian/patches/0001-More-refinements-about-version-contraints.patch
+++ b/debian/patches/0001-More-refinements-about-version-contraints.patch
@@ -1,4 +1,4 @@
-From 92cb54f0d41ff91bb5dc809e82ff9a025119c7fc Mon Sep 17 00:00:00 2001
+From f7b192c76aa933c327b4b22d94e0033b855f9330 Mon Sep 17 00:00:00 2001
 From: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
 Date: Wed, 4 Nov 2015 10:44:27 +0100
 Subject: [PATCH] More refinements about version contraints
@@ -9,7 +9,7 @@ Subject: [PATCH] More refinements about version contraints
  2 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/QTfrontend/util/LibavInteraction.cpp b/QTfrontend/util/LibavInteraction.cpp
-index 425368c..ed3795b 100644
+index 425368c..0a3cbc8 100644
 --- a/QTfrontend/util/LibavInteraction.cpp
 +++ b/QTfrontend/util/LibavInteraction.cpp
 @@ -106,7 +106,7 @@ LibavInteraction::LibavInteraction() : QObject()
@@ -17,12 +17,12 @@ index 425368c..ed3795b 100644
                  continue;
              bool yuv420Supported = false;
 -#if LIBAVCODEC_VERSION_MAJOR > 56
-+#if LIBAVCODEC_VERSION_MAJOR > 51
++#if LIBAVUTIL_VERSION_MAJOR > 51
              for (const AVPixelFormat* pfmt = pCodec->pix_fmts; *pfmt != -1; pfmt++)
                  if (*pfmt == AV_PIX_FMT_YUV420P)
  #else
 diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index 264014a..0e4082f 100644
+index 264014a..171fda7 100644
 --- a/hedgewars/avwrapper/avwrapper.c
 +++ b/hedgewars/avwrapper/avwrapper.c
 @@ -158,7 +158,7 @@ static void AddAudioStream()
@@ -30,7 +30,7 @@ index 264014a..0e4082f 100644
          g_NumSamples = g_pAudio->frame_size;
      g_pSamples = (int16_t*)av_malloc(g_NumSamples*g_Channels*sizeof(int16_t));
 -#if LIBAVCODEC_VERSION_MAJOR > 56
-+#if LIBAVCODEC_VERSION_MAJOR > 52
++#if LIBAVUTIL_VERSION_MAJOR > 52
      g_pAFrame = av_frame_alloc();
  #else
      g_pAFrame = avcodec_alloc_frame();
@@ -39,7 +39,7 @@ index 264014a..0e4082f 100644
      g_pVideo->time_base.num = g_Framerate.den;
      //g_pVideo->gop_size = 12; /* emit one intra frame every twelve frames at most */
 -#if LIBAVCODEC_VERSION_MAJOR > 56
-+#if LIBAVCODEC_VERSION_MAJOR > 51
++#if LIBAVUTIL_VERSION_MAJOR > 51
      g_pVideo->pix_fmt = AV_PIX_FMT_YUV420P;
  #else
      g_pVideo->pix_fmt = PIX_FMT_YUV420P;
@@ -48,7 +48,7 @@ index 264014a..0e4082f 100644
          return FatalError("Could not open video codec %s", g_pVCodec->long_name);
  
 -#if LIBAVCODEC_VERSION_MAJOR > 56
-+#if LIBAVCODEC_VERSION_MAJOR > 52
++#if LIBAVUTIL_VERSION_MAJOR > 52
      g_pVFrame = av_frame_alloc();
  #else
      g_pVFrame = avcodec_alloc_frame();
@@ -57,7 +57,7 @@ index 264014a..0e4082f 100644
      if (g_pAStream)
      {
 -#if LIBAVCODEC_VERSION_MAJOR > 56
-+#if LIBAVCODEC_VERSION_MAJOR > 55
++#if LIBAVFORMAT_VERSION_MAJOR > 55
          VideoTime = (double)av_stream_get_end_pts(g_pVStream)*g_pVStream->time_base.num/g_pVStream->time_base.den;
  #else
          VideoTime = (double)g_pVStream->pts.val*g_pVStream->time_base.num/g_pVStream->time_base.den;
@@ -65,7 +65,7 @@ index 264014a..0e4082f 100644
          do
          {
 -#if LIBAVCODEC_VERSION_MAJOR > 56
-+#if LIBAVCODEC_VERSION_MAJOR > 55
++#if LIBAVFORMAT_VERSION_MAJOR > 55
              AudioTime = (double)av_stream_get_end_pts(g_pAStream)*g_pAStream->time_base.num/g_pAStream->time_base.den;
  #else
              AudioTime = (double)g_pAStream->pts.val*g_pAStream->time_base.num/g_pAStream->time_base.den;
@@ -74,7 +74,7 @@ index 264014a..0e4082f 100644
          av_free(g_pVideo);
          av_free(g_pVStream);
 -#if LIBAVCODEC_VERSION_MAJOR > 56
-+#if LIBAVCODEC_VERSION_MAJOR > 52
++#if LIBAVUTIL_VERSION_MAJOR > 52
          av_frame_free(&g_pVFrame);
  #else
          av_free(g_pVFrame);
@@ -83,7 +83,7 @@ index 264014a..0e4082f 100644
          av_free(g_pAudio);
          av_free(g_pAStream);
 -#if LIBAVCODEC_VERSION_MAJOR > 56
-+#if LIBAVCODEC_VERSION_MAJOR > 52
++#if LIBAVUTIL_VERSION_MAJOR > 52
          av_frame_free(&g_pAFrame);
  #else
          av_free(g_pAFrame);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git