| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_MP4_TRACK_RUN_ITERATOR_H_ | 5 #ifndef MEDIA_MP4_TRACK_RUN_ITERATOR_H_ |
| 6 #define MEDIA_MP4_TRACK_RUN_ITERATOR_H_ | 6 #define MEDIA_MP4_TRACK_RUN_ITERATOR_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/time.h" | 11 #include "base/time/time.h" |
| 12 #include "media/base/media_export.h" | 12 #include "media/base/media_export.h" |
| 13 #include "media/base/media_log.h" | 13 #include "media/base/media_log.h" |
| 14 #include "media/mp4/box_definitions.h" | 14 #include "media/mp4/box_definitions.h" |
| 15 #include "media/mp4/cenc.h" | 15 #include "media/mp4/cenc.h" |
| 16 | 16 |
| 17 namespace media { | 17 namespace media { |
| 18 | 18 |
| 19 class DecryptConfig; | 19 class DecryptConfig; |
| 20 | 20 |
| 21 namespace mp4 { | 21 namespace mp4 { |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 int64 sample_dts_; | 102 int64 sample_dts_; |
| 103 int64 sample_offset_; | 103 int64 sample_offset_; |
| 104 | 104 |
| 105 DISALLOW_COPY_AND_ASSIGN(TrackRunIterator); | 105 DISALLOW_COPY_AND_ASSIGN(TrackRunIterator); |
| 106 }; | 106 }; |
| 107 | 107 |
| 108 } // namespace mp4 | 108 } // namespace mp4 |
| 109 } // namespace media | 109 } // namespace media |
| 110 | 110 |
| 111 #endif // MEDIA_MP4_TRACK_RUN_ITERATOR_H_ | 111 #endif // MEDIA_MP4_TRACK_RUN_ITERATOR_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 18052007:
Use a direct include of time headers in media/. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src