Changeset 6cfaa51a in ffmpeg

Timestamp:

Jun 12, 2015, 8:38:44 PM (9 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e1ec9c7f

Parents:

449c74f6 (diff), a9b2a511 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/12/15 20:34:53)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/12/15 20:38:44)

Message:

Merge commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6'

• commit 'a9b2a51178ea446909015f061ab5df65e3b66bf6': avconv_opt: Check localtime() return value

Conflicts:

ffmpeg_opt.c

See: 8e91d9652ea5048d9014e7636e12c6ed4732d7b7
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)