Merge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:29:42 +0000 (00:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:31:05 +0000 (00:31 +0100)
commit4009ee3eccac686ee2f01837cc8877012c47314c
tree15a77fa4b0384ff8e7b05fb1e14d5dbfcc9a927d
parent89388cf60bd5baa5991ee215a23d44f6d6b0c385
parent8e03ca2fff40ce065ea5a516200e777c96cd785e
Merge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e'

* commit '8e03ca2fff40ce065ea5a516200e777c96cd785e':
  isom: add 'mp1v' fourcc

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