hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

multimedia/gpac: Patch for ffmpeg-4.x. 

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
Matteo Bernardini 2019-07-18 16:24:39 +02:00 committed by Robby Workman
parent 2012566954
commit 7f26423849
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
multimedia/gpac/gpac-ffmpeg-4.0.patch Normal file
View File

@ -0,0 +1,42 @@
diff -rupN gpac-0.7.1.orig/applications/dashcast/video_encoder.c gpac-0.7.1/applications/dashcast/video_encoder.c
--- gpac-0.7.1.orig/applications/dashcast/video_encoder.c 2018-04-26 09:19:52.938118328 +0200
+++ gpac-0.7.1/applications/dashcast/video_encoder.c 2018-04-26 09:20:03.165170164 +0200
@@ -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;
diff -rupN gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c
--- gpac-0.7.1.orig/modules/ffmpeg_in/ffmpeg_decode.c 2018-04-26 09:19:53.034788555 +0200
+++ gpac-0.7.1/modules/ffmpeg_in/ffmpeg_decode.c 2018-04-26 09:30:09.739463486 +0200
@@ -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;

6
multimedia/gpac/gpac.SlackBuild
View File

@ -88,6 +88,12 @@ find -L . \
# configure doesn't have --libdir option.
sed -i "s/^libdir=\".*\"$/libdir=\"lib$LIBDIRSUFFIX\"/" configure
# remove this to let it build against openssl-1.1.x
sed -i "/SSLeay_add_all_algorithms/d" src/utils/downloader.c
# patch for ffmpeg-4.x
patch -p1 < $CWD/gpac-ffmpeg-4.0.patch
./configure \
--prefix=/usr \
--mandir=/usr/man \