tree e4271976aff3a564e0d6e1d562fbe13b946e20af
parent 7ac069e1b8b7818d0ba8304cac8eee635e77c01e
author Peter Boström <pbos@webrtc.org> 1429616837 +0200
committer Peter Boström <pbos@webrtc.org> 1429616822 +0000

Revert "Remove simulcast modules from ViEReceiver."

This reverts commit 14a97f0a9148be18a66a435a5933441eb023bc82.

Introduces a deadlock due to acquiring simulcast_rtp_rtcp_ in
ReceivedRTCPPacket.

BUG=4568, chromium:478911
R=stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/44289004

Cr-Original-Commit-Position: refs/heads/master@{#9039}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 6cff9cf8a3562f76b1dfe4584f447dd66c2d05f2