summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-19 01:02:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-19 01:02:21 +0200
commit7254afdf1c60f2786ff1f2a89e090f6c016ab85d (patch)
tree7254e50defef2854a5793b5b16c10e56fbf308f6 /doc
parent020c287f5ee51f06fd662f4ab79cb22acc5da204 (diff)
parentb1cc12d0e3aa9f800de1cd6ffa6a2c54e78b4e5d (diff)
Merge remote-tracking branch 'cigaes/master'
* cigaes/master: ffmpeg: make -aspect work with -vcodec copy. lavfi/vf_aspect: improve compatibility of parsing. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg.texi4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index eb981d7f54..94f48fdcf7 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -468,6 +468,10 @@ 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.
+If used together with @option{-vcodec copy}, it will affect the aspect ratio
+stored at container level, but not the aspect ratio stored in encoded
+frames, if it exists.
+
@item -vn (@emph{output})
Disable video recording.