diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-26 02:06:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-26 02:06:40 +0100 |
| commit | 3b709fd912749d7731fa954cfb3aedd18d8a666a (patch) | |
| tree | a03db8b7a73f30593cae44159cf17042aaf9ce15 /libavutil | |
| parent | 50697ac5b2e7151b7e29299a5e36aef17695f9c4 (diff) | |
| parent | 9dcf2397219ca796f0fafce2a703770d6fd09920 (diff) | |
| download | ffmpeg-3b709fd912749d7731fa954cfb3aedd18d8a666a.tar.gz | |
Merge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'
* commit '9dcf2397219ca796f0fafce2a703770d6fd09920':
lavf: Check the return value of strftime
Conflicts:
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions