diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2011-12-01 12:45:10 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-12-01 12:46:28 -0800 |
| commit | 2574f08d4c30b37e39650a3b3d1970f75f3170cd (patch) | |
| tree | e52efed4ffc267b4fdcdb4fce197bd0ce7555519 /libavcodec/h264.c | |
| parent | 3adba2de3d0c4903cf310fcce80ebac4dd972fd3 (diff) | |
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.
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index ad1ab69e29..96062b7806 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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; } |