Index: media/cdm/ppapi/ffmpeg_cdm_video_decoder.h |
diff --git a/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h b/media/cdm/ppapi/ffmpeg_cdm_video_decoder.h |
similarity index 79% |
rename from webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h |
rename to media/cdm/ppapi/ffmpeg_cdm_video_decoder.h |
index 5c4bb2b4e8562228ddcff5a7c3fe3f038fd3e5c5..17e2b5783bd1ab59afcffa69280c567fbf0dcfd2 100644 |
--- a/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h |
+++ b/media/cdm/ppapi/ffmpeg_cdm_video_decoder.h |
@@ -2,18 +2,18 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_ |
-#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_ |
+#ifndef MEDIA_CDM_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_ |
+#define MEDIA_CDM_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_ |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
-#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h" |
-#include "webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h" |
+#include "media/cdm/ppapi/api/content_decryption_module.h" |
+#include "media/cdm/ppapi/cdm_video_decoder.h" |
struct AVCodecContext; |
struct AVFrame; |
-namespace webkit_media { |
+namespace media { |
class FFmpegCdmVideoDecoder : public CdmVideoDecoder { |
public: |
@@ -53,6 +53,6 @@ class FFmpegCdmVideoDecoder : public CdmVideoDecoder { |
DISALLOW_COPY_AND_ASSIGN(FFmpegCdmVideoDecoder); |
}; |
-} // namespace webkit_media |
+} // namespace media |
-#endif // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_ |
+#endif // MEDIA_CDM_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_ |