summaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-02 22:39:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-02 22:39:00 +0200
commitf5b26fbc2f564831b337f1de9faaaf6753a03871 (patch)
treed6983d185fdc2a2df77795a739493c0569872e2c /Changelog
parentdeedf3e590027e53cf999b11a25fc9be9615b5f2 (diff)
parent16302246b1fcb7ad4e6f7bd31c49956a455336d2 (diff)
downloadffmpeg-streaming-f5b26fbc2f564831b337f1de9faaaf6753a03871.zip
ffmpeg-streaming-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 'Changelog')
-rw-r--r--Changelog1
1 files changed, 1 insertions, 0 deletions
diff --git a/Changelog b/Changelog
index 02dd77b..623d10a 100644
--- a/Changelog
+++ b/Changelog
@@ -18,6 +18,7 @@ version <next>:
- nvenc level and tier options
- chorus filter
- Canopus HQ/HQA decoder
+- Automatically rotate videos based on metadata in ffmpeg
version 2.6:
OpenPOWER on IntegriCloud