summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxartigas <xartigas@2b0047a9-a6d8-0310-accf-f7200b2a168c>2012-02-15 11:10:15 +0000
committerxartigas <xartigas@2b0047a9-a6d8-0310-accf-f7200b2a168c>2012-02-15 11:10:15 +0000
commitea3dabd316522c347a634bdf287e258df08f55e5 (patch)
treeb53fe2b860867221f262656dc97a72f7d88d7eb0
parentccdfa31fd7ef0784dc8a69c3c7ff153f4f3cbbc1 (diff)
* src/bitstream.h:
Fix Visual Studio build. It is unclear that this assembly optimization would bring benefits, since VS does not handle well registers modified inside _asm blocks. git-svn-id: https://core.fluendo.com/gstreamer/svn/trunk/gst-fluendo-mp3@2236 2b0047a9-a6d8-0310-accf-f7200b2a168c
-rw-r--r--ChangeLog7
-rw-r--r--src/bitstream.h4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1257bee..9185b9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-15 Xavi Artigas <xartigas@fluendo.com>
+
+ * src/bitstream.h:
+ Fix Visual Studio build. It is unclear that this assembly
+ optimization would bring benefits, since VS does not handle
+ well registers modified inside _asm blocks.
+
2012-01-27 Josep Torra <josep@fluendo.com>
* src/bitstream.c: (bs_free_buffer), (bs_add_buffer):
diff --git a/src/bitstream.h b/src/bitstream.h
index e8078a4..bdf9338 100644
--- a/src/bitstream.h
+++ b/src/bitstream.h
@@ -279,7 +279,7 @@ h_getbits (huffdec_bitbuf * bb, guint N)
bb->remaining -= 4;
/* we need reverse the byte order */
-#if defined(HAVE_CPU_I386)
+#if defined(HAVE_CPU_I386) && !defined (_MSC_VER)
register guint32 tmp = *((guint32 *) (bb->buf + bb->buf_byte_idx));
__asm__ ("bswap %0 \n\t": "=r" (tmp):"0" (tmp));
bb->accumulator = tmp;
@@ -342,7 +342,7 @@ h_get1bit (huffdec_bitbuf * bb)
bb->remaining -= 4;
/* we need reverse the byte order */
-#if defined(HAVE_CPU_I386)
+#if defined(HAVE_CPU_I386) && !defined (_MSC_VER)
register guint32 tmp = *((guint32 *) (bb->buf + bb->buf_byte_idx));
__asm__ ("bswap %0 \n\t": "=r" (tmp):"0" (tmp));
bb->accumulator = tmp;