FFmpegDemuxer: Clear |extra_data| when enabling bitstream conversion.

media/base/video_decoder_config.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/video_decoder_config.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "media/base/video_frame.h"
@@ skipping 50 matching lines @@
     const EncryptionScheme& encryption_scheme) {
   Initialize(codec, profile, format, color_space, coded_size, visible_rect,
              natural_size, extra_data, encryption_scheme);
 }
 
 VideoDecoderConfig::VideoDecoderConfig(const VideoDecoderConfig& other) =
     default;
 
 VideoDecoderConfig::~VideoDecoderConfig() {}
 
+void VideoDecoderConfig::set_extra_data(

[DaleCurtis, 2016/10/25 00:18:46]

Must be inlined to use hacker_style(). We have no other setters on this class,
so instead of making it mutable why not just construct a new one in the demuxer?

[sandersd (OOO until July 31), 2016/10/25 20:58:41]

Done.

+    const std::vector<uint8_t>& extra_data) {
+  extra_data_ = extra_data;
+}
+
 void VideoDecoderConfig::set_color_space_info(
     const gfx::ColorSpace& color_space_info) {
   color_space_info_ = color_space_info;
 }
 
 gfx::ColorSpace VideoDecoderConfig::color_space_info() const {
   return color_space_info_;
 }
 
 void VideoDecoderConfig::set_hdr_metadata(const HDRMetadata& hdr_metadata) {
@@ skipping 65 matching lines @@
     << " visible rect: [" << visible_rect().x() << "," << visible_rect().y()
     << "," << visible_rect().width() << "," << visible_rect().height() << "]"
     << " natural size: [" << natural_size().width() << ","
     << natural_size().height() << "]"
     << " has extra data? " << (extra_data().empty() ? "false" : "true")
     << " encrypted? " << (is_encrypted() ? "true" : "false");
   return s.str();
 }
 
 }  // namespace media