Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -64,14 +64,6 @@ static void fill_frame_from_iplimage(AVFrame *frame, const IplImage *img, enum A · 63 unmodified lines | |||
| 64 | frame->data[0] = img->imageData; | 64 | frame->data[0] = img->imageData; |
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | static int query_formats(AVFilterContext *ctx) | ||
| 68 | { | ||
| 69 | static const enum AVPixelFormat pix_fmts[] = { | ||
| 70 | AV_PIX_FMT_BGR24, AV_PIX_FMT_BGRA, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE | ||
| 71 | }; | ||
| 72 | return ff_set_common_formats_from_list(ctx, pix_fmts); | ||
| 73 | } | ||
| 74 | |||
| 75 | typedef struct OCVContext { | 67 | typedef struct OCVContext { |
| 76 | const AVClass *class; | 68 | const AVClass *class; |
| 77 | char *name; | 69 | char *name; |
| @@ -431,5 +423,5 @@ const AVFilter ff_vf_ocv = { · 353 unmodified lines | |||
| 431 | .uninit = uninit, | 423 | .uninit = uninit, |
| 432 | FILTER_INPUTS(avfilter_vf_ocv_inputs), | 424 | FILTER_INPUTS(avfilter_vf_ocv_inputs), |
| 433 | FILTER_OUTPUTS(avfilter_vf_ocv_outputs), | 425 | FILTER_OUTPUTS(avfilter_vf_ocv_outputs), |
| 434 | FILTER_QUERY_FUNC(query_formats), | 426 | FILTER_PIXFMTS(AV_PIX_FMT_BGR24, AV_PIX_FMT_BGRA, AV_PIX_FMT_GRAY8), |
| 435 | }; | 427 | }; |