Merge commit '7df3b426bbfbd7efd9a0f56393e3cc78413b0869'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 02:55:17 +0000 (04:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 02:55:17 +0000 (04:55 +0200)
* commit '7df3b426bbfbd7efd9a0f56393e3cc78413b0869':
  mxfenc: Fix possible integer overflows

Conflicts:
libavformat/mxfenc.c

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

Trivial merge