To M56: Roll src/third_party/ffmpeg/ 3c7a09882..cdf4accee (3188 commits).

media/base/audio_video_metadata_extractor.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 "media/base/audio_video_metadata_extractor.h"
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
@@ skipping 95 matching lines @@
     StreamInfo& info = stream_infos_.back();
 
     AVStream* stream = format_context->streams[i];
     if (!stream)
       continue;
 
     // Extract dictionary from streams also. Needed for containers that attach
     // metadata to contained streams instead the container itself, like OGG.
     ExtractDictionary(stream->metadata, &info.tags);
 
-    if (!stream->codec)
+    if (!stream->codecpar)
       continue;
 
-    info.type = avcodec_get_name(stream->codec->codec_id);
+    info.type = avcodec_get_name(stream->codecpar->codec_id);
 
     // Extract dimensions of largest stream that's not an attached image.
-    if (stream->codec->width > 0 && stream->codec->width > width_ &&
-        stream->codec->height > 0 && stream->codec->height > height_) {
-      width_ = stream->codec->width;
-      height_ = stream->codec->height;
+    if (stream->codecpar->width > 0 && stream->codecpar->width > width_ &&
+        stream->codecpar->height > 0 && stream->codecpar->height > height_) {
+      width_ = stream->codecpar->width;
+      height_ = stream->codecpar->height;
     }
 
     // Extract attached image if requested.
     if (extract_attached_images &&
         stream->disposition == AV_DISPOSITION_ATTACHED_PIC &&
         stream->attached_pic.size > 0 &&
         stream->attached_pic.size <= kAttachedImageSizeLimit &&
         stream->attached_pic.data != NULL) {
       attached_images_bytes_.push_back(std::string());
       attached_images_bytes_.back().assign(
@@ skipping 119 matching lines @@
     if (ExtractString(tag, "encoder", &encoder_)) continue;
     if (ExtractString(tag, "encoded_by", &encoded_by_)) continue;
     if (ExtractString(tag, "genre", &genre_)) continue;
     if (ExtractString(tag, "language", &language_)) continue;
     if (ExtractString(tag, "title", &title_)) continue;
     if (ExtractInt(tag, "track", &track_)) continue;
   }
 }
 
 }  // namespace media