ffmpeg_4

Gbp-Pq: Name ffmpeg_4.patch

diff --git a/applications/dashcast/video_encoder.c b/applications/dashcast/video_encoder.c
index 08c70a60bf8a30b31f4078af51724f95ebfe542a..d4c1278d0d0cd92dd15be1e176bceed3f37f88e2 100644 (file)
--- 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 f117bda024b3f3bc2d62faf1dec97278ee6c3070..b59c1f278e6fe483debcef22935ae824e57d4be9 100644 (file)
--- 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 93b6f5a1aae7627d25151ef92509a2e742a892b7..6e30a7d8835cd6d2e8ebed8137024af57e29c366 100644 (file)
--- 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 d73976c70c915e2faab9e4316e4db27df2c0c022..bc9847b45ae383e57b2acab38d0164948537f896 100644 (file)
--- 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;