Implement inline function av_fill_image_max_pixstep() and use it for

factorizing code.

Originally committed as revision 24827 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 4 insertions, 17 deletions

diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index f861651562..60a96ec8c9 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -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 @@ static int config_input(AVFilterLink *link)
     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_fill_image_max_pixstep(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;
 
diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c
index 3c1c3e347e..4bf661fb96 100644
--- a/libavfilter/vf_hflip.c
+++ b/libavfilter/vf_hflip.c
@@ -27,6 +27,7 @@
 #include "avfilter.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/intreadwrite.h"
+#include "libavcore/imgutils.h"
 
 typedef struct {
     int max_step[4];    ///< max pixel step for each plane, expressed as a number of bytes
@@ -68,15 +69,8 @@ static int config_props(AVFilterLink *inlink)
 {
     FlipContext *flip = inlink->dst->priv;
     const AVPixFmtDescriptor *pix_desc = &av_pix_fmt_descriptors[inlink->format];
-    int i;
-
-    memset(flip->max_step, 0, sizeof(flip->max_step));
-    for (i = 0; i < 4; i++) {
-        const AVComponentDescriptor *comp = &(pix_desc->comp[i]);
-        if ((comp->step_minus1+1) > flip->max_step[comp->plane])
-            flip->max_step[comp->plane] = comp->step_minus1+1;
-    }
 
+    av_fill_image_max_pixstep(flip->max_step, NULL, pix_desc);
     flip->hsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_w;
     flip->vsub = av_pix_fmt_descriptors[inlink->format].log2_chroma_h;