diff options
| author | imcheng@chromium.org <imcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 20:59:34 +0000 |
|---|---|---|
| committer | imcheng@chromium.org <imcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 20:59:34 +0000 |
| commit | df970ecba180164e86be3dc3a3b802e203295984 (patch) | |
| tree | 47d3198119c90f41f3f22567b490e382d4affafb /media | |
| parent | 227d5306e7c530f6256fc63475c22c2715d11def (diff) | |
| download | chromium_src-df970ecba180164e86be3dc3a3b802e203295984.zip chromium_src-df970ecba180164e86be3dc3a3b802e203295984.tar.gz chromium_src-df970ecba180164e86be3dc3a3b802e203295984.tar.bz2 | |
Removed strmiids.lib from MftH264Decoder by reordering two header files. (move evr.h after mfapi.h)
BUG=none
TEST=compile the decoder, example, and unittests and see if it works.
Review URL: http://codereview.chromium.org/3191027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/mf/mft_h264_decoder.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/mf/mft_h264_decoder.cc b/media/mf/mft_h264_decoder.cc index 22a42f4..0a7ba06 100644 --- a/media/mf/mft_h264_decoder.cc +++ b/media/mf/mft_h264_decoder.cc @@ -10,9 +10,10 @@ #include <d3d9.h> #include <dxva2api.h> -#include <evr.h> #include <initguid.h> #include <mfapi.h> +// Placed after mfapi.h to avoid linking strmiids.lib for MR_BUFFER_SERVICE. +#include <evr.h> #include <mferror.h> #include <wmcodecdsp.h> @@ -23,7 +24,6 @@ #pragma comment(lib, "d3d9.lib") #pragma comment(lib, "mf.lib") #pragma comment(lib, "mfplat.lib") -#pragma comment(lib, "strmiids.lib") namespace { @@ -431,9 +431,9 @@ bool MftH264Decoder::CheckDecoderDxvaSupport() { UINT32 dxva; hr = attributes->GetUINT32(MF_SA_D3D_AWARE, &dxva); if (FAILED(hr) || !dxva) { - LOG(ERROR) << "Failed to get DXVA attr, hr = " + LOG(ERROR) << "Failed to get DXVA attr or decoder is not DXVA-aware, hr = " << std::hex << std::showbase << hr - << "this might not be the right decoder."; + << " this might not be the right decoder."; return false; } return true; |