[FFmpeg-cvslog] Merge commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep  8 14:23:53 2015 +0200| [696634c5fa5894b4adeb240191a723ec77a30756] | committer: Hendrik Leppkes

Merge commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac'

* commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac':
  dxtory: Factorize slice size checks

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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