Michael Niedermayer aee51039ee 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>

2012-08-20 17:06:50 +02:00

2.0 KiB

Raw Blame History

View Raw