| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright 2011 The LibYuv Project Authors. All rights reserved. | 2  *  Copyright 2011 The LibYuv Project Authors. All rights reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS. All contributing project authors may | 7  *  in the file PATENTS. All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| 11 // Common definitions for video, including fourcc and VideoFormat. | 11 // Common definitions for video, including fourcc and VideoFormat. | 
| 12 | 12 | 
| 13 #ifndef INCLUDE_LIBYUV_VIDEO_COMMON_H_  // NOLINT | 13 #ifndef INCLUDE_LIBYUV_VIDEO_COMMON_H_ | 
| 14 #define INCLUDE_LIBYUV_VIDEO_COMMON_H_ | 14 #define INCLUDE_LIBYUV_VIDEO_COMMON_H_ | 
| 15 | 15 | 
| 16 #include "libyuv/basic_types.h" | 16 #include "libyuv/basic_types.h" | 
| 17 | 17 | 
| 18 #ifdef __cplusplus | 18 #ifdef __cplusplus | 
| 19 namespace libyuv { | 19 namespace libyuv { | 
| 20 extern "C" { | 20 extern "C" { | 
| 21 #endif | 21 #endif | 
| 22 | 22 | 
| 23 ////////////////////////////////////////////////////////////////////////////// | 23 ////////////////////////////////////////////////////////////////////////////// | 
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 174 }; | 174 }; | 
| 175 | 175 | 
| 176 // Converts fourcc aliases into canonical ones. | 176 // Converts fourcc aliases into canonical ones. | 
| 177 LIBYUV_API uint32 CanonicalFourCC(uint32 fourcc); | 177 LIBYUV_API uint32 CanonicalFourCC(uint32 fourcc); | 
| 178 | 178 | 
| 179 #ifdef __cplusplus | 179 #ifdef __cplusplus | 
| 180 }  // extern "C" | 180 }  // extern "C" | 
| 181 }  // namespace libyuv | 181 }  // namespace libyuv | 
| 182 #endif | 182 #endif | 
| 183 | 183 | 
| 184 #endif  // INCLUDE_LIBYUV_VIDEO_COMMON_H_  NOLINT | 184 #endif  // INCLUDE_LIBYUV_VIDEO_COMMON_H_ | 
| OLD | NEW | 
|---|