diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:34:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-12 22:38:44 +0200 |
| commit | 6cfaa51acbf7f604ff94a3bc6e564855e7813b3a (patch) | |
| tree | 8411b6265cfa2a786f1e582ba323f60042fbc6cd /common.mak | |
| parent | 449c74f629cb35cfd88b5d2b0d7accf0df225bc0 (diff) | |
| parent | a9b2a51178ea446909015f061ab5df65e3b66bf6 (diff) | |
Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'
* commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6':
avconv_opt: Check localtime() return value
Conflicts:
ffmpeg_opt.c
See: 8e91d9652ea5048d9014e7636e12c6ed4732d7b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions