diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 00:27:07 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 00:27:07 +0000 |
| commit | f3018df5f0253bd5dcbe3b67f65d889ebd09ab82 (patch) | |
| tree | ba548692d965da6944a1720b10d08d6a15536a44 /media | |
| parent | ab56fb3a85d66817b7812fe01a81c6710e7d2b6e (diff) | |
| download | chromium_src-f3018df5f0253bd5dcbe3b67f65d889ebd09ab82.zip chromium_src-f3018df5f0253bd5dcbe3b67f65d889ebd09ab82.tar.gz chromium_src-f3018df5f0253bd5dcbe3b67f65d889ebd09ab82.tar.bz2 | |
Adding in ffmpeg_common.h into header for definition of CodecID.
Review URL: http://codereview.chromium.org/125163
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/mock_ffmpeg.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/media/base/mock_ffmpeg.h b/media/base/mock_ffmpeg.h index 62b085c..711cf15 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 { |