diff options
author | James Almer <jamrial@gmail.com> | 2022-12-10 12:22:44 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2022-12-27 11:03:22 -0300 |
commit | 7fab58647c3eb32e04a58b9810a3e864305ebf2f (patch) | |
tree | a7821c431ab306d40635e8e74afb9de1cbb5ec24 | |
parent | 18f24527eb4b520585e55f922cdbc234aa9f0f18 (diff) | |
download | ffmpeg-7fab58647c3eb32e04a58b9810a3e864305ebf2f.tar.gz |
avcodec/proresdec2: set color information on frames instead of the decoder context
Similar to how the encoder looks at frame color information to write the frame
header bitstream.
Should workaround ticket #10091, where container level color parameters passed
to the decoder context were being overwritten.
Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r-- | libavcodec/proresdec2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index b0d7f8d5d5..c821a07849 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -289,10 +289,10 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf, avctx->pix_fmt = ret; } - avctx->color_primaries = buf[14]; - avctx->color_trc = buf[15]; - avctx->colorspace = buf[16]; - avctx->color_range = AVCOL_RANGE_MPEG; + ctx->frame->color_primaries = buf[14]; + ctx->frame->color_trc = buf[15]; + ctx->frame->colorspace = buf[16]; + ctx->frame->color_range = AVCOL_RANGE_MPEG; ptr = buf + 20; flags = buf[19]; |