libeplayer3: work around duplicate ffmpeg stream ids by comparing stream addresses instead of pids (plus a couple of optimizations)

Origin commit data
------------------
Branch: master
Commit: 908ff30629
Author: martii <m4rtii@gmx.de>
Date: 2014-04-10 (Thu, 10 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-04-10 23:35:38 +02:00
parent c313e41f08
commit c1ec620695
6 changed files with 83 additions and 128 deletions

View File

@@ -72,10 +72,7 @@ bool Player::Open(const char *Url, bool _noprobe)
manager.clearTracks();
if (*Url == '/') {
url = "file://";
url += Url;
} else if (!strncmp("mms://", Url, 6)) {
if (!strncmp("mms://", Url, 6)) {
url = "mmst";
url += Url + 3;
isHttp = true;
@@ -207,7 +204,6 @@ bool Player::Stop()
bool ret = true;
if (isPlaying) {
isPaused = false;
isPlaying = false;
isForwarding = false;