Merge commit '3a16ec19d2426457419cb8a7304f97982699efda'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 17:06:22 +0000 (18:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 17:06:40 +0000 (18:06 +0100)
* commit '3a16ec19d2426457419cb8a7304f97982699efda':
  vf_interlace: check one av_frame_clone allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_interlace.c

index 86e42e2..63fea2b 100644 (file)
@@ -184,6 +184,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
         av_log(ctx, AV_LOG_WARNING,
                "video is already interlaced, adjusting framerate only\n");
         out = av_frame_clone(s->cur);
+        if (!out)
+            return AVERROR(ENOMEM);
         out->pts /= 2;  // adjust pts to new framerate
         ret = ff_filter_frame(outlink, out);
         return ret;