aboutsummaryrefslogtreecommitdiffstats
path: root/testing/opencascade/fix_ffmpeg.patch
diff options
context:
space:
mode:
authorMarian Buschsieweke <marian.buschsieweke@ovgu.de>2019-12-20 11:17:17 +0100
committerRasmus Thomsen <oss@cogitri.dev>2019-12-21 15:25:04 +0100
commit4956d3846f7c80e31a2c62de056d8d056ae8343e (patch)
tree2c56687229b46e1aaa19e256e76041a785687122 /testing/opencascade/fix_ffmpeg.patch
parenta77633de5fed2a06a514d51b605facee88a103c2 (diff)
downloadaports-4956d3846f7c80e31a2c62de056d8d056ae8343e.tar.bz2
aports-4956d3846f7c80e31a2c62de056d8d056ae8343e.tar.xz
testing/opencascade: upgrade to 7.4.0
Diffstat (limited to 'testing/opencascade/fix_ffmpeg.patch')
-rw-r--r--testing/opencascade/fix_ffmpeg.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/testing/opencascade/fix_ffmpeg.patch b/testing/opencascade/fix_ffmpeg.patch
deleted file mode 100644
index 0ec810701d..0000000000
--- a/testing/opencascade/fix_ffmpeg.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-In current version of ffmpeg the flag CODEC_FLAG_GLOBAL_HEADER has been renamed
-and the deprecated raw picture API has been removed. This patch renames
-CODEC_FLAG_GLOBAL_HEADER to AV_CODEC_FLAG_GLOBAL_HEADER and removes the use of
-the dropped API.
---- occt-V7_3_0p3.bin/src/Image/Image_VideoRecorder.cxx
-+++ occt-V7_3_0p3/src/Image/Image_VideoRecorder.cxx
-@@ -283,7 +283,7 @@
- // 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
-@@ -456,18 +456,6 @@
- AVPacket aPacket;
- memset (&aPacket, 0, sizeof(aPacket));
- av_init_packet (&aPacket);
-- if ((myAVContext->oformat->flags & AVFMT_RAWPICTURE) != 0
-- && !theToFlush)
-- {
-- // raw video case - directly store the picture in the packet
-- aPacket.flags |= AV_PKT_FLAG_KEY;
-- aPacket.stream_index = myVideoStream->index;
-- aPacket.data = myFrame->data[0];
-- aPacket.size = sizeof(AVPicture);
--
-- aResAv = av_interleaved_write_frame (myAVContext, &aPacket);
-- }
-- else
- {
- // encode the image
- myFrame->pts = myFrameCount;