[FFmpeg-cvslog] af_hdcd: integrate() renamed hdcd_integrate() to be consistent with the other function names

[Burt P]

ffmpeg | branch: master | Burt P <pburt0 at gmail.com> | Tue Jul 12 12:54:06 2016 -0500| [0d8caeb41e5082edfbbb47b4b6402fcae486826f] | committer: Michael Niedermayer

af_hdcd: integrate() renamed hdcd_integrate() to be consistent with the other function names

Signed-off-by: Burt P <pburt0 at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavfilter/af_hdcd.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c
index 89012eb..73a0b93 100644
--- a/libavfilter/af_hdcd.c
+++ b/libavfilter/af_hdcd.c
@@ -883,7 +883,7 @@ static void hdcd_reset(hdcd_state_t *state, unsigned rate)
     state->cb7 = 0;
 }
 
-static int integrate(hdcd_state_t *state, int *flag, const int32_t *samples, int count, int stride)
+static int hdcd_integrate(hdcd_state_t *state, int *flag, const int32_t *samples, int count, int stride)
 {
     uint32_t bits = 0;
     int result = FFMIN(state->readahead, count);
@@ -941,7 +941,7 @@ static int hdcd_scan(hdcd_state_t *state, const int32_t *samples, int max, int s
     result = 0;
     while (result < max) {
         int flag;
-        int consumed = integrate(state, &flag, samples, max - result, stride);
+        int consumed = hdcd_integrate(state, &flag, samples, max - result, stride);
         result += consumed;
         if (flag > 0) {
             state->sustain = state->sustain_reset;