diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 01:32:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-29 01:40:23 +0200 |
| commit | 983109bbd99939c0c3a35c96b1c36e823bf30f6b (patch) | |
| tree | 224271a884ad85e453011e9398479e09f3b1bb45 /LICENSE.md | |
| parent | d55d8229fb120aeed7387ca749f59c404dec6304 (diff) | |
| parent | 942269fd00cb48328e4cffb6e21a0b691ce9f6bc (diff) | |
| download | ffmpeg-983109bbd99939c0c3a35c96b1c36e823bf30f6b.tar.gz | |
Merge commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc'
* commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc':
caf: Use correct printf conversion specifiers for POSIX int types
Conflicts:
libavformat/cafdec.c
See: 1f36ebf63a8d6ffccf4bf286849d77f76aad8b8f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'LICENSE.md')
0 files changed, 0 insertions, 0 deletions