diff mbox

[FFmpeg-devel,1/2] lavf/dashdec: fix the coding logic after open_input fail

Message ID 1557559424-5566-1-git-send-email-mypopydev@gmail.com
State Accepted
Commit c663046b41057d0cec519e305e1cc4798ab3da50
Headers show

Commit Message

Jun Zhao May 11, 2019, 7:23 a.m. UTC 
From: Jun Zhao <barryjzhao@tencent.com>

setting return status following goto will never be executed, so
adjust the location in the code.

Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
---
 libavformat/dashdec.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Liu Steven May 12, 2019, 6:06 a.m. UTC | #1 
> 在 2019年5月11日，15:23，Jun Zhao <mypopydev@gmail.com> 写道：
> 
> From: Jun Zhao <barryjzhao@tencent.com>
> 
> setting return status following goto will never be executed, so
> adjust the location in the code.
> 
> Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
> ---
> libavformat/dashdec.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
> index 6e3e7e4..ce8bd4a 100644
> --- a/libavformat/dashdec.c
> +++ b/libavformat/dashdec.c
> @@ -1793,8 +1793,8 @@ restart:
>         ret = open_input(c, v, v->cur_seg);
>         if (ret < 0) {
>             if (ff_check_interrupt(c->interrupt_callback)) {
> -                goto end;
>                 ret = AVERROR_EXIT;
> +                goto end;
>             }
>             av_log(v->parent, AV_LOG_WARNING, "Failed to open fragment of playlist %d\n", v->rep_idx);
>             v->cur_seq_no++;
> -- 
> 1.7.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”.


Pushed

Thanks
Steven
diff mbox

Patch

diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
index 6e3e7e4..ce8bd4a 100644
--- a/libavformat/dashdec.c
+++ b/libavformat/dashdec.c
@@ -1793,8 +1793,8 @@  restart:
         ret = open_input(c, v, v->cur_seg);
         if (ret < 0) {
             if (ff_check_interrupt(c->interrupt_callback)) {
-                goto end;
                 ret = AVERROR_EXIT;
+                goto end;
             }
             av_log(v->parent, AV_LOG_WARNING, "Failed to open fragment of playlist %d\n", v->rep_idx);
             v->cur_seq_no++;