Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(913)

Unified Diff: media/base/audio_video_metadata_extractor.cc

Issue 2534193003: To M56: Roll src/third_party/ffmpeg/ 3c7a09882..cdf4accee (3188 commits). (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/audio_video_metadata_extractor.cc
diff --git a/media/base/audio_video_metadata_extractor.cc b/media/base/audio_video_metadata_extractor.cc
index 5b92c1511c179ba7550a2e9fcd9595c9da8c0798..9e493601a33382bd969bbcae062663d28cedbb15 100644
--- a/media/base/audio_video_metadata_extractor.cc
+++ b/media/base/audio_video_metadata_extractor.cc
@@ -113,16 +113,16 @@ bool AudioVideoMetadataExtractor::Extract(DataSource* source,
// 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.

Powered by Google App Engine
This is Rietveld 408576698