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

Unified Diff: media/base/mock_ffmpeg.h

Issue 125163: Adding in ffmpeg_common.h into header for definition of CodecID. (Closed)
Patch Set: Created 11 years, 6 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_ffmpeg.h
diff --git a/media/base/mock_ffmpeg.h b/media/base/mock_ffmpeg.h
index 62b085c0bb7bff304d3effa1be82970db4f2144f..711cf1520605344510fd50a890469e79a56334f7 100644
--- a/media/base/mock_ffmpeg.h
+++ b/media/base/mock_ffmpeg.h
@@ -5,13 +5,10 @@
#ifndef MEDIA_BASE_MOCK_FFMPEG_H_
#define MEDIA_BASE_MOCK_FFMPEG_H_
-#include "testing/gmock/include/gmock/gmock.h"
+// TODO(scherkus): See if we can remove ffmpeg_common from this file.
+#include "media/filters/ffmpeg_common.h"
-struct AVCodec;
-struct AVCodecContext;
-struct AVFrame;
-struct AVPacket;
-enum CodecID;
+#include "testing/gmock/include/gmock/gmock.h"
namespace media {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698