1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00

avcodec/h264_refs: Fix pps_ref_count with multiple PPS

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-06-02 14:51:49 +02:00
parent a8289d2407
commit 3402871f36

View File

@@ -806,8 +806,10 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count)
print_long_term(h); print_long_term(h);
for (i = 0; i < FF_ARRAY_ELEMS(h->pps_buffers); i++) { for (i = 0; i < FF_ARRAY_ELEMS(h->pps_buffers); i++) {
pps_ref_count[0] = FFMAX(pps_ref_count[0], h->pps.ref_count[0]); if (h->pps_buffers[i]) {
pps_ref_count[1] = FFMAX(pps_ref_count[1], h->pps.ref_count[1]); pps_ref_count[0] = FFMAX(pps_ref_count[0], h->pps_buffers[i]->ref_count[0]);
pps_ref_count[1] = FFMAX(pps_ref_count[1], h->pps_buffers[i]->ref_count[1]);
}
} }
if ( err >= 0 if ( err >= 0