Revert "Set OPUSH SDP record supported format list to 0xff (any object type)."

This reverts commit ee7f17f2e9bc434c04fdfe5bfab84a6c48687b7a.
diff --git a/tools/sdptool.c b/tools/sdptool.c
index 0412f4c..4a02ed1 100644
--- a/tools/sdptool.c
+++ b/tools/sdptool.c
@@ -1749,7 +1749,12 @@
 	sdp_record_t record;
 	uint8_t chan = si->channel ? si->channel : 9;
 	sdp_data_t *channel;
+<<<<<<< HEAD
 	uint8_t formats[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0xff };
+=======
+	uint8_t formats[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
+	//uint8_t formats[] = { 0xff };
+>>>>>>> Revert "Set OPUSH SDP record supported format list to 0xff (any object type)."
 	void *dtds[sizeof(formats)], *values[sizeof(formats)];
 	unsigned int i;
 	uint8_t dtd = SDP_UINT8;