summaryrefslogtreecommitdiff
path: root/ext/hls
diff options
context:
space:
mode:
authorLuis de Bethencourt <luisbg@osg.samsung.com>2016-08-04 11:08:30 +0100
committerLuis de Bethencourt <luisbg@osg.samsung.com>2016-08-04 11:17:56 +0100
commit2ed41352370514ab9eabfb0f94e97f283945ec3e (patch)
tree556b062f19c4bb9dae1b1692ca4282cbca414b2f /ext/hls
parent35c82fee320385b25c28c411300b37ae9a137b70 (diff)
downloadgstreamer-plugins-bad-2ed41352370514ab9eabfb0f94e97f283945ec3e.tar.gz
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
Diffstat (limited to 'ext/hls')
-rw-r--r--ext/hls/m3u8.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/ext/hls/m3u8.c b/ext/hls/m3u8.c
index db5d89855..05f9188c3 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");