diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-02 22:21:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-02 22:31:20 +0200 |
| commit | deedf3e590027e53cf999b11a25fc9be9615b5f2 (patch) | |
| tree | a08c124244e22d1a0e416fbfcaaaff7e2238f469 /doc/ffplay.texi | |
| parent | e874772f70908ad5b1754c0373a35bec08fad547 (diff) | |
| parent | e2d50fc2f5f3600e13055acf1a10fec35e941f37 (diff) | |
| download | ffmpeg-deedf3e590027e53cf999b11a25fc9be9615b5f2.tar.gz | |
Merge commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37'
* commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37':
avplay: Add support for rotated video
Conflicts:
configure
doc/ffplay.texi
ffplay.c
See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffplay.texi')
| -rw-r--r-- | doc/ffplay.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ffplay.texi b/doc/ffplay.texi index d5397a9ecb..1ee3c30469 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -161,7 +161,7 @@ Force a specific video decoder. Force a specific subtitle decoder. @item -autorotate -Automatically rotate the video according to presentation metadata. Enabled by +Automatically rotate the video according to file metadata. Enabled by default, use @option{-noautorotate} to disable it. @item -framedrop |