[FFmpeg-cvslog] Merge commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  6 13:24:30 2014 +0200| [a083543da03e9270c1677eca592e96a298cccb1d] | committer: Michael Niedermayer

Merge commit 'e7d6d0bf3c5cc1bc048b0ddbc169a91862568e0c'

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

Conflicts:
	libavformat/mov.c

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

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