[FFmpeg-cvslog] Merge commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 01:41:16 2015 +0100| [f038623d534212c79f31434b0b071039c296a08c] | committer: Michael Niedermayer

Merge commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5' into release/2.4

* commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5':
  aacsbr: change order of operation to prevent out of array read

Conflicts:
	libavcodec/aacsbr.c

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

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