Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'

* commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da':
  lavfi: change the filter registering system to match the other libraries

Conflicts:
	cmdutils.c
	ffplay.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h

This removes the ability to put AVFilters in read only memory and having
them shareable.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-04-12 15:01:41 +02:00
7 changed files with 52 additions and 34 deletions

View File

@@ -499,7 +499,6 @@ static void exit_program(void)
uninit_opts();
avfilter_uninit();
avformat_network_deinit();
if (received_sigterm) {