Merge commit '77cc958f60f73963be4281d6e82ef81707e40c26'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Aug 2013 07:21:53 +0000 (09:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Aug 2013 07:22:18 +0000 (09:22 +0200)
* commit '77cc958f60f73963be4281d6e82ef81707e40c26':
  lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/avfilter.h
libavfilter/avfiltergraph.c

Simple merge
Simple merge