[FFmpeg-cvslog] Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

Michael Niedermayer git at videolan.org
Fri Nov 16 13:16:24 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 16 13:07:10 2012 +0100| [3db32ec119e5a7811e7ee1d41e3becc261fbb296] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3db32ec119e5a7811e7ee1d41e3becc261fbb296
---





More information about the ffmpeg-cvslog mailing list