diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 18:06:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 18:06:40 +0100 |
| commit | 0a382aa99bd2d23473e23fda9b78a7bf7f924d79 (patch) | |
| tree | 6ab31a9d1c0ceb5c261d66b3b36594006a415b9c /libavfilter | |
| parent | 8983dea426e34ced61d518f440be21d0f49ddb6d (diff) | |
| parent | 3a16ec19d2426457419cb8a7304f97982699efda (diff) | |
| download | ffmpeg-streaming-0a382aa99bd2d23473e23fda9b78a7bf7f924d79.zip ffmpeg-streaming-0a382aa99bd2d23473e23fda9b78a7bf7f924d79.tar.gz | |
Merge commit '3a16ec19d2426457419cb8a7304f97982699efda'
* commit '3a16ec19d2426457419cb8a7304f97982699efda':
vf_interlace: check one av_frame_clone allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_interlace.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/vf_interlace.c b/libavfilter/vf_interlace.c index 86e42e2..63fea2b 100644 --- a/libavfilter/vf_interlace.c +++ b/libavfilter/vf_interlace.c @@ -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; |
