From 436ebcaec142fe866b298d4aa2b396e0b569c83f Mon Sep 17 00:00:00 2001
From: Tim Haloun <thaloun@chromium.org>
Date: Thu, 25 Oct 2018 18:03:44 -0700
Subject: [PATCH] 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}
---
 media/engine/webrtcvoiceengine.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media/engine/webrtcvoiceengine.h b/media/engine/webrtcvoiceengine.h
index be2fe0bfac..3c26dbb536 100644
--- a/media/engine/webrtcvoiceengine.h
+++ b/media/engine/webrtcvoiceengine.h
@@ -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 =