[FFmpeg-cvslog] Merge commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  8 10:57:10 2014 +0100| [0bdc5db520ba9126776dd12b6734150ebcc7c559] | committer: Michael Niedermayer

Merge commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb'

* commit '95a449d3ce8e15522df47a80a8a4593ea5c2b1bb':
  movenc: Remove an outdated comment

Conflicts:
	libavformat/movenc.c

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

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