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)
* commit '8dd0a2c5cf40a8a49faae985adc11750b6429132':
  libopusenc: prevent an out-of-bounds read by returning early

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

Simple merge