Commit 6b295bcc authored by Derek Buitenhuis's avatar Derek Buitenhuis

Merge commit '56b17a33'

* commit '56b17a33':
  h264: stop testing whether the reference count changes in ff_set_ref_count()
Merged-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parents 7ab2c036 56b17a33
......@@ -1037,14 +1037,9 @@ int ff_set_ref_count(H264Context *h, H264SliceContext *sl)
ref_count[0] = ref_count[1] = 0;
}
if (list_count != sl->list_count ||
ref_count[0] != sl->ref_count[0] ||
ref_count[1] != sl->ref_count[1]) {
sl->ref_count[0] = ref_count[0];
sl->ref_count[1] = ref_count[1];
sl->list_count = list_count;
return 1;
}
sl->ref_count[0] = ref_count[0];
sl->ref_count[1] = ref_count[1];
sl->list_count = list_count;
return 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