Merge commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 21:00:01 +0000 (23:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 21:00:08 +0000 (23:00 +0200)
commit5380c9afb9a2be04564aeef2c3ecf080a8cdf24a
tree6feac92dad809bc8ea0a4249952b9a07bf5de5f3
parent037c9c25e6213852e33de5b6e00bbf9d26195938
parent98cab39798612dcaea4f9b6d1e7974bc60d84e13
Merge commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13'

* commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13':
  lavf: Fix variables constness in ff_iso8601_to_unix_time()

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