mirror of https://git.ffmpeg.org/ffmpeg.git
Merge remote-tracking branch 'qatar/master'
* qatar/master: h264: set ref_count to 0 for intra slices. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
547042a8cd
|
@ -3533,8 +3533,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
|
||||||
h->list_count = 2;
|
h->list_count = 2;
|
||||||
else
|
else
|
||||||
h->list_count = 1;
|
h->list_count = 1;
|
||||||
} else
|
} else {
|
||||||
h->ref_count[1]= h->ref_count[0]= h->list_count= 0;
|
h->list_count = 0;
|
||||||
|
h->ref_count[0] = h->ref_count[1] = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (!default_ref_list_done)
|
if (!default_ref_list_done)
|
||||||
ff_h264_fill_default_ref_list(h);
|
ff_h264_fill_default_ref_list(h);
|
||||||
|
|
Loading…
Reference in New Issue