[FFmpeg-cvslog] lavfi/vf_dnn_processing: Fix compile warning of mixed declarations and code

Linjie Fu git at videolan.org
Thu Mar 19 08:33:44 EET 2020


ffmpeg | branch: master | Linjie Fu <linjie.fu at intel.com> | Wed Mar 18 12:23:10 2020 +0800| [acc6f632b45f4b9eb0dc2572b3d95224022582cb] | committer: Guo, Yejun

lavfi/vf_dnn_processing: Fix compile warning of mixed declarations and code

Signed-off-by: Linjie Fu <linjie.fu at intel.com>
Reviewed-by: Guo, Yejun <yejun.guo at intel.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=acc6f632b45f4b9eb0dc2572b3d95224022582cb
---

 libavfilter/vf_dnn_processing.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavfilter/vf_dnn_processing.c b/libavfilter/vf_dnn_processing.c
index 7f40f85dad..fabe4f1d01 100644
--- a/libavfilter/vf_dnn_processing.c
+++ b/libavfilter/vf_dnn_processing.c
@@ -418,10 +418,13 @@ static av_always_inline int isPlanarYUV(enum AVPixelFormat pix_fmt)
 
 static int copy_uv_planes(DnnProcessingContext *ctx, AVFrame *out, const AVFrame *in)
 {
+    const AVPixFmtDescriptor *desc;
+    int uv_height;
+
     if (!ctx->sws_uv_scale) {
         av_assert0(in->height == out->height && in->width == out->width);
-        const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(in->format);
-        int uv_height = AV_CEIL_RSHIFT(in->height, desc->log2_chroma_h);
+        desc = av_pix_fmt_desc_get(in->format);
+        uv_height = AV_CEIL_RSHIFT(in->height, desc->log2_chroma_h);
         for (int i = 1; i < 3; ++i) {
             int bytewidth = av_image_get_linesize(in->format, in->width, i);
             av_image_copy_plane(out->data[i], out->linesize[i],



More information about the ffmpeg-cvslog mailing list