diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 03:15:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 03:15:51 +0200 |
| commit | 5ac46a0969a3c86422794c838b681c75fda6b25e (patch) | |
| tree | 0aefa5796f62a7bd8854d8e3e3ff3d2aee9b2e21 /libavfilter/af_afade.c | |
| parent | 8b55f67e3ee3dabb11877aa0df2ba56d1423be43 (diff) | |
| parent | 37e2d574ddcedc25e32bd963737b033354543789 (diff) | |
| download | ffmpeg-5ac46a0969a3c86422794c838b681c75fda6b25e.tar.gz | |
Merge commit '37e2d574ddcedc25e32bd963737b033354543789' into release/2.2
* commit '37e2d574ddcedc25e32bd963737b033354543789':
setpts: Add missing inttypes.h #include for PRId64
Conflicts:
libavfilter/setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_afade.c')
0 files changed, 0 insertions, 0 deletions