summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorimcheng@chromium.org <imcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 16:48:37 +0000
committerimcheng@chromium.org <imcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-08 16:48:37 +0000
commit5acca2efddcf230cc01cce9e5e1f179a1504e1aa (patch)
tree983757fea02d4d401331a6ef1b5d0a4c77176eda /media
parent6384d870fbb79b09f4d5fc04ec06ae5525be06d9 (diff)
downloadchromium_src-5acca2efddcf230cc01cce9e5e1f179a1504e1aa.zip
chromium_src-5acca2efddcf230cc01cce9e5e1f179a1504e1aa.tar.gz
chromium_src-5acca2efddcf230cc01cce9e5e1f179a1504e1aa.tar.bz2
Renamed a couple of variables in mft_h264_decoder.cc, and removed the <deque> header from mft_h264_decoder.h.
BUG=none TEST=compile Review URL: http://codereview.chromium.org/3331019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/mf/mft_h264_decoder.cc8
-rw-r--r--media/mf/mft_h264_decoder.h2
2 files changed, 4 insertions, 6 deletions
diff --git a/media/mf/mft_h264_decoder.cc b/media/mf/mft_h264_decoder.cc
index c63cae0..667645c 100644
--- a/media/mf/mft_h264_decoder.cc
+++ b/media/mf/mft_h264_decoder.cc
@@ -324,11 +324,11 @@ bool MftH264Decoder::CreateD3DDevManager() {
LOG(ERROR) << "Failed to create D3D9";
return false;
}
- static const TCHAR windowName[] = TEXT("MFT Decoder Hidden Window");
- static const TCHAR className[] = TEXT("STATIC");
+ static const TCHAR kWindowName[] = TEXT("MFT Decoder Hidden Window");
+ static const TCHAR kClassName[] = TEXT("STATIC");
device_window_ = CreateWindowEx(WS_EX_NOACTIVATE,
- className,
- windowName,
+ kClassName,
+ kWindowName,
WS_DISABLED | WS_POPUP,
0, 0, 1, 1,
HWND_MESSAGE,
diff --git a/media/mf/mft_h264_decoder.h b/media/mf/mft_h264_decoder.h
index 450cc2b..ede63cb 100644
--- a/media/mf/mft_h264_decoder.h
+++ b/media/mf/mft_h264_decoder.h
@@ -11,8 +11,6 @@
#if defined(OS_WIN)
-#include <deque>
-
#include <d3d9.h>
#include <dxva2api.h>
#include <mfidl.h>