From: Michael Niedermayer Date: Mon, 5 Aug 2013 07:21:53 +0000 (+0200) Subject: Merge commit '77cc958f60f73963be4281d6e82ef81707e40c26' X-Git-Tag: n2.1~1680 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=46b3dbf9ca1b65d909a27e01c7b6742d41688ce2;hp=46b3dbf9ca1b65d909a27e01c7b6742d41688ce2 Merge commit '77cc958f60f73963be4281d6e82ef81707e40c26' * commit '77cc958f60f73963be4281d6e82ef81707e40c26': lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter() Merged-by: Michael Niedermayer ---