[FFmpeg-cvslog] avformat/smoothstreaming: Forward errors from copying white/blacklists

Andreas Rheinhardt git at videolan.org
Wed Jun 24 17:13:25 EEST 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Fri Dec 20 18:50:21 2019 +0100| [6c777a6688715b21a15cab2cd87c8379225e53ec] | committer: Andreas Rheinhardt

avformat/smoothstreaming: Forward errors from copying white/blacklists

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

 libavformat/smoothstreamingenc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c
index 33bb404f46..eefc61d08b 100644
--- a/libavformat/smoothstreamingenc.c
+++ b/libavformat/smoothstreamingenc.c
@@ -327,10 +327,12 @@ static int ism_write_header(AVFormatContext *s)
         }
 
         os->ctx = ctx = avformat_alloc_context();
-        if (!ctx || ff_copy_whiteblacklists(ctx, s) < 0) {
+        if (!ctx) {
             ret = AVERROR(ENOMEM);
             goto fail;
         }
+        if ((ret = ff_copy_whiteblacklists(ctx, s)) < 0)
+            goto fail;
         ctx->oformat = oformat;
         ctx->interrupt_callback = s->interrupt_callback;
 



More information about the ffmpeg-cvslog mailing list