From 858ac903bfd5f277102e11789260deb7335aa3af Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@mozilla.com>
Date: Wed, 25 Jun 2014 13:13:00 -0700
Subject: [PATCH] Bug 1030308 - Clean up EbmlBufferWriter. r=cajbir DONTBUILD

Fix comments to match code and correct indenting.
---
 media/libmkv/EbmlBufferWriter.c | 14 +++++------
 media/libmkv/cleanup.patch      | 41 +++++++++++++++++++++++++++++++++
 media/libmkv/update.sh          |  1 +
 3 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 media/libmkv/cleanup.patch

diff --git a/media/libmkv/EbmlBufferWriter.c b/media/libmkv/EbmlBufferWriter.c
index 8c26e80656e1a..59255042cccac 100644
--- a/media/libmkv/EbmlBufferWriter.c
+++ b/media/libmkv/EbmlBufferWriter.c
@@ -14,21 +14,21 @@ Ebml_Serialize(EbmlGlobal *glob, const void *buffer_in, int buffer_size, unsigne
   /* buffer_size:
    * 1 - int8_t;
    * 2 - int16_t;
-   * 3 - int32_t;
-   * 4 - int64_t;
+   * 4 - int32_t;
+   * 8 - int64_t;
    */
   long i;
   for(i = len-1; i >= 0; i--) {
     unsigned char x;
     if (buffer_size == 1) {
       x = (char)(*(const int8_t *)buffer_in >> (i * 8));
-	} else if (buffer_size == 2) {
+    } else if (buffer_size == 2) {
       x = (char)(*(const int16_t *)buffer_in >> (i * 8));
-	} else if (buffer_size == 4) {
+    } else if (buffer_size == 4) {
       x = (char)(*(const int32_t *)buffer_in >> (i * 8));
-	} else if (buffer_size == 8) {
+    } else if (buffer_size == 8) {
       x = (char)(*(const int64_t *)buffer_in >> (i * 8));
-	}
+    }
     Ebml_Write(glob, &x, 1);
   }
 }
@@ -65,7 +65,7 @@ void Ebml_StartSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc, unsigned long clas
   Ebml_WriteID(glob, class_id);
   ebmlLoc->offset = glob->offset;
   // todo this is always taking 8 bytes, this may need later optimization
-  Ebml_Serialize(glob, (void *)&unknownLen,sizeof(unknownLen), 8); // this is a key that says lenght unknown
+  Ebml_Serialize(glob, (void *)&unknownLen,sizeof(unknownLen), 8); // this is a key that says length unknown
 }
 
 void Ebml_EndSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc) {
diff --git a/media/libmkv/cleanup.patch b/media/libmkv/cleanup.patch
new file mode 100644
index 0000000000000..7b848e6c80e0f
--- /dev/null
+++ b/media/libmkv/cleanup.patch
@@ -0,0 +1,41 @@
+diff --git a/media/libmkv/EbmlBufferWriter.c b/media/libmkv/EbmlBufferWriter.c
+index 8c26e80..5925504 100644
+--- a/media/libmkv/EbmlBufferWriter.c
++++ b/media/libmkv/EbmlBufferWriter.c
+@@ -14,21 +14,21 @@ Ebml_Serialize(EbmlGlobal *glob, const void *buffer_in, int buffer_size, unsigne
+   /* buffer_size:
+    * 1 - int8_t;
+    * 2 - int16_t;
+-   * 3 - int32_t;
+-   * 4 - int64_t;
++   * 4 - int32_t;
++   * 8 - int64_t;
+    */
+   long i;
+   for(i = len-1; i >= 0; i--) {
+     unsigned char x;
+     if (buffer_size == 1) {
+       x = (char)(*(const int8_t *)buffer_in >> (i * 8));
+-	} else if (buffer_size == 2) {
++    } else if (buffer_size == 2) {
+       x = (char)(*(const int16_t *)buffer_in >> (i * 8));
+-	} else if (buffer_size == 4) {
++    } else if (buffer_size == 4) {
+       x = (char)(*(const int32_t *)buffer_in >> (i * 8));
+-	} else if (buffer_size == 8) {
++    } else if (buffer_size == 8) {
+       x = (char)(*(const int64_t *)buffer_in >> (i * 8));
+-	}
++    }
+     Ebml_Write(glob, &x, 1);
+   }
+ }
+@@ -65,7 +65,7 @@ void Ebml_StartSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc, unsigned long clas
+   Ebml_WriteID(glob, class_id);
+   ebmlLoc->offset = glob->offset;
+   // todo this is always taking 8 bytes, this may need later optimization
+-  Ebml_Serialize(glob, (void *)&unknownLen,sizeof(unknownLen), 8); // this is a key that says lenght unknown
++  Ebml_Serialize(glob, (void *)&unknownLen,sizeof(unknownLen), 8); // this is a key that says length unknown
+ }
+ 
+ void Ebml_EndSubElement(EbmlGlobal *glob, EbmlLoc *ebmlLoc) {
diff --git a/media/libmkv/update.sh b/media/libmkv/update.sh
index 3c8ed439610fd..8f5e34c460c92 100644
--- a/media/libmkv/update.sh
+++ b/media/libmkv/update.sh
@@ -36,3 +36,4 @@ patch -p1 < gecko_fix.patch
 patch -p1 < const_fix.patch
 patch -p3 < bock_fix.patch
 patch -p3 < bug970774.patch
+patch -p3 < cleanup.patch