Merge commit 'ea1d0b7ece1881c2f1360f8c1e2116791105af21'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:18:09 +0000 (00:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:18:38 +0000 (00:18 +0100)
commit2ab3088dda31103351eb839f2d53674dc2936a97
treecc0ec090115aa63dfc90ab4cffcbd59907b92578
parent8a776726457ad20afc4e7cf9115b309034dd0f25
parentea1d0b7ece1881c2f1360f8c1e2116791105af21
Merge commit 'ea1d0b7ece1881c2f1360f8c1e2116791105af21'

* commit 'ea1d0b7ece1881c2f1360f8c1e2116791105af21':
  avcodec/utils: use correct printf specifier in ff_set_sar

See: 732c3ebffaff5005367d7f947fa903f3b6e92f68
Merged-by: Michael Niedermayer <michaelni@gmx.at>