highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/mlpenc: Avoid redundant temporary PutBitContext

Browse Source 
We are already word-aligned here, so one can just as well flush the main
PutBitContext.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2021-03-25 02:55:53 +01:00
committed by Andreas Rheinhardt
parent 0ab70230f2
commit 3183eda0fa
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mlpenc.c
View File

@@ -1067,7 +1067,7 @@ static uint8_t *write_substrs(MLPEncodeContext *ctx, uint8_t *buf, int buf_size,
RestartHeader *rh = &ctx->restart_header [substr]; RestartHeader *rh = &ctx->restart_header [substr];
int substr_restart_frame = restart_frame; int substr_restart_frame = restart_frame;
uint8_t parity, checksum; uint8_t parity, checksum;
PutBitContext pb, tmpb; PutBitContext pb;
int params_changed; int params_changed;
ctx->cur_restart_header = rh; ctx->cur_restart_header = rh;
@@ -1117,9 +1117,9 @@ static uint8_t *write_substrs(MLPEncodeContext *ctx, uint8_t *buf, int buf_size,
put_bits(&pb, 32, END_OF_STREAM); put_bits(&pb, 32, END_OF_STREAM);
} }
/* Data must be flushed for the checksum and parity to be correct. */ /* Data must be flushed for the checksum and parity to be correct;
tmpb = pb; * notice that we already are word-aligned here. */
flush_put_bits(&tmpb); flush_put_bits(&pb);
parity = ff_mlp_calculate_parity(buf, put_bits_count(&pb) >> 3) ^ 0xa9; parity = ff_mlp_calculate_parity(buf, put_bits_count(&pb) >> 3) ^ 0xa9;
checksum = ff_mlp_checksum8 (buf, put_bits_count(&pb) >> 3); checksum = ff_mlp_checksum8 (buf, put_bits_count(&pb) >> 3);