videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-07 00:20:09 +02:00
Code Releases Activity

mpevideo_enc: disallow multiple slices for h261 and flv

Browse Source 
They do not work and produce corrupted output.

CC: libav-stable@libav.org
This commit is contained in:
Anton Khirnov 2015-11-18 10:32:34 +01:00
parent ca489564ae
commit d80f0a4ad6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpegvideo_enc.c
View File

@ -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 &&
s->codec_id != AV_CODEC_ID_MPEG4 &&
s->codec_id != AV_CODEC_ID_MPEG1VIDEO &&