am b16cf676: am 6d35d4c2: Merge change Ib16e5543 into eclair-mr2

Merge commit 'b16cf676bd3304bc0c5da4210d689f4e680219b1'

* commit 'b16cf676bd3304bc0c5da4210d689f4e680219b1':
  Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.