diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-09 23:52:25 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-09 23:52:25 +0000 |
| commit | a830cd58ac3f146a797553abf6533b8fd3a5399d (patch) | |
| tree | 4158d599f32e75956931c4b1badabfd3485391cb /media/ffmpeg | |
| parent | 91e0e293fdf8be438d14b8ca25537fe3785aa3bf (diff) | |
| download | chromium_src-a830cd58ac3f146a797553abf6533b8fd3a5399d.zip chromium_src-a830cd58ac3f146a797553abf6533b8fd3a5399d.tar.gz chromium_src-a830cd58ac3f146a797553abf6533b8fd3a5399d.tar.bz2 | |
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
Review URL: http://codereview.chromium.org/9018019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc index 4f3dd0f..ca7efa1 100644 --- a/media/ffmpeg/ffmpeg_common.cc +++ b/media/ffmpeg/ffmpeg_common.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -190,7 +190,8 @@ void AVCodecContextToAudioDecoderConfig( channel_layout, samples_per_second, codec_context->extradata, - codec_context->extradata_size); + codec_context->extradata_size, + true); } void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config, @@ -258,7 +259,8 @@ void AVStreamToVideoDecoderConfig( aspect_ratio.num, aspect_ratio.den, stream->codec->extradata, - stream->codec->extradata_size); + stream->codec->extradata_size, + true); } void VideoDecoderConfigToAVCodecContext( |