Merge commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc'

Browse Source

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

Conflicts:
	libavformat/cafdec.c

See: 1f36ebf63a
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2014-07-29 01:32:48 +02:00

parent d55d8229fb 942269fd00

commit 983109bbd9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available