am c3429415: Merge "Don\'t use the bitrate of the xing header"

* commit 'c3429415023aeef0ac669fadcd11d4511b9a54a5':
  Don't use the bitrate of the xing header