summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-02-10 17:26:08 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-02-10 17:26:08 +0000
commit5c2144fc9e1fc812dadba98b8bdccbd6f9639460 (patch)
tree50f719ed173d65937901ca6176c88c9827563c51
parentec17a06e90ae960595fce584ce1b161f2674293e (diff)
downloadxine-lib-5c2144fc9e1fc812dadba98b8bdccbd6f9639460.tar.gz
xine-lib-5c2144fc9e1fc812dadba98b8bdccbd6f9639460.tar.bz2
Disable libmpeg2new for release.
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am1
3 files changed, 0 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index bdfaf1d23..b279fd1f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,6 @@ xine-lib (1.1.17) 2009-??-??
* Fix an error in Matroska PTS calculation.
* Some front ends hang due to the hang fixes in 1.1.16. Fix this by
removing a break statement.
- * Enable libmpeg2new. This is not yet production code; the old mpeg2
- decoder remains the default.
* Fix broken size checks in various input plugins (ref. CVE-2008-5239).
* More malloc checking (ref. CVE-2008-5240).
* Fix race conditions in gapless_switch (ref. kde bug #180339)
diff --git a/configure.ac b/configure.ac
index 55450c780..e5b1d110a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2731,9 +2731,6 @@ src/libffmpeg/libavcodec/libpostproc/Makefile
src/libffmpeg/libavutil/Makefile
src/libmad/Makefile
src/libmpeg2/Makefile
-src/libmpeg2new/Makefile
-src/libmpeg2new/libmpeg2/Makefile
-src/libmpeg2new/include/Makefile
src/libmusepack/Makefile
src/libmusepack/musepack/Makefile
src/libspudec/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 249bbc2b6..6718b4805 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,6 @@ SUBDIRS = \
demuxers \
libffmpeg \
libmpeg2 \
- libmpeg2new \
liba52 \
libspudec \
libspucc \