From: "Luca Barbato (lu_zero)" <lu_zero@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-video/libav/files: 0001-cpu.h-define-AV_CPU_FLAG_MMX2-for-libavutil-major-52.patch
Date: Thu, 20 Dec 2012 16:59:09 +0000 (UTC) [thread overview]
Message-ID: <20121220165909.BBCE42171C@flycatcher.gentoo.org> (raw)
lu_zero 12/12/20 16:59:09
Added:
0001-cpu.h-define-AV_CPU_FLAG_MMX2-for-libavutil-major-52.patch
Log:
Backport upstream fix
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 1191738E)
Revision Changes Path
1.1 media-video/libav/files/0001-cpu.h-define-AV_CPU_FLAG_MMX2-for-libavutil-major-52.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/files/0001-cpu.h-define-AV_CPU_FLAG_MMX2-for-libavutil-major-52.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/libav/files/0001-cpu.h-define-AV_CPU_FLAG_MMX2-for-libavutil-major-52.patch?rev=1.1&content-type=text/plain
Index: 0001-cpu.h-define-AV_CPU_FLAG_MMX2-for-libavutil-major-52.patch
===================================================================
From 8f5587c3d0bc4b5f075e4282215bda91a21fc12e Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-libav@jannau.net>
Date: Fri, 16 Nov 2012 14:55:08 +0100
Subject: [PATCH] cpu.h: define AV_CPU_FLAG_MMX2 for libavutil major 52
---
libavutil/cpu.h | 2 +-
libavutil/version.h | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index 01f7201..4929512 100644
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -28,7 +28,7 @@
/* lower 16 bits - CPU features */
#define AV_CPU_FLAG_MMX 0x0001 ///< standard MMX
#define AV_CPU_FLAG_MMXEXT 0x0002 ///< SSE integer functions or AMD MMX ext
-#if LIBAVUTIL_VERSION_MAJOR < 52
+#if FF_API_CPU_FLAG_MMX2
#define AV_CPU_FLAG_MMX2 0x0002 ///< SSE integer functions or AMD MMX ext
#endif
#define AV_CPU_FLAG_3DNOW 0x0004 ///< AMD 3DNOW
diff --git a/libavutil/version.h b/libavutil/version.h
index 6f79eeb..f69c73e 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -76,6 +76,9 @@
#ifndef FF_API_AUDIOCONVERT
#define FF_API_AUDIOCONVERT (LIBAVUTIL_VERSION_MAJOR < 53)
#endif
+#ifndef FF_API_CPU_FLAG_MMX2
+#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
/**
* @}
--
1.7.12
next reply other threads:[~2012-12-20 16:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-20 16:59 Luca Barbato (lu_zero) [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-01-01 10:40 [gentoo-commits] gentoo-x86 commit in media-video/libav/files: 0001-cpu.h-define-AV_CPU_FLAG_MMX2-for-libavutil-major-52.patch Tomas Chvatal (scarabeus)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121220165909.BBCE42171C@flycatcher.gentoo.org \
--to=lu_zero@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox