Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 13:01:41 +0000 (15:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Apr 2013 13:08:40 +0000 (15:08 +0200)
commit835cc0f2e7098fbb548d7622110c4fdc0831809d
tree22408566623b068dd3eb0ab2a49751fb1ecde67d
parentf4db6bfeb86feda2aeb98072e55b55de85ba0962
parentfa2a34cd40d124161c748bb0f430dc63c94dd0da
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>
cmdutils.c
doc/APIchanges
ffmpeg.c
ffplay.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/version.h