summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY1
-rw-r--r--dvbplayer.c6
3 files changed, 6 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1d64425c..beca76cc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3376,6 +3376,8 @@ Clemens Brauers <vdr@admin-cb.de>
Stefan Herdler <herdler@gmx.de>
for fixing cMarks::GetNextBegin() and cMarks::GetNextEnd()
+ for reporting that pausing replay at the last editing mark actually paused one I-frame
+ too early
Tobias Faust <tobias.faust@gmx.de>
for the original "jumpingseconds" patch
diff --git a/HISTORY b/HISTORY
index 5e3a674d..9b05e615 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8580,3 +8580,4 @@ Video Disk Recorder Revision History
- Updated the Swedish OSD texts (thanks to Magnus Sirwiö).
- Updated the Hungarian OSD texts (thanks to István Füley and Albert Danis).
- Modified the German translations of the OSD texts regarding "adaptive skipping".
+- Fixed pausing replay at the last editing mark (reported by Stefan Herdler).
diff --git a/dvbplayer.c b/dvbplayer.c
index 94882e29..aae0507c 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbplayer.c 3.5 2015/02/06 15:08:51 kls Exp $
+ * $Id: dvbplayer.c 3.6 2015/02/13 15:12:57 kls Exp $
*/
#include "dvbplayer.h"
@@ -460,9 +460,9 @@ void cDvbPlayer::Action(void)
// Read the next frame from the file:
- if (playMode != pmStill && playMode != pmPause && !AtLastMark) {
+ if (playMode != pmStill && playMode != pmPause) {
if (!readFrame && (replayFile || readIndex >= 0)) {
- if (!nonBlockingFileReader->Reading()) {
+ if (!nonBlockingFileReader->Reading() && !AtLastMark) {
if (!SwitchToPlayFrame && (playMode == pmFast || (playMode == pmSlow && playDir == pdBackward))) {
uint16_t FileNumber;
off_t FileOffset;