Merge commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 13:19:45 +0000 (14:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Feb 2014 13:19:45 +0000 (14:19 +0100)
commitef1aae6ea9aae9a523b6dcd8e670dbca823a88f8
treed4f14fa9d258a013fb8cc1f5f853e45bda9367bd
parent53d11f7b2d380c19ae862331d7283039b49c9f0e
parent1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66
Merge commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66'

* commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66':
  movenc: Add a fallback fragmentation method for plain mp4 as well

Conflicts:
libavformat/movenc.c

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