Commit 02223f4d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd1c229cd'

* commit 'd1c229cd':
  lavf: do not use int to store an int64

Conflicts:
	libavformat/utils.c

See: ad56535dMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 525289ed d1c229cd
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