[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 10 10:20:11 2013 +0200| [46405813c3c15caf8cee1cf9fa2bbaeead35c7cd] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Simplify setting the fragmentation flag

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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