[FFmpeg-cvslog] Merge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 26 02:21:42 2014 +0200| [50697ac5b2e7151b7e29299a5e36aef17695f9c4] | committer: Michael Niedermayer

Merge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6'

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

Conflicts:
	libavformat/wtvdec.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50697ac5b2e7151b7e29299a5e36aef17695f9c4
---