diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2018-04-20 19:25:06 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2018-04-20 20:11:56 +0200 |
| commit | 0e30c98c3d9687a5128deb9eccffe317faca8d06 (patch) | |
| tree | 78e92071399a9f8bc3fdc279bbd409115c7e8fe6 | |
| parent | media-video/dvdstyler: fix build with ffmpeg4 (diff) | |
| download | gentoo-0e30c98c3d9687a5128deb9eccffe317faca8d06.tar.gz gentoo-0e30c98c3d9687a5128deb9eccffe317faca8d06.tar.bz2 gentoo-0e30c98c3d9687a5128deb9eccffe317faca8d06.zip | |
media-video/gpac: fix build with ffmpeg4
Package-Manager: Portage-2.3.31, Repoman-2.3.9
| -rw-r--r-- | media-video/gpac/files/ffmpeg4.patch | 44 | ||||
| -rw-r--r-- | media-video/gpac/gpac-0.7.1.ebuild | 3 |
2 files changed, 46 insertions, 1 deletions
diff --git a/media-video/gpac/files/ffmpeg4.patch b/media-video/gpac/files/ffmpeg4.patch new file mode 100644 index 000000000000..61f329806a55 --- /dev/null +++ b/media-video/gpac/files/ffmpeg4.patch @@ -0,0 +1,44 @@ +Index: gpac-0.7.1/applications/dashcast/video_encoder.c +=================================================================== +--- gpac-0.7.1.orig/applications/dashcast/video_encoder.c ++++ gpac-0.7.1/applications/dashcast/video_encoder.c +@@ -144,7 +144,7 @@ int dc_video_encoder_open(VideoOutputFil + } + + //the global header gives access to the extradata (SPS/PPS) +- video_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ video_output_file->codec_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + video_output_file->vstream_idx = 0;//video_stream->index; + +Index: gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c +=================================================================== +--- gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c ++++ gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c +@@ -49,7 +49,7 @@ + static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size) { + uint8_t * buffer; + /* Size of buffer must be larger, see avcodec_decode_video2 documentation */ +- u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + size); ++ u32 allocatedSz = sizeof( char ) * (AV_INPUT_BUFFER_PADDING_SIZE + size); + if (oldBuffer) + gf_free(oldBuffer); + buffer = (uint8_t*)gf_malloc( allocatedSz ); +@@ -577,7 +577,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B + capability->cap.valueInt = 1; + return GF_OK; + case GF_CODEC_PADDING_BYTES: +- capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE; ++ capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE; + return GF_OK; + case GF_CODEC_REORDER: + capability->cap.valueInt = 1; +@@ -669,7 +669,7 @@ static GF_Err FFDEC_GetCapabilities(GF_B + break; + + case GF_CODEC_PADDING_BYTES: +- capability->cap.valueInt = FF_INPUT_BUFFER_PADDING_SIZE; ++ capability->cap.valueInt = AV_INPUT_BUFFER_PADDING_SIZE; + break; + default: + capability->cap.valueInt = 0; diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild index 2e7046a175c5..ca4acbd586ef 100644 --- a/media-video/gpac/gpac-0.7.1.ebuild +++ b/media-video/gpac/gpac-0.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -61,6 +61,7 @@ DEPEND="${RDEPEND}" # DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt" PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" + "${FILESDIR}/ffmpeg4.patch" ) DOCS=( |