diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-17 20:30:19 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-17 20:30:19 +0000 |
| commit | 3fbc3505b662034fb1bab5b5a8e12732981575fa (patch) | |
| tree | e9296c548dad39ed8f281485e524d1c2481c30d1 /media | |
| parent | b4834b7279f42a3e9403956549badcd77c16a89a (diff) | |
| download | chromium_src-3fbc3505b662034fb1bab5b5a8e12732981575fa.zip chromium_src-3fbc3505b662034fb1bab5b5a8e12732981575fa.tar.gz chromium_src-3fbc3505b662034fb1bab5b5a8e12732981575fa.tar.bz2 | |
Revert 89532 - 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)
Review URL: http://codereview.chromium.org/7044092
TBR=enal@chromium.org
Review URL: http://codereview.chromium.org/7205011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89546 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/ffmpeg_demuxer.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index dd2d96b..5bf47a7 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc @@ -421,10 +421,9 @@ 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; |