Skip to content

F
ffmpeg
Commit dded4cb2 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

lavc: fix support of unofficial pix_fmt extensions of jpeg 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 465a72b4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
libavcodec/utils.c
View file @ dded4cb2
...@@ -883,7 +883,9 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD ...@@ -883,7 +883,9 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD
for (i = 0; avctx->codec->pix_fmts[i] != PIX_FMT_NONE; i++) for (i = 0; avctx->codec->pix_fmts[i] != PIX_FMT_NONE; i++)
if (avctx->pix_fmt == avctx->codec->pix_fmts[i]) if (avctx->pix_fmt == avctx->codec->pix_fmts[i])
break; break;
if (avctx->codec->pix_fmts[i] == PIX_FMT_NONE) { if (avctx->codec->pix_fmts[i] == PIX_FMT_NONE
&& !((avctx->codec_id == CODEC_ID_MJPEG || avctx->codec_id == CODEC_ID_LJPEG)
&& avctx->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL)) {
av_log(avctx, AV_LOG_ERROR, "Specified pix_fmt is not supported\n"); av_log(avctx, AV_LOG_ERROR, "Specified pix_fmt is not supported\n");
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto free_and_end; goto free_and_end;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment