Merge commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 02:22:28 +0000 (03:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 02:22:52 +0000 (03:22 +0100)
commitabaa41b6426c862232977527e783a571fb62645e
treea1ffdd3739622ed3e117d2bcbc0f47e6747eb953
parent4360c6ff610cce5ef0fc844c1e0616aea0204f7e
parented6dad3737bf7bb2d5e9fa9511dfdb44806010e8
Merge commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8'

* commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8':
  lavf: Implement ff_brktimegm using gmtime_r

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/cutils.c