diff options
| author | Marian Buschsieweke <marian.buschsieweke@ovgu.de> | 2019-10-15 10:22:15 +0200 |
|---|---|---|
| committer | Milan P. Stanić <mps@arvanta.net> | 2019-10-22 22:41:30 +0200 |
| commit | cc09448dc3b0ed20643dbc894c515c88407ebc37 (patch) | |
| tree | 4334c4d252419f989ca9294f5d3ce6090d409a1d /testing/opencascade/fix_ffmpeg.patch | |
| parent | bd5f040a849d08e2ef29f742e34d6a601adac682 (diff) | |
| download | aports-cc09448dc3b0ed20643dbc894c515c88407ebc37.tar.bz2 aports-cc09448dc3b0ed20643dbc894c515c88407ebc37.tar.xz | |
testing/opencascade: new aport
Diffstat (limited to 'testing/opencascade/fix_ffmpeg.patch')
| -rw-r--r-- | testing/opencascade/fix_ffmpeg.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/testing/opencascade/fix_ffmpeg.patch b/testing/opencascade/fix_ffmpeg.patch new file mode 100644 index 0000000000..0ec810701d --- /dev/null +++ b/testing/opencascade/fix_ffmpeg.patch @@ -0,0 +1,34 @@ +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; |