Date: Wed, 2 May 2018 13:25:55 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468831 - head/cad/opencascade/files Message-ID: <201805021325.w42DPtX0046777@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed May 2 13:25:55 2018 New Revision: 468831 URL: https://svnweb.freebsd.org/changeset/ports/468831 Log: cad/opencascade: unbreak with ffmpeg 4.0 src/Image/Image_VideoRecorder.cxx:279:25: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; ^ src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'AVFMT_RAWPICTURE' if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0 ^ PR: 227726 Reported by: antoine (via exp-run) Added: head/cad/opencascade/files/patch-src_Image_Image__VideoRecorder.cxx (contents, props changed) Added: head/cad/opencascade/files/patch-src_Image_Image__VideoRecorder.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/cad/opencascade/files/patch-src_Image_Image__VideoRecorder.cxx Wed May 2 13:25:55 2018 (r468831) @@ -0,0 +1,34 @@ +src/Image/Image_VideoRecorder.cxx:279:25: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' + aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; + ^ +src/Image/Image_VideoRecorder.cxx:452:38: error: use of undeclared identifier 'AVFMT_RAWPICTURE' + if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0 + ^ + +--- src/Image/Image_VideoRecorder.cxx.orig 2017-08-30 13:28:21 UTC ++++ src/Image/Image_VideoRecorder.cxx +@@ -276,7 +276,7 @@ Standard_Boolean Image_VideoRecorder::addVideoStream ( + // some formats want stream headers to be separate + if (myAVContext->oformat->flags & AVFMT_GLOBALHEADER) + { +- aCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ aCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + return Standard_True; + #else +@@ -449,6 +449,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame + AVPacket aPacket; + memset (&aPacket, 0, sizeof(aPacket)); + av_init_packet (&aPacket); ++#ifdef AVFMT_RAWPICTURE + if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0 + && !theToFlush) + { +@@ -461,6 +462,7 @@ Standard_Boolean Image_VideoRecorder::writeVideoFrame + aResAv = av_interleaved_write_frame (myAVContext, &aPacket); + } + else ++#endif + { + // encode the image + myFrame->pts = myFrameCount;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805021325.w42DPtX0046777>