diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-21 21:47:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-21 21:47:43 +0200 |
| commit | 2bfd4ff16dddc46d30b9e3510cb31e3b1b1b90fe (patch) | |
| tree | 0d5cf2ee61c86b14375481cc46efd72fc9da6ce6 /libavformat/framehash.c | |
| parent | 4f49c39a2fec85435fd0aabd5a402d9fa11b2fea (diff) | |
| parent | 593aaee953f8b07c141ff115e67bae85ef0350c7 (diff) | |
| download | ffmpeg-2bfd4ff16dddc46d30b9e3510cb31e3b1b1b90fe.tar.gz | |
Merge commit '593aaee953f8b07c141ff115e67bae85ef0350c7'
* commit '593aaee953f8b07c141ff115e67bae85ef0350c7':
setpts: Add missing inttypes.h #include for PRId64
Conflicts:
libavfilter/setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/framehash.c')
0 files changed, 0 insertions, 0 deletions