ffmpeg_4

Gbp-Pq: Name ffmpeg_4.patch

diff --git a/applications/dashcast/video_encoder.c b/applications/dashcast/video_encoder.c
index 875e0bdc160b59c08157e43f5fb3e8686b5dc430..737c24daf728996e7f5e30dbc5a1d9ff5ac06aba 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 d76091dd4b3f3533e8b9e17ab3d45a64ae6b8b7c..3a333000aa77d04e5396c3f0b565015bca208aac 100644 (file)
--- 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 e325e193c5e17d7d3b34a272a37f808a54649487..a470cbb995864bbdad07908e1db2e24ea567d9da 100644 (file)
--- 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 5d3148b3cb2611e546702f17d7f827781fc9d6dd..7388df05cf71c7fa55649f0b717a3586ea68129b 100644 (file)
--- 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;