summaryrefslogtreecommitdiff
path: root/Changelog
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-16 13:07:10 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-16 13:07:10 +0100
commit3db32ec119e5a7811e7ee1d41e3becc261fbb296 (patch)
treec7a17b1094082626e7c85bfb8752e385bc8973c5 /Changelog
parent926481078b4f930ac9bb9ca2b4ab660cc9190935 (diff)
parentbf5f46b4cc47b7a4568119f224057d4ff91b6cdd (diff)
Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'
* commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd': APIChanges: add entry for av_read_packet deprecation mxfdec: fix typo in mxf_read_seek() avserver: use freopen to redirect stdin/out/err to /dev/null avserver: remove daemon mode configure: Check for -Werror parameters on clang doxygen: remove obsolete options from Doxyfile configure: Add option to disable all command line programs Conflicts: Changelog configure doc/APIchanges doc/ffserver.conf doc/ffserver.texi ffserver.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 9ef12b831d..d084762cea 100644
--- a/Changelog
+++ b/Changelog
@@ -23,6 +23,7 @@ version <next>:
- field filter ported from libmpcodecs
- AVR demuxer
- geq filter ported from libmpcodecs
+- remove ffserver daemon mode
version 1.0: