Merge commit '7a2b2b6a92c4b528ecb640790eca0aa790d858f4'
authorClément Bœsch <u@pkh.me>
Mon, 27 Mar 2017 20:05:50 +0000 (22:05 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 27 Mar 2017 20:05:50 +0000 (22:05 +0200)
commit349a26f50901732a0690d76487319c9d0df56ae0
tree3bbd5b8d671c445b836cf477245cf32ea8997a48
parent53dac6c23bdead2573a336128bc41810ab192def
parent7a2b2b6a92c4b528ecb640790eca0aa790d858f4
Merge commit '7a2b2b6a92c4b528ecb640790eca0aa790d858f4'

* commit '7a2b2b6a92c4b528ecb640790eca0aa790d858f4':
  dxtory: Drop nonsense ISO C printf conversion specifiers for standard types

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/dxtory.c