summaryrefslogtreecommitdiffstats
path: root/Documentation/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2017-09-01 14:44:31 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-09-05 06:20:28 -0400
commit7e30c077d4125b4b69717350b44b19013ef0bbe5 (patch)
tree8fd0924d2ad392c47b07aa60e8c465f73e1ad5b3 /Documentation/media
parent90b588a9b45cf64d2b7d83fc5f496a6ffb4f70cc (diff)
downloadlinux-7e30c077d4125b4b69717350b44b19013ef0bbe5.tar.bz2
media: intro.rst: don't assume audio and video codecs to be MPEG2
Originally, when DVB was introduced, all codecs would be part of MPEG2 standard. That's not true anymore, as there are a large number of codec standards used on digital TV nowadays. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'Documentation/media')
-rw-r--r--Documentation/media/uapi/dvb/intro.rst9
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/media/uapi/dvb/intro.rst b/Documentation/media/uapi/dvb/intro.rst
index fbae687414ce..79b4d0e4e920 100644
--- a/Documentation/media/uapi/dvb/intro.rst
+++ b/Documentation/media/uapi/dvb/intro.rst
@@ -94,11 +94,10 @@ Demultiplexer which filters the incoming Digital TV MPEG-TS stream
streams it also contains data streams with information about the
programs offered in this or other streams of the same provider.
-MPEG2 audio and video decoder
- The main targets of the demultiplexer are the MPEG2 audio and video
- decoders. After decoding they pass on the uncompressed audio and
- video to the computer screen or (through a PAL/NTSC encoder) to a TV
- set.
+Audio and video decoder
+ The main targets of the demultiplexer are audio and video
+ decoders. After decoding, they pass on the uncompressed audio and
+ video to the computer screen or to a TV set.
.. note::