diff mbox series

[FFmpeg-devel] avformat/imfdec: Actually return error upon error

Message ID AM7PR03MB666035BFEE4A4EA8EA66F6248F499@AM7PR03MB6660.eurprd03.prod.outlook.com
State Superseded
Headers show
Series [FFmpeg-devel] avformat/imfdec: Actually return error upon error | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc fail Make fate failed

Commit Message

Andreas Rheinhardt Jan. 3, 2022, 5:03 a.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/imfdec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Andreas Rheinhardt Jan. 3, 2022, 5:27 a.m. UTC | #1 
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavformat/imfdec.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c
> index f17064cfcd..da8c6cddea 100644
> --- a/libavformat/imfdec.c
> +++ b/libavformat/imfdec.c
> @@ -564,9 +564,8 @@ static int set_context_streams_from_tracks(AVFormatContext *s)
>          /* Copy stream information */
>          asset_stream = avformat_new_stream(s, NULL);
>          if (!asset_stream) {
> -            ret = AVERROR(ENOMEM);
>              av_log(s, AV_LOG_ERROR, "Could not create stream\n");
> -            break;
> +            return AVERROR(ENOMEM);
>          }
>          asset_stream->id = i;
>          ret = avcodec_parameters_copy(asset_stream->codecpar, first_resource_stream->codecpar);
> 
Sorry, I haven't realized that there is already a patch for this.

- Andreas
diff mbox series

Patch

diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c
index f17064cfcd..da8c6cddea 100644
--- a/libavformat/imfdec.c
+++ b/libavformat/imfdec.c
@@ -564,9 +564,8 @@  static int set_context_streams_from_tracks(AVFormatContext *s)
         /* Copy stream information */
         asset_stream = avformat_new_stream(s, NULL);
         if (!asset_stream) {
-            ret = AVERROR(ENOMEM);
             av_log(s, AV_LOG_ERROR, "Could not create stream\n");
-            break;
+            return AVERROR(ENOMEM);
         }
         asset_stream->id = i;
         ret = avcodec_parameters_copy(asset_stream->codecpar, first_resource_stream->codecpar);