diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 21:17:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 21:17:16 +0100 |
| commit | a298f934ec9b59f727a97186b928d9d8362a47c7 (patch) | |
| tree | 768ef55bda4731d03209e024b87582f064cefd73 /libavcodec/dxtory.c | |
| parent | 9eb954b91d3676f2ae207149db2e7f5ee2353df4 (diff) | |
| parent | 025fd76e1a2623c858d8c686a73cc30980a314b0 (diff) | |
| download | ffmpeg-a298f934ec9b59f727a97186b928d9d8362a47c7.tar.gz | |
Merge commit '025fd76e1a2623c858d8c686a73cc30980a314b0'
* commit '025fd76e1a2623c858d8c686a73cc30980a314b0':
dxtory: change error code for unexpected slice configuration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxtory.c')
| -rw-r--r-- | libavcodec/dxtory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxtory.c b/libavcodec/dxtory.c index 78f3a7a758..d61da45ee1 100644 --- a/libavcodec/dxtory.c +++ b/libavcodec/dxtory.c @@ -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; |