Merge commit '025fd76e1a2623c858d8c686a73cc30980a314b0'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 20:17:11 +0000 (21:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 20:17:16 +0000 (21:17 +0100)
commita298f934ec9b59f727a97186b928d9d8362a47c7
tree768ef55bda4731d03209e024b87582f064cefd73
parent9eb954b91d3676f2ae207149db2e7f5ee2353df4
parent025fd76e1a2623c858d8c686a73cc30980a314b0
Merge commit '025fd76e1a2623c858d8c686a73cc30980a314b0'

* commit '025fd76e1a2623c858d8c686a73cc30980a314b0':
  dxtory: change error code for unexpected slice configuration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxtory.c