From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Date: Sun, 7 Apr 2019 16:19:28 +0000 (-0400)
Subject: ffmpeg_4
X-Git-Tag: archive/raspbian/1.0.1+dfsg1-4+rpi1~1^2~39^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=24b79bb95ee0a77369a653bc3eb98a3d05433277;p=gpac.git

ffmpeg_4


Gbp-Pq: Name ffmpeg_4.patch
---

diff --git a/applications/dashcast/video_encoder.c b/applications/dashcast/video_encoder.c
index 875e0bd..737c24d 100644
--- a/applications/dashcast/video_encoder.c
+++ b/applications/dashcast/video_encoder.c
@@ -144,7 +144,7 @@ int dc_video_encoder_open(VideoOutputFile *video_output_file, VideoDataConf *vid
 	}
 
 	//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 --git a/modules/ffmpeg_in/ffmpeg_decode.c b/modules/ffmpeg_in/ffmpeg_decode.c
index d76091d..3a33300 100644
--- 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_BaseDecoder *plug, GF_CodecCapability *ca
 		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_BaseDecoder *plug, GF_CodecCapability *ca
 		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/modules/redirect_av/ffmpeg_ts_muxer.c b/modules/redirect_av/ffmpeg_ts_muxer.c
index e325e19..a470cbb 100644
--- 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_AVRedirect * avr, u32 videoBitrateInBitsPerS
 		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_AVRedirect * avr, u32 videoBitrateInBitsPerS
 		}
 		// 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);
diff --git a/modules/redirect_av/redirect_av.c b/modules/redirect_av/redirect_av.c
index 5d3148b..7388df0 100644
--- a/modules/redirect_av/redirect_av.c
+++ b/modules/redirect_av/redirect_av.c
@@ -133,7 +133,7 @@ static u32 audio_encoding_thread_run(void *param)
 	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;