Merge commit '31e558fbcfec8fa9fddf564ab8360384706e41c0'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:15:32 +0000 (22:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:15:32 +0000 (22:15 +0100)
commitd32245e5b12cd3c8aa8740585db950bfa628e69d
treecabb58f365838f07074aa48a8290b706232aacc1
parent2030b3a4abd8092d746853fdf021c179c0e01021
parent31e558fbcfec8fa9fddf564ab8360384706e41c0
Merge commit '31e558fbcfec8fa9fddf564ab8360384706e41c0'

* commit '31e558fbcfec8fa9fddf564ab8360384706e41c0':
  isom: add "NO16" FourCC

Conflicts:
libavformat/isom.c

See: 96e25073637f1fdc4818e193e74c38570c390d70
Merged-by: Michael Niedermayer <michaelni@gmx.at>