Refresh patches

diff --git a/debian/patches/gcc-optflags.patch b/debian/patches/gcc-optflags.patch
index 035231764c720df170c56d14985f3551640a0081..0e7f0a37ee848ace95fe4b8776cd6cd905feee9f 100644 (file)
--- a/debian/patches/gcc-optflags.patch
+++ b/debian/patches/gcc-optflags.patch
@@ -16,7 +16,7 @@ Forwarded: not-needed
              ;;
          --disable-opt) no_gcc_opt="yes"
              ;;
-@@ -638,7 +638,7 @@ fi
+@@ -642,7 +642,7 @@ fi
  
  #GCC opt
  if test "$no_gcc_opt" = "no"; then

diff --git a/debian/patches/libav10.patch b/debian/patches/libav10.patch
index 8722980f8054d0c0d88f691ec8896eb708939bc8..0cf291b5bb7bbfb977899b61b72b4457367624d6 100644 (file)
--- a/debian/patches/libav10.patch
+++ b/debian/patches/libav10.patch
@@ -53,7 +53,7 @@ Description: Allow compilation against libav10
        {
                u32 at_type, size;
                size = gf_bs_read_u32(bs);
-@@ -236,10 +236,10 @@ static GF_Err FFDEC_AttachStream(GF_Base
+@@ -239,10 +239,10 @@ static GF_Err FFDEC_AttachStream(GF_Base
                        (*ctx)->codec_type = AVMEDIA_TYPE_VIDEO;
                        switch (ffd->oti) {
                        case GPAC_OTI_VIDEO_MPEG4_PART2:
@@ -66,7 +66,7 @@ Description: Allow compilation against libav10
                                break;
  #ifdef HAS_HEVC
              case GPAC_OTI_VIDEO_HEVC:
-@@ -253,14 +253,14 @@ static GF_Err FFDEC_AttachStream(GF_Base
+@@ -256,14 +256,14 @@ static GF_Err FFDEC_AttachStream(GF_Base
                        case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
                        case GPAC_OTI_VIDEO_MPEG2_HIGH:
                        case GPAC_OTI_VIDEO_MPEG2_422:
@@ -84,7 +84,7 @@ Description: Allow compilation against libav10
                                break;
                        }
                } else if (ffd->st==GF_STREAM_AUDIO) {
-@@ -269,12 +269,12 @@ static GF_Err FFDEC_AttachStream(GF_Base
+@@ -272,12 +272,12 @@ static GF_Err FFDEC_AttachStream(GF_Base
                        case GPAC_OTI_AUDIO_MPEG2_PART3:
                        case GPAC_OTI_AUDIO_MPEG1:
                                (*ctx)->frame_size = 1152;
@@ -99,18 +99,18 @@ Description: Allow compilation against libav10
                }
                *codec = avcodec_find_decoder(codec_id);
        }
-@@ -357,8 +357,8 @@ static GF_Err FFDEC_AttachStream(GF_Base
- 
-       }
+@@ -363,8 +363,8 @@ static GF_Err FFDEC_AttachStream(GF_Base
  #endif //HAS_HEVC
+       if (!ffd->output_cb_size) ffd->output_cb_size = 4;
+ 
 -      if (codec_id == CODEC_ID_RAWVIDEO) {
 -              (*ctx)->codec_id = CODEC_ID_RAWVIDEO;
 +      if (codec_id == AV_CODEC_ID_RAWVIDEO) {
 +              (*ctx)->codec_id = AV_CODEC_ID_RAWVIDEO;
                (*ctx)->pix_fmt = ffd->raw_pix_fmt;
-               if ((*ctx)->extradata && strstr((*ctx)->extradata, "BottomUp")) ffd->flipped = 1;
+               if ((*ctx)->extradata && strstr((char *) (*ctx)->extradata, "BottomUp")) ffd->flipped = 1;
        } else {
-@@ -370,7 +370,7 @@ static GF_Err FFDEC_AttachStream(GF_Base
+@@ -376,7 +376,7 @@ static GF_Err FFDEC_AttachStream(GF_Base
        }
        /*setup audio streams*/
        if (ffd->st==GF_STREAM_AUDIO) {
@@ -119,7 +119,7 @@ Description: Allow compilation against libav10
                        (*ctx)->frame_size = ((*ctx)->sample_rate > 24000) ? 1152 : 576;
                }
                /*may be 0 (cfg not known yet)*/
-@@ -384,17 +384,17 @@ static GF_Err FFDEC_AttachStream(GF_Base
+@@ -390,17 +390,17 @@ static GF_Err FFDEC_AttachStream(GF_Base
  
        } else {
                switch ((*codec)->id) {
@@ -143,7 +143,7 @@ Description: Allow compilation against libav10
                        *frame = avcodec_alloc_frame();
  #ifdef USE_AVCODEC2
                        {
-@@ -752,7 +752,7 @@ redecode:
+@@ -783,7 +783,7 @@ redecode:
        }
  
  
@@ -152,7 +152,7 @@ Description: Allow compilation against libav10
                if (*outBufferLength != ffd->out_size) {
                        *outBufferLength = ffd->out_size;
                        return GF_BUFFER_TOO_SMALL;
-@@ -849,7 +849,7 @@ redecode:
+@@ -880,7 +880,7 @@ redecode:
                                /*OK we loose the DSI stored in the codec context, but H263 doesn't need any, and if we're
                                here this means the DSI was broken, so no big deal*/
                                avcodec_close(ctx);
@@ -161,7 +161,7 @@ Description: Allow compilation against libav10
  
  #ifdef USE_AVCTX3
                                if (! (*codec) || (avcodec_open2(ctx, *codec, NULL)<0)) return GF_NON_COMPLIANT_BITSTREAM;
-@@ -1132,9 +1132,9 @@ static u32 FFDEC_CanHandleStream(GF_Base
+@@ -1200,9 +1200,9 @@ static u32 FFDEC_CanHandleStream(GF_Base
        }
        else if (StreamType==GF_STREAM_AUDIO) {
                /*std MPEG-2 audio*/
@@ -173,7 +173,7 @@ Description: Allow compilation against libav10
        }
  
        /*std MPEG-4 visual*/
-@@ -1171,10 +1171,10 @@ static u32 FFDEC_CanHandleStream(GF_Base
+@@ -1239,10 +1239,10 @@ static u32 FFDEC_CanHandleStream(GF_Base
  
                switch (ffd->oti) {
                /*MPEG-4 v1 simple profile*/
@@ -186,7 +186,7 @@ Description: Allow compilation against libav10
  #ifdef HAS_HEVC
          case GPAC_OTI_VIDEO_HEVC:
              codec_id = AV_CODEC_ID_HEVC; break;
-@@ -1188,10 +1188,10 @@ static u32 FFDEC_CanHandleStream(GF_Base
+@@ -1256,10 +1256,10 @@ static u32 FFDEC_CanHandleStream(GF_Base
                case GPAC_OTI_VIDEO_MPEG2_SPATIAL:
                case GPAC_OTI_VIDEO_MPEG2_HIGH:
                case GPAC_OTI_VIDEO_MPEG2_422:
@@ -210,7 +210,7 @@ Description: Allow compilation against libav10
  
  #define av_find_stream_info(__c)      avformat_find_stream_info(__c, NULL)
  #ifndef FF_API_FORMAT_PARAMETERS
-@@ -353,7 +353,7 @@ static Bool FFD_CanHandleURL(GF_InputSer
+@@ -314,7 +314,7 @@ static Bool FFD_CanHandleURL(GF_InputSer
        }
  
  exit:
@@ -219,7 +219,7 @@ Description: Allow compilation against libav10
        return ret;
  }
  
-@@ -372,13 +372,13 @@ static GF_ESD *FFD_GetESDescriptor(FFDem
+@@ -333,13 +333,13 @@ static GF_ESD *FFD_GetESDescriptor(FFDem
        AVCodecContext *dec = ffd->ctx->streams[ffd->audio_st]->codec;
                esd->slConfig->timestampResolution = ffd->audio_tscale.den;
                switch (dec->codec_id) {
@@ -236,7 +236,7 @@ Description: Allow compilation against libav10
                        if (!dec->extradata_size) goto opaque_audio;
                        esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
                        esd->decoderConfig->decoderSpecificInfo->dataLength = dec->extradata_size;
-@@ -413,25 +413,25 @@ opaque_audio:
+@@ -374,25 +374,25 @@ opaque_audio:
                AVCodecContext *dec = ffd->ctx->streams[ffd->video_st]->codec;
                esd->slConfig->timestampResolution = ffd->video_tscale.den;
                switch (dec->codec_id) {
@@ -267,7 +267,7 @@ Description: Allow compilation against libav10
                        esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_MPEG2_422;
                        break;
                default:
-@@ -629,11 +629,7 @@ static GF_Err FFD_ConnectService(GF_Inpu
+@@ -590,11 +590,7 @@ static GF_Err FFD_ConnectService(GF_Inpu
                        }
                        /*setup downloader*/
                        av_in->flags |= AVFMT_NOFILE;
@@ -279,7 +279,7 @@ Description: Allow compilation against libav10
                }
        } else {
                res = open_file(&ffd->ctx, szName, av_in);
-@@ -712,7 +708,7 @@ static GF_Err FFD_ConnectService(GF_Inpu
+@@ -673,7 +669,7 @@ static GF_Err FFD_ConnectService(GF_Inpu
  
                ffd->seekable = (av_seek_frame(ffd->ctx, -1, 0, AVSEEK_FLAG_BACKWARD)<0) ? 0 : 1;
                if (!ffd->seekable) {
@@ -288,7 +288,7 @@ Description: Allow compilation against libav10
                        ffd->ctx = NULL;
                        open_file(&ffd->ctx, szName, av_in);
                        av_find_stream_info(ffd->ctx);
-@@ -727,7 +723,7 @@ static GF_Err FFD_ConnectService(GF_Inpu
+@@ -688,7 +684,7 @@ static GF_Err FFD_ConnectService(GF_Inpu
  
  err_exit:
        GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] Error opening file %s: %s\n", url, gf_error_to_string(e)));
@@ -297,7 +297,7 @@ Description: Allow compilation against libav10
        ffd->ctx = NULL;
        gf_term_on_connect(serv, NULL, e);
        return GF_OK;
-@@ -781,7 +777,7 @@ static GF_Err FFD_CloseService(GF_InputS
+@@ -742,7 +738,7 @@ static GF_Err FFD_CloseService(GF_InputS
  
        ffd->is_running = 0;