diff options
| author | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-01 02:12:47 +0100 |
| commit | 84829a4ea1903e5db5782b72861fabc503a589cb (patch) | |
| tree | 26b4acbaf6dd4b255278dcc67f28bd83357c3b86 /DOCS/tech-overview.txt | |
| parent | e45dd051c304dec189d0d4d792a89c2988c3fa71 (diff) | |
| parent | f4069259cf7ffd24ac2a5b64e26a386185e94c7b (diff) | |
| download | mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.bz2 mpv-84829a4ea1903e5db5782b72861fabc503a589cb.tar.xz | |
Merge branch 'osd_changes' into master
Conflicts:
DOCS/man/en/options.rst
Diffstat (limited to 'DOCS/tech-overview.txt')
| -rw-r--r-- | DOCS/tech-overview.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/DOCS/tech-overview.txt b/DOCS/tech-overview.txt index 9ffe891c5c..d407b92caa 100644 --- a/DOCS/tech-overview.txt +++ b/DOCS/tech-overview.txt @@ -150,8 +150,7 @@ libmpcodecs/: vf_*.c and vf.c form the video filter chain. They are fed by the video decoder, and output the filtered images to the VOs though vf_vo.c. By - default, no video filters (except vf_vo) are used, though sometimes - vf_ass.c is inserted for rendering ASS subtitles, when the VO can't. + default, no video filters (except vf_vo) are used. ad_*.c and dec_audio.c/ad.c handle audio decoding. The audio filter chain is separately in libaf. |