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

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

Issue 42521: Ability for demuxer clients to get to FFmpeg's AVStream object exposed as an ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 months 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/filters/decoder_base.h ('k') | media/filters/ffmpeg_common.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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_FILTERS_FFMPEG_COMMON_H_
6 #define MEDIA_FILTERS_FFMPEG_COMMON_H_
7
5 // Used for FFmpeg error codes. 8 // Used for FFmpeg error codes.
6 #include <cerrno> 9 #include <cerrno>
7 10
8 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
9 12
10 // Include FFmpeg header files. 13 // Include FFmpeg header files.
11 extern "C" { 14 extern "C" {
12 // Temporarily disable possible loss of data warning. 15 // Temporarily disable possible loss of data warning.
13 // TODO(scherkus): fix and upstream the compiler warnings. 16 // TODO(scherkus): fix and upstream the compiler warnings.
14 MSVC_PUSH_DISABLE_WARNING(4244); 17 MSVC_PUSH_DISABLE_WARNING(4244);
15 #include "third_party/ffmpeg/include/libavcodec/avcodec.h" 18 #include "third_party/ffmpeg/include/libavcodec/avcodec.h"
16 #include "third_party/ffmpeg/include/libavformat/avformat.h" 19 #include "third_party/ffmpeg/include/libavformat/avformat.h"
17 MSVC_POP_WARNING(); 20 MSVC_POP_WARNING();
18 } // extern "C" 21 } // extern "C"
19 22
20 namespace media { 23 namespace media {
21 24
22 // MediaFormat key identifying the CodecID. 25 // MediaFormat key identifying the CodecID.
23 extern const char kFFmpegCodecID[]; 26 extern const char kFFmpegCodecID[];
24 27
25 // FFmpeg MIME types. 28 // FFmpeg MIME types.
26 namespace mime_type { 29 namespace mime_type {
27 30
28 extern const char kFFmpegAudio[]; 31 extern const char kFFmpegAudio[];
29 extern const char kFFmpegVideo[]; 32 extern const char kFFmpegVideo[];
30 33
31 } // namespace mime_type 34 } // namespace mime_type
32 35
36 namespace interface_id {
37
38 extern const char kFFmpegDemuxerStream[];
39
40 } // namespace interface_id
41
42
33 } // namespace media 43 } // namespace media
44
45 #endif // MEDIA_FILTERS_FFMPEG_COMMON_H_
OLDNEW
« no previous file with comments | « media/filters/decoder_base.h ('k') | media/filters/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698