[paraview] 02/05: Refresh patch.

[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 3e73364955ed439070078185d919e6f8d00cf266
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Jan 10 13:44:13 2016 +0100

    Refresh patch.
---
 debian/patches/ffmpeg_2.9.patch | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
index 9e596a2..4c4df8f 100644
--- a/debian/patches/ffmpeg_2.9.patch
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -2,8 +2,10 @@ Description: Replace deprecated FFmpeg API
 Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
 Last-Update: <2015-11-02>
 
---- paraview-4.1.0+dfsg+1.orig/VTK/CMake/vtkTestFFMPEG.cmake
-+++ paraview-4.1.0+dfsg+1/VTK/CMake/vtkTestFFMPEG.cmake
+Index: paraview/VTK/CMake/vtkTestFFMPEG.cmake
+===================================================================
+--- paraview.orig/VTK/CMake/vtkTestFFMPEG.cmake
++++ paraview/VTK/CMake/vtkTestFFMPEG.cmake
 @@ -32,8 +32,8 @@ if(FFMPEG_INCLUDE_DIR)
  #include <${FFMEG_CODEC_HEADER_PATH}/avcodec.h>
  int main()
@@ -15,9 +17,11 @@ Last-Update: <2015-11-02>
                0, 0);
    return 0;
  }\n")
---- paraview-4.1.0+dfsg+1.orig/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-+++ paraview-4.1.0+dfsg+1/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -184,11 +184,11 @@ int vtkFFMPEGWriterInternal::Start()
+Index: paraview/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
+===================================================================
+--- paraview.orig/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
++++ paraview/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx
+@@ -188,11 +188,11 @@ int vtkFFMPEGWriterInternal::Start()
    c->height = this->Dim[1];
    if (this->Writer->GetCompression())
      {
@@ -31,7 +35,7 @@ Last-Update: <2015-11-02>
      }
  
    //to do playback at actual recorded rate, this will need more work see also below
-@@ -267,13 +267,13 @@ int vtkFFMPEGWriterInternal::Start()
+@@ -271,13 +271,13 @@ int vtkFFMPEGWriterInternal::Start()
  #endif
  
    //for the output of the writer's input...
@@ -47,7 +51,7 @@ Last-Update: <2015-11-02>
    unsigned char *rgb = new unsigned char[RGBsize];
    if (!rgb)
      {
-@@ -281,10 +281,10 @@ int vtkFFMPEGWriterInternal::Start()
+@@ -285,10 +285,10 @@ int vtkFFMPEGWriterInternal::Start()
      return 0;
      }
    //The rgb buffer should get deleted when this->rgbInput is.
@@ -60,7 +64,7 @@ Last-Update: <2015-11-02>
    if (!this->yuvOutput)
      {
      vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." );
-@@ -342,12 +342,12 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
+@@ -346,12 +346,12 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
    //convert that to YUV for input to the codec
  #ifdef VTK_FFMPEG_HAS_IMG_CONVERT
    img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt,
@@ -75,7 +79,7 @@ Last-Update: <2015-11-02>
      cc->width, cc->height, cc->pix_fmt,
      SWS_BICUBIC, NULL, NULL, NULL);
  
-@@ -440,14 +440,14 @@ void vtkFFMPEGWriterInternal::End()
+@@ -490,14 +490,14 @@ void vtkFFMPEGWriterInternal::End()
    if (this->yuvOutput)
      {
      av_free(this->yuvOutput->data[0]);

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