diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:27:47 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:27:47 +0000 |
| commit | 0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 (patch) | |
| tree | 08e3fb2fdca3674ceb4d6cf527cb65e755cd993e /media/base/video_decoder_config.cc | |
| parent | 0bdaf95291fc46702f274f40e8e5081e9ef23011 (diff) | |
| download | chromium_org-0f1bc08d4cfcc34181b0b5cbf065c40f687bf740.tar.gz | |
Merge from Chromium at DEPS revision 232870
This commit was generated by merge_to_master.py.
Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
Diffstat (limited to 'media/base/video_decoder_config.cc')
| -rw-r--r-- | media/base/video_decoder_config.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/base/video_decoder_config.cc b/media/base/video_decoder_config.cc index da914f22fb..015ae09066 100644 --- a/media/base/video_decoder_config.cc +++ b/media/base/video_decoder_config.cc @@ -12,7 +12,7 @@ namespace media { VideoDecoderConfig::VideoDecoderConfig() : codec_(kUnknownVideoCodec), profile_(VIDEO_CODEC_PROFILE_UNKNOWN), - format_(VideoFrame::INVALID), + format_(VideoFrame::UNKNOWN), is_encrypted_(false) { } |