diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2010-01-03 10:28:08 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2010-01-03 10:28:08 +0100 |
| commit | 4b5f232e59988e5c043b08210c3940a5bf82b360 (patch) | |
| tree | 25b53c2a7ed255fdeeddc3eb1d4d17a8e983d039 | |
| parent | 4577bfdd9ef7edc4a76de7cef30bda960e22e576 (diff) | |
| download | vdr-4b5f232e59988e5c043b08210c3940a5bf82b360.tar.gz vdr-4b5f232e59988e5c043b08210c3940a5bf82b360.tar.bz2 | |
Avoiding setting the video stream type to 2 if the vpid is 0
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | channels.c | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 864f0e82..8b9e371f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1582,6 +1582,7 @@ Arthur Konovalov <artlov@gmail.com> for fixing a missing ',' in the Swedish OSD texts for reporting problems with CAMs when checking the CAM status too frequently 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> for suggesting to skip code table info in SI data @@ -6197,7 +6197,7 @@ Video Disk Recorder Revision History - Fixed the default value for "Pause key handling" in the MANUAL (reported by 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. - 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). - Improved the description of the transponder parameters in vdr.5 (thanks to Winfried Köhler). +- Avoiding setting the video stream type to 2 if the vpid is 0 (problem reported + by Arthur Konovalov). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * 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" @@ -809,7 +809,7 @@ bool cChannel::Parse(const char *s) tpid = 0; } vpid = ppid = 0; - vtype = 2; // default is MPEG-2 + vtype = 0; apids[0] = 0; dpids[0] = 0; ok = false; @@ -831,6 +831,8 @@ bool cChannel::Parse(const char *s) return false; if (!ppid) ppid = vpid; + if (vpid && !vtype) + vtype = 2; // default is MPEG-2 char *dpidbuf = strchr(apidbuf, ';'); if (dpidbuf) |