diff options
Diffstat (limited to 'ffmpeg-3.patch')
| -rw-r--r-- | ffmpeg-3.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/ffmpeg-3.patch b/ffmpeg-3.patch new file mode 100644 index 000000000000..2ffdc6d013b6 --- /dev/null +++ b/ffmpeg-3.patch @@ -0,0 +1,61 @@ +diff -Naur ParaView-v4.2.0-source.orig/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx ParaView-v4.2.0-source/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx +--- ParaView-v4.2.0-source.orig/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx 2016-05-13 11:21:34.322631568 +0200 ++++ ParaView-v4.2.0-source/VTK/IO/FFMPEG/vtkFFMPEGWriter.cxx 2016-05-13 15:45:28.098994000 +0200 +@@ -189,11 +189,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 +@@ -272,13 +272,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 = new unsigned char[RGBsize]; + if (!rgb) + { +@@ -286,10 +286,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." ); +@@ -347,12 +347,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); + |