[FFmpeg-soc] [soc]: r967 - in libavfilter: allfilters.h avfilter.c avfiltergraph.c vf_crop.c vf_fifo.c vf_fps.c vf_overlay.c vf_passthrough.c vf_rgb2bgr.c vf_slicify.c vf_split.c vf_vflip.c vsrc_dummy.c vsrc_ppm.c
koorogi
subversion at mplayerhq.hu
Sat Aug 18 20:17:30 CEST 2007
Author: koorogi
Date: Sat Aug 18 20:17:30 2007
New Revision: 967
Log:
Prefix names of filter structs
Modified:
libavfilter/allfilters.h
libavfilter/avfilter.c
libavfilter/avfiltergraph.c
libavfilter/vf_crop.c
libavfilter/vf_fifo.c
libavfilter/vf_fps.c
libavfilter/vf_overlay.c
libavfilter/vf_passthrough.c
libavfilter/vf_rgb2bgr.c
libavfilter/vf_slicify.c
libavfilter/vf_split.c
libavfilter/vf_vflip.c
libavfilter/vsrc_dummy.c
libavfilter/vsrc_ppm.c
Modified: libavfilter/allfilters.h
==============================================================================
--- libavfilter/allfilters.h (original)
+++ libavfilter/allfilters.h Sat Aug 18 20:17:30 2007
@@ -21,17 +21,17 @@
#include "avfilter.h"
-extern AVFilter vsrc_dummy;
-extern AVFilter vsrc_ppm;
-extern AVFilter vf_crop;
-extern AVFilter vf_fifo;
-extern AVFilter vf_fps;
-extern AVFilter vf_graph;
-extern AVFilter vf_graphdesc;
-extern AVFilter vf_graphfile;
-extern AVFilter vf_overlay;
-extern AVFilter vf_passthrough;
-extern AVFilter vf_rgb2bgr;
-extern AVFilter vf_slicify;
-extern AVFilter vf_split;
-extern AVFilter vf_vflip;
+extern AVFilter avfilter_vsrc_dummy;
+extern AVFilter avfilter_vsrc_ppm;
+extern AVFilter avfilter_vf_crop;
+extern AVFilter avfilter_vf_fifo;
+extern AVFilter avfilter_vf_fps;
+extern AVFilter avfilter_vf_graph;
+extern AVFilter avfilter_vf_graphdesc;
+extern AVFilter avfilter_vf_graphfile;
+extern AVFilter avfilter_vf_overlay;
+extern AVFilter avfilter_vf_passthrough;
+extern AVFilter avfilter_vf_rgb2bgr;
+extern AVFilter avfilter_vf_slicify;
+extern AVFilter avfilter_vf_split;
+extern AVFilter avfilter_vf_vflip;
Modified: libavfilter/avfilter.c
==============================================================================
--- libavfilter/avfilter.c (original)
+++ libavfilter/avfilter.c Sat Aug 18 20:17:30 2007
@@ -265,20 +265,20 @@ void avfilter_register(AVFilter *filter)
void avfilter_init(void)
{
- avfilter_register(&vsrc_dummy);
- avfilter_register(&vsrc_ppm);
- avfilter_register(&vf_crop);
- avfilter_register(&vf_fifo);
- avfilter_register(&vf_fps);
- avfilter_register(&vf_graph);
- avfilter_register(&vf_graphdesc);
- avfilter_register(&vf_graphfile);
- avfilter_register(&vf_overlay);
- avfilter_register(&vf_passthrough);
- avfilter_register(&vf_rgb2bgr);
- avfilter_register(&vf_slicify);
- avfilter_register(&vf_split);
- avfilter_register(&vf_vflip);
+ avfilter_register(&avfilter_vsrc_dummy);
+ avfilter_register(&avfilter_vsrc_ppm);
+ avfilter_register(&avfilter_vf_crop);
+ avfilter_register(&avfilter_vf_fifo);
+ avfilter_register(&avfilter_vf_fps);
+ avfilter_register(&avfilter_vf_graph);
+ avfilter_register(&avfilter_vf_graphdesc);
+ avfilter_register(&avfilter_vf_graphfile);
+ avfilter_register(&avfilter_vf_overlay);
+ avfilter_register(&avfilter_vf_passthrough);
+ avfilter_register(&avfilter_vf_rgb2bgr);
+ avfilter_register(&avfilter_vf_slicify);
+ avfilter_register(&avfilter_vf_split);
+ avfilter_register(&avfilter_vf_vflip);
}
void avfilter_uninit(void)
Modified: libavfilter/avfiltergraph.c
==============================================================================
--- libavfilter/avfiltergraph.c (original)
+++ libavfilter/avfiltergraph.c Sat Aug 18 20:17:30 2007
@@ -415,9 +415,9 @@ int avfilter_graph_config_links(AVFilter
for(i = 0; i < graph->filter_count; i ++) {
for(j = 0; j < graph->filters[i]->input_count; j ++) {
/* ensure that graphs contained within graphs are configured */
- if((graph->filters[i]->filter == &vf_graph ||
- graph->filters[i]->filter == &vf_graphfile ||
- graph->filters[i]->filter == &vf_graphdesc) &&
+ if((graph->filters[i]->filter == &avfilter_vf_graph ||
+ graph->filters[i]->filter == &avfilter_vf_graphfile ||
+ graph->filters[i]->filter == &avfilter_vf_graphdesc) &&
avfilter_graph_config_links(graph->filters[i]))
return -1;
if(avfilter_config_link(graph->filters[i]->inputs[j]))
@@ -559,7 +559,7 @@ fail:
return -1;
}
-AVFilter vf_graph =
+AVFilter avfilter_vf_graph =
{
.name = "graph",
.author = "Bobby Bingham",
@@ -656,7 +656,7 @@ fail:
return -1;
}
-AVFilter vf_graphdesc =
+AVFilter avfilter_vf_graphdesc =
{
.name = "graph_desc",
.author = "Bobby Bingham",
@@ -685,7 +685,7 @@ static int init_file(AVFilterContext *ct
return ret;
}
-AVFilter vf_graphfile =
+AVFilter avfilter_vf_graphfile =
{
.name = "graph_file",
.author = "Bobby Bingham",
Modified: libavfilter/vf_crop.c
==============================================================================
--- libavfilter/vf_crop.c (original)
+++ libavfilter/vf_crop.c Sat Aug 18 20:17:30 2007
@@ -159,7 +159,7 @@ static void draw_slice(AVFilterLink *lin
avfilter_draw_slice(ctx->outputs[0], top - crop->cy, height);
}
-AVFilter vf_crop =
+AVFilter avfilter_vf_crop =
{
.name = "crop",
.author = "Bobby Bingham",
Modified: libavfilter/vf_fifo.c
==============================================================================
--- libavfilter/vf_fifo.c (original)
+++ libavfilter/vf_fifo.c Sat Aug 18 20:17:30 2007
@@ -115,7 +115,7 @@ static int request_frame(AVFilterLink *l
return 0;
}
-AVFilter vf_fifo =
+AVFilter avfilter_vf_fifo =
{
.name = "fifo",
.author = "Bobby Bingham",
Modified: libavfilter/vf_fps.c
==============================================================================
--- libavfilter/vf_fps.c (original)
+++ libavfilter/vf_fps.c Sat Aug 18 20:17:30 2007
@@ -103,7 +103,7 @@ static int request_frame(AVFilterLink *l
return 0;
}
-AVFilter vf_fps =
+AVFilter avfilter_vf_fps =
{
.name = "fps",
.author = "Bobby Bingham",
Modified: libavfilter/vf_overlay.c
==============================================================================
--- libavfilter/vf_overlay.c (original)
+++ libavfilter/vf_overlay.c Sat Aug 18 20:17:30 2007
@@ -215,7 +215,7 @@ static int request_frame(AVFilterLink *l
return 0;
}
-AVFilter vf_overlay =
+AVFilter avfilter_vf_overlay =
{
.name = "overlay",
.author = "Bobby Bingham",
Modified: libavfilter/vf_passthrough.c
==============================================================================
--- libavfilter/vf_passthrough.c (original)
+++ libavfilter/vf_passthrough.c Sat Aug 18 20:17:30 2007
@@ -58,7 +58,7 @@ static void draw_slice(AVFilterLink *lin
avfilter_draw_slice(link->dst->outputs[0], y, h);
}
-AVFilter vf_passthrough =
+AVFilter avfilter_vf_passthrough =
{
.name = "passthrough",
.author = "Bobby Bingham",
Modified: libavfilter/vf_rgb2bgr.c
==============================================================================
--- libavfilter/vf_rgb2bgr.c (original)
+++ libavfilter/vf_rgb2bgr.c Sat Aug 18 20:17:30 2007
@@ -67,7 +67,7 @@ static void draw_slice(AVFilterLink *lin
avfilter_draw_slice(link->dst->outputs[0], y, h);
}
-AVFilter vf_rgb2bgr =
+AVFilter avfilter_vf_rgb2bgr =
{
.name = "rgb2bgr",
.author = "Bobby Bingham",
Modified: libavfilter/vf_slicify.c
==============================================================================
--- libavfilter/vf_slicify.c (original)
+++ libavfilter/vf_slicify.c Sat Aug 18 20:17:30 2007
@@ -85,7 +85,7 @@ static void draw_slice(AVFilterLink *lin
avfilter_draw_slice(link->dst->outputs[0], y2, y + h - y2);
}
-AVFilter vf_slicify =
+AVFilter avfilter_vf_slicify =
{
.name = "slicify",
.author = "Bobby Bingham",
Modified: libavfilter/vf_split.c
==============================================================================
--- libavfilter/vf_split.c (original)
+++ libavfilter/vf_split.c Sat Aug 18 20:17:30 2007
@@ -62,7 +62,7 @@ static void draw_slice(AVFilterLink *lin
avfilter_draw_slice(link->dst->outputs[1], y, h);
}
-AVFilter vf_split =
+AVFilter avfilter_vf_split =
{
.name = "split",
.author = "Bobby Bingham",
Modified: libavfilter/vf_vflip.c
==============================================================================
--- libavfilter/vf_vflip.c (original)
+++ libavfilter/vf_vflip.c Sat Aug 18 20:17:30 2007
@@ -84,7 +84,7 @@ static void draw_slice(AVFilterLink *lin
avfilter_draw_slice(ctx->outputs[0], pic->h - (y+h), h);
}
-AVFilter vf_vflip =
+AVFilter avfilter_vf_vflip =
{
.name = "vflip",
.author = "Bobby Bingham",
Modified: libavfilter/vsrc_dummy.c
==============================================================================
--- libavfilter/vsrc_dummy.c (original)
+++ libavfilter/vsrc_dummy.c Sat Aug 18 20:17:30 2007
@@ -76,7 +76,7 @@ static int request_frame(AVFilterLink *l
return 0;
}
-AVFilter vsrc_dummy =
+AVFilter avfilter_vsrc_dummy =
{
.name = "dummy",
.author = "Bobby Bingham",
Modified: libavfilter/vsrc_ppm.c
==============================================================================
--- libavfilter/vsrc_ppm.c (original)
+++ libavfilter/vsrc_ppm.c Sat Aug 18 20:17:30 2007
@@ -105,7 +105,7 @@ static void uninit(AVFilterContext *ctx)
fclose(ppm->in);
}
-AVFilter vsrc_ppm =
+AVFilter avfilter_vsrc_ppm =
{
.name = "ppm",
.author = "Bobby Bingham",
More information about the FFmpeg-soc
mailing list