[FFmpeg-cvslog] Merge commit 'fa2a34cd40d124161c748bb0f430dc63c94dd0da'
Michael Niedermayer
git at videolan.org
Fri Apr 12 15:14:14 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 15:01:41 2013 +0200| [835cc0f2e7098fbb548d7622110c4fdc0831809d] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=835cc0f2e7098fbb548d7622110c4fdc0831809d
---
More information about the ffmpeg-cvslog
mailing list