[FFmpeg-cvslog] Merge commit '69583bd3b1eba471366141c945030c163e073e02'

Michael Niedermayer git at videolan.org
Sat Dec 29 13:24:26 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 29 13:05:37 2012 +0100| [2a9443a110e1865523fee32404890097fb6d1d93] | committer: Michael Niedermayer

Merge commit '69583bd3b1eba471366141c945030c163e073e02'

* commit '69583bd3b1eba471366141c945030c163e073e02':
  avfilter: Refactor unconditional filter registration
  build: Add rtpenc_chain extra config option
  configure: Add --disable-all command line option

Conflicts:
	libavfilter/allfilters.c
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list