Changeset 4360c6f in ffmpeg

Timestamp:

Oct 26, 2014, 2:12:37 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

abaa41b6

Parents:

4a39d4c6 (diff), 6b9b42cc (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.

Message:

Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'

• commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6': drawtext: Remove the ifdef for localtime_r

Conflicts:

libavfilter/vf_drawtext.c

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

(No files)