1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Elements/JingleRTPDescription.h b/Swiften/Elements/JingleRTPDescription.h
index 5337aa8..26b5a24 100644
--- a/Swiften/Elements/JingleRTPDescription.h
+++ b/Swiften/Elements/JingleRTPDescription.h
@@ -24,12 +24,12 @@ namespace Swift {
 			};
 
 		public:
-			JingleRTPDescription(MediaType mediaType = Unknown, std::string bandwidthType = "",
+			JingleRTPDescription(MediaType media = Unknown, std::string bandwidthType = "",
 					std::string bandwidthValue = "", boost::uint32_t ssrc = 0) :
-				mediaType(mediaType), bandwidthType(bandwidthType), bandwidthValue(bandwidthValue), ssrc(ssrc) {}
+				media(media), bandwidthType(bandwidthType), bandwidthValue(bandwidthValue), ssrc(ssrc) {}
 
-			void setMediaType(MediaType mediaType) { this->mediaType = mediaType; }
-			MediaType getMediaType() const { return mediaType; }
+			void setMedia(MediaType media) { this->media = media; }
+			MediaType getMedia() const { return media; }
 
 			void setBandwidth(const std::string& type, const std::string& value) {
 				bandwidthType = type;
@@ -47,7 +47,7 @@ namespace Swift {
 			const std::vector<RTPPayloadType>& getPayloadTypes() const { return payloadTypes; }
 
 		private:
-			MediaType mediaType;
+			MediaType media;
 			std::string bandwidthType;
 			std::string bandwidthValue;
 			boost::uint32_t ssrc;