diff options
| author | Michael Niedermayer <[email protected]> | 2014-10-26 02:21:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-10-26 02:21:42 +0200 |
| commit | 50697ac5b2e7151b7e29299a5e36aef17695f9c4 (patch) | |
| tree | 64e49705804313d7b4f99e9f9296de52fc8cedee /libavcodec/dpx_parser.c | |
| parent | 90bf1e3046000def2142e06c9f084b7542256804 (diff) | |
| parent | 851ace79a307bea54b44bd6f7ecd3b7861c28ec6 (diff) | |
Merge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6'
* commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6':
wtv: Avoid needlessly calling gmtime twice with the same argument
Conflicts:
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/dpx_parser.c')
0 files changed, 0 insertions, 0 deletions