[FFmpeg-cvslog] Merge commit '187023f6b2b43966acb2449a379b4ededdc4b22e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 23 12:17:10 2013 +0200| [b189c699b98cc2c563e6e9778013d3753476ed1e] | committer: Michael Niedermayer

Merge commit '187023f6b2b43966acb2449a379b4ededdc4b22e'

* commit '187023f6b2b43966acb2449a379b4ededdc4b22e':
  movenc: Set mov->mode earlier in mov_write_header

Conflicts:
	libavformat/movenc.c

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

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