Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: media/formats/mp4/box_reader.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/formats/mp4/box_definitions.h ('k') | media/formats/mp4/box_reader_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/formats/mp4/box_reader.h" 5 #include "media/formats/mp4/box_reader.h"
6 6
7 #include <stddef.h>
7 #include <string.h> 8 #include <string.h>
8 #include <algorithm> 9 #include <algorithm>
9 #include <set> 10 #include <set>
10 11
11 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
12 #include "media/formats/mp4/box_definitions.h" 13 #include "media/formats/mp4/box_definitions.h"
13 14
14 namespace media { 15 namespace media {
15 namespace mp4 { 16 namespace mp4 {
16 17
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 } 278 }
278 279
279 // Note that the pos_ head has advanced to the byte immediately after the 280 // Note that the pos_ head has advanced to the byte immediately after the
280 // header, which is where we want it. 281 // header, which is where we want it.
281 size_ = size; 282 size_ = size;
282 return true; 283 return true;
283 } 284 }
284 285
285 } // namespace mp4 286 } // namespace mp4
286 } // namespace media 287 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mp4/box_definitions.h ('k') | media/formats/mp4/box_reader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698