31a3397e96
Merge conflicts resolved in: * api/neteq/neteq.h * audio/channel_receive.cc * audio/channel_receive.h * media/engine/simulcast_encoder_adapter.cc * modules/audio_coding/BUILD.gn * modules/audio_coding/acm2/acm_resampler.cc * modules/audio_coding/acm2/acm_resampler_unittest.cc * modules/audio_processing/audio_processing_impl.h * modules/video_coding/BUILD.gn * p2p/base/p2p_transport_channel_unittest.cc * pc/jsep_transport_controller.cc * pc/rtp_transport.h * pc/rtp_transport_internal.h * unsafe_buffers_paths.txt |
||
|---|---|---|
| .. | ||
| async_audio_processing | ||
| audio_coding | ||
| audio_device | ||
| audio_mixer | ||
| audio_processing | ||
| congestion_controller | ||
| desktop_capture | ||
| include | ||
| pacing | ||
| portal | ||
| remote_bitrate_estimator | ||
| rtp_rtcp | ||
| third_party | ||
| utility | ||
| video_capture | ||
| video_coding | ||
| BUILD.gn | ||
| module_common_types_public_unittest.cc | ||