diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-09 20:58:07 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-09 20:58:07 +0200 |
| commit | d6cfbcd6219a6c9155864ca87c77bad524184542 (patch) | |
| tree | 145ccb97ebef24920b198f9557b6e19d6dfe4584 /libavcodec/mjpegenc_common.c | |
| parent | 1e81fd3710a81ca9c5e13647a189a65ff48778b3 (diff) | |
| download | ffmpeg-d6cfbcd6219a6c9155864ca87c77bad524184542.tar.gz | |
lavc/mjpegenc: Add an option to force outputting chroma matrix.
RFC 2435 suggests that mjpeg over rtp uses both two tables.
Diffstat (limited to 'libavcodec/mjpegenc_common.c')
| -rw-r--r-- | libavcodec/mjpegenc_common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index d1d4cfb40a..7dadda8bf9 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -64,11 +64,14 @@ static void jpeg_table_header(AVCodecContext *avctx, PutBitContext *p, { int i, j, size; uint8_t *ptr; + MpegEncContext *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) + matrix_count = 2; /* quant matrixes */ put_marker(p, DQT); put_bits(p, 16, 2 + matrix_count * (1 + 64)); |