[FFmpeg-cvslog] Merge commit '07cac07c0c0360d67e73a7472214c79d6c520a4b'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 27 22:09:08 2017 +0200| [9fec43902c993e6bdf7d57f176160c04c6ec2437] | committer: Clément Bœsch

Merge commit '07cac07c0c0360d67e73a7472214c79d6c520a4b'

* commit '07cac07c0c0360d67e73a7472214c79d6c520a4b':
  dash: Use correct ISO C scanf conversion specifier

This commit is a noop: the use of SCN (scanf) format is wrong here.

Merged-by: Clément Bœsch <u at pkh.me>

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