OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 #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 |
(...skipping 13 matching lines...) Expand all Loading... | |
24 // file or the headers below will generate different structures. | 24 // file or the headers below will generate different structures. |
25 #define FF_API_PIX_FMT_DESC 0 | 25 #define FF_API_PIX_FMT_DESC 0 |
26 #define FF_API_OLD_DECODE_AUDIO 0 | 26 #define FF_API_OLD_DECODE_AUDIO 0 |
27 #define FF_API_DESTRUCT_PACKET 0 | 27 #define FF_API_DESTRUCT_PACKET 0 |
28 #define FF_API_GET_BUFFER 0 | 28 #define FF_API_GET_BUFFER 0 |
29 | 29 |
30 // Temporarily disable possible loss of data warning. | 30 // Temporarily disable possible loss of data warning. |
31 // TODO(scherkus): fix and upstream the compiler warnings. | 31 // TODO(scherkus): fix and upstream the compiler warnings. |
32 MSVC_PUSH_DISABLE_WARNING(4244); | 32 MSVC_PUSH_DISABLE_WARNING(4244); |
33 #include <libavcodec/avcodec.h> | 33 #include <libavcodec/avcodec.h> |
34 #include <libavcodec/internal.h> | |
wtc1
2015/09/05 01:46:04
The "internal.h" file name suggests this header is
| |
34 #include <libavformat/avformat.h> | 35 #include <libavformat/avformat.h> |
35 #include <libavformat/internal.h> | 36 #include <libavformat/internal.h> |
36 #include <libavformat/avio.h> | 37 #include <libavformat/avio.h> |
37 #include <libavutil/avutil.h> | 38 #include <libavutil/avutil.h> |
38 #include <libavutil/imgutils.h> | 39 #include <libavutil/imgutils.h> |
39 #include <libavutil/log.h> | 40 #include <libavutil/log.h> |
40 #include <libavutil/mathematics.h> | 41 #include <libavutil/mathematics.h> |
41 #include <libavutil/opt.h> | 42 #include <libavutil/opt.h> |
42 MSVC_POP_WARNING(); | 43 MSVC_POP_WARNING(); |
43 } // extern "C" | 44 } // extern "C" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
128 AVColorRange color_range); | 129 AVColorRange color_range); |
129 | 130 |
130 // Convert FFmpeg UTC representation (YYYY-MM-DD HH:MM:SS) to base::Time. | 131 // Convert FFmpeg UTC representation (YYYY-MM-DD HH:MM:SS) to base::Time. |
131 // Returns true and sets |*out| if |date_utc| contains a valid | 132 // Returns true and sets |*out| if |date_utc| contains a valid |
132 // date string. Otherwise returns fals and timeline_offset is unmodified. | 133 // date string. Otherwise returns fals and timeline_offset is unmodified. |
133 MEDIA_EXPORT bool FFmpegUTCDateToTime(const char* date_utc, base::Time* out); | 134 MEDIA_EXPORT bool FFmpegUTCDateToTime(const char* date_utc, base::Time* out); |
134 | 135 |
135 } // namespace media | 136 } // namespace media |
136 | 137 |
137 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ | 138 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ |
OLD | NEW |