Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix] Allow mixed Audio&Video playlists #6476

Merged
merged 1 commit into from Feb 18, 2015

Conversation

VioletRed
Copy link
Contributor

Avoid trying to play music videos with PAPlayer.

Fix bug in commit d09993e

Avoid trying to play music videos with PAPlayer.

Fix bug in commit d09993e
@VioletRed
Copy link
Contributor Author

@FernetMenta, could you take a look at this?

@FernetMenta
Copy link
Contributor

thanks
jenkins build and merge

@VioletRed
Copy link
Contributor Author

Is there a problem with the OSX_64 building machine? It doesn't seem like it even started building.

Building remotely on OSX-i5-1-macminivault (osx osx64 ios atv2 osx32 darwin osxallbuilds) in workspace /Users/Shared/jenkins/workspace/OSX-64
/usr/bin/git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
/usr/bin/git config remote.origin.url git://github.com/xbmc/xbmc.git # timeout=10
Fetching upstream changes from git://github.com/xbmc/xbmc.git
/usr/bin/git --version # timeout=10
/usr/bin/git fetch --tags --progress git://github.com/xbmc/xbmc.git +refs/pull/:refs/remotes/origin/pr/ +refs/heads/:refs/remotes/xbmc/ +refs/heads/:refs/remotes/origin/ # timeout=40
Checking out Revision 2a5aaae (detached)
/usr/bin/git config core.sparsecheckout # timeout=10
/usr/bin/git checkout -f 2a5aaae # timeout=20
FATAL: Could not checkout null with start point 2a5aaae
hudson.plugins.git.GitException: Could not checkout null with start point 2a5aaae

@FernetMenta
Copy link
Contributor

build error not related

FernetMenta added a commit that referenced this pull request Feb 18, 2015
[fix] Allow mixed Audio&Video playlists
@FernetMenta FernetMenta merged commit f2e3b68 into xbmc:master Feb 18, 2015
@MartijnKaijser MartijnKaijser modified the milestone: I******* 15.0-alpha1 Feb 18, 2015
@VioletRed VioletRed deleted the dev/master_mixed branch February 18, 2015 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants