Merge commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:23:53 +0000 (14:23 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:23:53 +0000 (14:23 +0200)
commit696634c5fa5894b4adeb240191a723ec77a30756
treec7ddc36c262debae50601910ba7e8ed37878feb0
parent94d7060d71b435d2d5bbd5d7553d926a87695992
parent6a6bc43f5f79587b8936334cc0b3a6616f4807ac
Merge commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/dxtory.c