summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbuildbot@webrtc.org <buildbot@webrtc.org>2014-09-19 20:05:02 +0000
committerbuildbot@webrtc.org <buildbot@webrtc.org>2014-09-19 20:05:02 +0000
commitc76cc079d28a03d104bb75f9aad9be5ce899b2b0 (patch)
tree64060e4da6a8513b29da70c42c3c6b68053e1488
parent88b24bb6406739ee83a491dca2d9ad59e5910c6c (diff)
downloadtalk-c76cc079d28a03d104bb75f9aad9be5ce899b2b0.tar.gz
(Auto)update libjingle 75922684-> 75924589
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7250 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r--media/webrtc/webrtcvideoengine.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/webrtc/webrtcvideoengine.h b/media/webrtc/webrtcvideoengine.h
index bd8f1f8..fb0c4e1 100644
--- a/media/webrtc/webrtcvideoengine.h
+++ b/media/webrtc/webrtcvideoengine.h
@@ -310,6 +310,7 @@ class WebRtcVideoMediaChannel : public rtc::MessageHandler,
virtual int SendPacket(int channel, const void* data, int len);
virtual int SendRTCPPacket(int channel, const void* data, int len);
+ virtual void LogSendCodecChange(const std::string& reason);
bool SetPrimaryAndRtxSsrcs(
int channel_id, int idx, uint32 primary_ssrc,
const StreamParams& send_params);
@@ -348,7 +349,6 @@ class WebRtcVideoMediaChannel : public rtc::MessageHandler,
bool SetSendCodec(const webrtc::VideoCodec& codec);
bool SetSendCodec(WebRtcVideoChannelSendInfo* send_channel,
const webrtc::VideoCodec& codec);
- void LogSendCodecChange(const std::string& reason);
// Prepares the channel with channel id |info->channel_id()| to receive all
// codecs in |receive_codecs_| and start receive packets.
bool SetReceiveCodecs(WebRtcVideoChannelRecvInfo* info);