virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/movtextenc: Remove redundant byte count

Browse Source 
Use the AVBPrint's len instead.

Reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-11-30 11:05:52 +01:00
parent 0bc3c070fb
commit c4c9d096ae
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/movtextenc.c
View File

@@ -84,7 +84,6 @@ typedef struct {
uint8_t box_flags; uint8_t box_flags;
StyleBox d; StyleBox d;
uint16_t text_pos; uint16_t text_pos;
unsigned byte_count;
char **fonts; char **fonts;
int font_count; int font_count;
double font_scale_factor; double font_scale_factor;
@@ -611,7 +610,6 @@ static void mov_text_text_cb(void *priv, const char *text, int len)
av_bprint_append_data(&s->buffer, text, len); av_bprint_append_data(&s->buffer, text, len);
// If it's not utf-8, just use the byte length // If it's not utf-8, just use the byte length
s->text_pos += utf8_len ? utf8_len : len; s->text_pos += utf8_len ? utf8_len : len;
s->byte_count += len;
} }
static void mov_text_new_line_cb(void *priv, int forced) static void mov_text_new_line_cb(void *priv, int forced)
@@ -619,7 +617,6 @@ static void mov_text_new_line_cb(void *priv, int forced)
MovTextContext *s = priv; MovTextContext *s = priv;
av_bprint_append_data(&s->buffer, "\n", 1); av_bprint_append_data(&s->buffer, "\n", 1);
s->text_pos += 1; s->text_pos += 1;
s->byte_count += 1;
} }
static const ASSCodesCallbacks mov_text_callbacks = { static const ASSCodesCallbacks mov_text_callbacks = {
@@ -641,7 +638,6 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf,
ASSDialog *dialog; ASSDialog *dialog;
int i, length; int i, length;
s->byte_count = 0;
s->text_pos = 0; s->text_pos = 0;
s->count = 0; s->count = 0;
s->box_flags = 0; s->box_flags = 0;
@@ -662,9 +658,9 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf,
ff_ass_free_dialog(&dialog); ff_ass_free_dialog(&dialog);
} }
if (s->byte_count > UINT16_MAX) if (s->buffer.len > UINT16_MAX)
return AVERROR(ERANGE); return AVERROR(ERANGE);
AV_WB16(buf, s->byte_count); AV_WB16(buf, s->buffer.len);
buf += 2; buf += 2;
for (size_t j = 0; j < box_count; j++) for (size_t j = 0; j < box_count; j++)