| Index: source/patched-ffmpeg-mt/libavfilter/vf_crop.c
|
| ===================================================================
|
| --- source/patched-ffmpeg-mt/libavfilter/vf_crop.c (revision 59334)
|
| +++ source/patched-ffmpeg-mt/libavfilter/vf_crop.c (working copy)
|
| @@ -24,7 +24,7 @@
|
| */
|
|
|
| #include "avfilter.h"
|
| -#include "libavutil/pixdesc.h"
|
| +#include "libavcore/imgutils.h"
|
|
|
| typedef struct {
|
| int x; ///< x offset of the non-cropped area with respect to the input area
|
| @@ -83,15 +83,8 @@
|
| AVFilterContext *ctx = link->dst;
|
| CropContext *crop = ctx->priv;
|
| const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[link->format];
|
| - int i;
|
|
|
| - memset(crop->max_step, 0, sizeof(crop->max_step));
|
| - for (i = 0; i < 4; i++) {
|
| - const AVComponentDescriptor *comp = &(pix_desc->comp[i]);
|
| - if ((comp->step_minus1+1) > crop->max_step[comp->plane])
|
| - crop->max_step[comp->plane] = comp->step_minus1+1;
|
| - }
|
| -
|
| + av_image_fill_max_pixsteps(crop->max_step, NULL, pix_desc);
|
| crop->hsub = av_pix_fmt_descriptors[link->format].log2_chroma_w;
|
| crop->vsub = av_pix_fmt_descriptors[link->format].log2_chroma_h;
|
|
|
| @@ -135,8 +128,8 @@
|
| AVFilterBufferRef *ref2 = avfilter_ref_buffer(picref, ~0);
|
| int i;
|
|
|
| - ref2->w = crop->w;
|
| - ref2->h = crop->h;
|
| + picref->video->w = crop->w;
|
| + picref->video->h = crop->h;
|
|
|
| ref2->data[0] += crop->y * ref2->linesize[0];
|
| ref2->data[0] += (crop->x * crop->max_step[0]);
|
|
|