mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-13 21:28:01 +02:00
avcodec/dfa: don't check for the bitstream version on every copied line
And use av_image_copy_plane() while at it to simplify things for version != 0x100. Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
parent
2b2380c098
commit
5021b2ba06
@ -386,8 +386,8 @@ static int dfa_decode_frame(AVCodecContext *avctx,
|
||||
|
||||
buf = s->frame_buf;
|
||||
dst = frame->data[0];
|
||||
for (i = 0; i < avctx->height; i++) {
|
||||
if(version == 0x100) {
|
||||
if (version == 0x100) {
|
||||
for (i = 0; i < avctx->height; i++) {
|
||||
int j;
|
||||
const uint8_t *buf1 = buf + (i&3)*(avctx->width/4) + (i/4)*avctx->width;
|
||||
int stride = (avctx->height/4)*avctx->width;
|
||||
@ -401,12 +401,12 @@ static int dfa_decode_frame(AVCodecContext *avctx,
|
||||
for(; j < avctx->width; j++) {
|
||||
dst[j] = buf1[(j/4) + (j&3)*stride];
|
||||
}
|
||||
} else {
|
||||
memcpy(dst, buf, avctx->width);
|
||||
buf += avctx->width;
|
||||
dst += frame->linesize[0];
|
||||
}
|
||||
dst += frame->linesize[0];
|
||||
}
|
||||
} else
|
||||
av_image_copy_plane(dst, frame->linesize[0], buf, avctx->width,
|
||||
avctx->width, avctx->height);
|
||||
|
||||
memcpy(frame->data[1], s->pal, sizeof(s->pal));
|
||||
|
||||
*got_frame = 1;
|
||||
|
Loading…
Reference in New Issue
Block a user