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

Side by Side Diff: media/formats/mp4/box_definitions.h

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 4 years, 12 months 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/bitstream_converter.h ('k') | media/formats/mp4/box_reader.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 #ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 5 #ifndef MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
6 #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 6 #define MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
7 7
8 #include <stddef.h>
9 #include <stdint.h>
10
8 #include <string> 11 #include <string>
9 #include <vector> 12 #include <vector>
10 13
11 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
12 #include "media/base/media_export.h" 15 #include "media/base/media_export.h"
13 #include "media/base/media_log.h" 16 #include "media/base/media_log.h"
14 #include "media/base/video_codecs.h" 17 #include "media/base/video_codecs.h"
15 #include "media/formats/mp4/aac.h" 18 #include "media/formats/mp4/aac.h"
16 #include "media/formats/mp4/avc.h" 19 #include "media/formats/mp4/avc.h"
17 #include "media/formats/mp4/box_reader.h" 20 #include "media/formats/mp4/box_reader.h"
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 std::vector<TrackFragment> tracks; 434 std::vector<TrackFragment> tracks;
432 std::vector<ProtectionSystemSpecificHeader> pssh; 435 std::vector<ProtectionSystemSpecificHeader> pssh;
433 }; 436 };
434 437
435 #undef DECLARE_BOX 438 #undef DECLARE_BOX
436 439
437 } // namespace mp4 440 } // namespace mp4
438 } // namespace media 441 } // namespace media
439 442
440 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_ 443 #endif // MEDIA_FORMATS_MP4_BOX_DEFINITIONS_H_
OLDNEW
« no previous file with comments | « media/formats/mp4/bitstream_converter.h ('k') | media/formats/mp4/box_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698