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)
* commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a':
  dashenc: fix ISO8601 UTC parsing

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

Simple merge