| Index: video/video_quality_test.cc
 | 
| diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc
 | 
| index 16b3f65cd3787c9bb70c32cf404e58c51bb49e61..0553db76b8a76782ba6d2e992c6907cd8606f11a 100644
 | 
| --- a/video/video_quality_test.cc
 | 
| +++ b/video/video_quality_test.cc
 | 
| @@ -1549,26 +1549,20 @@ void VideoQualityTest::SetupVideo(Transport* send_transport,
 | 
|      if (decode_all_receive_streams) {
 | 
|        for (auto it = video_receive_configs_.begin();
 | 
|             it != video_receive_configs_.end(); ++it) {
 | 
| -        it->rtp.ulpfec.red_payload_type =
 | 
| +        it->rtp.red_payload_type =
 | 
|              video_send_config_.rtp.ulpfec.red_payload_type;
 | 
| -        it->rtp.ulpfec.ulpfec_payload_type =
 | 
| +        it->rtp.ulpfec_payload_type =
 | 
|              video_send_config_.rtp.ulpfec.ulpfec_payload_type;
 | 
| -        it->rtp.ulpfec.red_rtx_payload_type =
 | 
| -            video_send_config_.rtp.ulpfec.red_rtx_payload_type;
 | 
|          it->rtp.rtx_associated_payload_types[video_send_config_.rtp.ulpfec
 | 
|                                                   .red_rtx_payload_type] =
 | 
|              video_send_config_.rtp.ulpfec.red_payload_type;
 | 
|        }
 | 
|      } else {
 | 
| -      video_receive_configs_[params_.ss.selected_stream]
 | 
| -          .rtp.ulpfec.red_payload_type =
 | 
| +      video_receive_configs_[params_.ss.selected_stream].rtp.red_payload_type =
 | 
|            video_send_config_.rtp.ulpfec.red_payload_type;
 | 
|        video_receive_configs_[params_.ss.selected_stream]
 | 
| -          .rtp.ulpfec.ulpfec_payload_type =
 | 
| +          .rtp.ulpfec_payload_type =
 | 
|            video_send_config_.rtp.ulpfec.ulpfec_payload_type;
 | 
| -      video_receive_configs_[params_.ss.selected_stream]
 | 
| -          .rtp.ulpfec.red_rtx_payload_type =
 | 
| -          video_send_config_.rtp.ulpfec.red_rtx_payload_type;
 | 
|        video_receive_configs_[params_.ss.selected_stream]
 | 
|            .rtp.rtx_associated_payload_types[video_send_config_.rtp.ulpfec
 | 
|                                                  .red_rtx_payload_type] =
 | 
| 
 |