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/iff: Pass extradata and extradata_size explicitly

Browse Source 
This might be useful in case this decoder were changed to support
new extradata passed via side-data.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-07-11 20:07:11 +02:00
parent d0df74553b
commit 8612b26202
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/iff.c
View File

@@ -200,20 +200,20 @@ static int cmap_read_palette(AVCodecContext *avctx, uint32_t *pal)
* @param avctx the AVCodecContext where to extract extra context to * @param avctx the AVCodecContext where to extract extra context to
* @return >= 0 in case of success, a negative error code otherwise * @return >= 0 in case of success, a negative error code otherwise
*/ */
static int extract_header(AVCodecContext *const avctx) static int extract_header(AVCodecContext *const avctx,
const uint8_t *const extradata, int extradata_size)
{ {
IffContext *s = avctx->priv_data; IffContext *s = avctx->priv_data;
const uint8_t *buf; const uint8_t *buf = extradata;
unsigned buf_size = 0; unsigned buf_size = 0;
int i, palette_size; int i, palette_size;
if (avctx->extradata_size < 2) { if (extradata_size < 2) {
av_log(avctx, AV_LOG_ERROR, "not enough extradata\n"); av_log(avctx, AV_LOG_ERROR, "not enough extradata\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
palette_size = avctx->extradata_size - AV_RB16(avctx->extradata); palette_size = extradata_size - AV_RB16(extradata);
buf = avctx->extradata;
buf_size = bytestream_get_be16(&buf); buf_size = bytestream_get_be16(&buf);
if (buf_size <= 1 || palette_size < 0) { if (buf_size <= 1 || palette_size < 0) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
@@ -273,7 +273,7 @@ static int extract_header(AVCodecContext *const avctx)
if (s->ham) { if (s->ham) {
int i, count = FFMIN(palette_size / 3, 1 << s->ham); int i, count = FFMIN(palette_size / 3, 1 << s->ham);
int ham_count; int ham_count;
const uint8_t *const palette = avctx->extradata + AV_RB16(avctx->extradata); const uint8_t *const palette = extradata + AV_RB16(extradata);
int extra_space = 1; int extra_space = 1;
if (avctx->codec_tag == MKTAG('P', 'B', 'M', ' ') && s->ham == 4) if (avctx->codec_tag == MKTAG('P', 'B', 'M', ' ') && s->ham == 4)
@@ -388,7 +388,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if ((err = extract_header(avctx)) < 0) err = extract_header(avctx, avctx->extradata, avctx->extradata_size);
if (err < 0)
return err; return err;
return 0; return 0;