From 6ee35099c541b1e1706e986391ea4658a3c20f71 Mon Sep 17 00:00:00 2001 From: "scherkus@chromium.org" Date: Wed, 19 Oct 2011 20:22:42 +0000 Subject: Remove kDemuxerIsWebm as it hasn't been working for a while and isn't really needed. BUG=100624 Review URL: http://codereview.chromium.org/8354009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106370 0039d316-1c4b-4281-b951-d872f2087c98 --- media/filters/ffmpeg_demuxer.cc | 8 -------- 1 file changed, 8 deletions(-) (limited to 'media') diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index be52626..623a6e5 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc @@ -479,20 +479,12 @@ void FFmpegDemuxer::InitializeTask(DataSource* data_source, // Create demuxer streams for all supported streams. streams_.resize(DemuxerStream::NUM_TYPES); base::TimeDelta max_duration; - const bool kDemuxerIsWebm = !strcmp("webm", format_context_->iformat->name); bool no_supported_streams = true; for (size_t i = 0; i < format_context_->nb_streams; ++i) { AVCodecContext* codec_context = format_context_->streams[i]->codec; AVMediaType codec_type = codec_context->codec_type; if (codec_type == AVMEDIA_TYPE_AUDIO || codec_type == AVMEDIA_TYPE_VIDEO) { AVStream* stream = format_context_->streams[i]; - // WebM is currently strictly VP8 and Vorbis. - if (kDemuxerIsWebm && (stream->codec->codec_id != CODEC_ID_VP8 && - stream->codec->codec_id != CODEC_ID_VORBIS)) { - packet_streams_.push_back(NULL); - continue; - } - scoped_refptr demuxer_stream( new FFmpegDemuxerStream(this, stream)); if (!streams_[demuxer_stream->type()]) { -- cgit v1.1