| Index: media/formats/webm/webm_audio_client.cc
|
| diff --git a/media/formats/webm/webm_audio_client.cc b/media/formats/webm/webm_audio_client.cc
|
| index 995746a4a103587f3b9708d379bd073221e6c6f9..fb6a723a4d2a3f65fe48a73f85a1127aac05edbb 100644
|
| --- a/media/formats/webm/webm_audio_client.cc
|
| +++ b/media/formats/webm/webm_audio_client.cc
|
| @@ -25,8 +25,11 @@ void WebMAudioClient::Reset() {
|
| }
|
|
|
| bool WebMAudioClient::InitializeConfig(
|
| - const std::string& codec_id, const std::vector<uint8>& codec_private,
|
| - int64 seek_preroll, int64 codec_delay, bool is_encrypted,
|
| + const std::string& codec_id,
|
| + const std::vector<uint8_t>& codec_private,
|
| + int64_t seek_preroll,
|
| + int64_t codec_delay,
|
| + bool is_encrypted,
|
| AudioDecoderConfig* config) {
|
| DCHECK(config);
|
| SampleFormat sample_format = kSampleFormatPlanarF32;
|
| @@ -88,7 +91,7 @@ bool WebMAudioClient::InitializeConfig(
|
| return config->IsValidConfig();
|
| }
|
|
|
| -bool WebMAudioClient::OnUInt(int id, int64 val) {
|
| +bool WebMAudioClient::OnUInt(int id, int64_t val) {
|
| if (id == kWebMIdChannels) {
|
| if (channels_ != -1) {
|
| MEDIA_LOG(ERROR, media_log_) << "Multiple values for id " << std::hex
|
|
|