Gentoo Archives: gentoo-commits

From:	"PaweA Hajdan (phajdan.jr)" <phajdan.jr@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-ffmpeg-build-r0.patch
Date:	Sat, 02 Apr 2011 13:28:50
Message-Id:	`20110402132839.19DE220057@flycatcher.gentoo.org`

1	phajdan.jr 11/04/02 13:28:39
2
3	Added: chromium-ffmpeg-build-r0.patch
4	Log:
5	Backport upstream FFmpeg compatibility patch, bug #355405 by Philipp <sefi@×××××××.de>.
6
7	(Portage version: 2.1.9.42/cvs/Linux i686)
8
9	Revision Changes Path
10	1.1 www-client/chromium/files/chromium-ffmpeg-build-r0.patch
11
12	file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-build-r0.patch?rev=1.1&view=markup
13	plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-build-r0.patch?rev=1.1&content-type=text/plain
14
15	Index: chromium-ffmpeg-build-r0.patch
16	===================================================================
17	Index: media/ffmpeg/ffmpeg_common.h
18	diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
19	index ac1774a5b1dc7a80aee96e7e35fa2f5366e8f589..46dbe07bf5dad14e897b21b7f479776127ff7ef7 100644
20	--- a/media/ffmpeg/ffmpeg_common.h
21	+++ b/media/ffmpeg/ffmpeg_common.h
22	@@ -19,11 +19,15 @@ extern "C" {
23	// TODO(scherkus): fix and upstream the compiler warnings.
24	MSVC_PUSH_DISABLE_WARNING(4244);
25	#include <libavcodec/avcodec.h>
26	-#include <libavcore/samplefmt.h>
27	#include <libavformat/avformat.h>
28	#include <libavformat/avio.h>
29	#include <libavutil/avutil.h>
30	#include <libavutil/log.h>
31	+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(50, 38, 0)
32	+#include <libavutil/samplefmt.h>
33	+#else
34	+#include <libavcore/samplefmt.h>
35	+#endif
36	MSVC_POP_WARNING();
37	} // extern "C"