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)
* commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d':
  dashenc: Use inttypes.h macros for format strings instead of %lld

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

Simple merge