From 2ed41352370514ab9eabfb0f94e97f283945ec3e Mon Sep 17 00:00:00 2001 From: Luis de Bethencourt Date: Thu, 4 Aug 2016 11:08:30 +0100 Subject: [PATCH] hls: m3u8: remove impossible condition After the check in line 1,111, media->uri can't be NULL. So the two checks for GST_HLS_MEDIA_TYPE_CLOSED_CAPTIONS are the same, removing the redundant one which goes to cc_unsupported. CID 1364752 --- ext/hls/m3u8.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ext/hls/m3u8.c b/ext/hls/m3u8.c index db5d898559..05f9188c3f 100644 --- a/ext/hls/m3u8.c +++ b/ext/hls/m3u8.c @@ -1114,11 +1114,8 @@ gst_m3u8_parse_media (gchar * desc, const gchar * base_uri) if (media->group_id == NULL || media->name == NULL) goto required_attributes_missing; - if (mtype == GST_HLS_MEDIA_TYPE_CLOSED_CAPTIONS && media->uri != NULL) - goto uri_with_cc; - if (mtype == GST_HLS_MEDIA_TYPE_CLOSED_CAPTIONS) - goto cc_unsupported; + goto uri_with_cc; GST_DEBUG ("media: %s, group '%s', name '%s', uri '%s', %s %s %s, lang=%s", GST_HLS_MEDIA_TYPE_NAME (media->mtype), media->group_id, media->name, @@ -1128,11 +1125,6 @@ gst_m3u8_parse_media (gchar * desc, const gchar * base_uri) return media; -cc_unsupported: - { - GST_FIXME ("closed captions EXT-X-MEDIA are not yet supported"); - goto out_error; - } uri_with_cc: { GST_WARNING ("closed captions EXT-X-MEDIA should not have URI specified");