diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-29 22:24:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-29 22:24:01 +0200 |
| commit | db5effe1a4209e8ace97857e5de0d66a73fe7477 (patch) | |
| tree | 344974a46b06148b175dfcb8d7e4c4a5ecf00646 /doc/avconv.texi | |
| parent | ea36c44e84496a35562dab6cb03d2ca9a938224f (diff) | |
| parent | 22141917a987e22685ee20440148e25724451f50 (diff) | |
| download | ffmpeg-db5effe1a4209e8ace97857e5de0d66a73fe7477.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Revert "h264: Properly set coded_{width, height} when parsing H.264."
isom: add missing AVC-Intra tags, rearrange list and update comments
avconv: remove stubs of crop* and pad* options
avconv: re-add nb_streams to InputFile.
Conflicts:
avconv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/avconv.texi')
| -rw-r--r-- | doc/avconv.texi | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi index 3be40b7069..d25e61d640 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -274,20 +274,6 @@ form @var{num}:@var{den}, where @var{num} and @var{den} are the numerator and denominator of the aspect ratio. For example "4:3", "16:9", "1.3333", and "1.7777" are valid argument values. -@item -croptop @var{size} -@item -cropbottom @var{size} -@item -cropleft @var{size} -@item -cropright @var{size} -All the crop options have been removed. Use -vf -crop=width:height:x:y instead. - -@item -padtop @var{size} -@item -padbottom @var{size} -@item -padleft @var{size} -@item -padright @var{size} -@item -padcolor @var{hex_color} -All the pad options have been removed. Use -vf -pad=width:height:x:y:color instead. @item -vn Disable video recording. @item -bt @var{tolerance} |