| 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_VIDEO_CLIENT_H_ | 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_ |
| 6 #define MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_ | 6 #define MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include <string> | 10 #include <string> |
| 9 #include <vector> | 11 #include <vector> |
| 10 | 12 |
| 11 #include "base/macros.h" | 13 #include "base/macros.h" |
| 12 #include "media/base/media_log.h" | 14 #include "media/base/media_log.h" |
| 13 #include "media/formats/webm/webm_parser.h" | 15 #include "media/formats/webm/webm_parser.h" |
| 14 | 16 |
| 15 namespace media { | 17 namespace media { |
| 16 class VideoDecoderConfig; | 18 class VideoDecoderConfig; |
| 17 | 19 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 int64_t display_height_; | 55 int64_t display_height_; |
| 54 int64_t display_unit_; | 56 int64_t display_unit_; |
| 55 int64_t alpha_mode_; | 57 int64_t alpha_mode_; |
| 56 | 58 |
| 57 DISALLOW_COPY_AND_ASSIGN(WebMVideoClient); | 59 DISALLOW_COPY_AND_ASSIGN(WebMVideoClient); |
| 58 }; | 60 }; |
| 59 | 61 |
| 60 } // namespace media | 62 } // namespace media |
| 61 | 63 |
| 62 #endif // MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_H_ | 64 #endif // MEDIA_FORMATS_WEBM_WEBM_VIDEO_CLIENT_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