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

Side by Side Diff: media/formats/mp4/avc.cc

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « media/formats/mp4/aac.cc ('k') | media/formats/mp4/box_reader.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "media/formats/mp4/avc.h" 5 #include "media/formats/mp4/avc.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector>
9 8
10 #include "base/logging.h" 9 #include "base/logging.h"
11 #include "media/base/decrypt_config.h" 10 #include "media/base/decrypt_config.h"
12 #include "media/filters/h264_parser.h" 11 #include "media/filters/h264_parser.h"
13 #include "media/formats/mp4/box_definitions.h" 12 #include "media/formats/mp4/box_definitions.h"
14 #include "media/formats/mp4/box_reader.h" 13 #include "media/formats/mp4/box_reader.h"
15 14
16 namespace media { 15 namespace media {
17 namespace mp4 { 16 namespace mp4 {
18 17
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 294
296 case H264Parser::kEOStream: 295 case H264Parser::kEOStream:
297 done = true; 296 done = true;
298 } 297 }
299 } 298 }
300 299
301 return order_state >= kAfterFirstVCL; 300 return order_state >= kAfterFirstVCL;
302 } 301 }
303 } // namespace mp4 302 } // namespace mp4
304 } // namespace media 303 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mp4/aac.cc ('k') | media/formats/mp4/box_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698