Originally committed as revision 22576 to svn://svn.ffmpeg.org/ffmpeg/trunk
Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -85,18 +85,6 @@ static AVFilterFormats *make_format_list(FormatContext *format, int flag) · 84 unmodified lines | |||
| 85 | return formats; | 85 | return formats; |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | static int query_formats_format(AVFilterContext *ctx) | ||
| 89 | { | ||
| 90 | avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 1)); | ||
| 91 | return 0; | ||
| 92 | } | ||
| 93 | |||
| 94 | static int query_formats_noformat(AVFilterContext *ctx) | ||
| 95 | { | ||
| 96 | avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 0)); | ||
| 97 | return 0; | ||
| 98 | } | ||
| 99 | |||
| 100 | static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms, | 88 | static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms, |
| 101 | int w, int h) | 89 | int w, int h) |
| 102 | { | 90 | { |
| @@ -118,6 +106,12 @@ static void draw_slice(AVFilterLink *link, int y, int h, int slice_dir) · 15 unmodified lines | |||
| 118 | avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir); | 106 | avfilter_draw_slice(link->dst->outputs[0], y, h, slice_dir); |
| 119 | } | 107 | } |
| 120 | 108 | ||
| 109 | static int query_formats_format(AVFilterContext *ctx) | ||
| 110 | { | ||
| 111 | avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 1)); | ||
| 112 | return 0; | ||
| 113 | } | ||
| 114 | |||
| 121 | AVFilter avfilter_vf_format = { | 115 | AVFilter avfilter_vf_format = { |
| 122 | .name = "format", | 116 | .name = "format", |
| 123 | .description = "Convert the input video to one of the specified pixel formats.", | 117 | .description = "Convert the input video to one of the specified pixel formats.", |
| @@ -140,6 +134,12 @@ AVFilter avfilter_vf_format = { · 16 unmodified lines | |||
| 140 | { .name = NULL}}, | 134 | { .name = NULL}}, |
| 141 | }; | 135 | }; |
| 142 | 136 | ||
| 137 | static int query_formats_noformat(AVFilterContext *ctx) | ||
| 138 | { | ||
| 139 | avfilter_set_common_formats(ctx, make_format_list(ctx->priv, 0)); | ||
| 140 | return 0; | ||
| 141 | } | ||
| 142 | |||
| 143 | AVFilter avfilter_vf_noformat = { | 143 | AVFilter avfilter_vf_noformat = { |
| 144 | .name = "noformat", | 144 | .name = "noformat", |
| 145 | .description = "Force libavfilter not to use any of the specified pixel formats for the input to the next filter.", | 145 | .description = "Force libavfilter not to use any of the specified pixel formats for the input to the next filter.", |