[FFmpeg-cvslog] Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 20 17:03:04 2012 +0200| [aee51039ee204197fdb4c924f8ee433b803ab1e1] | committer: Michael Niedermayer

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 at gmx.at>

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