[vlc-commits] commit: Fix build of mpeg2 module with old libmpeg2 on arm ( Christophe Mutricy )

git at videolan.org git at videolan.org
Wed Jun 30 01:19:29 CEST 2010


vlc/vlc-1.1 | branch: master | Christophe Mutricy <xtophe at videolan.org> | Mon Jun 28 18:59:42 2010 +0100| [a688499e114445e91405bbed01b3ec2cbd9f75d0] | committer: Christophe Mutricy 

Fix build of mpeg2 module with old libmpeg2 on arm
(cherry picked from commit 8940931e6375cce95b08079342c7bb8f25788e0a)

Signed-off-by: Christophe Mutricy <xtophe at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=a688499e114445e91405bbed01b3ec2cbd9f75d0
---

 modules/codec/libmpeg2.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c
index 1189ee9..62d359c 100644
--- a/modules/codec/libmpeg2.c
+++ b/modules/codec/libmpeg2.c
@@ -213,7 +213,7 @@ static int OpenDecoder( vlc_object_t *p_this )
         i_accel |= MPEG2_ACCEL_PPC_ALTIVEC;
     }
 
-#elif defined(__arm__)
+#elif defined(__arm__) && defined(MPEG2_ACCEL_ARM)
     i_accel |= MPEG2_ACCEL_ARM;
 
 # ifdef MPEG2_ACCEL_ARM_NEON



More information about the vlc-commits mailing list