diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 19:48:49 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-02 19:48:49 +0000 |
| commit | fd6c9c9c5b789b6d4de40fc9d436e193342477aa (patch) | |
| tree | 6b465b771125e109a0e8980d8ce33ef77fddc241 /media | |
| parent | 6e8a896186815b76e76a88f49999c8049e5d84b7 (diff) | |
| download | chromium_src-fd6c9c9c5b789b6d4de40fc9d436e193342477aa.zip chromium_src-fd6c9c9c5b789b6d4de40fc9d436e193342477aa.tar.gz chromium_src-fd6c9c9c5b789b6d4de40fc9d436e193342477aa.tar.bz2 | |
Fix seek hack so it only skips the first seek if it is for start_time_.
BUG=82167
TEST=none
Review URL: http://codereview.chromium.org/7074047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/ffmpeg_demuxer.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index ac1b47e..fe259fd 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc @@ -551,8 +551,11 @@ void FFmpegDemuxer::SeekTask(base::TimeDelta time, const FilterStatusCB& cb) { // Preroll() states (i.e., the implicit Seek(0) should really be a Preroll()). if (first_seek_hack_) { first_seek_hack_ = false; - cb.Run(PIPELINE_OK); - return; + + if (time == start_time_) { + cb.Run(PIPELINE_OK); + return; + } } // Tell streams to flush buffers due to seeking. |