Roll FFmpeg for M45.

media/base/audio_video_metadata_extractor_unittest.cc

 // Copyright 2014 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 "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/sha1.h"
 #include "build/build_config.h"
 #include "media/base/audio_video_metadata_extractor.h"
 #include "media/base/test_data_util.h"
@@ skipping 170 matching lines @@
             extractor->stream_infos()[0].tags.find("encoder")->second);
   EXPECT_EQ("Alternative",
             extractor->stream_infos()[0].tags.find("genre")->second);
   EXPECT_EQ("Airbag", extractor->stream_infos()[0].tags.find("title")->second);
   EXPECT_EQ("1", extractor->stream_infos()[0].tags.find("track")->second);
 
   EXPECT_EQ("mp3", extractor->stream_infos()[1].type);
   EXPECT_EQ(0u, extractor->stream_infos()[1].tags.size());
 
   EXPECT_EQ("png", extractor->stream_infos()[2].type);
-  EXPECT_EQ(2u, extractor->stream_infos()[2].tags.size());
+  EXPECT_EQ(1u, extractor->stream_infos()[2].tags.size());
   EXPECT_EQ("Other", extractor->stream_infos()[2].tags.find("comment")->second);
-  EXPECT_EQ("", extractor->stream_infos()[2].tags.find("title")->second);
 
   EXPECT_EQ(1u, extractor->attached_images_bytes().size());
   EXPECT_EQ(155752u, extractor->attached_images_bytes()[0].size());
 
   EXPECT_EQ("\x89PNG\r\n\x1a\n",
             extractor->attached_images_bytes()[0].substr(0, 8));
   EXPECT_EQ("IEND\xae\x42\x60\x82",
             extractor->attached_images_bytes()[0].substr(
                 extractor->attached_images_bytes()[0].size() - 8, 8));
   EXPECT_EQ("\xF3\xED\x8F\xC7\xC7\x98\xB9V|p\xC0u!\xB5\x82\xCF\x95\xF0\xCD\xCE",
             base::SHA1HashString(extractor->attached_images_bytes()[0]));
 }
 #endif
 
 }  // namespace media