The branch, master has been updated
via afd927e0cad63bcca4c4652499dd9a1dea37c4ee (commit)
via 0d11c5c2f9438e893a34d0191c58d54e864e4ea2 (commit)
via 3d12d5682bd497ce70da93dbb171d54a272c9ce7 (commit)
from d31983dc8e50dc0e5673b0db6c50b9a85e3fd602 (commit)
- Log -----------------------------------------------------------------
commit afd927e0cad63bcca4c4652499dd9a1dea37c4ee
Author: Lynne <[email protected]>
AuthorDate: Tue Oct 28 23:10:15 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Tue Oct 28 23:10:15 2025 +0100
prores_raw: skip frames if the discard flag is set
All other decoders do this.
diff --git a/libavcodec/prores_raw.c b/libavcodec/prores_raw.c
index a872677e77..0298956efd 100644
--- a/libavcodec/prores_raw.c
+++ b/libavcodec/prores_raw.c
@@ -334,6 +334,9 @@ static int decode_frame(AVCodecContext *avctx,
DECLARE_ALIGNED(32, uint8_t, qmat)[64];
memset(qmat, 1, 64);
+ if (avctx->skip_frame >= AVDISCARD_ALL)
+ return avpkt->size;
+
switch (avctx->codec_tag) {
case 0:
break;
commit 0d11c5c2f9438e893a34d0191c58d54e864e4ea2
Author: Lynne <[email protected]>
AuthorDate: Tue Oct 28 21:18:55 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Tue Oct 28 22:19:34 2025 +0100
libplacebo: extend allowed range of color primaries and transfer functions
This was left out of the earlier commits.
diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c
index f2cf83ab33..87d00519c3 100644
--- a/libavfilter/vf_libplacebo.c
+++ b/libavfilter/vf_libplacebo.c
@@ -1650,7 +1650,7 @@ static const AVOption libplacebo_options[] = {
{"pc", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_RANGE_JPEG}, 0, 0, STATIC, .unit = "range"},
{"jpeg", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_RANGE_JPEG}, 0, 0, STATIC, .unit = "range"},
- {"color_primaries", "select color primaries", OFFSET(color_primaries),
AV_OPT_TYPE_INT, {.i64=-1}, -1, AVCOL_PRI_NB-1, DYNAMIC, .unit =
"color_primaries"},
+ {"color_primaries", "select color primaries", OFFSET(color_primaries),
AV_OPT_TYPE_INT, {.i64=-1}, -1, AVCOL_PRI_EXT_NB-1, DYNAMIC, .unit =
"color_primaries"},
{"auto", "keep the same color primaries", 0, AV_OPT_TYPE_CONST,
{.i64=-1}, INT_MIN, INT_MAX, STATIC, .unit =
"color_primaries"},
{"bt709", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_BT709}, INT_MIN, INT_MAX, STATIC, .unit =
"color_primaries"},
{"unknown", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_UNSPECIFIED}, INT_MIN, INT_MAX, STATIC, .unit =
"color_primaries"},
@@ -1667,7 +1667,7 @@ static const AVOption libplacebo_options[] = {
{"ebu3213", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_EBU3213}, INT_MIN, INT_MAX, STATIC, .unit =
"color_primaries"},
{"vgamut", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_PRI_V_GAMUT}, INT_MIN, INT_MAX, STATIC, .unit =
"color_primaries"},
- {"color_trc", "select color transfer", OFFSET(color_trc), AV_OPT_TYPE_INT,
{.i64=-1}, -1, AVCOL_TRC_NB-1, DYNAMIC, .unit = "color_trc"},
+ {"color_trc", "select color transfer", OFFSET(color_trc), AV_OPT_TYPE_INT,
{.i64=-1}, -1, AVCOL_TRC_EXT_NB-1, DYNAMIC, .unit = "color_trc"},
{"auto", "keep the same color transfer", 0, AV_OPT_TYPE_CONST, {.i64=-1},
INT_MIN, INT_MAX, STATIC, .unit = "color_trc"},
{"bt709", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_TRC_BT709}, INT_MIN, INT_MAX, STATIC, .unit = "color_trc"},
{"unknown", NULL, 0, AV_OPT_TYPE_CONST,
{.i64=AVCOL_TRC_UNSPECIFIED}, INT_MIN, INT_MAX, STATIC, .unit = "color_trc"},
commit 3d12d5682bd497ce70da93dbb171d54a272c9ce7
Author: Lynne <[email protected]>
AuthorDate: Tue Oct 28 20:56:24 2025 +0100
Commit: Lynne <[email protected]>
CommitDate: Tue Oct 28 22:19:34 2025 +0100
doc/APIchanges: add AVCOL_PRI_EXT_BASE and AVCOL_PRI_V_GAMUT
They were left out.
diff --git a/doc/APIchanges b/doc/APIchanges
index 9086093149..7c2ab3cc03 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -3,7 +3,8 @@ The last version increases of all libraries were on 2025-03-28
API changes, most recent first:
2025-10-xx - xxxxxxxxxx - lavu 60.16.100 - pixfmt.h
- Add AVCOL_TRC_EXT_BASE and AVCOL_TRC_L_LOG.
+ Add AVCOL_TRC_EXT_BASE, AVCOL_TRC_V_LOG,
+ AVCOL_PRI_EXT_BASE and AVCOL_PRI_V_GAMUT.
2025-10-xx - xxxxxxxxxx - lavu 60.15.100 - pixfmt.h
Add AV_PIX_FMT_GRAY10MSB, AV_PIX_FMT_GRAY12MSB,
-----------------------------------------------------------------------
Summary of changes:
doc/APIchanges | 3 ++-
libavcodec/prores_raw.c | 3 +++
libavfilter/vf_libplacebo.c | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
