summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2018-01-09 17:15:18 +0100
committerBastien Nocera <hadess@hadess.net>2018-01-09 17:15:18 +0100
commit8f3ee8cba28d1f84559ddb95ff70bfb90c041cae (patch)
tree1e44bee103e8ff9bfcdb1a15e479d201e2a8e8d9
parentcaaa3752dc6fa765392ed2a49900da356da30441 (diff)
downloadtotem-pl-parser-8f3ee8cba28d1f84559ddb95ff70bfb90c041cae.tar.gz
plparse: Don't consider MJPEG streams as JPEG images
Similarly to PLS/HLS playlist files in commit 32b2a71, we need to whitelist mjpeg files and pass them on as a media file, rather than ignoring them and removing them from the list of files to play. This requires a version of shared-mime-info with an MJPEG mime-type definition. https://bugzilla.gnome.org/show_bug.cgi?id=792325
-rw-r--r--plparse/totem-pl-parser.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/plparse/totem-pl-parser.c b/plparse/totem-pl-parser.c
index dfee836..505957a 100644
--- a/plparse/totem-pl-parser.c
+++ b/plparse/totem-pl-parser.c
@@ -1742,6 +1742,7 @@ totem_pl_parser_ignore_from_mimetype (TotemPlParser *parser, const char *mimetyp
* in shared-mime-info */
if (strcmp (mimetype, "application/vnd.apple.mpegurl") != 0 &&
strcmp (mimetype, "audio/x-mpegurl") != 0 &&
+ strcmp (mimetype, "video/x-mjpeg") != 0 &&
g_content_type_is_a (mimetype, ignore_types[i].mimetype) != FALSE) {
if (parser->priv->debug)
g_print ("Ignoring %s because it's a %s\n", mimetype, ignore_types[i].mimetype);