[FFmpeg-cvslog] avcodec/proresdec2: set color information on frames instead of the decoder context
James Almer
git at videolan.org
Tue Dec 27 16:05:31 EET 2022
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Dec 10 12:22:44 2022 -0300| [7fab58647c3eb32e04a58b9810a3e864305ebf2f] | committer: James Almer
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 at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fab58647c3eb32e04a58b9810a3e864305ebf2f
---
libavcodec/proresdec2.c | 8 ++++----
1 file 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];
More information about the ffmpeg-cvslog
mailing list