Merge lp:~justinmcp/media-hub/fix-video-detection into lp:media-hub

Proposed by Justin McPherson
Status: Needs review
Proposed branch: lp:~justinmcp/media-hub/fix-video-detection
Merge into: lp:media-hub
Diff against target: 12 lines (+1/-1)
1 file modified
src/core/media/gstreamer/playbin.cpp (+1/-1)
To merge this branch: bzr merge lp:~justinmcp/media-hub/fix-video-detection
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+260543@code.launchpad.net

Commit message

For non-file based URLs content type detection defaults to force "audio+video", however surrounding code can only make a binary choice between audio or video.

Change to force all non-file based content to be detected as video - as per the spirit of the temporary fix.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Unmerged revisions

141. By Justin McPherson <justin@phablet-dev>

Alter returned hack mime type to be detected as video.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/core/media/gstreamer/playbin.cpp'
2--- src/core/media/gstreamer/playbin.cpp 2015-05-01 19:44:11 +0000
3+++ src/core/media/gstreamer/playbin.cpp 2015-05-29 07:49:29 +0000
4@@ -517,7 +517,7 @@
5 // Anything other than a file, for now claim that the type
6 // is both audio and video.
7 // FIXME: implement true net stream sampling and get the type from GstCaps
8- return std::string("audio/video/");
9+ return std::string("video/x-something");
10
11
12 GError *error = nullptr;

Subscribers

People subscribed via source and target branches