Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Aug 2012 14:52:42 +0000 (16:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Aug 2012 14:55:08 +0000 (16:55 +0200)
commit67a6dac7c18caecb418f7590a484dcbfcad869ab
treedfc518e76432ade673085eb8003c25edefb5fc53
parentc5af0680848a62c482c0fd142f8d6646cec46212
parent7c5012127fb7e18f0616011257bb4248f6a8b608
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@gmx.at>
cmdutils.c
cmdutils.h
doc/ffmpeg.texi
ffmpeg_opt.c
ffplay.c
ffprobe.c
ffserver.c