diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 23:30:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 23:31:01 +0200 |
| commit | 9f3ae7aafd5ff3eadc9ab0be6a155de5493205ab (patch) | |
| tree | 8ada4d5bf70a727e22ef5bc68591cbadb561fee7 | |
| parent | 838d803155dd7bcdf87db409af9e151aca3329ae (diff) | |
| parent | 4a37d4b3f8137a4c2bbbca043de076af966b9446 (diff) | |
| download | ffmpeg-9f3ae7aafd5ff3eadc9ab0be6a155de5493205ab.tar.gz | |
Merge commit '4a37d4b3f8137a4c2bbbca043de076af966b9446'
* commit '4a37d4b3f8137a4c2bbbca043de076af966b9446':
lavfi: add const to the pads parameter of avfilter_pad_get_name/type
lavfi: add const to AVFilterContext.filter.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/avfilter.c | 4 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 9cdf12d2d1..5a99fdddd5 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -867,12 +867,12 @@ fail: return ret; } -const char *avfilter_pad_get_name(AVFilterPad *pads, int pad_idx) +const char *avfilter_pad_get_name(const AVFilterPad *pads, int pad_idx) { return pads[pad_idx].name; } -enum AVMediaType avfilter_pad_get_type(AVFilterPad *pads, int pad_idx) +enum AVMediaType avfilter_pad_get_type(const AVFilterPad *pads, int pad_idx) { return pads[pad_idx].type; } diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index effa4070bb..40be955e0a 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -397,7 +397,7 @@ struct AVFilterPad { * * @return name of the pad_idx'th pad in pads */ -const char *avfilter_pad_get_name(AVFilterPad *pads, int pad_idx); +const char *avfilter_pad_get_name(const AVFilterPad *pads, int pad_idx); /** * Get the type of an AVFilterPad. @@ -408,7 +408,7 @@ const char *avfilter_pad_get_name(AVFilterPad *pads, int pad_idx); * * @return type of the pad_idx'th pad in pads */ -enum AVMediaType avfilter_pad_get_type(AVFilterPad *pads, int pad_idx); +enum AVMediaType avfilter_pad_get_type(const AVFilterPad *pads, int pad_idx); /** * Filter definition. This defines the pads a filter contains, and all the @@ -507,7 +507,7 @@ typedef struct AVFilter { struct AVFilterContext { const AVClass *av_class; ///< needed for av_log() - AVFilter *filter; ///< the AVFilter of which this is an instance + const AVFilter *filter; ///< the AVFilter of which this is an instance char *name; ///< name of this filter instance |