diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-08 22:12:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-08 22:14:32 +0200 |
| commit | 6daff3bd8f30881d489aefebeca13f87f5290337 (patch) | |
| tree | 89edc31291144d7f594524ab840ec3cf55295357 /libavdevice/file_open.c | |
| parent | 1360db7e888e7d3c045e39a5645af0a29bc28c80 (diff) | |
| parent | 1ec335513f95bf2441f81d761ea127325ecd81a0 (diff) | |
| download | ffmpeg-6daff3bd8f30881d489aefebeca13f87f5290337.tar.gz | |
Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'
* commit '1ec335513f95bf2441f81d761ea127325ecd81a0':
time: Add missing zero
Conflicts:
libavutil/time.c
See: ebef9f5a56d7df91e010a177a80cfc8dbe394305
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/file_open.c')
0 files changed, 0 insertions, 0 deletions