Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Nov 2012 12:07:10 +0000 (13:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Nov 2012 12:07:10 +0000 (13:07 +0100)
commit3db32ec119e5a7811e7ee1d41e3becc261fbb296
treec7a17b1094082626e7c85bfb8752e385bc8973c5
parent926481078b4f930ac9bb9ca2b4ab660cc9190935
parentbf5f46b4cc47b7a4568119f224057d4ff91b6cdd
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>
Changelog
configure
doc/APIchanges
doc/Doxyfile
doc/ffserver.conf
doc/ffserver.texi
ffserver.c