summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-02-25 12:17:19 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2013-02-25 12:17:19 +0100
commit85027db9b986aa1c024048a7171b7e6706c07fb8 (patch)
tree3241d5fe9aaf97c79ae8186a82b16d0ac4b8a3a1
parent9e47d589e29d3bb4be4e533308563ba9c37c999d (diff)
downloadvdr-85027db9b986aa1c024048a7171b7e6706c07fb8.tar.gz
vdr-85027db9b986aa1c024048a7171b7e6706c07fb8.tar.bz2
Limited 'Fixed stuttering or asynchronous audio after changing the audio track' to TS recordings to avoid a segfault
-rw-r--r--HISTORY4
-rw-r--r--dvbplayer.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index a950c8c7..2e5bdda2 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7665,7 +7665,9 @@ Video Disk Recorder Revision History
- Fixed flashing OSD in "high level OSD" mode of the TT S2-6400 in case a menu is open
while subtitles are being displayed.
- Fixed stuttering or asynchronous audio after changing the audio track. This is done
- by doing a "jump" to the current position, which clears all buffers.
+ by doing a "jump" to the current position, which clears all buffers. However, this
+ only works with TS recordings. With PES recordings it causes a segfault - haven't
+ been able to figure out why.
- Added a manual page for 'svdrpsend' (thanks to Tobias Grimm).
- Fixed immediately disappearing subtitle track menu in "high level OSD" mode of the
TT S2-6400 when selecting "No subtitles".
diff --git a/dvbplayer.c b/dvbplayer.c
index fda02158..e936ca2c 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 2.31 2013/02/20 09:03:49 kls Exp $
+ * $Id: dvbplayer.c 2.32 2013/02/25 12:15:58 kls Exp $
*/
#include "dvbplayer.h"
@@ -810,6 +810,8 @@ void cDvbPlayer::Goto(int Index, bool Still)
void cDvbPlayer::SetAudioTrack(eTrackType Type, const tTrackId *TrackId)
{
+ if (isPesRecording)
+ return; // for some unknown reason this doesn't work with PES recordings - causes a segfault
if (playMode == pmPlay) {
int Current, Total;
if (GetIndex(Current, Total, true))