Merge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 00:21:42 +0000 (02:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Oct 2014 00:21:42 +0000 (02:21 +0200)
* commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6':
  wtv: Avoid needlessly calling gmtime twice with the same argument

Conflicts:
libavformat/wtvdec.c

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

No differences found