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)
* commit '3c01039e0bc7d269900e15551f8171c4328a0223':
  mov: further expand the list of parsed metadata tags

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

Simple merge