[FFmpeg-cvslog] avcodec/encode: Fix check for allowed LJPEG pixel formats

Andreas Rheinhardt git at videolan.org
Thu Apr 8 13:53:48 EEST 2021

ffmpeg | branch: release/4.4 | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Tue Apr  6 00:32:39 2021 +0200| [fb7cd459778d6ae8975bf26766109ad82859c0e8] | committer: Andreas Rheinhardt

avcodec/encode: Fix check for allowed LJPEG pixel formats

The pix_fmts of the LJPEG encoder already contain all supported pixel
formats (including the ones only supported when strictness is unofficial
or less); yet the check in ff_encode_preinit() ignored this list in case
strictness is unofficial or less. But the encoder presumed that it is
always applied and blacklists some of the entries in pix_fmts when
strictness is > unofficial. The result is that if one uses an entry not
on that list and sets strictness to unofficial, said entry passes both
checks and this can lead to segfaults lateron (e.g. when using gray).

Fix this by removing the exception for LJPEG in ff_encode_preinit().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
(cherry picked from commit 6e8e9b7633d8b755e7a464a10ba5047f31cbd84d)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fb7cd459778d6ae8975bf26766109ad82859c0e8

 libavcodec/encode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index a93bb3ccf7..89df5235da 100644
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
             if (avctx->pix_fmt == avctx->codec->pix_fmts[i])
         if (avctx->codec->pix_fmts[i] == AV_PIX_FMT_NONE
-            && !((avctx->codec_id == AV_CODEC_ID_MJPEG || avctx->codec_id == AV_CODEC_ID_LJPEG)
+            && !(avctx->codec_id == AV_CODEC_ID_MJPEG
                  && avctx->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL)) {
             char buf[128];
             snprintf(buf, sizeof(buf), "%d", avctx->pix_fmt);

More information about the ffmpeg-cvslog mailing list