[FFmpeg-devel] [PATCH v1 1/1] avformat/amr: Return PATCHWELCOME on stereo files

2021-09-15 Thread sunzhenliang
Signed-off-by: sunzhenliang --- libavformat/amr.c | 22 ++ 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/libavformat/amr.c b/libavformat/amr.c index 836b276fd5..2762010ebe 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -36,8 +36,10 @@ typedef struct

Re: [FFmpeg-devel] [PATCH 4/5] avcodec/apedec: Fix integer overflow in intermediate

2021-09-15 Thread Andreas Rheinhardt
Michael Niedermayer: > Fixes: signed integer overflow: 559334865 * 4 cannot be represented in type > 'int' > Fixes: > 37929/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-6751932295806976 > > Found-by: continuous fuzzing process > https://github.com/google/oss-fuzz/tree/master/pro

[FFmpeg-devel] [PATCH 1/5] avformat/sbgdec: Check for t0 overflow in expand_tseq()

2021-09-15 Thread Michael Niedermayer
Fixes: signed integer overflow: 4611686025627387904 + 4611686025627387904 cannot be represented in type 'long' Fixes: 35489/clusterfuzz-testcase-minimized-ffmpeg_dem_SBG_fuzzer-4862678601433088 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg S

[FFmpeg-devel] [PATCH 2/5] tools/target_dec_fuzzer: Adjust threshold for WMV2

2021-09-15 Thread Michael Niedermayer
Fixes: Timeout Fixes: 37737/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-4923012999151616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed,

[FFmpeg-devel] [PATCH 4/5] avcodec/apedec: Fix integer overflow in intermediate

2021-09-15 Thread Michael Niedermayer
Fixes: signed integer overflow: 559334865 * 4 cannot be represented in type 'int' Fixes: 37929/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-6751932295806976 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael

[FFmpeg-devel] [PATCH 3/5] avformat/mvdec: Do not set invalid sample rate

2021-09-15 Thread Michael Niedermayer
Fixes: signed integer overflow: -682581959642593728 * 16 cannot be represented in type 'long' Fixes: 37883/clusterfuzz-testcase-minimized-ffmpeg_dem_MV_fuzzer-5311691517198336 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Mich

[FFmpeg-devel] [PATCH 5/5] avformat/mov: Fix last mfra check

2021-09-15 Thread Michael Niedermayer
Fixes: signed integer overflow: 9223372036854775360 + 536870912 cannot be represented in type 'long' Fixes: 37940/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6095637855207424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-

Re: [FFmpeg-devel] [PATCH 3/5] avutil/opt: Add search flag to search children after the current object

2021-09-15 Thread Andreas Rheinhardt
Nicolas George: > Andreas Rheinhardt (12021-09-15): >> The current way searches children first which is odd and not always >> intended. >> >> Signed-off-by: Andreas Rheinhardt >> --- >> Missing APIchanges entry and version bump. >> >> libavutil/opt.c | 12 >> libavutil/opt.h | 7 +++

Re: [FFmpeg-devel] [PATCH 5/5] avfilter/avfilter: Apply options in one av_opt_set_dict2() call

2021-09-15 Thread Nicolas George
Andreas Rheinhardt (12021-09-15): > Up until now, avfilter_init_dict() first applied the generic options > via av_opt_set_dict(), then set the filter-specific options via > av_opt_set_dict2() applied to the private context with the > AV_OPT_SEARCH_CHILDREN flag set (this ensures that e.g. framesync

Re: [FFmpeg-devel] [PATCH 3/5] avutil/opt: Add search flag to search children after the current object

2021-09-15 Thread Nicolas George
Andreas Rheinhardt (12021-09-15): > The current way searches children first which is odd and not always > intended. > > Signed-off-by: Andreas Rheinhardt > --- > Missing APIchanges entry and version bump. > > libavutil/opt.c | 12 > libavutil/opt.h | 7 +++ > 2 files changed,

Re: [FFmpeg-devel] [PATCH 4/5] fftools/ffmpeg_opt: Add missing AV_OPT_SEARCH_FAKE_OBJ

2021-09-15 Thread Paul B Mahol
probably ok ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 5/5] avfilter/avfilter: Apply options in one av_opt_set_dict2() call

2021-09-15 Thread Paul B Mahol
probably fine ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/5] avcodec/avcodec: Set options only once via AV_OPT_SEARCH_CHILDREN

2021-09-15 Thread Paul B Mahol
lgtm ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 2/5] avfilter/avfilter: Actually error out on init error

2021-09-15 Thread Nicolas George
Andreas Rheinhardt (12021-09-15): > Currently an error from init could be overwritten by successfully > setting the enable expression. > > Signed-off-by: Andreas Rheinhardt > --- > libavfilter/avfilter.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Ok. Regards, -- Nicolas Geo

[FFmpeg-devel] [PATCH 5/5] avfilter/avfilter: Apply options in one av_opt_set_dict2() call

2021-09-15 Thread Andreas Rheinhardt
Up until now, avfilter_init_dict() first applied the generic options via av_opt_set_dict(), then set the filter-specific options via av_opt_set_dict2() applied to the private context with the AV_OPT_SEARCH_CHILDREN flag set (this ensures that e.g. framesync options are set, too). For filters with t

[FFmpeg-devel] [PATCH 4/5] fftools/ffmpeg_opt: Add missing AV_OPT_SEARCH_FAKE_OBJ

2021-09-15 Thread Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 6ca28cf974..8c8d5f60d8 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -821,7 +821,8 @@ static void ad

[FFmpeg-devel] [PATCH 3/5] avutil/opt: Add search flag to search children after the current object

2021-09-15 Thread Andreas Rheinhardt
The current way searches children first which is odd and not always intended. Signed-off-by: Andreas Rheinhardt --- Missing APIchanges entry and version bump. libavutil/opt.c | 12 libavutil/opt.h | 7 +++ 2 files changed, 19 insertions(+) diff --git a/libavutil/opt.c b/libav

[FFmpeg-devel] [PATCH 2/5] avfilter/avfilter: Actually error out on init error

2021-09-15 Thread Andreas Rheinhardt
Currently an error from init could be overwritten by successfully setting the enable expression. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c614eb0740..c

[FFmpeg-devel] [PATCH 1/5] avcodec/avcodec: Set options only once via AV_OPT_SEARCH_CHILDREN

2021-09-15 Thread Andreas Rheinhardt
For codecs with a private class the options are currently first applied to the private context after which the remaining options are applied to the AVCodecContext. This can be done in one step with av_opt_set_dict2() and the AV_OPT_SEARCH_CHILDREN flag. Doing so preserves the current order of apply

[FFmpeg-devel] [PATCH v3] avformat/mpegts: fixes overflow when parsing the PMT

2021-09-15 Thread Nicolas Jorge Dato
When a possible overflow was detected, there was a break to exit the while loop. However, it should have already substracted 2 bytes from program_info_length (descriptor ID + length). Ticket #9422 --- libavformat/mpegts.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib

Re: [FFmpeg-devel] [PATCH] avformat/aaxdec: Ask for a sample and disable COLUMN_FLAG_DEFAULT

2021-09-15 Thread Michael Niedermayer
On Wed, Sep 15, 2021 at 09:02:13AM +0200, Paul B Mahol wrote: > please do not apply ok, what else should be done ? thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Rewriting code that is poorly written but fully understood is good. Rewriting code that one d

Re: [FFmpeg-devel] [PATCH v5 00/12] Subtitle Filtering

2021-09-15 Thread Soft Works
> -Original Message- > From: ffmpeg-devel On Behalf Of > Hendrik Leppkes > Sent: Wednesday, 15 September 2021 11:21 > To: FFmpeg development discussions and patches de...@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH v5 00/12] Subtitle Filtering > > On Wed, Sep 15, 2021 at 9:39 AM

[FFmpeg-devel] [PATCH 2/2] avformat/mxf: support MCA audio information

2021-09-15 Thread Marc-Antoine Arnaud
--- libavformat/mxf.h| 1 + libavformat/mxfdec.c | 280 ++- 2 files changed, 275 insertions(+), 6 deletions(-) diff --git a/libavformat/mxf.h b/libavformat/mxf.h index fe9c52732c..cddbcb13c9 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -5

[FFmpeg-devel] [PATCH 1/2] avformat/mxf: rename sub_descriptors as file_descriptors

2021-09-15 Thread Marc-Antoine Arnaud
--- libavformat/mxfdec.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 34cbd2cd77..c28549f6a9 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -203,8 +203,8 @@ typedef struct MXFDescri

Re: [FFmpeg-devel] [PATCH v5 00/12] Subtitle Filtering

2021-09-15 Thread Hendrik Leppkes
On Wed, Sep 15, 2021 at 9:39 AM Soft Works wrote: > > In my upcoming patchset, I have added a new struct AVSubtitleArea > which is similar to AVSubtitleRect with the difference that > > - It's not AVSubtitleRect (which can be deprecated then) > - It uses refcounted buffers for the image data > > A

Re: [FFmpeg-devel] [PATCH v5 08/12] avfilter/overlay_graphicsubs: Add overlay_graphicsubs and graphicsub2video filters

2021-09-15 Thread Soft Works
> -Original Message- > From: ffmpeg-devel On Behalf Of > Andreas Rheinhardt > Sent: Sunday, 12 September 2021 22:00 > To: ffmpeg-devel@ffmpeg.org > Subject: Re: [FFmpeg-devel] [PATCH v5 08/12] > avfilter/overlay_graphicsubs: Add overlay_graphicsubs and > graphicsub2video filters > > So

Re: [FFmpeg-devel] [PATCH v5 00/12] Subtitle Filtering

2021-09-15 Thread Soft Works
> -Original Message- > From: ffmpeg-devel On Behalf Of > Soft Works > Sent: Wednesday, 15 September 2021 09:39 > To: FFmpeg development discussions and patches de...@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH v5 00/12] Subtitle Filtering > [..] > > > developing something para

Re: [FFmpeg-devel] [PATCH v5 00/12] Subtitle Filtering

2021-09-15 Thread Soft Works
> -Original Message- > From: ffmpeg-devel On Behalf Of > Hendrik Leppkes > Sent: Wednesday, 15 September 2021 08:11 > To: FFmpeg development discussions and patches de...@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH v5 00/12] Subtitle Filtering > > On Wed, Sep 15, 2021 at 1:21 AM S

Re: [FFmpeg-devel] [PATCH 11/12] Replace all occurences of av_mallocz_array() by av_calloc()

2021-09-15 Thread Paul B Mahol
lgtm ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 12/12] avutil/mem: Deprecate av_mallocz_array()

2021-09-15 Thread Paul B Mahol
lgtm ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avformat/aaxdec: Ask for a sample and disable COLUMN_FLAG_DEFAULT

2021-09-15 Thread Paul B Mahol
please do not apply ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".