summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2007-07-09 09:36:47 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2007-07-09 09:36:47 +0000
commit2acb41b416d55661ded2d6c64930ca5b08f1fe4c (patch)
treeb7a8ae709e52f39dae08b95249a8b1fc00b62224 /media-plugins/vdr-softdevice
parentremove space from description (diff)
downloadgentoo-2-2acb41b416d55661ded2d6c64930ca5b08f1fe4c.tar.gz
gentoo-2-2acb41b416d55661ded2d6c64930ca5b08f1fe4c.tar.bz2
gentoo-2-2acb41b416d55661ded2d6c64930ca5b08f1fe4c.zip
Updated ffmpeg patch to get away the last unresolved symbols.
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'media-plugins/vdr-softdevice')
-rw-r--r--media-plugins/vdr-softdevice/ChangeLog6
-rw-r--r--media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff25
2 files changed, 30 insertions, 1 deletions
diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 4215e2b5a6c9..a4a6305a35d5 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-plugins/vdr-softdevice
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.41 2007/07/03 14:22:13 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.42 2007/07/09 09:36:47 zzam Exp $
+
+ 09 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+ files/patches-0.4.0/new-ffmpeg-extern-c.diff:
+ Updated ffmpeg patch to get away the last unresolved symbols.
03 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+files/patches-0.4.0/new-ffmpeg-extern-c.diff, files/patches-0.4.0/series,
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff b/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff
index e4fca0bd738c..e5148463b03b 100644
--- a/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff
+++ b/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff
@@ -26,3 +26,28 @@ Index: softdevice-cvs/configure
int main(void) {
/* if ( avcodec_build() != LIBAVCODEC_BUILD ) {
fprintf(stderr,"Fatal Error! Libavcodec library build(%d) doesn't match avcodec.h build(%d)!!!\n",avcodec_build(),LIBAVCODEC_BUILD);
+Index: softdevice-cvs/VideoFilter.h
+===================================================================
+--- softdevice-cvs.orig/VideoFilter.h
++++ softdevice-cvs/VideoFilter.h
+@@ -14,8 +14,10 @@
+
+ #ifdef PP_LIBAVCODEC
+ #include <stdint.h> //needed by postproc.h
++extern "C" {
+ #include <postprocess.h>
+ //#include <postproc/postprocess.h>
++}
+ #endif //PP_LIBAVCODEC
+
+ #include "video.h"
+@@ -60,7 +62,9 @@ public:
+ };
+
+ #ifdef USE_SWSCALE
++extern "C" {
+ #include <swscale.h>
++}
+ #endif
+ class cImageConvert : public cVideoFilter {
+ sPicBuffer *outBuf;