Merge commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:41:16 +0000 (01:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:41:30 +0000 (01:41 +0100)
commitf038623d534212c79f31434b0b071039c296a08c
tree6832f9f8e680a04412332decada0180d92bd9c08
parent6aece62b50cc19280213f91007cbf8d63a9f9432
parent2a75c0b1ca16b5480497de0d4c79ef122406a0b5
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@gmx.at>
libavcodec/aacsbr.c