diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 13:00:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 13:00:21 +0200 |
| commit | d5dbd84c9ab63c2852103f5b6189cc7e53e797c9 (patch) | |
| tree | ed7d009f7abf7f42a9b7c24097ad20369ae06fb4 /libavutil/time.c | |
| parent | 3c200aa6930dfafdc4abacc49084503fa09dbbf8 (diff) | |
| parent | 2b677ffca54a5fbef9c8860841c32f28ecd68f70 (diff) | |
| download | ffmpeg-d5dbd84c9ab63c2852103f5b6189cc7e53e797c9.tar.gz | |
Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'
* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70':
swscale: Add av_cold attributes to init functions missing them
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/time.c')
0 files changed, 0 insertions, 0 deletions