ffmpeg rebased to master head, rev b691bc4, 2013-04-29
xbmc adjustments for ffmpeg master head, rev b691bc4, 2013-04-29