summaryrefslogtreecommitdiffstats
path: root/DOCS/tech
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 15:27:58 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-30 15:27:58 +0300
commit6f199ab3d97a1a5831f261fd5fc46d592ae1cdff (patch)
treea785da88f8fc1ffd73619d528bfac70a795d2f51 /DOCS/tech
parent18657beb190b3e4acc6404c3b87e6eafbd22de3c (diff)
parent8c9cb24a48373330e9bfd4568eb7987890b19f8f (diff)
downloadmpv-6f199ab3d97a1a5831f261fd5fc46d592ae1cdff.tar.bz2
mpv-6f199ab3d97a1a5831f261fd5fc46d592ae1cdff.tar.xz
Merge svn changes up to r31169
Diffstat (limited to 'DOCS/tech')
-rw-r--r--DOCS/tech/MAINTAINERS1
-rw-r--r--DOCS/tech/binary-packaging.txt2
-rw-r--r--DOCS/tech/general.txt2
3 files changed, 2 insertions, 3 deletions
diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
index e2fcf01862..5c690a0c1e 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -91,7 +91,6 @@ Imported libs/projects:
* VIDIX core: Benjamin Zores
* mp3lib: None
* loader: None
- * liba52: None
* libmpeg2: None
* libdvdcss: Diego Biurrun
* libdvdread: Diego Biurrun
diff --git a/DOCS/tech/binary-packaging.txt b/DOCS/tech/binary-packaging.txt
index 974a20d46f..6cc485ef2b 100644
--- a/DOCS/tech/binary-packaging.txt
+++ b/DOCS/tech/binary-packaging.txt
@@ -45,7 +45,7 @@ the following features MUST be included in any official binary package:
* codecs
- FAAD(internal)
- libavcodec(internal)
- - native codecs (libmpeg2/liba52/mp3lib)
+ - native codecs (libmpeg2/mp3lib)
- Vorbis Tremor codec(internal)
- RealPlayer codecs support (*)
- Win32/VfW/DShow/QT codecs support (*)
diff --git a/DOCS/tech/general.txt b/DOCS/tech/general.txt
index b9ac61ff10..36a584b746 100644
--- a/DOCS/tech/general.txt
+++ b/DOCS/tech/general.txt
@@ -196,7 +196,7 @@ Now, go on:
Only used if none of the above works.
4. Codecs. Consists of libmpcodecs/* and separate files or libs,
- for example liba52, libmpeg2, loader, mp3lib.
+ for example libmpeg2, loader, mp3lib.
mplayer.c doesn't call them directly, but through the dec_audio.c and
dec_video.c files, so the mplayer.c doesn't have to know anything about