| Index: media/gpu/vaapi_tfp_picture.h
|
| diff --git a/content/common/gpu/media/vaapi_tfp_picture.h b/media/gpu/vaapi_tfp_picture.h
|
| similarity index 84%
|
| rename from content/common/gpu/media/vaapi_tfp_picture.h
|
| rename to media/gpu/vaapi_tfp_picture.h
|
| index 5ef356532020e951ed717ed883d85535bd2cbc7e..1c9cdeb1a2314874304d23d272b76ba68387b510 100644
|
| --- a/content/common/gpu/media/vaapi_tfp_picture.h
|
| +++ b/media/gpu/vaapi_tfp_picture.h
|
| @@ -6,14 +6,14 @@
|
| // X11 window system used by VaapiVideoDecodeAccelerator to produce
|
| // output pictures.
|
|
|
| -#ifndef CONTENT_COMMON_GPU_MEDIA_VAAPI_TFP_PICTURE_H_
|
| -#define CONTENT_COMMON_GPU_MEDIA_VAAPI_TFP_PICTURE_H_
|
| +#ifndef MEDIA_GPU_VAAPI_TFP_PICTURE_H_
|
| +#define MEDIA_GPU_VAAPI_TFP_PICTURE_H_
|
|
|
| #include <stdint.h>
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "content/common/gpu/media/vaapi_picture.h"
|
| +#include "media/gpu/vaapi_picture.h"
|
| #include "ui/gfx/geometry/size.h"
|
| #include "ui/gl/gl_bindings.h"
|
|
|
| @@ -25,7 +25,7 @@ namespace gl {
|
| class GLImageGLX;
|
| }
|
|
|
| -namespace content {
|
| +namespace media {
|
|
|
| class VaapiWrapper;
|
|
|
| @@ -58,6 +58,6 @@ class VaapiTFPPicture : public VaapiPicture {
|
| DISALLOW_COPY_AND_ASSIGN(VaapiTFPPicture);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace media
|
|
|
| -#endif // CONTENT_COMMON_GPU_MEDIA_VAAPI_TFP_PICTURE_H_
|
| +#endif // MEDIA_GPU_VAAPI_TFP_PICTURE_H_
|
|
|