[vtk7] 09/24: remove patch 95_ffmpeg_2.9

[Gert Wollny]

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

gewo pushed a commit to branch master
in repository vtk7.

commit cd6414ce9934f64e75f3f5d928de8eacbb0a1335
Author: Gert Wollny <gewo at debian.org>
Date:   Sat Jul 8 15:34:25 2017 +0000

    remove patch  95_ffmpeg_2.9
---
 debian/patches/95_ffmpeg_2.9.patch | 77 --------------------------------------
 debian/patches/series              |  1 -
 2 files changed, 78 deletions(-)

diff --git a/debian/patches/95_ffmpeg_2.9.patch b/debian/patches/95_ffmpeg_2.9.patch
index 0da599c..3983b56 100644
--- a/debian/patches/95_ffmpeg_2.9.patch
+++ b/debian/patches/95_ffmpeg_2.9.patch
@@ -15,80 +15,3 @@ Last-Update: <2015-11-02>
                0, 0);
    return 0;
  }\n")
---- a/IO/FFMPEG/vtkFFMPEGWriter.cxx
-+++ b/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -191,11 +191,11 @@
-   c->height = this->Dim[1];
-   if (this->Writer->GetCompression())
-     {
--    c->pix_fmt = PIX_FMT_YUVJ422P;
-+    c->pix_fmt = AV_PIX_FMT_YUVJ422P;
-     }
-   else
-     {
--    c->pix_fmt = PIX_FMT_BGR24;
-+    c->pix_fmt = AV_PIX_FMT_BGR24;
-     }
- 
-   //to do playback at actual recorded rate, this will need more work see also below
-@@ -274,13 +274,13 @@
- #endif
- 
-   //for the output of the writer's input...
--  this->rgbInput = avcodec_alloc_frame();
-+  this->rgbInput = av_frame_alloc();
-   if (!this->rgbInput)
-     {
-     vtkGenericWarningMacro (<< "Could not make rgbInput avframe." );
-     return 0;
-     }
--  int RGBsize = avpicture_get_size(PIX_FMT_RGB24, c->width, c->height);
-+  int RGBsize = avpicture_get_size(AV_PIX_FMT_RGB24, c->width, c->height);
-   unsigned char *rgb = (unsigned char *)av_malloc(sizeof(unsigned char) * RGBsize);
-   if (!rgb)
-     {
-@@ -288,10 +288,10 @@
-     return 0;
-     }
-   //The rgb buffer should get deleted when this->rgbInput is.
--  avpicture_fill((AVPicture *)this->rgbInput, rgb, PIX_FMT_RGB24, c->width, c->height);
-+  avpicture_fill((AVPicture *)this->rgbInput, rgb, AV_PIX_FMT_RGB24, c->width, c->height);
- 
-   //and for the output to the codec's input.
--  this->yuvOutput = avcodec_alloc_frame();
-+  this->yuvOutput = av_frame_alloc();
-   if (!this->yuvOutput)
-     {
-     vtkGenericWarningMacro (<< "Could not make yuvOutput avframe." );
-@@ -349,12 +349,12 @@
-   //convert that to YUV for input to the codec
- #ifdef VTK_FFMPEG_HAS_IMG_CONVERT
-   img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt,
--              (AVPicture *)this->rgbInput, PIX_FMT_RGB24,
-+              (AVPicture *)this->rgbInput, AV_PIX_FMT_RGB24,
-               cc->width, cc->height);
- #else
-   //convert that to YUV for input to the codec
-   SwsContext* convert_ctx = sws_getContext(
--    cc->width, cc->height, PIX_FMT_RGB24,
-+    cc->width, cc->height, AV_PIX_FMT_RGB24,
-     cc->width, cc->height, cc->pix_fmt,
-     SWS_BICUBIC, NULL, NULL, NULL);
- 
-@@ -447,14 +447,14 @@
-   if (this->yuvOutput)
-     {
-     av_free(this->yuvOutput->data[0]);
--    av_free(this->yuvOutput);
-+    av_frame_free(&this->yuvOutput);
-     this->yuvOutput = NULL;
-     }
- 
-   if (this->rgbInput)
-     {
-     av_free(this->rgbInput->data[0]);
--    av_free(this->rgbInput);
-+    av_frame_free(&this->rgbInput);
-     this->rgbInput = NULL;
-     }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 00b8567..200502e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
 60_use_system_mpi4py.patch
 70_fix_ftbfs_gcc49.patch
 80_fix_arm_compilation.patch
-95_ffmpeg_2.9.patch
 97_fix_latex_doxygen.patch
 100_javac-heap.patch
 101_java_install_path.patch

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