[FFmpeg-cvslog] Merge commit '7df3b426bbfbd7efd9a0f56393e3cc78413b0869'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 25 04:55:17 2014 +0200| [48579041bae5e19177b0d09e3b9cfcfc33d440d8] | committer: Michael Niedermayer

Merge commit '7df3b426bbfbd7efd9a0f56393e3cc78413b0869'

* commit '7df3b426bbfbd7efd9a0f56393e3cc78413b0869':
  mxfenc: Fix possible integer overflows

Conflicts:
	libavformat/mxfenc.c

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

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