diff mbox series

[FFmpeg-devel,1/5] avcodec/dvbsubenc: merge rectangle encode code blocks

Message ID 20200818205535.2974765-1-u@pkh.me
State Accepted
Commit 5fc075d53e754c2028a2911138035d1dfedcdb65
Headers show
Series [FFmpeg-devel,1/5] avcodec/dvbsubenc: merge rectangle encode code blocks | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Clément Bœsch Aug. 18, 2020, 8:55 p.m. UTC 
---
 libavcodec/dvbsubenc.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Michael Niedermayer Aug. 19, 2020, 10:41 a.m. UTC | #1 
On Tue, Aug 18, 2020 at 10:55:31PM +0200, Clément Bœsch wrote:
> ---
>  libavcodec/dvbsubenc.c | 3 ---
>  1 file changed, 3 deletions(-)

probably ok

thx

[...]
Clément Bœsch Aug. 22, 2020, 5:27 p.m. UTC | #2 
[...]

Patchset applied, thanks for the review
diff mbox series

Patch

diff --git a/libavcodec/dvbsubenc.c b/libavcodec/dvbsubenc.c
index 7b8ef41a7e..ce6de4a774 100644
--- a/libavcodec/dvbsubenc.c
+++ b/libavcodec/dvbsubenc.c
@@ -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,