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

Side by Side Diff: media/filters/ffmpeg_demuxer.cc

Issue 46039: Removed unneeded includes of base/scoped_ptr.h. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/base/mock_filter_host.h ('k') | media/filters/null_audio_renderer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/scoped_ptr.h"
5 #include "base/string_util.h" 6 #include "base/string_util.h"
6 #include "base/time.h" 7 #include "base/time.h"
7 #include "media/base/filter_host.h" 8 #include "media/base/filter_host.h"
8 #include "media/filters/ffmpeg_common.h" 9 #include "media/filters/ffmpeg_common.h"
9 #include "media/filters/ffmpeg_demuxer.h" 10 #include "media/filters/ffmpeg_demuxer.h"
10 #include "media/filters/ffmpeg_glue.h" 11 #include "media/filters/ffmpeg_glue.h"
11 12
12 namespace media { 13 namespace media {
13 14
14 // 15 //
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 StreamVector::iterator iter; 273 StreamVector::iterator iter;
273 for (iter = streams_.begin(); iter != streams_.end(); ++iter) { 274 for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
274 if ((*iter)->HasPendingReads()) { 275 if ((*iter)->HasPendingReads()) {
275 return true; 276 return true;
276 } 277 }
277 } 278 }
278 return false; 279 return false;
279 } 280 }
280 281
281 } // namespace media 282 } // namespace media
OLDNEW
« no previous file with comments | « media/base/mock_filter_host.h ('k') | media/filters/null_audio_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698