June 2025 - ffmpeg-cvslog - lists.ffmpeg.org

doc: Remove libav-merge.txt
by Derek Buitenhuis 30 Jun '25

30 Jun '25

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Mon Jun 23 21:15:18 2025 +0100| [5bcff199d9f47991772cf82133fb51c7ce7c1832] | committer: Derek Buitenhuis doc: Remove libav-merge.txt It not longer exists. Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bcff199d9f479917… --- doc/libav-merge.txt | 115 ---------------------------------------------------- 1 file changed, 115 deletions(-) diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt deleted file mode 100644 index bcd0aacba5..0000000000 --- a/doc/libav-merge.txt +++ /dev/null @@ -1,115 +0,0 @@ -CONTEXT -======= - -The FFmpeg project merges all the changes from the Libav project -(https://libav.org) since the origin of the fork (around 2011). - -With the exceptions of some commits due to technical/political disagreements or -issues, the changes are merged on a more or less regular schedule (daily for -years thanks to Michael, but more sparse nowadays). - -WHY -=== - -The majority of the active developers believe the project needs to keep this -policy for various reasons. - -The most important one is that we don't want our users to have to choose -between two distributors of libraries of the exact same name in order to have a -different set of features and bugfixes. By taking the responsibility of -unifying the two codebases, we allow users to benefit from the changes from the -two teams. - -Today, FFmpeg has a much larger user database (we are distributed by every -major distribution), so we consider this mission a priority. - -A different approach to the merge could have been to pick the changes we are -interested in and drop most of the cosmetics and other less important changes. -Unfortunately, this makes the following picks much harder, especially since the -Libav project is involved in various deep API changes. As a result, we decide -to virtually take everything done there. - -Any Libav developer is of course welcome anytime to contribute directly to the -FFmpeg tree. Of course, we fully understand and are forced to accept that very -few Libav developers are interested in doing so, but we still want to recognize -their work. This leads us to create merge commits for every single one from -Libav. The original commit appears totally unchanged with full authorship in -our history (and the conflict are solved in the merge one). That way, not a -single thing from Libav will be lost in the future in case some reunification -happens, or that project disappears one way or another. - -DOWNSIDES -========= - -Of course, there are many downsides to this approach. - -- It causes a non negligible merge commits pollution. We make sure there are - not several level of merges entangled (we do a 1:1 merge/commit), but it's - still a non-linear history. - -- Many duplicated work. For instance, we added libavresample in our tree to - keep compatibility with Libav when our libswresample was already covering the - exact same purpose. The same thing happened for various elements such as the - ProRes support (but differences in features, bugs, licenses, ...). There are - many work to do to unify them, and any help is very much welcome. - -- So much manpower from both FFmpeg and Libav is lost because of this mess. We - know it, and we don't know how to fix it. It takes incredible time to do - these merges, so we have even less time to work on things we personally care - about. The bad vibes also do not help with keeping our developers motivated. - -- There is a growing technical risk factor with the merges due to the codebase - differing more and more. - -MERGE GUIDELINES -================ - -The following gives developer guidelines on how to proceed when merging Libav commits. - -Before starting, you can reduce the risk of errors on merge conflicts by using -a different merge conflict style: - - $ git config --global merge.conflictstyle diff3 - -tools/libav-merge-next-commit is a script to help merging the next commit in -the queue. It assumes a remote named libav. It has two modes: merge, and noop. -The noop mode creates a merge with no change to the HEAD. You can pass a hash -as extra argument to reference a justification (it is common that we already -have the change done in FFmpeg). - -Also see tools/murge, you can copy and paste a 3 way conflict into its stdin -and it will display colored diffs. Any arguments to murge (like ones to suppress -whitespace differences) are passed into colordiff. - -TODO/FIXME/UNMERGED -=================== - -Stuff that didn't reach the codebase: -------------------------------------- - -- HEVC DSP and x86 MC SIMD improvements from Libav (see https://ffmpeg.org/pipermail/ffmpeg-devel/2015-December/184777.html) - - 1f821750f hevcdsp: split the qpel functions by width instead of by the subpixel fraction - - 818bfe7f0 hevcdsp: split the epel functions by width - - 688417399 hevcdsp: split the pred functions by width - - a853388d2 hevc: change the stride of the MC buffer to be in bytes instead of elements - - 0cef06df0 checkasm: add HEVC MC tests - - e7078e842 hevcdsp: add x86 SIMD for MC - - 7993ec19a hevc: Add hevc_get_pixel_4/8/12/16/24/32/48/64 -- use av_cpu_max_align() instead of hardcoding alignment requirements (see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html) - - f44ec22e0 lavc: use av_cpu_max_align() instead of hardcoding alignment requirements - - 4de220d2e frame: allow align=0 (meaning automatic) for av_frame_get_buffer() -- Support recovery from an already present HLS playlist (see 16cb06bb30) -- Remove all output devices (see 8e7e042d41, 8d3db95f20, 6ce13070bd, d46cd24986 and https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/216904.html) -- avcodec/libaomenc: export the Sequence Header OBU as extradata (See a024c3ce9a) - -Collateral damage that needs work locally: ------------------------------------------- - -- Merge proresenc_anatoliy.c and proresenc_kostya.c -- Fix MIPS AC3 downmix - -Extra changes needed to be aligned with Libav: ----------------------------------------------- - -- Switching our examples to the new encode/decode API (see 67d28f4a0f) -- HEVC IDCT bit depth 12-bit support (Libav added 8 and 10 but doesn't have 12)

1 0

tools: Remove libav-merge-next-commit
by Derek Buitenhuis 30 Jun '25

30 Jun '25

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis(a)gmail.com> | Mon Jun 23 22:40:20 2025 +0100| [b58cca5a279b8b826fdac1f2f26d37a0ead091a8] | committer: Derek Buitenhuis tools: Remove libav-merge-next-commit Libav is no longer extant. Signed-off-by: Derek Buitenhuis <derek.buitenhuis(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b58cca5a279b8b826… --- tools/libav-merge-next-commit | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/tools/libav-merge-next-commit b/tools/libav-merge-next-commit deleted file mode 100755 index 9bd03fabf8..0000000000 --- a/tools/libav-merge-next-commit +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -if [ "$1" != "merge" -a "$1" != "noop" ]; then - printf "Usage: $0 <merge|noop [REF_HASH]>\n" - exit 0 -fi - -[ "$1" = "noop" ] && merge_opts="-s ours" - -nextrev=$(git rev-list libav/master --not master --no-merges | tail -n1) -if [ -z "$nextrev" ]; then - printf "Nothing to merge..\n" - exit 0 -fi -printf "Merging $(git log -n 1 --oneline $nextrev)\n" -git merge --no-commit $merge_opts --no-ff --log $nextrev - -if [ "$1" = "noop" -a -n "$2" ]; then - printf "\nThis commit is a noop, see $2\n" >> .git/MERGE_MSG -fi - -printf "\nMerged-by: $(git config --get user.name) <$(git config --get user.email)>\n" >> .git/MERGE_MSG

1 0

avcodec/speexdec: consider differing frame sizes in remaining space check
by Michael Niedermayer 29 Jun '25

29 Jun '25

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Jun 27 18:09:24 2025 +0200| [cfd1f81e7d06e64cc03d670bafe739cc8925f5be] | committer: Michael Niedermayer avcodec/speexdec: consider differing frame sizes in remaining space check Fixes: talk109-q5.spx Regression since: f6986e75be87f512f65d64ac91ba19d505a8d210 Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfd1f81e7d06e64cc… --- libavcodec/speexdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index 94dce5420c..ba9faeb15d 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -1234,7 +1234,7 @@ static int sb_decode(AVCodecContext *avctx, void *ptr_st, mode = st->mode; if (st->modeID > 0) { - if (packets_left <= 1) + if (packets_left * s->frame_size < 2*st->frame_size) return AVERROR_INVALIDDATA; low_innov_alias = out + st->frame_size; s->st[st->modeID - 1].innov_save = low_innov_alias;

1 0

libavcodec/tests: fix gitignore hashtable
by Nicolas Gaullier 29 Jun '25

29 Jun '25

ffmpeg | branch: master | Nicolas Gaullier <nicolas.gaullier(a)cji.paris> | Mon Jun 23 19:41:52 2025 +0200| [89ec66d61b2c53e42a29bc437a152b9d8556a312] | committer: Michael Niedermayer libavcodec/tests: fix gitignore hashtable Signed-off-by: Nicolas Gaullier <nicolas.gaullier(a)cji.paris> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89ec66d61b2c53e42… --- libavcodec/tests/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/tests/.gitignore b/libavcodec/tests/.gitignore index 29020a5945..6bd9b31b56 100644 --- a/libavcodec/tests/.gitignore +++ b/libavcodec/tests/.gitignore @@ -9,6 +9,7 @@ /codec_desc /dct /golomb +/hashtable /h264_levels /h265_levels /htmlsubtitles

1 0

avfilter/vf_lut3d: fix leak if allocate_3dlut failed
by Lidong Yan 29 Jun '25

29 Jun '25

ffmpeg | branch: master | Lidong Yan <yldhome2d2(a)gmail.com> | Fri Jun 27 22:09:17 2025 +0800| [a17596f55bcaac57c7670c053b28599bc6d1c347] | committer: Michael Niedermayer avfilter/vf_lut3d: fix leak if allocate_3dlut failed In parse_cinespace(), memory allocated in in_prelut[] and out_prelut[] would leak if allocate_3dlut() failed. Replace return ret with goto end to free memory before return error code. Signed-off-by: Lidong Yan <502024330056(a)smail.nju.edu.cn> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a17596f55bcaac57c… --- libavfilter/vf_lut3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 5f6bfc65b3..46afe36f6c 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -1006,7 +1006,7 @@ static int parse_cinespace(AVFilterContext *ctx, FILE *f) ret = allocate_3dlut(ctx, size, prelut); if (ret < 0) - return ret; + goto end; for (int k = 0; k < size; k++) { for (int j = 0; j < size; j++) {

1 0

avcodec/vorbisenc: fix leak if av_mallocz failed
by Lidong Yan 29 Jun '25

29 Jun '25

ffmpeg | branch: master | Lidong Yan <yldhome2d2(a)gmail.com> | Fri Jun 27 22:09:16 2025 +0800| [40a3d35da6ba51e0a4e59e754d033feefafc036d] | committer: Michael Niedermayer avcodec/vorbisenc: fix leak if av_mallocz failed In put_main_header(), av_mallocz() allocates memory to local variable buffer, buffer leaks if av_mallocz() to *out failed. Add av_free(buffer) before return error code. Signed-off-by: Lidong Yan <502024330056(a)smail.nju.edu.cn> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40a3d35da6ba51e0a… --- libavcodec/vorbisenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 99ac72c910..b4680a11ed 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -740,8 +740,10 @@ static int put_main_header(vorbis_enc_context *venc, uint8_t **out) len = hlens[0] + hlens[1] + hlens[2]; p = *out = av_mallocz(64 + len + len/255); - if (!p) + if (!p) { + av_freep(&buffer); return AVERROR(ENOMEM); + } *p++ = 2; p += av_xiphlacing(p, hlens[0]);

1 0

avcodec/vvc/refs: remove early return
by Marvin Scholz 28 Jun '25

28 Jun '25

ffmpeg | branch: master | Marvin Scholz <epirat07(a)gmail.com> | Thu Jun 26 23:49:06 2025 +0200| [7d384869751b45d4d057df67dde9050a82590a6e] | committer: Marvin Scholz avcodec/vvc/refs: remove early return The ret value is checked later on again, so this check is redundant and would cause the frame to not be unrefd on failure as well. So remove this check and add one before av_frame_remove_side_data to ensure it is not called with an invalid frame. Fix CID 1648350 Reviewed-by: Frank Plowman <post(a)frankplowman.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d384869751b45d4d… --- libavcodec/vvc/refs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/vvc/refs.c b/libavcodec/vvc/refs.c index 79967b77d3..1840caa4ec 100644 --- a/libavcodec/vvc/refs.c +++ b/libavcodec/vvc/refs.c @@ -300,16 +300,15 @@ int ff_vvc_output_frame(VVCContext *s, VVCFrameContext *fc, AVFrame *out, const frame->frame->flags |= AV_FRAME_FLAG_CORRUPT; ret = av_frame_ref(out, frame->needs_fg ? frame->frame_grain : frame->frame); - if (ret < 0) - return ret; - if (!(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN)) + if (!ret && !(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN)) av_frame_remove_side_data(out, AV_FRAME_DATA_FILM_GRAIN_PARAMS); if (frame->flags & VVC_FRAME_FLAG_BUMPING) ff_vvc_unref_frame(fc, frame, VVC_FRAME_FLAG_OUTPUT | VVC_FRAME_FLAG_BUMPING); else ff_vvc_unref_frame(fc, frame, VVC_FRAME_FLAG_OUTPUT); + if (ret < 0) return ret;

1 0

[ffmpeg-fateserver] branch master updated. bdfef11 Properly list test errors when there are no failed tests
by ffmpeg-git＠ffmpeg.org 28 Jun '25

28 Jun '25

The branch, master has been updated via bdfef11e4826e703ec0638c8093dbd3cfcbec958 (commit) from fd02ae530d5fa5b71987a47125ff308633e98b76 (commit) - Log ----------------------------------------------------------------- commit bdfef11e4826e703ec0638c8093dbd3cfcbec958 Author: Martin Storsjö <martin(a)martin.st> AuthorDate: Fri May 16 11:07:16 2025 +0300 Commit: Martin Storsjö <martin(a)martin.st> CommitDate: Sat Jun 28 11:34:55 2025 +0300 Properly list test errors when there are no failed tests If there were failures while running tests, e.g. if failing to compile checkasm or any other of the test programs, there are no failed tests per se, and the number of succeessful tests is equal to the total number of tests. For these cases, check the job status code instead of declaring them as a full success. diff --git a/history.cgi b/history.cgi index e38672f..5e4f007 100755 --- a/history.cgi +++ b/history.cgi @@ -76,7 +76,7 @@ for my $date ((sort { $b cmp $a } @reps)[0..49]) { td $$rep{nwarn}; if ($npass) { $rtext = "$npass / $ntest"; - $rclass = $npass==$ntest? 'pass' : $npass? 'warn' : 'fail'; + $rclass = $$rep{status}==0? 'pass' : $npass? 'warn' : 'fail'; } elsif (!$ntest and !$$rep{status}) { $rtext = "build only"; $rclass = $$rep{status}? 'fail' : 'pass'; diff --git a/index.cgi b/index.cgi index c053d0e..e0d7da0 100755 --- a/index.cgi +++ b/index.cgi @@ -286,7 +286,7 @@ for my $rep (sort repcmp @reps) { td $$rep{comment}, class => 'comment'; if ($npass) { $rtext = "$npass / $ntest"; - $rclass = $npass==$ntest? 'pass' : $npass? 'warn' : 'fail'; + $rclass = $$rep{status}==0? 'pass' : $npass? 'warn' : 'fail'; } elsif (!$ntest and !$$rep{status}) { $rtext = "build only"; $rclass = $$rep{status}? 'fail' : 'pass'; diff --git a/report.cgi b/report.cgi index fb00fee..c9ffae5 100755 --- a/report.cgi +++ b/report.cgi @@ -183,7 +183,11 @@ if ($nfail) { } end 'tbody'; } elsif ($ntest) { - start 'tr', class => 'pass'; th 'All tests successful', colspan => 3; end; + if ($$hdr{status}) { + start 'tr', class => 'fail'; th 'Failure building tests', colspan => 3; end; + } else { + start 'tr', class => 'pass'; th 'All tests successful', colspan => 3; end; + } } else { my $class = $$hdr{status}? 'fail' : 'pass'; start 'tr', class => $class; th 'No tests were run', colspan => 3; end; ----------------------------------------------------------------------- Summary of changes: history.cgi | 2 +- index.cgi | 2 +- report.cgi | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive --

1 0

avformat/apvdec: add framerate option
by Dawid Kozinski 28 Jun '25

28 Jun '25

ffmpeg | branch: master | Dawid Kozinski <d.kozinski(a)samsung.com> | Thu Jun 26 08:36:43 2025 +0200| [6e8bd5dd2588f892cde308022a8a1e6ee82b9fa0] | committer: James Almer avformat/apvdec: add framerate option Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e8bd5dd2588f892c… --- libavformat/apvdec.c | 27 +++++++++++++++++++++++++-- libavformat/version.h | 2 +- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/libavformat/apvdec.c b/libavformat/apvdec.c index 1e5497bcd3..52adb17e41 100644 --- a/libavformat/apvdec.c +++ b/libavformat/apvdec.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/opt.h" + #include "libavcodec/apv.h" #include "libavcodec/bytestream.h" @@ -24,6 +26,10 @@ #include "demux.h" #include "internal.h" +typedef struct APVDemuxerContext { + const AVClass *class; /**< Class for private options. */ + AVRational framerate; /**< AVRational describing framerate, set by a private option. */ +} APVDemuxerContext; typedef struct APVHeaderInfo { uint8_t pbu_type; @@ -145,6 +151,7 @@ static int apv_probe(const AVProbeData *p) static int apv_read_header(AVFormatContext *s) { + APVDemuxerContext *apv = s->priv_data; AVStream *st; GetByteContext gbc; uint8_t buffer[12]; @@ -184,8 +191,8 @@ static int apv_read_header(AVFormatContext *s) st->codecpar->codec_id = AV_CODEC_ID_APV; ffstream(st)->need_parsing = AVSTREAM_PARSE_HEADERS; - st->avg_frame_rate = (AVRational){ 30, 1 }; - avpriv_set_pts_info(st, 64, 1, 30); + st->avg_frame_rate = apv->framerate; + avpriv_set_pts_info(st, 64, apv->framerate.den, apv->framerate.num); avio_seek(s->pb, -size, SEEK_CUR); @@ -221,11 +228,27 @@ static int apv_read_packet(AVFormatContext *s, AVPacket *pkt) return 0; } +#define OFFSET(x) offsetof(APVDemuxerContext, x) +#define DEC AV_OPT_FLAG_DECODING_PARAM +static const AVOption apv_options[] = { + { "framerate", "set frame rate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, { .str = "30" }, 0, INT_MAX, DEC }, + { NULL }, +}; + +static const AVClass apv_demuxer_class = { + .class_name = "apv demuxer", + .item_name = av_default_item_name, + .option = apv_options, + .version = LIBAVUTIL_VERSION_INT, +}; + const FFInputFormat ff_apv_demuxer = { .p.name = "apv", .p.long_name = NULL_IF_CONFIG_SMALL("APV raw bitstream"), .p.extensions = "apv", .p.flags = AVFMT_GENERIC_INDEX | AVFMT_NOTIMESTAMPS, + .p.priv_class = &apv_demuxer_class, + .priv_data_size = sizeof(APVDemuxerContext), .read_probe = apv_probe, .read_header = apv_read_header, .read_packet = apv_read_packet, diff --git a/libavformat/version.h b/libavformat/version.h index a7c80dc564..b32ddb3617 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ #include "version_major.h" #define LIBAVFORMAT_VERSION_MINOR 1 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \

1 0

avformat/demux: Fix segfault due to avcodec_open2 failure
by Pavel Koshevoy 28 Jun '25

28 Jun '25

ffmpeg | branch: master | Pavel Koshevoy <pkoshevoy(a)gmail.com> | Fri Jun 27 19:31:26 2025 -0600| [59a6660625675c8343f3de858b93c8294f05bb52] | committer: Pavel Koshevoy avformat/demux: Fix segfault due to avcodec_open2 failure Fixes 'ffprobe 1_poc.mp4' segfault introduced with commit 0021484d05f9b0f032fa319399de6e24eea0c04f codec_close should not assume that the codec_id did not change. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=59a6660625675c834… --- libavformat/demux.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index ecd4f40da9..3749ab67a3 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -1292,9 +1292,15 @@ static int codec_close(FFStream *sti) { AVCodecContext *avctx_new = NULL; AVCodecParameters *par_tmp = NULL; + const AVCodec *new_codec = NULL; int ret; - avctx_new = avcodec_alloc_context3(sti->avctx->codec); + new_codec = + (sti->avctx->codec_id != sti->pub.codecpar->codec_id) ? + avcodec_find_decoder(sti->pub.codecpar->codec_id) : + sti->avctx->codec; + + avctx_new = avcodec_alloc_context3(new_codec); if (!avctx_new) { ret = AVERROR(ENOMEM); goto fail;

1 0