diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 13:50:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-16 16:03:24 +0200 |
| commit | 82d3dd44aad41a12b37f8bbd01b893c7fa3e13c2 (patch) | |
| tree | 3e47ad27646f19467f285f02b8c9477f7414f357 | |
| parent | 684f86391d3d014790a981eb1531ae25f2f6d6a2 (diff) | |
| download | ffmpeg-82d3dd44aad41a12b37f8bbd01b893c7fa3e13c2.tar.gz | |
avcodec/h264: Be more tolerant to changing pps id between slices
Fixes Ticket4446
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 98d0c4236c7542c87f012228d3bc88aea67bddc2)
Conflicts:
libavcodec/h264.c
(cherry picked from commit 0cd0fa9d0baabd2dc0442ed8b53ba65282733b61)
Conflicts:
libavcodec/h264.c
| -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 92c9fbc9e6..d2b88d1d42 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -5011,9 +5011,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 */ @@ -5059,6 +5056,10 @@ again: hx->inter_gb_ptr = &hx->gb; hx->data_partitioning = 0; + if ( nals_needed >= nal_index + || (!(avctx->active_thread_type & FF_THREAD_FRAME) && !context_count)) + h->au_pps_id = -1; + if ((err = decode_slice_header(hx, h))) break; |