[FFmpeg-cvslog] Merge commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 17 21:26:11 2015 +0100| [45f62c74dd40b0f2a83ac452c087fe0664d9e27b] | committer: Michael Niedermayer

Merge commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0'

* commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0':
  aacsbr: Fix type for index variable

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

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