diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-10 00:29:40 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-10 00:29:40 +0000 |
| commit | 4b4116d2aca7ea0b1756044b8e26fe01e59ddf5a (patch) | |
| tree | 511ca8d5b1b2140c1f73bd6174440c59f4f2e647 /media/base/video_decoder_config.h | |
| parent | 97cf0b0418cb481a63de19597d966f85ce6af6c9 (diff) | |
| download | chromium_src-4b4116d2aca7ea0b1756044b8e26fe01e59ddf5a.zip chromium_src-4b4116d2aca7ea0b1756044b8e26fe01e59ddf5a.tar.gz chromium_src-4b4116d2aca7ea0b1756044b8e26fe01e59ddf5a.tar.bz2 | |
Revert 116957 - Move WebM specific code from ChunkDemuxer to WebMStreamParser.
Created StreamParser interface to allow ChunkDemuxer to support formats other than WebM.
BUG=108329
TEST=Existing ChunkDemuxer unittests
Reverting because windows shared build broke.
Review URL: http://codereview.chromium.org/9018019
TBR=acolwell@chromium.org
Review URL: http://codereview.chromium.org/9149018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/video_decoder_config.h')
| -rw-r--r-- | media/base/video_decoder_config.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h index 96dd677..28b1106 100644 --- a/media/base/video_decoder_config.h +++ b/media/base/video_decoder_config.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -82,11 +82,7 @@ class MEDIA_EXPORT VideoDecoderConfig { const gfx::Rect& visible_rect, int frame_rate_numerator, int frame_rate_denominator, int aspect_ratio_numerator, int aspect_ratio_denominator, - const uint8* extra_data, size_t extra_data_size, - bool record_stats); - - // Deep copies |video_config|. - void CopyFrom(const VideoDecoderConfig& video_config); + const uint8* extra_data, size_t extra_data_size); // Returns true if this object has appropriate configuration values, false // otherwise. |