Merge commit '431f57f0467244686ae63a3d06a8cf51f60090ed' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 02:27:11 +0000 (03:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 02:27:11 +0000 (03:27 +0100)
* commit '431f57f0467244686ae63a3d06a8cf51f60090ed':
  libopusenc: prevent an out-of-bounds read by returning early

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/libopusenc.c

Simple merge