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

Side by Side Diff: media/base/mime_util.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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/base/media_switches.cc ('k') | media/base/mime_util_unittest.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 <stddef.h>
6 #include <stdint.h>
7
5 #include <map> 8 #include <map>
6 9
7 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
8 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/macros.h"
9 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/string_split.h" 14 #include "base/strings/string_split.h"
11 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
12 #include "build/build_config.h" 16 #include "build/build_config.h"
13 #include "media/base/mime_util.h" 17 #include "media/base/mime_util.h"
14 18
15 #if defined(OS_ANDROID) 19 #if defined(OS_ANDROID)
16 #include "base/android/build_info.h" 20 #include "base/android/build_info.h"
17 #endif 21 #endif
18 22
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 std::vector<std::string>* codecs_out, 699 std::vector<std::string>* codecs_out,
696 const bool strip) { 700 const bool strip) {
697 g_media_mime_util.Get().ParseCodecString(codecs, codecs_out, strip); 701 g_media_mime_util.Get().ParseCodecString(codecs, codecs_out, strip);
698 } 702 }
699 703
700 void RemoveProprietaryMediaTypesAndCodecsForTests() { 704 void RemoveProprietaryMediaTypesAndCodecsForTests() {
701 g_media_mime_util.Get().RemoveProprietaryMediaTypesAndCodecsForTests(); 705 g_media_mime_util.Get().RemoveProprietaryMediaTypesAndCodecsForTests();
702 } 706 }
703 707
704 } // namespace media 708 } // namespace media
OLDNEW
« no previous file with comments | « media/base/media_switches.cc ('k') | media/base/mime_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698