[FFmpeg-cvslog] avformat/movenc: Make check actually check what is intended

Andreas Rheinhardt git at videolan.org
Tue Feb 20 19:59:04 EET 2024


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Feb 20 18:47:46 2024 +0100| [cffadfe99a1c41866701bab6c7410c17737a1db1] | committer: Andreas Rheinhardt

avformat/movenc: Make check actually check what is intended

Also fixes a Clang warning:
"overlapping comparisons always evaluate to false
[-Wtautological-overlap-compare]"

Reviewed-by: James Almer <jamrial at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cffadfe99a1c41866701bab6c7410c17737a1db1
---

 libavformat/movenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index afcee683cd..724a1eb673 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -7160,7 +7160,7 @@ static int mov_init_iamf_track(AVFormatContext *s)
     if (!nb_audio_elements && !nb_mix_presentations)
         return 0;
 
-    if ((nb_audio_elements < 1 && nb_audio_elements > 2) || nb_mix_presentations < 1) {
+    if (nb_audio_elements < 1 || nb_audio_elements > 2 || nb_mix_presentations < 1) {
         av_log(s, AV_LOG_ERROR, "There must be >= 1 and <= 2 IAMF_AUDIO_ELEMENT and at least "
                                 "one IAMF_MIX_PRESENTATION stream groups to write a IMAF track\n");
         return AVERROR(EINVAL);



More information about the ffmpeg-cvslog mailing list