From 3db407038e9b7e0da2537fc2e19c370c45dba355 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 21 Jul 2012 09:45:52 -0700 Subject: lavfi: use const for AVFilterPad declarations in all filters. --- libavfilter/vf_yadif.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'libavfilter/vf_yadif.c') diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 230e797221..40cfdf54ef 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -400,18 +400,18 @@ AVFilter avfilter_vf_yadif = { .uninit = uninit, .query_formats = query_formats, - .inputs = (AVFilterPad[]) {{ .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .start_frame = start_frame, - .get_video_buffer = get_video_buffer, - .draw_slice = null_draw_slice, - .end_frame = end_frame, }, - { .name = NULL}}, - - .outputs = (AVFilterPad[]) {{ .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .poll_frame = poll_frame, - .request_frame = request_frame, - .config_props = config_props, }, - { .name = NULL}}, + .inputs = (const AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .start_frame = start_frame, + .get_video_buffer = get_video_buffer, + .draw_slice = null_draw_slice, + .end_frame = end_frame, }, + { .name = NULL}}, + + .outputs = (const AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .poll_frame = poll_frame, + .request_frame = request_frame, + .config_props = config_props, }, + { .name = NULL}}, }; -- cgit v1.2.3 From 731fa116b4d9ebe53fbacbd3ddda6ced840e4233 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 21 Jul 2012 17:04:06 -0700 Subject: yadif: use emms_c() instead of inline assembly for emms invocations. --- libavfilter/vf_yadif.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libavfilter/vf_yadif.c') diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 40cfdf54ef..02feeb213c 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -135,9 +135,8 @@ static void filter(AVFilterContext *ctx, AVFilterBufferRef *dstpic, } } } -#if HAVE_MMX - __asm__ volatile("emms \n\t" : : : "memory"); -#endif + + emms_c(); } static AVFilterBufferRef *get_video_buffer(AVFilterLink *link, int perms, int w, int h) -- cgit v1.2.3