Merge commit '174c5fde90060faab67796a5eaef742630f1db6e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 21:13:23 +0000 (22:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 21:14:29 +0000 (22:14 +0100)
commit420aebf0c585e54468e631460065448c9bb6ccb5
treeada0de425aaca19aaa6e356fd2dc7ae020289916
parent82f0f0482ed67f32414df7791e26cc473cdcb3bb
parent174c5fde90060faab67796a5eaef742630f1db6e
Merge commit '174c5fde90060faab67796a5eaef742630f1db6e'

* commit '174c5fde90060faab67796a5eaef742630f1db6e':
  mov: parse @PRM and @PRQ metadata tags

Conflicts:
libavformat/mov.c

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