Merge commit '69583bd3b1eba471366141c945030c163e073e02'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Dec 2012 12:05:37 +0000 (13:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Dec 2012 12:05:37 +0000 (13:05 +0100)
commit2a9443a110e1865523fee32404890097fb6d1d93
tree1efe4011946d8d0dde56c2394188e85751f2c05c
parentba34e56c0d39e0aa4c93241623b63db81dfef79b
parent69583bd3b1eba471366141c945030c163e073e02
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@gmx.at>
configure
libavfilter/allfilters.c
libavformat/Makefile