summaryrefslogtreecommitdiff
path: root/media/base/video_decoder_config.cc
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-03-18 10:20:56 +0000
committerTorne (Richard Coles) <torne@google.com>2014-03-18 10:20:56 +0000
commita1401311d1ab56c4ed0a474bd38c108f75cb0cd9 (patch)
tree3437151d9ae1ce20a1e53a0d98c19ca01c786394 /media/base/video_decoder_config.cc
parentaf5066f1e36c6579e74752647e6c584438f80f94 (diff)
downloadchromium_org-a1401311d1ab56c4ed0a474bd38c108f75cb0cd9.tar.gz
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py. Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
Diffstat (limited to 'media/base/video_decoder_config.cc')
-rw-r--r--media/base/video_decoder_config.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/base/video_decoder_config.cc b/media/base/video_decoder_config.cc
index 82d607526b..d2b6e41010 100644
--- a/media/base/video_decoder_config.cc
+++ b/media/base/video_decoder_config.cc
@@ -77,7 +77,7 @@ void VideoDecoderConfig::Initialize(VideoCodec codec,
UMA_HISTOGRAM_COUNTS_10000("Media.VideoVisibleWidth", visible_rect.width());
UmaHistogramAspectRatio("Media.VideoVisibleAspectRatio", visible_rect);
UMA_HISTOGRAM_ENUMERATION(
- "Media.VideoPixelFormat", format, VideoFrame::HISTOGRAM_MAX);
+ "Media.VideoPixelFormat", format, VideoFrame::FORMAT_MAX + 1);
}
codec_ = codec;