Merge branch 'dev'

Conflicts:
	deefuzzer/tools/player.py

diff --cc deefuzzer/tools/player.py
index 629083ea8cd23a201e4f253703865d8c7caf0458,244336e4212cd7130f7101b408672fdfafe9b199..7dd2be67dd7deb22a6951fb50023fa939c48f1cd
--- 1/deefuzzer/tools/player.py
--- 2/deefuzzer/tools/player.py
+++ b/deefuzzer/tools/player.py
@@@ -41,11 -41,15 +41,15 @@@ from relay import 
  class Player:
      """A file streaming iterator"""
  
-     def __init__(self):
 -    def __init__(self, type='mp3'):
++    def __init__(self, type='icecast'):
          self.main_buffer_size = 0x100000
-         self.relay_queue_size = 0x100000
-         self.sub_buffer_size = 0x10000
- 
+         if type == 'icecast':
+             self.relay_queue_size = 0x100000
+             self.sub_buffer_size = 0x10000
+         if type == 'stream-m':
+             self.relay_queue_size = 0x10000
+             self.sub_buffer_size = 0x20000
+         
      def set_media(self, media):
          self.media = media