Browse Source

Use av_frame_copy() to simplify code where appropriate.

tags/n2.2-rc1
Anton Khirnov 11 years ago
parent
commit
30517a9f05
2 changed files with 2 additions and 6 deletions
  1. +1
    -3
      libavcodec/libwebpenc.c
  2. +1
    -3
      libavfilter/vf_copy.c

+ 1
- 3
libavcodec/libwebpenc.c View File

@@ -161,9 +161,7 @@ static int libwebp_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
ret = av_frame_get_buffer(alt_frame, 32); ret = av_frame_get_buffer(alt_frame, 32);
if (ret < 0) if (ret < 0)
goto end; goto end;
av_image_copy(alt_frame->data, alt_frame->linesize,
frame->data, frame->linesize,
avctx->pix_fmt, frame->width, frame->height);
av_frame_copy(alt_frame, frame);
frame = alt_frame; frame = alt_frame;
} }
pic->use_argb = 0; pic->use_argb = 0;


+ 1
- 3
libavfilter/vf_copy.c View File

@@ -37,9 +37,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
av_frame_copy_props(out, in); av_frame_copy_props(out, in);
av_image_copy(out->data, out->linesize, in->data, in->linesize,
in->format, in->width, in->height);

av_frame_copy(out, in);
av_frame_free(&in); av_frame_free(&in);
return ff_filter_frame(outlink, out); return ff_filter_frame(outlink, out);
} }


Loading…
Cancel
Save