diff options
Diffstat (limited to 'ffmpeg3.patch')
-rw-r--r-- | ffmpeg3.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/ffmpeg3.patch b/ffmpeg3.patch deleted file mode 100644 index b5a2cb940141..000000000000 --- a/ffmpeg3.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -Naur ParaView-5.0.1p1.orig/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx ParaView-5.0.1p1/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx ---- ParaView-5.0.1p1.orig/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx 2016-11-19 23:17:56.596094663 +0100 -+++ ParaView-5.0.1p1/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx 2016-11-19 23:18:17.099178065 +0100 -@@ -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); - |