har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/dashdec: Remove dead code

Browse Source 
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>
(cherry picked from commit 248ef276beb8222bc2610484b830420e1a306d8b)
This commit is contained in:
Andreas Rheinhardt 2020-09-18 23:50:53 +02:00
parent c0aa40d334
commit 9ec9fc351e
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/dashdec.c
View File

@ -1047,12 +1047,7 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url,
fragmenturl_node = xmlNextElementSibling(fragmenturl_node); fragmenturl_node = xmlNextElementSibling(fragmenturl_node);
} }
fragment_timeline_node = find_child_node_by_name(representation_segmenttemplate_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(fragment_template_node, "SegmentTimeline");
if (!fragment_timeline_node)
fragment_timeline_node = find_child_node_by_name(adaptionset_segmentlist_node, "SegmentTimeline");
if (!fragment_timeline_node) if (!fragment_timeline_node)
fragment_timeline_node = find_child_node_by_name(period_segmentlist_node, "SegmentTimeline"); fragment_timeline_node = find_child_node_by_name(period_segmentlist_node, "SegmentTimeline");
if (fragment_timeline_node) { if (fragment_timeline_node) {
@ -1896,7 +1891,6 @@ static void close_demux_for_component(struct representation *pls)
memset(&pls->pb, 0x00, sizeof(AVIOContext)); memset(&pls->pb, 0x00, sizeof(AVIOContext));
pls->ctx->pb = NULL; pls->ctx->pb = NULL;
avformat_close_input(&pls->ctx); avformat_close_input(&pls->ctx);
pls->ctx = NULL;
} }
static int reopen_demux_for_component(AVFormatContext *s, struct representation *pls) static int reopen_demux_for_component(AVFormatContext *s, struct representation *pls)