-
Michael Niedermayer authored
* commit '7513234b': avfilter: more correct printf format specifiers Conflicts: libavfilter/af_ashowinfo.c libavfilter/vf_showinfo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
7ef8d97b
* commit '7513234b': avfilter: more correct printf format specifiers Conflicts: libavfilter/af_ashowinfo.c libavfilter/vf_showinfo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>