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

Unified Diff: media/filters/ffmpeg_demuxer.cc

Issue 203043002: Fix "unreachable code" warnings (MSVC warning 4702), misc. edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 9 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
Index: media/filters/ffmpeg_demuxer.cc
===================================================================
--- media/filters/ffmpeg_demuxer.cc (revision 256983)
+++ media/filters/ffmpeg_demuxer.cc (working copy)
@@ -313,14 +313,16 @@
}
bool FFmpegDemuxerStream::HasAvailableCapacity() {
- // TODO(scherkus): Remove early return and reenable time-based capacity
+ // TODO(scherkus): Remove this return and reenable time-based capacity
// after our data sources support canceling/concurrent reads, see
// http://crbug.com/165762 for details.
+#if 1
return !read_cb_.is_null();
-
+#else
// Try to have one second's worth of encoded data per stream.
const base::TimeDelta kCapacity = base::TimeDelta::FromSeconds(1);
return buffer_queue_.IsEmpty() || buffer_queue_.Duration() < kCapacity;
+#endif
}
size_t FFmpegDemuxerStream::MemoryUsage() const {

Powered by Google App Engine
This is Rietveld 408576698