From e207a618576ad61275a40958846d6509df686ad6 Mon Sep 17 00:00:00 2001
From: Kovensky <diogomfranco@gmail.com>
Date: Thu, 8 Oct 2009 23:00:58 -0300
Subject: [PATCH] Yet another failed merge

---
 liba52/imdct.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/liba52/imdct.c b/liba52/imdct.c
index 60bab5338c..766cacb422 100644
--- a/liba52/imdct.c
+++ b/liba52/imdct.c
@@ -1267,7 +1267,6 @@ void a52_imdct_init (uint32_t mm_accel)
 	  a52_imdct_512 = imdct_do_512_sse;
 	}
 	else*/
-#endif
 	if(mm_accel & MM_ACCEL_X86_3DNOWEXT)
 	{
 	  fprintf (stderr, "Using 3DNowEx optimized IMDCT transform\n");
-- 
2.11.4.GIT