Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Aug 2012 15:03:04 +0000 (17:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Aug 2012 15:06:50 +0000 (17:06 +0200)
commitaee51039ee204197fdb4c924f8ee433b803ab1e1
treeb1138f704eec5bf82e6fcc23591c7b245f728ac5
parent67a6dac7c18caecb418f7590a484dcbfcad869ab
parentf8b1e665539010d3ca148f09cb1203c20c1ca174
Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'

* commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174':
  avconv: print info/capabilities options in a separate help group.
  avtools: add -h demuxer/muxer
  cmdutils: extend -h to allow printing codec details.

Conflicts:
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
doc/avtools-common-opts.texi
ffmpeg_filter.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
ffserver.c