[FFmpeg-cvslog] Merge commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 12 23:03:12 2015 +0200| [fd04082af985d4aa7a363a0cd9ee136c64d83820] | committer: Michael Niedermayer

Merge commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd'

* commit '2d5176fad1a4556d209cbfb0f681712c7eada4fd':
  on2avc: Use the integer abs() version

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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