diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 16:22:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 16:23:01 +0100 |
| commit | 34e325efa5d05508c182d0753dd5fd00e95502eb (patch) | |
| tree | 995999c8e7b5fb523a0141618cae43e9866411ac /libavcodec | |
| parent | 987b873049a84aee002766e50d9165993e72f403 (diff) | |
| parent | bf0d7da7cbbf869605086c2a47cdf87f0a533e24 (diff) | |
| download | ffmpeg-34e325efa5d05508c182d0753dd5fd00e95502eb.tar.gz | |
Merge commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24'
* commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24':
ljpeg: check color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ljpegenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index b7e3d358c7..6fd86ff227 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -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 " |