[vtk6] 02/03: Fix libav10-compilation. (Closes: #739456)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository vtk6.

commit 675402e1d947bb26a17b401c2cc2e585bed664eb
Author: Anton Khirnov <anton at khirnov.net>
Date:   Wed Mar 12 21:37:11 2014 +0100

    Fix libav10-compilation. (Closes: #739456)
---
 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..8057d34
--- /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/IO/FFMPEG/vtkFFMPEGWriter.cxx
++++ b/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 c07da52..93aa3f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ vtkTclWrapper.patch
 vtkWrapJava.patch
 matplotlib.patch
 docs.patch
+fix_libav10.patch

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