Merge commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Jan 2015 11:06:34 +0000 (12:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 22 Jan 2015 11:06:47 +0000 (12:06 +0100)
commitb7f8e6dd8c26207213c7d1a74308b1c8dc84e92a
treea9279303ecde6c68fb82c8c98f90c24bed980f5a
parent526f7ef2110811f3b8d116e80ef29cae3b30bc2d
parent3a724a7f3ba7fa766c6a6f0924a15cc742031b8d
Merge commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d'

* commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d':
  dashenc: Use inttypes.h macros for format strings instead of %lld

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/dashenc.c