virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '4a37d4b3f8137a4c2bbbca043de076af966b9446'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-04-11 23:30:57 +02:00
parent 838d803155 4a37d4b3f8
commit 9f3ae7aafd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/avfilter.c
View File

@@ -867,12 +867,12 @@ fail:
return ret; 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; 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; return pads[pad_idx].type;
} }

6
libavfilter/avfilter.h
View File

@@ -397,7 +397,7 @@ struct AVFilterPad {
* *
* @return name of the pad_idx'th pad in pads * @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. * 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 * @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 * Filter definition. This defines the pads a filter contains, and all the
@@ -507,7 +507,7 @@ typedef struct AVFilter {
struct AVFilterContext { struct AVFilterContext {
const AVClass *av_class; ///< needed for av_log() 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 char *name; ///< name of this filter instance