ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Thu Mar 17 23:07:39 2022 -0300| [5021b2ba0653cc97165f40b2cf247cbf5122aae0] | committer: James Almer
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 <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5021b2ba0653cc97165f40b2cf247cbf5122aae0 --- libavcodec/dfa.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index 97a9bd5a1f..eaa1e7e33d 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
