summaryrefslogtreecommitdiff
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-23 14:43:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-23 14:46:48 +0100
commit3e641b4842b8b5f6592991479d19f1a7ce846308 (patch)
tree25bee33d11ceddf0ee1758dd8cf5763764d5fc80 /Changelog
parent62e10c375968d9cbbe2a0bc321e00eef52d32917 (diff)
parent7671dd7cd7d51bbd637cc46d8f104a141bc355ea (diff)
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea': avconv: add support for VDPAU decoding Conflicts: Changelog Makefile configure ffmpeg.h 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 ae0cb36b06..fef0d14899 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@ version <next>
- setsar/setdar filters now support variables in ratio expressions
- elbg filter
- string validation in ffprobe
+- support for decoding through VDPAU in ffmpeg (the -hwaccel option)
version 2.1: