From fe5a7c353c8d9e57f32e6a91507d35007f0afed0 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Fri, 25 May 2018 09:56:56 -0400 Subject: [PATCH] ffmpeg_4 Gbp-Pq: Name ffmpeg_4.patch --- applications/dashcast/video_encoder.c | 2 +- modules/ffmpeg_in/ffmpeg_decode.c | 6 +++--- modules/redirect_av/ffmpeg_ts_muxer.c | 4 ++-- modules/redirect_av/redirect_av.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/applications/dashcast/video_encoder.c b/applications/dashcast/video_encoder.c index 08c70a6..d4c1278 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 f117bda..b59c1f2 100644 --- a/modules/ffmpeg_in/ffmpeg_decode.c +++ b/modules/ffmpeg_in/ffmpeg_decode.c @@ -48,7 +48,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 = gf_malloc( allocatedSz ); @@ -530,7 +530,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; @@ -614,7 +614,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 93b6f5a..6e30a7d 100644 --- a/modules/redirect_av/ffmpeg_ts_muxer.c +++ b/modules/redirect_av/ffmpeg_ts_muxer.c @@ -195,7 +195,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 @@ -230,7 +230,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 d73976c..bc9847b 100644 --- a/modules/redirect_av/redirect_av.c +++ b/modules/redirect_av/redirect_av.c @@ -128,7 +128,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 = gf_malloc(outBuffSize* sizeof(u8)); inBuff = NULL; -- 2.30.2