Merge commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 11:24:30 +0000 (13:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Jun 2014 11:24:30 +0000 (13:24 +0200)
commita083543da03e9270c1677eca592e96a298cccb1d
tree19db1ed1fb28381ab1ef99285716daa56d7d552e
parentec98f80af47d2f463c5c3c59aa36c5aaf74204c5
parente7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c
Merge commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c'

* commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c':
  mov: Export geotag metadata fields

Conflicts:
libavformat/mov.c

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