[FFmpeg-cvslog] Merge commit '56b17a33f231859cbccbd741b4763617cb4ecf03'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Tue May 17 14:55:36 2016 +0100| [6b295bccbbf7e19d92fe7850de42885b40fe9f07] | committer: Derek Buitenhuis

Merge commit '56b17a33f231859cbccbd741b4763617cb4ecf03'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b295bccbbf7e19d92fe7850de42885b40fe9f07
---

 libavcodec/h264.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 3e29e88..d905303 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;
 }


======================================================================

diff --cc libavcodec/h264.c
index 3e29e88,f1f9c73..d905303
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@@ -1037,14 -997,17 +1037,9 @@@ int ff_set_ref_count(H264Context *h, H2
          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;
-     }
 -    max_refs = h->picture_structure == PICT_FRAME ? 16 : 32;
 -
 -    if (ref_count[0] > max_refs || ref_count[1] > max_refs) {
 -        av_log(h->avctx, AV_LOG_ERROR, "reference overflow\n");
 -        sl->ref_count[0] = sl->ref_count[1] = 0;
 -        return AVERROR_INVALIDDATA;
 -    }
 -
+     sl->ref_count[0] = ref_count[0];
+     sl->ref_count[1] = ref_count[1];
+     sl->list_count   = list_count;
  
      return 0;
  }