diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-02 22:39:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-02 22:39:00 +0200 |
| commit | f5b26fbc2f564831b337f1de9faaaf6753a03871 (patch) | |
| tree | d6983d185fdc2a2df77795a739493c0569872e2c /doc | |
| parent | deedf3e590027e53cf999b11a25fc9be9615b5f2 (diff) | |
| parent | 16302246b1fcb7ad4e6f7bd31c49956a455336d2 (diff) | |
| download | ffmpeg-f5b26fbc2f564831b337f1de9faaaf6753a03871.tar.gz | |
Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'
* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2':
avconv: Add an option for automatically rotating video according to display matrix
Conflicts:
Changelog
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffmpeg.texi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index c66cb16d64..7cd81b080a 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -462,6 +462,9 @@ Technical note -- attachments are implemented as codec extradata, so this option can actually be used to extract extradata from any stream, not just attachments. +@item -noautorotate +Disable automatically rotating video based on file metadata. + @end table @section Video Options |