h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.

This prevents frame allocation overflows, and fixed
fate-h264-conformance-mr3_tandberg_b with 2 threads.
This commit is contained in:
Ronald S. Bultje 2011-12-01 12:45:10 -08:00
parent 3adba2de3d
commit 2574f08d4c

View File

@ -1438,7 +1438,7 @@ static void decode_postinit(H264Context *h, int setup_finished){
if( s->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT
&& !h->sps.bitstream_restriction_flag){
s->avctx->has_b_frames= MAX_DELAYED_PIC_COUNT;
s->avctx->has_b_frames = MAX_DELAYED_PIC_COUNT - 1;
s->low_delay= 0;
}