diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/ljpegenc.c')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavcodec/ljpegenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/ljpegenc.c b/chromium/third_party/ffmpeg/libavcodec/ljpegenc.c index 35b82fdea2c..6fd86ff2276 100644 --- a/chromium/third_party/ffmpeg/libavcodec/ljpegenc.c +++ b/chromium/third_party/ffmpeg/libavcodec/ljpegenc.c @@ -233,7 +233,7 @@ static int ljpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, init_put_bits(&pb, pkt->data, pkt->size); ff_mjpeg_encode_picture_header(avctx, &pb, &s->scantable, - s->matrix); + s->matrix, s->matrix); header_bits = put_bits_count(&pb); @@ -275,7 +275,8 @@ static av_cold int ljpeg_encode_init(AVCodecContext *avctx) if ((avctx->pix_fmt == AV_PIX_FMT_YUV420P || avctx->pix_fmt == AV_PIX_FMT_YUV422P || - avctx->pix_fmt == AV_PIX_FMT_YUV444P) && + avctx->pix_fmt == AV_PIX_FMT_YUV444P || + avctx->color_range == AVCOL_RANGE_MPEG) && avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) { av_log(avctx, AV_LOG_ERROR, "Limited range YUV is non-standard, set strict_std_compliance to " |