Commit 48579041 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7df3b426'

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

Conflicts:
	libavformat/mxfenc.c

See: e3ba817bMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 5408d882 7df3b426
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment