Browse Source

Merge commit '025fd76e1a2623c858d8c686a73cc30980a314b0'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 11 years ago
parent
commit
a298f934ec
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/dxtory.c

+ 1
- 1
libavcodec/dxtory.c View 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;


Loading…
Cancel
Save