RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/dxtory: Support dxtory-2.0.127.avi 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-25 23:42:03 +02:00
parent c0f9df30dd
commit a43bcaafe2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/dxtory.c
View File

@ -424,7 +424,7 @@ static int dxtory_decode_v2_410(AVCodecContext *avctx, AVFrame *pic,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (!nslices || avctx->height % nslices) { if (!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_PATCHWELCOME; return AVERROR_PATCHWELCOME;
@ -445,9 +445,9 @@ static int dxtory_decode_v2_410(AVCodecContext *avctx, AVFrame *pic,
V = pic->data[2]; V = pic->data[2];
cur_y = 0; cur_y = 0;
next_y = ref_slice_height;
for (slice = 0; slice < nslices; slice++) { for (slice = 0; slice < nslices; slice++) {
slice_size = bytestream2_get_le32(&gb); slice_size = bytestream2_get_le32(&gb);
next_y = ((slice + 1) * avctx->height) / nslices;
slice_height = (next_y & ~3) - (cur_y & ~3); slice_height = (next_y & ~3) - (cur_y & ~3);
if (slice_size > src_size - off) { if (slice_size > src_size - off) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
@ -475,7 +475,6 @@ static int dxtory_decode_v2_410(AVCodecContext *avctx, AVFrame *pic,
V += pic->linesize[2] * (slice_height >> 2); V += pic->linesize[2] * (slice_height >> 2);
off += slice_size; off += slice_size;
cur_y = next_y; cur_y = next_y;
next_y += ref_slice_height;
} }
return 0; return 0;
@ -528,7 +527,7 @@ static int dxtory_decode_v2_420(AVCodecContext *avctx, AVFrame *pic,
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (!nslices || avctx->height % nslices) { if (!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_PATCHWELCOME; return AVERROR_PATCHWELCOME;
@ -549,9 +548,9 @@ static int dxtory_decode_v2_420(AVCodecContext *avctx, AVFrame *pic,
V = pic->data[2]; V = pic->data[2];
cur_y = 0; cur_y = 0;
next_y = ref_slice_height;
for (slice = 0; slice < nslices; slice++) { for (slice = 0; slice < nslices; slice++) {
slice_size = bytestream2_get_le32(&gb); slice_size = bytestream2_get_le32(&gb);
next_y = ((slice + 1) * avctx->height) / nslices;
slice_height = (next_y & ~1) - (cur_y & ~1); slice_height = (next_y & ~1) - (cur_y & ~1);
if (slice_size > src_size - off) { if (slice_size > src_size - off) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
@ -579,7 +578,6 @@ static int dxtory_decode_v2_420(AVCodecContext *avctx, AVFrame *pic,
V += pic->linesize[2] * (slice_height >> 1); V += pic->linesize[2] * (slice_height >> 1);
off += slice_size; off += slice_size;
cur_y = next_y; cur_y = next_y;
next_y += ref_slice_height;
} }
return 0; return 0;