diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 18:21:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 18:21:10 +0100 |
| commit | 7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b (patch) | |
| tree | 307a6348456706e6ca2d3aebfc89b999192f556b /libavcodec/4xm.c | |
| parent | 54df8b4feaf43c0c65e3e8bf541897e0abba3549 (diff) | |
| parent | 7513234bdd93f80593bfee3eb2da8c8f0d3992da (diff) | |
| download | ffmpeg-7ef8d97b1aa9e142527debcaf993aa1ee8f08a9b.tar.gz | |
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>
Diffstat (limited to 'libavcodec/4xm.c')
0 files changed, 0 insertions, 0 deletions