Merge commit 'b52307933b576eba741c80108c3dad09eb48ba12'

* commit 'b52307933b576eba741c80108c3dad09eb48ba12':
  wrapped_avframe: Drop a now-unused variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-16 23:04:46 +02:00
commit af065bf11b

View File

@ -43,7 +43,6 @@ static int wrapped_avframe_encode(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet) const AVFrame *frame, int *got_packet)
{ {
AVFrame *wrapped = av_frame_clone(frame); AVFrame *wrapped = av_frame_clone(frame);
int ret;
if (!wrapped) if (!wrapped)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);