diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 13:50:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 13:50:07 +0200 |
| commit | 98d0c4236c7542c87f012228d3bc88aea67bddc2 (patch) | |
| tree | 1de7672d09633fc170b435828b1b6f5ee05766a4 | |
| parent | 0773f6739538db9cbe2712bfffd4de47639a685e (diff) | |
| download | ffmpeg-98d0c4236c7542c87f012228d3bc88aea67bddc2.tar.gz | |
avcodec/h264: Be more tolerant to changing pps id between slices
Fixes Ticket4446
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index b4c4cd96c9..639761f07a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1495,9 +1495,6 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size, continue; again: - if ( (!(avctx->active_thread_type & FF_THREAD_FRAME) || nals_needed >= nal_index) - && !h->current_slice) - h->au_pps_id = -1; /* Ignore per frame NAL unit type during extradata * parsing. Decoding slices is not possible in codec init * with frame-mt */ @@ -1546,6 +1543,10 @@ again: case NAL_SLICE: init_get_bits(&sl->gb, ptr, bit_length); + if ( nals_needed >= nal_index + || (!(avctx->active_thread_type & FF_THREAD_FRAME) && !context_count)) + h->au_pps_id = -1; + if ((err = ff_h264_decode_slice_header(h, sl))) break; |