[FFmpeg-cvslog] Merge commit 'f3fdef108eb06b1e71b29152bf6822519e787efe'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Thu May 12 14:20:51 2016 +0100| [22900770c56d36868bf2dc758f721d02730092dd] | committer: Derek Buitenhuis

Merge commit 'f3fdef108eb06b1e71b29152bf6822519e787efe'

* commit 'f3fdef108eb06b1e71b29152bf6822519e787efe':
  ape: Avoid undefined behaviour

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

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

 libavcodec/apedec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index de9d71c..b028e94 100644
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -1284,7 +1284,7 @@ static void do_apply_filter(APEContext *ctx, int version, APEFilter *f,
             /* Update the adaption coefficients */
             absres = FFABS(res);
             if (absres)
-                *f->adaptcoeffs = ((res & INT32_MIN) ^ (-(1<<30))) >>
+                *f->adaptcoeffs = ((res & INT32_MIN) ^ ((~0UL) << 30)) >>
                                   (25 + (absres <= f->avg*3) + (absres <= f->avg*4/3));
             else
                 *f->adaptcoeffs = 0;


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

diff --cc libavcodec/apedec.c
index de9d71c,85d26ae..b028e94
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@@ -1284,7 -1305,7 +1284,7 @@@ static void do_apply_filter(APEContext 
              /* Update the adaption coefficients */
              absres = FFABS(res);
              if (absres)
-                 *f->adaptcoeffs = ((res & INT32_MIN) ^ (-(1<<30))) >>
 -                *f->adaptcoeffs = ((res & ((~0UL) << 31)) ^ ((~0UL) << 30)) >>
++                *f->adaptcoeffs = ((res & INT32_MIN) ^ ((~0UL) << 30)) >>
                                    (25 + (absres <= f->avg*3) + (absres <= f->avg*4/3));
              else
                  *f->adaptcoeffs = 0;