Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'

[ffmpeg] / libavfilter / vf_showinfo.c

diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 1cad3c93a6f530e6ca96bbc66c34b0294f6e1dbd..f91721d2781ada9c4bae38968ae3acf219b863a6 100644 (file)
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -50,7 +50,7 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
     uint32_t plane_checksum[4] = {0}, checksum = 0;
     int i, plane, vsub = desc->log2_chroma_h;
 
-    for (plane = 0; frame->data[plane] && plane < 4; plane++) {
+    for (plane = 0; plane < 4 && frame->data[plane]; plane++) {
         int64_t linesize = av_image_get_linesize(frame->format, frame->video->w, plane);
         uint8_t *data = frame->data[plane];
         int h = plane == 1 || plane == 2 ? inlink->h >> vsub : inlink->h;
@@ -80,7 +80,7 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *frame)
            av_get_picture_type_char(frame->video->pict_type),
            checksum, plane_checksum[0]);
 
-    for (plane = 1; frame->data[plane] && plane < 4; plane++)
+    for (plane = 1; plane < 4 && frame->data[plane]; plane++)
         av_log(ctx, AV_LOG_INFO, " %08X", plane_checksum[plane]);
     av_log(ctx, AV_LOG_INFO, "]\n");