virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-14 22:15:12 +02:00
Code Issues Releases Activity

Merge commit '025fd76e1a2623c858d8c686a73cc30980a314b0'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-01-21 21:17:11 +01:00
parent 9eb954b91d 025fd76e1a
commit a298f934ec
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dxtory.c
View File

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