From 828f30ce832a8dabd4c669cec2997808c5b2fa2a Mon Sep 17 00:00:00 2001
From: Adrian Grange <agrange@google.com>
Date: Tue, 29 Mar 2016 13:53:34 -0700
Subject: [PATCH] Change "Vp8" to "AOM"

Change-Id: I16d78a3715b185b6209b3bc2af68055d6c80b729
---
 test/decode_test_driver.cc       | 2 +-
 third_party/libwebm/mkvmuxer.cpp | 4 ++--
 third_party/libwebm/mkvmuxer.hpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/decode_test_driver.cc b/test/decode_test_driver.cc
index 294f92d0f..40174f95b 100644
--- a/test/decode_test_driver.cc
+++ b/test/decode_test_driver.cc
@@ -51,7 +51,7 @@ void DecoderTest::HandlePeekResult(Decoder *const decoder,
                                    const aom_codec_err_t res_peek) {
   const bool is_aom = decoder->IsAOM();
   if (is_aom) {
-    /* Vp8's implementation of PeekStream returns an error if the frame you
+    /* AOM's implementation of PeekStream returns an error if the frame you
      * pass it is not a keyframe, so we only expect AOM_CODEC_OK on the first
      * frame, which must be a keyframe. */
     if (video->frame_number() == 0)
diff --git a/third_party/libwebm/mkvmuxer.cpp b/third_party/libwebm/mkvmuxer.cpp
index c1bcb23d0..db4278acc 100644
--- a/third_party/libwebm/mkvmuxer.cpp
+++ b/third_party/libwebm/mkvmuxer.cpp
@@ -1045,7 +1045,7 @@ bool AudioTrack::Write(IMkvWriter* writer) const {
 
 const char Tracks::kOpusCodecId[] = "A_OPUS";
 const char Tracks::kVorbisCodecId[] = "A_VORBIS";
-const char Tracks::kVp8CodecId[] = "V_AOM";
+const char Tracks::kAOMCodecId[] = "V_AOM";
 const char Tracks::kVp9CodecId[] = "V_AV1";
 const char Tracks::kAV1CodecId[] = "V_AV1";
 
@@ -2516,7 +2516,7 @@ uint64 Segment::AddVideoTrack(int32 width, int32 height, int32 number) {
     return 0;
 
   track->set_type(Tracks::kVideo);
-  track->set_codec_id(Tracks::kVp8CodecId);
+  track->set_codec_id(Tracks::kAOMCodecId);
   track->set_width(width);
   track->set_height(height);
 
diff --git a/third_party/libwebm/mkvmuxer.hpp b/third_party/libwebm/mkvmuxer.hpp
index 1563ea5a6..c277ff98f 100644
--- a/third_party/libwebm/mkvmuxer.hpp
+++ b/third_party/libwebm/mkvmuxer.hpp
@@ -535,7 +535,7 @@ class Tracks {
 
   static const char kOpusCodecId[];
   static const char kVorbisCodecId[];
-  static const char kVp8CodecId[];
+  static const char kAOMCodecId[];
   static const char kVp9CodecId[];
   static const char kAV1CodecId[];