diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 13:24:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 13:24:30 +0200 |
| commit | a083543da03e9270c1677eca592e96a298cccb1d (patch) | |
| tree | 19db1ed1fb28381ab1ef99285716daa56d7d552e /compat/os2threads.h | |
| parent | ec98f80af47d2f463c5c3c59aa36c5aaf74204c5 (diff) | |
| parent | e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c (diff) | |
| download | ffmpeg-a083543da03e9270c1677eca592e96a298cccb1d.tar.gz | |
Merge commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c'
* commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c':
mov: Export geotag metadata fields
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat/os2threads.h')
0 files changed, 0 insertions, 0 deletions