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

Side by Side Diff: media/ffmpeg/ffmpeg_common.h

Issue 4770001: roll ffmpeg to nov 4 to fix clang issue (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 | « DEPS ('k') | media/ffmpeg/ffmpeg_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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #ifndef MEDIA_FFMPEG_FFMPEG_COMMON_H_ 5 #ifndef MEDIA_FFMPEG_FFMPEG_COMMON_H_
6 #define MEDIA_FFMPEG_FFMPEG_COMMON_H_ 6 #define MEDIA_FFMPEG_FFMPEG_COMMON_H_
7 7
8 // Used for FFmpeg error codes. 8 // Used for FFmpeg error codes.
9 #include <cerrno> 9 #include <cerrno>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/singleton.h" 12 #include "base/singleton.h"
13 13
14 // Include FFmpeg header files. 14 // Include FFmpeg header files.
15 extern "C" { 15 extern "C" {
16 // Temporarily disable possible loss of data warning. 16 // Temporarily disable possible loss of data warning.
17 // TODO(scherkus): fix and upstream the compiler warnings. 17 // TODO(scherkus): fix and upstream the compiler warnings.
18 MSVC_PUSH_DISABLE_WARNING(4244); 18 MSVC_PUSH_DISABLE_WARNING(4244);
19 #include <libavcore/samplefmt.h>
scherkus (not reviewing) 2010/11/11 01:54:34 alphabetical ordering (libavcodec > libavcore)
fbarchard 2010/11/11 02:19:44 Done.
19 #include <libavcodec/avcodec.h> 20 #include <libavcodec/avcodec.h>
20 #include <libavformat/avformat.h> 21 #include <libavformat/avformat.h>
21 #include <libavformat/avio.h> 22 #include <libavformat/avio.h>
22 #include <libavutil/avutil.h> 23 #include <libavutil/avutil.h>
23 #include <libavutil/log.h> 24 #include <libavutil/log.h>
24 MSVC_POP_WARNING(); 25 MSVC_POP_WARNING();
25 } // extern "C" 26 } // extern "C"
26 27
27 namespace media { 28 namespace media {
28 29
(...skipping 23 matching lines...) Expand all
52 namespace mime_type { 53 namespace mime_type {
53 54
54 extern const char kFFmpegAudio[]; 55 extern const char kFFmpegAudio[];
55 extern const char kFFmpegVideo[]; 56 extern const char kFFmpegVideo[];
56 57
57 } // namespace mime_type 58 } // namespace mime_type
58 59
59 } // namespace media 60 } // namespace media
60 61
61 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ 62 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_
OLDNEW
« no previous file with comments | « DEPS ('k') | media/ffmpeg/ffmpeg_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698