summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-30 09:45:58 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-30 09:45:58 +0000
commite5ca636dd1b50cc61275d0f686aea895d2f42ee2 (patch)
tree7cd49f805653764a7e501d0f494b83ba09cf3c9b /webkit
parent0d47474882642ea12d5c81170621cd826085b09c (diff)
downloadchromium_src-e5ca636dd1b50cc61275d0f686aea895d2f42ee2.zip
chromium_src-e5ca636dd1b50cc61275d0f686aea895d2f42ee2.tar.gz
chromium_src-e5ca636dd1b50cc61275d0f686aea895d2f42ee2.tar.bz2
Replace the unnecessary VDA::Profile typedef with media::VideoCodecProfile
Originally landed as: http://src.chromium.org/viewvc/chrome?view=rev&revision=129752 Reverted in: http://src.chromium.org/viewvc/chrome?view=rev&revision=129765 Review URL: http://codereview.chromium.org/9863027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129816 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/ppb_video_decoder_impl.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
index 9d34734..ac4a82b 100644
--- a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
+++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc
@@ -45,12 +45,12 @@ PPB_VideoDecoder_Impl::PPB_VideoDecoder_Impl(PP_Instance instance)
PPB_VideoDecoder_Impl::~PPB_VideoDecoder_Impl() {
}
-// Convert PP_VideoDecoder_Profile to media::VideoDecodeAccelerator::Profile.
-static media::VideoDecodeAccelerator::Profile PPToMediaProfile(
+// Convert PP_VideoDecoder_Profile to media::VideoCodecProfile.
+static media::VideoCodecProfile PPToMediaProfile(
const PP_VideoDecoder_Profile pp_profile) {
// TODO(fischman,vrk): this assumes the enum values in the two Profile types
// match up exactly. Add a COMPILE_ASSERT for this somewhere.
- return static_cast<media::VideoDecodeAccelerator::Profile>(pp_profile);
+ return static_cast<media::VideoCodecProfile>(pp_profile);
}
// static