OLD | NEW |
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 <libavcodec/avcodec.h> | 19 #include <libavcodec/avcodec.h> |
| 20 #include <libavcore/samplefmt.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 |
29 // Wraps FFmpeg's av_free() in a class that can be passed as a template argument | 30 // Wraps FFmpeg's av_free() in a class that can be passed as a template argument |
(...skipping 22 matching lines...) Expand all Loading... |
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_ |
OLD | NEW |