Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

Side by Side Diff: media/tools/mfplayer/mf_playback_main.cc

Issue 6816024: Revert 80819 due to failed tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/out_of_proc_test_runner.cc ('k') | media/tools/mfplayer/mfplayer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:eol-style
- LF
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This header is placed first to avoid compiler warning. 5 // This header is placed first to avoid compiler warning.
6 #include "media/tools/mfplayer/mfplayer.h" 6 #include "media/tools/mfplayer/mfplayer.h"
7 7
8 #include <mfapi.h> 8 #include <mfapi.h>
9 #define STRSAFE_NO_DEPRECATE
10 #include <strsafe.h> 9 #include <strsafe.h>
11
12 #include <cassert> 10 #include <cassert>
13 11
14 namespace mfplayer { 12 namespace mfplayer {
15 13
16 const wchar_t g_window_title[] = L"MFBasicPlayback"; 14 const wchar_t g_window_title[] = L"MFBasicPlayback";
17 const wchar_t g_window_class[] = L"Chrome_MFBasicPlayback"; 15 const wchar_t g_window_class[] = L"Chrome_MFBasicPlayback";
18 16
19 // True if there is no video playing, so we have to paint the window ourselves. 17 // True if there is no video playing, so we have to paint the window ourselves.
20 bool g_repaint_client = true; 18 bool g_repaint_client = true;
21 19
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 printf("Terminated\n"); 315 printf("Terminated\n");
318 return retval; 316 return retval;
319 } 317 }
320 318
321 } // namespace mfplayer 319 } // namespace mfplayer
322 320
323 321
324 int main(int argc, char** argv) { 322 int main(int argc, char** argv) {
325 return mfplayer::main2(argc, argv); 323 return mfplayer::main2(argc, argv);
326 } 324 }
OLDNEW
« no previous file with comments | « chrome/test/out_of_proc_test_runner.cc ('k') | media/tools/mfplayer/mfplayer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698