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)
* commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66':
  movenc: Add a fallback fragmentation method for plain mp4 as well

Conflicts:
libavformat/movenc.c

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

Simple merge