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)
* commit '8e03ca2fff40ce065ea5a516200e777c96cd785e':
  isom: add 'mp1v' fourcc

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

Simple merge