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>
libavcodec/dxtory.c

index 78f3a7a..d61da45 100644 (file)
@@ -135,7 +135,7 @@ static int dxtory_decode_v2(AVCodecContext *avctx, AVFrame *pic,
     if (!nslices || avctx->height % nslices) {
         avpriv_request_sample(avctx, "%d slices for %dx%d", nslices,
                               avctx->width, avctx->height);
-        return AVERROR(ENOSYS);
+        return AVERROR_PATCHWELCOME;
     }
 
     ref_slice_height = avctx->height / nslices;