diff mbox series

[FFmpeg-devel,16/21] avformat/dashdec: Remove redundant checks

Message ID 20200919163610.1099233-16-andreas.rheinhardt@gmail.com
State Accepted
Commit 622efc5c83fd77dff52242a9a503cd8dcee8e36f
Headers show
Series [FFmpeg-devel,01/21] avformat/dashdec: Avoid double free on error
Related show

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 19, 2020, 4:36 p.m. UTC
This commit removes two always-true checks as well as a dead default
case of a switch. The check when parsing manifests is always true,
because we now jump to the cleaning code in case the format of the
representation is unknown. The default case of the switch is dead,
because the type of the representation is already checked at the
beginning of parse_manifest_representation(). The check when reading
the header is dead, because we error out if an error happened before.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavformat/dashdec.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
index e1554d077b..d75ff92a7b 100644
--- a/libavformat/dashdec.c
+++ b/libavformat/dashdec.c
@@ -1049,7 +1049,6 @@  static int parse_manifest_representation(AVFormatContext *s, const char *url,
             goto free;
         }
 
-        if (rep) {
             if (rep->fragment_duration > 0 && !rep->fragment_timescale)
                 rep->fragment_timescale = 1;
             rep->bandwidth = rep_bandwidth_val ? atoi(rep_bandwidth_val) : 0;
@@ -1071,13 +1070,9 @@  static int parse_manifest_representation(AVFormatContext *s, const char *url,
                 case AVMEDIA_TYPE_SUBTITLE:
                     ret = av_dynarray_add_nofree(&c->subtitles, &c->n_subtitles, rep);
                     break;
-                default:
-                    av_log(s, AV_LOG_WARNING, "Unsupported the stream type %d\n", type);
-                    break;
             }
             if (ret < 0)
                 goto free;
-        }
     }
 
 end:
@@ -2042,6 +2037,7 @@  static int dash_read_header(AVFormatContext *s)
 {
     DASHContext *c = s->priv_data;
     struct representation *rep;
+    AVProgram *program;
     int ret = 0;
     int stream_index = 0;
     int i;
@@ -2123,8 +2119,6 @@  static int dash_read_header(AVFormatContext *s)
     }
 
     /* Create a program */
-    if (!ret) {
-        AVProgram *program;
         program = av_new_program(s, 0);
         if (!program) {
             ret = AVERROR(ENOMEM);
@@ -2164,7 +2158,6 @@  static int dash_read_header(AVFormatContext *s)
                 av_freep(&rep->lang);
             }
         }
-    }
 
     return 0;
 fail: