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)
commit50697ac5b2e7151b7e29299a5e36aef17695f9c4
tree64e49705804313d7b4f99e9f9296de52fc8cedee
parent90bf1e3046000def2142e06c9f084b7542256804
parent851ace79a307bea54b44bd6f7ecd3b7861c28ec6
Merge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6'

* commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6':
  wtv: Avoid needlessly calling gmtime twice with the same argument

Conflicts:
libavformat/wtvdec.c

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