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)
* commit '025fd76e1a2623c858d8c686a73cc30980a314b0':
  dxtory: change error code for unexpected slice configuration

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

Simple merge