Merge commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a'
authorClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:32:20 +0000 (16:32 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 20 May 2017 14:32:20 +0000 (16:32 +0200)
commit93bf0480c2dba12990f92cdf1927da2ff64db0cd
tree0c20ae06fbf7bf57db253b3dc5f47a9c62bbbfe7
parent068d91885ffdc858796ef73ada2a88b8313d9465
parent1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a
Merge commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a'

* commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a':
  dashenc: fix ISO8601 UTC parsing

Merged-by: Clément Bœsch <u@pkh.me>
libavformat/dashenc.c