diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:03:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:06:50 +0200 |
| commit | aee51039ee204197fdb4c924f8ee433b803ab1e1 (patch) | |
| tree | b1138f704eec5bf82e6fcc23591c7b245f728ac5 /doc/muxers.texi | |
| parent | 67a6dac7c18caecb418f7590a484dcbfcad869ab (diff) | |
| parent | f8b1e665539010d3ca148f09cb1203c20c1ca174 (diff) | |
| download | ffmpeg-aee51039ee204197fdb4c924f8ee433b803ab1e1.tar.gz | |
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>
Diffstat (limited to 'doc/muxers.texi')
0 files changed, 0 insertions, 0 deletions