mirror of https://git.ffmpeg.org/ffmpeg.git
vp3dec: move threads check out of header packet type check
Prevents reconfiguration with threads which is unsupported and would bring the contexts into an inconsistent state. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
1336382c6d
commit
14c8ee00ff
|
@ -1928,11 +1928,11 @@ static int vp3_decode_frame(AVCodecContext *avctx,
|
|||
int type = get_bits(&gb, 7);
|
||||
skip_bits_long(&gb, 6*8); /* "theora" */
|
||||
|
||||
if (s->avctx->active_thread_type&FF_THREAD_FRAME) {
|
||||
av_log(avctx, AV_LOG_ERROR, "midstream reconfiguration with multithreading is unsupported, try -threads 1\n");
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
if (type == 0) {
|
||||
if (s->avctx->active_thread_type&FF_THREAD_FRAME) {
|
||||
av_log(avctx, AV_LOG_ERROR, "midstream reconfiguration with multithreading is unsupported, try -threads 1\n");
|
||||
return AVERROR_PATCHWELCOME;
|
||||
}
|
||||
vp3_decode_end(avctx);
|
||||
ret = theora_decode_header(avctx, &gb);
|
||||
|
||||
|
|
Loading…
Reference in New Issue