[FFmpeg-cvslog] Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 22 18:21:10 2014 +0100| [7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b] | committer: Michael Niedermayer

Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'

* commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da':
  avfilter: more correct printf format specifiers

Conflicts:
	libavfilter/af_ashowinfo.c
	libavfilter/vf_showinfo.c

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

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