commit 28d72d7d6f48d7b2c14fdc5e914601cb83d1f1ce Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Wed Jan 17 19:56:00 2018 +0000 add ffmpeg build fix ffmpeg35_buildfix.patch | 24 ++++++++++++++++++++++++ gpac.spec | 3 +++ 2 files changed, 27 insertions(+) --- diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch new file mode 100644 index 0000000..d3b54b6 --- /dev/null +++ b/ffmpeg35_buildfix.patch @@ -0,0 +1,24 @@ +From 855aafe47677de558a7dd5f772b8094b54bfe61a Mon Sep 17 00:00:00 2001 +From: jeanlf <jeanlf(a)users.sourceforge.net&gt; +Date: Tue, 16 Jan 2018 16:21:28 +0100 +Subject: [PATCH] fixed compil bug with latest ffmpeg + +--- + applications/dashcast/video_encoder.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/applications/dashcast/video_encoder.c b/applications/dashcast/video_encoder.c +index 1632ffe38..9e2238aa1 100644 +--- a/applications/dashcast/video_encoder.c ++++ b/applications/dashcast/video_encoder.c +@@ -143,8 +143,10 @@ int dc_video_encoder_open(VideoOutputFile *video_output_file, VideoDataConf *vid + av_opt_set_int(video_output_file->codec_ctx->priv_data, "key-int", video_output_file->gdr, 0); + } + ++#ifdef CODEC_FLAG_GLOBAL_HEADER + //the global header gives access to the extradata (SPS/PPS) + video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++#endif + + video_output_file->vstream_idx = 0;//video_stream->index; + diff --git a/gpac.spec b/gpac.spec index d9f6b44..605f61c 100644 --- a/gpac.spec +++ b/gpac.spec @@ -27,6 +27,8 @@ Source0: https://github.com/gpac/gpac/archive/v%{version}/gpac-%{version}.ta Patch0: openssl-1.1.0.patch # Upstream commit, fix typo Patch1: https://github.com/gpac/gpac/commit/669258a21dcc9827e1496c460af0bff83aa5d... +# Upstream build fix for ffmpeg-3.5 +Patch2: https://github.com/gpac/gpac/commit/855aafe47677de558a7dd5f772b8094b54bfe... #Source9: gpac-snapshot.sh BuildRequires: ImageMagick @@ -146,6 +148,7 @@ web browsers. %patch0 -p1 %endif %patch1 -p1 +%patch2 -p1 rm -r extra_lib/ # Fix encoding warnings cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine