aboutsummaryrefslogtreecommitdiffstats
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-27 21:26:51 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-10-27 21:26:51 +0100
commita38a1d516fe68542523c772af27e41f28ae9852c (patch)
tree64cf1ee6d3cec0693a3f837c0d1bfde574f30346 /Changelog
parenta050cf0c451bdf1c1bd512c4fce6b6f8a5e85102 (diff)
parenta6674d2e7771dbf7a4a5556f5e126be83cadac96 (diff)
downloadffmpeg-a38a1d516fe68542523c772af27e41f28ae9852c.tar.gz
Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'
* commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96': xcbgrab: XCB-based screen capture Conflicts: Changelog configure libavdevice/Makefile libavdevice/alldevices.c libavdevice/version.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 a24fe8a748..ec6abba1e1 100644
--- a/Changelog
+++ b/Changelog
@@ -8,6 +8,7 @@ version <next>:
- CAST128 symmetric block cipher, ECB mode
- STL subtitle demuxer and decoder
- libutvideo YUV 4:2:2 10bit support
+- XCB-based screen-grabber
version 2.4:
- Icecast protocol