diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 19:34:45 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 19:34:45 +0000 |
| commit | 5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac (patch) | |
| tree | b3b4d32437596c5462b1907e6c68f2db2d15b8a0 /media/tools | |
| parent | 186bf92abfcce5136acb040c301959ff6ca96028 (diff) | |
| download | chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.zip chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.tar.gz chromium_src-5667f1bdc8d290f469f9c5eae7bb4ec7563f85ac.tar.bz2 | |
Revert 80819 due to failed tests
TBR=pkasting@chromium.org
Review URL: http://codereview.chromium.org/6816024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/mfplayer/mf_playback_main.cc | 4 | ||||
| -rw-r--r-- | media/tools/mfplayer/mfplayer.cc | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/media/tools/mfplayer/mf_playback_main.cc b/media/tools/mfplayer/mf_playback_main.cc index 3ce897c..3ae8164 100644 --- a/media/tools/mfplayer/mf_playback_main.cc +++ b/media/tools/mfplayer/mf_playback_main.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -6,9 +6,7 @@ #include "media/tools/mfplayer/mfplayer.h" #include <mfapi.h> -#define STRSAFE_NO_DEPRECATE #include <strsafe.h> - #include <cassert> namespace mfplayer { diff --git a/media/tools/mfplayer/mfplayer.cc b/media/tools/mfplayer/mfplayer.cc index 7ef51e1..79894ee 100644 --- a/media/tools/mfplayer/mfplayer.cc +++ b/media/tools/mfplayer/mfplayer.cc @@ -7,9 +7,9 @@ #include <mfapi.h> #include <mferror.h> #include <shlwapi.h> +#include <strsafe.h> #include <cassert> -#include <cstdio> template <class T> static void SafeRelease(T** pptr) { |