diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-05 09:21:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-05 09:22:18 +0200 |
| commit | 46b3dbf9ca1b65d909a27e01c7b6742d41688ce2 (patch) | |
| tree | ff1d488dbed02d8cfa72606821a3cfa3374f3926 | |
| parent | c4f9a4cd2f6ba5447b2f9bcf734c394b1dbe6f9d (diff) | |
| parent | 77cc958f60f73963be4281d6e82ef81707e40c26 (diff) | |
| download | ffmpeg-streaming-46b3dbf9ca1b65d909a27e01c7b6742d41688ce2.zip ffmpeg-streaming-46b3dbf9ca1b65d909a27e01c7b6742d41688ce2.tar.gz | |
Merge commit '77cc958f60f73963be4281d6e82ef81707e40c26'
* commit '77cc958f60f73963be4281d6e82ef81707e40c26':
lavfi: add const to the AVFilter parameter of avfilter_graph_create_filter()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/avfilter.h | 2 | ||||
| -rw-r--r-- | libavfilter/avfiltergraph.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 6de0f66..b8d7cc3 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -1242,7 +1242,7 @@ int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter); * @return a negative AVERROR error code in case of failure, a non * negative value otherwise */ -int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt, +int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *filt, const char *name, const char *args, void *opaque, AVFilterGraph *graph_ctx); diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 52edb6b..fb78a87 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -148,7 +148,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } #endif -int avfilter_graph_create_filter(AVFilterContext **filt_ctx, AVFilter *filt, +int avfilter_graph_create_filter(AVFilterContext **filt_ctx, const AVFilter *filt, const char *name, const char *args, void *opaque, AVFilterGraph *graph_ctx) { |
