[FFmpeg-cvslog] avcodec/apedec: use proper macro and type for pivot variable

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Oct  6 01:56:43 2020 +0200| [2fb517855a5c6dc623b59d5a5e342cc668aa220d] | committer: Paul B Mahol

avcodec/apedec: use proper macro and type for pivot variable

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

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

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index aa4d8fa524..8fe7b5ee86 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -559,12 +559,10 @@ static inline int ape_decode_value_3900(APEContext *ctx, APERice *rice)
 
 static inline int ape_decode_value_3990(APEContext *ctx, APERice *rice)
 {
-    unsigned int x, overflow;
-    int base, pivot;
+    unsigned int x, overflow, pivot;
+    int base;
 
-    pivot = rice->ksum >> 5;
-    if (pivot == 0)
-        pivot = 1;
+    pivot = FFMAX(rice->ksum >> 5, 1);
 
     overflow = range_get_symbol(ctx, counts_3980, counts_diff_3980);