summaryrefslogtreecommitdiffstats
path: root/media/ffmpeg/ffmpeg_common.h
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 05:40:10 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-28 05:40:10 +0000
commit7e72e7b3eb04b78828b8d5fd757e3abe191b6829 (patch)
treeec78ba6e2c6b0806654a2d12fa5676ade3e519f7 /media/ffmpeg/ffmpeg_common.h
parent0cf7628b3df79acccbeb724ad99f6ce2899c9d45 (diff)
downloadchromium_src-7e72e7b3eb04b78828b8d5fd757e3abe191b6829.zip
chromium_src-7e72e7b3eb04b78828b8d5fd757e3abe191b6829.tar.gz
chromium_src-7e72e7b3eb04b78828b8d5fd757e3abe191b6829.tar.bz2
Use a direct include of time headers in media/.
BUG=254986 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/18052007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg/ffmpeg_common.h')
-rw-r--r--media/ffmpeg/ffmpeg_common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
index cc5955c..b40a765 100644
--- a/media/ffmpeg/ffmpeg_common.h
+++ b/media/ffmpeg/ffmpeg_common.h
@@ -9,12 +9,12 @@
#include <cerrno>
#include "base/compiler_specific.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/channel_layout.h"
#include "media/base/media_export.h"
-#include "media/base/video_frame.h"
#include "media/base/video_decoder_config.h"
+#include "media/base/video_frame.h"
// Include FFmpeg header files.
extern "C" {