Merge commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 22:01:42 +0000 (23:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 22:16:43 +0000 (23:16 +0100)
commit885e74622e3f3be31aebee35540339c7652e723f
treeee720d71fa45f1e4db91c94a08644611f4550595
parent4acc717a05f27752a728c231f9df9dcd042c92d3
parente2e07dbaab1f17e995842b7eacec4665d44c3d14
Merge commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14'

* commit 'e2e07dbaab1f17e995842b7eacec4665d44c3d14':
  mov: expand the list of parsed metadata tags

Conflicts:
libavformat/mov.c

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