diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
---|---|---|
committer | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
commit | a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 (patch) | |
tree | 3437151d9ae1ce20a1e53a0d98c19ca01c786394 /media/cast/cast_config.h | |
parent | af5066f1e36c6579e74752647e6c584438f80f94 (diff) | |
download | chromium_org-a1401311d1ab56c4ed0a474bd38c108f75cb0cd9.tar.gz |
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
Diffstat (limited to 'media/cast/cast_config.h')
-rw-r--r-- | media/cast/cast_config.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/media/cast/cast_config.h b/media/cast/cast_config.h index 61e9620491..21caea098b 100644 --- a/media/cast/cast_config.h +++ b/media/cast/cast_config.h @@ -134,17 +134,6 @@ struct PcmAudioFrame { typedef transport::Packet Packet; typedef transport::PacketList PacketList; -enum CastInitializationStatus { - STATUS_INITIALIZED, - STATUS_INVALID_CAST_ENVIRONMENT, - STATUS_INVALID_CRYPTO_CONFIGURATION, - STATUS_UNSUPPORTED_AUDIO_CODEC, - STATUS_INVALID_AUDIO_CONFIGURATION, - STATUS_INVALID_VIDEO_CONFIGURATION, - STATUS_GPU_ACCELERATION_NOT_SUPPORTED, - STATUS_GPU_ACCELERATION_ERROR, -}; - typedef base::Callback<void(CastInitializationStatus)> CastInitializationCallback; |