summaryrefslogtreecommitdiff
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-22 23:54:11 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-22 23:54:34 +0100
commitdb4a2976f6afb6ac16bdd455695dcc277a03416d (patch)
tree4beb864664ddb62d9a6b56dbb6ea9609f2772222 /Changelog
parent0a32a1b4bbcdffe5c6a61a9e8ea64a17bf31f172 (diff)
parentc99915f7c74ce1249d8633cb6fd09035b8d84db7 (diff)
Merge commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7'
* commit 'c99915f7c74ce1249d8633cb6fd09035b8d84db7': rtpdec: DV depacketizer (RFC 6469) Conflicts: Changelog libavformat/Makefile libavformat/rtpdec_dv.c libavformat/version.h See: cbe508553ad17b277d4cb6f12f61aac4f52908b8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
-rw-r--r--Changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index 530e56bd04..02f899dc3b 100644
--- a/Changelog
+++ b/Changelog
@@ -27,7 +27,7 @@ version <next>:
- RTP depacketizer for AC3 payload format (RFC 4184)
- palettegen and paletteuse filters
- VP9 RTP payload format (draft 0) experimental depacketizer
-- DV RTP payload format (RFC 6469) depacketizer
+- RTP depacketizer for DV (RFC 6469)
- DXVA2-accelerated HEVC decoding
- AAC ELD 480 decoding
- Intel QSV-accelerated H.264 decoding