[FFmpeg-cvslog] Merge commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 22 12:06:34 2015 +0100| [b7f8e6dd8c26207213c7d1a74308b1c8dc84e92a] | committer: Michael Niedermayer

Merge commit '3a724a7f3ba7fa766c6a6f0924a15cc742031b8d'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7f8e6dd8c26207213c7d1a74308b1c8dc84e92a
---