| OLD | NEW |
|---|
| 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_AVC_H_ | 5 #ifndef MEDIA_FORMATS_MP4_AVC_H_ |
| 6 #define MEDIA_FORMATS_MP4_AVC_H_ | 6 #define MEDIA_FORMATS_MP4_AVC_H_ |
| 7 | 7 |
| 8 #include <stddef.h> |
| 9 #include <stdint.h> |
| 10 |
| 8 #include <vector> | 11 #include <vector> |
| 9 | 12 |
| 10 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 11 #include "media/base/media_export.h" | 14 #include "media/base/media_export.h" |
| 12 #include "media/formats/mp4/bitstream_converter.h" | 15 #include "media/formats/mp4/bitstream_converter.h" |
| 13 | 16 |
| 14 namespace media { | 17 namespace media { |
| 15 | 18 |
| 16 struct SubsampleEntry; | 19 struct SubsampleEntry; |
| 17 | 20 |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 | 78 |
| 76 private: | 79 private: |
| 77 ~AVCBitstreamConverter() override; | 80 ~AVCBitstreamConverter() override; |
| 78 scoped_ptr<AVCDecoderConfigurationRecord> avc_config_; | 81 scoped_ptr<AVCDecoderConfigurationRecord> avc_config_; |
| 79 }; | 82 }; |
| 80 | 83 |
| 81 } // namespace mp4 | 84 } // namespace mp4 |
| 82 } // namespace media | 85 } // namespace media |
| 83 | 86 |
| 84 #endif // MEDIA_FORMATS_MP4_AVC_H_ | 87 #endif // MEDIA_FORMATS_MP4_AVC_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1542013004:
Switch to standard integer types in media/, take 2. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master