Index: media/base/android/demuxer_stream_player_params.h |
diff --git a/media/base/android/demuxer_stream_player_params.h b/media/base/android/demuxer_stream_player_params.h |
index 4a3a04d10e04a16f3b8fd90ce203fe8d240ce63c..340742023f494cef01cdce9d4f59aff41a511714 100644 |
--- a/media/base/android/demuxer_stream_player_params.h |
+++ b/media/base/android/demuxer_stream_player_params.h |
@@ -5,9 +5,6 @@ |
#ifndef MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ |
#define MEDIA_BASE_ANDROID_DEMUXER_STREAM_PLAYER_PARAMS_H_ |
-#if defined(GOOGLE_TV) |
-#include <string> |
-#endif // defined(GOOGLE_TV) |
#include <vector> |
#include "media/base/audio_decoder_config.h" |
@@ -35,10 +32,6 @@ struct MEDIA_EXPORT DemuxerConfigs { |
std::vector<uint8> video_extra_data; |
int duration_ms; |
- |
-#if defined(GOOGLE_TV) |
- std::string key_system; |
-#endif // defined(GOOGLE_TV) |
}; |
struct MEDIA_EXPORT AccessUnit { |