Fix extra setdscp call introduced by bad merge.

Bug: webrtc:5008
Change-Id: I29b0debf0468c8c0ab5120e77dc774b566f5b446
Reviewed-on: https://webrtc-review.googlesource.com/c/108003
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Tim Haloun <thaloun@chromium.org>
Cr-Commit-Position: refs/heads/master@{#25394}
This commit is contained in:
Tim Haloun 2018-10-25 18:03:44 -07:00 committed by Commit Bot
parent 0f08d227c2
commit 436ebcaec1

View File

@ -220,7 +220,6 @@ class WebRtcVoiceMediaChannel final : public VoiceMediaChannel,
if (DscpEnabled()) {
rtc_options.dscp = PreferredDscp();
}
rtc_options.dscp = PreferredDscp();
rtc_options.info_signaled_after_sent.included_in_feedback =
options.included_in_feedback;
rtc_options.info_signaled_after_sent.included_in_allocation =