virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

mlpenc: fix huff offset calculation

Browse Source 
huff offset wasn't always within the bounds before, which lead to
corrupt encoding that didn't always trigger lossless check failures

Signed-off-by: Jai Luthra <me@jailuthra.in>
This commit is contained in:
Jai Luthra
2020-01-24 16:03:31 +05:30
committed by Paul B Mahol
parent c1c3916cec
commit 990990ed5d
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mlpenc.c
View File

@@ -1699,7 +1699,7 @@ static inline void codebook_bits(MLPEncodeContext *ctx,
offset_min = FFMAX(min, HUFF_OFFSET_MIN); offset_min = FFMAX(min, HUFF_OFFSET_MIN);
offset_max = FFMIN(max, HUFF_OFFSET_MAX); offset_max = FFMIN(max, HUFF_OFFSET_MAX);
for (;;) { while (offset <= offset_max && offset >= offset_min) {
BestOffset temp_bo; BestOffset temp_bo;
codebook_bits_offset(ctx, channel, codebook, codebook_bits_offset(ctx, channel, codebook,
@@ -1718,12 +1718,8 @@ static inline void codebook_bits(MLPEncodeContext *ctx,
if (direction) { if (direction) {
offset = temp_bo.max + 1; offset = temp_bo.max + 1;
if (offset > offset_max)
break;
} else { } else {
offset = temp_bo.min - 1; offset = temp_bo.min - 1;
if (offset < offset_min)
break;
} }
} }
} }