diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-11 10:57:03 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-11 10:57:03 +0100 |
| commit | 868fa2fe829687343ffae624259930155e16dbd8 (patch) | |
| tree | 54d316199dd9739c57c3aacd131853bbd6554a94 /media/base/mock_filters.cc | |
| parent | bb1bdbd796f966b5bf11f40ecbea12621c7bfac9 (diff) | |
| download | chromium_org-868fa2fe829687343ffae624259930155e16dbd8.tar.gz | |
Merge from Chromium at DEPS revision r205460
This commit was generated by merge_to_master.py.
Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
Diffstat (limited to 'media/base/mock_filters.cc')
| -rw-r--r-- | media/base/mock_filters.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc index cb2670ae22..eaf52013cd 100644 --- a/media/base/mock_filters.cc +++ b/media/base/mock_filters.cc @@ -26,12 +26,12 @@ DemuxerStream::Type MockDemuxerStream::type() { return type_; } -const AudioDecoderConfig& MockDemuxerStream::audio_decoder_config() { +AudioDecoderConfig MockDemuxerStream::audio_decoder_config() { DCHECK_EQ(type_, DemuxerStream::AUDIO); return audio_decoder_config_; } -const VideoDecoderConfig& MockDemuxerStream::video_decoder_config() { +VideoDecoderConfig MockDemuxerStream::video_decoder_config() { DCHECK_EQ(type_, DemuxerStream::VIDEO); return video_decoder_config_; } |