Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Jul 2013 08:25:26 +0000 (10:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Jul 2013 08:26:07 +0000 (10:26 +0200)
commit8740762c43dc92cfefa58769bb8cfade82aa695c
tree1550bb212ec5689d8441dc60f3decb0a02e6058d
parent454c89dde3afd8f84d2631dd87da47bf23de3fe3
parentd010e95f86089abe9a3d4d4a66ac8102312d28a4
Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4'

* commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4':
  avserver: Remove unused loadable module support

Conflicts:
configure
ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
ffserver.c