[FFmpeg-cvslog] avfilter/buffersink: fix order of operation with = and <0
ffmpeg | branch: master | Michael Niedermayer | Thu
Nov 2 23:49:53 2023 +0100| [c0a18e884c2d24d1052147082c358cb6929e97f1] |
committer: Michael Niedermayer
avfilter/buffersink: fix order of operation with = and <0
Reviewed-by: Sean McGovern
Reviewed-by: Nicolas George
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0a18e884c2d24d1052147082c358cb6929e97f1
---
libavfilter/buffersink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index 9426ded7ee..ca2af1bc07 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -293,7 +293,7 @@ static int asink_query_formats(AVFilterContext *ctx)
cleanup_redundant_layouts(ctx);
for (i = 0; i < NB_ITEMS(buf->channel_layouts); i++)
if ((ret = av_channel_layout_from_mask(,
buf->channel_layouts[i])) < 0 ||
-(ret = ff_add_channel_layout(, ) < 0))
+(ret = ff_add_channel_layout(, )) < 0)
return ret;
for (i = 0; i < NB_ITEMS(buf->channel_counts); i++) {
layout = FF_COUNT2LAYOUT(buf->channel_counts[i]);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/flicvideo: consider width in copy loops
ffmpeg | branch: master | Michael Niedermayer | Fri
Nov 3 00:10:02 2023 +0100| [03a4aa9699c397f157394af3394fb065bd0a8166] |
committer: Michael Niedermayer
avcodec/flicvideo: consider width in copy loops
Fixes: out of array write
Fixes:
63520/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FLIC_fuzzer-4876198087622656
Regression since: c7f8d42c12582b0626ea38117df6c9aea9fcf5b1 (was not posted to
ffmpeg-devel)
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Sean McGovern
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03a4aa9699c397f157394af3394fb065bd0a8166
---
libavcodec/flicvideo.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index 6ce033ba40..43f3f83bf6 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -642,7 +642,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
"has incorrect size, skipping chunk\n", chunk_size - 6);
bytestream2_skip(, chunk_size - 6);
} else {
-for (y_ptr = 0; check_pixel_ptr(y_ptr, 0, pixel_limit,
direction) == 0;
+for (y_ptr = 0; check_pixel_ptr(y_ptr, s->avctx->width,
pixel_limit, direction) == 0;
y_ptr += s->frame->linesize[0]) {
bytestream2_get_buffer(, [y_ptr],
s->avctx->width);
@@ -949,7 +949,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
if (bytestream2_get_bytes_left() < 2 * s->avctx->width *
s->avctx->height )
return AVERROR_INVALIDDATA;
-for (y_ptr = 0; check_pixel_ptr(y_ptr, 0, pixel_limit,
direction) == 0;
+for (y_ptr = 0; check_pixel_ptr(y_ptr, 2*s->avctx->width,
pixel_limit, direction) == 0;
y_ptr += s->frame->linesize[0]) {
pixel_countdown = s->avctx->width;
@@ -1235,7 +1235,7 @@ static int flic_decode_frame_24BPP(AVCodecContext *avctx,
"bigger than image, skipping chunk\n", chunk_size - 6);
bytestream2_skip(, chunk_size - 6);
} else {
-for (y_ptr = 0; check_pixel_ptr(y_ptr, 0, pixel_limit,
direction) == 0;
+for (y_ptr = 0; check_pixel_ptr(y_ptr, 3*s->avctx->width,
pixel_limit, direction) == 0;
y_ptr += s->frame->linesize[0]) {
bytestream2_get_buffer(, pixels + y_ptr,
3*s->avctx->width);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/lafdec: Check for 0 parameters
ffmpeg | branch: master | Michael Niedermayer | Fri Nov 3 00:33:41 2023 +0100| [4fb9d946883ba8a3e21a9e756aa27349e6e22cef] | committer: Michael Niedermayer avformat/lafdec: Check for 0 parameters Fixes: Timeout Fixes: 63661/clusterfuzz-testcase-minimized-ffmpeg_dem_LAF_fuzzer-6615365234589696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Sean McGovern Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fb9d946883ba8a3e21a9e756aa27349e6e22cef --- libavformat/lafdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/lafdec.c b/libavformat/lafdec.c index 59a59dcfe9..b867f106ae 100644 --- a/libavformat/lafdec.c +++ b/libavformat/lafdec.c @@ -139,7 +139,9 @@ static int laf_read_header(AVFormatContext *ctx) s->index = 0; s->stored_index = 0; s->bpp = bpp; -if ((int64_t)bpp * st_count * (int64_t)sample_rate >= INT32_MAX) +if ((int64_t)bpp * st_count * (int64_t)sample_rate >= INT32_MAX || +(int64_t)bpp * st_count * (int64_t)sample_rate == 0 +) return AVERROR_INVALIDDATA; s->data = av_calloc(st_count * sample_rate, bpp); if (!s->data) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/framesync: fix order of operation with = and <0
ffmpeg | branch: master | Michael Niedermayer | Thu
Nov 2 23:49:53 2023 +0100| [9450a4a7fef5816ee893177c903f0232724c57c6] |
committer: Michael Niedermayer
avfilter/framesync: fix order of operation with = and <0
Reviewed-by: Sean McGovern
Reviewed-by: Nicolas George
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9450a4a7fef5816ee893177c903f0232724c57c6
---
libavfilter/framesync.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c
index c748262ba6..6cb4b21fed 100644
--- a/libavfilter/framesync.c
+++ b/libavfilter/framesync.c
@@ -288,7 +288,7 @@ int ff_framesync_get_frame(FFFrameSync *fs, unsigned in,
AVFrame **rframe,
if (need_copy) {
if (!(frame = av_frame_clone(frame)))
return AVERROR(ENOMEM);
-if ((ret = ff_inlink_make_frame_writable(fs->parent->inputs[in],
) < 0)) {
+if ((ret = ff_inlink_make_frame_writable(fs->parent->inputs[in],
)) < 0) {
av_frame_free();
return ret;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/mov: Check that is_still_picture_avif has no trak based streams
ffmpeg | branch: release/5.1 | Michael Niedermayer |
Sun Oct 15 01:52:20 2023 +0200| [1435f5028342de869c15c4c0630d44e4439c0479] |
committer: Michael Niedermayer
avformat/mov: Check that is_still_picture_avif has no trak based streams
Fixes: Assertion failure in mov_read_iloc( in mov_read_iloc())
Fixes:
62866/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5282997370486784
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer
(cherry picked from commit 98c2711b58ce65eae02cb2ece3a664e1119fd8fe)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1435f5028342de869c15c4c0630d44e4439c0479
---
libavformat/mov.c | 4
1 file changed, 4 insertions(+)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 0d2ca6b9f5..77108738a4 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4440,6 +4440,10 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
MOVStreamContext *sc;
int ret;
+if (c->is_still_picture_avif) {
+return AVERROR_INVALIDDATA;
+}
+
st = avformat_new_stream(c->fc, NULL);
if (!st) return AVERROR(ENOMEM);
st->id = -1;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] tools/target_dec_fuzzer: Adjust threshold for CSCD
ffmpeg | branch: release/5.1 | Michael Niedermayer |
Sat Oct 21 00:11:02 2023 +0200| [0f93f8ce2cec4d85ac0eb312c904aef17f5fdb02] |
committer: Michael Niedermayer
tools/target_dec_fuzzer: Adjust threshold for CSCD
Fixes: Timeout
Fixes:
63362/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CSCD_fuzzer-4694620065628160
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer
(cherry picked from commit c2f2bf82c1b3987e2d1a75cc79c4b58d286a2291)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f93f8ce2cec4d85ac0eb312c904aef17f5fdb02
---
tools/target_dec_fuzzer.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index dabb305ba0..475d29f603 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -218,6 +218,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t
size) {
case AV_CODEC_ID_CFHD:maxpixels /= 16384; break;
case AV_CODEC_ID_CINEPAK: maxpixels /= 128; break;
case AV_CODEC_ID_COOK:maxsamples /= 1<<20; break;
+case AV_CODEC_ID_CSCD:maxpixels /= 1024; break;
case AV_CODEC_ID_DFA: maxpixels /= 1024; break;
case AV_CODEC_ID_DIRAC: maxpixels /= 8192; break;
case AV_CODEC_ID_DSICINVIDEO: maxpixels /= 1024; break;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/buffersink: fix order of operation with = and <0
ffmpeg | branch: release/5.1 | Michael Niedermayer |
Thu Nov 2 23:49:53 2023 +0100| [e531abaf3c41953618573bef9a2568f7644626b6] |
committer: Michael Niedermayer
avfilter/buffersink: fix order of operation with = and <0
Reviewed-by: Sean McGovern
Reviewed-by: Nicolas George
Signed-off-by: Michael Niedermayer
(cherry picked from commit c0a18e884c2d24d1052147082c358cb6929e97f1)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e531abaf3c41953618573bef9a2568f7644626b6
---
libavfilter/buffersink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index e269cf72d1..5e38180f53 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -313,7 +313,7 @@ static int asink_query_formats(AVFilterContext *ctx)
cleanup_redundant_layouts(ctx);
for (i = 0; i < NB_ITEMS(buf->channel_layouts); i++)
if ((ret = av_channel_layout_from_mask(,
buf->channel_layouts[i])) < 0 ||
-(ret = ff_add_channel_layout(, ) < 0))
+(ret = ff_add_channel_layout(, )) < 0)
return ret;
for (i = 0; i < NB_ITEMS(buf->channel_counts); i++) {
layout = FF_COUNT2LAYOUT(buf->channel_counts[i]);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/dovi_rpu: Use 64 bit in get_us/se_coeff()
ffmpeg | branch: release/5.1 | Michael Niedermayer | Fri Oct 20 23:50:07 2023 +0200| [26a4846b28e4d81610b3c831f4317cbc0b422078] | committer: Michael Niedermayer avcodec/dovi_rpu: Use 64 bit in get_us/se_coeff() Fixes: shift exponent 32 is too large for 32-bit type 'int' Fixes: 63151/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5067531154751488 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer (cherry picked from commit 2817efbba331ac1d3a39fbee78b480008ce20a93) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=26a4846b28e4d81610b3c831f4317cbc0b422078 --- libavcodec/dovi_rpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c index dd38936552..107d1ab441 100644 --- a/libavcodec/dovi_rpu.c +++ b/libavcodec/dovi_rpu.c @@ -157,7 +157,7 @@ static inline uint64_t get_ue_coef(GetBitContext *gb, const AVDOVIRpuDataHeader case RPU_COEFF_FLOAT: fpart.u32 = get_bits_long(gb, 32); -return fpart.f32 * (1 << hdr->coef_log2_denom); +return fpart.f32 * (1LL << hdr->coef_log2_denom); } return 0; /* unreachable */ @@ -176,7 +176,7 @@ static inline int64_t get_se_coef(GetBitContext *gb, const AVDOVIRpuDataHeader * case RPU_COEFF_FLOAT: fpart.u32 = get_bits_long(gb, 32); -return fpart.f32 * (1 << hdr->coef_log2_denom); +return fpart.f32 * (1LL << hdr->coef_log2_denom); } return 0; /* unreachable */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_format: Deduplicate inputs
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 09:10:09 2023 +0100| [8661b5e8f9e63d2775978f2aa3ee6fae4d515c53] |
committer: Andreas Rheinhardt
avfilter/vf_format: Deduplicate inputs
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8661b5e8f9e63d2775978f2aa3ee6fae4d515c53
---
libavfilter/vf_format.c | 18 --
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c
index 04c265f59f..1189bd61c2 100644
--- a/libavfilter/vf_format.c
+++ b/libavfilter/vf_format.c
@@ -144,9 +144,7 @@ static const AVOption options[] = {
AVFILTER_DEFINE_CLASS_EXT(format, "(no)format", options);
-#if CONFIG_FORMAT_FILTER
-
-static const AVFilterPad avfilter_vf_format_inputs[] = {
+static const AVFilterPad inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
@@ -154,6 +152,7 @@ static const AVFilterPad avfilter_vf_format_inputs[] = {
},
};
+#if CONFIG_FORMAT_FILTER
const AVFilter ff_vf_format = {
.name = "format",
.description = NULL_IF_CONFIG_SMALL("Convert the input video to one of
the specified pixel formats."),
@@ -166,7 +165,7 @@ const AVFilter ff_vf_format = {
.flags = AVFILTER_FLAG_METADATA_ONLY,
-FILTER_INPUTS(avfilter_vf_format_inputs),
+FILTER_INPUTS(inputs),
FILTER_OUTPUTS(ff_video_default_filterpad),
FILTER_QUERY_FUNC(query_formats),
@@ -174,15 +173,6 @@ const AVFilter ff_vf_format = {
#endif /* CONFIG_FORMAT_FILTER */
#if CONFIG_NOFORMAT_FILTER
-
-static const AVFilterPad avfilter_vf_noformat_inputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.get_buffer.video = ff_null_get_video_buffer,
-},
-};
-
const AVFilter ff_vf_noformat = {
.name = "noformat",
.description = NULL_IF_CONFIG_SMALL("Force libavfilter not to use any of
the specified pixel formats for the input to the next filter."),
@@ -195,7 +185,7 @@ const AVFilter ff_vf_noformat = {
.flags = AVFILTER_FLAG_METADATA_ONLY,
-FILTER_INPUTS(avfilter_vf_noformat_inputs),
+FILTER_INPUTS(inputs),
FILTER_OUTPUTS(ff_video_default_filterpad),
FILTER_QUERY_FUNC(query_formats),
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_xmedian: Deduplicate outputs
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 09:05:32 2023 +0100| [748c168f8eabc1800c6096d521a3a32954b7b50f] |
committer: Andreas Rheinhardt
avfilter/vf_xmedian: Deduplicate outputs
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=748c168f8eabc1800c6096d521a3a32954b7b50f
---
libavfilter/vf_xmedian.c | 26 +-
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/libavfilter/vf_xmedian.c b/libavfilter/vf_xmedian.c
index 0a02ca065e..ebcbea97ed 100644
--- a/libavfilter/vf_xmedian.c
+++ b/libavfilter/vf_xmedian.c
@@ -327,6 +327,14 @@ static int activate(AVFilterContext *ctx)
return ff_framesync_activate(>fs);
}
+static const AVFilterPad outputs[] = {
+{
+.name = "default",
+.type = AVMEDIA_TYPE_VIDEO,
+.config_props = config_output,
+},
+};
+
#if CONFIG_XMEDIAN_FILTER
static av_cold int xmedian_init(AVFilterContext *ctx)
{
@@ -363,14 +371,6 @@ static const AVOption xmedian_options[] = {
{ NULL },
};
-static const AVFilterPad outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_output,
-},
-};
-
FRAMESYNC_DEFINE_CLASS(xmedian, XMedianContext, fs);
const AVFilter ff_vf_xmedian = {
@@ -448,14 +448,6 @@ static const AVFilterPad tmedian_inputs[] = {
},
};
-static const AVFilterPad tmedian_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_output,
-},
-};
-
AVFILTER_DEFINE_CLASS(tmedian);
const AVFilter ff_vf_tmedian = {
@@ -464,7 +456,7 @@ const AVFilter ff_vf_tmedian = {
.priv_size = sizeof(XMedianContext),
.priv_class= _class,
FILTER_INPUTS(tmedian_inputs),
-FILTER_OUTPUTS(tmedian_outputs),
+FILTER_OUTPUTS(outputs),
FILTER_PIXFMTS_ARRAY(pixel_fmts),
.init = init,
.uninit= uninit,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_convolve: Deduplicate outputs
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 08:50:13 2023 +0100| [50d3c5bd8ca5a1181c1a57dbb8006c9aa87d3c4d] |
committer: Andreas Rheinhardt
avfilter/vf_convolve: Deduplicate outputs
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50d3c5bd8ca5a1181c1a57dbb8006c9aa87d3c4d
---
libavfilter/vf_convolve.c | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/libavfilter/vf_convolve.c b/libavfilter/vf_convolve.c
index 324686..25dc92e988 100644
--- a/libavfilter/vf_convolve.c
+++ b/libavfilter/vf_convolve.c
@@ -955,13 +955,7 @@ static const AVFilterPad xcorrelate_inputs[] = {
},
};
-static const AVFilterPad xcorrelate_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_output,
-},
-};
+#define xcorrelate_outputs convolve_outputs
const AVFilter ff_vf_xcorrelate = {
.name = "xcorrelate",
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_hsvkey: Deduplicate inputs and outputs
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 08:52:42 2023 +0100| [93abb9b560e8398191383fb439810f775348e32c] |
committer: Andreas Rheinhardt
avfilter/vf_hsvkey: Deduplicate inputs and outputs
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93abb9b560e8398191383fb439810f775348e32c
---
libavfilter/vf_hsvkey.c | 30 ++
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/libavfilter/vf_hsvkey.c b/libavfilter/vf_hsvkey.c
index 542ac1f3b2..0bd8cace37 100644
--- a/libavfilter/vf_hsvkey.c
+++ b/libavfilter/vf_hsvkey.c
@@ -265,7 +265,7 @@ static const enum AVPixelFormat key_pixel_fmts[] = {
AV_PIX_FMT_NONE
};
-static const AVFilterPad hsvkey_inputs[] = {
+static const AVFilterPad inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
@@ -275,7 +275,7 @@ static const AVFilterPad hsvkey_inputs[] = {
},
};
-static const AVFilterPad hsvkey_outputs[] = {
+static const AVFilterPad outputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
@@ -302,8 +302,8 @@ const AVFilter ff_vf_hsvkey = {
.description = NULL_IF_CONFIG_SMALL("Turns a certain HSV range into
transparency. Operates on YUV colors."),
.priv_size = sizeof(HSVKeyContext),
.priv_class= _class,
-FILTER_INPUTS(hsvkey_inputs),
-FILTER_OUTPUTS(hsvkey_outputs),
+FILTER_INPUTS(inputs),
+FILTER_OUTPUTS(outputs),
FILTER_PIXFMTS_ARRAY(key_pixel_fmts),
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC |
AVFILTER_FLAG_SLICE_THREADS,
.process_command = ff_filter_process_command,
@@ -337,24 +337,6 @@ static const AVOption hsvhold_options[] = {
{ NULL }
};
-static const AVFilterPad hsvhold_inputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.flags = AVFILTERPAD_FLAG_NEEDS_WRITABLE,
-.filter_frame = filter_frame,
-.config_props = config_input,
-},
-};
-
-static const AVFilterPad hsvhold_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_output,
-},
-};
-
AVFILTER_DEFINE_CLASS(hsvhold);
const AVFilter ff_vf_hsvhold = {
@@ -362,8 +344,8 @@ const AVFilter ff_vf_hsvhold = {
.description = NULL_IF_CONFIG_SMALL("Turns a certain HSV range into
gray."),
.priv_size = sizeof(HSVKeyContext),
.priv_class= _class,
-FILTER_INPUTS(hsvhold_inputs),
-FILTER_OUTPUTS(hsvhold_outputs),
+FILTER_INPUTS(inputs),
+FILTER_OUTPUTS(outputs),
FILTER_PIXFMTS_ARRAY(hold_pixel_fmts),
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC |
AVFILTER_FLAG_SLICE_THREADS,
.process_command = ff_filter_process_command,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vsrc_testsrc: Deduplicate outputs
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 09:06:14 2023 +0100| [c32c1a18b9bbc342521853aca320e08d1c871fb3] |
committer: Andreas Rheinhardt
avfilter/vsrc_testsrc: Deduplicate outputs
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c32c1a18b9bbc342521853aca320e08d1c871fb3
---
libavfilter/vsrc_testsrc.c | 64 --
1 file changed, 16 insertions(+), 48 deletions(-)
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index 9081b55f1c..da17e950d8 100644
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -160,6 +160,14 @@ static int config_props(AVFilterLink *outlink)
return 0;
}
+static const AVFilterPad outputs[] = {
+{
+.name = "default",
+.type = AVMEDIA_TYPE_VIDEO,
+.config_props = config_props,
+},
+};
+
static int activate(AVFilterContext *ctx)
{
AVFilterLink *outlink = ctx->outputs[0];
@@ -465,14 +473,6 @@ static av_cold int nullsrc_init(AVFilterContext *ctx)
return init(ctx);
}
-static const AVFilterPad nullsrc_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_props,
-},
-};
-
const AVFilter ff_vsrc_nullsrc = {
.name= "nullsrc",
.description = NULL_IF_CONFIG_SMALL("Null video source, return unprocessed
video frames."),
@@ -482,7 +482,7 @@ const AVFilter ff_vsrc_nullsrc = {
.activate= activate,
.priv_size = sizeof(TestSourceContext),
.inputs = NULL,
-FILTER_OUTPUTS(nullsrc_outputs),
+FILTER_OUTPUTS(outputs),
};
#endif /* CONFIG_NULLSRC_FILTER */
@@ -688,14 +688,6 @@ static av_cold int test_init(AVFilterContext *ctx)
return init(ctx);
}
-static const AVFilterPad avfilter_vsrc_testsrc_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_props,
-},
-};
-
const AVFilter ff_vsrc_testsrc = {
.name = "testsrc",
.description = NULL_IF_CONFIG_SMALL("Generate test pattern."),
@@ -705,7 +697,7 @@ const AVFilter ff_vsrc_testsrc = {
.uninit= uninit,
.activate = activate,
.inputs= NULL,
-FILTER_OUTPUTS(avfilter_vsrc_testsrc_outputs),
+FILTER_OUTPUTS(outputs),
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_RGB24),
};
@@ -1424,14 +1416,6 @@ static const enum AVPixelFormat smptebars_pix_fmts[] = {
AV_PIX_FMT_NONE,
};
-static const AVFilterPad smptebars_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_props,
-},
-};
-
AVFILTER_DEFINE_CLASS_EXT(palbars, "pal(75|100)bars", options);
#if CONFIG_PAL75BARS_FILTER
@@ -1474,7 +1458,7 @@ const AVFilter ff_vsrc_pal75bars = {
.uninit= uninit,
.activate = activate,
.inputs= NULL,
-FILTER_OUTPUTS(smptebars_outputs),
+FILTER_OUTPUTS(outputs),
FILTER_PIXFMTS_ARRAY(smptebars_pix_fmts),
};
@@ -1518,7 +1502,7 @@ const AVFilter ff_vsrc_pal100bars = {
.uninit= uninit,
.activate = activate,
.inputs= NULL,
-FILTER_OUTPUTS(smptebars_outputs),
+FILTER_OUTPUTS(outputs),
FILTER_PIXFMTS_ARRAY(smptebars_pix_fmts),
};
@@ -1585,7 +1569,7 @@ const AVFilter ff_vsrc_smptebars = {
.uninit= uninit,
.activate = activate,
.inputs= NULL,
-FILTER_OUTPUTS(smptebars_outputs),
+FILTER_OUTPUTS(outputs),
FILTER_PIXFMTS_ARRAY(smptebars_pix_fmts),
};
@@ -1688,7 +1672,7 @@ const AVFilter ff_vsrc_smptehdbars = {
.uninit= uninit,
.activate = activate,
.inputs= NULL,
-FILTER_OUTPUTS(smptebars_outputs),
+FILTER_OUTPUTS(outputs),
FILTER_PIXFMTS_ARRAY(smptebars_pix_fmts),
};
@@ -1735,14 +1719,6 @@ static av_cold int allyuv_init(AVFilterContext *ctx)
return init(ctx);
}
-static const AVFilterPad avfilter_vsrc_allyuv_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_props,
-},
-};
-
const AVFilter ff_vsrc_allyuv = {
.name = "allyuv",
.description = NULL_IF_CONFIG_SMALL("Generate all yuv colors."),
@@ -1752,7 +1728,7 @@ const AVFilter ff_vsrc_allyuv = {
.uninit= uninit,
.activate = activate,
.inputs= NULL,
-FILTER_OUTPUTS(avfilter_vsrc_allyuv_outputs),
+FILTER_OUTPUTS(outputs),
FILTER_PIXFMTS(AV_PIX_FMT_YUV444P, AV_PIX_FMT_GBRP),
};
@@ -1885,14 +1861,6 @@ static av_cold int colorspectrum_init(AVFilterContext
*ctx)
return init(ctx);
}
-static const AVFilterPad avfilter_vsrc_colorspectrum_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props =
[FFmpeg-cvslog] avfilter/vf_deshake: Remove unnecessary emms_c
ffmpeg | branch: master | Andreas Rheinhardt | Wed Nov 1 10:12:26 2023 +0100| [2fdaeec41bef822df6a0c6294878a723300035b6] | committer: Andreas Rheinhardt avfilter/vf_deshake: Remove unnecessary emms_c Redundant since ea043cc53ed3506775ec6239ed5f8a20718b1098 (which made 16x16 no longer use MMX). Signed-off-by: Andreas Rheinhardt > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2fdaeec41bef822df6a0c6294878a723300035b6 --- libavfilter/vf_deshake.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index d44dd71eb0..cb062dd11f 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -53,7 +53,6 @@ #include "internal.h" #include "video.h" #include "libavutil/common.h" -#include "libavutil/emms.h" #include "libavutil/file_open.h" #include "libavutil/mem.h" #include "libavutil/opt.h" @@ -178,7 +177,6 @@ static void find_block_motion(DeshakeContext *deshake, uint8_t *src1, mv->x = -1; mv->y = -1; } -emms_c(); //av_log(NULL, AV_LOG_ERROR, "%d\n", smallest); //av_log(NULL, AV_LOG_ERROR, "Final: (%d, %d) = %d x %d\n", cx, cy, mv->x, mv->y); } ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/deshake: Merge header into its only user
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 10:25:03 2023 +0100| [de4846dd184bd5a7a66d8fec2e81922188906b17] |
committer: Andreas Rheinhardt
avfilter/deshake: Merge header into its only user
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de4846dd184bd5a7a66d8fec2e81922188906b17
---
libavfilter/deshake.h| 83
libavfilter/vf_deshake.c | 55 +++-
2 files changed, 54 insertions(+), 84 deletions(-)
diff --git a/libavfilter/deshake.h b/libavfilter/deshake.h
deleted file mode 100644
index 406cbab2f6..00
--- a/libavfilter/deshake.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2013 Wei Gao
- * Copyright (C) 2013 Lenny Wang
- *
- * 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 AVFILTER_DESHAKE_H
-#define AVFILTER_DESHAKE_H
-
-#include "config.h"
-#include "avfilter.h"
-#include "transform.h"
-#include "libavutil/pixelutils.h"
-
-
-enum SearchMethod {
-EXHAUSTIVE,///< Search all possible positions
-SMART_EXHAUSTIVE, ///< Search most possible positions (faster)
-SEARCH_COUNT
-};
-
-typedef struct IntMotionVector {
-int x; ///< Horizontal shift
-int y; ///< Vertical shift
-} IntMotionVector;
-
-typedef struct MotionVector {
-double x; ///< Horizontal shift
-double y; ///< Vertical shift
-} MotionVector;
-
-typedef struct Transform {
-MotionVector vec; ///< Motion vector
-double angle; ///< Angle of rotation
-double zoom; ///< Zoom percentage
-} Transform;
-
-#define MAX_R 64
-
-typedef struct DeshakeContext {
-const AVClass *class;
-int counts[2*MAX_R+1][2*MAX_R+1]; /// < Scratch buffer for motion search
-double *angles;///< Scratch buffer for block angles
-unsigned angles_size;
-AVFrame *ref; ///< Previous frame
-int rx;///< Maximum horizontal shift
-int ry;///< Maximum vertical shift
-int edge; ///< Edge fill method
-int blocksize; ///< Size of blocks to compare
-int contrast; ///< Contrast threshold
-int search;///< Motion search method
-av_pixelutils_sad_fn sad; ///< Sum of the absolute difference function
-Transform last;///< Transform from last frame
-int refcount; ///< Number of reference frames (defines
averaging window)
-FILE *fp;
-Transform avg;
-int cw;///< Crop motion search to this box
-int ch;
-int cx;
-int cy;
-char *filename;///< Motion search detailed log filename
-int opencl;
-int (* transform)(AVFilterContext *ctx, int width, int height, int cw, int
ch,
- const float *matrix_y, const float *matrix_uv, enum
InterpolateMethod interpolate,
- enum FillMethod fill, AVFrame *in, AVFrame *out);
-} DeshakeContext;
-
-#endif /* AVFILTER_DESHAKE_H */
diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c
index cb062dd11f..299814fd65 100644
--- a/libavfilter/vf_deshake.c
+++ b/libavfilter/vf_deshake.c
@@ -51,15 +51,68 @@
#include "avfilter.h"
#include "internal.h"
+#include "transform.h"
#include "video.h"
#include "libavutil/common.h"
#include "libavutil/file_open.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
+#include "libavutil/pixelutils.h"
#include "libavutil/qsort.h"
-#include "deshake.h"
+
+enum SearchMethod {
+EXHAUSTIVE,///< Search all possible positions
+SMART_EXHAUSTIVE, ///< Search most possible positions (faster)
+SEARCH_COUNT
+};
+
+typedef struct IntMotionVector {
+int x; ///< Horizontal shift
+int y; ///< Vertical shift
+} IntMotionVector;
+
+typedef struct MotionVector {
+double x; ///< Horizontal shift
+double y; ///< Vertical shift
+} MotionVector;
+
+typedef struct Transform {
+MotionVector vec; ///< Motion vector
+double angle; ///< Angle of rotation
+double zoom; ///< Zoom percentage
+}
[FFmpeg-cvslog] avutil/x86/pixelutils: Empty MMX state in ff_pixelutils_sad_8x8_mmxext
ffmpeg | branch: master | Andreas Rheinhardt | Wed Nov 1 10:01:09 2023 +0100| [5b85ca5317f28a73eadf10d604d2a7421b84bed8] | committer: Andreas Rheinhardt avutil/x86/pixelutils: Empty MMX state in ff_pixelutils_sad_8x8_mmxext We currently mostly do not empty the MMX state in our MMX DSP functions; instead we only do so before code that might be using x87 code. This is a violation of the System V i386 ABI (and maybe of other ABIs, too): "The CPU shall be in x87 mode upon entry to a function. Therefore, every function that uses the MMX registers is required to issue an emms or femms instruction after using MMX registers, before returning or calling another function." (See 2.2.1 in [1]) This patch does not intend to change all these functions to abide by the ABI; it only does so for ff_pixelutils_sad_8x8_mmxext, as this function can by called by external users, because it is exported via the pixelutils API. Without this, the following fragment will assert (on x86/x64): uint8_t src1[8 * 8], src2[8 * 8]; av_pixelutils_sad_fn fn = av_pixelutils_get_sad_fn(3, 3, 0, NULL); fn(src1, 8, src2, 8); av_assert0_fpu(); [1]: https://raw.githubusercontent.com/wiki/hjl-tools/x86-psABI/intel386-psABI-1.1.pdf Signed-off-by: Andreas Rheinhardt > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b85ca5317f28a73eadf10d604d2a7421b84bed8 --- libavutil/x86/pixelutils.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/libavutil/x86/pixelutils.asm b/libavutil/x86/pixelutils.asm index fbe9b45971..0bcccb51f5 100644 --- a/libavutil/x86/pixelutils.asm +++ b/libavutil/x86/pixelutils.asm @@ -43,6 +43,7 @@ cglobal pixelutils_sad_8x8, 4,4,0, src1, stride1, src2, stride2 lea src2q, [src2q + 2*stride2q] %endrep movdeax, m2 +emms RET ;--- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_mpdecimate: Remove emms_c
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 10:09:51 2023 +0100| [392ab35db1300141220e2e772e2f785c5bae8784] |
committer: Andreas Rheinhardt
avfilter/vf_mpdecimate: Remove emms_c
Unnecessary now that the pixelutils API abides by the ABI.
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=392ab35db1300141220e2e772e2f785c5bae8784
---
libavfilter/vf_mpdecimate.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/libavfilter/vf_mpdecimate.c b/libavfilter/vf_mpdecimate.c
index baba1f183f..dab8941e46 100644
--- a/libavfilter/vf_mpdecimate.c
+++ b/libavfilter/vf_mpdecimate.c
@@ -24,7 +24,6 @@
* Rich Felker.
*/
-#include "libavutil/emms.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "libavutil/pixelutils.h"
@@ -142,13 +141,10 @@ static int decimate_frame(AVFilterContext *ctx,
cur->data[plane], cur->linesize[plane],
ref->data[plane], ref->linesize[plane],
AV_CEIL_RSHIFT(ref->width, hsub),
-AV_CEIL_RSHIFT(ref->height, vsub))) {
-emms_c();
+AV_CEIL_RSHIFT(ref->height, vsub)))
return 0;
-}
}
-emms_c();
return 1;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/cbs_h2645: Fix leak of SPS VUI extension data
ffmpeg | branch: master | Andreas Rheinhardt |
Mon Oct 23 17:16:22 2023 +0200| [3f890fbfd9014843c51408c8f7ab3ba4aef7d354] |
committer: Andreas Rheinhardt
avcodec/cbs_h2645: Fix leak of SPS VUI extension data
Fixes: VUI extension leak
Fixes:
63004/clusterfuzz-testcase-minimized-ffmpeg_BSF_VVC_METADATA_fuzzer-4928832253329408
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f890fbfd9014843c51408c8f7ab3ba4aef7d354
---
libavcodec/cbs_h2645.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index 470f60b95f..c48a06b241 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -1989,7 +1989,17 @@ static const CodedBitstreamUnitTypeDescriptor
cbs_h266_unit_types[] = {
CBS_UNIT_TYPE_INTERNAL_REF(VVC_DCI_NUT, H266RawDCI, extension_data.data),
CBS_UNIT_TYPE_INTERNAL_REF(VVC_OPI_NUT, H266RawOPI, extension_data.data),
CBS_UNIT_TYPE_INTERNAL_REF(VVC_VPS_NUT, H266RawVPS, extension_data.data),
-CBS_UNIT_TYPE_INTERNAL_REF(VVC_SPS_NUT, H266RawSPS, extension_data.data),
+{
+.nb_unit_types = 1,
+.unit_type.list[0] = VVC_SPS_NUT,
+.content_type = CBS_CONTENT_TYPE_INTERNAL_REFS,
+.content_size = sizeof(H266RawSPS),
+.type.ref = {
+.nb_offsets = 2,
+.offsets= { offsetof(H266RawSPS, extension_data.data),
+offsetof(H266RawSPS, vui.extension_data.data) }
+},
+},
CBS_UNIT_TYPE_INTERNAL_REF(VVC_PPS_NUT, H266RawPPS, extension_data.data),
CBS_UNIT_TYPE_INTERNAL_REF(VVC_PREFIX_APS_NUT, H266RawAPS,
extension_data.data),
CBS_UNIT_TYPE_INTERNAL_REF(VVC_SUFFIX_APS_NUT, H266RawAPS,
extension_data.data),
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_aspect: Deduplicate inputs
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 08:39:58 2023 +0100| [1d33a310df4efe717dee4cc1eede7adcfc2547d1] |
committer: Andreas Rheinhardt
avfilter/vf_aspect: Deduplicate inputs
Also avoid using the avfilter-prefix for static objects.
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d33a310df4efe717dee4cc1eede7adcfc2547d1
---
libavfilter/vf_aspect.c | 28 ++--
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c
index b453de70c5..129ae19d6d 100644
--- a/libavfilter/vf_aspect.c
+++ b/libavfilter/vf_aspect.c
@@ -127,6 +127,14 @@ static int get_aspect_ratio(AVFilterLink *inlink,
AVRational *aspect_ratio)
return 0;
}
+static const AVFilterPad aspect_inputs[] = {
+{
+.name = "default",
+.type = AVMEDIA_TYPE_VIDEO,
+.filter_frame = filter_frame,
+},
+};
+
#if CONFIG_SETDAR_FILTER
static int setdar_config_props(AVFilterLink *outlink)
@@ -171,14 +179,6 @@ static const AVOption setdar_options[] = {
AVFILTER_DEFINE_CLASS(setdar);
-static const AVFilterPad avfilter_vf_setdar_inputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.filter_frame = filter_frame,
-},
-};
-
static const AVFilterPad avfilter_vf_setdar_outputs[] = {
{
.name = "default",
@@ -193,7 +193,7 @@ const AVFilter ff_vf_setdar = {
.priv_size = sizeof(AspectContext),
.priv_class = _class,
.flags = AVFILTER_FLAG_METADATA_ONLY,
-FILTER_INPUTS(avfilter_vf_setdar_inputs),
+FILTER_INPUTS(aspect_inputs),
FILTER_OUTPUTS(avfilter_vf_setdar_outputs),
};
@@ -234,14 +234,6 @@ static const AVOption setsar_options[] = {
AVFILTER_DEFINE_CLASS(setsar);
-static const AVFilterPad avfilter_vf_setsar_inputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.filter_frame = filter_frame,
-},
-};
-
static const AVFilterPad avfilter_vf_setsar_outputs[] = {
{
.name = "default",
@@ -256,7 +248,7 @@ const AVFilter ff_vf_setsar = {
.priv_size = sizeof(AspectContext),
.priv_class = _class,
.flags = AVFILTER_FLAG_METADATA_ONLY,
-FILTER_INPUTS(avfilter_vf_setsar_inputs),
+FILTER_INPUTS(aspect_inputs),
FILTER_OUTPUTS(avfilter_vf_setsar_outputs),
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/aactab: Deduplicate swb_offset_960 tabs
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 00:55:49 2023 +0100| [5935423e1e8bf02362590ee5843f0a869872af9e] |
committer: Andreas Rheinhardt
avcodec/aactab: Deduplicate swb_offset_960 tabs
swb_offset_960_48 and swb_offset_960_32 coincide.
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5935423e1e8bf02362590ee5843f0a869872af9e
---
libavcodec/aactab.c | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c
index d20ac56a3f..63a478f33f 100644
--- a/libavcodec/aactab.c
+++ b/libavcodec/aactab.c
@@ -1331,14 +1331,7 @@ static const uint16_t swb_offset_960_48[] =
672, 704, 736, 768, 800, 832, 864, 896, 928, 960
};
-static const uint16_t swb_offset_960_32[] =
-{
-0, 4, 8, 12, 16, 20, 24, 28, 32, 36,
-40, 48, 56, 64, 72, 80, 88, 96, 108, 120,
-132, 144, 160, 176, 196, 216, 240, 264, 292, 320,
-352, 384, 416, 448, 480, 512, 544, 576, 608, 640,
-672, 704, 736, 768, 800, 832, 864, 896, 928, 960
-};
+#define swb_offset_960_32 swb_offset_960_48
static const uint16_t swb_offset_960_24[] =
{
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/f_drawgraph: Deduplicate outputs
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 08:33:26 2023 +0100| [a02670ded71ef718799799d9f92b65c02852bd40] |
committer: Andreas Rheinhardt
avfilter/f_drawgraph: Deduplicate outputs
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a02670ded71ef718799799d9f92b65c02852bd40
---
libavfilter/f_drawgraph.c | 25 -
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c
index d29a7fb60a..d53598ee15 100644
--- a/libavfilter/f_drawgraph.c
+++ b/libavfilter/f_drawgraph.c
@@ -454,22 +454,22 @@ static av_cold void uninit(AVFilterContext *ctx)
av_freep(>values[3]);
}
-#if CONFIG_DRAWGRAPH_FILTER
-
-static const AVFilterPad drawgraph_inputs[] = {
+static const AVFilterPad drawgraph_outputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
-.filter_frame = filter_frame,
+.config_props = config_output,
+.request_frame = request_frame,
},
};
-static const AVFilterPad drawgraph_outputs[] = {
+#if CONFIG_DRAWGRAPH_FILTER
+
+static const AVFilterPad drawgraph_inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_output,
-.request_frame = request_frame,
+.filter_frame = filter_frame,
},
};
@@ -497,15 +497,6 @@ static const AVFilterPad adrawgraph_inputs[] = {
},
};
-static const AVFilterPad adrawgraph_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_output,
-.request_frame = request_frame,
-},
-};
-
const AVFilter ff_avf_adrawgraph = {
.name = "adrawgraph",
.description = NULL_IF_CONFIG_SMALL("Draw a graph using input audio
metadata."),
@@ -514,7 +505,7 @@ const AVFilter ff_avf_adrawgraph = {
.init = init,
.uninit= uninit,
FILTER_INPUTS(adrawgraph_inputs),
-FILTER_OUTPUTS(adrawgraph_outputs),
+FILTER_OUTPUTS(drawgraph_outputs),
FILTER_QUERY_FUNC(query_formats),
};
#endif // CONFIG_ADRAWGRAPH_FILTER
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_blend: Deduplicate outputs
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 08:42:47 2023 +0100| [2e2c28119ff179f9acd33b9b226f17ba625aa0af] |
committer: Andreas Rheinhardt
avfilter/vf_blend: Deduplicate outputs
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e2c28119ff179f9acd33b9b226f17ba625aa0af
---
libavfilter/vf_blend.c | 26 +-
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c
index 7100d9f372..ecabb78e61 100644
--- a/libavfilter/vf_blend.c
+++ b/libavfilter/vf_blend.c
@@ -378,6 +378,14 @@ static int process_command(AVFilterContext *ctx, const
char *cmd, const char *ar
return config_params(ctx);
}
+static const AVFilterPad blend_outputs[] = {
+{
+.name = "default",
+.type = AVMEDIA_TYPE_VIDEO,
+.config_props = config_output,
+},
+};
+
#if CONFIG_BLEND_FILTER
static int activate(AVFilterContext *ctx)
@@ -396,14 +404,6 @@ static const AVFilterPad blend_inputs[] = {
},
};
-static const AVFilterPad blend_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_output,
-},
-};
-
const AVFilter ff_vf_blend = {
.name = "blend",
.description = NULL_IF_CONFIG_SMALL("Blend two video frames into each
other."),
@@ -455,14 +455,6 @@ static const AVFilterPad tblend_inputs[] = {
},
};
-static const AVFilterPad tblend_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_output,
-},
-};
-
const AVFilter ff_vf_tblend = {
.name = "tblend",
.description = NULL_IF_CONFIG_SMALL("Blend successive frames."),
@@ -471,7 +463,7 @@ const AVFilter ff_vf_tblend = {
.init = init,
.uninit= uninit,
FILTER_INPUTS(tblend_inputs),
-FILTER_OUTPUTS(tblend_outputs),
+FILTER_OUTPUTS(blend_outputs),
FILTER_PIXFMTS_ARRAY(pix_fmts),
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL |
AVFILTER_FLAG_SLICE_THREADS,
.process_command = process_command,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/vf_chromakey: Deduplicate inputs and outputs
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 08:46:38 2023 +0100| [e557d89ac109e4c6353481803f2feeb3313fc6ce] |
committer: Andreas Rheinhardt
avfilter/vf_chromakey: Deduplicate inputs and outputs
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e557d89ac109e4c6353481803f2feeb3313fc6ce
---
libavfilter/vf_chromakey.c | 30 ++
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/libavfilter/vf_chromakey.c b/libavfilter/vf_chromakey.c
index c204a58328..9c0918bb4d 100644
--- a/libavfilter/vf_chromakey.c
+++ b/libavfilter/vf_chromakey.c
@@ -323,7 +323,7 @@ static int process_command(AVFilterContext *ctx, const char
*cmd, const char *ar
return config_output(ctx->outputs[0]);
}
-static const AVFilterPad chromakey_inputs[] = {
+static const AVFilterPad inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
@@ -333,7 +333,7 @@ static const AVFilterPad chromakey_inputs[] = {
},
};
-static const AVFilterPad chromakey_outputs[] = {
+static const AVFilterPad outputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
@@ -370,8 +370,8 @@ const AVFilter ff_vf_chromakey = {
.description = NULL_IF_CONFIG_SMALL("Turns a certain color into
transparency. Operates on YUV colors."),
.priv_size = sizeof(ChromakeyContext),
.priv_class= _class,
-FILTER_INPUTS(chromakey_inputs),
-FILTER_OUTPUTS(chromakey_outputs),
+FILTER_INPUTS(inputs),
+FILTER_OUTPUTS(outputs),
FILTER_PIXFMTS_ARRAY(chromakey_fmts),
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC |
AVFILTER_FLAG_SLICE_THREADS,
.process_command = process_command,
@@ -385,24 +385,6 @@ static const AVOption chromahold_options[] = {
{ NULL }
};
-static const AVFilterPad chromahold_inputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.flags = AVFILTERPAD_FLAG_NEEDS_WRITABLE,
-.filter_frame = filter_frame,
-.config_props = config_input,
-},
-};
-
-static const AVFilterPad chromahold_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_output,
-},
-};
-
static const enum AVPixelFormat hold_pixel_fmts[] = {
AV_PIX_FMT_YUV420P,
AV_PIX_FMT_YUV422P,
@@ -429,8 +411,8 @@ const AVFilter ff_vf_chromahold = {
.description = NULL_IF_CONFIG_SMALL("Turns a certain color range into
gray."),
.priv_size = sizeof(ChromakeyContext),
.priv_class= _class,
-FILTER_INPUTS(chromahold_inputs),
-FILTER_OUTPUTS(chromahold_outputs),
+FILTER_INPUTS(inputs),
+FILTER_OUTPUTS(outputs),
FILTER_PIXFMTS_ARRAY(hold_pixel_fmts),
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC |
AVFILTER_FLAG_SLICE_THREADS,
.process_command = process_command,
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/f_graphmonitor: Deduplicate outputs
ffmpeg | branch: master | Andreas Rheinhardt |
Wed Nov 1 08:35:44 2023 +0100| [a40f833bac72866dfc48de56d31432e27e7075dd] |
committer: Andreas Rheinhardt
avfilter/f_graphmonitor: Deduplicate outputs
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a40f833bac72866dfc48de56d31432e27e7075dd
---
libavfilter/f_graphmonitor.c | 14 +++---
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c
index ce4153fc79..d2c0ae81bf 100644
--- a/libavfilter/f_graphmonitor.c
+++ b/libavfilter/f_graphmonitor.c
@@ -568,8 +568,6 @@ static av_cold void uninit(AVFilterContext *ctx)
AVFILTER_DEFINE_CLASS_EXT(graphmonitor, "(a)graphmonitor",
graphmonitor_options);
-#if CONFIG_GRAPHMONITOR_FILTER
-
static const AVFilterPad graphmonitor_outputs[] = {
{
.name = "default",
@@ -578,6 +576,8 @@ static const AVFilterPad graphmonitor_outputs[] = {
},
};
+#if CONFIG_GRAPHMONITOR_FILTER
+
const AVFilter ff_vf_graphmonitor = {
.name = "graphmonitor",
.description = NULL_IF_CONFIG_SMALL("Show various filtergraph stats."),
@@ -596,14 +596,6 @@ const AVFilter ff_vf_graphmonitor = {
#if CONFIG_AGRAPHMONITOR_FILTER
-static const AVFilterPad agraphmonitor_outputs[] = {
-{
-.name = "default",
-.type = AVMEDIA_TYPE_VIDEO,
-.config_props = config_output,
-},
-};
-
const AVFilter ff_avf_agraphmonitor = {
.name = "agraphmonitor",
.description = NULL_IF_CONFIG_SMALL("Show various filtergraph stats."),
@@ -613,7 +605,7 @@ const AVFilter ff_avf_agraphmonitor = {
.uninit= uninit,
.activate = activate,
FILTER_INPUTS(ff_audio_default_filterpad),
-FILTER_OUTPUTS(agraphmonitor_outputs),
+FILTER_OUTPUTS(graphmonitor_outputs),
FILTER_QUERY_FUNC(query_formats),
.process_command = ff_filter_process_command,
};
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/cbs_h2645: Fix leak of SPS VUI extension data
ffmpeg | branch: release/6.1 | Andreas Rheinhardt
| Mon Oct 23 17:16:22 2023 +0200|
[868aa88d83c85a0f0ec56e9ae353e4b39e90e00a] | committer: Andreas Rheinhardt
avcodec/cbs_h2645: Fix leak of SPS VUI extension data
Fixes: VUI extension leak
Fixes:
63004/clusterfuzz-testcase-minimized-ffmpeg_BSF_VVC_METADATA_fuzzer-4928832253329408
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Andreas Rheinhardt
(cherry picked from commit 3f890fbfd9014843c51408c8f7ab3ba4aef7d354)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=868aa88d83c85a0f0ec56e9ae353e4b39e90e00a
---
libavcodec/cbs_h2645.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c
index 470f60b95f..c48a06b241 100644
--- a/libavcodec/cbs_h2645.c
+++ b/libavcodec/cbs_h2645.c
@@ -1989,7 +1989,17 @@ static const CodedBitstreamUnitTypeDescriptor
cbs_h266_unit_types[] = {
CBS_UNIT_TYPE_INTERNAL_REF(VVC_DCI_NUT, H266RawDCI, extension_data.data),
CBS_UNIT_TYPE_INTERNAL_REF(VVC_OPI_NUT, H266RawOPI, extension_data.data),
CBS_UNIT_TYPE_INTERNAL_REF(VVC_VPS_NUT, H266RawVPS, extension_data.data),
-CBS_UNIT_TYPE_INTERNAL_REF(VVC_SPS_NUT, H266RawSPS, extension_data.data),
+{
+.nb_unit_types = 1,
+.unit_type.list[0] = VVC_SPS_NUT,
+.content_type = CBS_CONTENT_TYPE_INTERNAL_REFS,
+.content_size = sizeof(H266RawSPS),
+.type.ref = {
+.nb_offsets = 2,
+.offsets= { offsetof(H266RawSPS, extension_data.data),
+offsetof(H266RawSPS, vui.extension_data.data) }
+},
+},
CBS_UNIT_TYPE_INTERNAL_REF(VVC_PPS_NUT, H266RawPPS, extension_data.data),
CBS_UNIT_TYPE_INTERNAL_REF(VVC_PREFIX_APS_NUT, H266RawAPS,
extension_data.data),
CBS_UNIT_TYPE_INTERNAL_REF(VVC_SUFFIX_APS_NUT, H266RawAPS,
extension_data.data),
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/webpenc: Check seeks
ffmpeg | branch: master | Andreas Rheinhardt |
Fri Oct 6 03:55:31 2023 +0200| [155f0c8ef7430e1f963c811e6bd4e2d85ee9f81b] |
committer: Andreas Rheinhardt
avformat/webpenc: Check seeks
Addresses the issue reported in ticket #4609.
Signed-off-by: Andreas Rheinhardt
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=155f0c8ef7430e1f963c811e6bd4e2d85ee9f81b
---
libavformat/webpenc.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/libavformat/webpenc.c b/libavformat/webpenc.c
index b3f5bdc9b5..fb0cca3922 100644
--- a/libavformat/webpenc.c
+++ b/libavformat/webpenc.c
@@ -177,8 +177,8 @@ static int webp_write_trailer(AVFormatContext *s)
if (w->using_webp_anim_encoder) {
if (w->loop) { // Write loop count.
-avio_seek(s->pb, 42, SEEK_SET);
-avio_wl16(s->pb, w->loop);
+if (avio_seek(s->pb, 42, SEEK_SET) == 42)
+avio_wl16(s->pb, w->loop);
}
} else {
int ret;
@@ -186,10 +186,11 @@ static int webp_write_trailer(AVFormatContext *s)
return ret;
filesize = avio_tell(s->pb);
-avio_seek(s->pb, 4, SEEK_SET);
-avio_wl32(s->pb, filesize - 8);
-// Note: without the following, avio only writes 8 bytes to the file.
-avio_seek(s->pb, filesize, SEEK_SET);
+if (avio_seek(s->pb, 4, SEEK_SET) == 4) {
+avio_wl32(s->pb, filesize - 8);
+// Note: without the following, avio only writes 8 bytes to the
file.
+avio_seek(s->pb, filesize, SEEK_SET);
+}
}
return 0;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] mailmap: remap my email accounts
ffmpeg | branch: master | Zhao Zhili | Thu Nov 2 11:01:45 2023 +0800| [e920a8480185ff9112b2369a8f3418fa5d0ce5f0] | committer: Zhao Zhili mailmap: remap my email accounts Signed-off-by: Zhao Zhili > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e920a8480185ff9112b2369a8f3418fa5d0ce5f0 --- .mailmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index af60290f77..7546cf0caf 100644 --- a/.mailmap +++ b/.mailmap @@ -1,8 +1,8 @@ - - + + ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/dovi_rpu: Use 64 bit in get_us/se_coeff()
ffmpeg | branch: release/6.0 | Michael Niedermayer | Fri Oct 20 23:50:07 2023 +0200| [66caaeec1347951dbac711e7ee95f8b94a6a46e5] | committer: Michael Niedermayer avcodec/dovi_rpu: Use 64 bit in get_us/se_coeff() Fixes: shift exponent 32 is too large for 32-bit type 'int' Fixes: 63151/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5067531154751488 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer (cherry picked from commit 2817efbba331ac1d3a39fbee78b480008ce20a93) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=66caaeec1347951dbac711e7ee95f8b94a6a46e5 --- libavcodec/dovi_rpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c index dd38936552..107d1ab441 100644 --- a/libavcodec/dovi_rpu.c +++ b/libavcodec/dovi_rpu.c @@ -157,7 +157,7 @@ static inline uint64_t get_ue_coef(GetBitContext *gb, const AVDOVIRpuDataHeader case RPU_COEFF_FLOAT: fpart.u32 = get_bits_long(gb, 32); -return fpart.f32 * (1 << hdr->coef_log2_denom); +return fpart.f32 * (1LL << hdr->coef_log2_denom); } return 0; /* unreachable */ @@ -176,7 +176,7 @@ static inline int64_t get_se_coef(GetBitContext *gb, const AVDOVIRpuDataHeader * case RPU_COEFF_FLOAT: fpart.u32 = get_bits_long(gb, 32); -return fpart.f32 * (1 << hdr->coef_log2_denom); +return fpart.f32 * (1LL << hdr->coef_log2_denom); } return 0; /* unreachable */ ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] Update for FFmpeg 6.0.1
ffmpeg | branch: release/6.0 | Michael Niedermayer | Sat Oct 28 23:06:46 2023 +0200| [7058f9a3d62ce3a656acd3b974b24ef145f0a71b] | committer: Michael Niedermayer Update for FFmpeg 6.0.1 Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7058f9a3d62ce3a656acd3b974b24ef145f0a71b --- Changelog| 165 +++ RELEASE | 2 +- doc/Doxyfile | 2 +- 3 files changed, 167 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 1d5810ee02..b5c0ec3c1f 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,171 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. +version 6.0.1: + avformat/rtsp: Use rtsp_st->stream_index + avutil/tx_template: fix integer ovberflwo in fft3() + avcodec/jpeg2000dec: Check image offset + avformat/mxfdec: Check klv offset + libavutil/ppc/cpu.c: check that AT_HWCAP2 is defined + avcodec/h2645_parse: Avoid EAGAIN + avcodec/xvididct: Make c* unsigned to avoid undefined overflows + avcodec/bonk: Fix undefined overflow in predictor_calc_error() + avformat/tmv: Check video chunk size + avcodec/h264_parser: saturate dts a bit + avformat/asfdec_f: Saturate presentation time in marker + avformat/xwma: sanity check bits_per_coded_sample + avformat/matroskadec: Check prebuffered_ns for overflow + avformat/wavdec: Check left avio_tell for overflow + avformat/tta: Better totalframes check + avformat/rpl: Check for number_of_chunks overflow + avformat/mov: compute absolute dts difference without overflow in mov_find_next_sample() + avformat/jacosubdec: Check timeres + avformat/jacosubdec: avoid signed integer overflows in get_shift() + avformat/jacosubdec: Factorize code in get_shift() a bit + avformat/sbgdec: Check for negative duration or un-representable end pts + avcodec/escape124: Do not return random numbers + avcodec/apedec: Fix an integer overflow in predictor_update_filter() + tools/target_dec_fuzzer: Adjust wmapro threshold + avcodec/wavarc: Allocate AV_INPUT_BUFFER_PADDING_SIZE + avcodec/wavarc: Fix integer overflwo in do_stereo() + avutil/tx_template: Fix some signed integer overflows in DECL_FFT5() + avcodec/aacdec_template: Better avoidance of signed integer overflow in imdct_and_windowing_eld() + tools/target_dec_fuzzer: Adjust threshold for MVHA + avformat/avs: Check if return code is representable + avcodec/flacdec: Fix integer overflow in "33bit" DECODER_SUBFRAME_FIXED_WIDE() + avcodec/flacdec: Fix overflow in "33bit" decorrelate + avcodec/lcldec: Make PNG filter addressing match the code afterwards + avformat/westwood_vqa: Check chunk size + avformat/sbgdec: Check for period overflow + avformat/concatdec: Check in/outpoint for overflow + avformat/mov: Check avif_info + avformat/mxfdec: Remove this_partition + avcodec/xvididct: Fix integer overflow in idct_row() + avcodec/celp_math: avoid overflow in shift + tools/target_dec_fuzzer: Adjust threshold for rtv1 + avformat/hls: reduce default max reload to 3 + avformat/format: Stop reading data at EOF during probing + avcodec/bonk: Fix integer overflow in predictor_calc_error() + avcodec/jpeg2000dec: jpeg2000 has its own lowres option + avcodec/huffyuvdec: avoid undefined behavior with get_vlc2() failure + avcodec/cscd: Fix "CamStudio Lossless Codec 1.0" gzip files + avcodec/cscd: Check for CamStudio Lossless Codec 1.0 behavior in end check of LZO files + avcodec/mpeg4videodec: consider lowres in dest_pcm[] + avcodec/hevcdec: Fix undefined memcpy() + avcodec/mpeg4videodec: more unsigned in amv computation + avcodec/tta: fix signed overflow in decorrelate + avcodec/apedec: remove unused variable + avcodec/apedec: Fix 48khz 24bit below insane level + avcodec/apedec: Fix CRC for 24bps and bigendian + avcodec/wavarc: Check that nb_samples is not negative + avcodec/wavarc: Check shift + avcodec/xvididct: Fix integer overflow in idct_row() + avformat/avr: Check sample rate + avformat/imf_cpl: Replace NULL content_title_utf8 by "" + avformat/imf_cpl: xmlNodeListGetString() can return NULL + avcodec/aacdec_template: Fix undefined signed interger operations + avcodec/wavarc: Fix k limit + avcodec/rka: Fix integer overflow in decode_filter() + avformat/rka: bps < 8 is invalid + avcodec/pcm: allow Changing parameters + avutil/tx_template: extend to 2M + avcodec/jpeg2000dec: Check for reduction factor and image offset + avutil/softfloat: Basic documentation for av_sincos_sf() + avutil/softfloat: fix av_sincos_sf() + tools/target_dec_fuzzer: Adjust threshold for speex + avcodec/utils: fix 2 integer overflows in get_audio_frame_duration() + avcodec/hevcdec: Avoid null pointer dereferences in MC + avcodec/takdsp: Fix integer overflows + avcodec/mpegvideo_dec: consider interlaced lowres 4:2:0 chroma in edge emulation check better + avcodec/rka: use unsigned for buf0 additions + avcodec/rka: Avoid undefined left shift + avcodec: Ignoring errors is
[FFmpeg-cvslog] tools/target_dec_fuzzer: Adjust threshold for CSCD
ffmpeg | branch: release/6.0 | Michael Niedermayer |
Sat Oct 21 00:11:02 2023 +0200| [7e7c3d5db27d6a4c8c0358e12f8bc28566253c3f] |
committer: Michael Niedermayer
tools/target_dec_fuzzer: Adjust threshold for CSCD
Fixes: Timeout
Fixes:
63362/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CSCD_fuzzer-4694620065628160
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer
(cherry picked from commit c2f2bf82c1b3987e2d1a75cc79c4b58d286a2291)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7e7c3d5db27d6a4c8c0358e12f8bc28566253c3f
---
tools/target_dec_fuzzer.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c
index f6c8ec1b04..8bcc91394c 100644
--- a/tools/target_dec_fuzzer.c
+++ b/tools/target_dec_fuzzer.c
@@ -220,6 +220,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t
size) {
case AV_CODEC_ID_CFHD:maxpixels /= 16384; break;
case AV_CODEC_ID_CINEPAK: maxpixels /= 128; break;
case AV_CODEC_ID_COOK:maxsamples /= 1<<20; break;
+case AV_CODEC_ID_CSCD:maxpixels /= 1024; break;
case AV_CODEC_ID_DFA: maxpixels /= 1024; break;
case AV_CODEC_ID_DIRAC: maxpixels /= 8192; break;
case AV_CODEC_ID_DSICINVIDEO: maxpixels /= 1024; break;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/mov: Check that is_still_picture_avif has no trak based streams
ffmpeg | branch: release/6.0 | Michael Niedermayer |
Sun Oct 15 01:52:20 2023 +0200| [e82515787455f8f424243d4e69ee0828495cc081] |
committer: Michael Niedermayer
avformat/mov: Check that is_still_picture_avif has no trak based streams
Fixes: Assertion failure in mov_read_iloc( in mov_read_iloc())
Fixes:
62866/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5282997370486784
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer
(cherry picked from commit 98c2711b58ce65eae02cb2ece3a664e1119fd8fe)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e82515787455f8f424243d4e69ee0828495cc081
---
libavformat/mov.c | 4
1 file changed, 4 insertions(+)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7cdc860458..804ea9db46 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4470,6 +4470,10 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb,
MOVAtom atom)
MOVStreamContext *sc;
int ret;
+if (c->is_still_picture_avif) {
+return AVERROR_INVALIDDATA;
+}
+
st = avformat_new_stream(c->fc, NULL);
if (!st) return AVERROR(ENOMEM);
st->id = -1;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/matroskadec: Fix declaration-after-statement warnings
ffmpeg | branch: release/6.0 | Andreas Rheinhardt
| Mon Oct 9 00:16:08 2023 +0200|
[f2a4a49afb89efb45f25ab4038339f6eb7525520] | committer: Michael Niedermayer
avformat/matroskadec: Fix declaration-after-statement warnings
Reviewed-by: Michael Niedermayer
Signed-off-by: Andreas Rheinhardt
(cherry picked from commit 37b5f4a1f6a9c7c8f3620c6b1f7f2b0bb997e5d7)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2a4a49afb89efb45f25ab4038339f6eb7525520
---
libavformat/matroskadec.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 53292fff18..b5ddeafa16 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -4197,14 +4197,13 @@ static int64_t
webm_dash_manifest_compute_bandwidth(AVFormatContext *s, int64_t
int64_t pre_bytes, pre_ns;
double pre_sec, prebuffer, bits_per_second;
CueDesc desc_beg = get_cue_desc(s, time_ns, cues_start);
+// Start with the first Cue.
+CueDesc desc_end = desc_beg;
if (time_ns > INT64_MAX - prebuffer_ns)
return -1;
prebuffered_ns = time_ns + prebuffer_ns;
-// Start with the first Cue.
-CueDesc desc_end = desc_beg;
-
// Figure out how much data we have downloaded for the prebuffer. This
will
// be used later to adjust the bits per sample to try.
while (desc_end.start_time_ns != -1 && desc_end.end_time_ns <
prebuffered_ns) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/framesync: fix order of operation with = and <0
ffmpeg | branch: release/6.0 | Michael Niedermayer |
Thu Nov 2 23:49:53 2023 +0100| [14b1998c1a53d8ccdebd84bd988aad4bd0f58f14] |
committer: Michael Niedermayer
avfilter/framesync: fix order of operation with = and <0
Reviewed-by: Sean McGovern
Reviewed-by: Nicolas George
Signed-off-by: Michael Niedermayer
(cherry picked from commit 9450a4a7fef5816ee893177c903f0232724c57c6)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14b1998c1a53d8ccdebd84bd988aad4bd0f58f14
---
libavfilter/framesync.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c
index c748262ba6..6cb4b21fed 100644
--- a/libavfilter/framesync.c
+++ b/libavfilter/framesync.c
@@ -288,7 +288,7 @@ int ff_framesync_get_frame(FFFrameSync *fs, unsigned in,
AVFrame **rframe,
if (need_copy) {
if (!(frame = av_frame_clone(frame)))
return AVERROR(ENOMEM);
-if ((ret = ff_inlink_make_frame_writable(fs->parent->inputs[in],
) < 0)) {
+if ((ret = ff_inlink_make_frame_writable(fs->parent->inputs[in],
)) < 0) {
av_frame_free();
return ret;
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avfilter/buffersink: fix order of operation with = and <0
ffmpeg | branch: release/6.0 | Michael Niedermayer |
Thu Nov 2 23:49:53 2023 +0100| [d77be99a8367ea87a4a0ce837f8d8f9eb987d1d3] |
committer: Michael Niedermayer
avfilter/buffersink: fix order of operation with = and <0
Reviewed-by: Sean McGovern
Reviewed-by: Nicolas George
Signed-off-by: Michael Niedermayer
(cherry picked from commit c0a18e884c2d24d1052147082c358cb6929e97f1)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d77be99a8367ea87a4a0ce837f8d8f9eb987d1d3
---
libavfilter/buffersink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index 306c283f77..9ab83696ce 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -291,7 +291,7 @@ static int asink_query_formats(AVFilterContext *ctx)
cleanup_redundant_layouts(ctx);
for (i = 0; i < NB_ITEMS(buf->channel_layouts); i++)
if ((ret = av_channel_layout_from_mask(,
buf->channel_layouts[i])) < 0 ||
-(ret = ff_add_channel_layout(, ) < 0))
+(ret = ff_add_channel_layout(, )) < 0)
return ret;
for (i = 0; i < NB_ITEMS(buf->channel_counts); i++) {
layout = FF_COUNT2LAYOUT(buf->channel_counts[i]);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] Changelog: update
ffmpeg | branch: release/6.0 | Michael Niedermayer | Fri Nov 3 23:34:59 2023 +0100| [2baff271a27957114ce798c54b6dc9a4851d316f] | committer: Michael Niedermayer Changelog: update > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2baff271a27957114ce798c54b6dc9a4851d316f --- Changelog | 10 ++ 1 file changed, 10 insertions(+) diff --git a/Changelog b/Changelog index b5c0ec3c1f..cac6f223b0 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,16 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version 6.0.1: + avformat/lafdec: Check for 0 parameters + avfilter/buffersink: fix order of operation with = and <0 + avfilter/framesync: fix order of operation with = and <0 + tools/target_dec_fuzzer: Adjust threshold for CSCD + avcodec/dovi_rpu: Use 64 bit in get_us/se_coeff() + avformat/mov: Check that is_still_picture_avif has no trak based streams + avformat/matroskadec: Fix declaration-after-statement warnings + Update for FFmpeg 6.0.1 + fftools/ffmpeg_mux_init: Restrict disabling automatic copying of metadata + avformat/rtsp: Use rtsp_st->stream_index avformat/rtsp: Use rtsp_st->stream_index avutil/tx_template: fix integer ovberflwo in fft3() avcodec/jpeg2000dec: Check image offset ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/lafdec: Check for 0 parameters
ffmpeg | branch: release/6.0 | Michael Niedermayer | Fri Nov 3 00:33:41 2023 +0100| [028ae6f26c12863a9338214248224bafe8af7c2a] | committer: Michael Niedermayer avformat/lafdec: Check for 0 parameters Fixes: Timeout Fixes: 63661/clusterfuzz-testcase-minimized-ffmpeg_dem_LAF_fuzzer-6615365234589696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Sean McGovern Signed-off-by: Michael Niedermayer (cherry picked from commit 4fb9d946883ba8a3e21a9e756aa27349e6e22cef) Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=028ae6f26c12863a9338214248224bafe8af7c2a --- libavformat/lafdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/lafdec.c b/libavformat/lafdec.c index 59a59dcfe9..b867f106ae 100644 --- a/libavformat/lafdec.c +++ b/libavformat/lafdec.c @@ -139,7 +139,9 @@ static int laf_read_header(AVFormatContext *ctx) s->index = 0; s->stored_index = 0; s->bpp = bpp; -if ((int64_t)bpp * st_count * (int64_t)sample_rate >= INT32_MAX) +if ((int64_t)bpp * st_count * (int64_t)sample_rate >= INT32_MAX || +(int64_t)bpp * st_count * (int64_t)sample_rate == 0 +) return AVERROR_INVALIDDATA; s->data = av_calloc(st_count * sample_rate, bpp); if (!s->data) ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
