diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2017-04-03 21:13:28 +0100 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2017-04-09 00:02:12 +0100 |
| commit | 6c9574e490218683a302f3814036bf6b9bbc37df (patch) | |
| tree | 31312367bd1e31211c9f168bfa2938fc0f92f710 | |
| parent | 37fcf089b4a29aa90e4a1ce6a54b4fcc75063f78 (diff) | |
| download | ffmpeg-6c9574e490218683a302f3814036bf6b9bbc37df.tar.gz | |
mjpegenc_common: check for codec ID before using avctx->priv_data
When coding lossless jpeg the priv context will be pointing to LJpegEncContext
rather than MpegEncContext, which the function expects.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
(cherry picked from commit 2c9be3882a03823413945bd9e2d9af33e6e322d5)
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
| -rw-r--r-- | libavcodec/mjpegenc_common.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 83a9e95766..6d9c982726 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -91,13 +91,17 @@ static void jpeg_table_header(AVCodecContext *avctx, PutBitContext *p, { int i, j, size; uint8_t *ptr; - MpegEncContext *s = avctx->priv_data; + MpegEncContext *s = NULL; + + /* Since avctx->priv_data will point to LJpegEncContext in this case */ + if (avctx->codec_id != AV_CODEC_ID_LJPEG) + s = avctx->priv_data; if (avctx->codec_id != AV_CODEC_ID_LJPEG) { int matrix_count = 1 + !!memcmp(luma_intra_matrix, chroma_intra_matrix, sizeof(luma_intra_matrix[0]) * 64); - if (s->force_duplicated_matrix) + if (s && s->force_duplicated_matrix) matrix_count = 2; /* quant matrixes */ put_marker(p, DQT); @@ -134,7 +138,7 @@ static void jpeg_table_header(AVCodecContext *avctx, PutBitContext *p, // Only MJPEG can have a variable Huffman variable. All other // formats use the default Huffman table. - if (s->out_format == FMT_MJPEG && s->huffman == HUFFMAN_TABLE_OPTIMAL) { + if (s && s->huffman == HUFFMAN_TABLE_OPTIMAL) { size += put_huffman_table(p, 0, 0, s->mjpeg_ctx->bits_dc_luminance, s->mjpeg_ctx->val_dc_luminance); size += put_huffman_table(p, 0, 1, s->mjpeg_ctx->bits_dc_chrominance, |