diff options
| author | jzern <jzern@chromium.org> | 2015-08-11 19:06:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-12 02:06:51 +0000 |
| commit | dbaf444c119c6c45a2f9b2e508339e435d1e4a95 (patch) | |
| tree | 668932a4103da27f6a7b033b73723a2e8c9ac71c /media | |
| parent | d53bb2ab620b6dc5e17da85dcf1b83b516c8c212 (diff) | |
| download | chromium_src-dbaf444c119c6c45a2f9b2e508339e435d1e4a95.zip chromium_src-dbaf444c119c6c45a2f9b2e508339e435d1e4a95.tar.gz chromium_src-dbaf444c119c6c45a2f9b2e508339e435d1e4a95.tar.bz2 | |
ffmpeg_aac_bitstream_converter: s/CODEC_ID_AAC/AV_CODEC_ID_AAC/
BUG=519105
Review URL: https://codereview.chromium.org/1287563002
Cr-Commit-Position: refs/heads/master@{#342963}
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/ffmpeg_aac_bitstream_converter.cc | 2 | ||||
| -rw-r--r-- | media/filters/ffmpeg_aac_bitstream_converter_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/filters/ffmpeg_aac_bitstream_converter.cc b/media/filters/ffmpeg_aac_bitstream_converter.cc index 6a55b6a..616cd1f 100644 --- a/media/filters/ffmpeg_aac_bitstream_converter.cc +++ b/media/filters/ffmpeg_aac_bitstream_converter.cc @@ -19,7 +19,7 @@ bool GenerateAdtsHeader( int private_stream, int channel_configuration, int originality, int home, int copyrighted_stream, int copyright_start, int frame_length, int buffer_fullness, int number_of_frames_minus_one, uint8* hdr) { - DCHECK_EQ(codec, CODEC_ID_AAC); + DCHECK_EQ(codec, AV_CODEC_ID_AAC); memset(reinterpret_cast<void *>(hdr), 0, FFmpegAACBitstreamConverter::kAdtsHeaderSize); diff --git a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc index 6262a80..6f92f76 100644 --- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc +++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc @@ -23,7 +23,7 @@ class FFmpegAACBitstreamConverterTest : public testing::Test { // Set up reasonable aac context memset(&test_context_, 0, sizeof(AVCodecContext)); - test_context_.codec_id = CODEC_ID_AAC; + test_context_.codec_id = AV_CODEC_ID_AAC; test_context_.profile = FF_PROFILE_AAC_MAIN; test_context_.channels = 2; test_context_.extradata = context_header_; |