The branch, release/7.1 has been updated
via f893221c8d89cb798b829bebe71d55e1a3f242fd (commit)
via 1b08c6c95e3f19452566b8aae7a0288b39d05161 (commit)
via 483015d6ce5e720e71bed66814d353d656f37356 (commit)
via dc2728474ea56cb52d9f9d7fd62504185149bd67 (commit)
from 8627b7c7978268899373081d1d6965a142b794a7 (commit)
- Log -----------------------------------------------------------------
commit f893221c8d89cb798b829bebe71d55e1a3f242fd
Author: Michael Niedermayer <mich...@niedermayer.cc>
AuthorDate: Sun Sep 14 00:32:13 2025 +0200
Commit: Michael Niedermayer <mich...@niedermayer.cc>
CommitDate: Sun Sep 14 00:32:13 2025 +0200
Changelog: update
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
diff --git a/Changelog b/Changelog
index c64d281e24..b8f15aabb7 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,9 @@ Entries are sorted chronologically from oldest to youngest
within each release,
releases are sorted from youngest to oldest.
version 7.1.2:
+ doc/examples/vaapi_encode: fix invalid check on fwrite
+ avcodec/librsvgdec: fix compilation with librsvg 2.50.3
+ fftools/ffmpeg: fix gracefully shutdown
fftools/ffmpeg_demux: ensure the display_rotation option is honored
avcodec/mjpegdec: use ff_frame_new_side_data() to export display matrix
aacdec_usac: use RefStruct to track unfinished extension buffers
commit 1b08c6c95e3f19452566b8aae7a0288b39d05161
Author: Zhao Zhili <quinkbl...@foxmail.com>
AuthorDate: Tue Sep 2 18:04:11 2025 +0800
Commit: Michael Niedermayer <mich...@niedermayer.cc>
CommitDate: Sun Sep 14 00:31:17 2025 +0200
doc/examples/vaapi_encode: fix invalid check on fwrite
enc_pkt->size is 0 after av_packet_unref, which makes the check invalid.
Fix regression from 3e4bfff2.
Co-Authored-by: Jin Bo <ji...@loongson.cn>
Signed-off-by: Zhao Zhili <zhiliz...@tencent.com>
(cherry picked from commit 09856e4e483f14125d38e5c84e908f623bb1a888)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
diff --git a/doc/examples/vaapi_encode.c b/doc/examples/vaapi_encode.c
index ff3ebb1e2b..330a6524ef 100644
--- a/doc/examples/vaapi_encode.c
+++ b/doc/examples/vaapi_encode.c
@@ -88,7 +88,7 @@ static int encode_write(AVCodecContext *avctx, AVFrame
*frame, FILE *fout)
enc_pkt->stream_index = 0;
ret = fwrite(enc_pkt->data, enc_pkt->size, 1, fout);
av_packet_unref(enc_pkt);
- if (ret != enc_pkt->size) {
+ if (!ret) {
ret = AVERROR(errno);
break;
}
commit 483015d6ce5e720e71bed66814d353d656f37356
Author: Andrey Semashev <andrey.semas...@gmail.com>
AuthorDate: Tue Sep 2 01:07:05 2025 +0300
Commit: Michael Niedermayer <mich...@niedermayer.cc>
CommitDate: Sun Sep 14 00:31:17 2025 +0200
avcodec/librsvgdec: fix compilation with librsvg 2.50.3
This fixes compilation with librsvg 2.50.3: error: viewport undeclared
This was a regression since commit
86ed68420d3b60439d0b7767c53d0fdc1deb7277.
Fixes #10722.
Reviewed-by: Leo Izen <leo.i...@gmail.com>
(cherry picked from commit 9ee7796c540ce9cec3fdff0dd246de842228707b)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
diff --git a/libavcodec/librsvgdec.c b/libavcodec/librsvgdec.c
index c328fbc774..f0566eb5d8 100644
--- a/libavcodec/librsvgdec.c
+++ b/libavcodec/librsvgdec.c
@@ -90,8 +90,6 @@ static int librsvg_decode_frame(AVCodecContext *avctx,
AVFrame *frame,
goto end;
avctx->pix_fmt = AV_PIX_FMT_RGB32;
- viewport.width = dimensions.width;
- viewport.height = dimensions.height;
ret = ff_get_buffer(avctx, frame, 0);
if (ret < 0)
@@ -116,6 +114,8 @@ static int librsvg_decode_frame(AVCodecContext *avctx,
AVFrame *frame,
cairo_restore(crender);
#if LIBRSVG_MAJOR_VERSION > 2 || LIBRSVG_MAJOR_VERSION == 2 &&
LIBRSVG_MINOR_VERSION >= 52
+ viewport.width = dimensions.width;
+ viewport.height = dimensions.height;
gret = rsvg_handle_render_document(handle, crender, &viewport, &error);
#else
cairo_scale(crender, dimensions.width / (double)unscaled_dimensions.width,
commit dc2728474ea56cb52d9f9d7fd62504185149bd67
Author: Patrick Wang <mail6543...@gmail.com>
AuthorDate: Fri Aug 29 02:58:16 2025 +0800
Commit: Michael Niedermayer <mich...@niedermayer.cc>
CommitDate: Sun Sep 14 00:31:17 2025 +0200
fftools/ffmpeg: fix gracefully shutdown
d119ae2fd82a494d9430ff4d4fc262961a68c598 removed the loop-breaking condition
received_sigterm.
Thus, signals no longer gracefully shutdown ffmpeg.
Fixes: #10834
Signed-off-by: Patrick Wang <mail6543...@gmail.com>
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
(cherry picked from commit d7173e982ec815dcf70999c8683c465b99ce249c)
Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc>
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 420ba3c6e4..99668ada18 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -789,8 +789,6 @@ static int check_keyboard_interaction(int64_t cur_time)
{
int i, key;
static int64_t last_time;
- if (received_nb_signals)
- return AVERROR_EXIT;
/* read_key() returns 0 on EOF */
if (cur_time - last_time >= 100000) {
key = read_key();
@@ -874,6 +872,9 @@ static int transcode(Scheduler *sch)
while (!sch_wait(sch, stats_period, &transcode_ts)) {
int64_t cur_time= av_gettime_relative();
+ if (received_nb_signals)
+ break;
+
/* if 'q' pressed, exits */
if (stdin_interaction)
if (check_keyboard_interaction(cur_time) < 0)
-----------------------------------------------------------------------
Summary of changes:
Changelog | 3 +++
doc/examples/vaapi_encode.c | 2 +-
fftools/ffmpeg.c | 5 +++--
libavcodec/librsvgdec.c | 4 ++--
4 files changed, 9 insertions(+), 5 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- ffmpeg-cvslog@ffmpeg.org
To unsubscribe send an email to ffmpeg-cvslog-le...@ffmpeg.org
