generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/h264: Be more strict on rejecting pps_id changes

Browse Source 
Fixes race condition
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 31cc9c04ca)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-06 15:01:17 +01:00
parent a75787a71a
commit eeab3e1b20
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.c
View File

@@ -1515,8 +1515,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
continue; continue;
again: again:
if ( !(avctx->active_thread_type & FF_THREAD_FRAME) if ( (!(avctx->active_thread_type & FF_THREAD_FRAME) || nals_needed >= nal_index)
|| nals_needed >= nal_index) && !h->current_slice)
h->au_pps_id = -1; h->au_pps_id = -1;
/* Ignore per frame NAL unit type during extradata /* Ignore per frame NAL unit type during extradata
* parsing. Decoding slices is not possible in codec init * parsing. Decoding slices is not possible in codec init