diff options
| author | Bobby Bingham <uhmmmm@gmail.com> | 2010-03-17 04:37:36 +0000 |
|---|---|---|
| committer | Bobby Bingham <uhmmmm@gmail.com> | 2010-03-17 04:37:36 +0000 |
| commit | 55fd1bbc1b00eb8874404074fc4fe98bf4a53a79 (patch) | |
| tree | 0a3684cf479c4e5f5713c7ad38d154b86661574f /libavfilter | |
| parent | ad8eede7b1dd0578d4b69c0e2a41d9276e9e127d (diff) | |
| download | ffmpeg-55fd1bbc1b00eb8874404074fc4fe98bf4a53a79.tar.gz | |
Cosmetics: rearrange functions to simplify ifdeffery
Originally committed as revision 22576 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_format.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index d9f102db7c..1da944d7f8 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -85,18 +85,6 @@ static AVFilterFormats *make_format_list(FormatContext *format, int flag) return formats; } -static int query_formats_format(AVFilterContext *ctx) -{ - avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 1)); - return 0; -} - -static int query_formats_noformat(AVFilterContext *ctx) -{ - avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 0)); - return 0; -} - static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms, int w, int h) { @@ -118,6 +106,12 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir) avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir); } +static int query_formats_format(AVFilterContext *ctx) +{ + avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 1)); + return 0; +} + AVFilter avfilter_vf_format = { .name = "format", .description = "Convert the input video to one of the specified pixel formats.", @@ -140,6 +134,12 @@ AVFilter avfilter_vf_format = { { .name = NULL}}, }; +static int query_formats_noformat(AVFilterContext *ctx) +{ + avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 0)); + return 0; +} + AVFilter avfilter_vf_noformat = { .name = "noformat", .description = "Force libavfilter not to use any of the specified pixel formats for the input to the next filter.", |