| Index: media/formats/mp4/aac.cc
|
| diff --git a/media/formats/mp4/aac.cc b/media/formats/mp4/aac.cc
|
| index bbfd4f57854d99e993baedd046e8bacd8c04b874..9aa749ca310cffe9eb0520c8c2c6395da439c4f0 100644
|
| --- a/media/formats/mp4/aac.cc
|
| +++ b/media/formats/mp4/aac.cc
|
| @@ -22,7 +22,8 @@ AAC::AAC()
|
| AAC::~AAC() {
|
| }
|
|
|
| -bool AAC::Parse(const std::vector<uint8>& data, const LogCB& log_cb) {
|
| +bool AAC::Parse(const std::vector<uint8>& data,
|
| + const scoped_refptr<MediaLog>& media_log) {
|
| #if defined(OS_ANDROID)
|
| codec_specific_data_ = data;
|
| #endif
|
| @@ -57,8 +58,8 @@ bool AAC::Parse(const std::vector<uint8>& data, const LogCB& log_cb) {
|
| RCHECK(reader.ReadBits(5, &profile_));
|
| }
|
|
|
| - MEDIA_LOG(INFO, log_cb) << "Audio codec: mp4a.40." << std::hex
|
| - << static_cast<int>(profile_);
|
| + MEDIA_LOG(INFO, media_log) << "Audio codec: mp4a.40." << std::hex
|
| + << static_cast<int>(profile_);
|
|
|
| RCHECK(SkipDecoderGASpecificConfig(&reader));
|
| RCHECK(SkipErrorSpecificConfig());
|
|
|