Package: gpac / 0.7.1+dfsg1-3

ffmpeg_4.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
Description: Fix FTBFS with FFmpeg 4.0
Author: James Cowgill <jcowgill@debian.org>
Bug: https://github.com/gpac/gpac/pull/1063
Bug-Debian: https://bugs.debian.org/888343
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/applications/dashcast/video_encoder.c
+++ b/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;
 
--- a/modules/ffmpeg_in/ffmpeg_decode.c
+++ b/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;
--- a/modules/redirect_av/ffmpeg_ts_muxer.c
+++ b/modules/redirect_av/ffmpeg_ts_muxer.c
@@ -201,7 +201,7 @@ GF_AbstractTSMuxer * ts_amux_new(GF_AVRe
 		c->time_base.den = 1000;
 		// some formats want stream headers to be separate
 		if (ts->oc->oformat->flags & AVFMT_GLOBALHEADER)
-			c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+			c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 	}
 #endif
 
@@ -240,7 +240,7 @@ GF_AbstractTSMuxer * ts_amux_new(GF_AVRe
 		}
 		// some formats want stream headers to be separate
 		if (ts->oc->oformat->flags & AVFMT_GLOBALHEADER)
-			c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+			c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 
 	}
 	//av_set_pts_info(ts->audio_st, 33, 1, audioBitRateInBitsPerSec);
--- a/modules/redirect_av/redirect_av.c
+++ b/modules/redirect_av/redirect_av.c
@@ -133,7 +133,7 @@ static u32 audio_encoding_thread_run(voi
 	AVCodecContext * ctx = NULL;
 	assert( avr );
 
-	outBuffSize = FF_MIN_BUFFER_SIZE;
+	outBuffSize = AV_INPUT_BUFFER_MIN_SIZE;
 
 	outBuff = (u8*)gf_malloc(outBuffSize* sizeof(u8));
 	inBuff = NULL;