[FFmpeg-cvslog] Merge commit '1389b4c18d1042c196603ba66c25113bcee1738b'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Apr 13 16:24:42 2016 +0100| [eff2b4311750f7f8e66b99b321ebcbf80458a259] | committer: Derek Buitenhuis

Merge commit '1389b4c18d1042c196603ba66c25113bcee1738b'

This commit is a no-op.

* commit '1389b4c18d1042c196603ba66c25113bcee1738b':
  idct8x8: Fix undefined negative shifts

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

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