August 2025 - ffmpeg-cvslog - lists.ffmpeg.org

[ffmpeg] branch master updated. ae448e00af avcodec/pcm: use compile-time guards for PCM table init
by ffmpeg-git＠ffmpeg.org 31 Aug '25

31 Aug '25

The branch, master has been updated via ae448e00afb43d7f72dfa9c82a4c45994e4fea6a (commit) from f317b6c052f1108fcf2ce07b28efa2484c21cabe (commit) - Log ----------------------------------------------------------------- commit ae448e00afb43d7f72dfa9c82a4c45994e4fea6a Author: YiboFang <blueybf777(a)outlook.com> AuthorDate: Tue Aug 26 15:54:33 2025 +0800 Commit: Zhao Zhili <quinkblack(a)foxmail.com> CommitDate: Sun Aug 31 21:40:29 2025 +0800 avcodec/pcm: use compile-time guards for PCM table init Change the PCM table init to use compile-time #if instead of a runtime `if (CONFIG_...)`. This makes sure code for disabled encoders never gets built, without depending on compiler dead-code elimination. Signed-off-by: YiboFang <fangyibo(a)xiaomi.com> Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c index 68b1945194..7132eeb8de 100644 --- a/libavcodec/pcm.c +++ b/libavcodec/pcm.c @@ -43,16 +43,27 @@ static av_cold int pcm_encode_init(AVCodecContext *avctx) avctx->frame_size = 0; #if !CONFIG_HARDCODED_TABLES switch (avctx->codec->id) { -#define INIT_ONCE(id, name) \ - case AV_CODEC_ID_PCM_ ## id: \ - if (CONFIG_PCM_ ## id ## _ENCODER) { \ - static AVOnce init_static_once = AV_ONCE_INIT; \ - ff_thread_once(&init_static_once, pcm_ ## name ## _tableinit); \ - } \ - break - INIT_ONCE(ALAW, alaw); - INIT_ONCE(MULAW, ulaw); - INIT_ONCE(VIDC, vidc); +#if CONFIG_PCM_ALAW_ENCODER + case AV_CODEC_ID_PCM_ALAW: { + static AVOnce once_alaw = AV_ONCE_INIT; + ff_thread_once(&once_alaw, pcm_alaw_tableinit); + break; + } +#endif +#if CONFIG_PCM_MULAW_ENCODER + case AV_CODEC_ID_PCM_MULAW: { + static AVOnce once_mulaw = AV_ONCE_INIT; + ff_thread_once(&once_mulaw, pcm_ulaw_tableinit); + break; + } +#endif +#if CONFIG_PCM_VIDC_ENCODER + case AV_CODEC_ID_PCM_VIDC: { + static AVOnce once_vidc = AV_ONCE_INIT; + ff_thread_once(&once_vidc, pcm_vidc_tableinit); + break; + } +#endif default: break; } @@ -216,24 +227,30 @@ static int pcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, bytestream_put_buffer(&dst, src, n * sample_size); } break; +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER case AV_CODEC_ID_PCM_ALAW: for (; n > 0; n--) { v = *samples++; *dst++ = linear_to_alaw[(v + 32768) >> 2]; } break; +#endif +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER case AV_CODEC_ID_PCM_MULAW: for (; n > 0; n--) { v = *samples++; *dst++ = linear_to_ulaw[(v + 32768) >> 2]; } break; +#endif +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER case AV_CODEC_ID_PCM_VIDC: for (; n > 0; n--) { v = *samples++; *dst++ = linear_to_vidc[(v + 32768) >> 2]; } break; +#endif default: return -1; } @@ -329,18 +346,24 @@ static av_cold av_unused int pcm_lut_decode_init(AVCodecContext *avctx) switch (avctx->codec_id) { default: av_unreachable("pcm_lut_decode_init() only used with alaw, mulaw and vidc"); +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER case AV_CODEC_ID_PCM_ALAW: for (int i = 0; i < 256; i++) s->table[i] = alaw2linear(i); break; +#endif +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER case AV_CODEC_ID_PCM_MULAW: for (int i = 0; i < 256; i++) s->table[i] = ulaw2linear(i); break; +#endif +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER case AV_CODEC_ID_PCM_VIDC: for (int i = 0; i < 256; i++) s->table[i] = vidc2linear(i); break; +#endif } avctx->sample_fmt = AV_SAMPLE_FMT_S16; @@ -547,6 +570,9 @@ static int pcm_decode_frame(AVCodecContext *avctx, AVFrame *frame, bytestream_get_buffer(&src, samples, n * sample_size); } break; +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER || \ + CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER || \ + CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER case AV_CODEC_ID_PCM_ALAW: case AV_CODEC_ID_PCM_MULAW: case AV_CODEC_ID_PCM_VIDC: { @@ -557,6 +583,7 @@ static int pcm_decode_frame(AVCodecContext *avctx, AVFrame *frame, *samples_16++ = lut[*src++]; break; } +#endif case AV_CODEC_ID_PCM_LXF: { int i; @@ -657,7 +684,9 @@ const FFCodec ff_ ## name_ ## _decoder = { \ * to the table in pcm_decode_init() as well. */ // AV_CODEC_ID_* pcm_* name // AV_SAMPLE_FMT_* long name DecodeContext decode init func +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER PCM_CODEC_EXT(ALAW, S16, alaw, "PCM A-law / G.711 A-law", PCMLUTDecode, pcm_lut_decode_init); +#endif PCM_DEC_EXT (F16LE, FLT, f16le, "PCM 16.8 floating point little-endian", PCMScaleDecode, pcm_scale_decode_init); PCM_DEC_EXT (F24LE, FLT, f24le, "PCM 24.0 floating point little-endian", PCMScaleDecode, pcm_scale_decode_init); PCM_CODEC (F32BE, FLT, f32be, "PCM 32-bit floating point big-endian"); @@ -665,7 +694,9 @@ PCM_CODEC (F32LE, FLT, f32le, "PCM 32-bit floating point little PCM_CODEC (F64BE, DBL, f64be, "PCM 64-bit floating point big-endian"); PCM_CODEC (F64LE, DBL, f64le, "PCM 64-bit floating point little-endian"); PCM_DECODER (LXF, S32P,lxf, "PCM signed 20-bit little-endian planar"); +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER PCM_CODEC_EXT(MULAW, S16, mulaw, "PCM mu-law / G.711 mu-law", PCMLUTDecode, pcm_lut_decode_init); +#endif PCM_CODEC (S8, U8, s8, "PCM signed 8-bit"); PCM_CODEC (S8_PLANAR, U8P, s8_planar, "PCM signed 8-bit planar"); PCM_CODEC (S16BE, S16, s16be, "PCM signed 16-bit big-endian"); @@ -688,5 +719,7 @@ PCM_CODEC (U32BE, S32, u32be, "PCM unsigned 32-bit big-endian") PCM_CODEC (U32LE, S32, u32le, "PCM unsigned 32-bit little-endian"); PCM_CODEC (S64BE, S64, s64be, "PCM signed 64-bit big-endian"); PCM_CODEC (S64LE, S64, s64le, "PCM signed 64-bit little-endian"); +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER PCM_CODEC_EXT(VIDC, S16, vidc, "PCM Archimedes VIDC", PCMLUTDecode, pcm_lut_decode_init); +#endif PCM_DECODER (SGA, U8, sga, "PCM SGA"); diff --git a/libavcodec/pcm_tablegen.h b/libavcodec/pcm_tablegen.h index 7274c3cd17..590ba59814 100644 --- a/libavcodec/pcm_tablegen.h +++ b/libavcodec/pcm_tablegen.h @@ -42,6 +42,7 @@ #define VIDC_SEG_SHIFT (5) #define VIDC_SEG_MASK (0xE0) +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER /* alaw2linear() - Convert an A-law value to 16-bit linear PCM */ static av_cold int alaw2linear(unsigned char a_val) { @@ -57,7 +58,9 @@ static av_cold int alaw2linear(unsigned char a_val) return (a_val & SIGN_BIT) ? t : -t; } +#endif +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER static av_cold int ulaw2linear(unsigned char u_val) { int t; @@ -74,7 +77,9 @@ static av_cold int ulaw2linear(unsigned char u_val) return (u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS); } +#endif +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER static av_cold int vidc2linear(unsigned char u_val) { int t; @@ -88,6 +93,7 @@ static av_cold int vidc2linear(unsigned char u_val) return (u_val & VIDC_SIGN_BIT) ? (BIAS - t) : (t - BIAS); } +#endif #if CONFIG_HARDCODED_TABLES #define pcm_alaw_tableinit() @@ -96,10 +102,19 @@ static av_cold int vidc2linear(unsigned char u_val) #include "libavcodec/pcm_tables.h" #else /* 16384 entries per table */ +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER static uint8_t linear_to_alaw[16384]; +#endif +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER static uint8_t linear_to_ulaw[16384]; +#endif +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER static uint8_t linear_to_vidc[16384]; +#endif +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER || \ + CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER || \ + CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw, int (*xlaw2linear)(unsigned char), int mask) @@ -123,21 +138,28 @@ static av_cold void build_xlaw_table(uint8_t *linear_to_xlaw, } linear_to_xlaw[0] = linear_to_xlaw[1]; } +#endif +#if CONFIG_PCM_ALAW_DECODER || CONFIG_PCM_ALAW_ENCODER static void pcm_alaw_tableinit(void) { build_xlaw_table(linear_to_alaw, alaw2linear, 0xd5); } +#endif +#if CONFIG_PCM_MULAW_DECODER || CONFIG_PCM_MULAW_ENCODER static void pcm_ulaw_tableinit(void) { build_xlaw_table(linear_to_ulaw, ulaw2linear, 0xff); } +#endif +#if CONFIG_PCM_VIDC_DECODER || CONFIG_PCM_VIDC_ENCODER static void pcm_vidc_tableinit(void) { build_xlaw_table(linear_to_vidc, vidc2linear, 0xff); } +#endif #endif /* CONFIG_HARDCODED_TABLES */ #endif /* AVCODEC_PCM_TABLEGEN_H */ ----------------------------------------------------------------------- Summary of changes: libavcodec/pcm.c | 53 ++++++++++++++++++++++++++++++++++++++--------- libavcodec/pcm_tablegen.h | 22 ++++++++++++++++++++ 2 files changed, 65 insertions(+), 10 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. f317b6c052 lavc/codec_desc: add lossless flags for hevc and av1
by ffmpeg-git＠ffmpeg.org 31 Aug '25

31 Aug '25

The branch, master has been updated via f317b6c052f1108fcf2ce07b28efa2484c21cabe (commit) from 9893d66addd19401830a9187525194354882fee8 (commit) - Log ----------------------------------------------------------------- commit f317b6c052f1108fcf2ce07b28efa2484c21cabe Author: Gyan Doshi <ffmpeg(a)gyani.pro> AuthorDate: Sun Aug 31 16:48:03 2025 +0530 Commit: Gyan Doshi <ffmpeg(a)gyani.pro> CommitDate: Sun Aug 31 16:48:03 2025 +0530 lavc/codec_desc: add lossless flags for hevc and av1 Both codecs support a lossless mode akin to H.264/AVC diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index a065556e51..d5d178cc7e 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1277,7 +1277,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .type = AVMEDIA_TYPE_VIDEO, .name = "hevc", .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC (High Efficiency Video Coding)"), - .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_REORDER, + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS | AV_CODEC_PROP_REORDER, .profiles = NULL_IF_CONFIG_SMALL(ff_hevc_profiles), }, { @@ -1648,7 +1648,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .type = AVMEDIA_TYPE_VIDEO, .name = "av1", .long_name = NULL_IF_CONFIG_SMALL("Alliance for Open Media AV1"), - .props = AV_CODEC_PROP_LOSSY, + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, .profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles), }, { ----------------------------------------------------------------------- Summary of changes: libavcodec/codec_desc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 9893d66add avcodec/d3d12va_encode: add max_frame_size option
by ffmpeg-git＠ffmpeg.org 31 Aug '25

31 Aug '25

The branch, master has been updated via 9893d66addd19401830a9187525194354882fee8 (commit) from 2296a9c1bc0636c9ccf5217a49d87d29638ea65a (commit) - Log ----------------------------------------------------------------- commit 9893d66addd19401830a9187525194354882fee8 Author: Tong Wu <wutong1208(a)outlook.com> AuthorDate: Tue Aug 19 22:42:25 2025 +0800 Commit: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> CommitDate: Sun Aug 31 10:46:11 2025 +0000 avcodec/d3d12va_encode: add max_frame_size option Add the max_frame_size option to support setting max frame size in bytes. Max frame size is the maximum cap in the bitrate algorithm per each encoded frame. Signed-off-by: Tong Wu <wutong1208(a)outlook.com> diff --git a/libavcodec/d3d12va_encode.c b/libavcodec/d3d12va_encode.c index 1ecaee3b6d..008b0ddc2a 100644 --- a/libavcodec/d3d12va_encode.c +++ b/libavcodec/d3d12va_encode.c @@ -992,6 +992,11 @@ rc_mode_found: ctx->rc.Flags |= D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAG_ENABLE_QP_RANGE; } + if (ctx->max_frame_size > 0) { + cbr_ctl->MaxFrameBitSize = ctx->max_frame_size * 8; + ctx->rc.Flags |= D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAG_ENABLE_MAX_FRAME_SIZE; + } + ctx->rc.ConfigParams.pConfiguration_CBR = cbr_ctl; break; } @@ -1015,6 +1020,11 @@ rc_mode_found: ctx->rc.Flags |= D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAG_ENABLE_QP_RANGE; } + if (ctx->max_frame_size > 0) { + vbr_ctl->MaxFrameBitSize = ctx->max_frame_size * 8; + ctx->rc.Flags |= D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAG_ENABLE_MAX_FRAME_SIZE; + } + ctx->rc.ConfigParams.pConfiguration_VBR = vbr_ctl; break; } @@ -1036,6 +1046,11 @@ rc_mode_found: ctx->rc.Flags |= D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAG_ENABLE_QP_RANGE; } + if (ctx->max_frame_size > 0) { + qvbr_ctl->MaxFrameBitSize = ctx->max_frame_size * 8; + ctx->rc.Flags |= D3D12_VIDEO_ENCODER_RATE_CONTROL_FLAG_ENABLE_MAX_FRAME_SIZE; + } + ctx->rc.ConfigParams.pConfiguration_QVBR = qvbr_ctl; break; } diff --git a/libavcodec/d3d12va_encode.h b/libavcodec/d3d12va_encode.h index 3b0b8153d5..8af5554626 100644 --- a/libavcodec/d3d12va_encode.h +++ b/libavcodec/d3d12va_encode.h @@ -149,6 +149,11 @@ typedef struct D3D12VAEncodeContext { */ const struct D3D12VAEncodeType *codec; + /** + * Max frame size + */ + int max_frame_size; + /** * Explicitly set RC mode (otherwise attempt to pick from * available modes). @@ -317,6 +322,12 @@ int ff_d3d12va_encode_receive_packet(AVCodecContext *avctx, AVPacket *pkt); int ff_d3d12va_encode_init(AVCodecContext *avctx); int ff_d3d12va_encode_close(AVCodecContext *avctx); +#define D3D12VA_ENCODE_COMMON_OPTIONS \ + { "max_frame_size", \ + "Maximum frame size (in bytes)",\ + OFFSET(common.max_frame_size), AV_OPT_TYPE_INT, \ + { .i64 = 0 }, 0, INT_MAX / 8, FLAGS } + #define D3D12VA_ENCODE_RC_MODE(name, desc) \ { #name, desc, 0, AV_OPT_TYPE_CONST, { .i64 = RC_MODE_ ## name }, \ 0, 0, FLAGS, .unit = "rc_mode" } diff --git a/libavcodec/d3d12va_encode_hevc.c b/libavcodec/d3d12va_encode_hevc.c index 0aa1a1d3a4..4f4dda1f8f 100644 --- a/libavcodec/d3d12va_encode_hevc.c +++ b/libavcodec/d3d12va_encode_hevc.c @@ -705,6 +705,7 @@ static int d3d12va_encode_hevc_close(AVCodecContext *avctx) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) static const AVOption d3d12va_encode_hevc_options[] = { HW_BASE_ENCODE_COMMON_OPTIONS, + D3D12VA_ENCODE_COMMON_OPTIONS, D3D12VA_ENCODE_RC_OPTIONS, { "qp", "Constant QP (for P-frames; scaled by qfactor/qoffset for I/B)", ----------------------------------------------------------------------- Summary of changes: libavcodec/d3d12va_encode.c | 15 +++++++++++++++ libavcodec/d3d12va_encode.h | 11 +++++++++++ libavcodec/d3d12va_encode_hevc.c | 1 + 3 files changed, 27 insertions(+) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 2296a9c1bc avutil/bprint: fix av_bprint_strftime with %p format string reporting truncated output
by ffmpeg-git＠ffmpeg.org 31 Aug '25

31 Aug '25

The branch, master has been updated via 2296a9c1bc0636c9ccf5217a49d87d29638ea65a (commit) via 50e94aadb2d624407c46c988857a767dce5020b7 (commit) from 16d32a1c1d040d1b444ec476901d7458e1620301 (commit) - Log ----------------------------------------------------------------- commit 2296a9c1bc0636c9ccf5217a49d87d29638ea65a Author: Marton Balint <cus(a)passwd.hu> AuthorDate: Sun Aug 24 21:35:41 2025 +0200 Commit: Marton Balint <cus(a)passwd.hu> CommitDate: Sun Aug 31 09:37:59 2025 +0200 avutil/bprint: fix av_bprint_strftime with %p format string reporting truncated output strftime returns 0 in case of an empty output (e.g. %p format string with some locales), there is no way to distinguish this from a buffer-too-small error condition. So we must use some heuristics to handle this case, and not consume INT_MAX RAM and falsely report a truncated output. Signed-off-by: Marton Balint <cus(a)passwd.hu> diff --git a/libavutil/bprint.c b/libavutil/bprint.c index ac07a17326..11e0f08774 100644 --- a/libavutil/bprint.c +++ b/libavutil/bprint.c @@ -167,6 +167,7 @@ void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm) { unsigned room; size_t l; + size_t fmt_len = strlen(fmt); if (!*fmt) return; @@ -174,9 +175,18 @@ void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm) room = av_bprint_room(buf); if (room && (l = strftime(buf->str + buf->len, room, fmt, tm))) break; + + /* Due to the limitations of strftime() it is not possible to know if + * the output buffer is too small or the output is empty. + * However, a 256x output space requirement compared to the format + * string length is so unlikely we can safely assume empty output. This + * allows supporting possibly empty format strings like "%p". */ + if (room >> 8 > fmt_len) + break; + /* strftime does not tell us how much room it would need: let us retry with twice as much until the buffer is large enough */ - room = !room ? strlen(fmt) + 1 : + room = !room ? fmt_len + 1 : room <= INT_MAX / 2 ? room * 2 : INT_MAX; if (av_bprint_alloc(buf, room)) { /* impossible to grow, try to manage something useful anyway */ commit 50e94aadb2d624407c46c988857a767dce5020b7 Author: Marton Balint <cus(a)passwd.hu> AuthorDate: Sun Aug 24 21:42:54 2025 +0200 Commit: Marton Balint <cus(a)passwd.hu> CommitDate: Sun Aug 31 09:37:59 2025 +0200 avutil/bprint: make av_bprintf use av_vbprintf No reason to duplicate the code. Signed-off-by: Marton Balint <cus(a)passwd.hu> diff --git a/libavutil/bprint.c b/libavutil/bprint.c index 4e9571715c..ac07a17326 100644 --- a/libavutil/bprint.c +++ b/libavutil/bprint.c @@ -96,17 +96,17 @@ void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size) *buf->str = 0; } -void av_bprintf(AVBPrint *buf, const char *fmt, ...) +void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg) { unsigned room; char *dst; - va_list vl; int extra_len; + va_list vl; while (1) { room = av_bprint_room(buf); dst = room ? buf->str + buf->len : NULL; - va_start(vl, fmt); + va_copy(vl, vl_arg); extra_len = vsnprintf(dst, room, fmt, vl); va_end(vl); if (extra_len <= 0) @@ -119,27 +119,12 @@ void av_bprintf(AVBPrint *buf, const char *fmt, ...) av_bprint_grow(buf, extra_len); } -void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg) +void av_bprintf(AVBPrint *buf, const char *fmt, ...) { - unsigned room; - char *dst; - int extra_len; va_list vl; - - while (1) { - room = av_bprint_room(buf); - dst = room ? buf->str + buf->len : NULL; - va_copy(vl, vl_arg); - extra_len = vsnprintf(dst, room, fmt, vl); - va_end(vl); - if (extra_len <= 0) - return; - if (extra_len < room) - break; - if (av_bprint_alloc(buf, extra_len)) - break; - } - av_bprint_grow(buf, extra_len); + va_start(vl, fmt); + av_vbprintf(buf, fmt, vl); + va_end(vl); } void av_bprint_chars(AVBPrint *buf, char c, unsigned n) ----------------------------------------------------------------------- Summary of changes: libavutil/bprint.c | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 16d32a1c1d libavcodec/dpxenc: map AVCodecContext color transfer and color primaries fields
by ffmpeg-git＠ffmpeg.org 31 Aug '25

31 Aug '25

The branch, master has been updated via 16d32a1c1d040d1b444ec476901d7458e1620301 (commit) via 6d7daaab0afbab82f6aeb646257a51982108afa0 (commit) from 7a774829f99815f7671999c12fc920d8885b854a (commit) - Log ----------------------------------------------------------------- commit 16d32a1c1d040d1b444ec476901d7458e1620301 Author: Peter Ross <pross(a)xvid.org> AuthorDate: Fri Aug 29 17:51:46 2025 +1000 Commit: Peter Ross <pross(a)xvid.org> CommitDate: Sun Aug 31 07:05:36 2025 +0000 libavcodec/dpxenc: map AVCodecContext color transfer and color primaries fields diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c index 400ff98395..e136c7a249 100644 --- a/libavcodec/dpxenc.c +++ b/libavcodec/dpxenc.c @@ -26,6 +26,7 @@ #include "codec_internal.h" #include "encode.h" #include "version.h" +#include "dpx.h" typedef struct DPXContext { int big_endian; @@ -178,6 +179,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, DPXContext *s = avctx->priv_data; int size, ret, need_align, len; uint8_t *buf; + int color_trc, color_spec; #define HEADER_SIZE 1664 /* DPX Generic header */ if (s->bits_per_component == 10) @@ -217,8 +219,46 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, write32(buf + 772, avctx->width); write32(buf + 776, avctx->height); buf[800] = s->descriptor; - buf[801] = 2; /* linear transfer */ - buf[802] = 2; /* linear colorimetric */ + + switch (avctx->color_trc) { + case AVCOL_TRC_BT709: + color_trc = DPX_TRC_ITU_R_709_4; + break; + default: + av_log(avctx, AV_LOG_WARNING, "unsupported color transfer\n"); + case AVCOL_TRC_UNSPECIFIED: + color_trc = DPX_TRC_UNSPECIFIED_VIDEO; + break; + case AVCOL_TRC_GAMMA28: + color_trc = DPX_TRC_ITU_R_624_4_PAL; + break; + case AVCOL_TRC_SMPTE170M: + color_trc = DPX_TRC_SMPTE_170; + break; + case AVCOL_TRC_LINEAR: + color_trc = DPX_TRC_LINEAR; + break; + } + buf[801] = color_trc; + + switch (avctx->color_primaries) { + case AVCOL_PRI_BT709: + color_spec = DPX_COL_SPEC_ITU_R_709_4; + break; + default: + av_log(avctx, AV_LOG_WARNING, "unsupported colorimetric specification\n"); + case AVCOL_PRI_UNSPECIFIED: + color_spec = DPX_COL_SPEC_UNSPECIFIED_VIDEO; + break; + case AVCOL_PRI_BT470BG: + color_spec = DPX_COL_SPEC_ITU_R_624_4_PAL; + break; + case AVCOL_PRI_SMPTE170M: + color_spec = DPX_COL_SPEC_SMPTE_170; + break; + } + buf[802] = color_spec; + buf[803] = s->bits_per_component; write16(buf + 804, (s->bits_per_component == 10 || s->bits_per_component == 12) ? 1 : 0); /* packing method */ diff --git a/tests/ref/lavf/dpx b/tests/ref/lavf/dpx index 736fe39cff..9ac74196d0 100644 --- a/tests/ref/lavf/dpx +++ b/tests/ref/lavf/dpx @@ -1,3 +1,3 @@ -4c8880d5835ffb5fe37c1ed8c8d404de *tests/data/images/dpx/02.dpx +1ac8708e2d140b63915f0abfbdeb953f *tests/data/images/dpx/02.dpx 305792 tests/data/images/dpx/02.dpx tests/data/images/dpx/%02d.dpx CRC=0x6da01946 diff --git a/tests/ref/lavf/gbrp10le.dpx b/tests/ref/lavf/gbrp10le.dpx index 35e34d0859..54c01ea2fa 100644 --- a/tests/ref/lavf/gbrp10le.dpx +++ b/tests/ref/lavf/gbrp10le.dpx @@ -1,3 +1,3 @@ -7ca935d5d5e00c54acbc85565d3039b6 *tests/data/images/gbrp10le.dpx/02.gbrp10le.dpx +79aa69bb78c4422a883a7d2323f6b066 *tests/data/images/gbrp10le.dpx/02.gbrp10le.dpx 407168 tests/data/images/gbrp10le.dpx/02.gbrp10le.dpx tests/data/images/gbrp10le.dpx/%02d.gbrp10le.dpx CRC=0xe6663fba diff --git a/tests/ref/lavf/gbrp12le.dpx b/tests/ref/lavf/gbrp12le.dpx index 2758982d5a..ed15abe056 100644 --- a/tests/ref/lavf/gbrp12le.dpx +++ b/tests/ref/lavf/gbrp12le.dpx @@ -1,3 +1,3 @@ -a4cfea1797c928f2eff73573e559675d *tests/data/images/gbrp12le.dpx/02.gbrp12le.dpx +6969191e30f9f8b0d895784dc4d07f96 *tests/data/images/gbrp12le.dpx/02.gbrp12le.dpx 609920 tests/data/images/gbrp12le.dpx/02.gbrp12le.dpx tests/data/images/gbrp12le.dpx/%02d.gbrp12le.dpx CRC=0x1c755633 diff --git a/tests/ref/lavf/rgb48le.dpx b/tests/ref/lavf/rgb48le.dpx index b808ff4bdc..7d818d9d0f 100644 --- a/tests/ref/lavf/rgb48le.dpx +++ b/tests/ref/lavf/rgb48le.dpx @@ -1,3 +1,3 @@ -075963c3c08978b6a20555ba09161434 *tests/data/images/rgb48le.dpx/02.rgb48le.dpx +35376cc1ff5f1b934cdfc1bf0776cf48 *tests/data/images/rgb48le.dpx/02.rgb48le.dpx 609920 tests/data/images/rgb48le.dpx/02.rgb48le.dpx tests/data/images/rgb48le.dpx/%02d.rgb48le.dpx CRC=0xe5b9c023 diff --git a/tests/ref/lavf/rgb48le_10.dpx b/tests/ref/lavf/rgb48le_10.dpx index a49d929f7f..2a5d82dff5 100644 --- a/tests/ref/lavf/rgb48le_10.dpx +++ b/tests/ref/lavf/rgb48le_10.dpx @@ -1,3 +1,3 @@ -b9f22728f8ff393bf30cf6cbd624fa95 *tests/data/images/rgb48le_10.dpx/02.rgb48le_10.dpx +46533558d2f7ff875756dcd9227b9907 *tests/data/images/rgb48le_10.dpx/02.rgb48le_10.dpx 407168 tests/data/images/rgb48le_10.dpx/02.rgb48le_10.dpx tests/data/images/rgb48le_10.dpx/%02d.rgb48le_10.dpx CRC=0xf38d5830 diff --git a/tests/ref/lavf/rgba64le.dpx b/tests/ref/lavf/rgba64le.dpx index 5ccde8975b..66ea06d33b 100644 --- a/tests/ref/lavf/rgba64le.dpx +++ b/tests/ref/lavf/rgba64le.dpx @@ -1,3 +1,3 @@ -545603630f30dec2768c8ae8d12eb8ea *tests/data/images/rgba64le.dpx/02.rgba64le.dpx +89f545002e21044b01378aeccc437dcd *tests/data/images/rgba64le.dpx/02.rgba64le.dpx 812672 tests/data/images/rgba64le.dpx/02.rgba64le.dpx tests/data/images/rgba64le.dpx/%02d.rgba64le.dpx CRC=0xe72ce131 commit 6d7daaab0afbab82f6aeb646257a51982108afa0 Author: Peter Ross <pross(a)xvid.org> AuthorDate: Fri Aug 29 17:51:06 2025 +1000 Commit: Peter Ross <pross(a)xvid.org> CommitDate: Sun Aug 31 07:05:36 2025 +0000 avcodec/dpx: move enum DPX_TRC and DPX_COL_SPEC to dpx.h diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 80616d98a2..1b1ada316a 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -27,38 +27,7 @@ #include "avcodec.h" #include "codec_internal.h" #include "decode.h" - -enum DPX_TRC { - DPX_TRC_USER_DEFINED = 0, - DPX_TRC_PRINTING_DENSITY = 1, - DPX_TRC_LINEAR = 2, - DPX_TRC_LOGARITHMIC = 3, - DPX_TRC_UNSPECIFIED_VIDEO = 4, - DPX_TRC_SMPTE_274 = 5, - DPX_TRC_ITU_R_709_4 = 6, - DPX_TRC_ITU_R_601_625 = 7, - DPX_TRC_ITU_R_601_525 = 8, - DPX_TRC_SMPTE_170 = 9, - DPX_TRC_ITU_R_624_4_PAL = 10, - DPX_TRC_Z_LINEAR = 11, - DPX_TRC_Z_HOMOGENEOUS = 12, -}; - -enum DPX_COL_SPEC { - DPX_COL_SPEC_USER_DEFINED = 0, - DPX_COL_SPEC_PRINTING_DENSITY = 1, - /* 2 = N/A */ - /* 3 = N/A */ - DPX_COL_SPEC_UNSPECIFIED_VIDEO = 4, - DPX_COL_SPEC_SMPTE_274 = 5, - DPX_COL_SPEC_ITU_R_709_4 = 6, - DPX_COL_SPEC_ITU_R_601_625 = 7, - DPX_COL_SPEC_ITU_R_601_525 = 8, - DPX_COL_SPEC_SMPTE_170 = 9, - DPX_COL_SPEC_ITU_R_624_4_PAL = 10, - /* 11 = N/A */ - /* 12 = N/A */ -}; +#include "dpx.h" static unsigned int read16(const uint8_t **ptr, int is_big) { diff --git a/libavcodec/dpx.h b/libavcodec/dpx.h new file mode 100644 index 0000000000..800c651e5a --- /dev/null +++ b/libavcodec/dpx.h @@ -0,0 +1,57 @@ +/* + * DPX (.dpx) image decoder + * Copyright (c) 2009 Jimmy Christensen + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_DPX_H +#define AVCODEC_DPX_H + +enum DPX_TRC { + DPX_TRC_USER_DEFINED = 0, + DPX_TRC_PRINTING_DENSITY = 1, + DPX_TRC_LINEAR = 2, + DPX_TRC_LOGARITHMIC = 3, + DPX_TRC_UNSPECIFIED_VIDEO = 4, + DPX_TRC_SMPTE_274 = 5, + DPX_TRC_ITU_R_709_4 = 6, + DPX_TRC_ITU_R_601_625 = 7, + DPX_TRC_ITU_R_601_525 = 8, + DPX_TRC_SMPTE_170 = 9, + DPX_TRC_ITU_R_624_4_PAL = 10, + DPX_TRC_Z_LINEAR = 11, + DPX_TRC_Z_HOMOGENEOUS = 12, +}; + +enum DPX_COL_SPEC { + DPX_COL_SPEC_USER_DEFINED = 0, + DPX_COL_SPEC_PRINTING_DENSITY = 1, + /* 2 = N/A */ + /* 3 = N/A */ + DPX_COL_SPEC_UNSPECIFIED_VIDEO = 4, + DPX_COL_SPEC_SMPTE_274 = 5, + DPX_COL_SPEC_ITU_R_709_4 = 6, + DPX_COL_SPEC_ITU_R_601_625 = 7, + DPX_COL_SPEC_ITU_R_601_525 = 8, + DPX_COL_SPEC_SMPTE_170 = 9, + DPX_COL_SPEC_ITU_R_624_4_PAL = 10, + /* 11 = N/A */ + /* 12 = N/A */ +}; + +#endif /* AVCODEC_DPX_H */ ----------------------------------------------------------------------- Summary of changes: libavcodec/dpx.c | 33 +------------------------ libavcodec/dpx.h | 57 +++++++++++++++++++++++++++++++++++++++++++ libavcodec/dpxenc.c | 44 +++++++++++++++++++++++++++++++-- tests/ref/lavf/dpx | 2 +- tests/ref/lavf/gbrp10le.dpx | 2 +- tests/ref/lavf/gbrp12le.dpx | 2 +- tests/ref/lavf/rgb48le.dpx | 2 +- tests/ref/lavf/rgb48le_10.dpx | 2 +- tests/ref/lavf/rgba64le.dpx | 2 +- 9 files changed, 106 insertions(+), 40 deletions(-) create mode 100644 libavcodec/dpx.h hooks/post-receive --

1 0

[ffmpeg] branch master updated. 7a774829f9 avutil/opt: also print option names on parse error
by ffmpeg-git＠ffmpeg.org 30 Aug '25

30 Aug '25

The branch, master has been updated via 7a774829f99815f7671999c12fc920d8885b854a (commit) from 73d411c399df4abe2750b611fc8381979fcbafc6 (commit) - Log ----------------------------------------------------------------- commit 7a774829f99815f7671999c12fc920d8885b854a Author: Marton Balint <cus(a)passwd.hu> AuthorDate: Wed Aug 27 00:15:31 2025 +0200 Commit: Marton Balint <cus(a)passwd.hu> CommitDate: Sat Aug 30 18:46:15 2025 +0000 avutil/opt: also print option names on parse error It is more user-friendly to print which option caused the parse error. Signed-off-by: Marton Balint <cus(a)passwd.hu> diff --git a/libavutil/opt.c b/libavutil/opt.c index 7a84a18bb5..fc5834e168 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -490,7 +490,7 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con res = av_expr_parse_and_eval(&d, i ? buf : val, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, obj); if (res < 0) { - av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\"\n", val); + av_log(obj, AV_LOG_ERROR, "Unable to parse \"%s\" option value \"%s\"\n", o->name, val); return res; } } @@ -522,7 +522,7 @@ static int set_string_image_size(void *obj, const AVOption *o, const char *val, } ret = av_parse_video_size(dst, dst + 1, val); if (ret < 0) - av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as image size\n", val); + av_log(obj, AV_LOG_ERROR, "Unable to parse \"%s\" option value \"%s\" as image size\n", o->name, val); return ret; } @@ -530,7 +530,7 @@ static int set_string_video_rate(void *obj, const AVOption *o, const char *val, { int ret = av_parse_video_rate(dst, val); if (ret < 0) - av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as video rate\n", val); + av_log(obj, AV_LOG_ERROR, "Unable to parse \"%s\" option value \"%s\" as video rate\n", o->name, val); return ret; } @@ -543,7 +543,7 @@ static int set_string_color(void *obj, const AVOption *o, const char *val, uint8 } else { ret = av_parse_color(dst, val, -1, obj); if (ret < 0) - av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as color\n", val); + av_log(obj, AV_LOG_ERROR, "Unable to parse \"%s\" option value \"%s\" as color\n", o->name, val); return ret; } return 0; @@ -583,7 +583,7 @@ static int set_string_bool(void *obj, const AVOption *o, const char *val, int *d return 0; fail: - av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as boolean\n", val); + av_log(obj, AV_LOG_ERROR, "Unable to parse \"%s\" option value \"%s\" as boolean\n", o->name, val); return AVERROR(EINVAL); } @@ -601,7 +601,7 @@ static int set_string_fmt(void *obj, const AVOption *o, const char *val, uint8_t fmt = strtol(val, &tail, 0); if (*tail || (unsigned)fmt >= fmt_nb) { av_log(obj, AV_LOG_ERROR, - "Unable to parse option value \"%s\" as %s\n", val, desc); + "Unable to parse \"%s\" option value \"%s\" as %s\n", o->name, val, desc); return AVERROR(EINVAL); } } @@ -724,7 +724,7 @@ static int opt_set_elem(void *obj, void *target_obj, const AVOption *o, int64_t usecs = 0; if (val) { if ((ret = av_parse_time(&usecs, val, 1)) < 0) { - av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as duration\n", val); + av_log(obj, AV_LOG_ERROR, "Unable to parse \"%s\" option value \"%s\" as duration\n", o->name, val); return ret; } } @@ -741,7 +741,7 @@ static int opt_set_elem(void *obj, void *target_obj, const AVOption *o, case AV_OPT_TYPE_CHLAYOUT: ret = set_string_channel_layout(obj, o, val, dst); if (ret < 0) { - av_log(obj, AV_LOG_ERROR, "Unable to parse option value \"%s\" as channel layout\n", val); + av_log(obj, AV_LOG_ERROR, "Unable to parse \"%s\" option value \"%s\" as channel layout\n", o->name, val); ret = AVERROR(EINVAL); } return ret; diff --git a/tests/ref/fate/opt b/tests/ref/fate/opt index b8812e3eff..1f82f7e4bd 100644 --- a/tests/ref/fate/opt +++ b/tests/ref/fate/opt @@ -231,7 +231,7 @@ Error 'foo==val' Setting options string 'toggle=:' Setting entry with key 'toggle' to value '' Undefined constant or missing '(' in '' -Unable to parse option value "" +Unable to parse "toggle" option value "" Error 'toggle=:' Setting options string 'string=:' Setting entry with key 'string' to value '' @@ -247,7 +247,7 @@ Error 'toggle=100' Setting options string 'toggle==1' Setting entry with key 'toggle' to value '=1' Undefined constant or missing '(' in '=1' -Unable to parse option value "=1" +Unable to parse "toggle" option value "=1" Error 'toggle==1' Setting options string 'flags=+mu-lame : num=42: toggle=0' Setting entry with key 'flags' to value '+mu-lame' @@ -275,7 +275,7 @@ Setting entry with key 'size' to value 'pal' OK 'size=pal' Setting options string 'size=bogus' Setting entry with key 'size' to value 'bogus' -Unable to parse option value "bogus" as image size +Unable to parse "size" option value "bogus" as image size Error 'size=bogus' Setting options string 'pix_fmt=yuv420p' Setting entry with key 'pix_fmt' to value 'yuv420p' @@ -285,7 +285,7 @@ Setting entry with key 'pix_fmt' to value '2' OK 'pix_fmt=2' Setting options string 'pix_fmt=bogus' Setting entry with key 'pix_fmt' to value 'bogus' -Unable to parse option value "bogus" as pixel format +Unable to parse "pix_fmt" option value "bogus" as pixel format Error 'pix_fmt=bogus' Setting options string 'sample_fmt=s16' Setting entry with key 'sample_fmt' to value 's16' @@ -295,7 +295,7 @@ Setting entry with key 'sample_fmt' to value '2' OK 'sample_fmt=2' Setting options string 'sample_fmt=bogus' Setting entry with key 'sample_fmt' to value 'bogus' -Unable to parse option value "bogus" as sample format +Unable to parse "sample_fmt" option value "bogus" as sample format Error 'sample_fmt=bogus' Setting options string 'video_rate=pal' Setting entry with key 'video_rate' to value 'pal' @@ -312,11 +312,11 @@ OK 'video_rate=30/1.001' Setting options string 'video_rate=bogus' Setting entry with key 'video_rate' to value 'bogus' Undefined constant or missing '(' in 'bogus' -Unable to parse option value "bogus" as video rate +Unable to parse "video_rate" option value "bogus" as video rate Error 'video_rate=bogus' Setting options string 'duration=bogus' Setting entry with key 'duration' to value 'bogus' -Unable to parse option value "bogus" as duration +Unable to parse "duration" option value "bogus" as duration Error 'duration=bogus' Setting options string 'duration=123.45' Setting entry with key 'duration' to value '123.45' @@ -338,7 +338,7 @@ Setting entry with key 'cl' to value 'FL+FR' OK 'cl=FL+FR' Setting options string 'cl=foo' Setting entry with key 'cl' to value 'foo' -Unable to parse option value "foo" as channel layout +Unable to parse "cl" option value "foo" as channel layout Error 'cl=foo' Setting options string 'bin=boguss' Setting entry with key 'bin' to value 'boguss' @@ -352,7 +352,7 @@ OK 'bin=ffff' Setting options string 'num=bogus' Setting entry with key 'num' to value 'bogus' Undefined constant or missing '(' in 'bogus' -Unable to parse option value "bogus" +Unable to parse "num" option value "bogus" Error 'num=bogus' Setting options string 'num=44' Setting entry with key 'num' to value '44' @@ -374,7 +374,7 @@ Error 'num=101' Setting options string 'unum=bogus' Setting entry with key 'unum' to value 'bogus' Undefined constant or missing '(' in 'bogus' -Unable to parse option value "bogus" +Unable to parse "unum" option value "bogus" Error 'unum=bogus' Setting options string 'unum=44' Setting entry with key 'unum' to value '44' @@ -396,7 +396,7 @@ Error 'unum=2147483649' Setting options string 'num64=bogus' Setting entry with key 'num64' to value 'bogus' Undefined constant or missing '(' in 'bogus' -Unable to parse option value "bogus" +Unable to parse "num64" option value "bogus" Error 'num64=bogus' Setting options string 'num64=44' Setting entry with key 'num64' to value '44' @@ -421,7 +421,7 @@ Error 'num64=4294967297' Setting options string 'flt=bogus' Setting entry with key 'flt' to value 'bogus' Undefined constant or missing '(' in 'bogus' -Unable to parse option value "bogus" +Unable to parse "flt" option value "bogus" Error 'flt=bogus' Setting options string 'flt=2' Setting entry with key 'flt' to value '2' @@ -440,7 +440,7 @@ Error 'flt=101' Setting options string 'dbl=bogus' Setting entry with key 'dbl' to value 'bogus' Undefined constant or missing '(' in 'bogus' -Unable to parse option value "bogus" +Unable to parse "dbl" option value "bogus" Error 'dbl=bogus' Setting options string 'dbl=2' Setting entry with key 'dbl' to value '2' @@ -496,7 +496,7 @@ Error '5:size=pal:hello' Setting options string ':' Setting 'num' to value '' Undefined constant or missing '(' in '' -Unable to parse option value "" +Unable to parse "num" option value "" Error ':' Setting options string '=' Setting '' to value '' ----------------------------------------------------------------------- Summary of changes: libavutil/opt.c | 16 ++++++++-------- tests/ref/fate/opt | 28 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 22 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 73d411c399 avfilter/af_whisper: fix srt file format
by ffmpeg-git＠ffmpeg.org 30 Aug '25

30 Aug '25

The branch, master has been updated via 73d411c399df4abe2750b611fc8381979fcbafc6 (commit) from 3a0e324ab95d5e1de212b2815b0bf7622f838b3f (commit) - Log ----------------------------------------------------------------- commit 73d411c399df4abe2750b611fc8381979fcbafc6 Author: Vittorio Palmisano <vpalmisano(a)gmail.com> AuthorDate: Fri Aug 29 11:32:20 2025 +0200 Commit: Leo Izen <leo.izen(a)gmail.com> CommitDate: Sat Aug 30 14:30:51 2025 +0000 avfilter/af_whisper: fix srt file format The SRT file format requires commas in the time string, not periods. diff --git a/libavfilter/af_whisper.c b/libavfilter/af_whisper.c index 385180b4ed..663fe446bb 100644 --- a/libavfilter/af_whisper.c +++ b/libavfilter/af_whisper.c @@ -246,7 +246,7 @@ static void run_transcription(AVFilterContext *ctx, AVFrame *frame, int samples) if (!av_strcasecmp(wctx->format, "srt")) { buf = av_asprintf - ("%d\n%02ld:%02ld:%02ld.%03ld --> %02ld:%02ld:%02ld.%03ld\n%s\n\n", + ("%d\n%02ld:%02ld:%02ld,%03ld --> %02ld:%02ld:%02ld,%03ld\n%s\n\n", wctx->index, start_t / 3600000, (start_t / 60000) % 60, (start_t / 1000) % 60, start_t % 1000, end_t / 3600000, (end_t / 60000) % 60, ----------------------------------------------------------------------- Summary of changes: libavfilter/af_whisper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 3a0e324ab9 .forge/CODEOWNERS: add myself to EXIF code
by ffmpeg-git＠ffmpeg.org 30 Aug '25

30 Aug '25

The branch, master has been updated via 3a0e324ab95d5e1de212b2815b0bf7622f838b3f (commit) from 2fffa01ddb777871cd53ef6c92f5c19cae8afe16 (commit) - Log ----------------------------------------------------------------- commit 3a0e324ab95d5e1de212b2815b0bf7622f838b3f Author: Leo Izen <leo.izen(a)gmail.com> AuthorDate: Fri Aug 29 06:52:09 2025 -0400 Commit: Leo Izen <leo.izen(a)gmail.com> CommitDate: Sat Aug 30 08:34:34 2025 -0400 .forge/CODEOWNERS: add myself to EXIF code Now that the major EXIF overhaul has been merged, I should be suggested to review patches that modify it. Signed-off-by: Leo Izen <leo.izen(a)gmail.com> diff --git a/.forgejo/CODEOWNERS b/.forgejo/CODEOWNERS index 39abd7a832..d421aacb12 100644 --- a/.forgejo/CODEOWNERS +++ b/.forgejo/CODEOWNERS @@ -27,6 +27,7 @@ libavcodec/eacmv.* @pross libavcodec/eaidct.* @pross libavcodec/eamad.* @pross libavcodec/eat.* @pross +libavcodec/.*exif.* @Traneptora libavcodec/.*ffv1.* @lynne @michaelni libavcodec/g728.* @pross libavcodec/gem.* @pross @@ -104,6 +105,7 @@ libavformat/cine.* @pross libavformat/dsf.* @pross libavformat/eacdata.* @pross libavformat/electronicarts.* @pross +libavformat/.*exif.* @Traneptora libavformat/filmstrip.* @pross libavformat/frm.* @pross libavformat/iamf.* @jamrial ----------------------------------------------------------------------- Summary of changes: .forgejo/CODEOWNERS | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 2fffa01ddb avcodec/x86/vp9dsp_init: remove preprocessor checks for some prototypes
by ffmpeg-git＠ffmpeg.org 29 Aug '25

29 Aug '25

The branch, master has been updated via 2fffa01ddb777871cd53ef6c92f5c19cae8afe16 (commit) from 7252f6c0bfe7b983232c99b1a5f5924a58654d6b (commit) - Log ----------------------------------------------------------------- commit 2fffa01ddb777871cd53ef6c92f5c19cae8afe16 Author: James Almer <jamrial(a)gmail.com> AuthorDate: Fri Aug 29 14:02:13 2025 -0300 Commit: James Almer <jamrial(a)gmail.com> CommitDate: Fri Aug 29 14:02:49 2025 -0300 avcodec/x86/vp9dsp_init: remove preprocessor checks for some prototypes Fixes compilation with --disable-avx512icl Signed-off-by: James Almer <jamrial(a)gmail.com> diff --git a/libavcodec/x86/vp9dsp_init.c b/libavcodec/x86/vp9dsp_init.c index 15862f43bf..9836b3321c 100644 --- a/libavcodec/x86/vp9dsp_init.c +++ b/libavcodec/x86/vp9dsp_init.c @@ -50,14 +50,12 @@ decl_mc_funcs(8, ssse3, int8_t, 32, 8); #if ARCH_X86_64 decl_mc_funcs(16, ssse3, int8_t, 32, 8); decl_mc_funcs(32, avx2, int8_t, 32, 8); -#if HAVE_AVX512ICL_EXTERNAL decl_subpel_asm( 4, 8, avx512icl); decl_subpel_asm( 8, 8, avx512icl); decl_subpel_asm(16, 8, avx512icl); decl_subpel_asm(32, 8, avx512icl); decl_subpel_asm(64, 8, avx512icl); #endif -#endif mc_rep_funcs(16, 8, 8, sse2, int16_t, 8, 8) #if ARCH_X86_32 ----------------------------------------------------------------------- Summary of changes: libavcodec/x86/vp9dsp_init.c | 2 -- 1 file changed, 2 deletions(-) hooks/post-receive --

1 0

[ffmpeg] branch master updated. 7252f6c0bf avcodec/version: update the codec_ids
by ffmpeg-git＠ffmpeg.org 29 Aug '25

29 Aug '25

The branch, master has been updated via 7252f6c0bfe7b983232c99b1a5f5924a58654d6b (commit) from 4ede75b5f48df5a487ec85da4ec4ca2e16046341 (commit) - Log ----------------------------------------------------------------- commit 7252f6c0bfe7b983232c99b1a5f5924a58654d6b Author: Nicolas Gaullier <nicolas.gaullier(a)cji.paris> AuthorDate: Fri Aug 29 17:29:24 2025 +0200 Commit: Nicolas Gaullier <nicolas.gaullier(a)cji.paris> CommitDate: Fri Aug 29 17:32:52 2025 +0200 avcodec/version: update the codec_ids The counters should be incremented for each new codec. Catch-up to be in sync with codec_id.h again. Signed-off-by: Nicolas Gaullier <nicolas.gaullier(a)cji.paris> diff --git a/libavcodec/version.c b/libavcodec/version.c index 8a0398f28f..07e8e47e44 100644 --- a/libavcodec/version.c +++ b/libavcodec/version.c @@ -31,13 +31,13 @@ const char av_codec_ffversion[] = "FFmpeg version " FFMPEG_VERSION; unsigned avcodec_version(void) { - static_assert(AV_CODEC_ID_DNXUC == 270 && + static_assert(AV_CODEC_ID_PRORES_RAW == 274 && AV_CODEC_ID_PCM_SGA == 65572 && - AV_CODEC_ID_ADPCM_XMD == 69683 && + AV_CODEC_ID_ADPCM_SANYO == 69685 && AV_CODEC_ID_CBD2_DPCM == 81928 && - AV_CODEC_ID_QOA == 86121 && + AV_CODEC_ID_G728 == 86123 && AV_CODEC_ID_IVTV_VBI == 94234 && - AV_CODEC_ID_SMPTE_2038 == 98315, + AV_CODEC_ID_SMPTE_436M_ANC == 98317, "Don't insert new codec ids in the middle of a list"); static_assert(LIBAVCODEC_VERSION_MICRO >= 100, "micro version starts at 100"); ----------------------------------------------------------------------- Summary of changes: libavcodec/version.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive --

1 0