History

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
  1. libavfilter/avfilter.h +1 −1
  2. libavfilter/vf_aspect.c +4 −4
  3. libavfilter/vf_crop.c +2 −2
  4. libavfilter/vf_format.c +4 −4
  5. libavfilter/vf_null.c +2 −2
  6. libavfilter/vf_scale.c +2 −2
  7. libavfilter/vf_slicify.c +2 −2
  8. libavfilter/vf_vflip.c +2 −2
  9. libavfilter/vsink_nullsink.c +1 −1
  10. libavfilter/vsrc_nullsrc.c +1 −1
libavfilter/avfilter.h+1−1
@@ -280,7 +280,7 @@ struct AVFilterPad · 279 unmodified lines
280280 * AVFilterPad type. Only video supported now, hopefully someone will
281281 * add audio in the future.
282282 */
283− enum CodecType type;
283+ enum AVMediaType type;
284284
285285 /**
286286 * 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
8686 .priv_size = sizeof(AspectContext),
8787
8888 .inputs = (AVFilterPad[]) {{ .name = "default",
89− .type = CODEC_TYPE_VIDEO,
89+ .type = AVMEDIA_TYPE_VIDEO,
9090 .config_props = frameaspect_config_props,
9191 .get_video_buffer = avfilter_null_get_video_buffer,
9292 .start_frame = start_frame,
@@ -94,7 +94,7 @@ AVFilter avfilter_vf_aspect = { · 1 unmodified line
9494 { .name = NULL}},
9595
9696 .outputs = (AVFilterPad[]) {{ .name = "default",
97− .type = CODEC_TYPE_VIDEO, },
97+ .type = AVMEDIA_TYPE_VIDEO, },
9898 { .name = NULL}},
9999 };
100100 #endif /* CONFIG_ASPECT_FILTER */
@@ -109,14 +109,14 @@ AVFilter avfilter_vf_pixelaspect = { · 8 unmodified lines
109109 .priv_size = sizeof(AspectContext),
110110
111111 .inputs = (AVFilterPad[]) {{ .name = "default",
112− .type = CODEC_TYPE_VIDEO,
112+ .type = AVMEDIA_TYPE_VIDEO,
113113 .get_video_buffer = avfilter_null_get_video_buffer,
114114 .start_frame = start_frame,
115115 .end_frame = avfilter_null_end_frame },
116116 { .name = NULL}},
117117
118118 .outputs = (AVFilterPad[]) {{ .name = "default",
119− .type = CODEC_TYPE_VIDEO, },
119+ .type = AVMEDIA_TYPE_VIDEO, },
120120 { .name = NULL}},
121121 };
122122 #endif /* CONFIG_PIXELASPECT_FILTER */
libavfilter/vf_crop.c+2−2
@@ -214,14 +214,14 @@ AVFilter avfilter_vf_crop = { · 213 unmodified lines
214214 .init = init,
215215
216216 .inputs = (AVFilterPad[]) {{ .name = "default",
217− .type = CODEC_TYPE_VIDEO,
217+ .type = AVMEDIA_TYPE_VIDEO,
218218 .start_frame = start_frame,
219219 .draw_slice = draw_slice,
220220 .get_video_buffer = avfilter_null_get_video_buffer,
221221 .config_props = config_input, },
222222 { .name = NULL}},
223223 .outputs = (AVFilterPad[]) {{ .name = "default",
224− .type = CODEC_TYPE_VIDEO,
224+ .type = AVMEDIA_TYPE_VIDEO,
225225 .config_props = config_output, },
226226 { .name = NULL}},
227227 };
libavfilter/vf_format.c+4−4
@@ -103,14 +103,14 @@ AVFilter avfilter_vf_format = { · 102 unmodified lines
103103 .priv_size = sizeof(FormatContext),
104104
105105 .inputs = (AVFilterPad[]) {{ .name = "default",
106− .type = CODEC_TYPE_VIDEO,
106+ .type = AVMEDIA_TYPE_VIDEO,
107107 .get_video_buffer= avfilter_null_get_video_buffer,
108108 .start_frame = avfilter_null_start_frame,
109109 .draw_slice = avfilter_null_draw_slice,
110110 .end_frame = avfilter_null_end_frame, },
111111 { .name = NULL}},
112112 .outputs = (AVFilterPad[]) {{ .name = "default",
113− .type = CODEC_TYPE_VIDEO },
113+ .type = AVMEDIA_TYPE_VIDEO },
114114 { .name = NULL}},
115115 };
116116 #endif /* CONFIG_FORMAT_FILTER */
@@ -133,14 +133,14 @@ AVFilter avfilter_vf_noformat = { · 16 unmodified lines
133133 .priv_size = sizeof(FormatContext),
134134
135135 .inputs = (AVFilterPad[]) {{ .name = "default",
136− .type = CODEC_TYPE_VIDEO,
136+ .type = AVMEDIA_TYPE_VIDEO,
137137 .get_video_buffer= avfilter_null_get_video_buffer,
138138 .start_frame = avfilter_null_start_frame,
139139 .draw_slice = avfilter_null_draw_slice,
140140 .end_frame = avfilter_null_end_frame, },
141141 { .name = NULL}},
142142 .outputs = (AVFilterPad[]) {{ .name = "default",
143− .type = CODEC_TYPE_VIDEO },
143+ .type = AVMEDIA_TYPE_VIDEO },
144144 { .name = NULL}},
145145 };
146146 #endif /* CONFIG_NOFORMAT_FILTER */
libavfilter/vf_null.c+2−2
@@ -30,13 +30,13 @@ AVFilter avfilter_vf_null = { · 29 unmodified lines
3030 .priv_size = 0,
3131
3232 .inputs = (AVFilterPad[]) {{ .name = "default",
33− .type = CODEC_TYPE_VIDEO,
33+ .type = AVMEDIA_TYPE_VIDEO,
3434 .get_video_buffer = avfilter_null_get_video_buffer,
3535 .start_frame = avfilter_null_start_frame,
3636 .end_frame = avfilter_null_end_frame },
3737 { .name = NULL}},
3838
3939 .outputs = (AVFilterPad[]) {{ .name = "default",
40− .type = CODEC_TYPE_VIDEO, },
40+ .type = AVMEDIA_TYPE_VIDEO, },
4141 { .name = NULL}},
4242 };
libavfilter/vf_scale.c+2−2
@@ -197,13 +197,13 @@ AVFilter avfilter_vf_scale = { · 196 unmodified lines
197197 .priv_size = sizeof(ScaleContext),
198198
199199 .inputs = (AVFilterPad[]) {{ .name = "default",
200− .type = CODEC_TYPE_VIDEO,
200+ .type = AVMEDIA_TYPE_VIDEO,
201201 .start_frame = start_frame,
202202 .draw_slice = draw_slice,
203203 .min_perms = AV_PERM_READ, },
204204 { .name = NULL}},
205205 .outputs = (AVFilterPad[]) {{ .name = "default",
206− .type = CODEC_TYPE_VIDEO,
206+ .type = AVMEDIA_TYPE_VIDEO,
207207 .config_props = config_props, },
208208 { .name = NULL}},
209209 };
libavfilter/vf_slicify.c+2−2
@@ -104,7 +104,7 @@ AVFilter avfilter_vf_slicify = { · 103 unmodified lines
104104 .priv_size = sizeof(SliceContext),
105105
106106 .inputs = (AVFilterPad[]) {{ .name = "default",
107− .type = CODEC_TYPE_VIDEO,
107+ .type = AVMEDIA_TYPE_VIDEO,
108108 .get_video_buffer = avfilter_null_get_video_buffer,
109109 .start_frame = start_frame,
110110 .draw_slice = draw_slice,
@@ -112,6 +112,6 @@ AVFilter avfilter_vf_slicify = { · 1 unmodified line
112112 .end_frame = avfilter_null_end_frame, },
113113 { .name = NULL}},
114114 .outputs = (AVFilterPad[]) {{ .name = "default",
115− .type = CODEC_TYPE_VIDEO, },
115+ .type = AVMEDIA_TYPE_VIDEO, },
116116 { .name = NULL}},
117117 };
libavfilter/vf_vflip.c+2−2
@@ -91,7 +91,7 @@ AVFilter avfilter_vf_vflip = { · 90 unmodified lines
9191 .priv_size = sizeof(FlipContext),
9292
9393 .inputs = (AVFilterPad[]) {{ .name = "default",
94− .type = CODEC_TYPE_VIDEO,
94+ .type = AVMEDIA_TYPE_VIDEO,
9595 .get_video_buffer = get_video_buffer,
9696 .start_frame = start_frame,
9797 .draw_slice = draw_slice,
@@ -99,6 +99,6 @@ AVFilter avfilter_vf_vflip = { · 1 unmodified line
9999 .config_props = config_input, },
100100 { .name = NULL}},
101101 .outputs = (AVFilterPad[]) {{ .name = "default",
102− .type = CODEC_TYPE_VIDEO, },
102+ .type = AVMEDIA_TYPE_VIDEO, },
103103 { .name = NULL}},
104104 };
libavfilter/vsink_nullsink.c+1−1
@@ -35,7 +35,7 @@ AVFilter avfilter_vsink_nullsink = { · 34 unmodified lines
3535 .inputs = (AVFilterPad[]) {
3636 {
3737 .name = "default",
38− .type = CODEC_TYPE_VIDEO,
38+ .type = AVMEDIA_TYPE_VIDEO,
3939 .start_frame = start_frame,
4040 .end_frame = end_frame,
4141 },
libavfilter/vsrc_nullsrc.c+1−1
@@ -74,7 +74,7 @@ AVFilter avfilter_vsrc_nullsrc = { · 73 unmodified lines
7474 .outputs = (AVFilterPad[]) {
7575 {
7676 .name = "default",
77− .type = CODEC_TYPE_VIDEO,
77+ .type = AVMEDIA_TYPE_VIDEO,
7878 .config_props = config_props,
7979 .request_frame = request_frame,
8080 },

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t