diff options
| author | Mark Purcell <msp@debian.org> | 2008-06-22 11:00:40 +1000 |
|---|---|---|
| committer | etobi <git@e-tobi.net> | 2013-09-03 09:48:42 +0200 |
| commit | 891c51ff368ed700dec6025eeb47ce4d96f76418 (patch) | |
| tree | 3729664829e4faa691d403274f38eb10890b533c /util/scan/dump-vdr.c | |
| parent | 1c6e1f28f54ec2606c23936c1d8689f2be55a86c (diff) | |
| parent | ab959d7b4194715870128e616b8e29d4a101e488 (diff) | |
| download | linux-dvb-apps-891c51ff368ed700dec6025eeb47ce4d96f76418.tar.gz | |
Imported Debian patch 1.1.1+rev1207-1debian/1.1.1+rev1207-1
Diffstat (limited to 'util/scan/dump-vdr.c')
| -rw-r--r-- | util/scan/dump-vdr.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/util/scan/dump-vdr.c b/util/scan/dump-vdr.c index f030c93..ef4101e 100644 --- a/util/scan/dump-vdr.c +++ b/util/scan/dump-vdr.c @@ -138,7 +138,7 @@ void vdr_dump_service_parameter_set (FILE *f, { int i; - if ((video_pid || audio_pid[0]) && ((ca_select > 0) || ((ca_select == 0) && (scrambled == 0)))) { + if (video_pid || audio_pid[0]) { if (vdr_version <= 2) { audio_lang = NULL; network_id = 0; @@ -174,10 +174,17 @@ void vdr_dump_service_parameter_set (FILE *f, if (audio_lang && audio_lang[0][0]) fprintf (f, "=%.4s", audio_lang[0]); } - if (scrambled == 1) scrambled = ca_select; + if (scrambled == 1) { + if (ca_select == -1) + if (vdr_version <= 2) + scrambled = 1; + else + scrambled = 0; + else + scrambled = ca_select; + } fprintf (f, ":%d:%d:%d:%d:%d:0", teletext_pid, scrambled, service_id, network_id, transport_stream_id); fprintf (f, "\n"); } } - |