| Index: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h
|
| diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h
|
| index afec024abc4db8904fa500a0f4c75604dd3bca56..c3bf4cf75a3c562575f658e5fc3e1edfabab9171 100644
|
| --- a/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h
|
| +++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h
|
| @@ -71,8 +71,8 @@ class SimulcastEncoderAdapter : public VP8Encoder {
|
| send_stream(true) {}
|
| StreamInfo(VideoEncoder* encoder,
|
| EncodedImageCallback* callback,
|
| - unsigned short width,
|
| - unsigned short height,
|
| + uint16_t width,
|
| + uint16_t height,
|
| bool send_stream)
|
| : encoder(encoder),
|
| callback(callback),
|
| @@ -83,8 +83,8 @@ class SimulcastEncoderAdapter : public VP8Encoder {
|
| // Deleted by SimulcastEncoderAdapter::Release().
|
| VideoEncoder* encoder;
|
| EncodedImageCallback* callback;
|
| - unsigned short width;
|
| - unsigned short height;
|
| + uint16_t width;
|
| + uint16_t height;
|
| bool key_frame_request;
|
| bool send_stream;
|
| };
|
| @@ -118,4 +118,3 @@ class SimulcastEncoderAdapter : public VP8Encoder {
|
| } // namespace webrtc
|
|
|
| #endif // WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_ENCODER_ADAPTER_H_
|
| -
|
|
|