Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/composite_filter.cc

Issue 8294027: Merge r104540 into 874 (m15). (Closed) Base URL: svn://svn.chromium.org/chrome/branches/874/src/
Patch Set: '' Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/audio_renderer_impl.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/composite_filter.cc
===================================================================
--- media/base/composite_filter.cc (revision 105911)
+++ media/base/composite_filter.cc (working copy)
@@ -178,7 +178,13 @@
return;
}
+ if (!status_cb_.is_null()) {
+ DCHECK_EQ(state_, kStopWhileSeekPending);
+ status_cb_.Reset();
+ }
+
callback_.reset(callback.release());
+
if (state_ == kStopPending) {
StartSerialCallSequence();
}
« no previous file with comments | « content/renderer/media/audio_renderer_impl.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698