[FFmpeg-cvslog] lavf/dashdec: refactoring error handle logic for open_input

Jun Zhao git at videolan.org
Tue May 14 12:36:30 EEST 2019


ffmpeg | branch: master | Jun Zhao <barryjzhao at tencent.com> | Sat May 11 15:23:44 2019 +0800| [bf6e0f709be20f3aad6c6fe9b85411507bdf025c] | committer: Steven Liu

lavf/dashdec: refactoring error handle logic for open_input

refactoring error handle logic for open_input.

Reviewed-by: Steven Liu <lq at onvideo.cn>
Signed-off-by: Jun Zhao <barryjzhao at tencent.com>

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

 libavformat/dashdec.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
index ce8bd4ad68..2c50f23c06 100644
--- a/libavformat/dashdec.c
+++ b/libavformat/dashdec.c
@@ -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);



More information about the ffmpeg-cvslog mailing list