virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  Use av_frame_copy() to simplify code where appropriate.

Conflicts:
	libavfilter/vf_copy.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-24 10:47:47 +01:00
commit 2a3cb1cfca
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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);
if (ret < 0)
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;
}
pic->use_argb = 0;

4
libavfilter/vf_copy.c
View File

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