aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2013-01-07 09:44:48 +0000
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-01-08 23:26:19 +0100
commit9202824e1bf9e3c1e2a98806e3ef0b20f8d1e5c0 (patch)
tree30448fb6a1816175f5f45cb9e353fc87a6f9a71e
parent79013a59c0605472fe941ca9ff01324c1320f874 (diff)
downloadffmpeg-9202824e1bf9e3c1e2a98806e3ef0b20f8d1e5c0.tar.gz
Changelog: move Megalux where it belongs
Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit e13c5abbd70440a02e00d7392738a36356481a78)
-rw-r--r--Changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index 5d59a9738d..1a2e96a4cc 100644
--- a/Changelog
+++ b/Changelog
@@ -60,6 +60,7 @@ version 1.1:
- support building on the Plan 9 operating system
- kerndeint filter ported from MPlayer
- histeq filter ported from VirtualDub
+- Megalux Frame demuxer
- 012v decoder
@@ -349,7 +350,6 @@ easier to use. The changes are:
- Simple segmenting muxer
- Indeo 4 decoder
- SMJPEG demuxer
-- Megalux Frame demuxer
version 0.8: