diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 01:21:12 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 01:21:12 +0000 |
| commit | 55ae5ecc5017ecce6b2d42d383d7e6fff3e78703 (patch) | |
| tree | ae0eca7575207502e37356dd63fc6d54ff793300 /media/webm/webm_cluster_parser.h | |
| parent | 6c7a6d221aefd8bf35e5e4368e91b532b5fd12c3 (diff) | |
| download | chromium_src-55ae5ecc5017ecce6b2d42d383d7e6fff3e78703.zip chromium_src-55ae5ecc5017ecce6b2d42d383d7e6fff3e78703.tar.gz chromium_src-55ae5ecc5017ecce6b2d42d383d7e6fff3e78703.tar.bz2 | |
Use std::string for decryption key ID in webm parser.
TBR=ddorwin@chromium.org
BUG=130689
TEST=media_unittests
Review URL: https://chromiumcodereview.appspot.com/10826098
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/webm/webm_cluster_parser.h')
| -rw-r--r-- | media/webm/webm_cluster_parser.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/media/webm/webm_cluster_parser.h b/media/webm/webm_cluster_parser.h index bbcbf37..988f224 100644 --- a/media/webm/webm_cluster_parser.h +++ b/media/webm/webm_cluster_parser.h @@ -22,8 +22,7 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient { WebMClusterParser(int64 timecode_scale, int audio_track_num, int video_track_num, - const uint8* video_encryption_key_id, - int video_encryption_key_id_size); + const std::string& video_encryption_key_id); virtual ~WebMClusterParser(); // Resets the parser state so it can accept a new cluster. @@ -75,8 +74,7 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient { double timecode_multiplier_; // Multiplier used to convert timecodes into // microseconds. - scoped_array<uint8> video_encryption_key_id_; - int video_encryption_key_id_size_; + std::string video_encryption_key_id_; WebMListParser parser_; |