mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-14 08:53:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	lib/Makefile.am
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Commit: e2d5f6ebf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
This commit is contained in:
vanhofen
2017-03-06 22:40:18 +01:00
parent 47b8bce563 fdda0de766
commit 3a863c91f0
50 changed files with 110 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/movieplayer.cpp
View File

@@ -1391,12 +1391,12 @@ void CMoviePlayerGui::PlayFileLoop(void)
}
#endif
/* in case ffmpeg report incorrect values */
if((playstate == CMoviePlayerGui::PLAY) && (speed == 1)){
if(file_prozent > 96 && (playstate == CMoviePlayerGui::PLAY) && (speed == 1)){
if(position_tmp != position){
position_tmp = position ;
eof2 = 0;
}else{
if (++eof2 > 6) {
if (++eof2 > 12) {
at_eof = true;
break;
}