Added userdata pointer to audio/video callbacks
Merge branch 'mannol1-master'