Date: Thu, 3 May 2018 18:38:06 +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: r468955 - in head/multimedia/dvdstyler: . files Message-ID: <201805031838.w43Ic6mU036897@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu May 3 18:38:06 2018 New Revision: 468955 URL: https://svnweb.freebsd.org/changeset/ports/468955 Log: 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) Added: head/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp (contents, props changed) Modified: head/multimedia/dvdstyler/Makefile (contents, props changed) Modified: head/multimedia/dvdstyler/Makefile ============================================================================== --- head/multimedia/dvdstyler/Makefile Thu May 3 18:29:29 2018 (r468954) +++ head/multimedia/dvdstyler/Makefile Thu May 3 18:38:06 2018 (r468955) @@ -15,8 +15,6 @@ COMMENT= WxWidgets frontend to dvd recoding and author LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build with ffmpeg 4.0 - BUILD_DEPENDS= zip:archivers/zip \ wxsvg>=1.2:graphics/wxsvg \ dvdauthor:multimedia/dvdauthor \ Added: head/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/dvdstyler/files/patch-src_mediaenc__ffmpeg.cpp Thu May 3 18:38:06 2018 (r468955) @@ -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; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805031838.w43Ic6mU036897>