update ffmpeg git patches for version 7.0 + minor fixes

diff --git a/cinelerra-5.1/blds/bld_prepare.sh b/cinelerra-5.1/blds/bld_prepare.sh
index 46a03d18a92e927ac096772f275a739e4c7ee152..0e7958d0750970b27d42104c24f518869e9360f1 100755 (executable)
--- a/cinelerra-5.1/blds/bld_prepare.sh
+++ b/cinelerra-5.1/blds/bld_prepare.sh
@@ -127,7 +127,7 @@ case "$dir" in
     libdc1394-25 libdc1394-dev libflac-dev libjbig-dev libvdpau-dev libva-dev \
     inkscape libsndfile1-dev libtheora-dev cmake udftools libxml2-utils git \
     autoconf automake debhelper libgtk2.0-dev libpulse-dev 2to3 python-is-python3  python3 dh-python \
-    patchelf libboost-filesystem-dev libboost-regex-dev fuse
+    patchelf libboost-filesystem-dev libboost-regex-dev libxml-parser-perl fuse
   ;;
 
 *)

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index 72a4bb4dc2a107242bf94c5a8d4243debdb53962..48577fb9f974d482762c6c02ab09160c040a8cbf 100644 (file)
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -9,7 +9,7 @@ For usage help, refer to the following:
   Libaom is updated to 3.8.0 but does not work on older O/S.
   The Resources window info/details now shows sar/dar values.
   Libsvtav1 is a buildable option for newer distros.
-  Color3way / Histogram now allow for greater than 1 values.
+  Histogram/Videoscpe now allow for greater than 1 values.
 2023 November changes of note:
   New build farm for Ubuntu, Debian, Suse, and Fedora at:
    https://github.com/einhander/cin-gg-packages/releases

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch2 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch2
index d346510ecd4a09090590f34e05c65b2876f63b8a..fc9c74b7c427268d2062331fbafb114cb9e45872 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch2
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch2
@@ -1,6 +1,6 @@
---- a/libavformat/mpegtsenc.c  2023-05-25 11:35:50.216478386 -0600
-+++ b/libavformat/mpegtsenc.c  2023-05-25 11:36:49.259182848 -0600
-@@ -87,9 +87,11 @@
+--- a/libavformat/mpegtsenc.c
++++ b/libavformat/mpegtsenc.c
+@@ -89,9 +89,11 @@
      int64_t pat_period; /* PAT/PMT period in PCR time base */
      int64_t nit_period; /* NIT period in PCR time base */
      int nb_services;
@@ -14,7 +14,7 @@
      int mux_rate; ///< set to 1 when VBR
      int pes_payload_size;
      int64_t total_size;
-@@ -256,7 +258,7 @@
+@@ -258,7 +260,7 @@
      int data_st_warning;
  
      int64_t pcr_period; /* PCR period in PCR time base */
@@ -23,7 +23,7 @@
  
      /* For Opus */
      int opus_queued_samples;
-@@ -949,18 +951,18 @@
+@@ -959,18 +961,18 @@
      return 0;
  }
  
@@ -47,7 +47,7 @@
          tp_extra_header = AV_RB32(&tp_extra_header);
          avio_write(s->pb, (unsigned char *) &tp_extra_header,
                     sizeof(tp_extra_header));
-@@ -1046,9 +1048,6 @@
+@@ -1056,9 +1058,6 @@
          else
              ts_st->pcr_period = 1;
      }
@@ -57,7 +57,7 @@
  }
  
  static void select_pcr_streams(AVFormatContext *s)
-@@ -1111,6 +1110,7 @@
+@@ -1121,6 +1120,7 @@
  
      if (s->max_delay < 0) /* Not set by the caller */
          s->max_delay = 0;
@@ -65,7 +65,7 @@
  
      // round up to a whole number of TS packets
      ts->pes_payload_size = (ts->pes_payload_size + 14 + 183) / 184 * 184 - 14;
-@@ -1170,7 +1170,9 @@
+@@ -1180,7 +1180,9 @@
          /* MPEG pid values < 16 are reserved. Applications which set st->id in
           * this range are assigned a calculated pid. */
          if (st->id < 16) {
@@ -76,7 +76,7 @@
                  switch (st->codecpar->codec_type) {
                  case AVMEDIA_TYPE_VIDEO:
                      ts_st->pid = ts->m2ts_video_pid++;
-@@ -1197,9 +1199,9 @@
+@@ -1207,9 +1209,9 @@
                      av_log(s, AV_LOG_ERROR, "Cannot automatically assign PID for stream %d\n", st->index);
                      return AVERROR(EINVAL);
                  }
@@ -88,7 +88,7 @@
          } else {
              ts_st->pid = st->id;
          }
-@@ -1267,9 +1269,14 @@
+@@ -1277,9 +1279,14 @@
      ts->last_pat_ts = AV_NOPTS_VALUE;
      ts->last_sdt_ts = AV_NOPTS_VALUE;
      ts->last_nit_ts = AV_NOPTS_VALUE;
@@ -106,7 +106,7 @@
  
      /* assign provider name */
      provider = av_dict_get(s->metadata, "service_provider", NULL, 0);
-@@ -1285,8 +1292,8 @@
+@@ -1295,8 +1302,8 @@
          av_log(s, AV_LOG_VERBOSE, "muxrate %d, ", ts->mux_rate);
      av_log(s, AV_LOG_VERBOSE,
             "sdt every %"PRId64" ms, pat/pmt every %"PRId64" ms",
@@ -117,7 +117,7 @@
      if (ts->flags & MPEGTS_FLAG_NIT)
          av_log(s, AV_LOG_VERBOSE, ", nit every %"PRId64" ms", av_rescale(ts->nit_period, 1000, PCR_TIME_BASE));
      av_log(s, AV_LOG_VERBOSE, "\n");
-@@ -1295,36 +1302,40 @@
+@@ -1305,36 +1312,40 @@
  }
  
  /* send SDT, NIT, PAT and PMT tables regularly */
@@ -182,7 +182,7 @@
      }
  }
  
-@@ -1361,25 +1372,29 @@
+@@ -1371,25 +1382,29 @@
  static void mpegts_insert_pcr_only(AVFormatContext *s, AVStream *st)
  {
      MpegTSWrite *ts = s->priv_data;
@@ -218,7 +218,7 @@
  
      /* stuffing bytes */
      memset(q, 0xFF, TS_PACKET_SIZE - (q - buf));
-@@ -1479,9 +1494,9 @@
+@@ -1490,9 +1505,9 @@
      int afc_len, stuffing_len;
      int is_dvb_subtitle = (st->codecpar->codec_id == AV_CODEC_ID_DVB_SUBTITLE);
      int is_dvb_teletext = (st->codecpar->codec_id == AV_CODEC_ID_DVB_TELETEXT);
@@ -229,7 +229,7 @@
      int force_nit = 0;
  
      av_assert0(ts_st->payload != buf || st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO);
-@@ -1498,21 +1513,19 @@
+@@ -1509,21 +1524,19 @@
  
      is_start = 1;
      while (payload_size > 0) {
@@ -260,7 +260,7 @@
              if (pcr >= ts->next_pcr) {
                  int64_t next_pcr = INT64_MAX;
                  for (int i = 0; i < s->nb_streams; i++) {
-@@ -1522,36 +1535,43 @@
+@@ -1533,36 +1546,43 @@
                      AVStream *st2 = s->streams[st2_index];
                      MpegTSWriteStream *ts_st2 = st2->priv_data;
                      if (ts_st2->pcr_period) {
@@ -321,7 +321,7 @@
          /* prepare packet header */
          q    = buf;
          *q++ = 0x47;
-@@ -1581,7 +1601,6 @@
+@@ -1592,7 +1612,6 @@
          if (write_pcr) {
              set_af_flag(buf, 0x10);
              q = get_ts_payload_start(buf);
@@ -329,7 +329,7 @@
              if (dts != AV_NOPTS_VALUE && dts < pcr / 300)
                  av_log(s, AV_LOG_WARNING, "dts < pcr, TS is invalid\n");
              extend_af(buf, write_pcr_bits(q, pcr));
-@@ -1845,8 +1864,8 @@
+@@ -1864,8 +1883,8 @@
      uint8_t *data = NULL;
      MpegTSWrite *ts = s->priv_data;
      MpegTSWriteStream *ts_st = st->priv_data;
@@ -340,7 +340,7 @@
      int64_t dts = pkt->dts, pts = pkt->pts;
      int opus_samples = 0;
      size_t side_data_size;
-@@ -1866,9 +1885,9 @@
+@@ -1885,9 +1904,9 @@
  
      if (ts->copyts < 1) {
          if (pts != AV_NOPTS_VALUE)
@@ -352,8 +352,8 @@
      }
  
      if (!ts_st->first_timestamp_checked && (pts == AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE)) {
-@@ -2299,8 +2318,10 @@
-       0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_HEVC_DIGITAL_HDTV }, 0x01, 0xff, ENC, "mpegts_service_type" },
+@@ -2354,8 +2373,10 @@
+       0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_HEVC_DIGITAL_HDTV }, 0x01, 0xff, ENC, .unit = "mpegts_service_type" },
      { "mpegts_pmt_start_pid", "Set the first pid of the PMT.",
        OFFSET(pmt_start_pid), AV_OPT_TYPE_INT, { .i64 = 0x1000 }, FIRST_OTHER_PID, LAST_OTHER_PID, ENC },
 +    { "mpegts_pcr_stream_pid", "create seperate PCR stream on this pid.",
@@ -364,7 +364,7 @@
      { "mpegts_m2ts_mode", "Enable m2ts mode.", OFFSET(m2ts_mode), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, ENC },
      { "muxrate", NULL, OFFSET(mux_rate), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, ENC },
      { "pes_payload_size", "Minimum PES packet payload in bytes",
-@@ -2326,10 +2347,10 @@
+@@ -2381,10 +2402,10 @@
        OFFSET(omit_video_pes_length), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, ENC },
      { "pcr_period", "PCR retransmission time in milliseconds",
        OFFSET(pcr_period_ms), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, ENC },
@@ -384,25 +384,25 @@
  /* PID from 0x1FFC to 0x1FFE may be assigned as needed to PMT, elementary
   * streams and other data tables */
  #define NULL_PID        0x1FFF /* Null packet (used for fixed bandwidth padding) */
-+#define START_PID       0x0400
-
++#define START_PID     0x0400
+ 
  /* m2ts pids */
  #define M2TS_PMT_PID                      0x0100
 --- a/libavformat/bluray.c
 +++ b/libavformat/bluray.c
-@@ -28,7 +28,7 @@
+@@ -27,7 +27,7 @@
  #include "libavutil/opt.h"
-
+ 
  #define BLURAY_PROTO_PREFIX     "bluray:"
 -#define MIN_PLAYLIST_LENGTH     180     /* 3 min */
 +#define MIN_PLAYLIST_LENGTH     0
-
+ 
  typedef struct {
      const AVClass *class;
 
 --- a/doc/muxers.texi
 +++ b/doc/muxers.texi
-@@ -1930,7 +1930,8 @@
+@@ -2920,7 +2920,8 @@
  Maximum time in seconds between PAT/PMT tables. Default is @code{0.1}.
  
  @item sdt_period @var{duration}

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch3 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch3
index 7edb2e24923e51a421580537133316b32d01a189..25b062bc3bbbcb4465ff6bbe2766932950898555 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch3
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch3
@@ -1,6 +1,6 @@
 --- a/libavformat/avformat.h
 +++ b/libavformat/avformat.h
-@@ -497,6 +497,9 @@
+@@ -499,6 +499,9 @@
                                          The user or muxer can override this through
                                          AVFormatContext.avoid_negative_ts
                                          */
@@ -10,7 +10,7 @@
  
  #define AVFMT_SEEK_TO_PTS   0x4000000 /**< Seeking is based on PTS */
  
-@@ -560,7 +563,8 @@
+@@ -562,7 +565,8 @@
      /**
       * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
       * AVFMT_NOTIMESTAMPS, AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
@@ -19,38 +19,40 @@
 +     * AVFMT_SEEK_NOSTREAMS
       */
      int flags;
-
+ 
 --- a/libavformat/dv.c
 +++ b/libavformat/dv.c
-@@ -672,6 +672,7 @@
- const AVInputFormat ff_dv_demuxer = {
-     .name           = "dv",
-     .long_name      = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
-+    .flags          = AVFMT_SEEK_NOSTREAMS,
+@@ -713,6 +713,7 @@
+ const FFInputFormat ff_dv_demuxer = {
+     .p.name         = "dv",
+     .p.long_name    = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
++    .p.flags       = AVFMT_SEEK_NOSTREAMS,
+     .p.extensions   = "dv,dif",
      .priv_data_size = sizeof(RawDVContext),
      .read_probe     = dv_probe,
-     .read_header    = dv_read_header,
+
 --- a/libavformat/matroskadec.c
 +++ b/libavformat/matroskadec.c
-@@ -4432,6 +4432,7 @@
- const AVInputFormat ff_webm_dash_manifest_demuxer = {
-     .name           = "webm_dash_manifest",
-     .long_name      = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"),
-+    .flags          = AVFMT_SEEK_NOSTREAMS,
-     .priv_class     = &webm_dash_class,
+@@ -4794,6 +4794,7 @@
+ const FFInputFormat ff_webm_dash_manifest_demuxer = {
+     .p.name         = "webm_dash_manifest",
+     .p.long_name    = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"),
++    .p.flags        = AVFMT_SEEK_NOSTREAMS,
+     .p.priv_class   = &webm_dash_class,
      .priv_data_size = sizeof(MatroskaDemuxContext),
-     .flags_internal = FF_FMT_INIT_CLEANUP,
-@@ -4444,6 +4445,7 @@
- const AVInputFormat ff_matroska_demuxer = {
-     .name           = "matroska,webm",
-     .long_name      = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
-+    .flags          = AVFMT_SEEK_NOSTREAMS,
-     .extensions     = "mkv,mk3d,mka,mks,webm",
+     .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
+@@ -4806,6 +4807,7 @@
+ const FFInputFormat ff_matroska_demuxer = {
+     .p.name         = "matroska,webm",
+     .p.long_name    = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
++    .p.flags        = AVFMT_SEEK_NOSTREAMS,
+     .p.extensions   = "mkv,mk3d,mka,mks,webm",
+     .p.mime_type    = "audio/webm,audio/x-matroska,video/webm,video/x-matroska",
      .priv_data_size = sizeof(MatroskaDemuxContext),
-     .flags_internal = FF_FMT_INIT_CLEANUP,
+
 --- a/libavformat/seek.c
 +++ b/libavformat/seek.c
-@@ -602,6 +602,13 @@
+@@ -605,6 +605,13 @@
          return seek_frame_byte(s, stream_index, timestamp, flags);
      }
  

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch4 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch4
index 0cff0a5a515ce9c55d7513c939687b1b44c9c746..9e472ce1697e0ecbd588af46bd6c16e0d7d52edf 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch4
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch4
@@ -1,10 +1,10 @@
 --- a/libavformat/avidec.c
 +++ b/libavformat/avidec.c
-@@ -2006,6 +2006,7 @@
+@@ -2020,6 +2020,7 @@
+     .p.name         = "avi",
+     .p.long_name    = NULL_IF_CONFIG_SMALL("AVI (Audio Video Interleaved)"),
+     .p.extensions   = "avi",
++    .p.flags        = AVFMT_SEEK_NOSTREAMS,
+     .p.priv_class   = &demuxer_class,
      .priv_data_size = sizeof(AVIContext),
-     .flags_internal = FF_FMT_INIT_CLEANUP,
-     .extensions     = "avi",
-+    .flags          = AVFMT_SEEK_NOSTREAMS,
-     .read_probe     = avi_probe,
-     .read_header    = avi_read_header,
-     .read_packet    = avi_read_packet,
+     .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7
index 17f2f0500886281f00e7502a2a8e7ec3b90f2d01..379ddb6229a1f54e5dad41696a9577dcfce41778 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7
@@ -1,6 +1,6 @@
 --- a/libavcodec/vdpau_mpeg12.c
-+++ a/libavcodec/vdpau_mpeg12.c
-@@ -116,6 +116,7 @@
++++ b/libavcodec/vdpau_mpeg12.c
+@@ -117,6 +117,7 @@
      .frame_priv_data_size = sizeof(struct vdpau_picture_context),
      .init           = vdpau_mpeg1_init,
      .uninit         = ff_vdpau_common_uninit,

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch8 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch8
index f2fc30d6232f20f5998c48b267e272d89c00ca27..fcafebb829fa44edc64933a15016ac985478ef33 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch8
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch8
@@ -1,6 +1,6 @@
 --- a/libavcodec/h263dec.c
 +++ b/libavcodec/h263dec.c
-@@ -634,7 +634,7 @@
+@@ -623,7 +623,7 @@
      if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4)
          ff_mpeg4_frame_end(avctx, buf, buf_size);
  

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch9 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch9
index 99fa5480037afb553e492ea241d15bbc3205515e..721fd09dac6469f2c6deff5c2cc99eb23b4b1d1b 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch9
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch9
@@ -1,6 +1,6 @@
 --- a/libavformat/mpegenc.c
 +++ b/libavformat/mpegenc.c
-@@ -977,9 +977,9 @@
+@@ -987,9 +987,9 @@
          PacketDesc *pkt_desc;
  
          while ((pkt_desc = stream->predecode_packet) &&

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchC b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchC
index e197e5fb4049946c7739c6f68cb0a1ee35cbc18a..b89b3afbcf9c1dae359d6e3508d2919d69e54c08 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchC
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchC
@@ -1,6 +1,6 @@
 --- a/libavcodec/encode.c
 +++ b/libavcodec/encode.c
-@@ -290,7 +290,7 @@
+@@ -320,7 +320,7 @@
      }
  
      if (!frame->buf[0]) {
@@ -9,7 +9,7 @@
                avci->frame_thread_encoder))
              return AVERROR_EOF;
  
-@@ -309,8 +309,10 @@
+@@ -339,8 +339,10 @@
          ret = ff_encode_encode_cb(avctx, avpkt, frame, &got_packet);
      }
  
@@ -21,7 +21,7 @@
  
      return ret;
  }
-@@ -491,10 +493,16 @@
+@@ -515,10 +517,16 @@
      if (avci->draining)
          return AVERROR_EOF;
  

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchZ2 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchZ2
index 2d8ede6d45b04f49cf32ca9a8c8737f3761d20f7..a883b14d104e380b61ea13bf34d7af04e2a40e0c 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchZ2
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchZ2
@@ -1,6 +1,6 @@
 --- a/libavformat/yuv4mpegenc.c
 +++ b/libavformat/yuv4mpegenc.c
-@@ -259,7 +259,7 @@
+@@ -268,7 +268,7 @@
              av_log(s, AV_LOG_ERROR, "'%s' is not an official yuv4mpegpipe pixel format. "
                     "Use '-strict -1' to encode to this pixel format.\n",
                     av_get_pix_fmt_name(s->streams[0]->codecpar->format));