Commit 983109bb authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '942269fd'

* commit '942269fd':
  caf: Use correct printf conversion specifiers for POSIX int types

Conflicts:
	libavformat/cafdec.c

See: 1f36ebf6Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d55d8229 942269fd
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