Merge commit '8dd0a2c5cf40a8a49faae985adc11750b6429132'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 11:12:16 +0000 (12:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 11:12:27 +0000 (12:12 +0100)
commit7b824e8b25cb9442ce8769ded59200aa0deab35c
tree7ae83c2caea5351ac8f5b64fedb9852f2ea7c7c1
parent3c6e148e843e97a6c7d9dff937b0371bf1e37ff3
parent8dd0a2c5cf40a8a49faae985adc11750b6429132
Merge commit '8dd0a2c5cf40a8a49faae985adc11750b6429132'

* commit '8dd0a2c5cf40a8a49faae985adc11750b6429132':
  libopusenc: prevent an out-of-bounds read by returning early

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