[FFmpeg-cvslog] Merge commit '1d8aa23794cc63e9517d5055a2d48040b843b1cf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 22 11:55:53 2015 +0100| [526f7ef2110811f3b8d116e80ef29cae3b30bc2d] | committer: Michael Niedermayer

Merge commit '1d8aa23794cc63e9517d5055a2d48040b843b1cf'

* commit '1d8aa23794cc63e9517d5055a2d48040b843b1cf':
  dashenc: Fix format string generation

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

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