diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 19:36:47 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 19:36:47 +0000 |
| commit | 35eb9b2460d0ac3c54001059c174e884fe13158f (patch) | |
| tree | fe42e9b301b9f4dbbe1dc50a2b73d935f393bb4e /media/ffmpeg/ffmpeg_common.h | |
| parent | 7f10d11484d9f4ca57cd8f1fdddb82abe71e5a6e (diff) | |
| download | chromium_src-35eb9b2460d0ac3c54001059c174e884fe13158f.zip chromium_src-35eb9b2460d0ac3c54001059c174e884fe13158f.tar.gz chromium_src-35eb9b2460d0ac3c54001059c174e884fe13158f.tar.bz2 | |
Miscellaneous header file cleanup for src/media.
Review URL: http://codereview.chromium.org/8418017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg/ffmpeg_common.h')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index bb01f4f..13a53cf 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -9,13 +9,10 @@ #include <cerrno> #include "base/compiler_specific.h" -#include "base/memory/singleton.h" #include "base/time.h" -#include "media/base/audio_decoder_config.h" #include "media/base/channel_layout.h" #include "media/base/media_export.h" -#include "media/video/video_decode_engine.h" -#include "ui/gfx/size.h" +#include "media/base/video_frame.h" // Include FFmpeg header files. extern "C" { @@ -32,6 +29,9 @@ MSVC_POP_WARNING(); namespace media { +class AudioDecoderConfig; +class VideoDecoderConfig; + // Wraps FFmpeg's av_free() in a class that can be passed as a template argument // to scoped_ptr_malloc. class ScopedPtrAVFree { |