| Index: media/base/simd/convert_rgb_to_yuv.h
 | 
| diff --git a/media/base/simd/convert_rgb_to_yuv.h b/media/base/simd/convert_rgb_to_yuv.h
 | 
| index d3bb4ca70672ffd73fb1322e2dd2b47ed818fe85..063454066bb004248ccceacd1d7ae7b49c20962c 100644
 | 
| --- a/media/base/simd/convert_rgb_to_yuv.h
 | 
| +++ b/media/base/simd/convert_rgb_to_yuv.h
 | 
| @@ -5,7 +5,8 @@
 | 
|  #ifndef MEDIA_BASE_SIMD_CONVERT_RGB_TO_YUV_H_
 | 
|  #define MEDIA_BASE_SIMD_CONVERT_RGB_TO_YUV_H_
 | 
|  
 | 
| -#include "base/basictypes.h"
 | 
| +#include <stdint.h>
 | 
| +
 | 
|  #include "media/base/yuv_convert.h"
 | 
|  
 | 
|  namespace media {
 | 
| @@ -13,60 +14,60 @@ namespace media {
 | 
|  // These methods are exported for testing purposes only.  Library users should
 | 
|  // only call the methods listed in yuv_convert.h.
 | 
|  
 | 
| -MEDIA_EXPORT void ConvertRGB32ToYUV_SSSE3(const uint8* rgbframe,
 | 
| -                                          uint8* yplane,
 | 
| -                                          uint8* uplane,
 | 
| -                                          uint8* vplane,
 | 
| +MEDIA_EXPORT void ConvertRGB32ToYUV_SSSE3(const uint8_t* rgbframe,
 | 
| +                                          uint8_t* yplane,
 | 
| +                                          uint8_t* uplane,
 | 
| +                                          uint8_t* vplane,
 | 
|                                            int width,
 | 
|                                            int height,
 | 
|                                            int rgbstride,
 | 
|                                            int ystride,
 | 
|                                            int uvstride);
 | 
|  
 | 
| -MEDIA_EXPORT void ConvertRGB24ToYUV_SSSE3(const uint8* rgbframe,
 | 
| -                                          uint8* yplane,
 | 
| -                                          uint8* uplane,
 | 
| -                                          uint8* vplane,
 | 
| +MEDIA_EXPORT void ConvertRGB24ToYUV_SSSE3(const uint8_t* rgbframe,
 | 
| +                                          uint8_t* yplane,
 | 
| +                                          uint8_t* uplane,
 | 
| +                                          uint8_t* vplane,
 | 
|                                            int width,
 | 
|                                            int height,
 | 
|                                            int rgbstride,
 | 
|                                            int ystride,
 | 
|                                            int uvstride);
 | 
|  
 | 
| -MEDIA_EXPORT void ConvertRGB32ToYUV_SSE2(const uint8* rgbframe,
 | 
| -                                         uint8* yplane,
 | 
| -                                         uint8* uplane,
 | 
| -                                         uint8* vplane,
 | 
| +MEDIA_EXPORT void ConvertRGB32ToYUV_SSE2(const uint8_t* rgbframe,
 | 
| +                                         uint8_t* yplane,
 | 
| +                                         uint8_t* uplane,
 | 
| +                                         uint8_t* vplane,
 | 
|                                           int width,
 | 
|                                           int height,
 | 
|                                           int rgbstride,
 | 
|                                           int ystride,
 | 
|                                           int uvstride);
 | 
|  
 | 
| -MEDIA_EXPORT void ConvertRGB32ToYUV_SSE2_Reference(const uint8* rgbframe,
 | 
| -                                                   uint8* yplane,
 | 
| -                                                   uint8* uplane,
 | 
| -                                                   uint8* vplane,
 | 
| +MEDIA_EXPORT void ConvertRGB32ToYUV_SSE2_Reference(const uint8_t* rgbframe,
 | 
| +                                                   uint8_t* yplane,
 | 
| +                                                   uint8_t* uplane,
 | 
| +                                                   uint8_t* vplane,
 | 
|                                                     int width,
 | 
|                                                     int height,
 | 
|                                                     int rgbstride,
 | 
|                                                     int ystride,
 | 
|                                                     int uvstride);
 | 
|  
 | 
| -MEDIA_EXPORT void ConvertRGB32ToYUV_C(const uint8* rgbframe,
 | 
| -                                      uint8* yplane,
 | 
| -                                      uint8* uplane,
 | 
| -                                      uint8* vplane,
 | 
| +MEDIA_EXPORT void ConvertRGB32ToYUV_C(const uint8_t* rgbframe,
 | 
| +                                      uint8_t* yplane,
 | 
| +                                      uint8_t* uplane,
 | 
| +                                      uint8_t* vplane,
 | 
|                                        int width,
 | 
|                                        int height,
 | 
|                                        int rgbstride,
 | 
|                                        int ystride,
 | 
|                                        int uvstride);
 | 
|  
 | 
| -MEDIA_EXPORT void ConvertRGB24ToYUV_C(const uint8* rgbframe,
 | 
| -                                      uint8* yplane,
 | 
| -                                      uint8* uplane,
 | 
| -                                      uint8* vplane,
 | 
| +MEDIA_EXPORT void ConvertRGB24ToYUV_C(const uint8_t* rgbframe,
 | 
| +                                      uint8_t* yplane,
 | 
| +                                      uint8_t* uplane,
 | 
| +                                      uint8_t* vplane,
 | 
|                                        int width,
 | 
|                                        int height,
 | 
|                                        int rgbstride,
 | 
| 
 |