Define AVMediaType enum, and use it instead of enum CodecType, which is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk

Stefano Sabatini committed 16 years ago

Commit 72415b21 parent ca6e770383 files · +1041 −1029Browse files

Showing the changes to libavfilter (10 of 383 files). Show all

Unified · Split

10 files

libavfilter/avfilter.h +1 −1
libavfilter/vf_aspect.c +4 −4
libavfilter/vf_crop.c +2 −2
libavfilter/vf_format.c +4 −4
libavfilter/vf_null.c +2 −2
libavfilter/vf_scale.c +2 −2
libavfilter/vf_slicify.c +2 −2
libavfilter/vf_vflip.c +2 −2
libavfilter/vsink_nullsink.c +1 −1
libavfilter/vsrc_nullsrc.c +1 −1

@@ -280,7 +280,7 @@ struct AVFilterPad · 279 unmodified lines
280	* AVFilterPad type. Only video supported now, hopefully someone will	280	* AVFilterPad type. Only video supported now, hopefully someone will
281	* add audio in the future.	281	* add audio in the future.
282	*/	282	*/
283	enum CodecType type;	283	enum AVMediaType type;
284		284
285	/**	285	/**
286	* Minimum required permissions on incoming buffers. Any buffer with	286	* Minimum required permissions on incoming buffers. Any buffer with

libavfilter/vf_aspect.c+4−4

@@ -86,7 +86,7 @@ AVFilter avfilter_vf_aspect = { · 85 unmodified lines
86	.priv_size = sizeof(AspectContext),	86	.priv_size = sizeof(AspectContext),
87		87
88	.inputs = (AVFilterPad[]) {{ .name = "default",	88	.inputs = (AVFilterPad[]) {{ .name = "default",
89	.type = CODEC_TYPE_VIDEO,	89	.type = AVMEDIA_TYPE_VIDEO,
90	.config_props = frameaspect_config_props,	90	.config_props = frameaspect_config_props,
91	.get_video_buffer = avfilter_null_get_video_buffer,	91	.get_video_buffer = avfilter_null_get_video_buffer,
92	.start_frame = start_frame,	92	.start_frame = start_frame,
@@ -94,7 +94,7 @@ AVFilter avfilter_vf_aspect = { · 1 unmodified line
94	{ .name = NULL}},	94	{ .name = NULL}},
95		95
96	.outputs = (AVFilterPad[]) {{ .name = "default",	96	.outputs = (AVFilterPad[]) {{ .name = "default",
97	.type = CODEC_TYPE_VIDEO, },	97	.type = AVMEDIA_TYPE_VIDEO, },
98	{ .name = NULL}},	98	{ .name = NULL}},
99	};	99	};
100	#endif /* CONFIG_ASPECT_FILTER */	100	#endif /* CONFIG_ASPECT_FILTER */
@@ -109,14 +109,14 @@ AVFilter avfilter_vf_pixelaspect = { · 8 unmodified lines
109	.priv_size = sizeof(AspectContext),	109	.priv_size = sizeof(AspectContext),
110		110
111	.inputs = (AVFilterPad[]) {{ .name = "default",	111	.inputs = (AVFilterPad[]) {{ .name = "default",
112	.type = CODEC_TYPE_VIDEO,	112	.type = AVMEDIA_TYPE_VIDEO,
113	.get_video_buffer = avfilter_null_get_video_buffer,	113	.get_video_buffer = avfilter_null_get_video_buffer,
114	.start_frame = start_frame,	114	.start_frame = start_frame,
115	.end_frame = avfilter_null_end_frame },	115	.end_frame = avfilter_null_end_frame },
116	{ .name = NULL}},	116	{ .name = NULL}},
117		117
118	.outputs = (AVFilterPad[]) {{ .name = "default",	118	.outputs = (AVFilterPad[]) {{ .name = "default",
119	.type = CODEC_TYPE_VIDEO, },	119	.type = AVMEDIA_TYPE_VIDEO, },
120	{ .name = NULL}},	120	{ .name = NULL}},
121	};	121	};
122	#endif /* CONFIG_PIXELASPECT_FILTER */	122	#endif /* CONFIG_PIXELASPECT_FILTER */

libavfilter/vf_crop.c+2−2

@@ -214,14 +214,14 @@ AVFilter avfilter_vf_crop = { · 213 unmodified lines
214	.init = init,	214	.init = init,
215		215
216	.inputs = (AVFilterPad[]) {{ .name = "default",	216	.inputs = (AVFilterPad[]) {{ .name = "default",
217	.type = CODEC_TYPE_VIDEO,	217	.type = AVMEDIA_TYPE_VIDEO,
218	.start_frame = start_frame,	218	.start_frame = start_frame,
219	.draw_slice = draw_slice,	219	.draw_slice = draw_slice,
220	.get_video_buffer = avfilter_null_get_video_buffer,	220	.get_video_buffer = avfilter_null_get_video_buffer,
221	.config_props = config_input, },	221	.config_props = config_input, },
222	{ .name = NULL}},	222	{ .name = NULL}},
223	.outputs = (AVFilterPad[]) {{ .name = "default",	223	.outputs = (AVFilterPad[]) {{ .name = "default",
224	.type = CODEC_TYPE_VIDEO,	224	.type = AVMEDIA_TYPE_VIDEO,
225	.config_props = config_output, },	225	.config_props = config_output, },
226	{ .name = NULL}},	226	{ .name = NULL}},
227	};	227	};

libavfilter/vf_format.c+4−4

libavfilter/vf_null.c+2−2

@@ -30,13 +30,13 @@ AVFilter avfilter_vf_null = { · 29 unmodified lines
30	.priv_size = 0,	30	.priv_size = 0,
31		31
32	.inputs = (AVFilterPad[]) {{ .name = "default",	32	.inputs = (AVFilterPad[]) {{ .name = "default",
33	.type = CODEC_TYPE_VIDEO,	33	.type = AVMEDIA_TYPE_VIDEO,
34	.get_video_buffer = avfilter_null_get_video_buffer,	34	.get_video_buffer = avfilter_null_get_video_buffer,
35	.start_frame = avfilter_null_start_frame,	35	.start_frame = avfilter_null_start_frame,
36	.end_frame = avfilter_null_end_frame },	36	.end_frame = avfilter_null_end_frame },
37	{ .name = NULL}},	37	{ .name = NULL}},
38		38
39	.outputs = (AVFilterPad[]) {{ .name = "default",	39	.outputs = (AVFilterPad[]) {{ .name = "default",
40	.type = CODEC_TYPE_VIDEO, },	40	.type = AVMEDIA_TYPE_VIDEO, },
41	{ .name = NULL}},	41	{ .name = NULL}},
42	};	42	};

libavfilter/vf_scale.c+2−2

@@ -197,13 +197,13 @@ AVFilter avfilter_vf_scale = { · 196 unmodified lines
197	.priv_size = sizeof(ScaleContext),	197	.priv_size = sizeof(ScaleContext),
198		198
199	.inputs = (AVFilterPad[]) {{ .name = "default",	199	.inputs = (AVFilterPad[]) {{ .name = "default",
200	.type = CODEC_TYPE_VIDEO,	200	.type = AVMEDIA_TYPE_VIDEO,
201	.start_frame = start_frame,	201	.start_frame = start_frame,
202	.draw_slice = draw_slice,	202	.draw_slice = draw_slice,
203	.min_perms = AV_PERM_READ, },	203	.min_perms = AV_PERM_READ, },
204	{ .name = NULL}},	204	{ .name = NULL}},
205	.outputs = (AVFilterPad[]) {{ .name = "default",	205	.outputs = (AVFilterPad[]) {{ .name = "default",
206	.type = CODEC_TYPE_VIDEO,	206	.type = AVMEDIA_TYPE_VIDEO,
207	.config_props = config_props, },	207	.config_props = config_props, },
208	{ .name = NULL}},	208	{ .name = NULL}},
209	};	209	};

libavfilter/vf_slicify.c+2−2

@@ -104,7 +104,7 @@ AVFilter avfilter_vf_slicify = { · 103 unmodified lines
104	.priv_size = sizeof(SliceContext),	104	.priv_size = sizeof(SliceContext),
105		105
106	.inputs = (AVFilterPad[]) {{ .name = "default",	106	.inputs = (AVFilterPad[]) {{ .name = "default",
107	.type = CODEC_TYPE_VIDEO,	107	.type = AVMEDIA_TYPE_VIDEO,
108	.get_video_buffer = avfilter_null_get_video_buffer,	108	.get_video_buffer = avfilter_null_get_video_buffer,
109	.start_frame = start_frame,	109	.start_frame = start_frame,
110	.draw_slice = draw_slice,	110	.draw_slice = draw_slice,
@@ -112,6 +112,6 @@ AVFilter avfilter_vf_slicify = { · 1 unmodified line
112	.end_frame = avfilter_null_end_frame, },	112	.end_frame = avfilter_null_end_frame, },
113	{ .name = NULL}},	113	{ .name = NULL}},
114	.outputs = (AVFilterPad[]) {{ .name = "default",	114	.outputs = (AVFilterPad[]) {{ .name = "default",
115	.type = CODEC_TYPE_VIDEO, },	115	.type = AVMEDIA_TYPE_VIDEO, },
116	{ .name = NULL}},	116	{ .name = NULL}},
117	};	117	};

libavfilter/vf_vflip.c+2−2

@@ -91,7 +91,7 @@ AVFilter avfilter_vf_vflip = { · 90 unmodified lines
91	.priv_size = sizeof(FlipContext),	91	.priv_size = sizeof(FlipContext),
92		92
93	.inputs = (AVFilterPad[]) {{ .name = "default",	93	.inputs = (AVFilterPad[]) {{ .name = "default",
94	.type = CODEC_TYPE_VIDEO,	94	.type = AVMEDIA_TYPE_VIDEO,
95	.get_video_buffer = get_video_buffer,	95	.get_video_buffer = get_video_buffer,
96	.start_frame = start_frame,	96	.start_frame = start_frame,
97	.draw_slice = draw_slice,	97	.draw_slice = draw_slice,
@@ -99,6 +99,6 @@ AVFilter avfilter_vf_vflip = { · 1 unmodified line
99	.config_props = config_input, },	99	.config_props = config_input, },
100	{ .name = NULL}},	100	{ .name = NULL}},
101	.outputs = (AVFilterPad[]) {{ .name = "default",	101	.outputs = (AVFilterPad[]) {{ .name = "default",
102	.type = CODEC_TYPE_VIDEO, },	102	.type = AVMEDIA_TYPE_VIDEO, },
103	{ .name = NULL}},	103	{ .name = NULL}},
104	};	104	};

libavfilter/vsink_nullsink.c+1−1

@@ -35,7 +35,7 @@ AVFilter avfilter_vsink_nullsink = { · 34 unmodified lines
35	.inputs = (AVFilterPad[]) {	35	.inputs = (AVFilterPad[]) {
36	{	36	{
37	.name = "default",	37	.name = "default",
38	.type = CODEC_TYPE_VIDEO,	38	.type = AVMEDIA_TYPE_VIDEO,
39	.start_frame = start_frame,	39	.start_frame = start_frame,
40	.end_frame = end_frame,	40	.end_frame = end_frame,
41	},	41	},

libavfilter/vsrc_nullsrc.c+1−1

@@ -74,7 +74,7 @@ AVFilter avfilter_vsrc_nullsrc = { · 73 unmodified lines
74	.outputs = (AVFilterPad[]) {	74	.outputs = (AVFilterPad[]) {
75	{	75	{
76	.name = "default",	76	.name = "default",
77	.type = CODEC_TYPE_VIDEO,	77	.type = AVMEDIA_TYPE_VIDEO,
78	.config_props = config_props,	78	.config_props = config_props,
79	.request_frame = request_frame,	79	.request_frame = request_frame,
80	},	80	},

Define AVMediaType enum, and use it instead of enum CodecType, which is deprecated and will be dropped at the next major bump.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -103,14 +103,14 @@ AVFilter avfilter_vf_format = { · 102 unmodified lines
103	.priv_size = sizeof(FormatContext),	103	.priv_size = sizeof(FormatContext),
104		104
105	.inputs = (AVFilterPad[]) {{ .name = "default",	105	.inputs = (AVFilterPad[]) {{ .name = "default",
106	.type = CODEC_TYPE_VIDEO,	106	.type = AVMEDIA_TYPE_VIDEO,
107	.get_video_buffer= avfilter_null_get_video_buffer,	107	.get_video_buffer= avfilter_null_get_video_buffer,
108	.start_frame = avfilter_null_start_frame,	108	.start_frame = avfilter_null_start_frame,
109	.draw_slice = avfilter_null_draw_slice,	109	.draw_slice = avfilter_null_draw_slice,
110	.end_frame = avfilter_null_end_frame, },	110	.end_frame = avfilter_null_end_frame, },
111	{ .name = NULL}},	111	{ .name = NULL}},
112	.outputs = (AVFilterPad[]) {{ .name = "default",	112	.outputs = (AVFilterPad[]) {{ .name = "default",
113	.type = CODEC_TYPE_VIDEO },	113	.type = AVMEDIA_TYPE_VIDEO },
114	{ .name = NULL}},	114	{ .name = NULL}},
115	};	115	};
116	#endif /* CONFIG_FORMAT_FILTER */	116	#endif /* CONFIG_FORMAT_FILTER */
@@ -133,14 +133,14 @@ AVFilter avfilter_vf_noformat = { · 16 unmodified lines
133	.priv_size = sizeof(FormatContext),	133	.priv_size = sizeof(FormatContext),
134		134
135	.inputs = (AVFilterPad[]) {{ .name = "default",	135	.inputs = (AVFilterPad[]) {{ .name = "default",
136	.type = CODEC_TYPE_VIDEO,	136	.type = AVMEDIA_TYPE_VIDEO,
137	.get_video_buffer= avfilter_null_get_video_buffer,	137	.get_video_buffer= avfilter_null_get_video_buffer,
138	.start_frame = avfilter_null_start_frame,	138	.start_frame = avfilter_null_start_frame,
139	.draw_slice = avfilter_null_draw_slice,	139	.draw_slice = avfilter_null_draw_slice,
140	.end_frame = avfilter_null_end_frame, },	140	.end_frame = avfilter_null_end_frame, },
141	{ .name = NULL}},	141	{ .name = NULL}},
142	.outputs = (AVFilterPad[]) {{ .name = "default",	142	.outputs = (AVFilterPad[]) {{ .name = "default",
143	.type = CODEC_TYPE_VIDEO },	143	.type = AVMEDIA_TYPE_VIDEO },
144	{ .name = NULL}},	144	{ .name = NULL}},
145	};	145	};
146	#endif /* CONFIG_NOFORMAT_FILTER */	146	#endif /* CONFIG_NOFORMAT_FILTER */