summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed von Merkatz2010-01-02 19:41:28 +0100
committerArwed von Merkatz2010-01-02 20:47:58 +0100
commit717a3eb47d13ce37e1698ac53b4ef399d7e98358 (patch)
treee629f11067b5ea111f5f170d6afbfa9689b1e9a2
parent5c454e0ae8ab5614ec5dc76ef713d73e8719c132 (diff)
xine-lib: LIBAVCODEC is mandatory, bug 15541
(cherry picked from commit 6f90e076d8a9f1aa3821130f912d63c3b5d39504)
-rwxr-xr-xvideo-libs/xine-lib/DEPENDS2
-rw-r--r--video-libs/xine-lib/HISTORY4
2 files changed, 5 insertions, 1 deletions
diff --git a/video-libs/xine-lib/DEPENDS b/video-libs/xine-lib/DEPENDS
index 94195cd8fa..cd73147a22 100755
--- a/video-libs/xine-lib/DEPENDS
+++ b/video-libs/xine-lib/DEPENDS
@@ -34,7 +34,7 @@ optional_depends "libmng" "" "" "for MNG file support" &&
optional_depends "win32codecs" "" "" "to use win32 dlls for video/audio decoding" "z-rejected" &&
optional_depends "quicktime-codecs" "" "" "for addtional video/audio codecs used in quicktime files" "z-rejected" &&
optional_depends "real-codecs" "" "" "for RealMedia decoding" "z-rejected" &&
-optional_depends "LIBAVCODEC" "--with-external-ffmpeg=/usr" "" "to use external libavcodec" &&
+depends LIBAVCODEC &&
optional_depends "libtheora" "" "" "for OGG/Theora video support" &&
optional_depends "libdvdcss" "" "" "to play encrypted DVDs" &&
optional_depends "speex" "" "" "for speech compression" &&
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 58988ba49a..a8a3e03c83 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,7 @@
+2010-01-02 Arwed v. Merkatz <v.merkatz@gmx.net>
+ * DEPENDS: LIBAVCODEC is mandatory, the included ffmpeg is too old,
+ bug #15541
+
2009-12-19 Vasil Yonkov <spirtbrat@sourcemage.org>
* PROVIDES: removed