| Index: webrtc/media/engine/webrtcvideoengine2.h
|
| diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h
|
| index 24019bc3d1edc04490fc423eccee879c710426b5..6f1b17ec15198e1cdaaa815b880664d61612050d 100644
|
| --- a/webrtc/media/engine/webrtcvideoengine2.h
|
| +++ b/webrtc/media/engine/webrtcvideoengine2.h
|
| @@ -61,9 +61,6 @@ class WebRtcVoiceMediaChannel;
|
|
|
| struct Device;
|
|
|
| -// Exposed here for unittests.
|
| -std::vector<VideoCodec> DefaultVideoCodecList();
|
| -
|
| class UnsignalledSsrcHandler {
|
| public:
|
| enum Action {
|
| @@ -301,11 +298,11 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
|
|
|
| struct AllocatedEncoder {
|
| AllocatedEncoder(webrtc::VideoEncoder* encoder,
|
| - webrtc::VideoCodecType type,
|
| + const cricket::VideoCodec& codec,
|
| bool external);
|
| webrtc::VideoEncoder* encoder;
|
| webrtc::VideoEncoder* external_encoder;
|
| - webrtc::VideoCodecType type;
|
| + cricket::VideoCodec codec;
|
| bool external;
|
| };
|
|
|
|
|