From 9ef5badfe194907ca68a0265c5900f5146706093 Mon Sep 17 00:00:00 2001
From: Matthew Gregan <kinetik@flim.org>
Date: Fri, 26 Feb 2016 15:38:14 +1300
Subject: [PATCH] Bug 1251504 - Update libnestegg to remove generated
 nestegg-stdint.h.  r=giles

---
 media/libnestegg/README_MOZILLA           | 2 +-
 media/libnestegg/include/moz.build        | 1 -
 media/libnestegg/include/nestegg-stdint.h | 5 -----
 media/libnestegg/include/nestegg.h        | 2 +-
 media/libnestegg/src/nestegg.c            | 2 ++
 5 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 media/libnestegg/include/nestegg-stdint.h

diff --git a/media/libnestegg/README_MOZILLA b/media/libnestegg/README_MOZILLA
index 5397d2674f97..f54b4232455f 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 c84eed87f214e2a551a971b7e9fffd9a0223d6c2.
+The git commit ID used was 6f0a01d75a222032357fb829be1f56905dc9cede.
diff --git a/media/libnestegg/include/moz.build b/media/libnestegg/include/moz.build
index bbd1d0dbbdab..b8e73efde812 100644
--- a/media/libnestegg/include/moz.build
+++ b/media/libnestegg/include/moz.build
@@ -5,7 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS.nestegg += [
-    'nestegg-stdint.h',
     'nestegg.h',
 ]
 
diff --git a/media/libnestegg/include/nestegg-stdint.h b/media/libnestegg/include/nestegg-stdint.h
deleted file mode 100644
index 462232072961..000000000000
--- a/media/libnestegg/include/nestegg-stdint.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include <stdint.h>
diff --git a/media/libnestegg/include/nestegg.h b/media/libnestegg/include/nestegg.h
index 9004dfb2c354..64a5736a47aa 100644
--- a/media/libnestegg/include/nestegg.h
+++ b/media/libnestegg/include/nestegg.h
@@ -8,7 +8,7 @@
 #define NESTEGG_671cac2a_365d_ed69_d7a3_4491d3538d79
 
 #include <limits.h>
-#include <nestegg/nestegg-stdint.h>
+#include <stdint.h>
 
 #if defined(__cplusplus)
 extern "C" {
diff --git a/media/libnestegg/src/nestegg.c b/media/libnestegg/src/nestegg.c
index 61e96bee2c21..3d91cec74025 100644
--- a/media/libnestegg/src/nestegg.c
+++ b/media/libnestegg/src/nestegg.c
@@ -2142,6 +2142,8 @@ nestegg_track_seek(nestegg * ctx, unsigned int track, uint64_t tstamp)
 
   /* Seek and set up parser state for segment-level element (Cluster). */
   r = nestegg_offset_seek(ctx, ctx->segment_offset + seek_pos);
+  if (r != 0)
+    return -1;
 
   if (!ne_is_suspend_element(ctx->last_id))
     return -1;