commit 4a3208e6319696e87157d4e79dc77d52f06af5ce
author stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jan 29 10:27:51 2014 +0000
committer stefan@webrtc.org <stefan@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jan 29 10:27:51 2014 +0000
tree 6906fecdc1aceb42c75e0c96131d2868fea5e0c2
parent d2f95a8b894344de70a531ebcd3c2b7dfab12e27

Fix deadlock in video_receiver.cc.

In webrtc::vcm::VideoReceiver::ResetDecoder(), the lock order is:
1. take _receiveCritSect,
2. take process_crit_sect_

This conflicts with the follow code path:
1. webrtc::vcm::VideoReceiver::Process(), take process_crit_sect_
  call -> webrtc::vcm::VideoReceiver::NackList(),
2.  with nackStats=kNackKeyFrameRequest, take _receiveCritSect

BUG=2861
TEST=trybots
R=sprang@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5456 4adac7df-926f-26a2-2b94-8c16560cd09d