[FFmpeg-cvslog] Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 20 16:52:42 2012 +0200| [67a6dac7c18caecb418f7590a484dcbfcad869ab] | committer: Michael Niedermayer

Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'

* commit '7c5012127fb7e18f0616011257bb4248f6a8b608':
  cmdutils: change semantics of show_help_options() and document it.
  avtools: move some newlines to show_help_options().
  avconv: deprecate -isync.

Conflicts:
	ffmpeg_opt.c
	ffserver.c

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

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