diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-25 17:08:48 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-25 17:08:48 -0600 |
| commit | bdf583dd1cbec85e2760a6825d3ddf571c791870 (patch) | |
| tree | a97b66970f20ce2330816ca2a5e3d405a293c7ed /linux/Documentation | |
| parent | 52e19741ce48048ada5cc3b87c065dec5b100b8d (diff) | |
| parent | afb2abb44347c884e3a8a2ddf7151756c1869d2f (diff) | |
| download | mediapointer-dvb-s2-bdf583dd1cbec85e2760a6825d3ddf571c791870.tar.gz mediapointer-dvb-s2-bdf583dd1cbec85e2760a6825d3ddf571c791870.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/Documentation')
| -rw-r--r-- | linux/Documentation/dvb/get_dvb_firmware | 2 | ||||
| -rw-r--r-- | linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/linux/Documentation/dvb/get_dvb_firmware b/linux/Documentation/dvb/get_dvb_firmware index bb55f49f2..15fc8fbef 100644 --- a/linux/Documentation/dvb/get_dvb_firmware +++ b/linux/Documentation/dvb/get_dvb_firmware @@ -246,7 +246,7 @@ sub vp7041 { } sub dibusb { - my $url = "http://www.linuxtv.org/downloads/firmware/dvb-dibusb-5.0.0.11.fw"; + my $url = "http://www.linuxtv.org/downloads/firmware/dvb-usb-dibusb-5.0.0.11.fw"; my $outfile = "dvb-dibusb-5.0.0.11.fw"; my $hash = "fa490295a527360ca16dcdf3224ca243"; diff --git a/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt index 20e00e81f..64cd11134 100644 --- a/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt +++ b/linux/Documentation/video4linux/cx2341x/fw-encoder-api.txt @@ -242,14 +242,17 @@ Enum 185/0xB9 Description Assign stream type Param[0] - 0=Program Stream - 1=Transport Stream + 0=Program stream + 1=Transport stream 2=MPEG1 stream - 3=PES A/V - 5=PES Video - 7=PES Audio - 10=DVD Stream + 3=PES A/V stream + 5=PES Video stream + 7=PES Audio stream + 10=DVD stream 11=VCD stream + 12=SVCD stream + 13=DVD_S1 stream + 14=DVD_S2 stream ------------------------------------------------------------------------------- |