[paraview] 03/08: debian/patches/fix_libav10.patch: Make it actually build against libav10. (Closes: #739434)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository paraview.

commit 89cd37582bea8296332d35c6708d8ed0f5ff14aa
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed May 14 22:04:49 2014 +0200

    debian/patches/fix_libav10.patch: Make it actually build against
    libav10. (Closes: #739434)
---
 debian/patches/fix_libav10.patch | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/debian/patches/fix_libav10.patch b/debian/patches/fix_libav10.patch
index 75aa4af..5727b43 100644
--- a/debian/patches/fix_libav10.patch
+++ b/debian/patches/fix_libav10.patch
@@ -1,24 +1,12 @@
 Description: fix libav10 compilation
-Author: Anton Khirnov <anton at khirnov.net>
+Author: Anton Khirnov <anton at khirnov.net>, Sebastian Ramacher <sramacher at debian.org>
 Applied-Upstream: http://review.source.kitware.com/#/c/14289/
 Reviewed-By: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-03-13
+Last-Update: 2014-05-14
 
 --- a/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
 +++ b/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -38,6 +38,11 @@
- 
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- 
-+#ifndef VTK_FFMPEG_AVCODECID
-+#define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG
-+#define AV_CODEC_ID_RAWVIDEO CODEC_ID_RAWVIDEO
-+#endif
-+
- //---------------------------------------------------------------------------
- class vtkFFMPEGWriterInternal
- {
-@@ -143,11 +148,11 @@
+@@ -143,11 +143,11 @@
    if (this->Writer->GetCompression())
      {
      //choose a codec that is easily playable on windows
@@ -32,3 +20,12 @@ Last-Update: 2014-03-13
      }
  
    //assign the format to the context
+@@ -170,7 +170,7 @@
+ 
+   //Set up the codec.
+   AVCodecContext *c = this->avStream->codec;
+-  c->codec_id = (CodecID)this->avOutputFormat->video_codec;
++  c->codec_id = (AVCodecID)this->avOutputFormat->video_codec;
+ #ifdef VTK_FFMPEG_HAS_OLD_HEADER
+   c->codec_type = CODEC_TYPE_VIDEO;
+ #else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/paraview.git