Merge commit '019a28cd630286ecb2b06ee62025a17c821b493e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 23:22:05 +0000 (01:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 23:22:46 +0000 (01:22 +0200)
commitd55d8229fb120aeed7387ca749f59c404dec6304
tree224271a884ad85e453011e9398479e09f3b1bb45
parent60831f441db8f18b619613f6dd942e3091687496
parent019a28cd630286ecb2b06ee62025a17c821b493e
Merge commit '019a28cd630286ecb2b06ee62025a17c821b493e'

* commit '019a28cd630286ecb2b06ee62025a17c821b493e':
  sanm: Use correct printf conversion specifiers for POSIX int types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/sanm.c