diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-17 14:55:36 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-17 14:55:36 +0100 |
| commit | 6b295bccbbf7e19d92fe7850de42885b40fe9f07 (patch) | |
| tree | 0dd13e9701a2b685e932cf287fd2f6ffdaef59cc /libavcodec | |
| parent | 7ab2c036b917ad3ecaf245601aeba4316b6604c2 (diff) | |
| parent | 56b17a33f231859cbccbd741b4763617cb4ecf03 (diff) | |
| download | ffmpeg-6b295bccbbf7e19d92fe7850de42885b40fe9f07.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 3e29e881c5..d9053037e2 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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; } |