[paraview] 02/05: Fix libav10 compilation. (Closes: #739434

[Anton Gladky]

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

gladk pushed a commit to branch 4.0
in repository paraview.

commit f4ccb4e1e4251a0e8696bee069678989f7b89a32
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Mar 13 19:33:34 2014 +0100

    Fix libav10 compilation. (Closes: #739434
---
 debian/patches/fix_libav10.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 35 insertions(+)

diff --git a/debian/patches/fix_libav10.patch b/debian/patches/fix_libav10.patch
new file mode 100644
index 0000000..75aa4af
--- /dev/null
+++ b/debian/patches/fix_libav10.patch
@@ -0,0 +1,34 @@
+Description: fix libav10 compilation
+Author: Anton Khirnov <anton at khirnov.net>
+Applied-Upstream: http://review.source.kitware.com/#/c/14289/
+Reviewed-By: Anton Gladky <gladk at debian.org>
+Last-Update: 2014-03-13
+
+--- 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 @@
+   if (this->Writer->GetCompression())
+     {
+     //choose a codec that is easily playable on windows
+-    this->avOutputFormat->video_codec = CODEC_ID_MJPEG;
++    this->avOutputFormat->video_codec = AV_CODEC_ID_MJPEG;
+     }
+   else
+     {
+-    this->avOutputFormat->video_codec = CODEC_ID_RAWVIDEO;
++    this->avOutputFormat->video_codec = AV_CODEC_ID_RAWVIDEO;
+     }
+ 
+   //assign the format to the context
diff --git a/debian/patches/series b/debian/patches/series
index fa3626f..37881eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_manpages_errors.patch
 use_system_json.patch
+fix_libav10.patch

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