[FFmpeg-cvslog] Merge commit '470c9db11ff2c3249e995e7ba68e87bb81bf778c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  3 05:17:19 2015 +0100| [38c1bffd80c106ec42938178ad3e71e58eef3b09] | committer: Michael Niedermayer

Merge commit '470c9db11ff2c3249e995e7ba68e87bb81bf778c'

* commit '470c9db11ff2c3249e995e7ba68e87bb81bf778c':
  sidxindex: Remove parsing that isn't necessary any longer

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38c1bffd80c106ec42938178ad3e71e58eef3b09
---