diff options
| author | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
| commit | 1320f92c476a1ad9d19dba2a48c72b75566198e9 (patch) | |
| tree | ea7f149ccad687b22c18a72b729646568b2d54fb /media/filters/decoder_stream_traits.cc | |
| parent | 39b78c562f50ad7d5551ee861121f899239525a2 (diff) | |
| download | chromium_org-1320f92c476a1ad9d19dba2a48c72b75566198e9.tar.gz | |
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
Diffstat (limited to 'media/filters/decoder_stream_traits.cc')
| -rw-r--r-- | media/filters/decoder_stream_traits.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/filters/decoder_stream_traits.cc b/media/filters/decoder_stream_traits.cc index 824b912825..1c654c3b08 100644 --- a/media/filters/decoder_stream_traits.cc +++ b/media/filters/decoder_stream_traits.cc @@ -15,7 +15,7 @@ namespace media { std::string DecoderStreamTraits<DemuxerStream::AUDIO>::ToString() { - return "Audio"; + return "audio"; } void DecoderStreamTraits<DemuxerStream::AUDIO>::Initialize( @@ -47,7 +47,7 @@ scoped_refptr<DecoderStreamTraits<DemuxerStream::AUDIO>::OutputType> } std::string DecoderStreamTraits<DemuxerStream::VIDEO>::ToString() { - return "Video"; + return "video"; } void DecoderStreamTraits<DemuxerStream::VIDEO>::Initialize( |