Update ffmpeg patches in preparation for potential ffmpeg version 8.0

diff --git a/cinelerra-5.1/doc/Makefile b/cinelerra-5.1/doc/Makefile
index 776447e13d5a39934c55b096011343f4f530fe35..64164e89358542d1ed6b5ff63f495b1f17d16b17 100644 (file)
--- a/cinelerra-5.1/doc/Makefile
+++ b/cinelerra-5.1/doc/Makefile
@@ -58,6 +58,7 @@ install:      all
        cp -a cinelerra.html $(TARGET_DIR)/.
        cp -a shortcuts.html $(TARGET_DIR)/.
        cp -a RenderMux.sh $(TARGET_DIR)/.
+       cp -a brender_tmp_delete.sh $(TARGET_DIR)/.
        cp -a ContextManual.pl $(TARGET_DIR)/.
        cp -a README.blendalg $(TARGET_DIR)/.
        cp -a 99-ShuttlePRO.rules $(TARGET_DIR)/.

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch1 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch1
index e157d3f351b1c6ae058e2e3f55289b0d7f33e6aa..4427ea65483ee307d5b9c1cd87f722b4cc1996d3 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch1
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch1
@@ -1,6 +1,6 @@
---- a/fftools/cmdutils.c
-+++ b/fftools/cmdutils.c
-@@ -59,7 +59,7 @@
+--- a/fftools/cmdutils.c       2025-04-18 12:38:40.562773988 -0600
++++ b/fftools/cmdutils.c       2025-04-18 12:37:06.493547153 -0600
+@@ -57,7 +57,7 @@
  AVDictionary *swr_opts;
  AVDictionary *format_opts, *codec_opts;
  

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch10 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch10
index 1fc3f8904a54eb2206c175bade061e21edc6b2a6..818da25cba4c722d1906725ef5d272fb0dcc3c78 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch10
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch10
@@ -1,6 +1,6 @@
---- a/libavutil/hwcontext_cuda.c.orig  2023-11-11 03:25:17.000000000 +0300
-+++ b/libavutil/hwcontext_cuda.c       2023-11-12 17:52:01.243063419 +0300
-@@ -361,11 +361,13 @@
+--- a/libavutil/hwcontext_cuda.c       2025-04-18 14:35:01.291580404 -0600
++++ b/libavutil/hwcontext_cuda.c       2025-04-18 14:34:29.859129090 -0600
+@@ -365,11 +365,13 @@
                                                      hwctx->internal->cuda_device));
          if (ret < 0)
              return ret;

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch2 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch2
index fc9c74b7c427268d2062331fbafb114cb9e45872..9dcd92843dca24cfa87aab0680a743113bf544bc 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
-+++ b/libavformat/mpegtsenc.c
-@@ -89,9 +89,11 @@
+--- a/libavformat/mpegtsenc.c  2025-05-12 18:48:13.570751744 -0600
++++ b/libavformat/mpegtsenc.c  2025-05-13 12:12:38.534457031 -0600
+@@ -90,9 +90,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;
-@@ -258,7 +260,7 @@
+@@ -259,7 +261,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;
-@@ -959,18 +961,18 @@
+@@ -962,18 +964,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));
-@@ -1056,9 +1058,6 @@
+@@ -1059,9 +1061,6 @@
          else
              ts_st->pcr_period = 1;
      }
@@ -57,7 +57,7 @@
  }
  
  static void select_pcr_streams(AVFormatContext *s)
-@@ -1121,6 +1120,7 @@
+@@ -1124,6 +1123,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;
-@@ -1180,7 +1180,9 @@
+@@ -1183,7 +1183,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++;
-@@ -1207,9 +1209,9 @@
+@@ -1210,9 +1212,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;
          }
-@@ -1277,9 +1279,14 @@
+@@ -1280,9 +1282,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);
-@@ -1295,8 +1302,8 @@
+@@ -1298,8 +1305,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");
-@@ -1305,36 +1312,40 @@
+@@ -1308,36 +1315,40 @@
  }
  
  /* send SDT, NIT, PAT and PMT tables regularly */
@@ -182,7 +182,7 @@
      }
  }
  
-@@ -1371,25 +1382,29 @@
+@@ -1374,25 +1385,29 @@
  static void mpegts_insert_pcr_only(AVFormatContext *s, AVStream *st)
  {
      MpegTSWrite *ts = s->priv_data;
@@ -194,7 +194,7 @@
      uint8_t buf[TS_PACKET_SIZE];
  
      q    = buf;
-     *q++ = 0x47;
+     *q++ = SYNC_BYTE;
 -    *q++ = ts_st->pid >> 8;
 -    *q++ = ts_st->pid;
 -    *q++ = 0x20 | ts_st->cc;   /* Adaptation only */
@@ -217,8 +217,8 @@
 +    q += write_pcr_bits(q, pcr);
  
      /* stuffing bytes */
-     memset(q, 0xFF, TS_PACKET_SIZE - (q - buf));
-@@ -1490,9 +1505,9 @@
+     memset(q, STUFFING_BYTE, TS_PACKET_SIZE - (q - buf));
+@@ -1493,9 +1508,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);
-@@ -1509,21 +1524,19 @@
+@@ -1512,21 +1527,19 @@
  
      is_start = 1;
      while (payload_size > 0) {
@@ -237,7 +237,7 @@
 -        if (ts->mux_rate > 1)
 -            pcr = get_pcr(ts);
 -        else if (dts != AV_NOPTS_VALUE)
--            pcr = (dts - delay) * 300;
+-            pcr = (dts - delay) * SYSTEM_CLOCK_FREQUENCY_DIVISOR;
 -
 -        retransmit_si_info(s, force_pat, force_sdt, force_nit, pcr);
 -        force_pat = 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++) {
-@@ -1533,36 +1546,43 @@
+@@ -1536,36 +1549,43 @@
                      AVStream *st2 = s->streams[st2_index];
                      MpegTSWriteStream *ts_st2 = st2->priv_data;
                      if (ts_st2->pcr_period) {
@@ -282,7 +282,7 @@
                  }
                  ts->next_pcr = next_pcr;
              }
--            if (dts != AV_NOPTS_VALUE && (dts - pcr / 300) > delay) {
+-            if (dts != AV_NOPTS_VALUE && (dts - pcr / SYSTEM_CLOCK_FREQUENCY_DIVISOR) > delay) {
 -                /* pcr insert gets priority over null packet insert */
 -                if (write_pcr)
 -                    mpegts_insert_pcr_only(s, st);
@@ -320,16 +320,16 @@
 +
          /* prepare packet header */
          q    = buf;
-         *q++ = 0x47;
-@@ -1592,7 +1612,6 @@
+         *q++ = SYNC_BYTE;
+@@ -1595,7 +1615,6 @@
          if (write_pcr) {
              set_af_flag(buf, 0x10);
              q = get_ts_payload_start(buf);
 -            // add 11, pcr references the last byte of program clock reference base
-             if (dts != AV_NOPTS_VALUE && dts < pcr / 300)
+             if (dts != AV_NOPTS_VALUE && dts < pcr / SYSTEM_CLOCK_FREQUENCY_DIVISOR)
                  av_log(s, AV_LOG_WARNING, "dts < pcr, TS is invalid\n");
              extend_af(buf, write_pcr_bits(q, pcr));
-@@ -1864,8 +1883,8 @@
+@@ -1867,8 +1886,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;
-@@ -1885,9 +1904,9 @@
+@@ -1888,9 +1907,9 @@
  
      if (ts->copyts < 1) {
          if (pts != AV_NOPTS_VALUE)
@@ -352,7 +352,7 @@
      }
  
      if (!ts_st->first_timestamp_checked && (pts == AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE)) {
-@@ -2354,8 +2373,10 @@
+@@ -2357,8 +2376,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 },
@@ -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",
-@@ -2381,10 +2402,10 @@
+@@ -2384,10 +2405,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 },
@@ -378,9 +378,9 @@
      { "nit_period", "NIT retransmission time limit in seconds",
        OFFSET(nit_period_us), AV_OPT_TYPE_DURATION, { .i64 = NIT_RETRANS_TIME * 1000LL }, 0, INT64_MAX, ENC },
      { NULL },
---- a/libavformat/mpegts.h
-+++ b/libavformat/mpegts.h
-@@ -64,6 +64,7 @@
+--- a/libavformat/mpegts.h     2025-05-12 18:48:32.808049998 -0600
++++ b/libavformat/mpegts.h     2025-05-13 12:23:31.824879487 -0600
+@@ -68,6 +68,7 @@
  /* 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) */
@@ -388,8 +388,8 @@
  
  /* m2ts pids */
  #define M2TS_PMT_PID                      0x0100
---- a/libavformat/bluray.c
-+++ b/libavformat/bluray.c
+--- a/libavformat/bluray.c     2025-05-12 18:48:54.328383651 -0600
++++ b/libavformat/bluray.c     2025-05-12 18:52:51.113993748 -0600
 @@ -27,7 +27,7 @@
  #include "libavutil/opt.h"
  
@@ -400,9 +400,9 @@
  typedef struct {
      const AVClass *class;
 
---- a/doc/muxers.texi
-+++ b/doc/muxers.texi
-@@ -2920,7 +2920,8 @@
+--- a/doc/muxers.texi  2025-05-12 18:49:20.456781375 -0600
++++ b/doc/muxers.texi  2025-05-13 12:19:17.959026488 -0600
+@@ -3116,7 +3116,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 25b062bc3bbbcb4465ff6bbe2766932950898555..538c5935f534a2af7cd8d7c3366d3b684d16cac0 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
-@@ -499,6 +499,9 @@
+--- a/libavformat/avformat.h   2025-05-08 15:58:37.933172640 -0600
++++ b/libavformat/avformat.h   2025-05-08 15:57:46.964410825 -0600
+@@ -496,6 +496,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 */
  
-@@ -562,7 +565,8 @@
+@@ -559,7 +562,8 @@
      /**
       * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
       * AVFMT_NOTIMESTAMPS, AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
@@ -20,9 +20,9 @@
       */
      int flags;
  
---- a/libavformat/dv.c
-+++ b/libavformat/dv.c
-@@ -713,6 +713,7 @@
+--- a/libavformat/dv.c 2025-05-08 15:59:26.143851727 -0600
++++ b/libavformat/dv.c 2025-05-08 15:59:01.103509955 -0600
+@@ -714,6 +714,7 @@
  const FFInputFormat ff_dv_demuxer = {
      .p.name         = "dv",
      .p.long_name    = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
@@ -31,9 +31,9 @@
      .priv_data_size = sizeof(RawDVContext),
      .read_probe     = dv_probe,
 
---- a/libavformat/matroskadec.c
-+++ b/libavformat/matroskadec.c
-@@ -4794,6 +4794,7 @@
+--- a/libavformat/matroskadec.c        2025-05-08 16:00:34.406740107 -0600
++++ b/libavformat/matroskadec.c        2025-05-08 15:59:37.777003123 -0600
+@@ -4832,6 +4832,7 @@
  const FFInputFormat ff_webm_dash_manifest_demuxer = {
      .p.name         = "webm_dash_manifest",
      .p.long_name    = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"),
@@ -41,7 +41,7 @@
      .p.priv_class   = &webm_dash_class,
      .priv_data_size = sizeof(MatroskaDemuxContext),
      .flags_internal = FF_INFMT_FLAG_INIT_CLEANUP,
-@@ -4806,6 +4807,7 @@
+@@ -4844,6 +4845,7 @@
  const FFInputFormat ff_matroska_demuxer = {
      .p.name         = "matroska,webm",
      .p.long_name    = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
@@ -50,9 +50,9 @@
      .p.mime_type    = "audio/webm,audio/x-matroska,video/webm,video/x-matroska",
      .priv_data_size = sizeof(MatroskaDemuxContext),
 
---- a/libavformat/seek.c
-+++ b/libavformat/seek.c
-@@ -605,6 +605,13 @@
+--- a/libavformat/seek.c       2025-05-08 16:01:47.828700137 -0600
++++ b/libavformat/seek.c       2025-05-08 16:00:44.845875964 -0600
+@@ -607,6 +607,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 9e472ce1697e0ecbd588af46bd6c16e0d7d52edf..b054f7a134efb47502363e21b1e891bc0d7b9799 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch4
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch4
@@ -1,6 +1,6 @@
---- a/libavformat/avidec.c
-+++ b/libavformat/avidec.c
-@@ -2020,6 +2020,7 @@
+--- a/libavformat/avidec.c     2025-05-09 13:35:07.851155737 -0600
++++ b/libavformat/avidec.c     2025-05-09 13:34:45.702821357 -0600
+@@ -2021,6 +2021,7 @@
      .p.name         = "avi",
      .p.long_name    = NULL_IF_CONFIG_SMALL("AVI (Audio Video Interleaved)"),
      .p.extensions   = "avi",

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch7
index 379ddb6229a1f54e5dad41696a9577dcfce41778..e2c43f74730cbdc0135f09141558bb5e95b6dea2 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
-+++ b/libavcodec/vdpau_mpeg12.c
-@@ -117,6 +117,7 @@
+--- a/libavcodec/vdpau_mpeg12.c        2025-05-09 14:54:40.549494700 -0600
++++ b/libavcodec/vdpau_mpeg12.c        2025-05-09 14:53:57.284866101 -0600
+@@ -118,6 +118,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.patch9 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch9
index 721fd09dac6469f2c6deff5c2cc99eb23b4b1d1b..befd285ffad30ed307ad04ddab2619887b13515a 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
-@@ -987,9 +987,9 @@
+--- a/libavformat/mpegenc.c    2025-05-11 15:05:24.437490237 -0600
++++ b/libavformat/mpegenc.c    2025-05-11 14:46:46.661934073 -0600
+@@ -989,9 +989,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 b89b3afbcf9c1dae359d6e3508d2919d69e54c08..63d187f98ec895551b6b9dfb022b6329838a1419 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
-@@ -320,7 +320,7 @@
+--- a/libavcodec/encode.c      2025-05-12 08:52:53.070539488 -0600
++++ b/libavcodec/encode.c      2025-05-12 08:40:22.831978565 -0600
+@@ -306,7 +306,7 @@
      }
  
      if (!frame->buf[0]) {
@@ -9,7 +9,7 @@
                avci->frame_thread_encoder))
              return AVERROR_EOF;
  
-@@ -339,8 +339,10 @@
+@@ -325,8 +325,10 @@
          ret = ff_encode_encode_cb(avctx, avpkt, frame, &got_packet);
      }
  
@@ -21,7 +21,7 @@
  
      return ret;
  }
-@@ -515,10 +517,16 @@
+@@ -501,10 +503,16 @@
      if (avci->draining)
          return AVERROR_EOF;
  

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchD b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchD
new file mode 100644 (file)
index 0000000..d782ae9
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchD
@@ -0,0 +1,24 @@
+--- a/libavcodec/pcm-dvdenc.c  2025-05-12 17:20:39.267102833 -0600
++++ b/libavcodec/pcm-dvdenc.c  2025-05-12 17:22:13.361600238 -0600
+@@ -38,6 +38,12 @@
+     int quant, freq, frame_size;
+ 
+     switch (avctx->sample_rate) {
++    case 32000:
++       freq = 3;
++       break;
++    case 44100:
++       freq = 2;
++       break;
+     case 48000:
+         freq = 0;
+         break;
+@@ -181,7 +187,7 @@
+     .priv_data_size = sizeof(PCMDVDContext),
+     .init           = pcm_dvd_encode_init,
+     FF_CODEC_ENCODE_CB(pcm_dvd_encode_frame),
+-    CODEC_SAMPLERATES(48000, 96000),
++    CODEC_SAMPLERATES(32000, 44100, 48000, 96000),
+     CODEC_CH_LAYOUTS(AV_CHANNEL_LAYOUT_MONO,    AV_CHANNEL_LAYOUT_STEREO,
+                      AV_CHANNEL_LAYOUT_5POINT1, AV_CHANNEL_LAYOUT_7POINT1),
+     CODEC_SAMPLEFMTS(AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32),

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchZ1 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchZ1
index 29cfb628e533a9e899703d43f8a0759f9a82a42b..5354f74a21eed9cdc942dcab5dca945c523c1a77 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchZ1
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchZ1
@@ -1,8 +1,8 @@
---- a/libavcodec/wrapped_avframe.c
-+++ b/libavcodec/wrapped_avframe.c
-@@ -33,6 +33,38 @@
+--- a/libavcodec/wrapped_avframe.c     2025-05-11 16:34:43.753546422 -0600
++++ b/libavcodec/wrapped_avframe.c     2025-05-11 15:08:08.157768438 -0600
+@@ -32,6 +32,38 @@
  #include "libavutil/buffer.h"
- #include "libavutil/pixdesc.h"
+ #include "libavutil/mem.h"
  
 +
 +
@@ -39,7 +39,7 @@
  static void wrapped_avframe_release_buffer(void *unused, uint8_t *data)
  {
      AVFrame *frame = (AVFrame *)data;
-@@ -111,6 +143,7 @@
+@@ -110,6 +142,7 @@
      .p.id           = AV_CODEC_ID_WRAPPED_AVFRAME,
      .p.capabilities = AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
      FF_CODEC_ENCODE_CB(wrapped_avframe_encode),

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchZ2 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patchZ2
index a883b14d104e380b61ea13bf34d7af04e2a40e0c..6a20f7ab44637e90d3460ac21b8a58bc39e2c28c 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
-@@ -268,7 +268,7 @@
+--- a/libavformat/yuv4mpegenc.c        2025-05-11 15:58:35.782501756 -0600
++++ b/libavformat/yuv4mpegenc.c        2025-05-11 15:58:08.480121797 -0600
+@@ -265,7 +265,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));