diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-09-18 23:50:53 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-09-21 04:31:19 +0200 |
| commit | 248ef276beb8222bc2610484b830420e1a306d8b (patch) | |
| tree | 6f3268ff8f0c3e3bddaa6a35b4a0b530ca64888d /libavformat/dashdec.c | |
| parent | e09e2c6442924bfa1fb5efc419bc27fc6ef8a532 (diff) | |
avformat/dashdec: Remove dead code
The code in question seems to have been copied from about 70 lines
above; yet the code here is only executed if some of the variables
(namely representation_segmenttemplate_node and fragment_template_node)
are NULL, so it makes no sense to check them for a child element.
Also remove a redundant resetting of a pointer to an AVFormatContext
after avformat_close_input() (which already sets the pointer to NULL).
Reviewed-by: Steven Liu <lq@chinaffmpeg.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat/dashdec.c')
| -rw-r--r-- | libavformat/dashdec.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 4048323c7d..f81b323d96 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -1047,12 +1047,7 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, fragmenturl_node = xmlNextElementSibling(fragmenturl_node); } - fragment_timeline_node = find_child_node_by_name(representation_segmenttemplate_node, "SegmentTimeline"); - - if (!fragment_timeline_node) - fragment_timeline_node = find_child_node_by_name(fragment_template_node, "SegmentTimeline"); - if (!fragment_timeline_node) - fragment_timeline_node = find_child_node_by_name(adaptionset_segmentlist_node, "SegmentTimeline"); + fragment_timeline_node = find_child_node_by_name(adaptionset_segmentlist_node, "SegmentTimeline"); if (!fragment_timeline_node) fragment_timeline_node = find_child_node_by_name(period_segmentlist_node, "SegmentTimeline"); if (fragment_timeline_node) { @@ -1898,7 +1893,6 @@ static void close_demux_for_component(struct representation *pls) memset(&pls->pb, 0x00, sizeof(AVIOContext)); pls->ctx->pb = NULL; avformat_close_input(&pls->ctx); - pls->ctx = NULL; } static int reopen_demux_for_component(AVFormatContext *s, struct representation *pls) |