]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/dvbsubenc: merge rectangle encode code blocks
authorClément Bœsch <u@pkh.me>
Tue, 18 Aug 2020 08:29:22 +0000 (10:29 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 22 Aug 2020 17:02:01 +0000 (19:02 +0200)
libavcodec/dvbsubenc.c

index 7b8ef41a7e2e50f9dd1fbe1307e979bd4ea8b47b..ce6de4a7744e63fbfe5058024d3b454e5693386f 100644 (file)
@@ -374,7 +374,6 @@ static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size,
             bytestream_put_be16(&pseg_len, q - pseg_len - 2);
             buf_size -= 6 + h->rects[clut_id]->nb_colors * 6;
         }
-    }
 
     if (buf_size < h->num_rects * 22)
         return AVERROR_BUFFER_TOO_SMALL;
@@ -419,8 +418,6 @@ static int dvbsub_encode(AVCodecContext *avctx, uint8_t *outbuf, int buf_size,
     }
     buf_size -= h->num_rects * 22;
 
-    if (h->num_rects) {
-
         for (object_id = 0; object_id < h->num_rects; object_id++) {
             int (*dvb_encode_rle)(uint8_t **pq, int buf_size,
                                   const uint8_t *bitmap, int linesize,