[FFmpeg-cvslog] Merge commit 'bc1a985ba030e9861d24965d42792850b43a43ea'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 23:56:39 2013 +0200| [86070b8e5a0e0ba087a9ce2a050c00094e29f35b] | committer: Michael Niedermayer

Merge commit 'bc1a985ba030e9861d24965d42792850b43a43ea'

* commit 'bc1a985ba030e9861d24965d42792850b43a43ea':
  lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().

Conflicts:
	libavfilter/avfiltergraph.c
	libavfilter/internal.h
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=86070b8e5a0e0ba087a9ce2a050c00094e29f35b
---