diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 16:52:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 16:55:08 +0200 |
| commit | 67a6dac7c18caecb418f7590a484dcbfcad869ab (patch) | |
| tree | dfc518e76432ade673085eb8003c25edefb5fc53 /libavformat/ipmovie.c | |
| parent | c5af0680848a62c482c0fd142f8d6646cec46212 (diff) | |
| parent | 7c5012127fb7e18f0616011257bb4248f6a8b608 (diff) | |
| download | ffmpeg-67a6dac7c18caecb418f7590a484dcbfcad869ab.tar.gz | |
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>
Diffstat (limited to 'libavformat/ipmovie.c')
0 files changed, 0 insertions, 0 deletions