Bug 1251504 - Update libnestegg to remove generated nestegg-stdint.h. r=giles
authorMatthew Gregan <kinetik@flim.org>
Fri, 26 Feb 2016 15:38:14 +1300
changeset 324224 16d458be65b39e5e4851e1328e1f8ec9a924db6d
parent 324223 764c86198573e102dd4fdc2c48a6e760dcdfe882
child 324225 ade444def97280077c3d3972b1d9c8601f6bda25
push id1128
push userjlund@mozilla.com
push dateWed, 01 Jun 2016 01:31:59 +0000
treeherdermozilla-release@fe0d30de989d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgiles
bugs1251504
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1251504 - Update libnestegg to remove generated nestegg-stdint.h. r=giles
media/libnestegg/README_MOZILLA
media/libnestegg/include/moz.build
media/libnestegg/include/nestegg-stdint.h
media/libnestegg/include/nestegg.h
media/libnestegg/src/nestegg.c
--- a/media/libnestegg/README_MOZILLA
+++ b/media/libnestegg/README_MOZILLA
@@ -1,8 +1,8 @@
 The source from this directory was copied from the nestegg
 git repository using the update.sh script.  The only changes
 made were those applied by update.sh and the addition of
 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.
--- a/media/libnestegg/include/moz.build
+++ b/media/libnestegg/include/moz.build
@@ -1,11 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 EXPORTS.nestegg += [
-    'nestegg-stdint.h',
     'nestegg.h',
 ]
 
deleted file mode 100644
--- 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>
--- a/media/libnestegg/include/nestegg.h
+++ b/media/libnestegg/include/nestegg.h
@@ -3,17 +3,17 @@
  *
  * This program is made available under an ISC-style license.  See the
  * accompanying file LICENSE for details.
  */
 #if !defined(NESTEGG_671cac2a_365d_ed69_d7a3_4491d3538d79)
 #define NESTEGG_671cac2a_365d_ed69_d7a3_4491d3538d79
 
 #include <limits.h>
-#include <nestegg/nestegg-stdint.h>
+#include <stdint.h>
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
 
 /** @mainpage
 
     @section intro Introduction
--- a/media/libnestegg/src/nestegg.c
+++ b/media/libnestegg/src/nestegg.c
@@ -2137,16 +2137,18 @@ nestegg_track_seek(nestegg * ctx, unsign
   if (pos == NULL)
     return -1;
 
   if (ne_get_uint(pos->cluster_position, &seek_pos) != 0)
     return -1;
 
   /* 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;
 
   return 0;
 }
 
 int