[FFmpeg-cvslog] Merge commit '8b524ab0c43c1767919530abb79d3656113cdc47'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 10 10:08:38 2013 +0200| [ada9b17e7a3d63b5c58d493006d7b17aa2617813] | committer: Michael Niedermayer

Merge commit '8b524ab0c43c1767919530abb79d3656113cdc47'

* commit '8b524ab0c43c1767919530abb79d3656113cdc47':
  movenc: Add a warning message if conflicting options have been specified

Conflicts:
	libavformat/movenc.c

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

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