-
Michael Niedermayer authored
* commit 'd010e95f': avserver: Remove unused loadable module support Conflicts: configure ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
8740762c
* commit 'd010e95f': avserver: Remove unused loadable module support Conflicts: configure ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>