From 78cd11b4eaaae3064495b902447f0ad90a005f59 Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Thu, 22 Jan 2015 15:04:39 +1300
Subject: [PATCH] Bug 1124518 - Update libnestegg.  r=ehsan

---
 media/libnestegg/README_MOZILLA |  2 +-
 media/libnestegg/src/align.h    | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/media/libnestegg/README_MOZILLA b/media/libnestegg/README_MOZILLA
index 711abdcf3d9..690cdee2962 100644
--- a/media/libnestegg/README_MOZILLA
+++ b/media/libnestegg/README_MOZILLA
@@ -5,4 +5,4 @@ Makefile.in build files for the Mozilla build system.
 
 The nestegg git repository is: git://github.com/kinetiknz/nestegg.git
 
-The git commit ID used was fa610276b66c2a62415fc957483e9adc0a55de5e.
+The git commit ID used was 17ae8cd3cb5d87c2ebdcd48cae4910f5dd86ae93.
diff --git a/media/libnestegg/src/align.h b/media/libnestegg/src/align.h
index 4c6e1831f6d..58c82b4354f 100644
--- a/media/libnestegg/src/align.h
+++ b/media/libnestegg/src/align.h
@@ -15,6 +15,15 @@
 #ifndef _LIBP_ALIGN_H_
 #define _LIBP_ALIGN_H_
 
+#ifdef _MSC_VER
+
+/*
+ * MSVC defines max_align_t as a double.
+ */
+typedef double max_align_t;
+
+#else
+
 /*
  *	a type with the most strict alignment requirements
  */
@@ -34,3 +43,5 @@ typedef union max_align max_align_t;
 
 #endif
 
+#endif
+