Merge commit '3c01039e0bc7d269900e15551f8171c4328a0223'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 10:48:27 +0000 (11:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 10:50:48 +0000 (11:50 +0100)
commit99bf26fc6b17c05e9e1ec598a714c5efe1b978f6
treeeda127a572b593326ca1b1f94117e0db72e7f7ea
parenta5e5959d52860678d028df07ad1351a11aaf47f7
parent3c01039e0bc7d269900e15551f8171c4328a0223
Merge commit '3c01039e0bc7d269900e15551f8171c4328a0223'

* commit '3c01039e0bc7d269900e15551f8171c4328a0223':
  mov: further expand the list of parsed metadata tags

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