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)
commit6feb72a094de7ae43ae6ec0685fab4856a8938bd
treee40c02b714170f59e239a55d1a2bae9fd10be070
parent02d979d0074a8ec6f6650c8262e15ac50d2b97ce
parent431f57f0467244686ae63a3d06a8cf51f60090ed
Merge commit '431f57f0467244686ae63a3d06a8cf51f60090ed' into release/2.4

* commit '431f57f0467244686ae63a3d06a8cf51f60090ed':
  libopusenc: prevent an out-of-bounds read by returning early

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