diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-18 11:57:30 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-18 11:57:30 +0100 |
| commit | 9ab5563a3196760eb381d102cbb2bc0f7abc6a50 (patch) | |
| tree | 1c690f8b0c998ba536a0c7aeff34764383c7dff6 /media/base/bitstream_buffer.h | |
| parent | 106cdaa9e420b49e5b1ef6941f08dd990128a374 (diff) | |
| download | chromium_org-9ab5563a3196760eb381d102cbb2bc0f7abc6a50.tar.gz | |
Merge from Chromium at DEPS revision r212225
This commit was generated by merge_to_master.py.
Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
Diffstat (limited to 'media/base/bitstream_buffer.h')
| -rw-r--r-- | media/base/bitstream_buffer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/base/bitstream_buffer.h b/media/base/bitstream_buffer.h index b7ff3d76aa..3a264737f4 100644 --- a/media/base/bitstream_buffer.h +++ b/media/base/bitstream_buffer.h @@ -6,7 +6,7 @@ #define MEDIA_BASE_BITSTREAM_BUFFER_H_ #include "base/basictypes.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" namespace media { |