Commit d80f0a4a authored by Anton Khirnov's avatar Anton Khirnov

mpevideo_enc: disallow multiple slices for h261 and flv

They do not work and produce corrupted output.

CC: libav-stable@libav.org
parent ca489564
...@@ -496,6 +496,12 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -496,6 +496,12 @@ FF_ENABLE_DEPRECATION_WARNINGS
} }
} }
if (avctx->slices > 1 &&
(avctx->codec_id == AV_CODEC_ID_FLV1 || avctx->codec_id == AV_CODEC_ID_H261)) {
av_log(avctx, AV_LOG_ERROR, "Multiple slices are not supported by this codec\n");
return AVERROR(EINVAL);
}
if (s->avctx->thread_count > 1 && if (s->avctx->thread_count > 1 &&
s->codec_id != AV_CODEC_ID_MPEG4 && s->codec_id != AV_CODEC_ID_MPEG4 &&
s->codec_id != AV_CODEC_ID_MPEG1VIDEO && s->codec_id != AV_CODEC_ID_MPEG1VIDEO &&
......
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