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

avcodec/exrenc: use correct type for actual_size as argument for zlib

Browse Source
This commit is contained in:
Paul B Mahol
2021-02-23 12:30:55 +01:00
parent 081cbe6961
commit d7f10b2497
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/exrenc.c
View File

@@ -251,6 +251,7 @@ static int encode_scanline_zip(EXRContext *s, const AVFrame *frame)
const int scanline_height = FFMIN(s->scanline_height, frame->height - y * s->scanline_height); const int scanline_height = FFMIN(s->scanline_height, frame->height - y * s->scanline_height);
int64_t tmp_size = 4LL * s->planes * frame->width * scanline_height; int64_t tmp_size = 4LL * s->planes * frame->width * scanline_height;
int64_t max_compressed_size = tmp_size * 3 / 2; int64_t max_compressed_size = tmp_size * 3 / 2;
unsigned long actual_size, source_size;
av_fast_padded_malloc(&scanline->uncompressed_data, &scanline->uncompressed_size, tmp_size); av_fast_padded_malloc(&scanline->uncompressed_data, &scanline->uncompressed_size, tmp_size);
if (!scanline->uncompressed_data) if (!scanline->uncompressed_data)
@@ -278,10 +279,12 @@ static int encode_scanline_zip(EXRContext *s, const AVFrame *frame)
reorder_pixels(scanline->tmp, scanline->uncompressed_data, tmp_size); reorder_pixels(scanline->tmp, scanline->uncompressed_data, tmp_size);
predictor(scanline->tmp, tmp_size); predictor(scanline->tmp, tmp_size);
scanline->actual_size = max_compressed_size; source_size = tmp_size;
compress(scanline->compressed_data, &scanline->actual_size, actual_size = max_compressed_size;
scanline->tmp, tmp_size); compress(scanline->compressed_data, &actual_size,
scanline->tmp, source_size);
scanline->actual_size = actual_size;
if (scanline->actual_size >= tmp_size) { if (scanline->actual_size >= tmp_size) {
FFSWAP(uint8_t *, scanline->uncompressed_data, scanline->compressed_data); FFSWAP(uint8_t *, scanline->uncompressed_data, scanline->compressed_data);
FFSWAP(int, scanline->uncompressed_size, scanline->compressed_size); FFSWAP(int, scanline->uncompressed_size, scanline->compressed_size);