libvpx: Pull from upstream

source/libvpx/webmenc.cc

 /*
  *  Copyright (c) 2014 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "./webmenc.h"
@@ skipping 31 matching lines @@
   info->set_writing_app(version.c_str());
 
   const uint64_t video_track_id =
       segment->AddVideoTrack(static_cast<int>(cfg->g_w),
                              static_cast<int>(cfg->g_h),
                              kVideoTrackNumber);
   mkvmuxer::VideoTrack* const video_track =
       static_cast<mkvmuxer::VideoTrack*>(
           segment->GetTrackByNumber(video_track_id));
   video_track->SetStereoMode(stereo_fmt);
-  video_track->set_codec_id(fourcc == VP8_FOURCC ? "V_VP8" : "V_VP9");
+  const char *codec_id;
+  switch (fourcc) {
+  case VP8_FOURCC:
+    codec_id = "V_VP8";
+    break;
+  case VP9_FOURCC:
+    codec_id = "V_VP9";
+    break;
+  case VP10_FOURCC:
+    codec_id = "V_VP10";
+    break;
+  default:
+    codec_id = "V_VP10";
+    break;
+  }
+  video_track->set_codec_id(codec_id);
   if (par->numerator > 1 || par->denominator > 1) {
     // TODO(fgalligan): Add support of DisplayUnit, Display Aspect Ratio type
     // to WebM format.
     const uint64_t display_width =
         static_cast<uint64_t>(((cfg->g_w * par->numerator * 1.0) /
                                par->denominator) + .5);
     video_track->set_display_width(display_width);
     video_track->set_display_height(cfg->g_h);
   }
   if (glob->debug) {
@@ skipping 25 matching lines @@
   mkvmuxer::MkvWriter *const writer =
       reinterpret_cast<mkvmuxer::MkvWriter*>(glob->writer);
   mkvmuxer::Segment *const segment =
       reinterpret_cast<mkvmuxer::Segment*>(glob->segment);
   segment->Finalize();
   delete segment;
   delete writer;
   glob->writer = NULL;
   glob->segment = NULL;
 }