| 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_WEBM_WEBM_CONTENT_ENCODINGS_H_ | 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ |
| 6 #define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ | 6 #define MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include <string> | 10 #include <string> |
| 9 | 11 |
| 10 #include "base/macros.h" | 12 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 12 #include "media/base/media_export.h" | 14 #include "media/base/media_export.h" |
| 13 | 15 |
| 14 namespace media { | 16 namespace media { |
| 15 | 17 |
| 16 class MEDIA_EXPORT ContentEncoding { | 18 class MEDIA_EXPORT ContentEncoding { |
| 17 public: | 19 public: |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 EncryptionAlgo encryption_algo_; | 81 EncryptionAlgo encryption_algo_; |
| 80 std::string encryption_key_id_; | 82 std::string encryption_key_id_; |
| 81 CipherMode cipher_mode_; | 83 CipherMode cipher_mode_; |
| 82 | 84 |
| 83 DISALLOW_COPY_AND_ASSIGN(ContentEncoding); | 85 DISALLOW_COPY_AND_ASSIGN(ContentEncoding); |
| 84 }; | 86 }; |
| 85 | 87 |
| 86 } // namespace media | 88 } // namespace media |
| 87 | 89 |
| 88 #endif // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_H_ | 90 #endif // MEDIA_FORMATS_WEBM_WEBM_CONTENT_ENCODINGS_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