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

Unified Diff: media/filters/ffmpeg_common.h

Issue 42029: Checking in media::FFmpegGlue, media::FFmpegDemuxer and tests. (Closed)
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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/build/media_unittests.vcproj ('k') | media/filters/ffmpeg_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_common.h
diff --git a/media/filters/ffmpeg_common.h b/media/filters/ffmpeg_common.h
new file mode 100644
index 0000000000000000000000000000000000000000..baddbb10a05afd42f6d0ec12506c2b8c05967ca4
--- /dev/null
+++ b/media/filters/ffmpeg_common.h
@@ -0,0 +1,33 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Used for FFmpeg error codes.
+#include <cerrno>
+
+#include "base/compiler_specific.h"
+
+// Include FFmpeg header files.
+extern "C" {
+// Temporarily disable possible loss of data warning.
+// TODO(scherkus): fix and upstream the compiler warnings.
+MSVC_PUSH_DISABLE_WARNING(4244);
+#include "third_party/ffmpeg/include/libavcodec/avcodec.h"
+#include "third_party/ffmpeg/include/libavformat/avformat.h"
+MSVC_POP_WARNING();
+} // extern "C"
+
+namespace media {
+
+// MediaFormat key identifying the CodecID.
+extern const char kFFmpegCodecID[];
+
+// FFmpeg MIME types.
+namespace mime_type {
+
+extern const char kFFmpegAudio[];
+extern const char kFFmpegVideo[];
+
+} // namespace mime_type
+
+} // namespace media
« no previous file with comments | « media/build/media_unittests.vcproj ('k') | media/filters/ffmpeg_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698