diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2009-01-19 23:15:33 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2009-01-19 23:15:33 +0000 |
| commit | 387f25d46c83bb944383f395c80437c778f332f8 (patch) | |
| tree | e53558698ea70560916e79222ac26a7e794edf95 /x11-misc/xvidcap | |
| parent | whitespace (diff) | |
| download | gentoo-2-387f25d46c83bb944383f395c80437c778f332f8.tar.gz gentoo-2-387f25d46c83bb944383f395c80437c778f332f8.tar.bz2 gentoo-2-387f25d46c83bb944383f395c80437c778f332f8.zip | |
Dont try to include useless and private ffmpeg header. Bug #254452
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xvidcap')
| -rw-r--r-- | x11-misc/xvidcap/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-headers.patch | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog index 67a716cd0a1d..bd8d88daf0bc 100644 --- a/x11-misc/xvidcap/ChangeLog +++ b/x11-misc/xvidcap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xvidcap # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.46 2009/01/03 22:26:01 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.47 2009/01/19 23:15:33 aballier Exp $ + + 19 Jan 2009; Alexis Ballier <aballier@gentoo.org> + files/xvidcap-1.1.7-ffmpeg-headers.patch: + Dont try to include useless and private ffmpeg header. Bug #254452 03 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> -files/xvidcap-1.1.6-ffmpeg.patch, -files/xvidcap-1.1.7_rc1-ffmpeg.patch, diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-headers.patch b/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-headers.patch index 005ed2ba4c6d..1a9aeb5ea572 100644 --- a/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-headers.patch +++ b/x11-misc/xvidcap/files/xvidcap-1.1.7-ffmpeg-headers.patch @@ -42,7 +42,7 @@ diff -wru /home/fsousa/tmp/xvidcap-1.1.7/src/xtoffmpeg.c xvidcap-1.1.7/src/xtoff -#include <ffmpeg/rgb2rgb.h> -#include <ffmpeg/fifo.h> +#include <libswscale/swscale.h> -+#include <libswscale/rgb2rgb.h> ++//#include <libswscale/rgb2rgb.h> +#include <libavutil/fifo.h> #define swscale_isRGB(x) ((x)==PIX_FMT_BGR32 || (x)==PIX_FMT_RGB24 \ || (x)==PIX_FMT_RGB565 || (x)==PIX_FMT_RGB555 \ |