[FFmpeg-cvslog] Merge commit '1e142d5b4842dcb39fcb0e92e4aacbc9977bfa66'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 19 14:19:45 2014 +0100| [ef1aae6ea9aae9a523b6dcd8e670dbca823a88f8] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef1aae6ea9aae9a523b6dcd8e670dbca823a88f8
---