[FFmpeg-devel] [PATCH 1/3] avformat/iamfenc: Remove always-false check

[FFmpeg-devel] [PATCH 1/3] avformat/iamfenc: Remove always-false check

[Andreas Rheinhardt]

This muxer does not have the AVFMT_NOSTREAMS flag; therefore
it is checked generically that there is at least a stream.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/iamfenc.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/libavformat/iamfenc.c b/libavformat/iamfenc.c
index ebf0c2fd67..bf4a268c95 100644
--- a/libavformat/iamfenc.c
+++ b/libavformat/iamfenc.c
@@ -48,11 +48,6 @@ static int iamf_init(AVFormatContext *s)
     int nb_audio_elements = 0, nb_mix_presentations = 0;
     int ret;
 
-    if (!s->nb_streams) {
-        av_log(s, AV_LOG_ERROR, "There must be at least one stream\n");
-        return AVERROR(EINVAL);
-    }
-
     for (int i = 0; i < s->nb_streams; i++) {
         if (s->streams[i]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO ||
             (s->streams[i]->codecpar->codec_tag != MKTAG('m','p','4','a') &&
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/3] avformat/iamfenc: Align check and error message

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/iamfenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/iamfenc.c b/libavformat/iamfenc.c
index bf4a268c95..5e53a7748f 100644
--- a/libavformat/iamfenc.c
+++ b/libavformat/iamfenc.c
@@ -72,7 +72,7 @@ static int iamf_init(AVFormatContext *s)
         }
     }
 
-    if (!s->nb_stream_groups) {
+    if (s->nb_stream_groups <= 1) {
         av_log(s, AV_LOG_ERROR, "There must be at least two stream groups\n");
         return AVERROR(EINVAL);
     }
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/3] avformat/iamfenc: Remove unused headers

[Andreas Rheinhardt]

Forgotten in c95c8a0158073be84338d84c46529561bcc70a03.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/iamfenc.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/libavformat/iamfenc.c b/libavformat/iamfenc.c
index 5e53a7748f..3169ff1eb8 100644
--- a/libavformat/iamfenc.c
+++ b/libavformat/iamfenc.c
@@ -21,12 +21,7 @@
 
 #include <stdint.h>
 
-#include "libavutil/avassert.h"
-#include "libavutil/common.h"
-#include "libavutil/iamf.h"
-#include "libavcodec/put_bits.h"
 #include "avformat.h"
-#include "avio_internal.h"
 #include "iamf.h"
 #include "iamf_writer.h"
 #include "internal.h"
-- 
2.40.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 1/3] avformat/iamfenc: Remove always-false check

[James Almer]

On 3/19/2024 12:29 AM, Andreas Rheinhardt wrote:
> This muxer does not have the AVFMT_NOSTREAMS flag; therefore
> it is checked generically that there is at least a stream.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>   libavformat/iamfenc.c | 5 -----
>   1 file changed, 5 deletions(-)
> 
> diff --git a/libavformat/iamfenc.c b/libavformat/iamfenc.c
> index ebf0c2fd67..bf4a268c95 100644
> --- a/libavformat/iamfenc.c
> +++ b/libavformat/iamfenc.c
> @@ -48,11 +48,6 @@ static int iamf_init(AVFormatContext *s)
>       int nb_audio_elements = 0, nb_mix_presentations = 0;
>       int ret;
>   
> -    if (!s->nb_streams) {
> -        av_log(s, AV_LOG_ERROR, "There must be at least one stream\n");
> -        return AVERROR(EINVAL);
> -    }
> -
>       for (int i = 0; i < s->nb_streams; i++) {
>           if (s->streams[i]->codecpar->codec_type != AVMEDIA_TYPE_AUDIO ||
>               (s->streams[i]->codecpar->codec_tag != MKTAG('m','p','4','a') &&

Patchset 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-request@ffmpeg.org with subject "unsubscribe".