Browse Source

Merge commit '56b17a33f231859cbccbd741b4763617cb4ecf03'

* commit '56b17a33f231859cbccbd741b4763617cb4ecf03':
  h264: stop testing whether the reference count changes in ff_set_ref_count()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
tags/n3.1
Derek Buitenhuis 9 years ago
parent
commit
6b295bccbb
1 changed files with 3 additions and 8 deletions
  1. +3
    -8
      libavcodec/h264.c

+ 3
- 8
libavcodec/h264.c View File

@@ -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;
}


Loading…
Cancel
Save