| Index: content/common/gpu/media/h264_dpb.h
|
| diff --git a/content/common/gpu/media/h264_dpb.h b/content/common/gpu/media/h264_dpb.h
|
| index fe15c700fec762322c021c0f3715bb6401d8435f..29be0bcfeda250bffc6a53b7624a6f79c8c4c381 100644
|
| --- a/content/common/gpu/media/h264_dpb.h
|
| +++ b/content/common/gpu/media/h264_dpb.h
|
| @@ -12,7 +12,7 @@
|
|
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_vector.h"
|
| -#include "content/common/gpu/media/h264_parser.h"
|
| +#include "media/filters/h264_parser.h"
|
|
|
| namespace content {
|
|
|
| @@ -55,7 +55,8 @@ struct H264Picture {
|
| // memory management after finishing this picture.
|
| bool long_term_reference_flag;
|
| bool adaptive_ref_pic_marking_mode_flag;
|
| - H264DecRefPicMarking ref_pic_marking[H264SliceHeader::kRefListSize];
|
| + media::H264DecRefPicMarking
|
| + ref_pic_marking[media::H264SliceHeader::kRefListSize];
|
|
|
| typedef std::vector<H264Picture*> PtrVector;
|
| };
|
|
|