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

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

Issue 11364077: Linux: fix build with system ffmpeg (Chromium side). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update Created 8 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 | « media/base/media_posix.cc ('k') | no next file » | 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) 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
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/time.h" 12 #include "base/time.h"
13 #include "media/base/audio_decoder_config.h" 13 #include "media/base/audio_decoder_config.h"
14 #include "media/base/channel_layout.h" 14 #include "media/base/channel_layout.h"
15 #include "media/base/media_export.h" 15 #include "media/base/media_export.h"
16 #include "media/base/video_frame.h" 16 #include "media/base/video_frame.h"
17 #include "media/base/video_decoder_config.h" 17 #include "media/base/video_decoder_config.h"
18 18
19 // Include FFmpeg header files. 19 // Include FFmpeg header files.
20 extern "C" { 20 extern "C" {
21 // Temporarily disable possible loss of data warning. 21 // Temporarily disable possible loss of data warning.
22 // TODO(scherkus): fix and upstream the compiler warnings. 22 // TODO(scherkus): fix and upstream the compiler warnings.
23 MSVC_PUSH_DISABLE_WARNING(4244); 23 MSVC_PUSH_DISABLE_WARNING(4244);
24 #include <libavcodec/avcodec.h> 24 #include <libavcodec/avcodec.h>
25 #include <libavformat/avformat.h> 25 #include <libavformat/avformat.h>
26 #include <libavformat/avio.h> 26 #include <libavformat/avio.h>
27 #include <libavformat/url.h>
28 #include <libavutil/avutil.h> 27 #include <libavutil/avutil.h>
29 #include <libavutil/mathematics.h> 28 #include <libavutil/mathematics.h>
30 #include <libavutil/log.h> 29 #include <libavutil/log.h>
31 #include <libavutil/imgutils.h> 30 #include <libavutil/imgutils.h>
32 MSVC_POP_WARNING(); 31 MSVC_POP_WARNING();
33 } // extern "C" 32 } // extern "C"
34 33
35 namespace media { 34 namespace media {
36 35
37 class AudioDecoderConfig; 36 class AudioDecoderConfig;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 99
101 // Converts an FFmpeg video codec ID into its corresponding supported codec id. 100 // Converts an FFmpeg video codec ID into its corresponding supported codec id.
102 VideoCodec CodecIDToVideoCodec(CodecID codec_id); 101 VideoCodec CodecIDToVideoCodec(CodecID codec_id);
103 102
104 // Converts an FFmpeg audio codec ID into its corresponding supported codec id. 103 // Converts an FFmpeg audio codec ID into its corresponding supported codec id.
105 AudioCodec CodecIDToAudioCodec(CodecID codec_id); 104 AudioCodec CodecIDToAudioCodec(CodecID codec_id);
106 105
107 } // namespace media 106 } // namespace media
108 107
109 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_ 108 #endif // MEDIA_FFMPEG_FFMPEG_COMMON_H_
OLDNEW
« no previous file with comments | « media/base/media_posix.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698