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

Side by Side Diff: media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_VIDEO_DECODER_H_ 5 #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_VIDEO_DECODER_H_
6 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_VIDEO_DECODER_H_ 6 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_VIDEO_DECODER_H_
7 7
8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
11 #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h" 10 #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
12 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" 11 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"
13 #include "media/ffmpeg/ffmpeg_deleters.h" 12 #include "media/ffmpeg/ffmpeg_deleters.h"
14 13
15 struct AVCodecContext; 14 struct AVCodecContext;
16 struct AVFrame; 15 struct AVFrame;
17 16
18 namespace media { 17 namespace media {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 bool is_initialized_; 50 bool is_initialized_;
52 51
53 ClearKeyCdmHost* const host_; 52 ClearKeyCdmHost* const host_;
54 53
55 DISALLOW_COPY_AND_ASSIGN(FFmpegCdmVideoDecoder); 54 DISALLOW_COPY_AND_ASSIGN(FFmpegCdmVideoDecoder);
56 }; 55 };
57 56
58 } // namespace media 57 } // namespace media
59 58
60 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_VIDEO_DECODER_H_ 59 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_VIDEO_DECODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698