Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:44:28 +0000 (23:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 22:44:28 +0000 (23:44 +0100)
commitde182701ac9e5c6f571e21ba1fffb1fa8d0f808d
tree7cd842c2634db0ff70ef8c811c29511f3c97ac8d
parent9d6a27d5336550c131d2a45fc4b0e90c93e46aca
parent4f4840377f8074c0b8f4c07e5c44226b2d4e79da
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lagarith: Fix typo in printf format string

Conflicts:
libavcodec/lagarith.c

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