]> git.sesse.net Git - ffmpeg/commitdiff
lavf/dashdec: refactoring error handle logic for open_input
authorJun Zhao <barryjzhao@tencent.com>
Sat, 11 May 2019 07:23:44 +0000 (15:23 +0800)
committerSteven Liu <lq@chinaffmpeg.org>
Tue, 14 May 2019 09:36:19 +0000 (17:36 +0800)
refactoring error handle logic for open_input.

Reviewed-by: Steven Liu <lq@onvideo.cn>
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
libavformat/dashdec.c

index ce8bd4ad68807209ffec4da0a69209f8df1e48ae..2c50f23c066a2b3aef01ce64f981c8804c718e4f 100644 (file)
@@ -1687,6 +1687,7 @@ static int open_input(DASHContext *c, struct representation *pls, struct fragmen
 
     url = av_mallocz(c->max_url_size);
     if (!url) {
+        ret = AVERROR(ENOMEM);
         goto cleanup;
     }
 
@@ -1701,9 +1702,6 @@ static int open_input(DASHContext *c, struct representation *pls, struct fragmen
     av_log(pls->parent, AV_LOG_VERBOSE, "DASH request for url '%s', offset %"PRId64", playlist %d\n",
            url, seg->url_offset, pls->rep_idx);
     ret = open_url(pls->parent, &pls->input, url, c->avio_opts, opts, NULL);
-    if (ret < 0) {
-        goto cleanup;
-    }
 
 cleanup:
     av_free(url);