Avoiding setting the video stream type to 2 if the vpid is 0

This commit is contained in:
Klaus Schmidinger 2010-01-03 10:28:08 +01:00
parent 4577bfdd9e
commit 4b5f232e59
3 changed files with 8 additions and 3 deletions

View File

@ -1582,6 +1582,7 @@ Arthur Konovalov <artlov@gmail.com>
for fixing a missing ',' in the Swedish OSD texts for fixing a missing ',' in the Swedish OSD texts
for reporting problems with CAMs when checking the CAM status too frequently for reporting problems with CAMs when checking the CAM status too frequently
for reporting references to old *.vdr file names in MANUAL for reporting references to old *.vdr file names in MANUAL
for reporting that the video stream type was set to 2 even if the vpid was 0
Milos Kapoun <m.kapoun@cra.cz> Milos Kapoun <m.kapoun@cra.cz>
for suggesting to skip code table info in SI data for suggesting to skip code table info in SI data

View File

@ -6197,7 +6197,7 @@ Video Disk Recorder Revision History
- Fixed the default value for "Pause key handling" in the MANUAL (reported by - Fixed the default value for "Pause key handling" in the MANUAL (reported by
Diego Pierotto). Diego Pierotto).
2010-01-02: Version 1.7.11 2010-01-03: Version 1.7.11
- Fixed resetting the file size when regenerating the index file. - Fixed resetting the file size when regenerating the index file.
- The new function cDevice::PatPmtParser() can be used in derived devices to access - The new function cDevice::PatPmtParser() can be used in derived devices to access
@ -6254,3 +6254,5 @@ Video Disk Recorder Revision History
(based on a patch from Helmut Auer). (based on a patch from Helmut Auer).
- Improved the description of the transponder parameters in vdr.5 (thanks to - Improved the description of the transponder parameters in vdr.5 (thanks to
Winfried Köhler). Winfried Köhler).
- Avoiding setting the video stream type to 2 if the vpid is 0 (problem reported
by Arthur Konovalov).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: channels.c 2.11 2010/01/01 15:38:18 kls Exp $ * $Id: channels.c 2.12 2010/01/02 17:38:40 kls Exp $
*/ */
#include "channels.h" #include "channels.h"
@ -809,7 +809,7 @@ bool cChannel::Parse(const char *s)
tpid = 0; tpid = 0;
} }
vpid = ppid = 0; vpid = ppid = 0;
vtype = 2; // default is MPEG-2 vtype = 0;
apids[0] = 0; apids[0] = 0;
dpids[0] = 0; dpids[0] = 0;
ok = false; ok = false;
@ -831,6 +831,8 @@ bool cChannel::Parse(const char *s)
return false; return false;
if (!ppid) if (!ppid)
ppid = vpid; ppid = vpid;
if (vpid && !vtype)
vtype = 2; // default is MPEG-2
char *dpidbuf = strchr(apidbuf, ';'); char *dpidbuf = strchr(apidbuf, ';');
if (dpidbuf) if (dpidbuf)