Commit 4c7a232f authored by Laurent Aimar's avatar Laurent Aimar Committed by Janne Grunau

h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()

Signed-off-by: 's avatarJanne Grunau <janne-libav@jannau.net>
parent e8ac80fb
...@@ -2857,8 +2857,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ...@@ -2857,8 +2857,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
ff_h264_fill_default_ref_list(h); ff_h264_fill_default_ref_list(h);
} }
if(h->slice_type_nos!=AV_PICTURE_TYPE_I && ff_h264_decode_ref_pic_list_reordering(h) < 0) if(h->slice_type_nos!=AV_PICTURE_TYPE_I && ff_h264_decode_ref_pic_list_reordering(h) < 0) {
h->ref_count[1]= h->ref_count[0]= 0;
return -1; return -1;
}
if(h->slice_type_nos!=AV_PICTURE_TYPE_I){ if(h->slice_type_nos!=AV_PICTURE_TYPE_I){
s->last_picture_ptr= &h->ref_list[0][0]; s->last_picture_ptr= &h->ref_list[0][0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment