diff -Nru v4l-utils-0.9.3+r1674/debian/bzr-builder.manifest v4l-utils-0.9.3+r1676/debian/bzr-builder.manifest --- v4l-utils-0.9.3+r1674/debian/bzr-builder.manifest 2013-04-22 03:57:02.000000000 +0000 +++ v4l-utils-0.9.3+r1676/debian/bzr-builder.manifest 2013-04-28 22:36:08.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}+r1674-61 -lp:libv4l revid:git-v1:bb3780de8cc8d2089dc0b7a2dc2b689ba0ce481e +# bzr-builder format 0.3 deb-version {debupstream}+r1676-61 +lp:libv4l revid:git-v1:d77aa6ce10ef0b2984374f28116ae48af989e64f nest packaging lp:~libv4l/+junk/packaging debian revid:gjasny@googlemail.com-20121209125204-0af8am9cp1jrlura diff -Nru v4l-utils-0.9.3+r1674/debian/changelog v4l-utils-0.9.3+r1676/debian/changelog --- v4l-utils-0.9.3+r1674/debian/changelog 2013-04-22 03:57:02.000000000 +0000 +++ v4l-utils-0.9.3+r1676/debian/changelog 2013-04-28 22:36:08.000000000 +0000 @@ -1,8 +1,8 @@ -v4l-utils (0.9.3+r1674-61~oneiric1) oneiric; urgency=low +v4l-utils (0.9.3+r1676-61~oneiric1) oneiric; urgency=low * Auto build. - -- Launchpad Package Builder Mon, 22 Apr 2013 03:57:02 +0000 + -- Launchpad Package Builder Sun, 28 Apr 2013 22:36:08 +0000 v4l-utils (0.9.3-1) experimental; urgency=low diff -Nru v4l-utils-0.9.3+r1674/utils/dvb/dvbv5-zap.c v4l-utils-0.9.3+r1676/utils/dvb/dvbv5-zap.c --- v4l-utils-0.9.3+r1674/utils/dvb/dvbv5-zap.c 2013-04-22 03:57:01.000000000 +0000 +++ v4l-utils-0.9.3+r1676/utils/dvb/dvbv5-zap.c 2013-04-28 22:36:07.000000000 +0000 @@ -55,7 +55,7 @@ unsigned diseqc_wait, silent, verbose, frontend_only, freq_bpf; unsigned timeout, dvr, rec_psi, exit_after_tuning; unsigned record; - unsigned n_apid, n_vpid; + unsigned n_apid, n_vpid, all_pids; enum file_formats input_format, output_format; unsigned traffic_monitor, low_traffic; char *search; @@ -65,29 +65,30 @@ }; static const struct argp_option options[] = { + {"dvbv3", '3', NULL, 0, "Use DVBv3 only", 0}, {"adapter", 'a', "adapter#", 0, "use given adapter (default 0)", 0}, - {"frontend", 'f', "frontend#", 0, "use given frontend (default 0)", 0}, - {"demux", 'd', "demux#", 0, "use given demux (default 0)", 0}, {"audio_pid", 'A', "audio_pid#", 0, "audio pid program to use (default 0)", 0}, - {"video_pid", 'V', "video_pid#", 0, "video pid program to use (default 0)", 0}, + {"channels", 'c', "file", 0, "read channels list from 'file'", 0}, + {"demux", 'd', "demux#", 0, "use given demux (default 0)", 0}, + {"frontend", 'f', "frontend#", 0, "use given frontend (default 0)", 0}, + {"frontend", 'F', NULL, 0, "set up frontend only, don't touch demux", 0}, + {"input-format", 'I', "format", 0, "Input format: ZAP, CHANNEL, DVBV5 (default: DVBV5)", 0}, {"lnbf", 'l', "LNBf_type", 0, "type of LNBf to use. 'help' lists the available ones", 0}, + {"search", 'L', NULL, 0, "search/look for a string inside the traffic", 0}, + {"monitor", 'm', NULL, 0, "monitors de DVB traffic", 0}, + {"output", 'o', "file", 0, "output filename (use -o - for stdout)", 0}, + {"pat", 'p', NULL, 0, "add pat and pmt to TS recording (implies -r)", 0}, + {"all-pids", 'P', NULL, 0, "don't filter any pids. Instead, outputs all of them", 0 }, + {"record", 'r', NULL, 0, "set up /dev/dvb/adapterX/dvr0 for TS recording", 0}, + {"silence", 's', NULL, 0, "increases silence (can be used more than once)", 0}, {"sat_number", 'S', "satellite_number", 0, "satellite number. If not specified, disable DISEqC", 0}, + {"timeout", 't', "seconds", 0, "timeout for zapping and for recording", 0}, {"freq_bpf", 'U', "frequency", 0, "SCR/Unicable band-pass filter frequency to use, in kHz", 0}, + {"verbose", 'v', NULL, 0, "verbose debug messages (can be used more than once)", 0}, + {"video_pid", 'V', "video_pid#", 0, "video pid program to use (default 0)", 0}, {"wait", 'W', "time", 0, "adds additional wait time for DISEqC command completion", 0}, - {"channels", 'c', "file", 0, "read channels list from 'file'", 0}, {"exit", 'x', NULL, 0, "exit after tuning", 0}, - {"record", 'r', NULL, 0, "set up /dev/dvb/adapterX/dvr0 for TS recording", 0}, - {"pat", 'p', NULL, 0, "add pat and pmt to TS recording (implies -r)", 0}, - {"silence", 's', NULL, 0, "increases silence (can be used more than once)", 0}, - {"verbose", 'v', NULL, 0, "verbose debug messages (can be used more than once)", 0}, - {"frontend", 'F', NULL, 0, "set up frontend only, don't touch demux", 0}, - {"timeout", 't', "seconds", 0, "timeout for zapping and for recording", 0}, - {"output", 'o', "file", 0, "output filename (use -o - for stdout)", 0}, - {"input-format", 'I', "format", 0, "Input format: ZAP, CHANNEL, DVBV5 (default: DVBV5)", 0}, - {"dvbv3", '3', NULL, 0, "Use DVBv3 only", 0}, - {"monitor", 'm', NULL, 0, "monitors the DVB traffic", 0}, {"low_traffic", 'X', NULL, 0, "also shows DVB traffic with less then 1 packet per second", 0}, - {"search", 'L', NULL, 0, "search/look for a string inside the traffic", 0}, { 0, 0, 0, 0, 0, 0 } }; @@ -466,6 +467,10 @@ break; case 'V': args->n_vpid = strtoul(optarg, NULL, 0); + break; + case 'P': + args->all_pids++; + break; case '3': args->force_dvbv3 = 1; break; @@ -744,9 +749,17 @@ return -1; } + if (args.all_pids++) { + vpid = 0x2000; + apid = 0; + } if (vpid >= 0) { - if (args.silent < 2) - fprintf(stderr, "video pid %d\n", vpid); + if (args.silent < 2) { + if (vpid == 0x2000) + fprintf(stderr, "pass all PID's to TS\n"); + else + fprintf(stderr, "video pid %d\n", vpid); + } if ((video_fd = open(args.demux_dev, O_RDWR)) < 0) { PERROR("failed opening '%s'", args.demux_dev); return -1;