[FFmpeg-cvslog] Merge commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  8 11:41:29 2014 +0100| [9ebfe38f3873eafacff9b0933cbf9b97198ec020] | committer: Michael Niedermayer

Merge commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc'

* commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc':
  movenc: Require samples before trying to write edts

Conflicts:
	libavformat/movenc.c

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

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