| Index: webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc
 | 
| diff --git a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc
 | 
| index cc9a7706635f92c5d5f0794ad5e85007a2d5645c..0c15005c750931089984e78b92a8f4e069fce4e2 100644
 | 
| --- a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc
 | 
| +++ b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc
 | 
| @@ -31,6 +31,7 @@
 | 
|  #include "webrtc/test/testsupport/frame_writer.h"
 | 
|  #include "webrtc/test/testsupport/metrics/video_metrics.h"
 | 
|  #include "webrtc/test/testsupport/packet_reader.h"
 | 
| +#include "webrtc/test/video_codec_settings.h"
 | 
|  
 | 
|  DEFINE_string(test_name, "Quality test", "The name of the test to run. ");
 | 
|  DEFINE_string(test_description,
 | 
| @@ -204,8 +205,7 @@ int HandleCommandLineFlags(webrtc::test::TestConfig* config) {
 | 
|    config->use_single_core = FLAGS_use_single_core;
 | 
|  
 | 
|    // Get codec specific configuration.
 | 
| -  webrtc::VideoCodingModule::Codec(webrtc::kVideoCodecVP8,
 | 
| -                                   &config->codec_settings);
 | 
| +  webrtc::test::CodecSettings(webrtc::kVideoCodecVP8, &config->codec_settings);
 | 
|  
 | 
|    // Check the temporal layers.
 | 
|    if (FLAGS_temporal_layers < 0 ||
 | 
| 
 |