diff options
| author | enal@chromium.org <enal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-21 18:05:51 +0000 |
|---|---|---|
| committer | enal@chromium.org <enal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-21 18:05:51 +0000 |
| commit | c7bef94c6c62b01493e368837d4c6cdc76233b23 (patch) | |
| tree | f01f3e32ec979af1b7d8076b93e41b181b2c3a95 /media | |
| parent | 83dcf4963042c7afd3ce939bdea0bee4395179f8 (diff) | |
| download | chromium_src-c7bef94c6c62b01493e368837d4c6cdc76233b23.zip chromium_src-c7bef94c6c62b01493e368837d4c6cdc76233b23.tar.gz chromium_src-c7bef94c6c62b01493e368837d4c6cdc76233b23.tar.bz2 | |
Not allow compression when requesting multimedia
because ffmpeg does not expect compressed files.
(It does not make sense to compress audio/video anyways...)
http://codereview.chromium.org/7044092
BUG=47381
TEST=http://www.deafmac.org/html5/grinchsample.mp4 (Please clear browser cache, otherwise it can contain original GZIP-ed file requested by old browser)
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=89532
Review URL: http://codereview.chromium.org/7044092
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/ffmpeg_demuxer.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index 5bf47a7..dd2d96b 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc @@ -421,9 +421,10 @@ bool FFmpegDemuxer::SetPosition(int64 position) { DCHECK(data_source_); int64 file_size; - if (!data_source_->GetSize(&file_size) || position >= file_size || - position < 0) + if ((data_source_->GetSize(&file_size) && position >= file_size) || + position < 0) { return false; + } read_position_ = position; return true; |