Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 17:21:10 +0000 (18:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 17:21:10 +0000 (18:21 +0100)
commit7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b
tree307a6348456706e6ca2d3aebfc89b999192f556b
parent54df8b4feaf43c0c65e3e8bf541897e0abba3549
parent7513234bdd93f80593bfee3eb2da8c8f0d3992da
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@gmx.at>
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c