Merge commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 00:30:18 +0000 (01:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 00:30:24 +0000 (01:30 +0100)
* commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6':
  samplefmt: avoid integer overflow in av_samples_get_buffer_size()

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

Simple merge