| 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 // Used with URLProtocol. | |
| 15 typedef int64 offset_t; | |
| 16 | |
| 17 // Include FFmpeg header files. | 14 // Include FFmpeg header files. |
| 18 extern "C" { | 15 extern "C" { |
| 19 // Temporarily disable possible loss of data warning. | 16 // Temporarily disable possible loss of data warning. |
| 20 // TODO(scherkus): fix and upstream the compiler warnings. | 17 // TODO(scherkus): fix and upstream the compiler warnings. |
| 21 MSVC_PUSH_DISABLE_WARNING(4244); | 18 MSVC_PUSH_DISABLE_WARNING(4244); |
| 22 #include <libavcodec/avcodec.h> | 19 #include <libavcodec/avcodec.h> |
| 23 #include <libavformat/avformat.h> | 20 #include <libavformat/avformat.h> |
| 24 #include <libavutil/avutil.h> | 21 #include <libavutil/avutil.h> |
| 25 #include <libavutil/log.h> | 22 #include <libavutil/log.h> |
| 26 MSVC_POP_WARNING(); | 23 MSVC_POP_WARNING(); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 54 namespace mime_type { | 51 namespace mime_type { |
| 55 | 52 |
| 56 extern const char kFFmpegAudio[]; | 53 extern const char kFFmpegAudio[]; |
| 57 extern const char kFFmpegVideo[]; | 54 extern const char kFFmpegVideo[]; |
| 58 | 55 |
| 59 } // namespace mime_type | 56 } // namespace mime_type |
| 60 | 57 |
| 61 } // namespace media | 58 } // namespace media |
| 62 | 59 |
| 63 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ | 60 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ |
| OLD | NEW |