From 0665a3d4b954afbee4d1d456fcf8333d0cca9057 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 3 May 2018 18:38:06 +0000 Subject: multimedia/dvdstyler: unbreak with ffmpeg 4.0 mediaenc_ffmpeg.cpp:215:18: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' c->flags |= CODEC_FLAG_GLOBAL_HEADER; ^ PR: 227726 Reported by: antoine (via exp-run) --- .../dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp (limited to 'multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp') diff --git a/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp b/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp new file mode 100644 index 000000000000..0b41a21b37f1 --- /dev/null +++ b/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp @@ -0,0 +1,25 @@ +mediaenc_ffmpeg.cpp:215:18: error: use of undeclared identifier 'CODEC_FLAG_GLOBAL_HEADER' + c->flags |= CODEC_FLAG_GLOBAL_HEADER; + ^ + +--- src/mediaenc_ffmpeg.cpp.orig 2015-10-04 13:18:58 UTC ++++ src/mediaenc_ffmpeg.cpp +@@ -48,6 +48,9 @@ extern "C" { + #define av_frame_free avcodec_free_frame + #endif + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 34, 1) ++#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER ++#endif + + wxFfmpegMediaEncoder::wxFfmpegMediaEncoder(int threadCount) { + m_threadCount = threadCount; +@@ -212,7 +215,7 @@ bool wxFfmpegMediaEncoder::addAudioStream(int codecId) + c->time_base = (AVRational){ 1, c->sample_rate }; + // some formats want stream headers to be separate + if(m_outputCtx->oformat->flags & AVFMT_GLOBALHEADER) +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + return true; + } -- cgit v1.2.3