Commit da304c52 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '4c5fa628'

* commit '4c5fa628':
  mov: Do not compute negative SAR values

Conflicts:
	libavformat/mov.c

See: e32b07aeMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e40cdf86 4c5fa628
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