[FFmpeg-cvslog] Merge commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  5 01:30:18 2014 +0100| [d80b9ea11da1680a3373a52a6031e2717cade25b] | committer: Michael Niedermayer

Merge commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6'

* commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6':
  samplefmt: avoid integer overflow in av_samples_get_buffer_size()

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d80b9ea11da1680a3373a52a6031e2717cade25b
---