summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-08-18 12:53:18 +0200
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2011-08-22 10:40:50 +0200
commite0ddc2e953b6485c1b6b183fc781170ba945951a (patch)
tree66bc9962cb6c3f766c9fdad53de678774932d546
parentdf4c7ae9db04206c7557e9eaa1b16274e1bea965 (diff)
downloadffmpeg-streaming-e0ddc2e953b6485c1b6b183fc781170ba945951a.zip
ffmpeg-streaming-e0ddc2e953b6485c1b6b183fc781170ba945951a.tar.gz
vsrc_movie: rename video movie specific callbacks, prefix them with "movie"
-rw-r--r--libavfilter/vsrc_movie.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/vsrc_movie.c b/libavfilter/vsrc_movie.c
index 54c7712..f8001f8 100644
--- a/libavfilter/vsrc_movie.c
+++ b/libavfilter/vsrc_movie.c
@@ -206,7 +206,7 @@ static av_cold int movie_init(AVFilterContext *ctx, const char *args, void *opaq
return 0;
}
-static int query_formats(AVFilterContext *ctx)
+static int movie_query_formats(AVFilterContext *ctx)
{
MovieContext *movie = ctx->priv;
enum PixelFormat pix_fmts[] = { movie->codec_ctx->pix_fmt, PIX_FMT_NONE };
@@ -215,7 +215,7 @@ static int query_formats(AVFilterContext *ctx)
return 0;
}
-static int config_output_props(AVFilterLink *outlink)
+static int movie_config_output_props(AVFilterLink *outlink)
{
MovieContext *movie = outlink->src->priv;
@@ -281,7 +281,7 @@ static int movie_get_frame(AVFilterLink *outlink)
return ret;
}
-static int request_frame(AVFilterLink *outlink)
+static int movie_request_frame(AVFilterLink *outlink)
{
AVFilterBufferRef *outpicref;
MovieContext *movie = outlink->src->priv;
@@ -308,12 +308,12 @@ AVFilter avfilter_vsrc_movie = {
.priv_size = sizeof(MovieContext),
.init = movie_init,
.uninit = movie_common_uninit,
- .query_formats = query_formats,
+ .query_formats = movie_query_formats,
.inputs = (AVFilterPad[]) {{ .name = NULL }},
.outputs = (AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_VIDEO,
- .request_frame = request_frame,
- .config_props = config_output_props, },
+ .request_frame = movie_request_frame,
+ .config_props = movie_config_output_props, },
{ .name = NULL}},
};
OpenPOWER on IntegriCloud