Conflicts:
	configure.ac
	libeplayer3-arm/container/buff_ffmpeg.c


Origin commit data
------------------
Branch: master
Commit: f9dbc6233d
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-02-23 (Sat, 23 Feb 2019)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-02-23 22:49:32 +01:00
73 changed files with 3827 additions and 1637 deletions

View File

@@ -791,10 +791,10 @@ bool cPlayback::IsPlaying()
uint64_t cPlayback::GetReadCount()
{
//if (player && player->playback)
//{
// return player->playback->readCount;
//}
if (player && player->playback)
{
return player->playback->readCount;
}
return 0;
}