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)
* commit '7a2b2b6a92c4b528ecb640790eca0aa790d858f4':
  dxtory: Drop nonsense ISO C printf conversion specifiers for standard types

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

Simple merge